Changeset 9 for trunk/MacFaceFloat/MainForm.cs

Timestamp:

Nov 10, 2004, 8:24:03 PM (20 years ago)

Author:

altba\rryu

Message:

起動時に黙って起動時のディレクトリにあるdefault.mcfaceを開くようにした。

File:

• trunk/MacFaceFloat/MainForm.cs (modified) (5 diffs)

trunk/MacFaceFloat/MainForm.cs

@@ -119 +119 @@
                         return SelectFaceDefine(Application.StartupPath);
                 }
+
                 public bool SelectFaceDefine(string defaultPath)
                 {
                         String facePath;
-                        Hashtable property;
 
                         // XV‚ðŽ~‚ß‚éB
@@ -140 +140 @@
                                 {
                                         facePath = folderBrowser.SelectedPath;
-                                        if (File.Exists(Path.Combine(facePath, "faceDef.plist")))
+
+                                        if (LoadFaceDefine(facePath)) 
                                         {
-                                                break;
-                                        }
-                                        else
-                                        {
-                                                // ƒtƒ@ƒCƒ‹‚ª‚È‚¢
-                                                if (MessageBox.Show(
-                                                        String.Format("Žw’肳‚ꂽƒtƒHƒ‹ƒ_‚ÉŠçƒpƒ^[ƒ“’è‹`XMLƒtƒ@ƒCƒ‹ \"faceDef.plist\" ‚ª‘¶Ý‚µ‚Ü‚¹‚ñB\n\nƒtƒHƒ‹ƒ_:\n{0}", facePath),
-                                                        "MacFace for Windows", MessageBoxButtons.RetryCancel, MessageBoxIcon.Error)
-                                                        == DialogResult.Cancel)
-                                                {
-                                                        return false;
-                                                }
+                                                return true;
                                         }
                                 }
@@ -162 +152 @@
                         }
 
-                        // “ǂݍž‚Ý
+                }
+
+
+                bool LoadFaceDefine(string path)
+                {
+                        string plistPath = Path.Combine(path, "faceDef.plist");
+
+                        if (!File.Exists(plistPath))
+                        {
+                                System.Windows.Forms.MessageBox.Show(
+                                        String.Format("Žw’肳‚ꂽƒtƒHƒ‹ƒ_‚ÉŠçƒpƒ^[ƒ“’è‹`XMLƒtƒ@ƒCƒ‹ \"faceDef.plist\" ‚ª‘¶Ý‚µ‚Ü‚¹‚ñB\n\nƒtƒHƒ‹ƒ_:\n{0}", path),
+                                        "MacFace for Windows", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                                return false;
+                        }
+                        
+                        Hashtable property;
                         try 
                         {
-                                property = PropertyList.Load(Path.Combine(facePath, "faceDef.plist"));
+                                property = PropertyList.Load(plistPath);
                         } 
                         catch (System.IO.IOException ie) 
@@ -184 +189 @@
                         }
 
+                        // Šçƒpƒ^[ƒ“·‚µ‘Ö‚¦’†‚͍XV‚ðŽ~‚ß‚Ä‚¨‚­
+                        if (_updateTimer != null) _updateTimer.Stop();
+
                         _property = property;
-                        _facePath = facePath;
+                        _facePath = path;
                         _parts = (ArrayList)_property["parts"];
-
-                        // XVŠJŽn
+                        prevUsage = -10;
+
+                        // XVÄŠJ
                         if (_updateTimer != null) _updateTimer.Start();
 
                         return true;
                 }
-
-
 
                 public void CountProcessorUsage(object sender, EventArgs e)
@@ -234 +241 @@
                 public void MainForm_Load(object sender, System.EventArgs e)
                 {
-                        if (!SelectFaceDefine(Path.Combine(Application.StartupPath, "default.mcface")))
-                        {
-                                Application.Exit();
-                                return;
-                        }
-
+                        string faceDefPath = Path.Combine(Application.StartupPath, "default.mcface");
+                        bool result = false;
+
+                        if (Directory.Exists(faceDefPath))
+                        {
+                                result = LoadFaceDefine(faceDefPath);
+                        }
+
+                        if (!result)
+                        {
+                                if (!SelectFaceDefine(Application.StartupPath))
+                                {
+                                        Application.Exit();
+                                        return;
+                                }
+
+                        }
                 }