Skip to content

Commit 0cca5c0

Browse files
committed
* Added ability export all logs
* Minor design changes
1 parent 6745839 commit 0cca5c0

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

MemPlus/Windows/MainWindow.xaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,21 @@
5959
<MenuItem.Icon>
6060
<Image Width="16" Height="16" Source="/Resources/Images/export.png"/>
6161
</MenuItem.Icon>
62-
<MenuItem Header="RAM logs" Click="RamExportMenuItem_OnClick" />
63-
<MenuItem Header="Application logs" Click="ApplicationExportMenuItem_OnClick"/>
62+
<MenuItem Header="Logs">
63+
<MenuItem.Icon>
64+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/log.png" />
65+
</MenuItem.Icon>
66+
<MenuItem Header="All logs" Click="ExportAllLogsMenuItem_OnClick" />
67+
<Separator />
68+
<MenuItem Header="RAM logs" Click="RamExportMenuItem_OnClick" />
69+
<MenuItem Header="Application logs" Click="ApplicationExportMenuItem_OnClick"/>
70+
</MenuItem>
6471
<Separator />
65-
<MenuItem Header="RAM Analyzer data" Click="ExportRamAnalyzerDataMenuItem_OnClick"/>
72+
<MenuItem Header="RAM Analyzer data" Click="ExportRamAnalyzerDataMenuItem_OnClick">
73+
<MenuItem.Icon>
74+
<Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/ram_tab.png" />
75+
</MenuItem.Icon>
76+
</MenuItem>
6677
</MenuItem>
6778
<Separator />
6879
<MenuItem Header="Exit" Click="ExitMenuItem_OnClick">
@@ -76,7 +87,7 @@
7687
<MenuItem x:Name="MniRamMonitor" Header="RAM Monitor" IsCheckable="True" Checked="RamMonitorMenuItem_OnCheckedChanged" Unchecked="RamMonitorMenuItem_OnCheckedChanged" />
7788
<MenuItem Header="RAM Analyzer" Click="RamAnalyzerMenuItem_OnClick">
7889
<MenuItem.Icon>
79-
<Image Width="16" Height="16" Source="/Resources/Images/ram.png"/>
90+
<Image Width="16" Height="16" Source="/Resources/Images/ram_tab.png"/>
8091
</MenuItem.Icon>
8192
</MenuItem>
8293
<Separator />

MemPlus/Windows/MainWindow.xaml.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ private void AboutMenuItem_OnClick(object sender, RoutedEventArgs e)
340340
/// <summary>
341341
/// Method that is called when Log objects from a specific type should be exported
342342
/// </summary>
343-
/// <param name="logType">The LogType that should be exported</param>
344-
private void ExportLogs(LogType logType)
343+
/// <param name="logType">The LogType that should be exported. Null to export all logs</param>
344+
private void ExportLogs(LogType? logType)
345345
{
346346
SaveFileDialog sfd = new SaveFileDialog
347347
{
@@ -601,5 +601,15 @@ private void MainWindow_OnClosing(object sender, CancelEventArgs e)
601601
{
602602
TbiIcon.Visibility = Visibility.Hidden;
603603
}
604+
605+
/// <summary>
606+
/// Method that is called when all logs should be exported
607+
/// </summary>
608+
/// <param name="sender">The object that called this method</param>
609+
/// <param name="e">The RoutedEventArgs</param>
610+
private void ExportAllLogsMenuItem_OnClick(object sender, RoutedEventArgs e)
611+
{
612+
ExportLogs(null);
613+
}
604614
}
605615
}

0 commit comments

Comments
 (0)