From cd8b28be986e7d643f285870e3a9aefc5aede5d1 Mon Sep 17 00:00:00 2001 From: pa Date: Tue, 23 Sep 2025 02:58:17 +0900 Subject: [PATCH] refactor: split discord & picture settings into their own components --- src/views/Settings/Settings.vue | 267 +----------------- .../Settings/components/DiscordSettings.vue | 110 ++++++++ .../Settings/components/PictureSettings.vue | 166 +++++++++++ 3 files changed, 285 insertions(+), 258 deletions(-) create mode 100644 src/views/Settings/components/DiscordSettings.vue create mode 100644 src/views/Settings/components/PictureSettings.vue diff --git a/src/views/Settings/Settings.vue b/src/views/Settings/Settings.vue index f76ec50c..33c232bf 100644 --- a/src/views/Settings/Settings.vue +++ b/src/views/Settings/Settings.vue @@ -1172,218 +1172,12 @@ -
- {{ t('view.settings.discord_presence.discord_presence.header') }} -
- {{ t('view.settings.discord_presence.discord_presence.description') }} -
-
- {{ t('view.settings.discord_presence.discord_presence.enable_tooltip') }} -
-
- - - - - - - - -
+
- -
- {{ t('view.settings.category.pictures') }} -
- {{ - t('view.settings.advanced.advanced.screenshot_metadata') - }} - -
-
- - -
- {{ t('view.tools.pictures.pictures.open_folder') }} -
- - {{ - t('view.tools.pictures.pictures.vrc_photos') - }} - {{ - t('view.tools.pictures.pictures.steam_screenshots') - }} - -
-
- - -
- {{ t('view.settings.advanced.advanced.screenshot_helper.header') }} -
- {{ - t('view.settings.advanced.advanced.screenshot_helper.description') - }} -
- - - - {{ - t('view.settings.advanced.advanced.delete_all_screenshot_metadata.button') - }} -
- -
- {{ t('view.settings.pictures.pictures.auto_delete_old_prints') }} - -
- - -
- {{ t('view.settings.advanced.advanced.user_generated_content.header') }} -
-
- {{ - t('view.settings.advanced.advanced.user_generated_content.description') - }} -
- {{ - t('view.settings.advanced.advanced.user_generated_content.folder') - }} - {{ - t('view.settings.advanced.advanced.user_generated_content.set_folder') - }} - {{ - t('view.settings.advanced.advanced.user_generated_content.reset_override') - }} -
-
-
- {{ - t('view.settings.advanced.advanced.save_instance_prints_to_file.header') - }} - - - - - -
- {{ - t('view.settings.advanced.advanced.save_instance_stickers_to_file.header') - }} - -
- {{ t('view.settings.advanced.advanced.save_instance_emoji_to_file.header') }} - - - - - -
+
@@ -1597,9 +1391,7 @@ > - +
{{ t('view.settings.advanced.advanced.cache_debug.header') }} @@ -1753,6 +1545,9 @@ +
@@ -1764,8 +1559,6 @@ ArrowRight, Upload, Folder, - Delete, - FolderOpened, User, Tickets, Refresh, @@ -1774,7 +1567,6 @@ Document, Connection, ChatSquare, - Picture, CaretRight, DeleteFilled, Timer, @@ -1797,7 +1589,6 @@ useVRCXUpdaterStore, useNotificationsSettingsStore, useWristOverlaySettingsStore, - useDiscordPresenceSettingsStore, useAdvancedSettingsStore, useFriendStore, useAvatarProviderStore, @@ -1825,6 +1616,8 @@ import { THEME_CONFIG } from '../../shared/constants'; import SimpleSwitch from './components/SimpleSwitch.vue'; + import DiscordSettings from './components/DiscordSettings.vue'; + import PictureSettings from './components/PictureSettings.vue'; const OpenSourceSoftwareNoticeDialog = defineAsyncComponent( () => import('./dialogs/OpenSourceSoftwareNoticeDialog.vue') @@ -1848,28 +1641,7 @@ const { cachedGroups } = useGroupStore(); const { cachedAvatars, cachedAvatarNames } = useAvatarStore(); const { showConsole } = useVrcxStore(); - const { - discordActive, - discordInstance, - discordHideInvite, - discordJoinButton, - discordHideImage, - discordShowPlatform, - discordWorldIntegration, - discordWorldNameAsDiscordStatus - } = storeToRefs(useDiscordPresenceSettingsStore()); const { disableGameLogDialog } = useGameLogStore(); - const { - setDiscordActive, - setDiscordInstance, - setDiscordHideInvite, - setDiscordJoinButton, - setDiscordHideImage, - setDiscordShowPlatform, - setDiscordWorldIntegration, - setDiscordWorldNameAsDiscordStatus, - saveDiscordOption - } = useDiscordPresenceSettingsStore(); const { photonLoggingEnabled } = storeToRefs(usePhotonStore()); const { saveSidebarSortOrder } = useFriendStore(); const { cachedWorlds } = useWorldStore(); @@ -2032,26 +1804,17 @@ vrcQuitFix, autoSweepVRChatCache, selfInviteOverride, - saveInstancePrints, - cropInstancePrints, - saveInstanceStickers, avatarRemoteDatabase, enableAppLauncher, enableAppLauncherAutoClose, enableAppLauncherRunProcessOnce, - screenshotHelper, - screenshotHelperModifyFilename, - screenshotHelperCopyToClipboard, youTubeApi, progressPie, progressPieFilter, showConfirmationOnSwitchAvatar, gameLogDisabled, sqliteTableSizes, - ugcFolderPath, notificationOpacity, - autoDeleteOldPrints, - saveInstanceEmoji, sentryErrorReporting } = storeToRefs(advancedSettingsStore); @@ -2060,28 +1823,16 @@ setVrcQuitFix, setAutoSweepVRChatCache, setSelfInviteOverride, - setSaveInstancePrints, - setCropInstancePrints, - setSaveInstanceStickers, setAvatarRemoteDatabase, setEnableAppLauncher, setEnableAppLauncherAutoClose, setEnableAppLauncherRunProcessOnce, - setScreenshotHelper, - setScreenshotHelperModifyFilename, - setScreenshotHelperCopyToClipboard, setShowConfirmationOnSwitchAvatar, getSqliteTableSizes, setNotificationOpacity, - setAutoDeleteOldPrints, - resetUGCFolder, - openUGCFolder, - openUGCFolderSelector, showVRChatConfig, promptAutoClearVRCXCacheFrequency, - setSaveInstanceEmoji, - setSentryErrorReporting, - askDeleteAllScreenshotMetadata + setSentryErrorReporting } = advancedSettingsStore; const instanceTypes = ref([ diff --git a/src/views/Settings/components/DiscordSettings.vue b/src/views/Settings/components/DiscordSettings.vue new file mode 100644 index 00000000..0da73ff2 --- /dev/null +++ b/src/views/Settings/components/DiscordSettings.vue @@ -0,0 +1,110 @@ + + + diff --git a/src/views/Settings/components/PictureSettings.vue b/src/views/Settings/components/PictureSettings.vue new file mode 100644 index 00000000..56cf2050 --- /dev/null +++ b/src/views/Settings/components/PictureSettings.vue @@ -0,0 +1,166 @@ + + +