izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sunshine/master'

Browse Source
This commit is contained in:
Yukino Song
2025-09-27 00:37:24 +08:00
parent db4c2fabb6 1a96d13514
commit 10fd290b81
104 changed files with 3939 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src_assets/common/assets/web/configs/tabs/General.vue
View File

@@ -69,6 +69,7 @@ onMounted(() => {
<option value="en_US">English, US</option>
<option value="es">Español (Spanish)</option>
<option value="fr">Français (French)</option>
<option value="hu">Magyar (Hungarian)</option>
<option value="it">Italiano (Italian)</option>
<option value="ja">日本語 (Japanese)</option>
<option value="ko">한국어 (Korean)</option>
@@ -79,6 +80,7 @@ onMounted(() => {
<option value="sv">svenska (Swedish)</option>
<option value="tr">Türkçe (Turkish)</option>
<option value="uk">Українська (Ukranian)</option>
<option value="vi">Tiếng Việt (Vietnamese)</option>
<option value="zh">简体中文 (Chinese Simplified)</option>
<option value="zh_TW">繁體中文 (Chinese Traditional)</option>
</select>
@@ -95,17 +97,17 @@ onMounted(() => {
<!-- Log Level -->
<div class="mb-3">
<label for="min_log_level" class="form-label">{{ $t('config.log_level') }}</label>
<label for="min_log_level" class="form-label">{{ $t('config.min_log_level') }}</label>
<select id="min_log_level" class="form-select" v-model="config.min_log_level">
<option value="0">{{ $t('config.log_level_0') }}</option>
<option value="1">{{ $t('config.log_level_1') }}</option>
<option value="2">{{ $t('config.log_level_2') }}</option>
<option value="3">{{ $t('config.log_level_3') }}</option>
<option value="4">{{ $t('config.log_level_4') }}</option>
<option value="5">{{ $t('config.log_level_5') }}</option>
<option value="6">{{ $t('config.log_level_6') }}</option>
<option value="0">{{ $t('config.min_log_level_0') }}</option>
<option value="1">{{ $t('config.min_log_level_1') }}</option>
<option value="2">{{ $t('config.min_log_level_2') }}</option>
<option value="3">{{ $t('config.min_log_level_3') }}</option>
<option value="4">{{ $t('config.min_log_level_4') }}</option>
<option value="5">{{ $t('config.min_log_level_5') }}</option>
<option value="6">{{ $t('config.min_log_level_6') }}</option>
</select>
<div class="form-text">{{ $t('config.log_level_desc') }}</div>
<div class="form-text">{{ $t('config.min_log_level_desc') }}</div>
</div>
<!-- Global Prep/State Commands -->
@@ -234,6 +236,14 @@ onMounted(() => {
v-model="config.notify_pre_releases"
default="false"
></Checkbox>
<!-- Enable system tray -->
<Checkbox class="mb-3"
id="system_tray"
locale-prefix="config"
v-model="config.system_tray"
default="true"
></Checkbox>
</div>
</template>

26
src_assets/common/assets/web/configs/tabs/Inputs.vue
View File

@@ -45,28 +45,28 @@ const config = ref(props.config)
<!-- Additional options based on gamepad type -->
<template v-if="config.controller === 'enabled'">
<template v-if="config.gamepad === 'ds4' || (config.gamepad === 'auto' && platform === 'windows')">
<template v-if="config.gamepad === 'ds4' || config.gamepad === 'ds5' || (config.gamepad === 'auto' && platform !== 'macos')">
<div class="mb-3 accordion">
<div class="accordion-item">
<h2 class="accordion-header">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseOne">
{{ $t(config.gamepad === 'ds4' ? 'config.gamepad_ds4_manual' : 'config.gamepad_auto') }}
{{ $t(config.gamepad === 'ds4' ? 'config.gamepad_ds4_manual' : (config.gamepad === 'ds5' ? 'config.gamepad_ds5_manual' : 'config.gamepad_auto')) }}
</button>
</h2>
<div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
aria-labelledby="panelsStayOpen-headingOne">
<div class="accordion-body">
<!-- Auto options (Windows only) -->
<template v-if="config.gamepad === 'auto'">
<!-- DS4 motion -->
<!-- Automatic detection options (for Windows and Linux) -->
<template v-if="config.gamepad === 'auto' && (platform === 'windows' || platform === 'linux')">
<!-- Gamepad with motion-capability as DS4(Windows)/DS5(Linux) -->
<Checkbox class="mb-3"
id="motion_as_ds4"
locale-prefix="config"
v-model="config.motion_as_ds4"
default="true"
></Checkbox>
<!-- DS4 touchpad -->
<!-- Gamepad with touch-capability as DS4(Windows)/DS5(Linux) -->
<Checkbox class="mb-3"
id="touchpad_as_ds4"
locale-prefix="config"
@@ -74,9 +74,8 @@ const config = ref(props.config)
default="true"
></Checkbox>
</template>
<!-- DS4 options (all platforms) -->
<template v-if="config.gamepad === 'ds4'">
<!-- DS4 back button as touchpad click -->
<!-- DS4 option: DS4 back button as touchpad click (on Automatic: Windows only) -->
<template v-if="config.gamepad === 'ds4' || (config.gamepad === 'auto' && platform === 'windows')">
<Checkbox class="mb-3"
id="ds4_back_as_touchpad_click"
locale-prefix="config"
@@ -84,6 +83,15 @@ const config = ref(props.config)
default="true"
></Checkbox>
</template>
<!-- DS5 Option: Controller MAC randomization (on Automatic: Linux only) -->
<template v-if="config.gamepad === 'ds5' || (config.gamepad === 'auto' && platform === 'linux')">
<Checkbox class="mb-3"
id="ds5_inputtino_randomize_mac"
locale-prefix="config"
v-model="config.ds5_inputtino_randomize_mac"
default="true"
></Checkbox>
</template>
</div>
</div>
</div>

6
src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
View File

@@ -68,7 +68,7 @@ function addRemappingEntry() {
<!-- Configuration option -->
<div class="mb-3">
<label for="dd_configuration_option" class="form-label">
{{ $t('config.dd_config_label') }}
{{ $t('config.dd_configuration_option') }}
</label>
<select id="dd_configuration_option" class="form-select" v-model="config.dd_configuration_option">
<option value="disabled">{{ $t('_common.disabled_def') }}</option>
@@ -97,7 +97,7 @@ function addRemappingEntry() {
<!-- Manual resolution -->
<div class="mt-2 ps-4" v-if="config.dd_resolution_option === 'manual'">
<div class="form-text">
{{ $t('config.dd_resolution_option_manual_desc') }}
{{ $t('config.dd_manual_resolution') }}
</div>
<input type="text" class="form-control" id="dd_manual_resolution" placeholder="2560x1440"
v-model="config.dd_manual_resolution" />
@@ -118,7 +118,7 @@ function addRemappingEntry() {
<!-- Manual refresh rate -->
<div class="mt-2 ps-4" v-if="config.dd_refresh_rate_option === 'manual'">
<div class="form-text">
{{ $t('config.dd_refresh_rate_option_manual_desc') }}
{{ $t('config.dd_manual_refresh_rate') }}
</div>
<input type="text" class="form-control" id="dd_manual_refresh_rate" placeholder="59.9558"
v-model="config.dd_manual_refresh_rate" />