beta v0.0.10

- Add hotkey Menu (M), Overlay (M, O), Reset (M, R)
bayoen · Oct 14, 2018 · fc1ed36 · fc1ed36
1 parent f1aae3d
commit fc1ed36
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 31 deletions.
diff --git a/.vs/bayoen-star/v15/.suo b/.vs/bayoen-star/v15/.suo
diff --git a/.vs/bayoen-star/v15/Server/sqlite3/storage.ide b/.vs/bayoen-star/v15/Server/sqlite3/storage.ide
diff --git a/.vs/bayoen-star/v15/Server/sqlite3/storage.ide-wal b/.vs/bayoen-star/v15/Server/sqlite3/storage.ide-wal
diff --git a/bayoen-star-exe/DisplayGrid.cs b/bayoen-star-exe/DisplayGrid.cs
@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-using System.Threading.Tasks;
-
-using js = Newtonsoft.Json;
-using jl = Newtonsoft.Json.Linq;
+using System.Collections.Generic;
 using System.Windows.Controls;
-using System.Windows.Media;
 using System.Windows;
-using System.Windows.Media.Imaging;
 
 namespace bayoen
 {

diff --git a/bayoen-star-exe/MainWindow.xaml b/bayoen-star-exe/MainWindow.xaml
@@ -10,6 +10,7 @@
                  ResizeMode="NoResize"
                  Height="120" Width="525"
                  MouseLeftButtonDown="MetroWindow_MouseLeftButtonDown"
+                 KeyDown="MetroWindow_KeyDown"
                  Closing="MetroWindow_Closing">
 
     <!--Titlebar buttons-->
@@ -35,7 +36,7 @@
 
             <TextBlock x:Name="StatusTextBlock" Margin="8,3,8,3" Foreground="DimGray" IsEnabled="False"/>
 
-            <Button x:Name ="MenuButton" Background="Transparent" Click="MenuButton_Click">
+            <Button x:Name ="MenuButton" Background="Transparent" ToolTip="Hotkey 'M'" Click="MenuButton_Click">
                 <StackPanel Orientation="Horizontal">
                     <Rectangle Margin="3,6,5,3">
                         <Rectangle.OpacityMask>
@@ -46,7 +47,7 @@
                 </StackPanel>
 
                 <Button.ContextMenu>
-                    <ContextMenu x:Name="TopContextMenu">
+                    <ContextMenu x:Name="TopContextMenu" KeyDown="TopContextMenu_KeyDown" >
                         <ContextMenu.ItemsSource>
                             <CompositeCollection x:Name="TopCompositeCollection"/>
                         </ContextMenu.ItemsSource>

diff --git a/bayoen-star-exe/MainWindow.xaml.cs b/bayoen-star-exe/MainWindow.xaml.cs
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
@@ -42,7 +43,7 @@ public MainWindow()
         public DisplayGrid OverlayDisplay;
         public List<TextBox> Monitors;
 
-        public const string versionText = " - Beta v0.0.9";
+        public const string versionText = " - Beta v0.0.10";
         public const string pptName = "puyopuyotetris";
         public const string prefName = "pref.json";
         public const string exportFolderName = "export";
@@ -1132,6 +1133,17 @@ private void FixOverlay()
             this.Overlay.Top = this.pptRect.Top - this.preferences.Overlay[2];
         }
 
+        private void Reset()
+        {
+            this.countingStar = new List<int>() { 0, 0 };
+            this.countingCrown = new List<int>() { 0, 0 };
+
+            this.CheckContainers();
+            this.ToMonitors();
+            this.Save();
+            System.Media.SystemSounds.Hand.Play();
+        }
+
         private void MenuButton_Click(object sender, RoutedEventArgs e)
         {
             this.TopContextMenu.IsOpen = true;
@@ -1142,17 +1154,16 @@ private async void ResetMenuItem_ClickAsync(object sender, RoutedEventArgs e)
             var result = await this.ShowMessageAsync("Do clear?", "", MessageDialogStyle.AffirmativeAndNegative);
             if (result == MessageDialogResult.Affirmative)
             {
-                this.countingStar = new List<int>() { 0, 0 };
-                this.countingCrown = new List<int>() { 0, 0 };
-
-                this.CheckContainers();
-                this.ToMonitors();
-                this.Save();
-                System.Media.SystemSounds.Hand.Play();
+                this.Reset();
             }
         }
 
         private void OverlayMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            this.ViewOverlay();
+        }
+
+        private void ViewOverlay()
         {
             this.Overlay.Show();
             if (this.Overlay.WindowState == WindowState.Minimized)
@@ -1176,6 +1187,26 @@ private void SettingMenuItem_Click(object sender, RoutedEventArgs e)
             this.Setting.Activate();
         }
 
+        private void TopContextMenu_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.O)
+            {
+                this.ViewOverlay();
+            }
+            else if (e.Key == Key.R)
+            {
+                this.Reset();
+            }
+        }
+
+        private void MetroWindow_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.M)
+            {
+                this.TopContextMenu.IsOpen = true;
+            }
+        }
+
         private void MetroWindow_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
             this.DragMove();

diff --git a/bayoen-star-exe/Preferences.cs b/bayoen-star-exe/Preferences.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using System.Threading.Tasks;
 
 using js = Newtonsoft.Json;
 using jl = Newtonsoft.Json.Linq;

diff --git a/bayoen-star-exe/bayoen-star.csproj b/bayoen-star-exe/bayoen-star.csproj
@@ -155,9 +155,6 @@
   <ItemGroup>
     <None Include="Resources\CrownLight.png" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\StarBlank.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\StarPlain.png" />
   </ItemGroup>
@@ -170,9 +167,6 @@
   <ItemGroup>
     <Resource Include="Resources\Entypo-license.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\score4.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\score2_long_strong.png" />
   </ItemGroup>