Skip to content

Commit 0eca08b

Browse files
committed
* Added an overlay to display when the GUI is paused
* Compressed image
1 parent 8381124 commit 0eca08b

File tree

7 files changed

+36
-3
lines changed

7 files changed

+36
-3
lines changed

MemPlus/MemPlus.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,8 @@
113113
<ItemGroup>
114114
<Resource Include="Resources\ram.png" />
115115
</ItemGroup>
116+
<ItemGroup>
117+
<Resource Include="Resources\paused.png" />
118+
</ItemGroup>
116119
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
117120
</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
@@ -118,6 +118,9 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="paused" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\paused.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
121124
<data name="ram" type="System.Resources.ResXFileRef, System.Windows.Forms">
122125
<value>..\Resources\ram.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123126
</data>

MemPlus/Resources/paused.png

2.55 KB
Loading

MemPlus/Resources/ram.png

-1.51 KB
Loading

MemPlus/Windows/MainWindow.xaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Title="MemPlus" Height="300" Width="500" WindowStartupLocation="CenterScreen" Icon="/MemPlus;component/Resources/ram.png">
1212
<Grid>
1313
<Grid.RowDefinitions>
14+
<RowDefinition Height="Auto"></RowDefinition>
1415
<RowDefinition Height="Auto"></RowDefinition>
1516
<RowDefinition></RowDefinition>
1617
</Grid.RowDefinitions>
@@ -30,8 +31,9 @@
3031
<Separator />
3132
<MenuItem Header="Logs">
3233
<MenuItem Header="RAM Optimizer log" />
33-
<Separator />
3434
<MenuItem Header="Application logs" />
35+
<Separator />
36+
<MenuItem Header="Clear" Click="ClearLogsMenuItem_OnClick" />
3537
</MenuItem>
3638
<Separator />
3739
<MenuItem Header="GUI">
@@ -54,7 +56,15 @@
5456

5557
</Menu>
5658

57-
<Grid Grid.Row="1" Visibility="Visible">
59+
<Grid Grid.Row="1" x:Name="Overlay" Panel.ZIndex="1000" Visibility="Collapsed" Grid.RowSpan="2">
60+
<Grid.Background>
61+
<SolidColorBrush Color="Black" Opacity="0.5"/>
62+
</Grid.Background>
63+
64+
<Image Source="/MemPlus;component/Resources/paused.png" HorizontalAlignment="Center" VerticalAlignment="Center" Height="96" Width="96" />
65+
</Grid>
66+
67+
<Grid Grid.Row="2" Visibility="Visible">
5868
<Grid.ColumnDefinitions>
5969
<ColumnDefinition></ColumnDefinition>
6070
<ColumnDefinition Width="Auto"></ColumnDefinition>
@@ -93,7 +103,7 @@
93103
<Label Grid.Row="3" Content="Used physical memory:" FontSize="14" Margin="10,5" />
94104
<Label x:Name="LblAvailablePhysicalMemory" Grid.Row="4" Content="" FontSize="14" Foreground="Red" Margin="10,5" />
95105

96-
<Button Grid.Row="5" x:Name="BtnClearMemory" Content="Clear memory" Click="BtnClearMemory_OnClick" Margin="10,5" FontSize="14"/>
106+
<Button Grid.Row="5" x:Name="BtnClearMemory" Content="Clear memory" Click="BtnClearMemory_OnClick" Margin="10,5" FontSize="14" MinHeight="25" />
97107
</Grid>
98108
</Grid>
99109
</Grid>

MemPlus/Windows/MainWindow.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ public MainWindow()
4040
private void Active(object sender, EventArgs args)
4141
{
4242
_ramController.EnableMonitor();
43+
Overlay.Visibility = Visibility.Collapsed;
4344
}
4445

4546
private void Passive(object sender, EventArgs args)
4647
{
4748
_ramController.DisableMonitor();
49+
Overlay.Visibility = Visibility.Visible;
4850
}
4951

5052
private static void LogAddedEvent(Log log)
@@ -91,5 +93,10 @@ private async void BtnClearMemory_OnClick(object sender, RoutedEventArgs e)
9193

9294
_logController.AddLog(new ApplicationLog("Done clearing RAM memory"));
9395
}
96+
97+
private void ClearLogsMenuItem_OnClick(object sender, RoutedEventArgs e)
98+
{
99+
_logController.ClearLogs();
100+
}
94101
}
95102
}

0 commit comments

Comments
 (0)