Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): reorder and add missing config options #1993

Merged

Conversation

ReenigneArcher
Copy link
Member

@ReenigneArcher ReenigneArcher commented Jan 6, 2024

Description

  • reorder some config options
  • add missing config options (inadvertently removed in Web UI migration to Vite and Vue3 and improvements to the UX #1673
  • use shortened line breaks
  • removed va-api tab, and put adapter_name option on A/V tab
  • used common spacing in html comments
  • gamepad options only appear if gamepad/controller input is enabled
  • keyboard options only appear if keyboard input is enabled
  • mouse options only appear if mouse input is enabled

Todo:

  • Get team approval on order of config options. Probably some that were added back in e7e3c1d could be re-arranged better.

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Copy link
Member Author

@ReenigneArcher ReenigneArcher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These comments are some of the rationale behind re-ordering and such.

@@ -189,21 +108,50 @@ <h1 class="my-4">Configuration</h1>
</tr>
</tbody>
</table>
<button class="mt-2 btn btn-success" style="margin: 0 auto" @click="add_global_prep_cmd">
<button class="ms-0 mt-2 btn btn-success" style="margin: 0 auto" @click="add_global_prep_cmd">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Button looked odd in the center, so moved it to left side.

<div class="mb-3" v-if="platform === 'windows'">
<label for="adapter_name" class="form-label">Adapter Name</label>
<input type="text" class="form-control" id="adapter_name" placeholder="Radeon RX 580 Series"
v-model="config.adapter_name" />
<div class="form-text" v-if="platform === 'windows'">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v-if not needed here, since parent div already has it.

Comment on lines +456 to +468
<div class="mb-3" v-if="platform === 'linux'">
<label for="adapter_name" class="form-label">Adapter Name</label>
<input class="form-control" id="adapter_name" placeholder="/dev/dri/renderD128" v-model="config.adapter_name" />
<div class="form-text">
Manually specify a GPU to use for capture.<br>
<pre>ls /dev/dri/renderD* # to find all devices capable of VAAPI</pre>
<pre>
vainfo --display drm --device /dev/dri/renderD129 | \
grep -E "((VAProfileH264High|VAProfileHEVCMain|VAProfileHEVCMain10).*VAEntrypointEncSlice)|Driver version"
</pre>
Replace ``renderD129`` with the device from above to lists the name and capabilities of the device.<br>
To be supported by Sunshine, it needs to have at the very minimum:
<i>VAProfileH264High : VAEntrypointEncSlice</i>
</div>
</div>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was on the va-api tab previously, and it was the only option there. I thought it made more sense to put on the A/V tab... and not sure it applies to only va-api anyway?

<div v-if="currentTab === 'advanced'" class="config-page">
<!--Address family-->

<!-- Network Tab -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added new Network tab.


<!-- Advanced Tab -->
<div v-if="currentTab === 'advanced'" class="config-page">
<!-- Channels -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting was re-added

</div>
</div>

<!-- HEVC Support -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting was re-added

</div>
</div>

<!-- AV1 Support -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting was re-added

</div>
</div>

<!-- Capture -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting was re-added

</div>
</div>

<!-- Encoder -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setting was re-added

@@ -846,7 +1023,49 @@ <h2 class="accordion-header">
</select>
</div>
</div>

<!-- Software Encoder Tab -->
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to end, like shown in the display

@ReenigneArcher ReenigneArcher force-pushed the fix(ui)-reorder-and-add-missing-config-options branch from 0591cfd to 22604cb Compare January 7, 2024 18:15
@ReenigneArcher ReenigneArcher merged commit de7b81e into nightly Jan 7, 2024
42 checks passed
@ReenigneArcher ReenigneArcher deleted the fix(ui)-reorder-and-add-missing-config-options branch January 7, 2024 18:32
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
e-dong pushed a commit to e-dong/Sunshine that referenced this pull request Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants