Changeset 63

Timestamp:

Sep 9, 2005, 3:21:14 AM (19 years ago)

Author:

rryu

Message:

パターンウインドウ・ステータスウインドウを開閉する為のメニューのキャプションが、ウインドウの表示状態によって「開く」「閉じる」の適切な表記になるようにした。

File:

• trunk/MacFaceFloat/MacFaceApp.cs (modified) (8 diffs)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -21 +21 @@
         public class MacFaceApp : ApplicationContext
         {
+                private const string MES_OPEN_PATTERN_WINDOW = "ƒpƒ^[ƒ“ƒEƒCƒ“ƒhƒE‚ðŠJ‚­(&P)";
+                private const string MES_CLOSE_PATTERN_WINDOW = "ƒpƒ^[ƒ“ƒEƒCƒ“ƒhƒE‚ð•Â‚¶‚é(&P)";
+                private const string MES_OPEN_STATUS_WINDOW = "ƒXƒe[ƒ^ƒXƒEƒCƒ“ƒhƒE‚ðŠJ‚­(&S)";
+                private const string MES_CLOSE_STATUS_WINDOW = "ƒXƒe[ƒ^ƒXƒEƒCƒ“ƒhƒE‚ð•Â‚¶‚é(&S)";
 
                 private Configuration config;
@@ -32 +36 @@
                 private PatternWindow patternWindow;
                 private StatusWindow statusWindow;
-                
+                private MenuItem menuItemTogglePatternWindow;
+                private MenuItem menuItemToggleStatusWindow;
+
                 [STAThread]
                 public static void Main(string[] args)
@@ -64 +70 @@
 [
                         ContextMenu contextMenu = new System.Windows.Forms.ContextMenu();
-                        MenuItem menuItemShowPatternWindow = new System.Windows.Forms.MenuItem();
-                        MenuItem menuItemShowStatusWindow = new System.Windows.Forms.MenuItem();
+                        menuItemTogglePatternWindow = new System.Windows.Forms.MenuItem();
+                        menuItemToggleStatusWindow = new System.Windows.Forms.MenuItem();
                         MenuItem menuItemConfigure = new System.Windows.Forms.MenuItem();
                         MenuItem menuItemExit = new System.Windows.Forms.MenuItem();
 
-                        menuItemShowPatternWindow.Text = "ƒpƒ^[ƒ“ƒEƒCƒ“ƒhƒE‚ðŠJ‚­(&P)";
-                        menuItemShowPatternWindow.Click +=new EventHandler(menuItemShowPatternWindow_Click);
-
-                        menuItemShowStatusWindow.Text = "ƒXƒe[ƒ^ƒXƒEƒCƒ“ƒhƒE‚ðŠJ‚­(&S)";
-                        menuItemShowStatusWindow.Click +=new EventHandler(menuItemShowStatusWindow_Click);
+                        menuItemTogglePatternWindow.Text = MES_OPEN_PATTERN_WINDOW;
+                        menuItemTogglePatternWindow.Click +=new EventHandler(menuItemTogglePatternWindow_Click);
+
+                        menuItemToggleStatusWindow.Text = MES_OPEN_STATUS_WINDOW;
+                        menuItemToggleStatusWindow.Click +=new EventHandler(menuItemToggleStatusWindow_Click);
 
                         menuItemConfigure.Text = "MacFace ‚̐ݒè(&C)...";
@@ -83 +89 @@
 
                         contextMenu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
-                                        menuItemShowPatternWindow, menuItemShowStatusWindow, new MenuItem("-"), menuItemConfigure, new MenuItem("-"), menuItemExit});
+                                        menuItemTogglePatternWindow, menuItemToggleStatusWindow, new MenuItem("-"), menuItemConfigure, new MenuItem("-"), menuItemExit});
 
                         // ’Ê’mƒAƒCƒRƒ“
@@ -231 +237 @@
 
                         patternWindow.Show();
+
+                        menuItemTogglePatternWindow.Text = MES_CLOSE_PATTERN_WINDOW;
                 }
 
@@ -244 +252 @@
                         statusWindow.UpdateGraph();
                         statusWindow.Show();
+
+                        menuItemToggleStatusWindow.Text = MES_CLOSE_STATUS_WINDOW;
                 }
 
@@ -300 +310 @@
                         patternWindow.Dispose();
                         patternWindow = null;
+                        menuItemTogglePatternWindow.Text = MES_OPEN_PATTERN_WINDOW;
                 }
 
@@ -306 +317 @@
                         statusWindow.Dispose();
                         statusWindow = null;
-                }
-
-                private void menuItemShowPatternWindow_Click(object sender, EventArgs e)
+                        menuItemToggleStatusWindow.Text = MES_OPEN_STATUS_WINDOW;
+                }
+
+                private void menuItemTogglePatternWindow_Click(object sender, EventArgs e)
                 {
                         if (patternWindow == null) 
                         {
                                 openPatternWindow();
-                        }
-                }
-
-                private void menuItemShowStatusWindow_Click(object sender, EventArgs e)
+                        } 
+                        else 
+                        {
+                                patternWindow.Close();
+                        }
+                }
+
+                private void menuItemToggleStatusWindow_Click(object sender, EventArgs e)
                 {
                         if (statusWindow == null) 
                         {
                                 openStatusWindow();
+                        }
+                        else 
+                        {
+                                statusWindow.Close();
                         }
                 }