* Added Export capabilities to some context menu's

CodeDead · CodeDead · commit 0b907169fe33 · 2018-03-03T19:59:06.000+01:00
* Refactoring
* Minor design changes
diff --git a/MemPlus/Business/EXPORT/ExportTypes.cs b/MemPlus/Business/EXPORT/ExportTypes.cs
@@ -1,4 +1,4 @@
-﻿namespace MemPlus.Business.Classes.EXPORT
+﻿namespace MemPlus.Business.EXPORT
 {
     /// <summary>
     /// Sealed class containing all different export types that MemPlus supports
diff --git a/MemPlus/Business/GUI/StyleManager.cs b/MemPlus/Business/GUI/StyleManager.cs
@@ -3,7 +3,7 @@
 using System.Windows.Media;
 using Syncfusion.Windows.Shared;
 
-namespace MemPlus.Business.Classes.GUI
+namespace MemPlus.Business.GUI
 {
     /// <summary>
     /// Static class to change the style of an object
diff --git a/MemPlus/Business/LOG/ApplicationLog.cs b/MemPlus/Business/LOG/ApplicationLog.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/MemPlus/Business/LOG/ILogMethods.cs b/MemPlus/Business/LOG/ILogMethods.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <summary>
     /// Interface containing methods that are required for Log objects
diff --git a/MemPlus/Business/LOG/Log.cs b/MemPlus/Business/LOG/Log.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/MemPlus/Business/LOG/LogController.cs b/MemPlus/Business/LOG/LogController.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Timers;
-using MemPlus.Business.Classes.EXPORT;
+using MemPlus.Business.EXPORT;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <summary>
     /// Class containing methods to control logs
diff --git a/MemPlus/Business/LOG/LogExporter.cs b/MemPlus/Business/LOG/LogExporter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <summary>
     /// Static class containing the logic for exporting logs
diff --git a/MemPlus/Business/LOG/RamLog.cs b/MemPlus/Business/LOG/RamLog.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace MemPlus.Business.Classes.LOG
+namespace MemPlus.Business.LOG
 {
     /// <inheritdoc />
     /// <summary>
diff --git a/MemPlus/Business/RAM/RamController.cs b/MemPlus/Business/RAM/RamController.cs
@@ -4,11 +4,11 @@
 using System.Timers;
 using System.Windows.Controls;
 using System.Windows.Threading;
-using MemPlus.Business.Classes.LOG;
+using MemPlus.Business.LOG;
 using Microsoft.VisualBasic.Devices;
 using Syncfusion.UI.Xaml.Gauges;
 
-namespace MemPlus.Business.Classes.RAM
+namespace MemPlus.Business.RAM
 {
     /// <summary>
     /// Sealed class containing methods and interaction logic in terms of RAM
diff --git a/MemPlus/Business/RAM/RamData.cs b/MemPlus/Business/RAM/RamData.cs
@@ -1,4 +1,4 @@
-﻿namespace MemPlus.Business.Classes.RAM
+﻿namespace MemPlus.Business.RAM
 {
     /// <summary>
     /// ViewModal for displaying RAM information inside a treeview
diff --git a/MemPlus/Business/RAM/RamOptimizer.cs b/MemPlus/Business/RAM/RamOptimizer.cs
@@ -4,9 +4,9 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
-using MemPlus.Business.Classes.LOG;
+using MemPlus.Business.LOG;
 
-namespace MemPlus.Business.Classes.RAM
+namespace MemPlus.Business.RAM
 {
     /// <summary>
     /// System Cache Information structure for x86 working set
diff --git a/MemPlus/Business/RAM/RamStick.cs b/MemPlus/Business/RAM/RamStick.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace MemPlus.Business.Classes.RAM
+namespace MemPlus.Business.RAM
 {
     /// <summary>
     /// Internal sealed class containing logic behind a physical RAM stick
diff --git a/MemPlus/Business/RAM/RamSticksExporter.cs b/MemPlus/Business/RAM/RamSticksExporter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace MemPlus.Business.Classes.RAM
+namespace MemPlus.Business.RAM
 {
     /// <summary>
     /// Static class that can be used to export RamStick information
diff --git a/MemPlus/Business/UTILS/Utils.cs b/MemPlus/Business/UTILS/Utils.cs
@@ -1,9 +1,9 @@
 ﻿using System.Collections.Generic;
 using System.Management;
 using System.Security.Principal;
-using MemPlus.Business.Classes.RAM;
+using MemPlus.Business.RAM;
 
-namespace MemPlus.Business.Classes.UTILS
+namespace MemPlus.Business.UTILS
 {
     /// <summary>
     /// Static class containing utility code that can be used by different objects
diff --git a/MemPlus/MemPlus.csproj b/MemPlus/MemPlus.csproj
@@ -86,11 +86,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Business\Classes\EXPORT\ExportTypes.cs" />
-    <Compile Include="Business\Classes\RAM\RamData.cs" />
-    <Compile Include="Business\Classes\RAM\RamSticksExporter.cs" />
-    <Compile Include="Business\Classes\RAM\RamStick.cs" />
-    <Compile Include="Business\Classes\UTILS\Utils.cs" />
+    <Compile Include="Business\EXPORT\ExportTypes.cs" />
+    <Compile Include="Business\RAM\RamData.cs" />
+    <Compile Include="Business\RAM\RamSticksExporter.cs" />
+    <Compile Include="Business\RAM\RamStick.cs" />
+    <Compile Include="Business\UTILS\Utils.cs" />
     <Compile Include="Views\Windows\AnalyzerWindow.xaml.cs">
       <DependentUpon>AnalyzerWindow.xaml</DependentUpon>
     </Compile>
@@ -117,15 +117,15 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Business\Classes\LOG\ApplicationLog.cs" />
-    <Compile Include="Business\Classes\LOG\ILogMethods.cs" />
-    <Compile Include="Business\Classes\LOG\Log.cs" />
-    <Compile Include="Business\Classes\LOG\LogController.cs" />
-    <Compile Include="Business\Classes\LOG\LogExporter.cs" />
-    <Compile Include="Business\Classes\LOG\RamLog.cs" />
-    <Compile Include="Business\Classes\RAM\RamController.cs" />
-    <Compile Include="Business\Classes\RAM\RamOptimizer.cs" />
-    <Compile Include="Business\Classes\GUI\StyleManager.cs" />
+    <Compile Include="Business\LOG\ApplicationLog.cs" />
+    <Compile Include="Business\LOG\ILogMethods.cs" />
+    <Compile Include="Business\LOG\Log.cs" />
+    <Compile Include="Business\LOG\LogController.cs" />
+    <Compile Include="Business\LOG\LogExporter.cs" />
+    <Compile Include="Business\LOG\RamLog.cs" />
+    <Compile Include="Business\RAM\RamController.cs" />
+    <Compile Include="Business\RAM\RamOptimizer.cs" />
+    <Compile Include="Business\GUI\StyleManager.cs" />
     <Compile Include="Views\Windows\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
diff --git a/MemPlus/Views/Windows/AboutWindow.xaml.cs b/MemPlus/Views/Windows/AboutWindow.xaml.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Input;
-using MemPlus.Business.Classes.GUI;
-using MemPlus.Business.Classes.LOG;
+using MemPlus.Business.GUI;
+using MemPlus.Business.LOG;
 
 namespace MemPlus.Views.Windows
 {
diff --git a/MemPlus/Views/Windows/AnalyzerWindow.xaml b/MemPlus/Views/Windows/AnalyzerWindow.xaml
@@ -8,7 +8,7 @@
     mc:Ignorable="d"
     UseLayoutRounding="True"
     TitleTextAlignment="Center"
-    Title="MemPlus - RAM Analyzer" Height="350" Width="500"
+    Title="MemPlus - RAM Analyzer" Height="300" Width="350"
     Icon="/MemPlus;component/Resources/Images/ram.png"
     WindowStartupLocation="CenterScreen">
     <Grid>
@@ -25,6 +25,11 @@
                         </MenuItem.Icon>
                     </MenuItem>
                     <Separator />
+                    <MenuItem Header="Export" Click="BtnExport_OnClick">
+                        <MenuItem.Icon>
+                            <Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/export.png"></Image>
+                        </MenuItem.Icon>
+                    </MenuItem>
                     <MenuItem Header="Refresh" Click="BtnRefresh_OnClick">
                         <MenuItem.Icon>
                             <Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/paused.png" />
diff --git a/MemPlus/Views/Windows/AnalyzerWindow.xaml.cs b/MemPlus/Views/Windows/AnalyzerWindow.xaml.cs
@@ -3,10 +3,10 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MemPlus.Business.Classes.GUI;
-using MemPlus.Business.Classes.LOG;
-using MemPlus.Business.Classes.RAM;
-using MemPlus.Business.Classes.UTILS;
+using MemPlus.Business.GUI;
+using MemPlus.Business.LOG;
+using MemPlus.Business.RAM;
+using MemPlus.Business.UTILS;
 using Microsoft.Win32;
 
 namespace MemPlus.Views.Windows
diff --git a/MemPlus/Views/Windows/LogWindow.xaml b/MemPlus/Views/Windows/LogWindow.xaml
@@ -34,6 +34,12 @@
                             <Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/exit.png" />
                         </MenuItem.Icon>
                     </MenuItem>
+                    <Separator />
+                    <MenuItem Header="Export" Click="BtnExport_OnClick">
+                        <MenuItem.Icon>
+                            <Image Width="16" Height="16" Source="/MemPlus;component/Resources/Images/export.png"></Image>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
             </ListView.ContextMenu>
             <ListView.View>
@@ -49,8 +55,8 @@
                 <ColumnDefinition />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" MinHeight="25" Margin="5" Content="Export" Click="BtnExport_OnClick" />
-            <Button Grid.Column="1" MinHeight="25" Margin="5" Content="Clear logs" Click="BtnClear_OnClick" />
+            <Button Grid.Column="0" MinHeight="25" Margin="3" Content="Export" Click="BtnExport_OnClick" />
+            <Button Grid.Column="1" MinHeight="25" Margin="3" Content="Clear logs" Click="BtnClear_OnClick" />
         </Grid>
     </Grid>
 </syncfusion:ChromelessWindow>
diff --git a/MemPlus/Views/Windows/LogWindow.xaml.cs b/MemPlus/Views/Windows/LogWindow.xaml.cs
@@ -6,9 +6,9 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using MemPlus.Business.Classes.EXPORT;
-using MemPlus.Business.Classes.GUI;
-using MemPlus.Business.Classes.LOG;
+using MemPlus.Business.EXPORT;
+using MemPlus.Business.GUI;
+using MemPlus.Business.LOG;
 using Microsoft.Win32;
 
 namespace MemPlus.Views.Windows
diff --git a/MemPlus/Views/Windows/MainWindow.xaml b/MemPlus/Views/Windows/MainWindow.xaml
@@ -203,7 +203,7 @@
                 <Label Grid.Row="2" Content="Used physical memory:" FontSize="14" Margin="10,5" />
                 <Label Grid.Row="3" x:Name="LblAvailablePhysicalMemory" Content="" FontSize="14" Foreground="Red" Margin="10,5" />
 
-                <syncfusion:SplitButtonAdv Grid.Row="4" FontSize="14" SmallIcon="../../Resources/Images/ram_tab.png" Label="Clear memory" x:Name="BtnClearMemory" Click="BtnClearMemory_OnClick" IsMultiLine="False">
+                <syncfusion:SplitButtonAdv Grid.Row="4" FontSize="14" SmallIcon="../../Resources/Images/ram_tab.png" Label="Clear memory" x:Name="BtnClearMemory" Click="BtnClearMemory_OnClick" IsMultiLine="False" HorizontalAlignment="Stretch" Margin="10,5">
                     <syncfusion:DropDownMenuGroup>
                         <syncfusion:DropDownMenuItem Header="Clear Working sets" Click="ClearWorkingSetsDropDownMenuItem_OnClick"/>
                         <syncfusion:DropDownMenuItem Header="Clear FileSystem cache" Click="ClearFileSystemCacheDropDownMenuItem_OnClick"/>
diff --git a/MemPlus/Views/Windows/MainWindow.xaml.cs b/MemPlus/Views/Windows/MainWindow.xaml.cs
@@ -5,11 +5,11 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using Hardcodet.Wpf.TaskbarNotification;
-using MemPlus.Business.Classes.EXPORT;
-using MemPlus.Business.Classes.GUI;
-using MemPlus.Business.Classes.LOG;
-using MemPlus.Business.Classes.RAM;
-using MemPlus.Business.Classes.UTILS;
+using MemPlus.Business.EXPORT;
+using MemPlus.Business.GUI;
+using MemPlus.Business.LOG;
+using MemPlus.Business.RAM;
+using MemPlus.Business.UTILS;
 using Microsoft.Win32;
 
 namespace MemPlus.Views.Windows
diff --git a/MemPlus/Views/Windows/SettingsWindow.xaml b/MemPlus/Views/Windows/SettingsWindow.xaml
@@ -39,13 +39,13 @@
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
 
-                            <CheckBox Grid.Row="0" x:Name="ChbAutoStart" Content="Automatic start MemPlus when Windows starts" Margin="3" />
-                            <CheckBox Grid.Row="1" x:Name="ChbStartHidden" Content="Hide MemPlus on startup" Margin="3" />
-                            <CheckBox Grid.Row="2" x:Name="ChbStartMinimized" Content="Start MemPlus minimized" Margin="3" />
-                            <CheckBox Grid.Row="3" x:Name="ChbAutoUpdate" Content="Automatic updates" Margin="3" />
+                            <CheckBox Grid.Row="0" x:Name="ChbAutoUpdate" Content="Automatic updates" Margin="3" />
+                            <CheckBox Grid.Row="1" x:Name="ChbAutoStart" Content="Automatic start MemPlus when Windows starts" Margin="3" />
+                            <CheckBox Grid.Row="2" x:Name="ChbStartHidden" Content="Hide MemPlus on startup" Margin="3" />
+                            <CheckBox Grid.Row="3" x:Name="ChbStartMinimized" Content="Start MemPlus minimized" Margin="3" />
                             <CheckBox Grid.Row="4" x:Name="ChbTopmost" Content="Topmost" Margin="3" />
-                            <CheckBox Grid.Row="5" x:Name="ChbNotifyIcon" Content="Display notifyicon" Margin="3" />
-                            <CheckBox Grid.Row="6" x:Name="ChbWindowDraggable" Content="Allow windows to be dragged by clicking anywhere" Margin="3" />
+                            <CheckBox Grid.Row="5" x:Name="ChbWindowDraggable" Content="Window draggable" Margin="3" />
+                            <CheckBox Grid.Row="6" x:Name="ChbNotifyIcon" Content="Display notifyicon" Margin="3" />
                             <CheckBox Grid.Row="7" x:Name="ChbAdminWarning" Content="Display administrative rights warning" Margin="3" />
                             <CheckBox Grid.Row="8" x:Name="ChbRamClearingMessage" Content="Display information after clearing RAM" Margin="3" />
                         </Grid>
@@ -231,8 +231,8 @@
                 <ColumnDefinition />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Button Content="Reset" Margin="5" MinHeight="25" Click="BtnReset_OnClick" />
-            <Button Grid.Column="1" Content="Save" Margin="5" MinHeight="25" Click="BtnSave_OnClick" />
+            <Button Content="Reset" Margin="3" MinHeight="25" Click="BtnReset_OnClick" />
+            <Button Grid.Column="1" Content="Save" Margin="3" MinHeight="25" Click="BtnSave_OnClick" />
         </Grid>
     </Grid>
 </syncfusion:ChromelessWindow>
diff --git a/MemPlus/Views/Windows/SettingsWindow.xaml.cs b/MemPlus/Views/Windows/SettingsWindow.xaml.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using MemPlus.Business.Classes.GUI;
-using MemPlus.Business.Classes.LOG;
+using MemPlus.Business.GUI;
+using MemPlus.Business.LOG;
 using Microsoft.Win32;
 
 namespace MemPlus.Views.Windows

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace MemPlus.Business.Classes.EXPORT`
	`1`	`+namespace MemPlus.Business.EXPORT`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Sealed class containing all different export types that MemPlus supports`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Windows.Media;`
`4`	`4`	`using Syncfusion.Windows.Shared;`
`5`	`5`
`6`		`-namespace MemPlus.Business.Classes.GUI`
	`6`	`+namespace MemPlus.Business.GUI`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Static class to change the style of an object`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace MemPlus.Business.Classes.LOG`
	`3`	`+namespace MemPlus.Business.LOG`
`4`	`4`	`{`
`5`	`5`	`/// <inheritdoc />`
`6`	`6`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
`4`	`4`
`5`		`-namespace MemPlus.Business.Classes.LOG`
	`5`	`+namespace MemPlus.Business.LOG`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Static class containing the logic for exporting logs`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace MemPlus.Business.Classes.RAM`
	`1`	`+namespace MemPlus.Business.RAM`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// ViewModal for displaying RAM information inside a treeview`