diff --git a/html/src/app.js b/html/src/app.js index ec199437..f3f5f37f 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -16163,6 +16163,22 @@ speechSynthesis.getVoices(); this.VRChatConfigFile.screenshot_res_width = res.width; }; + $app.methods.getVRChatSpoutResolution = function () { + if ( + this.VRChatConfigFile.camera_spout_res_height && + this.VRChatConfigFile.camera_spout_res_width + ) { + var res = `${this.VRChatConfigFile.camera_spout_res_width}x${this.VRChatConfigFile.camera_spout_res_height}`; + return this.getVRChatResolution(res); + } + return '1920x1080 (1080p)'; + }; + + $app.methods.setVRChatSpoutResolution = function (res) { + this.VRChatConfigFile.camera_spout_res_height = res.height; + this.VRChatConfigFile.camera_spout_res_width = res.width; + }; + // Auto Launch Shortcuts $app.methods.openShortcutFolder = function () { diff --git a/html/src/localization/en/en.json b/html/src/localization/en/en.json index 916ba9c1..7a87bf9d 100644 --- a/html/src/localization/en/en.json +++ b/html/src/localization/en/en.json @@ -1056,6 +1056,7 @@ "picture_directory": "Custom Picture Folder Location", "fpv_steadycam_fov": "First-Person Steadycam FOV", "camera_resolution": "Camera Resolution", + "spout_resolution": "Spout Resolution", "screenshot_resolution": "Screenshot Resolution", "picture_sort_by_date": "Sort pictures into folders by date", "disable_discord_presence": "Disable Discord Rich Presence", diff --git a/html/src/mixins/dialogs/settings.pug b/html/src/mixins/dialogs/settings.pug index 3d72a194..6c49ada0 100644 --- a/html/src/mixins/dialogs/settings.pug +++ b/html/src/mixins/dialogs/settings.pug @@ -31,7 +31,17 @@ mixin settings() span #[span(v-text="getVRChatCameraResolution()")] #[i.el-icon-arrow-down.el-icon--right] el-dropdown-menu(#default="dropdown") el-dropdown-item(v-for="row in VRChatCameraResolutions" :key="row.index" v-text="row.name" :command="row") - div(style="display:inline-block;margin-top:10px;margin-left:10px") + br + div(style="display:inline-block;margin-top:10px") + span {{ $t('dialog.config_json.spout_resolution') }} + br + el-dropdown(@command="(command) => setVRChatSpoutResolution(command)" size="small" trigger="click" style="margin-top:5px") + el-button(size="small") + span #[span(v-text="getVRChatSpoutResolution()")] #[i.el-icon-arrow-down.el-icon--right] + el-dropdown-menu(#default="dropdown") + el-dropdown-item(v-for="row in VRChatScreenshotResolutions" :key="row.index" v-text="row.name" :command="row") + br + div(style="display:inline-block;margin-top:10px") span {{ $t('dialog.config_json.screenshot_resolution') }} br el-dropdown(@command="(command) => setVRChatScreenshotResolution(command)" size="small" trigger="click" style="margin-top:5px") diff --git a/html/src/mixins/tabs/notifications.pug b/html/src/mixins/tabs/notifications.pug index f51073e3..1fd10ffc 100644 --- a/html/src/mixins/tabs/notifications.pug +++ b/html/src/mixins/tabs/notifications.pug @@ -24,9 +24,8 @@ mixin notificationsTab() template(#content) location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName" :grouphint="scope.row.groupName" :link="false") span.x-link(v-text="scope.row.type" @click="showWorldDialog(scope.row.location)") - template(v-else-if="scope.row.link") - el-tooltip(placement="top" :content="scope.row.linkText" :disabled="hideTooltips") - span.x-link(v-text="scope.row.type" @click="openNotificationLink(scope.row.link)") + el-tooltip(v-else-if="scope.row.link" placement="top" :content="scope.row.linkText" :disabled="hideTooltips") + span.x-link(v-text="scope.row.type" @click="openNotificationLink(scope.row.link)") span(v-else v-text="scope.row.type") el-table-column(:label="$t('table.notification.user_group')" prop="senderUsername" width="150") template(v-once #default="scope")