tidy settings

src/localization/en.json

@@ -629,6 +629,12 @@
                     "table_density_comfortable": "Comfortable",
                     "table_density_compact": "Compact"
                 },
+                "display": {
+                    "header": "Display"
+                },
+                "sorting_tables": {
+                    "header": "Sorting & Tables"
+                },
                 "timedate": {
                     "header": "Time/Date",
                     "time_format": "Time Format",
@@ -784,6 +790,12 @@
                 "advanced": {
                     "launch_options": "Launch Options",
                     "vrc_registry_backup": "VRC Registry Backup",
+                    "vrchat_settings": {
+                        "header": "VRChat"
+                    },
+                    "vrcx_settings": {
+                        "header": "VRCX"
+                    },
                     "primary_password": {
                         "header": "Primary Password",
                         "description": "Encrypt password (disables auto login)"

src/views/Settings/components/Tabs/AdvancedTab.vue

@@ -1,14 +1,7 @@
 <template>
     <div>
         <div class="options-container">
-            <span class="sub-header">{{ t('view.settings.advanced.advanced.primary_password.header') }}</span>
+            <span class="header">{{ t('view.settings.advanced.advanced.vrchat_settings.header') }}</span>
-            <simple-switch
-                :label="t('view.settings.advanced.advanced.primary_password.description')"
-                :value="enablePrimaryPassword"
-                :disabled="!enablePrimaryPassword"
-                :long-label="true"
-                @change="enablePrimaryPasswordChange" />
-
             <span class="sub-header">{{ t('view.settings.advanced.advanced.relaunch_vrchat.header') }}</span>
             <simple-switch
                 :label="t('view.settings.advanced.advanced.relaunch_vrchat.description')"
@@ -36,6 +29,16 @@
                 :value="selfInviteOverride"
                 :long-label="true"
                 @change="setSelfInviteOverride" />
+        </div>
+        <div class="options-container">
+            <span class="header">{{ t('view.settings.advanced.advanced.vrcx_settings.header') }}</span>
+            <span class="sub-header">{{ t('view.settings.advanced.advanced.primary_password.header') }}</span>
+            <simple-switch
+                :label="t('view.settings.advanced.advanced.primary_password.description')"
+                :value="enablePrimaryPassword"
+                :disabled="!enablePrimaryPassword"
+                :long-label="true"
+                @change="enablePrimaryPasswordChange" />
 
             <div v-if="branch === 'Nightly'">
                 <span class="sub-header">{{
@@ -47,6 +50,29 @@
                     :long-label="true"
                     @change="setSentryErrorReporting()" />
             </div>
+
+            <span class="sub-header">{{ t('view.settings.general.logging.header') }}</span>
+            <simple-switch
+                :label="t('view.settings.advanced.advanced.cache_debug.udon_exception_logging')"
+                :value="udonExceptionLogging"
+                @change="setUdonExceptionLogging" />
+            <simple-switch
+                :label="t('view.settings.general.logging.resource_load')"
+                :value="logResourceLoad"
+                @change="setLogResourceLoad" />
+            <simple-switch
+                :label="t('view.settings.general.logging.empty_avatar')"
+                :value="logEmptyAvatars"
+                @change="setLogEmptyAvatars" />
+            <simple-switch
+                :label="t('view.settings.general.logging.auto_login_delay')"
+                :value="autoLoginDelayEnabled"
+                @change="setAutoLoginDelayEnabled" />
+            <div v-if="autoLoginDelayEnabled" class="options-container-item">
+                <Button size="sm" variant="outline" @click="promptAutoLoginDelaySeconds">
+                    {{ t('view.settings.general.logging.auto_login_delay_button') }}
+                </Button>
+            </div>
         </div>
         <div class="options-container">
             <span class="header">{{ t('view.profile.game_info.header') }}</span>
@@ -364,6 +390,7 @@
         useAvatarProviderStore,
         useAvatarStore,
         useGameLogStore,
+        useGeneralSettingsStore,
         useGroupStore,
         useInstanceStore,
         useLaunchStore,
@@ -398,6 +425,17 @@
     const { showConsole } = useUiStore();
     const { disableGameLogDialog } = useGameLogStore();
 
+    const generalSettingsStore = useGeneralSettingsStore();
+    const { udonExceptionLogging, logResourceLoad, logEmptyAvatars, autoLoginDelayEnabled } =
+        storeToRefs(generalSettingsStore);
+    const {
+        setUdonExceptionLogging,
+        setLogResourceLoad,
+        setLogEmptyAvatars,
+        setAutoLoginDelayEnabled,
+        promptAutoLoginDelaySeconds
+    } = generalSettingsStore;
+
     const { cachedUsers } = useUserStore();
     const { cachedWorlds } = useWorldStore();
     const { cachedAvatars, cachedAvatarNames } = useAvatarStore();

src/views/Settings/components/Tabs/AppearanceTab.vue

@@ -75,6 +75,9 @@
                     setDisplayVRCPlusIconsAsAvatar();
                     saveOpenVROption();
                 " />
+        </div>
+        <div class="options-container">
+            <span class="header">{{ t('view.settings.appearance.display.header') }}</span>
             <simple-switch
                 :label="t('view.settings.appearance.appearance.show_instance_id')"
                 :value="showInstanceIdInLocation"
@@ -86,6 +89,10 @@
                     setHideNicknames();
                     saveOpenVROption();
                 " />
+            <simple-switch
+                :label="t('view.settings.appearance.appearance.age_gated_instances')"
+                :value="isAgeGatedInstancesVisible"
+                @change="setIsAgeGatedInstancesVisible" />
             <simple-switch
                 :label="t('view.settings.appearance.appearance.striped_data_table_mode')"
                 :value="isDataTableStriped"
@@ -94,10 +101,9 @@
                 :label="t('view.settings.appearance.appearance.toggle_pointer_on_hover')"
                 :value="showPointerOnHover"
                 @change="togglePointerOnHover" />
-            <simple-switch
+        </div>
-                :label="t('view.settings.appearance.appearance.age_gated_instances')"
+        <div class="options-container">
-                :value="isAgeGatedInstancesVisible"
+            <span class="header">{{ t('view.settings.appearance.sorting_tables.header') }}</span>
-                @change="setIsAgeGatedInstancesVisible" />
             <div class="options-container-item">
                 <span class="name">{{ t('view.settings.appearance.appearance.sort_favorite_by') }}</span>
                 <RadioGroup

src/views/Settings/components/Tabs/GeneralTab.vue

@@ -143,30 +143,6 @@
                 </SelectContent>
             </Select>
         </div>
-        <div class="options-container">
-            <span class="header">{{ t('view.settings.general.logging.header') }}</span>
-            <simple-switch
-                :label="t('view.settings.advanced.advanced.cache_debug.udon_exception_logging')"
-                :value="udonExceptionLogging"
-                @change="setUdonExceptionLogging" />
-            <simple-switch
-                :label="t('view.settings.general.logging.resource_load')"
-                :value="logResourceLoad"
-                @change="setLogResourceLoad" />
-            <simple-switch
-                :label="t('view.settings.general.logging.empty_avatar')"
-                :value="logEmptyAvatars"
-                @change="setLogEmptyAvatars" />
-            <simple-switch
-                :label="t('view.settings.general.logging.auto_login_delay')"
-                :value="autoLoginDelayEnabled"
-                @change="setAutoLoginDelayEnabled" />
-            <div v-if="autoLoginDelayEnabled" class="options-container-item">
-                <Button size="sm" variant="outline" @click="promptAutoLoginDelaySeconds">
-                    {{ t('view.settings.general.logging.auto_login_delay_button') }}
-                </Button>
-            </div>
-        </div>
         <div class="options-container">
             <span class="header">{{ t('view.settings.general.contributors.header') }}</span>
             <div class="options-container-item">
@@ -237,11 +213,7 @@
         isCloseToTray,
         disableGpuAcceleration,
         disableVrOverlayGpuAcceleration,
-        localFavoriteFriendsGroups,
+        localFavoriteFriendsGroups
-        udonExceptionLogging,
-        logResourceLoad,
-        logEmptyAvatars,
-        autoLoginDelayEnabled
     } = storeToRefs(generalSettingsStore);
 
     const {
@@ -250,11 +222,6 @@
         setIsCloseToTray,
         setDisableGpuAcceleration,
         setDisableVrOverlayGpuAcceleration,
-        setUdonExceptionLogging,
-        setLogResourceLoad,
-        setLogEmptyAvatars,
-        setAutoLoginDelayEnabled,
-        promptAutoLoginDelaySeconds,
         setLocalFavoriteFriendsGroups,
         promptProxySettings
     } = generalSettingsStore;