Merge pull request #532 from dremin/settings-advanced

Properties window with Advanced tab
dremin · Mar 5, 2023 · 3cd95a2 · 3cd95a2
2 parents 3e2ef43 + bba151b
commit 3cd95a2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
@@ -4,6 +4,7 @@
 
     <s:String x:Key="retrobar_properties">RetroBar Properties</s:String>
     <s:String x:Key="taskbar_options">Taskbar Options</s:String>
+    <s:String x:Key="advanced">Advanced</s:String>
     <s:String x:Key="taskbar_appearance">Taskbar appearance</s:String>
     <s:String x:Key="notification_area">Notification area</s:String>
     <s:String x:Key="autostart">Automatically start at _logon</s:String>
@@ -29,6 +30,7 @@
     <s:String x:Key="quick_launch_folder">Quick Launch - Choose a folder</s:String>
     <s:String x:Key="show_window_previews">Show _window previews (thumbnails)</s:String>
     <s:String x:Key="use_software_rendering">_Use software rendering</s:String>
+    <s:String x:Key="middle_mouse_to_close">_Middle-click to close taskbar items</s:String>
     <s:String x:Key="multiple_displays">Multiple displays</s:String>
     <s:String x:Key="show_tasks_on">S_how tasks on:</s:String>
     <x:Array x:Key="show_tasks_on_values" Type="s:String">
@@ -79,9 +81,7 @@
 
     <s:String x:Key="open_folder">&amp;Open Folder</s:String>
 
+    <!-- Items below are settings, and should always be in English -->
     <FlowDirection x:Key="flow_direction">LeftToRight</FlowDirection>
-
     <FontFamily x:Key="start_text_xp_font_family">Franklin Gothic</FontFamily>
-
-    <s:String x:Key="middle_mouse_to_close">_Middle mouse click to close Taskbar Items</s:String>
 </ResourceDictionary>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
@@ -265,6 +265,27 @@
                             </DockPanel>
                         </StackPanel>
                     </GroupBox>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="{DynamicResource advanced}">
+                <StackPanel Orientation="Vertical"
+                            Margin="10">
+                    <StackPanel Orientation="Vertical"
+                                Margin="0,0,0,10">
+                        <CheckBox Checked="AutoStartCheckBox_OnChecked"
+                                  Unchecked="AutoStartCheckBox_OnChecked"
+                                  Name="AutoStartCheckBox">
+                            <Label Content="{DynamicResource autostart}" />
+                        </CheckBox>
+                        <CheckBox x:Name="cbMiddleMouseToClose"
+                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=MiddleMouseToClose, UpdateSourceTrigger=PropertyChanged}">
+                            <Label Content="{DynamicResource middle_mouse_to_close}" />
+                        </CheckBox>
+                        <CheckBox x:Name="cbUseSoftwareRendering"
+                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=UseSoftwareRendering, UpdateSourceTrigger=PropertyChanged}">
+                            <Label Content="{DynamicResource use_software_rendering}" />
+                        </CheckBox>
+                    </StackPanel>
                     <GroupBox Header="{DynamicResource multiple_displays}">
                         <StackPanel Orientation="Vertical">
                             <CheckBox x:Name="cbShowMultiMon"
@@ -284,26 +305,6 @@
                             </DockPanel>
                         </StackPanel>
                     </GroupBox>
-                </StackPanel>
-            </TabItem>
-            <TabItem Header="RetroBar">
-                <StackPanel Orientation="Vertical"
-                            Margin="10">
-                    <StackPanel Orientation="Vertical">
-                        <CheckBox Checked="AutoStartCheckBox_OnChecked"
-                                  Unchecked="AutoStartCheckBox_OnChecked"
-                                  Name="AutoStartCheckBox">
-                            <Label Content="{DynamicResource autostart}" />
-                        </CheckBox>
-                        <CheckBox x:Name="cbUseSoftwareRendering"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=UseSoftwareRendering, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="{DynamicResource use_software_rendering}" />
-                        </CheckBox>
-                        <CheckBox x:Name="cbMiddleMouseToClose"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=MiddleMouseToClose, UpdateSourceTrigger=PropertyChanged}">
-                            <Label Content="{DynamicResource middle_mouse_to_close}" />
-                        </CheckBox>
-                    </StackPanel>
                     <DockPanel Margin="0,10,0,0">
                         <TextBlock Name="txtVersion"
                                    DockPanel.Dock="Left"