MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small changes

Browse Source
This commit is contained in:
Natsumi
2021-07-20 05:29:54 +12:00
parent 779d96d2a8
commit a6f5fbc276
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/src/app.js
View File

@@ -4428,18 +4428,16 @@ speechSynthesis.getVoices();
$app.methods.playNoty = function (notyFeed) { $app.methods.playNoty = function (notyFeed) {
var playNotificationTTS = false; var playNotificationTTS = false;
if ((this.notificationTTS === 'Always') || if ((this.notificationTTS === 'Always') ||
((this.notificationTTS === 'Outside VR') && ((this.isGameNoVR) || (!this.isGameRunning))) ||
((this.notificationTTS === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) || ((this.notificationTTS === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) ||
((this.notificationTTS === 'Game Closed') && (!this.isGameRunning)) || ((this.notificationTTS === 'Game Closed') && (!this.isGameRunning)) ||
((this.notificationTTS === 'Desktop Mode') && (this.isGameNoVR) && (this.isGameRunning))) { ((this.notificationTTS === 'Game Running') && (this.isGameRunning))) {
playNotificationTTS = true; playNotificationTTS = true;
} }
var playDesktopToast = false; var playDesktopToast = false;
if ((this.desktopToast === 'Always') || if ((this.desktopToast === 'Always') ||
((this.desktopToast === 'Outside VR') && ((this.isGameNoVR) || (!this.isGameRunning))) ||
((this.desktopToast === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) || ((this.desktopToast === 'Inside VR') && (!this.isGameNoVR) && (this.isGameRunning)) ||
((this.desktopToast === 'Game Closed') && (!this.isGameRunning)) || ((this.desktopToast === 'Game Closed') && (!this.isGameRunning)) ||
((this.desktopToast === 'Desktop Mode') && (this.isGameNoVR) && (this.isGameRunning))) { ((this.desktopToast === 'Game Running') && (this.isGameRunning))) {
playDesktopToast = true; playDesktopToast = true;
} }
var playXSNotification = false; var playXSNotification = false;

14
html/src/index.pug
View File

@@ -678,9 +678,6 @@ html
div.options-container-item div.options-container-item
span.name Disable Tooltips span.name Disable Tooltips
el-switch(v-model="hideTooltips") el-switch(v-model="hideTooltips")
div.options-container-item
span.name Use a Primary Password
el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
div.options-container div.options-container
span.header Side Panel span.header Side Panel
br br
@@ -803,10 +800,9 @@ html
br br
el-radio-group(v-model="desktopToast" size="mini") el-radio-group(v-model="desktopToast" size="mini")
el-radio-button(label="Never") el-radio-button(label="Never")
el-radio-button(label="Desktop Mode")
el-radio-button(label="Outside VR")
el-radio-button(label="Inside VR") el-radio-button(label="Inside VR")
el-radio-button(label="Game Closed") el-radio-button(label="Game Closed")
el-radio-button(label="Game Running")
el-radio-button(label="Always") el-radio-button(label="Always")
div.options-container-item div.options-container-item
el-button(size="small" icon="el-icon-chat-square" @click="showNotyFeedFiltersDialog()") Notification Filters el-button(size="small" icon="el-icon-chat-square" @click="showNotyFeedFiltersDialog()") Notification Filters
@@ -817,10 +813,9 @@ html
br br
el-radio-group(v-model="notificationTTS" size="mini") el-radio-group(v-model="notificationTTS" size="mini")
el-radio-button(label="Never") el-radio-button(label="Never")
el-radio-button(label="Desktop Mode")
el-radio-button(label="Outside VR")
el-radio-button(label="Inside VR") el-radio-button(label="Inside VR")
el-radio-button(label="Game Closed") el-radio-button(label="Game Closed")
el-radio-button(label="Game Running")
el-radio-button(label="Always") el-radio-button(label="Always")
div.options-container-item div.options-container-item
span.name TTS Voice span.name TTS Voice
@@ -864,6 +859,9 @@ html
el-switch(v-model="autoSweepVRChatCache") el-switch(v-model="autoSweepVRChatCache")
div.options-container div.options-container
span.header Application span.header Application
div.options-container-item
span.name Use a Primary Password
el-switch(v-model="enablePrimaryPassword" @change="enablePrimaryPasswordChange" :disabled="!loginForm.savedCredentials[API.currentUser.username]")
div.options-container-item div.options-container-item
span.name Start at Windows startup span.name Start at Windows startup
el-switch(v-model="isStartAtWindowsStartup") el-switch(v-model="isStartAtWindowsStartup")
@@ -1617,7 +1615,7 @@ html
el-dialog.x-dialog(ref="launchOptionsDialog" :visible.sync="launchOptionsDialog.visible" title="Launch Options" width="400px") el-dialog.x-dialog(ref="launchOptionsDialog" :visible.sync="launchOptionsDialog.visible" title="Launch Options" width="400px")
div(style='font-size:12px;') div(style='font-size:12px;')
| These options are for advanced users only. #[br] | These options are for advanced users only. #[br]
| to change fps: --fps=<N> ex) #[el-tag(size="mini") --fps=144] | to change fps: --fps=<N> e.g.) #[el-tag(size="mini") --fps=144]
el-input(type="textarea" v-model="launchOptionsDialog.arguments" size="mini" show-word-limit :autosize="{ minRows:2, maxRows:5 }" placeholder="" style="margin-top:10px") el-input(type="textarea" v-model="launchOptionsDialog.arguments" size="mini" show-word-limit :autosize="{ minRows:2, maxRows:5 }" placeholder="" style="margin-top:10px")
template(#footer) template(#footer)
div(style="display:flex") div(style="display:flex")