Changeset 60

Timestamp:

Jul 2, 2005, 2:58:52 AM (19 years ago)

Author:

rryu

Message:

盲腸のように存在していたSelectFaceDefine()を撲滅した。

File:

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

trunk/MacFaceFloat/MacFaceApp.cs

@@ -44 +44 @@
                 private int memHistoryCount;
 
-                private bool doExit;
-
                 [STAThread]
                 public static void Main(string[] args)
@@ -120 +118 @@
                 public void StartApplication()
                 {
-                        doExit = false;
-
                         // Šçƒpƒ^[ƒ““ǂݍž‚Ý
                         bool result = false;
@@ -131 +127 @@
                         if (!result)
                         {
-                                if (!SelectFaceDefine(Application.StartupPath))
+                                string path = Path.Combine(Application.StartupPath, "default.plist");
+
+                                if (!LoadFaceDefine(path))
                                 {
                                         Application.Exit();
@@ -152 +150 @@
                         config.Save();
                 }
-
-                /*
-                 * Šçƒpƒ^[ƒ“’è‹`ƒtƒHƒ‹ƒ_‘I‘ð
-                 */
-                public bool SelectFaceDefine()
-                {
-                        return SelectFaceDefine(Application.StartupPath);
-                }
-
-                public bool SelectFaceDefine(string defaultPath)
-                {
-                        while (true) 
-                        {
-                                FolderBrowserDialog folderBrowser = new FolderBrowserDialog();
-                                folderBrowser.SelectedPath = defaultPath;
-                                folderBrowser.Description = "Šçƒpƒ^[ƒ“ƒtƒ@ƒCƒ‹‚Ì‘¶Ý‚·‚éƒtƒHƒ‹ƒ_‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B";
-                                if (folderBrowser.ShowDialog() == DialogResult.OK) 
-                                {
-                                        if (LoadFaceDefine(folderBrowser.SelectedPath)) 
-                                        {
-                                                return true;
-                                        }
-                                }
-                                else 
-                                {
-                                        return false;
-                                }
-                        }
-
-                }
-
 
                 public bool LoadFaceDefine(string path)
@@ -286 +253 @@
                         patternWindow.Move +=new EventHandler(patternWindow_Move);
 
-                        LoadFaceDefine(config.FaceDefPath);
-
                         patternWindow.Location = config.Location;
                         patternWindow.Opacity = (float)config.Opacity / 100;
                         patternWindow.PatternSize = (float)config.PatternSize / 100;
                         patternWindow.TransparentMouseMessage = config.TransparentMouseMessage;
-                        patternWindow.Refresh();
+
+                        LoadFaceDefine(config.FaceDefPath);
 
                         patternWindow.Show();
@@ -323 +289 @@
 [ƒNƒŠƒbƒNƒCƒxƒ“ƒg
                  */
-                public void menuItemPatternSelect_Click(object sender, System.EventArgs e)
-                {
-                        SelectFaceDefine(patternWindow.FaceDef.Path);   
-                }
 
                 public void menuItemExit_Click(object sender, System.EventArgs e)