Skip to content

Commit adb97b7

Browse files
CodeDeadCodeDead
committed
* Code optimisations
* Design changes
1 parent 9acbe29 commit adb97b7

File tree

6 files changed

+50
-25
lines changed

6 files changed

+50
-25
lines changed

‎MemPlus/App.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<setting name="BorderThickness" serializeAs="String">
2020
<value>3</value>
2121
</setting>
22+
<setting name="FileSystemCache" serializeAs="String">
23+
<value>True</value>
24+
</setting>
2225
</MemPlus.Properties.Settings>
2326
</userSettings>
2427
</configuration>

‎MemPlus/Classes/RAM/RamController.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ internal RamController(Dispatcher dispatcher, SfCircularGauge gauge, int timerIn
3737
internal void EnableMonitor()
3838
{
3939
if (_ramTimer.Enabled) return;
40-
4140
_ramTimer.Enabled = true;
4241
OnTimedEvent(null, null);
4342
}

‎MemPlus/Properties/Settings.Designer.cs‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MemPlus/Properties/Settings.settings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@
1111
<Setting Name="BorderThickness" Type="System.Int32" Scope="User">
1212
<Value Profile="(Default)">3</Value>
1313
</Setting>
14+
<Setting Name="FileSystemCache" Type="System.Boolean" Scope="User">
15+
<Value Profile="(Default)">True</Value>
16+
</Setting>
1417
</Settings>
1518
</SettingsFile>

‎MemPlus/Windows/MainWindow.xaml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<Grid.RowDefinitions>
1414
<RowDefinition Height="Auto"></RowDefinition>
1515
<RowDefinition></RowDefinition>
16-
<RowDefinition Height="Auto"></RowDefinition>
1716
</Grid.RowDefinitions>
18-
<Menu>
19-
<MenuItem Header="File">
17+
18+
<Menu IsMainMenu="True">
19+
<MenuItem Header="_File">
2020
<MenuItem Header="Export">
2121
<MenuItem Header="RAM usage" />
2222
<MenuItem Header="Application logs" />
@@ -25,7 +25,7 @@
2525
<MenuItem Header="Exit" />
2626
</MenuItem>
2727

28-
<MenuItem Header="Tools">
28+
<MenuItem Header="_Tools">
2929
<MenuItem Header="RAM Analyzer"></MenuItem>
3030
<Separator />
3131
<MenuItem Header="Logs">
@@ -35,7 +35,7 @@
3535
<MenuItem Header="Settings" />
3636
</MenuItem>
3737

38-
<MenuItem Header="Help">
38+
<MenuItem Header="_Help">
3939
<MenuItem Header="Help" />
4040
<Separator />
4141
<MenuItem Header="Check for updates" />
@@ -49,26 +49,28 @@
4949

5050
</Menu>
5151

52-
<syncfusion:SfCircularGauge Grid.Row="1" x:Name="CgRamUsage"
53-
GaugeHeader="RAM usage (%)"
54-
FontSize="14" HeaderAlignment="Bottom"
55-
Margin="5" MaxHeight="350" MaxWidth="350">
56-
<syncfusion:SfCircularGauge.Scales>
57-
<syncfusion:CircularScale >
58-
<syncfusion:CircularScale.Ranges>
59-
<syncfusion:CircularRange StartValue="80" EndValue="100" Stroke="Red" />
60-
</syncfusion:CircularScale.Ranges>
61-
</syncfusion:CircularScale>
62-
</syncfusion:SfCircularGauge.Scales>
63-
</syncfusion:SfCircularGauge>
64-
65-
<Grid Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
52+
<Grid Grid.Row="1" Visibility="Visible">
6653
<Grid.RowDefinitions>
6754
<RowDefinition></RowDefinition>
68-
<RowDefinition></RowDefinition>
55+
<RowDefinition Height="Auto"></RowDefinition>
6956
</Grid.RowDefinitions>
70-
<CheckBox x:Name="ChbFileSystemCache" Content="Clear FileSystem standby cache"></CheckBox>
71-
<Button Grid.Row="1" Content="Clear memory" Click="BtnClearMemory_OnClick" MinHeight="25" />
57+
58+
<syncfusion:SfCircularGauge Grid.Row="0" x:Name="CgRamUsage"
59+
GaugeHeader="RAM usage (%)"
60+
FontSize="14" HeaderAlignment="Bottom"
61+
FontWeight="Bold"
62+
Margin="5" MaxHeight="350" MaxWidth="350">
63+
<syncfusion:SfCircularGauge.Scales>
64+
<syncfusion:CircularScale >
65+
<syncfusion:CircularScale.Ranges>
66+
<syncfusion:CircularRange StartValue="0" EndValue="80" Stroke="#666666" />
67+
<syncfusion:CircularRange StartValue="80" EndValue="100" Stroke="Red" />
68+
</syncfusion:CircularScale.Ranges>
69+
</syncfusion:CircularScale>
70+
</syncfusion:SfCircularGauge.Scales>
71+
</syncfusion:SfCircularGauge>
72+
73+
<Button x:Name="BtnClearMemory" Grid.Row="1" Content="Clear memory" Click="BtnClearMemory_OnClick" MinHeight="25" />
7274
</Grid>
7375
</Grid>
7476
</syncfusion:ChromelessWindow>

‎MemPlus/Windows/MainWindow.xaml.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Windows;
3+
using System.Windows.Media;
34
using MemPlus.Classes;
45
using MemPlus.Classes.RAM;
56

@@ -25,22 +26,27 @@ public MainWindow()
2526
internal void ChangeVisualStyle()
2627
{
2728
StyleManager.ChangeStyle(this);
29+
CgRamUsage.Scales[0].Ranges[0].Stroke = new SolidColorBrush(Properties.Settings.Default.MetroColor);
2830
}
2931

3032
private async void BtnClearMemory_OnClick(object sender, RoutedEventArgs e)
3133
{
3234
try
3335
{
34-
await _ramController.ClearMemory(ChbFileSystemCache.IsChecked != null && ChbFileSystemCache.IsChecked.Value);
36+
BtnClearMemory.IsEnabled = false;
37+
38+
await _ramController.ClearMemory(true);
3539
double ramSavings = _ramController.RamSavings / 1024 / 1024;
3640
if (ramSavings < 0)
3741
{
3842
MessageBox.Show("Looks like your RAM usage has increased with " + Math.Abs(ramSavings).ToString("F2") + "MB!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);
3943
}
4044
else
4145
{
42-
MessageBox.Show("You saved " + ramSavings.ToString("F2") + "MB of RAM memory!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);
46+
MessageBox.Show("You saved " + ramSavings.ToString("F2") + "MB of RAM!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);
4347
}
48+
49+
BtnClearMemory.IsEnabled = true;
4450
}
4551
catch (Exception ex)
4652
{

0 commit comments

Comments
 (0)