2 Commits

Author SHA1 Message Date
eebd23f702 Handle when Process V2 isn't available 2023-04-03 08:23:20 -04:00
ebd9dc607b Add setting to show process ID 2023-04-02 12:43:52 -04:00
9 changed files with 102 additions and 20 deletions

View File

@@ -29,6 +29,9 @@
<setting name="FirstRun" serializeAs="String"> <setting name="FirstRun" serializeAs="String">
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="ShowProcessId" serializeAs="String">
<value>False</value>
</setting>
</ProcessCpuUsageStatusWindow.Properties.Settings> </ProcessCpuUsageStatusWindow.Properties.Settings>
</userSettings> </userSettings>
</configuration> </configuration>

View File

@@ -15,6 +15,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
@@ -23,20 +24,34 @@
Name="StartWithWindows" Name="StartWithWindows"
VerticalAlignment="Top" VerticalAlignment="Top"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Grid.Column="0"
Grid.Row="0"
Grid.ColumnSpan="2" /> Grid.ColumnSpan="2" />
<Label Grid.Column="0" <Label Grid.Column="0"
Grid.Row="1" Grid.Row="1"
Content="{x:Static properties:Resources.NumberOfProcesses}" Content="{x:Static properties:Resources.NumberOfProcesses}"
Margin="0,4,6,0" Margin="0,4,6,4"
Padding="0" Padding="0"
VerticalContentAlignment="Center" VerticalAlignment="Center" Target="{x:Reference NumberOfProcesses}" /> VerticalContentAlignment="Center"
VerticalAlignment="Center"
Target="{x:Reference NumberOfProcesses}" />
<xctk:IntegerUpDown Grid.Column="1" <xctk:IntegerUpDown Grid.Column="1"
Grid.Row="1" x:Name="NumberOfProcesses" Grid.Row="1"
Minimum="1" Maximum="20" x:Name="NumberOfProcesses"
TextAlignment="Left" Margin="0,12,6,6" Minimum="1"
Maximum="20"
TextAlignment="Left"
Margin="0,12,6,12"
Width="50" Width="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Left" /> 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> </Grid>
</windows:CategoryPanel> </windows:CategoryPanel>

View File

@@ -5,9 +5,13 @@ namespace ProcessCpuUsageStatusWindow.Options
{ {
public partial class GeneralOptionsPanel public partial class GeneralOptionsPanel
{ {
public GeneralOptionsPanel() private bool IsV2 { get; }
public GeneralOptionsPanel(bool isV2)
{ {
InitializeComponent(); InitializeComponent();
IsV2 = isV2;
} }
public override void LoadPanel(object data) public override void LoadPanel(object data)
@@ -18,6 +22,9 @@ namespace ProcessCpuUsageStatusWindow.Options
StartWithWindows.IsChecked = settings.AutoStart; StartWithWindows.IsChecked = settings.AutoStart;
NumberOfProcesses.Text = settings.ProcessCount.ToString(); NumberOfProcesses.Text = settings.ProcessCount.ToString();
ShowProcessId.IsChecked = settings.ShowProcessId;
ShowProcessId.Visibility = IsV2 ? Visibility.Visible : Visibility.Collapsed;
} }
public override bool ValidatePanel() public override bool ValidatePanel()
@@ -34,6 +41,9 @@ namespace ProcessCpuUsageStatusWindow.Options
settings.ProcessCount = int.Parse(NumberOfProcesses.Text); 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); Application.Current.SetStartWithWindows(settings.AutoStart);
} }

View File

@@ -28,6 +28,8 @@ namespace ProcessCpuUsageStatusWindow
public Dictionary<string, ProcessCpuUsage> CurrentProcessList; public Dictionary<string, ProcessCpuUsage> CurrentProcessList;
public bool IsV2 => _processCategory.CategoryName == "Process V2";
#endregion #endregion
#region Initialize and terminate #region Initialize and terminate
@@ -40,7 +42,8 @@ namespace ProcessCpuUsageStatusWindow
CurrentProcessList = new Dictionary<string, ProcessCpuUsage>(); CurrentProcessList = new Dictionary<string, ProcessCpuUsage>();
// Get the category for process performance info // Get the category for process performance info
_processCategory = PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process V2"); _processCategory = PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process V2") ??
PerformanceCounterCategory.GetCategories().FirstOrDefault(category => category.CategoryName == "Process");
if (_processCategory == null) if (_processCategory == null)
return; return;

View File

@@ -225,7 +225,7 @@ namespace ProcessCpuUsageStatusWindow.Properties {
} }
/// <summary> /// <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> /// </summary>
public static string ProcessLine { public static string ProcessLine {
get { 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> /// <summary>
/// Looks up a localized string similar to Restarting application.... /// Looks up a localized string similar to Restarting application....
/// </summary> /// </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> /// <summary>
/// Looks up a localized string similar to _Start when Windows starts. /// Looks up a localized string similar to _Start when Windows starts.
/// </summary> /// </summary>

View File

@@ -173,7 +173,7 @@
<value>Options</value> <value>Options</value>
</data> </data>
<data name="ProcessLine" xml:space="preserve"> <data name="ProcessLine" xml:space="preserve">
<value>CPU: {1,4:f1}% - {0} ({2})</value> <value>CPU: {1,4:f1}% - {0}</value>
</data> </data>
<data name="StartWithWindows" xml:space="preserve"> <data name="StartWithWindows" xml:space="preserve">
<value>_Start when Windows starts</value> <value>_Start when Windows starts</value>
@@ -184,4 +184,10 @@
<data name="RestartingAfterUpdate" xml:space="preserve"> <data name="RestartingAfterUpdate" xml:space="preserve">
<value>Restarting application...</value> <value>Restarting application...</value>
</data> </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> </root>

View File

@@ -82,5 +82,17 @@ namespace ProcessCpuUsageStatusWindow.Properties {
this["FirstRun"] = value; 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;
}
}
} }
} }

View File

@@ -17,5 +17,8 @@
<Setting Name="FirstRun" Type="System.Boolean" Scope="User"> <Setting Name="FirstRun" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value> <Value Profile="(Default)">True</Value>
</Setting> </Setting>
<Setting Name="ShowProcessId" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

View File

@@ -62,7 +62,7 @@ namespace ProcessCpuUsageStatusWindow
{ {
var panels = new List<CategoryPanel> var panels = new List<CategoryPanel>
{ {
new GeneralOptionsPanel(), new GeneralOptionsPanel(_processCpuUsageWatcher.IsV2),
new AboutOptionsPanel() new AboutOptionsPanel()
}; };
@@ -114,7 +114,8 @@ namespace ProcessCpuUsageStatusWindow
private static class PredefinedProcessName private static class PredefinedProcessName
{ {
public const string Total = "_Total"; public const string Total = "_Total";
public const string Idle = "Idle:0"; public const string Idle = "Idle";
public const string IdleWithProcessId = "Idle:0";
} }
private void UpdateDisplay(Dictionary<string, ProcessCpuUsage> currentProcessList) private void UpdateDisplay(Dictionary<string, ProcessCpuUsage> currentProcessList)
@@ -123,7 +124,7 @@ namespace ProcessCpuUsageStatusWindow
var validProcessList = (currentProcessList.Values.Where( var validProcessList = (currentProcessList.Values.Where(
process => process =>
process.UsageValid && process.ProcessName != PredefinedProcessName.Total && process.UsageValid && process.ProcessName != PredefinedProcessName.Total &&
process.ProcessName != PredefinedProcessName.Idle)).ToList(); process.ProcessName != (_processCpuUsageWatcher.IsV2 ? PredefinedProcessName.IdleWithProcessId : PredefinedProcessName.Idle))).ToList();
// Calculate the total usage by adding up all the processes we know about // Calculate the total usage by adding up all the processes we know about
var totalUsage = validProcessList.Sum(process => process.PercentUsage); var totalUsage = validProcessList.Sum(process => process.PercentUsage);
@@ -149,13 +150,24 @@ namespace ProcessCpuUsageStatusWindow
if (stringBuilder.Length != 0) if (stringBuilder.Length != 0)
stringBuilder.AppendLine(); stringBuilder.AppendLine();
var colonPosition = processCpuUsage.ProcessName.LastIndexOf(':'); if (_processCpuUsageWatcher.IsV2)
{
// Split the process name from the process ID
var colonPosition = processCpuUsage.ProcessName.LastIndexOf(':');
var processName = colonPosition == -1 ? processCpuUsage.ProcessName : processCpuUsage.ProcessName.Substring(0, colonPosition); var processName = processCpuUsage.ProcessName.Substring(0, colonPosition);
var processId = colonPosition == -1 ? string.Empty : processCpuUsage.ProcessName.Substring(colonPosition + 1); var processId = processCpuUsage.ProcessName.Substring(colonPosition + 1);
// Format the process information into a string to display var formatString = Settings.Default.ShowProcessId ? Resources.ProcessLineWithProcessId : Resources.ProcessLine;
stringBuilder.AppendFormat(Resources.ProcessLine, processName, processCpuUsage.PercentUsage, processId);
// Format the process information into a string to display
stringBuilder.AppendFormat(formatString, processName, processCpuUsage.PercentUsage, processId);
}
else
{
// Format the process information into a string to display
stringBuilder.AppendFormat(Resources.ProcessLine, processCpuUsage.ProcessName, processCpuUsage.PercentUsage);
}
} }
// Add the footer line (if any) // Add the footer line (if any)