Skip to content

Commit 3b27b55

Browse files
CodeDeadCodeDead
committed
* Minor changes
1 parent f2a4889 commit 3b27b55

File tree

9 files changed

+94
-53
lines changed

9 files changed

+94
-53
lines changed

‎MemPlus/Business/UTILS/GridViewSort.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace MemPlus.Business.UTILS
1010
/// <summary>
1111
/// Internal logic for sorting a GridView
1212
/// </summary>
13-
internal class GridViewSort
13+
internal static class GridViewSort
1414
{
1515
#region Properties
1616
/// <summary>

‎MemPlus/Business/UTILS/Utils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ internal static List<RamStick> GetRamSticks()
7878
ManagementScope scope = new ManagementScope("\\root\\CIMV2", connection);
7979
scope.Connect();
8080

81-
ObjectQuery query = new ObjectQuery("SELECT * FROM Win32_PhysicalMemory");
81+
ObjectQuery query = new ObjectQuery(@"SELECT * FROM Win32_PhysicalMemory");
8282

8383
ManagementObjectSearcher searcher = new ManagementObjectSearcher(scope, query);
8484

‎MemPlus/Views/Windows/AboutWindow.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
UseLayoutRounding="True"
1313
AllowsTransparency="True" UseNativeChrome="True"
1414
Topmost="{utils:SettingsBinder Topmost}"
15-
Title="{DynamicResource AboutWindowTitle}" Height="200" Width="350" Icon="/MemPlus;component/Resources/Images/ram.png">
15+
Title="{DynamicResource AboutWindowTitle}" Height="200" Width="350"
16+
Icon="/MemPlus;component/Resources/Images/ram.png">
1617
<Grid VerticalAlignment="Center" HorizontalAlignment="Center">
1718
<Grid.RowDefinitions>
1819
<RowDefinition />
@@ -35,7 +36,7 @@
3536
<ColumnDefinition />
3637
</Grid.ColumnDefinitions>
3738
<Button Margin="5" Content="{DynamicResource Close}" Click="BtnClose_OnClick" />
38-
<Button Margin="5" Grid.Column="1" Content="{DynamicResource License}" Click="BtnLicense_OnClick" />
39+
<Button Margin="5" Grid.Column="1" Content="{DynamicResource License}" Click="BtnLicense_OnClick" />
3940
<Button Margin="5" Grid.Column="2" Content="CodeDead" Click="BtnCodeDead_OnClick" />
4041
</Grid>
4142
</Grid>

‎MemPlus/Views/Windows/LogWindow.xaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<RowDefinition />
2020
<RowDefinition Height="Auto" />
2121
</Grid.RowDefinitions>
22-
<ListView x:Name="LsvLogs" ScrollBar.Scroll="LsvLogs_OnScroll" SelectionMode="Single" PreviewMouseWheel="LsvLogs_MouseWheel"
22+
<ListView x:Name="LsvLogs" ScrollBar.Scroll="LsvLogs_OnScroll" SelectionMode="Single"
23+
PreviewMouseWheel="LsvLogs_MouseWheel"
2324
utils:GridViewSort.Enabled="True" d:DataContext="{d:DesignInstance log:Log}">
2425
<ListView.ContextMenu>
2526
<ContextMenu>
@@ -49,8 +50,10 @@
4950
</ListView.ContextMenu>
5051
<ListView.View>
5152
<GridView>
52-
<GridViewColumn Header="{DynamicResource Date}" DisplayMemberBinding="{Binding Time}" utils:GridViewSort.PropertyName="Time" />
53-
<GridViewColumn Header="{DynamicResource Content}" DisplayMemberBinding="{Binding Data}" utils:GridViewSort.PropertyName="Data" />
53+
<GridViewColumn Header="{DynamicResource Date}" DisplayMemberBinding="{Binding Time}"
54+
utils:GridViewSort.PropertyName="Time" />
55+
<GridViewColumn Header="{DynamicResource Content}" DisplayMemberBinding="{Binding Data}"
56+
utils:GridViewSort.PropertyName="Data" />
5457
</GridView>
5558
</ListView.View>
5659
</ListView>
@@ -60,8 +63,10 @@
6063
<ColumnDefinition />
6164
<ColumnDefinition />
6265
</Grid.ColumnDefinitions>
63-
<Button Grid.Column="0" MinHeight="25" Margin="3" Content="{DynamicResource Export}" Click="BtnExport_OnClick" />
64-
<Button Grid.Column="1" MinHeight="25" Margin="3" Content="{DynamicResource ClearLogs}" Click="BtnClear_OnClick" />
66+
<Button Grid.Column="0" MinHeight="25" Margin="3" Content="{DynamicResource Export}"
67+
Click="BtnExport_OnClick" />
68+
<Button Grid.Column="1" MinHeight="25" Margin="3" Content="{DynamicResource ClearLogs}"
69+
Click="BtnClear_OnClick" />
6570
</Grid>
6671
</Grid>
6772
</syncfusion:ChromelessWindow>

‎MemPlus/Views/Windows/MainWindow.xaml

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</Grid.RowDefinitions>
2323

2424
<tb:TaskbarIcon x:Name="TbiIcon"
25-
ToolTipText="MemPlus"
26-
IconSource="../../ram.ico"
27-
TrayMouseDoubleClick="OpenTbItem_Click">
25+
ToolTipText="MemPlus"
26+
IconSource="../../ram.ico"
27+
TrayMouseDoubleClick="OpenTbItem_Click">
2828

2929
<tb:TaskbarIcon.ContextMenu>
3030
<ContextMenu>
@@ -61,17 +61,18 @@
6161

6262
<Grid Grid.Row="0" x:Name="Overlay" Panel.ZIndex="1000" Visibility="Collapsed" Grid.RowSpan="3">
6363
<Grid.Background>
64-
<SolidColorBrush Color="Black" Opacity="0.5"/>
64+
<SolidColorBrush Color="Black" Opacity="0.5" />
6565
</Grid.Background>
6666

67-
<Image Source="/Resources/Images/paused.png" HorizontalAlignment="Center" VerticalAlignment="Center" Height="96" Width="96" />
67+
<Image Source="/Resources/Images/paused.png" HorizontalAlignment="Center" VerticalAlignment="Center"
68+
Height="96" Width="96" />
6869
</Grid>
6970

7071
<Menu Grid.Row="1" IsMainMenu="True">
7172
<MenuItem Header="{DynamicResource File}">
7273
<MenuItem Header="{DynamicResource Export}">
7374
<MenuItem.Icon>
74-
<Image Width="16" Height="16" Source="/Resources/Images/export.png"/>
75+
<Image Width="16" Height="16" Source="/Resources/Images/export.png" />
7576
</MenuItem.Icon>
7677
<MenuItem Header="{DynamicResource Logs}">
7778
<MenuItem.Icon>
@@ -81,8 +82,8 @@
8182
<Separator />
8283
<MenuItem Header="{DynamicResource RamLogs}" Click="RamExportMenuItem_OnClick" />
8384
<MenuItem Header="{DynamicResource ProcessLogs}" Click="ProcessExportMenuItem_OnClick" />
84-
<MenuItem Header="{DynamicResource ApplicationLogs}" Click="ApplicationExportMenuItem_OnClick"/>
85-
<MenuItem Header="{DynamicResource ErrorLogs}" Click="ErrorExportMenuItem_OnClick"/>
85+
<MenuItem Header="{DynamicResource ApplicationLogs}" Click="ApplicationExportMenuItem_OnClick" />
86+
<MenuItem Header="{DynamicResource ErrorLogs}" Click="ErrorExportMenuItem_OnClick" />
8687
</MenuItem>
8788
<Separator />
8889
<MenuItem Header="{DynamicResource RamAnalyzerData}" Click="ExportRamAnalyzerDataMenuItem_OnClick">
@@ -95,7 +96,8 @@
9596
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/ram_tab.png" />
9697
</MenuItem.Icon>
9798
</MenuItem>
98-
<MenuItem Header="{DynamicResource ProcessAnalyzerData}" Click="ExportProcessAnalyzerDataMenuItem_OnClick">
99+
<MenuItem Header="{DynamicResource ProcessAnalyzerData}"
100+
Click="ExportProcessAnalyzerDataMenuItem_OnClick">
99101
<MenuItem.Icon>
100102
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/process.png" />
101103
</MenuItem.Icon>
@@ -109,7 +111,7 @@
109111
</MenuItem>
110112
<MenuItem Header="{DynamicResource Exit}" Click="ExitMenuItem_OnClick">
111113
<MenuItem.Icon>
112-
<Image Width="16" Height="16" Source="/Resources/Images/exit.png"/>
114+
<Image Width="16" Height="16" Source="/Resources/Images/exit.png" />
113115
</MenuItem.Icon>
114116
</MenuItem>
115117
</MenuItem>
@@ -120,7 +122,9 @@
120122
<MenuItem.Icon>
121123
<Image Width="16" Height="16" Source="/Resources/Images/ram_tab.png" />
122124
</MenuItem.Icon>
123-
<MenuItem x:Name="MniRamMonitor" Header="{DynamicResource RamMonitor}" IsCheckable="True" Checked="RamMonitorMenuItem_OnCheckedChanged" Unchecked="RamMonitorMenuItem_OnCheckedChanged" />
125+
<MenuItem x:Name="MniRamMonitor" Header="{DynamicResource RamMonitor}" IsCheckable="True"
126+
Checked="RamMonitorMenuItem_OnCheckedChanged"
127+
Unchecked="RamMonitorMenuItem_OnCheckedChanged" />
124128
<Separator />
125129
<MenuItem Header="{DynamicResource RamAnalyzer}" Click="RamAnalyzerMenuItem_OnClick">
126130
<MenuItem.Icon>
@@ -133,7 +137,7 @@
133137
</MenuItem.Icon>
134138
</MenuItem>
135139
</MenuItem>
136-
140+
137141
<MenuItem Header="{DynamicResource ProcessAnalyzer}" Click="ProcessAnalyzerMenuItem_OnClick">
138142
<MenuItem.Icon>
139143
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/process.png" />
@@ -158,11 +162,18 @@
158162
<MenuItem.Icon>
159163
<Image Width="16" Height="16" Source="/Resources/Images/monitor.png" />
160164
</MenuItem.Icon>
161-
<MenuItem Header="{DynamicResource Topmost}" IsCheckable="true" IsChecked="{utils:SettingsBinder Topmost}" />
162-
<MenuItem Header="{DynamicResource DisableWhenInactive}" IsCheckable="True" IsChecked="{utils:SettingsBinder DisableOnInactive}" />
163-
<MenuItem x:Name="MniWindowDraggable" Header="{DynamicResource WindowDraggable}" IsCheckable="True" Checked="WindowDraggableMenuItem_OnCheckedChanged" Unchecked="WindowDraggableMenuItem_OnCheckedChanged" />
164-
<MenuItem x:Name="MniRamStatistics" Header="{DynamicResource DisplayRamStatistics}" IsCheckable="True" Checked="RamStatisticsMenuItem_OnCheckedChanged" Unchecked="RamStatisticsMenuItem_OnCheckedChanged" />
165-
<MenuItem x:Name="MniRamGauge" Header="{DynamicResource DisplayRamGauge}" IsCheckable="True" Checked="RamGaugeMenuItem_OnCheckedChanged" Unchecked="RamGaugeMenuItem_OnCheckedChanged" />
165+
<MenuItem Header="{DynamicResource Topmost}" IsCheckable="true"
166+
IsChecked="{utils:SettingsBinder Topmost}" />
167+
<MenuItem Header="{DynamicResource DisableWhenInactive}" IsCheckable="True"
168+
IsChecked="{utils:SettingsBinder DisableOnInactive}" />
169+
<MenuItem x:Name="MniWindowDraggable" Header="{DynamicResource WindowDraggable}" IsCheckable="True"
170+
Checked="WindowDraggableMenuItem_OnCheckedChanged"
171+
Unchecked="WindowDraggableMenuItem_OnCheckedChanged" />
172+
<MenuItem x:Name="MniRamStatistics" Header="{DynamicResource DisplayRamStatistics}"
173+
IsCheckable="True" Checked="RamStatisticsMenuItem_OnCheckedChanged"
174+
Unchecked="RamStatisticsMenuItem_OnCheckedChanged" />
175+
<MenuItem x:Name="MniRamGauge" Header="{DynamicResource DisplayRamGauge}" IsCheckable="True"
176+
Checked="RamGaugeMenuItem_OnCheckedChanged" Unchecked="RamGaugeMenuItem_OnCheckedChanged" />
166177
</MenuItem>
167178
<MenuItem Header="{DynamicResource Settings}" Click="SettingsMenuItem_OnClick">
168179
<MenuItem.Icon>
@@ -210,12 +221,13 @@
210221

211222
<Grid Grid.Row="2">
212223
<Grid.ColumnDefinitions>
213-
<ColumnDefinition Width="Auto"/>
224+
<ColumnDefinition Width="Auto" />
214225
<ColumnDefinition Width="Auto" />
215226
<ColumnDefinition />
216227
</Grid.ColumnDefinitions>
217-
<syncfusion:SfCircularGauge Visibility="Visible" Grid.Row="0" x:Name="CgRamUsage" GaugeHeader="RAM usage (%)"
218-
FontSize="14" HeaderAlignment="Bottom" FontWeight="Bold"
228+
<syncfusion:SfCircularGauge Visibility="Visible" Grid.Row="0" x:Name="CgRamUsage"
229+
GaugeHeader="RAM usage (%)"
230+
FontSize="14" HeaderAlignment="Bottom" FontWeight="Bold"
219231
Margin="5" MaxHeight="350" MaxWidth="350"
220232
MouseDoubleClick="RamStatisticsMenuitem_OnClick">
221233
<syncfusion:SfCircularGauge.Scales>
@@ -227,7 +239,8 @@
227239
</syncfusion:CircularScale>
228240
</syncfusion:SfCircularGauge.Scales>
229241
</syncfusion:SfCircularGauge>
230-
<Separator Visibility="Visible" x:Name="SepGauge" Margin="5,10" Grid.Column="1" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
242+
<Separator Visibility="Visible" x:Name="SepGauge" Margin="5,10" Grid.Column="1"
243+
Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
231244

232245
<Grid Grid.Column="2" VerticalAlignment="Center">
233246
<Grid.RowDefinitions>
@@ -244,18 +257,23 @@
244257
</Grid.RowDefinitions>
245258

246259
<Label Grid.Row="0" Content="{DynamicResource TotalPhysicalMemory}" FontSize="14" Margin="10,5" />
247-
<Label Grid.Row="1" x:Name="LblTotalPhysicalMemory" Content="" FontSize="14" Foreground="Green" Margin="10,5" />
260+
<Label Grid.Row="1" x:Name="LblTotalPhysicalMemory" Content="" FontSize="14" Foreground="Green"
261+
Margin="10,5" />
248262
<Label Grid.Row="2" Content="{DynamicResource UsedPhysicalMemory}" FontSize="14" Margin="10,5" />
249-
<Label Grid.Row="3" x:Name="LblAvailablePhysicalMemory" Content="" FontSize="14" Foreground="Red" Margin="10,5" />
263+
<Label Grid.Row="3" x:Name="LblAvailablePhysicalMemory" Content="" FontSize="14" Foreground="Red"
264+
Margin="10,5" />
250265
</Grid>
251266

252267
<syncfusion:SplitButtonAdv Grid.Row="1" FontSize="14"
253-
SmallIcon="../../Resources/Images/ram_tab.png" Label="{DynamicResource ClearMemory}"
268+
SmallIcon="../../Resources/Images/ram_tab.png"
269+
Label="{DynamicResource ClearMemory}"
254270
x:Name="BtnClearMemory" Click="BtnClearMemory_OnClick" IsMultiLine="False"
255271
MinHeight="25" HorizontalAlignment="Stretch" Margin="10,5">
256272
<syncfusion:DropDownMenuGroup>
257-
<syncfusion:DropDownMenuItem Header="{DynamicResource ClearWorkingSets}" Click="ClearWorkingSetsDropDownMenuItem_OnClick" />
258-
<syncfusion:DropDownMenuItem Header="{DynamicResource ClearFileSystemCache}" Click="ClearFileSystemCacheDropDownMenuItem_OnClick" />
273+
<syncfusion:DropDownMenuItem Header="{DynamicResource ClearWorkingSets}"
274+
Click="ClearWorkingSetsDropDownMenuItem_OnClick" />
275+
<syncfusion:DropDownMenuItem Header="{DynamicResource ClearFileSystemCache}"
276+
Click="ClearFileSystemCacheDropDownMenuItem_OnClick" />
259277
</syncfusion:DropDownMenuGroup>
260278
</syncfusion:SplitButtonAdv>
261279
</Grid>

‎MemPlus/Views/Windows/ProcessAnalyzerWindow.xaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<ContextMenu>
2727
<MenuItem Header="{DynamicResource ClearWorkingSet}" Click="EmptyWorkingSetMenuItem_OnClick">
2828
<MenuItem.Icon>
29-
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/process.png"></Image>
29+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/process.png" />
3030
</MenuItem.Icon>
3131
</MenuItem>
3232
<MenuItem Header="{DynamicResource KillProcess}" Click="KillMenuItem_OnClick">
3333
<MenuItem.Icon>
34-
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/delete.png"></Image>
34+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/delete.png" />
3535
</MenuItem.Icon>
3636
</MenuItem>
3737
<Separator />
@@ -60,10 +60,15 @@
6060
</ListView.ContextMenu>
6161
<ListView.View>
6262
<GridView>
63-
<GridViewColumn Header="{DynamicResource ProcessId}" DisplayMemberBinding="{Binding ProcessId}" utils:GridViewSort.PropertyName="ProcessId" />
64-
<GridViewColumn Header="{DynamicResource ProcessName}" DisplayMemberBinding="{Binding ProcessName}" utils:GridViewSort.PropertyName="ProcessName" />
65-
<GridViewColumn Header="{DynamicResource ProcessLocation}" DisplayMemberBinding="{Binding ProcessLocation}" utils:GridViewSort.PropertyName="ProcessLocation" />
66-
<GridViewColumn Header="{DynamicResource MemoryUsage}" DisplayMemberBinding="{Binding MemoryUsage}" utils:GridViewSort.PropertyName="MemoryUsageLong" />
63+
<GridViewColumn Header="{DynamicResource ProcessId}" DisplayMemberBinding="{Binding ProcessId}"
64+
utils:GridViewSort.PropertyName="ProcessId" />
65+
<GridViewColumn Header="{DynamicResource ProcessName}" DisplayMemberBinding="{Binding ProcessName}"
66+
utils:GridViewSort.PropertyName="ProcessName" />
67+
<GridViewColumn Header="{DynamicResource ProcessLocation}"
68+
DisplayMemberBinding="{Binding ProcessLocation}"
69+
utils:GridViewSort.PropertyName="ProcessLocation" />
70+
<GridViewColumn Header="{DynamicResource MemoryUsage}" DisplayMemberBinding="{Binding MemoryUsage}"
71+
utils:GridViewSort.PropertyName="MemoryUsageLong" />
6772
</GridView>
6873
</ListView.View>
6974
</ListView>
@@ -73,8 +78,10 @@
7378
<ColumnDefinition />
7479
<ColumnDefinition />
7580
</Grid.ColumnDefinitions>
76-
<Button Grid.Column="0" MinHeight="25" Content="{DynamicResource Refresh}" Margin="3" Click="BtnRefresh_OnClick"/>
77-
<Button Grid.Column="1" MinHeight="25" Content="{DynamicResource Export}" Margin="3" Click="BtnExport_OnClick" />
81+
<Button Grid.Column="0" MinHeight="25" Content="{DynamicResource Refresh}" Margin="3"
82+
Click="BtnRefresh_OnClick" />
83+
<Button Grid.Column="1" MinHeight="25" Content="{DynamicResource Export}" Margin="3"
84+
Click="BtnExport_OnClick" />
7885
</Grid>
7986
</Grid>
8087
</syncfusion:ChromelessWindow>

‎MemPlus/Views/Windows/RamAnalyzerWindow.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747
<ColumnDefinition />
4848
<ColumnDefinition />
4949
</Grid.ColumnDefinitions>
50-
<Button Grid.Column="0" MinHeight="25" Content="{DynamicResource Refresh}" Margin="3" Click="BtnRefresh_OnClick"/>
51-
<Button Grid.Column="1" MinHeight="25" Content="{DynamicResource Export}" Margin="3" Click="BtnExport_OnClick" />
50+
<Button Grid.Column="0" MinHeight="25" Content="{DynamicResource Refresh}" Margin="3"
51+
Click="BtnRefresh_OnClick" />
52+
<Button Grid.Column="1" MinHeight="25" Content="{DynamicResource Export}" Margin="3"
53+
Click="BtnExport_OnClick" />
5254
</Grid>
5355
</Grid>
5456
</syncfusion:ChromelessWindow>

0 commit comments

Comments
 (0)