From ebd9dc607bf59ab05177ceccff665ab4328011f1 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Sun, 2 Apr 2023 12:43:52 -0400
Subject: [PATCH] Add setting to show process ID

---
 App.config                          |  3 +++
 Options/GeneralOptionsPanel.xaml    | 31 +++++++++++++++++++++--------
 Options/GeneralOptionsPanel.xaml.cs |  4 ++++
 Properties/Resources.Designer.cs    | 20 ++++++++++++++++++-
 Properties/Resources.resx           |  8 +++++++-
 Properties/Settings.Designer.cs     | 12 +++++++++++
 Properties/Settings.settings        |  3 +++
 WindowSource.cs                     |  2 +-
 8 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/App.config b/App.config
index 6e50766..174f2fe 100644
--- a/App.config
+++ b/App.config
@@ -29,6 +29,9 @@
 			<setting name="FirstRun" serializeAs="String">
 				<value>True</value>
 			</setting>
+			<setting name="ShowProcessId" serializeAs="String">
+				<value>False</value>
+			</setting>
 		</ProcessCpuUsageStatusWindow.Properties.Settings>
 	</userSettings>
 </configuration>
\ No newline at end of file
diff --git a/Options/GeneralOptionsPanel.xaml b/Options/GeneralOptionsPanel.xaml
index 886edcd..8c50e61 100644
--- a/Options/GeneralOptionsPanel.xaml
+++ b/Options/GeneralOptionsPanel.xaml
@@ -15,6 +15,7 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
@@ -23,20 +24,34 @@
                   Name="StartWithWindows"
                   VerticalAlignment="Top"
                   VerticalContentAlignment="Center"
+                  Grid.Column="0"
+                  Grid.Row="0"
                   Grid.ColumnSpan="2" />
-        <Label Grid.Column="0" 
+        <Label Grid.Column="0"
                Grid.Row="1"
                Content="{x:Static properties:Resources.NumberOfProcesses}"
-               Margin="0,4,6,0"
-               Padding="0"               
-               VerticalContentAlignment="Center" VerticalAlignment="Center" Target="{x:Reference NumberOfProcesses}" />
+               Margin="0,4,6,4"
+               Padding="0"
+               VerticalContentAlignment="Center"
+               VerticalAlignment="Center"
+               Target="{x:Reference NumberOfProcesses}" />
         <xctk:IntegerUpDown Grid.Column="1"
-                            Grid.Row="1" x:Name="NumberOfProcesses"
-                            Minimum="1" Maximum="20"
-                            TextAlignment="Left" Margin="0,12,6,6"
+                            Grid.Row="1"
+                            x:Name="NumberOfProcesses"
+                            Minimum="1"
+                            Maximum="20"
+                            TextAlignment="Left"
+                            Margin="0,12,6,12"
                             Width="50"
                             VerticalContentAlignment="Center"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Left" />
+        <CheckBox Content="{x:Static properties:Resources.ShowProcessId}"
+                  Name="ShowProcessId"
+                  VerticalAlignment="Top"
+                  VerticalContentAlignment="Center"
+                  Grid.Column="0"
+                  Grid.Row="2"
+                  Grid.ColumnSpan="2" />
     </Grid>
-</windows:CategoryPanel>
+</windows:CategoryPanel>
\ No newline at end of file
diff --git a/Options/GeneralOptionsPanel.xaml.cs b/Options/GeneralOptionsPanel.xaml.cs
index 5aeea70..c013829 100644
--- a/Options/GeneralOptionsPanel.xaml.cs
+++ b/Options/GeneralOptionsPanel.xaml.cs
@@ -18,6 +18,7 @@ namespace ProcessCpuUsageStatusWindow.Options
 
             StartWithWindows.IsChecked = settings.AutoStart;
             NumberOfProcesses.Text = settings.ProcessCount.ToString();
+            ShowProcessId.IsChecked = settings.ShowProcessId;
         }
 
         public override bool ValidatePanel()
@@ -34,6 +35,9 @@ namespace ProcessCpuUsageStatusWindow.Options
 
             settings.ProcessCount = int.Parse(NumberOfProcesses.Text);
 
+            if (ShowProcessId.IsChecked.HasValue && settings.ShowProcessId != ShowProcessId.IsChecked.Value)
+                settings.ShowProcessId = ShowProcessId.IsChecked.Value;
+
             Application.Current.SetStartWithWindows(settings.AutoStart);
         }
 
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 168e215..284df37 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -225,7 +225,7 @@ namespace ProcessCpuUsageStatusWindow.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to CPU: {1,4:f1}% - {0} ({2}).
+        ///   Looks up a localized string similar to CPU: {1,4:f1}% - {0}.
         /// </summary>
         public static string ProcessLine {
             get {
@@ -233,6 +233,15 @@ namespace ProcessCpuUsageStatusWindow.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to CPU: {1,4:f1}% - {0} ({2}).
+        /// </summary>
+        public static string ProcessLineWithProcessId {
+            get {
+                return ResourceManager.GetString("ProcessLineWithProcessId", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Restarting application....
         /// </summary>
@@ -242,6 +251,15 @@ namespace ProcessCpuUsageStatusWindow.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show _process ID.
+        /// </summary>
+        public static string ShowProcessId {
+            get {
+                return ResourceManager.GetString("ShowProcessId", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to _Start when Windows starts.
         /// </summary>
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 985a0af..da9a6ce 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -173,7 +173,7 @@
     <value>Options</value>
   </data>
   <data name="ProcessLine" xml:space="preserve">
-    <value>CPU: {1,4:f1}% - {0} ({2})</value>
+    <value>CPU: {1,4:f1}% - {0}</value>
   </data>
   <data name="StartWithWindows" xml:space="preserve">
     <value>_Start when Windows starts</value>
@@ -184,4 +184,10 @@
   <data name="RestartingAfterUpdate" xml:space="preserve">
     <value>Restarting application...</value>
   </data>
+  <data name="ProcessLineWithProcessId" xml:space="preserve">
+    <value>CPU: {1,4:f1}% - {0} ({2})</value>
+  </data>
+  <data name="ShowProcessId" xml:space="preserve">
+    <value>Show _process ID</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index f0ed91a..ffe6c05 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -82,5 +82,17 @@ namespace ProcessCpuUsageStatusWindow.Properties {
                 this["FirstRun"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ShowProcessId {
+            get {
+                return ((bool)(this["ShowProcessId"]));
+            }
+            set {
+                this["ShowProcessId"] = value;
+            }
+        }
     }
 }
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
index 250074c..4fafc05 100644
--- a/Properties/Settings.settings
+++ b/Properties/Settings.settings
@@ -17,5 +17,8 @@
     <Setting Name="FirstRun" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="ShowProcessId" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WindowSource.cs b/WindowSource.cs
index 95a6036..da17be7 100644
--- a/WindowSource.cs
+++ b/WindowSource.cs
@@ -155,7 +155,7 @@ namespace ProcessCpuUsageStatusWindow
                 var processId = colonPosition == -1 ? string.Empty : processCpuUsage.ProcessName.Substring(colonPosition + 1);
 
                 // Format the process information into a string to display
-                stringBuilder.AppendFormat(Resources.ProcessLine, processName, processCpuUsage.PercentUsage, processId);
+                stringBuilder.AppendFormat(Settings.Default.ShowProcessId ? Resources.ProcessLineWithProcessId : Resources.ProcessLine, processName, processCpuUsage.PercentUsage, processId);
             }
 
             // Add the footer line (if any)