Merge pull request #818 from dremin/minor-renames-tweaks

Minor renames and tweaks
dremin · Apr 30, 2024 · 1174218 · 1174218
2 parents f97fae3 + 1a1866a
commit 1174218
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git a/RetroBar/Controls/NotifyIcon.xaml.cs b/RetroBar/Controls/NotifyIcon.xaml.cs
@@ -106,7 +106,7 @@ private void TrayIcon_NotificationBalloonShown(object sender, NotificationBalloo
                 return;
             }
 
-            if (TrayIcon == null || TrayIcon.GetBehavior() == NotifyIconBehavior.AlwaysHide || TrayIcon.GetBehavior() == NotifyIconBehavior.Disabled)
+            if (TrayIcon == null || TrayIcon.GetBehavior() == NotifyIconBehavior.AlwaysHide || TrayIcon.GetBehavior() == NotifyIconBehavior.Remove)
             {
                 return;
             }

diff --git a/RetroBar/Controls/NotifyIconList.xaml.cs b/RetroBar/Controls/NotifyIconList.xaml.cs
@@ -111,7 +111,7 @@ private bool UnpinnedNotifyIcons_Filter(object obj)
         {
             if (obj is ManagedShell.WindowsTray.NotifyIcon notifyIcon)
             {
-                return !notifyIcon.IsPinned && !notifyIcon.IsHidden && notifyIcon.GetBehavior() != NotifyIconBehavior.Disabled;
+                return !notifyIcon.IsPinned && !notifyIcon.IsHidden && notifyIcon.GetBehavior() != NotifyIconBehavior.Remove;
             }
 
             return true;

diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
@@ -70,7 +70,7 @@
     <s:String x:Key="hide_when_inactive">Hide when inactive</s:String>
     <s:String x:Key="always_show">Always show</s:String>
     <s:String x:Key="always_hide">Always hide</s:String>
-    <s:String x:Key="disabled">Disabled</s:String>
+    <s:String x:Key="remove">Remove</s:String>
     <s:String x:Key="name_heading">Name</s:String>
     <s:String x:Key="behavior_heading">Behavior</s:String>
     <s:String x:Key="invert_heading">Invert</s:String>

diff --git a/RetroBar/NotificationPropertiesWindow.xaml b/RetroBar/NotificationPropertiesWindow.xaml
@@ -111,7 +111,7 @@
                                                             <Setter Property="Text" Value="{DynamicResource always_show}" />
                                                         </DataTrigger>
                                                         <DataTrigger Binding="{Binding Converter={StaticResource notifyIconBehaviorConverter}}" Value="3">
-                                                            <Setter Property="Text" Value="{DynamicResource disabled}" />
+                                                            <Setter Property="Text" Value="{DynamicResource remove}" />
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
@@ -124,7 +124,7 @@
                                             <ComboBoxItem Content="{DynamicResource hide_when_inactive}" Tag="{x:Static Settings:NotifyIconBehavior.HideWhenInactive}" />
                                             <ComboBoxItem Content="{DynamicResource always_hide}" Tag="{x:Static Settings:NotifyIconBehavior.AlwaysHide}" />
                                             <ComboBoxItem Content="{DynamicResource always_show}" Tag="{x:Static Settings:NotifyIconBehavior.AlwaysShow}" />
-                                            <ComboBoxItem Content="{DynamicResource disabled}" Tag="{x:Static Settings:NotifyIconBehavior.Disabled}" />
+                                            <ComboBoxItem Content="{DynamicResource remove}" Tag="{x:Static Settings:NotifyIconBehavior.Remove}" />
                                         </ComboBox>
                                     </StackPanel>
                                     <DataTemplate.Triggers>

diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
@@ -321,9 +321,19 @@
                             <Label Content="{DynamicResource debug_logging}" />
                         </CheckBox>
                         <CheckBox x:Name="cbCheckForUpdates"
-                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=Updates, UpdateSourceTrigger=PropertyChanged}">
+                                  IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=CheckForUpdates, UpdateSourceTrigger=PropertyChanged}">
                             <Label Content="{DynamicResource check_for_updates}" />
                         </CheckBox>
+                        <DockPanel>
+                            <Label VerticalAlignment="Center"
+                                   Target="{Binding ElementName=cboMiddleMouseAction}">
+                                <AccessText Text="{DynamicResource middle_mouse_task_action}" />
+                            </Label>
+                            <ComboBox x:Name="cboMiddleMouseAction"
+                                      ItemsSource="{DynamicResource middle_mouse_task_action_values}"
+                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskMiddleClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
+                                      SelectionChanged="cboMiddleMouseAction_SelectionChanged" />
+                        </DockPanel>
                         <DockPanel>
                             <Label VerticalAlignment="Center"
                                    Target="{Binding ElementName=cboInvertIconsMode}">
@@ -337,16 +347,6 @@
                         <Button HorizontalAlignment="Right"
                                         Content="{DynamicResource customize}"
                                         Click="CustomizeNotifications_OnClick" />
-                        <DockPanel>
-                            <Label VerticalAlignment="Center"
-                                   Target="{Binding ElementName=cboMiddleMouseAction}">
-                                <AccessText Text="{DynamicResource middle_mouse_task_action}" />
-                            </Label>
-                            <ComboBox x:Name="cboMiddleMouseAction"
-                                      ItemsSource="{DynamicResource middle_mouse_task_action_values}"
-                                      SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskMiddleClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
-                                      SelectionChanged="cboMiddleMouseAction_SelectionChanged" />
-                        </DockPanel>
                     </StackPanel>
                     <GroupBox Header="{DynamicResource multiple_displays}"
                               Margin="0,0,0,10">

diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
@@ -41,6 +41,12 @@ public Orientation Orientation
             get => Orientation.Horizontal;
         }
 
+        // Previews should always assume normal mode
+        public AppBarMode AppBarMode
+        {
+            get => AppBarMode.Normal;
+        }
+
         // Previews should reflect the locked setting
         public bool IsLocked
         {

diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
@@ -280,11 +280,11 @@ public TaskMiddleClickOption TaskMiddleClickAction
             set => SetEnum(ref _taskMiddleClickAction, value);
         }
 
-        private bool _updates = true;
-        public bool Updates
+        private bool _checkForUpdates = true;
+        public bool CheckForUpdates
         {
-            get => _updates;
-            set => Set(ref _updates, value);
+            get => _checkForUpdates;
+            set => Set(ref _checkForUpdates, value);
         }
         #endregion
 
@@ -357,7 +357,7 @@ public enum NotifyIconBehavior
         HideWhenInactive,
         AlwaysHide,
         AlwaysShow,
-        Disabled
+        Remove
     }
     #endregion
 

diff --git a/RetroBar/Utilities/Updater.cs b/RetroBar/Utilities/Updater.cs
@@ -33,15 +33,15 @@ public Updater()
 
         private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(Settings.Updates))
+            if (e.PropertyName == nameof(Settings.CheckForUpdates))
             {
                 SetTimer();
             }
         }
 
         private void SetTimer()
         {
-            if (Settings.Instance.Updates)
+            if (Settings.Instance.CheckForUpdates)
             {
                 if (updateCheck == null)
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
                     return;
                 }
-                if (TrayIcon == null || TrayIcon.GetBehavior() == NotifyIconBehavior.AlwaysHide || TrayIcon.GetBehavior() == NotifyIconBehavior.Disabled)
+                if (TrayIcon == null || TrayIcon.GetBehavior() == NotifyIconBehavior.AlwaysHide || TrayIcon.GetBehavior() == NotifyIconBehavior.Remove)
                 {
                     return;
                 }
@@ Expand Down @@