Skip to content

Commit cc8e645

Browse files
CodeDeadCodeDead
committed
* Added a setting to enable or disable automatic updates
* Further completed the SettingsWindow design * Code improvements
1 parent b8d6368 commit cc8e645

File tree

10 files changed

+103
-18
lines changed

10 files changed

+103
-18
lines changed

‎MemPlus/App.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
<setting name="RamMonitor" serializeAs="String">
3232
<value>True</value>
3333
</setting>
34+
<setting name="AutoUpdate" serializeAs="String">
35+
<value>True</value>
36+
</setting>
3437
</MemPlus.Properties.Settings>
3538
</userSettings>
3639
</configuration>

‎MemPlus/MemPlus.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<ItemGroup>
4545
<Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
4646
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
47+
<SpecificVersion>False</SpecificVersion>
4748
</Reference>
4849
<Reference Include="Microsoft.VisualBasic" />
4950
<Reference Include="Syncfusion.SfGauge.WPF, Version=15.4460.0.20, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
@@ -181,5 +182,8 @@
181182
<ItemGroup>
182183
<Resource Include="Resources\Images\delete.png" />
183184
</ItemGroup>
185+
<ItemGroup>
186+
<Resource Include="Resources\Images\ram_tab.png" />
187+
</ItemGroup>
184188
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
185189
</Project>

‎MemPlus/Properties/Resources.Designer.cs‎

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

‎MemPlus/Properties/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
<data name="ram" type="System.Resources.ResXFileRef, System.Windows.Forms">
155155
<value>..\Resources\Images\ram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
156156
</data>
157+
<data name="ram_tab" type="System.Resources.ResXFileRef, System.Windows.Forms">
158+
<value>..\Resources\Images\ram_tab.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
159+
</data>
157160
<data name="settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
158161
<value>..\Resources\Images\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
159162
</data>

‎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
@@ -26,5 +26,8 @@
2626
<Setting Name="RamMonitor" Type="System.Boolean" Scope="User">
2727
<Value Profile="(Default)">True</Value>
2828
</Setting>
29+
<Setting Name="AutoUpdate" Type="System.Boolean" Scope="User">
30+
<Value Profile="(Default)">True</Value>
31+
</Setting>
2932
</Settings>
3033
</SettingsFile>

‎MemPlus/Resources/Images/ram_tab.png‎

541 Bytes
Loading

‎MemPlus/Windows/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public MainWindow()
3838
_logController.AddLog(new ApplicationLog("Done initializing MainWindow"));
3939
}
4040

41-
private void LoadProperties()
41+
internal void LoadProperties()
4242
{
4343
_logController.AddLog(new ApplicationLog("Loading properties"));
4444
MniDisableInactive.IsChecked = Properties.Settings.Default.DisableOnInactive;

‎MemPlus/Windows/SettingsWindow.xaml‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,46 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:local="clr-namespace:MemPlus.Windows"
87
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
98
mc:Ignorable="d"
109
UseLayoutRounding="True"
1110
TitleTextAlignment="Center"
1211
WindowStartupLocation="CenterScreen"
13-
Title="MemPlus - Settings" Height="300" Width="300">
12+
Title="MemPlus - Settings" Height="300" Width="450" Icon="/MemPlus;component/Resources/Images/ram.png">
1413
<Grid>
15-
14+
<Grid.RowDefinitions>
15+
<RowDefinition></RowDefinition>
16+
<RowDefinition Height="Auto"></RowDefinition>
17+
</Grid.RowDefinitions>
18+
<syncfusion:TabControlExt CloseButtonType="Hide" EnableLabelEdit="False"
19+
AllowDragDrop="False" DefaultContextMenuItemVisibility="Hidden">
20+
<syncfusion:TabItemExt Header="General"
21+
Image="../Resources/Images/settings.png"
22+
ImageWidth="16" ImageHeight="16">
23+
24+
</syncfusion:TabItemExt>
25+
26+
<syncfusion:TabItemExt Header="Memory Optimizer"
27+
Image="../Resources/Images/ram_tab.png"
28+
ImageWidth="16" ImageHeight="16">
29+
30+
</syncfusion:TabItemExt>
31+
32+
<syncfusion:TabItemExt Header="Theme"
33+
Image="../Resources/Images/home.png"
34+
ImageWidth="16" ImageHeight="16">
35+
36+
</syncfusion:TabItemExt>
37+
</syncfusion:TabControlExt>
38+
39+
<Grid Grid.Row="1">
40+
<Grid.ColumnDefinitions>
41+
<ColumnDefinition></ColumnDefinition>
42+
<ColumnDefinition></ColumnDefinition>
43+
</Grid.ColumnDefinitions>
44+
45+
<Button Content="Reset" Margin="5" MinHeight="25" Click="BtnReset_OnClick" />
46+
<Button Grid.Column="1" Content="Save" Margin="5" MinHeight="25" Click="BtnSave_OnClick" />
47+
</Grid>
1648
</Grid>
1749
</syncfusion:ChromelessWindow>

‎MemPlus/Windows/SettingsWindow.xaml.cs‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using System.Windows;
7-
using System.Windows.Controls;
8-
using System.Windows.Data;
9-
using System.Windows.Documents;
10-
using System.Windows.Input;
11-
using System.Windows.Media;
12-
using System.Windows.Media.Imaging;
13-
using System.Windows.Shapes;
1+
using System.Windows;
142
using MemPlus.Classes.GUI;
153
using MemPlus.Classes.LOG;
164

@@ -27,11 +15,16 @@ public partial class SettingsWindow
2715

2816
public SettingsWindow(MainWindow mainWindow, LogController logController)
2917
{
18+
_logController = logController;
19+
_logController.AddLog(new ApplicationLog("Initializing SettingsWindow"));
20+
3021
InitializeComponent();
3122
ChangeVisualStyle();
23+
LoadSettings();
3224

3325
_mainWindow = mainWindow;
34-
_logController = logController;
26+
27+
_logController.AddLog(new ApplicationLog("Done initializing SettingsWindow"));
3528
}
3629

3730
/// <summary>
@@ -55,7 +48,32 @@ private void SaveSettings()
5548
{
5649
//TODO
5750
Properties.Settings.Default.Save();
51+
52+
_mainWindow.ChangeVisualStyle();
53+
_mainWindow.LoadProperties();
54+
5855
_logController.AddLog(new ApplicationLog("Settings have been saved"));
56+
57+
MessageBox.Show("All settings have been saved!", "MemPlus", MessageBoxButton.OK, MessageBoxImage.Information);
58+
}
59+
60+
private void ResetSettings()
61+
{
62+
Properties.Settings.Default.Reset();
63+
Properties.Settings.Default.Save();
64+
65+
_mainWindow.ChangeVisualStyle();
66+
_mainWindow.LoadProperties();
67+
}
68+
69+
private void BtnReset_OnClick(object sender, RoutedEventArgs e)
70+
{
71+
ResetSettings();
72+
}
73+
74+
private void BtnSave_OnClick(object sender, RoutedEventArgs e)
75+
{
76+
SaveSettings();
5977
}
6078
}
6179
}

0 commit comments

Comments
 (0)