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

Fix build

Browse Source 
(Never wanna merge again)
This commit is contained in:
Yukino Song
2025-01-15 09:01:33 +08:00
parent 1dc6465f12
commit fcbdaed1e0
12 changed files with 93 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src_assets/common/assets/web/apps.html
View File

@@ -273,12 +273,13 @@
default="true"
></Checkbox>
<!-- use virtual display -->
<div class="mb-3 form-check" v-if="platform === 'windows'">
<label for="virtualDisplay" class="form-check-label">{{ $t('apps.virtual_display') }}</label>
<input type="checkbox" class="form-check-input" id="virtualDisplay" v-model="editForm['virtual-display']"
true-value="true" false-value="false" />
<div class="form-text">{{ $t('apps.virtual_display_desc') }}</div>
</div>
<Checkbox class="mb-3"
id="virtualDisplay"
label="apps.virtual_display"
desc="apps.virtual_display_desc"
v-model="editForm['exclude-global-prep-cmd']"
default="false"
></Checkbox>
<!-- set virtual display to primary -->
<div class="mb-3 form-check" v-if="platform === 'windows' && editForm['virtual-display'] == 'true'">
<label for="virtualDisplayPrimary" class="form-check-label">{{ $t('apps.virtual_display_primary') }}</label>
@@ -399,7 +400,6 @@
import { initApp } from './init'
import Navbar from './Navbar.vue'
import Checkbox from './Checkbox.vue'
import PlatformLayout from './PlatformLayout.vue'
import { Dropdown } from 'bootstrap/dist/js/bootstrap'
const newApp = {

14
src_assets/common/assets/web/config.html
View File

@@ -37,6 +37,7 @@
<general
v-if="currentTab === 'general'"
:config="config"
:global-prep-cmd="global_prep_cmd"
:server-cmd="server_cmd"
:platform="platform">
</general>
@@ -135,6 +136,7 @@
config: null,
currentTab: "general",
vdisplayStatus: "1",
global_prep_cmd: [],
server_cmd: [],
tabs: [ // TODO: Move the options to each Component instead, encapsulate.
{
@@ -144,8 +146,8 @@
"locale": "en",
"sunshine_name": "",
"min_log_level": 2,
"global_prep_cmd": "[]",
"server_cmd": "[]",
"global_prep_cmd": [],
"server_cmd": [],
"notify_pre_releases": "disabled",
},
},
@@ -362,7 +364,7 @@
this.config.global_prep_cmd = this.config.global_prep_cmd || [];
this.config.server_cmd = this.config.server_cmd || [];
this.global_prep_cmd = JSON.parse(this.config.global_prep_cmd);
this.global_prep_cmd = this.config.global_prep_cmd;
this.server_cmd = JSON.parse(this.config.server_cmd);
});
},
@@ -371,9 +373,6 @@
this.$forceUpdate()
},
serialize() {
this.config.global_prep_cmd = JSON.stringify(this.global_prep_cmd.filter(cmd => cmd.do || cmd.undo));
this.config.server_cmd = JSON.stringify(this.server_cmd.filter(cmd => cmd.name && cmd.cmd));
// Validate fallback mode
if (this.config.fallback_mode && !this.config.fallback_mode.match(/^\d+x\d+x\d+$/)) {
this.config.fallback_mode = fallbackDisplayModeCache;
@@ -381,8 +380,9 @@
fallbackDisplayModeCache = this.config.fallback_mode;
}
let config = JSON.parse(JSON.stringify(this.config));
config.global_prep_cmd = JSON.stringify(config.global_prep_cmd);
config.global_prep_cmd = JSON.stringify(this.global_prep_cmd.filter(cmd => cmd.do || cmd.undo));
config.dd_mode_remapping = JSON.stringify(config.dd_mode_remapping);
config.server_cmd = JSON.stringify(this.server_cmd.filter(cmd => cmd.name && cmd.cmd));
return config;
},
save() {

22
src_assets/common/assets/web/configs/tabs/AudioVideo.vue
View File

@@ -84,17 +84,19 @@ const validateFallbackMode = (event) => {
default="true"
></Checkbox>
<div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="keep_sink_default" v-model="config.keep_sink_default" true-value="enabled" false-value="disabled"/>
<label for="keep_sink_default" class="form-check-label">{{ $t('config.keep_sink_default') }}</label>
<div class="form-text pre-wrap">{{ $t('config.keep_sink_default_desc') }}</div>
</div>
<Checkbox class="mb-3"
id="keep_sink_default"
locale-prefix="config"
v-model="config.keep_sink_default"
default="true"
></Checkbox>
<div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="auto_capture_sink" v-model="config.auto_capture_sink" true-value="enabled" false-value="disabled"/>
<label for="auto_capture_sink" class="form-check-label">{{ $t('config.auto_capture_sink') }}</label>
<div class="form-text pre-wrap">{{ $t('config.auto_capture_sink_desc') }}</div>
</div>
<Checkbox class="mb-3"
id="auto_capture_sink"
locale-prefix="config"
v-model="config.auto_capture_sink"
default="true"
></Checkbox>
</template>
</PlatformLayout>

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

@@ -99,7 +99,7 @@ onMounted(() => {
<div id="global_prep_cmd" class="mb-3 d-flex flex-column">
<label class="form-label">{{ $t('config.global_prep_cmd') }}</label>
<div class="form-text">{{ $t('config.global_prep_cmd_desc') }}</div>
<table class="table" v-if="config.global_prep_cmd.length > 0">
<table class="table" v-if="globalPrepCmd.length > 0">
<thead>
<tr>
<th scope="col"><i class="fas fa-play"></i> {{ $t('_common.do_cmd') }}</th>
@@ -111,7 +111,7 @@ onMounted(() => {
</tr>
</thead>
<tbody>
<tr v-for="(c, i) in config.global_prep_cmd">
<tr v-for="(c, i) in globalPrepCmd">
<td>
<input type="text" class="form-control monospace" v-model="c.do" />
</td>
@@ -191,18 +191,20 @@ onMounted(() => {
</div>
<!-- Enable Pairing -->
<div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="enable_pairing" v-model="config.enable_pairing" true-value="enabled" false-value="disabled"/>
<label for="enable_pairing" class="form-check-label">{{ $t('config.enable_pairing') }}</label>
<div class="form-text">{{ $t('config.enable_pairing_desc') }}</div>
</div>
<Checkbox class="mb-3"
id="enable_pairing"
locale-prefix="config"
v-model="config.enable_pairing"
default="true"
></Checkbox>
<!-- Hide Tray Controls -->
<div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="hide_tray_controls" v-model="config.hide_tray_controls" true-value="enabled" false-value="disabled"/>
<label for="hide_tray_controls" class="form-check-label">{{ $t('config.hide_tray_controls') }}</label>
<div class="form-text">{{ $t('config.hide_tray_controls_desc') }}</div>
</div>
<Checkbox class="mb-3"
id="hide_tray_controls"
locale-prefix="config"
v-model="config.hide_tray_controls"
default="false"
></Checkbox>
<!-- Notify Pre-Releases -->
<Checkbox class="mb-3"

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

@@ -55,7 +55,7 @@ function addRemappingEntry() {
<h2 class="accordion-header">
<button class="accordion-button" type="button" data-bs-toggle="collapse"
data-bs-target="#panelsStayOpen-collapseOne">
{{ $t('config.dd_options_header') }}
{{ $t('config.dd_options_header') }} {{ $t('dd_options_header_vdd_na') }}
</button>
</h2>
<div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"

3
src_assets/common/assets/web/public/assets/locale/en.json
View File

@@ -92,7 +92,7 @@
"virtual_display": "Always use Virtual Display",
"virtual_display_desc": "Always use virtual display on this app, overriding client request. Please make sure the SudoVDA driver is installed and enabled.",
"virtual_display_primary": "Enforce Virtual Display Primary",
"virtual_display_primary_desc": "Automatically set the virtual display as primary display when the app starts. Virtual display will always be set to primary when client requests to use virtual display. (Recommended to keep on)",
"virtual_display_primary_desc": "Automatically set the virtual display as primary display when the app starts. Virtual display will always be set to primary when client requests to use virtual display. (Recommended to keep on) [Broken on Windows 11 24H2]",
"resolution_scale_factor": "Resolution Scale Factor",
"resolution_scale_factor_desc": "Scale the client requested resolution based on this factor. e.g. 2000x1000 with a factor of 120% will become 2400x1200. Overrides client requested factor when the number isn't 100%. This option won't affect client requested streaming resolution.",
"use_app_identity": "Use App Identity",
@@ -201,6 +201,7 @@
"dd_mode_remapping_requested_fps": "Requested FPS",
"dd_mode_remapping_requested_resolution": "Requested resolution",
"dd_options_header": "Advanced display device options",
"dd_options_header_vdd_na": "(Does not work with Virtual Display)",
"dd_refresh_rate_option": "Refresh rate",
"dd_refresh_rate_option_auto": "Use FPS value provided by the client (default)",
"dd_refresh_rate_option_disabled": "Do not change refresh rate",

3
src_assets/common/assets/web/public/assets/locale/zh.json
View File

@@ -90,7 +90,7 @@
"virtual_display": "总是使用虚拟显示器",
"virtual_display_desc": "在使用这个 App 的时候总是使用虚拟显示器，覆盖客户端请求。请确保 SudoVDA 虚拟显示器驱动已安装并启用。",
"virtual_display_primary": "强制设置虚拟显示器为主显示器",
"virtual_display_primary_desc": "在 App 启动时强制将虚拟显示器设为主显示器。当客户端请求使用虚拟显示器时将无条件设为主显示器。（覆盖全局设置，推荐保持开启）",
"virtual_display_primary_desc": "在 App 启动时强制将虚拟显示器设为主显示器。当客户端请求使用虚拟显示器时将无条件设为主显示器。（覆盖全局设置，推荐保持开启）[Windows 11 24H2 不可用]",
"resolution_scale_factor": "分辨率缩放比例",
"resolution_scale_factor_desc": "基于此比例缩放客户端请求的分辨率。例如 2000x1000 缩放 120% 将变成 2400x1200。当此项为非 100% 时覆盖客户端请求的缩放比例。此选项不会影响客户端请求的串流分辨率。",
"use_app_identity": "使用 App 身份",
@@ -198,6 +198,7 @@
"dd_mode_remapping_requested_fps": "请求FPS",
"dd_mode_remapping_requested_resolution": "请求的决议",
"dd_options_header": "高级显示设备选项",
"dd_options_header_vdd_na": "（使用虚拟显示器时不可用）",
"dd_refresh_rate_option": "刷新率",
"dd_refresh_rate_option_auto": "使用客户端提供的 FPS 值 (默认)",
"dd_refresh_rate_option_disabled": "不要改变刷新率",