Remove show-only-ui toggle and viewThemeOnly logic

main
Warinyourself 3 weeks ago
parent fce3ceef16
commit 43d934cd15

@ -22,7 +22,7 @@ export default defineComponent({
{buildBodyClassSwitch('blur')}
{buildBodyClassSwitch('show-framerate')}
{buildBodyClassSwitch('no-transition')}
{buildBodyClassSwitch('only-ui')}
<AppSwitch
label={t('settings.hotkeys')}
modelValue={appStore.hotkeysEnabled}

@ -1,4 +1,4 @@
import { defineComponent, computed } from 'vue'
import { defineComponent } from 'vue'
import { useI18n } from 'vue-i18n'
import { useAppStore } from '@/store/app'
import { useRouter, useRoute } from 'vue-router'
@ -16,8 +16,6 @@ export default defineComponent({
const router = useRouter()
const route = useRoute()
const isViewThemeOnly = computed(() => appStore.viewThemeOnly)
const resetSettings = () => {
localStorage.clear()
appStore.setUpSettings()
@ -31,7 +29,7 @@ export default defineComponent({
<div class="user-settings-general">
<SettingsCheckboxes />
<SettingsSelectors />
{!isViewThemeOnly.value && <SettingsUsers />}
<SettingsUsers />
{appStore.hotkeysEnabled && <SettingsHotkeys />}
<div class="help-block">
<AppButton onClick={resetSettings}>

@ -18,8 +18,6 @@ export default defineComponent({
const pageStore = usePageStore()
const { t, locale } = useI18n()
const isViewThemeOnly = computed(() => appStore.viewThemeOnly)
const languageList = computed(() =>
pageStore.languages.map((lang) => ({ text: languageMap[lang] || lang, value: lang }))
)
@ -52,15 +50,13 @@ export default defineComponent({
modelValue={pageStore.language}
onUpdate:modelValue={changeLanguage}
/>
{!isViewThemeOnly.value && (
<AppButtonGroup
block
label={t('settings.choice-desktop')}
items={generateDesktopIcons()}
modelValue={appStore.currentDesktop?.key}
onUpdate:modelValue={changeDesktop}
/>
)}
<AppButtonGroup
block
label={t('settings.choice-desktop')}
items={generateDesktopIcons()}
modelValue={appStore.currentDesktop?.key}
onUpdate:modelValue={changeDesktop}
/>
</div>
)
}

@ -53,7 +53,6 @@
"blur": "Unschärfe",
"no-transition": "Animationen deaktivieren",
"show-framerate": "Bildrate anzeigen",
"only-ui": "Nur Oberfläche anzeigen",
"performance": "Leistung",
"choice-desktop": "Desktop-Umgebung",
"choice-language": "Sprache auswählen",

@ -53,7 +53,6 @@
"blur": "Blur",
"no-transition": "Disable animations",
"show-framerate": "Show framerate",
"only-ui": "Show only ui",
"performance": "performance",
"choice-desktop": "Choice desktop",
"choice-language": "Choice language",

@ -53,7 +53,6 @@
"blur": "Desenfoque",
"no-transition": "Desactivar animaciones",
"show-framerate": "Mostrar tasa de fotogramas",
"only-ui": "Mostrar solo la interfaz",
"performance": "rendimiento",
"choice-desktop": "Entorno de escritorio",
"choice-language": "Idioma",

@ -53,7 +53,6 @@
"blur": "Flou",
"no-transition": "Désactiver les animations",
"show-framerate": "Afficher le taux de rafraîchissement",
"only-ui": "Afficher uniquement l'interface",
"performance": "performance",
"choice-desktop": "Environnement de bureau",
"choice-language": "Langue",

@ -53,7 +53,6 @@
"blur": "Размытие",
"no-transition": "Отключить анимацию",
"show-framerate": "Показывать частоту кадров",
"only-ui": "Показывать только настройки",
"performance": "производительность",
"choice-desktop": "Окружение рабочего стола",
"choice-language": "Выбор языка",

@ -30,11 +30,9 @@ export const useAppStore = defineStore('app', () => {
blur: true,
'no-transition': false,
'show-framerate': false,
'only-ui': false
})
const showFrameRate = computed(() => bodyClass['show-framerate'])
const viewThemeOnly = computed(() => bodyClass['only-ui'])
const currentUser = computed(() => users.value.find((user) => user.username === username.value))
const currentDesktop = computed(() => desktops.value.find(({ key }) => key === desktop.value))
@ -123,7 +121,6 @@ export const useAppStore = defineStore('app', () => {
timeFormat,
bodyClass,
showFrameRate,
viewThemeOnly,
currentUser,
currentDesktop,
getMainSettings,

@ -16,7 +16,6 @@ export const usePageStore = defineStore('page', () => {
{
id: 'login',
closeBeforeMount: ['settings'],
mayOpen: () => !useAppStore().viewThemeOnly
},
{
id: 'settings',

@ -55,10 +55,10 @@ export default defineComponent({
return () => {
const showFrameRate = appStore.showFrameRate
const isOpenLogin = pageStore.isOpenBlock('login') && !appStore.viewThemeOnly
const isOpenLogin = pageStore.isOpenBlock('login')
const isOpenSettings = pageStore.isOpenBlock('settings')
const hasActiveBlock = !!pageStore.activeBlock
const showShutdownButton = !appStore.viewThemeOnly && hasActiveBlock
const showShutdownButton = hasActiveBlock
const showGithubButton = appStore.isGithubMode && hasActiveBlock
return (

Loading…
Cancel
Save