MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 06:56:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Theme dropdown, correct inverted settings

Browse Source
This commit is contained in:
Natsumi
2024-08-13 20:25:09 +12:00
parent 65e5ef5bc6
commit a7cad54867
3 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+3 -2
View File
@@ -15682,11 +15682,12 @@ speechSynthesis.getVoices();
.matchMedia('(prefers-color-scheme: dark)') .matchMedia('(prefers-color-scheme: dark)')
.addEventListener('change', async () => { .addEventListener('change', async () => {
if ($app.themeMode === 'system') { if ($app.themeMode === 'system') {
await $app.saveThemeMode(); await $app.changeThemeMode();
} }
}); });
$app.methods.saveThemeMode = async function () { $app.methods.saveThemeMode = async function (newThemeMode) {
this.themeMode = newThemeMode;
await configRepository.setString('VRCX_ThemeMode', this.themeMode); await configRepository.setString('VRCX_ThemeMode', this.themeMode);
await this.changeThemeMode(); await this.changeThemeMode();
}; };
html/src/localization/en/en.json
+16 -16
View File
@@ -271,8 +271,8 @@
"theme_mode_material3": "Material 3", "theme_mode_material3": "Material 3",
"zoom": "Zoom", "zoom": "Zoom",
"vrcplus_profile_icons": "VRCPlus Profile Icons", "vrcplus_profile_icons": "VRCPlus Profile Icons",
"disable_tooltips": "Disable Tooltips", "tooltips": "Tooltips",
"disable_nicknames": "Disable Memo Nicknames", "nicknames": "Memo Nicknames",
"sort_favorite_by": "Sort Favorites by", "sort_favorite_by": "Sort Favorites by",
"sort_favorite_by_name": "name", "sort_favorite_by_name": "name",
"sort_favorite_by_date": "date", "sort_favorite_by_date": "date",
@@ -314,8 +314,8 @@
}, },
"user_dialog": { "user_dialog": {
"header": "User Dialog", "header": "User Dialog",
"hide_vrchat_notes": "Hide VRChat Notes", "vrchat_notes": "VRChat Notes",
"hide_vrcx_memos": "Hide VRCX Memos", "vrcx_memos": "VRCX Memos",
"export_vrcx_memos_into_vrchat_notes": "Export VRCX Memos into VRChat notes", "export_vrcx_memos_into_vrchat_notes": "Export VRCX Memos into VRChat notes",
"export_notes": "Export Notes" "export_notes": "Export Notes"
}, },
@@ -352,7 +352,7 @@
"desktop_notification_while_afk": "Desktop Notifications While AFK" "desktop_notification_while_afk": "Desktop Notifications While AFK"
}, },
"text_to_speech": { "text_to_speech": {
"header": "Text-To-Speech Options", "header": "Text-To-Speech",
"when_to_play": "Notification TTS. When to play", "when_to_play": "Notification TTS. When to play",
"when_to_play_never": "Never", "when_to_play_never": "Never",
"when_to_play_inside_vr": "Inside VR", "when_to_play_inside_vr": "Inside VR",
@@ -366,7 +366,7 @@
"wrist_overlay": { "wrist_overlay": {
"steamvr_wrist_overlay": { "steamvr_wrist_overlay": {
"header": "SteamVR Wrist Overlay", "header": "SteamVR Wrist Overlay",
"description": "* It runs automatically when VRChat is running.", "description": "* Runs automatically while VRChat is running.",
"grip": "Grip: Vive or Other Controllers Grab, Oculus X/A Buttons", "grip": "Grip: Vive or Other Controllers Grab, Oculus X/A Buttons",
"menu": "Menu: Vive Menu, Index B, Oculus Y/B Buttons", "menu": "Menu: Vive Menu, Index B, Oculus Y/B Buttons",
"steamvr_overlay": "SteamVR Overlay", "steamvr_overlay": "SteamVR Overlay",
@@ -379,12 +379,12 @@
"display_overlay_on": "Display Overlay On", "display_overlay_on": "Display Overlay On",
"display_overlay_on_left": "Left Hand", "display_overlay_on_left": "Left Hand",
"display_overlay_on_right": "Right Hand", "display_overlay_on_right": "Right Hand",
"display_overlay_on_both": "Both Hand", "display_overlay_on_both": "Both Hands",
"background_color": "Background Color", "grey_background": "Grey Background",
"minimal_feed_icons": "Minimal Feed Icons", "minimal_feed_icons": "Minimal Feed Icons",
"hide_vr_devices": "Hide VR Devices", "show_vr_devices": "Show VR Devices",
"show_cpu_usage": "Show CPU Usage", "show_cpu_usage": "Show CPU Usage",
"hide_game_uptime": "Hide Game Uptime", "show_game_uptime": "Show Game Uptime",
"show_pc_uptime": "Show PC Uptime", "show_pc_uptime": "Show PC Uptime",
"wrist_feed_filters": "Wrist Feed Filters" "wrist_feed_filters": "Wrist Feed Filters"
} }
@@ -392,13 +392,13 @@
"discord_presence": { "discord_presence": {
"discord_presence": { "discord_presence": {
"header": "Discord Presence", "header": "Discord Presence",
"description": "* Only works when VRChat is running.", "description": "* Only active while VRChat is running.",
"enable": "Enable", "enable": "Enable",
"enable_tooltip": "Recommended to disable Rich Presence in VRChat config.json to stop it from conflicting", "enable_tooltip": "Recommended to disable Rich Presence in VRChat config.json to stop it from conflicting",
"instance_type_player_count": "Instance type/player count", "instance_type_player_count": "Instance type/player count",
"join_button": "Join button (public only)", "join_button": "Join button (public only)",
"hide_details_in_private": "Hide world details in private", "show_details_in_private": "Show world details in private",
"hide_images": "Hide World Images" "show_images": "Show world images"
} }
}, },
"advanced": { "advanced": {
@@ -433,9 +433,9 @@
"header": "Automatically Manage Cache When Closing VRChat", "header": "Automatically Manage Cache When Closing VRChat",
"description": "Auto delete old versions from cache" "description": "Auto delete old versions from cache"
}, },
"disable_local_world_persistence": { "local_world_persistence": {
"header": "Disable Local World Persistence", "header": "Local World Persistence",
"description": "Disable localhost webserver (requires restart)" "description": "Localhost webserver (requires restart)"
}, },
"remote_database": { "remote_database": {
"header": "Remote Avatar Database", "header": "Remote Avatar Database",
html/src/mixins/tabs/settings.pug
+31 -28
View File
@@ -147,14 +147,17 @@ mixin settingsTab()
el-dropdown-item(v-for="(obj, language) in $i18n.messages" v-text="obj.language" @click.native="changeAppLanguage(language)") el-dropdown-item(v-for="(obj, language) in $i18n.messages" v-text="obj.language" @click.native="changeAppLanguage(language)")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.appearance.theme_mode') }} span.name {{ $t('view.settings.appearance.appearance.theme_mode') }}
el-radio-group(v-model="themeMode" size="mini" @change="saveThemeMode") el-dropdown(@click.native.stop trigger="click" size="small")
el-radio-button(label="system") {{ $t('view.settings.appearance.appearance.theme_mode_system') }} el-button(size="mini")
el-radio-button(label="light") {{ $t('view.settings.appearance.appearance.theme_mode_light') }} span {{ $t(`view.settings.appearance.appearance.theme_mode_${themeMode}`) }} #[i.el-icon-arrow-down.el-icon--right]
el-radio-button(label="dark") {{ $t('view.settings.appearance.appearance.theme_mode_dark') }} el-dropdown-menu(#default="dropdown")
el-radio-button(label="darkvanillaold") {{ $t('view.settings.appearance.appearance.theme_mode_darkvanillaold') }} el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_system')" @click.native="saveThemeMode('system')")
el-radio-button(label="darkvanilla") {{ $t('view.settings.appearance.appearance.theme_mode_darkvanilla') }} el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_light')" @click.native="saveThemeMode('light')")
el-radio-button(label="pink") {{ $t('view.settings.appearance.appearance.theme_mode_pink') }} el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_dark')" @click.native="saveThemeMode('dark')")
el-radio-button(label="material3") {{ $t('view.settings.appearance.appearance.theme_mode_material3') }} el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_darkvanillaold')" @click.native="saveThemeMode('darkvanillaold')")
el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_darkvanilla')" @click.native="saveThemeMode('darkvanilla')")
el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_pink')" @click.native="saveThemeMode('pink')")
el-dropdown-item(v-text="$t('view.settings.appearance.appearance.theme_mode_material3')" @click.native="saveThemeMode('material3')")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.appearance.zoom') }} span.name {{ $t('view.settings.appearance.appearance.zoom') }}
el-input-number(size="small" v-model="zoomLevel" @change="setZoomLevel" :precision="0" style="width:128px") el-input-number(size="small" v-model="zoomLevel" @change="setZoomLevel" :precision="0" style="width:128px")
@@ -162,11 +165,11 @@ mixin settingsTab()
span.name {{ $t('view.settings.appearance.appearance.vrcplus_profile_icons') }} span.name {{ $t('view.settings.appearance.appearance.vrcplus_profile_icons') }}
el-switch(v-model="displayVRCPlusIconsAsAvatar" @change="saveOpenVROption") el-switch(v-model="displayVRCPlusIconsAsAvatar" @change="saveOpenVROption")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.appearance.disable_nicknames') }} span.name {{ $t('view.settings.appearance.appearance.nicknames') }}
el-switch(v-model="hideNicknames" @change="saveOpenVROption") el-switch(v-model="hideNicknames" :active-value="false" :inactive-value="true" @change="saveOpenVROption")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.appearance.disable_tooltips') }} span.name {{ $t('view.settings.appearance.appearance.tooltips') }}
el-switch(v-model="hideTooltips" @change="saveOpenVROption") el-switch(v-model="hideTooltips" :active-value="false" :inactive-value="true" @change="saveOpenVROption")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.appearance.sort_favorite_by') }} span.name {{ $t('view.settings.appearance.appearance.sort_favorite_by') }}
el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption") el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
@@ -224,11 +227,11 @@ mixin settingsTab()
div.options-container div.options-container
span.header {{ $t('view.settings.appearance.user_dialog.header') }} span.header {{ $t('view.settings.appearance.user_dialog.header') }}
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.user_dialog.hide_vrchat_notes') }} span.name {{ $t('view.settings.appearance.user_dialog.vrchat_notes') }}
el-switch(v-model="hideUserNotes" @change="saveUserDialogOption") el-switch(v-model="hideUserNotes" :active-value="false" :inactive-value="true" @change="saveUserDialogOption")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.user_dialog.hide_vrcx_memos') }} span.name {{ $t('view.settings.appearance.user_dialog.vrcx_memos') }}
el-switch(v-model="hideUserMemos" @change="saveUserDialogOption") el-switch(v-model="hideUserMemos" :active-value="false" :inactive-value="true" @change="saveUserDialogOption")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.appearance.user_dialog.export_vrcx_memos_into_vrchat_notes') }} span.name {{ $t('view.settings.appearance.user_dialog.export_vrcx_memos_into_vrchat_notes') }}
br br
@@ -366,20 +369,20 @@ mixin settingsTab()
el-radio-button(label="2") {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_right') }} el-radio-button(label="2") {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_right') }}
el-radio-button(label="0") {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_both') }} el-radio-button(label="0") {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_both') }}
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.background_color') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.grey_background') }}
el-switch(v-model="vrBackgroundEnabled" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="vrBackgroundEnabled" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.minimal_feed_icons') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.minimal_feed_icons') }}
el-switch(v-model="minimalFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="minimalFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.hide_vr_devices') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_vr_devices') }}
el-switch(v-model="hideDevicesFromFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="hideDevicesFromFeed" @change="saveOpenVROption" :active-value="false" :inactive-value="true" :disabled="!openVR || !overlayWrist")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_cpu_usage') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_cpu_usage') }}
el-switch(v-model="vrOverlayCpuUsage" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="vrOverlayCpuUsage" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.hide_game_uptime') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_game_uptime') }}
el-switch(v-model="hideUptimeFromFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="hideUptimeFromFeed" @change="saveOpenVROption" :active-value="false" :inactive-value="true" :disabled="!openVR || !overlayWrist")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_pc_uptime') }} span.name {{ $t('view.settings.wrist_overlay.steamvr_wrist_overlay.show_pc_uptime') }}
el-switch(v-model="pcUptimeOnFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist") el-switch(v-model="pcUptimeOnFeed" @change="saveOpenVROption" :disabled="!openVR || !overlayWrist")
@@ -398,14 +401,14 @@ mixin settingsTab()
span.name {{ $t('view.settings.discord_presence.discord_presence.instance_type_player_count') }} span.name {{ $t('view.settings.discord_presence.discord_presence.instance_type_player_count') }}
el-switch(v-model="discordInstance" @change="saveDiscordOption" :disabled="!discordActive") el-switch(v-model="discordInstance" @change="saveDiscordOption" :disabled="!discordActive")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.discord_presence.discord_presence.hide_details_in_private') }} span.name {{ $t('view.settings.discord_presence.discord_presence.show_details_in_private') }}
el-switch(v-model="discordHideInvite" @change="saveDiscordOption" :disabled="!discordActive") el-switch(v-model="discordHideInvite" @change="saveDiscordOption" :active-value="false" :inactive-value="true" :disabled="!discordActive")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.discord_presence.discord_presence.join_button') }} span.name {{ $t('view.settings.discord_presence.discord_presence.join_button') }}
el-switch(v-model="discordJoinButton" @change="saveDiscordOption" :disabled="!discordActive") el-switch(v-model="discordJoinButton" @change="saveDiscordOption" :disabled="!discordActive")
div.options-container-item div.options-container-item
span.name {{ $t('view.settings.discord_presence.discord_presence.hide_images') }} span.name {{ $t('view.settings.discord_presence.discord_presence.show_images') }}
el-switch(v-model="discordHideImage" @change="saveDiscordOption" :disabled="!discordActive") el-switch(v-model="discordHideImage" @change="saveDiscordOption" :active-value="false" :inactive-value="true" :disabled="!discordActive")
//- "Advanced" Tab //- "Advanced" Tab
el-tab-pane(:label="$t('view.settings.category.advanced')") el-tab-pane(:label="$t('view.settings.category.advanced')")
//- Advanced | Advanced //- Advanced | Advanced
@@ -455,10 +458,10 @@ mixin settingsTab()
span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.auto_cache_management.description') }} span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.auto_cache_management.description') }}
el-switch(v-model="autoSweepVRChatCache" @change="saveOpenVROption") el-switch(v-model="autoSweepVRChatCache" @change="saveOpenVROption")
//- Advanced | Disable local world database //- Advanced | Disable local world database
span.sub-header {{ $t('view.settings.advanced.advanced.disable_local_world_persistence.header') }} span.sub-header {{ $t('view.settings.advanced.advanced.local_world_persistence.header') }}
div.options-container-item div.options-container-item
span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.disable_local_world_persistence.description') }} span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.local_world_persistence.description') }}
el-switch(v-model="disableWorldDatabase" @change="saveVRCXWindowOption") el-switch(v-model="disableWorldDatabase" :active-value="false" :inactive-value="true" @change="saveVRCXWindowOption")
//- Advanced | Remote Avatar Database //- Advanced | Remote Avatar Database
div.options-container div.options-container
span.header {{ $t('view.settings.advanced.advanced.remote_database.header') }} span.header {{ $t('view.settings.advanced.advanced.remote_database.header') }}