Skip to content

Commit 025e91c

Browse files
committed
* Added restart capabilities
1 parent 2d9229a commit 025e91c

File tree

3 files changed

+33
-4
lines changed

3 files changed

+33
-4
lines changed

MemPlus.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2026
4+
VisualStudioVersion = 15.0.27130.2036
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemPlus", "MemPlus\MemPlus.csproj", "{DB7B448C-7643-4B9E-AA41-ED67DD02E3A9}"
77
EndProject

MemPlus/Views/Windows/MainWindow.xaml

+13-3
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,23 @@
2727
<ContextMenu>
2828
<MenuItem Header="MemPlus" Click="OpenTbItem_Click">
2929
<MenuItem.Icon>
30-
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/ram.png"></Image>
30+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/ram.png" />
3131
</MenuItem.Icon>
3232
</MenuItem>
3333
<MenuItem Header="Settings" Click="SettingsMenuItem_OnClick">
3434
<MenuItem.Icon>
35-
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/settings.png"></Image>
35+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/settings.png" />
3636
</MenuItem.Icon>
3737
</MenuItem>
3838
<Separator></Separator>
39+
<MenuItem Header="Restart" Click="RestartMenuItem_OnClick">
40+
<MenuItem.Icon>
41+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/paused.png" />
42+
</MenuItem.Icon>
43+
</MenuItem>
3944
<MenuItem Header="Exit" Click="ExitMenuItem_OnClick">
4045
<MenuItem.Icon>
41-
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/exit.png"></Image>
46+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/exit.png" />
4247
</MenuItem.Icon>
4348
</MenuItem>
4449
</ContextMenu>
@@ -76,6 +81,11 @@
7681
</MenuItem>
7782
</MenuItem>
7883
<Separator />
84+
<MenuItem Header="Restart" Click="RestartMenuItem_OnClick">
85+
<MenuItem.Icon>
86+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/paused.png" />
87+
</MenuItem.Icon>
88+
</MenuItem>
7989
<MenuItem Header="Exit" Click="ExitMenuItem_OnClick">
8090
<MenuItem.Icon>
8191
<Image Width="16" Height="16" Source="/Resources/Images/exit.png"/>

MemPlus/Views/Windows/MainWindow.xaml.cs

+19
Original file line numberDiff line numberDiff line change
@@ -656,5 +656,24 @@ private void ExportAllLogsMenuItem_OnClick(object sender, RoutedEventArgs e)
656656
{
657657
ExportLogs(null);
658658
}
659+
660+
/// <summary>
661+
/// Method that is called when the application should restart
662+
/// </summary>
663+
/// <param name="sender">The object that called this method</param>
664+
/// <param name="e">The RoutedEventArgs</param>
665+
private void RestartMenuItem_OnClick(object sender, RoutedEventArgs e)
666+
{
667+
try
668+
{
669+
System.Diagnostics.Process.Start(Application.ResourceAssembly.Location);
670+
Application.Current.Shutdown();
671+
}
672+
catch (Exception ex)
673+
{
674+
_logController.AddLog(new ApplicationLog(ex.Message));
675+
MessageBox.Show(ex.Message, "MemPlus", MessageBoxButton.OK, MessageBoxImage.Error);
676+
}
677+
}
659678
}
660679
}

0 commit comments

Comments
 (0)