beta v0.0.7

- fix some bugs - add status display
bayoen · Oct 10, 2018 · ff16d15 · ff16d15
1 parent 16c06a5
commit ff16d15
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 149 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-shm b/.vs/bayoen-star/v15/Server/sqlite3/storage.ide-shm
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/MainWindow.xaml b/bayoen-star-exe/MainWindow.xaml
@@ -33,7 +33,7 @@
                 </Style>
             </mtc:WindowCommands.Resources>
 
-            <TextBlock Text="Beta v0.0.6" Margin="8,3,8,3" Foreground="DimGray" IsEnabled="False"/>
+            <TextBlock x:Name="StatusTextBlock" Margin="8,3,8,3" Foreground="DimGray" IsEnabled="False"/>
 
             <Button x:Name ="MenuButton" Background="Transparent" Click="MenuButton_Click">
                 <StackPanel Orientation="Horizontal">

diff --git a/bayoen-star-exe/MainWindow.xaml.cs b/bayoen-star-exe/MainWindow.xaml.cs
@@ -30,6 +30,7 @@ public MainWindow()
             this.InitializeLayouts();
             this.InitializeTimer(333);
             this.InitializeVariables();
+            this.Status("Ready");
             Thread.Sleep(1000);
 
             this.CheckContainers();
@@ -41,6 +42,7 @@ public MainWindow()
         public DisplayGrid OverlayDisplay;
         public List<TextBox> Monitors;
 
+        public const string versionText = " - Beta v0.0.6";
         public const string pptName = "puyopuyotetris";
         public const string prefName = "pref.json";
         public const string exportFolderName = "export";
@@ -61,9 +63,7 @@ public MainWindow()
         public List<int> currentStar;
         public List<int> oldStar;
         public List<int> countingStar;
-        public List<int> countingCrown;
-
-        //public ContextMenu ModeContextMenu;
+        public List<int> countingCrown;       
 
         public DisplayModes _mode;
         public DisplayModes Mode
@@ -866,15 +866,16 @@ private void CountingStars()
             if (IsPPTOn)
             {
                 if (this.MainDisplay.Visibility == Visibility.Collapsed) this.MainDisplay.Visibility = Visibility.Visible;
-                if (this.OverlayDisplay.Visibility == Visibility.Hidden) this.MainDisplay.Visibility = Visibility.Visible;
+                if (this.OverlayDisplay.Visibility == Visibility.Hidden) this.OverlayDisplay.Visibility = Visibility.Visible;
                 this.scoreAddress = this.pptMemory.ReadInt32(new IntPtr(0x14057F048)) + 0x38;
 
                 this.CheckOverlay();                
             }
             else
             {
                 if (this.MainDisplay.Visibility == Visibility.Visible) this.MainDisplay.Visibility = Visibility.Collapsed;
-                if (this.OverlayDisplay.Visibility == Visibility.Visible) this.MainDisplay.Visibility = Visibility.Hidden;
+                if (this.OverlayDisplay.Visibility == Visibility.Visible) this.OverlayDisplay.Visibility = Visibility.Hidden;
+                this.Status("Offline");
                 return;
             }
 
@@ -888,6 +889,7 @@ private void CountingStars()
             }
             else
             {
+                this.Status("Ready");
                 return;
             }
 
@@ -919,7 +921,7 @@ private void CountingStars()
             }
 
             this.CheckContainers();
-
+            this.Status("Working");
 
             for (int playerIndex = 0; playerIndex < 2; playerIndex++)
             {
@@ -1144,6 +1146,11 @@ public RECT(RECT rect)
         [System.Runtime.InteropServices.DllImport("user32.dll")]
         public static extern bool GetWindowRect(IntPtr hwnd, ref RECT rectangle);
 
+        private void Status(string s)
+        {
+            this.StatusTextBlock.Text = s + versionText;
+        }
+
         public enum DisplayModes : int
         {
             Star_plus_only = 0,

diff --git a/bayoen-star-exe/obj/x64/Release/DesignTimeResolveAssemblyReferences.cache b/bayoen-star-exe/obj/x64/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/bayoen-star-exe/obj/x64/Release/MainWindow.baml b/bayoen-star-exe/obj/x64/Release/MainWindow.baml
diff --git a/bayoen-star-exe/obj/x64/Release/MainWindow.g.cs b/bayoen-star-exe/obj/x64/Release/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1812A1DDC2566FA9CCF76CA61D70EAECC2E1B9CB"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "234CC2784EF128432DF393840ABBB8A2FF67BE1B"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     이 코드는 도구를 사용하여 생성되었습니다.
@@ -43,57 +43,33 @@ namespace bayoen {
     public partial class MainWindow : MahApps.Metro.Controls.MetroWindow, System.Windows.Markup.IComponentConnector {
 
 
-        #line 38 "..\..\..\MainWindow.xaml"
+        #line 36 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button MenuButton;
+        internal System.Windows.Controls.TextBlock StatusTextBlock;
 
         #line default
         #line hidden
 
 
-        #line 49 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ContextMenu TopContextMenu;
-
-        #line default
-        #line hidden
-
-
-        #line 51 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Data.CompositeCollection TopCompositeCollection;
-
-        #line default
-        #line hidden
-
-
-        #line 53 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem ResetMenuItem;
-
-        #line default
-        #line hidden
-
-
-        #line 63 "..\..\..\MainWindow.xaml"
+        #line 38 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem OverlayMenuItem;
+        internal System.Windows.Controls.Button MenuButton;
 
         #line default
         #line hidden
 
 
-        #line 73 "..\..\..\MainWindow.xaml"
+        #line 49 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem SettingMenuItem;
+        internal System.Windows.Controls.ContextMenu TopContextMenu;
 
         #line default
         #line hidden
 
 
-        #line 83 "..\..\..\MainWindow.xaml"
+        #line 51 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem ModeMenuItem;
+        internal System.Windows.Data.CompositeCollection TopCompositeCollection;
 
         #line default
         #line hidden
@@ -143,6 +119,9 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             #line hidden
             return;
             case 2:
+            this.StatusTextBlock = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 3:
             this.MenuButton = ((System.Windows.Controls.Button)(target));
 
             #line 38 "..\..\..\MainWindow.xaml"
@@ -151,47 +130,11 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             #line default
             #line hidden
             return;
-            case 3:
-            this.TopContextMenu = ((System.Windows.Controls.ContextMenu)(target));
-            return;
             case 4:
-            this.TopCompositeCollection = ((System.Windows.Data.CompositeCollection)(target));
+            this.TopContextMenu = ((System.Windows.Controls.ContextMenu)(target));
             return;
             case 5:
-            this.ResetMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 53 "..\..\..\MainWindow.xaml"
-            this.ResetMenuItem.Click += new System.Windows.RoutedEventHandler(this.ResetMenuItem_ClickAsync);
-
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this.OverlayMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 63 "..\..\..\MainWindow.xaml"
-            this.OverlayMenuItem.Click += new System.Windows.RoutedEventHandler(this.OverlayMenuItem_Click);
-
-            #line default
-            #line hidden
-            return;
-            case 7:
-            this.SettingMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 73 "..\..\..\MainWindow.xaml"
-            this.SettingMenuItem.Click += new System.Windows.RoutedEventHandler(this.SettingMenuItem_Click);
-
-            #line default
-            #line hidden
-            return;
-            case 8:
-            this.ModeMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 83 "..\..\..\MainWindow.xaml"
-            this.ModeMenuItem.Click += new System.Windows.RoutedEventHandler(this.ModeMenuItem_Click);
-
-            #line default
-            #line hidden
+            this.TopCompositeCollection = ((System.Windows.Data.CompositeCollection)(target));
             return;
             }
             this._contentLoaded = true;

diff --git a/bayoen-star-exe/obj/x64/Release/MainWindow.g.i.cs b/bayoen-star-exe/obj/x64/Release/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1812A1DDC2566FA9CCF76CA61D70EAECC2E1B9CB"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "234CC2784EF128432DF393840ABBB8A2FF67BE1B"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     이 코드는 도구를 사용하여 생성되었습니다.
@@ -43,57 +43,33 @@ namespace bayoen {
     public partial class MainWindow : MahApps.Metro.Controls.MetroWindow, System.Windows.Markup.IComponentConnector {
 
 
-        #line 38 "..\..\..\MainWindow.xaml"
+        #line 36 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button MenuButton;
+        internal System.Windows.Controls.TextBlock StatusTextBlock;
 
         #line default
         #line hidden
 
 
-        #line 49 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ContextMenu TopContextMenu;
-
-        #line default
-        #line hidden
-
-
-        #line 51 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Data.CompositeCollection TopCompositeCollection;
-
-        #line default
-        #line hidden
-
-
-        #line 53 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem ResetMenuItem;
-
-        #line default
-        #line hidden
-
-
-        #line 63 "..\..\..\MainWindow.xaml"
+        #line 38 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem OverlayMenuItem;
+        internal System.Windows.Controls.Button MenuButton;
 
         #line default
         #line hidden
 
 
-        #line 73 "..\..\..\MainWindow.xaml"
+        #line 49 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem SettingMenuItem;
+        internal System.Windows.Controls.ContextMenu TopContextMenu;
 
         #line default
         #line hidden
 
 
-        #line 83 "..\..\..\MainWindow.xaml"
+        #line 51 "..\..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem ModeMenuItem;
+        internal System.Windows.Data.CompositeCollection TopCompositeCollection;
 
         #line default
         #line hidden
@@ -143,6 +119,9 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             #line hidden
             return;
             case 2:
+            this.StatusTextBlock = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 3:
             this.MenuButton = ((System.Windows.Controls.Button)(target));
 
             #line 38 "..\..\..\MainWindow.xaml"
@@ -151,47 +130,11 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
             #line default
             #line hidden
             return;
-            case 3:
-            this.TopContextMenu = ((System.Windows.Controls.ContextMenu)(target));
-            return;
             case 4:
-            this.TopCompositeCollection = ((System.Windows.Data.CompositeCollection)(target));
+            this.TopContextMenu = ((System.Windows.Controls.ContextMenu)(target));
             return;
             case 5:
-            this.ResetMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 53 "..\..\..\MainWindow.xaml"
-            this.ResetMenuItem.Click += new System.Windows.RoutedEventHandler(this.ResetMenuItem_ClickAsync);
-
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this.OverlayMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 63 "..\..\..\MainWindow.xaml"
-            this.OverlayMenuItem.Click += new System.Windows.RoutedEventHandler(this.OverlayMenuItem_Click);
-
-            #line default
-            #line hidden
-            return;
-            case 7:
-            this.SettingMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 73 "..\..\..\MainWindow.xaml"
-            this.SettingMenuItem.Click += new System.Windows.RoutedEventHandler(this.SettingMenuItem_Click);
-
-            #line default
-            #line hidden
-            return;
-            case 8:
-            this.ModeMenuItem = ((System.Windows.Controls.MenuItem)(target));
-
-            #line 83 "..\..\..\MainWindow.xaml"
-            this.ModeMenuItem.Click += new System.Windows.RoutedEventHandler(this.ModeMenuItem_Click);
-
-            #line default
-            #line hidden
+            this.TopCompositeCollection = ((System.Windows.Data.CompositeCollection)(target));
             return;
             }
             this._contentLoaded = true;

diff --git a/bayoen-star-exe/obj/x64/Release/bayoen-star.exe b/bayoen-star-exe/obj/x64/Release/bayoen-star.exe
diff --git a/bayoen-star-exe/obj/x64/Release/bayoen-star.g.resources b/bayoen-star-exe/obj/x64/Release/bayoen-star.g.resources
diff --git a/bayoen-star-exe/obj/x64/Release/bayoen-star.pdb b/bayoen-star-exe/obj/x64/Release/bayoen-star.pdb