Changeset 38

Timestamp:

Feb 25, 2005, 3:31:02 AM (19 years ago)

Author:

altba\rryu

Message:

アプリケーションクラス作成に向けてのコード整理その2。

File:

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

trunk/MacFaceFloat/MainForm.cs

@@ -40 +40 @@
                 private int curMarkers;
 
+                [STAThread]
+                public static void Main(string[] args)
+                {
+                        MainForm form = new MainForm();
+                        form.StartApplication();
+                }
+
                 // ƒRƒ“ƒXƒgƒ‰ƒNƒ^
                 public MainForm()
@@ -59 +66 @@
 
                         _updateTimer = new System.Windows.Forms.Timer();
+                        _updateTimer.Tick += new EventHandler(this.CountProcessorUsage);
                         _updateTimer.Enabled = false;
                         _updateTimer.Interval = 1000;
-                        _updateTimer.Tick += new EventHandler(this.CountProcessorUsage);
-                        _updateTimer.Stop();
                 }
 
@@ -117 +123 @@
                         this.Text = "MacFace For Windows";
                         this.TopMost = true;
-                        this.Load += new EventHandler(MainForm_Load);
-                        this.Closing += new CancelEventHandler(MainForm_Closing);
-                }
-                        
-
-                [STAThread]
-                public static void Main(string[] args)
-                {
-                        Application.Run(new MainForm());
-                }
-                
+                }
+
+                public void StartApplication()
+                {
+                        // Ý’è
+                        _config = Configuration.GetInstance();
+                        _config.Load();
+
+
+                        // Šçƒpƒ^[ƒ““ǂݍž‚Ý
+                        bool result = false;
+                        if (Directory.Exists(_config.FaceDefPath))
+                        {
+                                result = LoadFaceDefine(_config.FaceDefPath);
+                        }
+
+                        if (!result)
+                        {
+                                if (!SelectFaceDefine(Application.StartupPath))
+                                {
+                                        Application.Exit();
+                                        return;
+                                }
+                        }
+
+                        Application.ApplicationExit += new EventHandler(Application_ApplicationExit);
+
+                        this.Location = _config.Location;
+                        ApplyConfiguration();
+
+                        _updateTimer.Start();
+                        Application.Run(this);
+                }
+
+                void Application_ApplicationExit(object sender, EventArgs e)
+                {
+                        notifyIcon.Visible = false;
+
+                        // •Û‘¶
+                        _config.Opacity = (int)(this.Opacity * 100);
+                        _config.FaceDefPath = (_currentFaceDef != null ? _currentFaceDef.Path : Path.Combine(Application.StartupPath, "default.mcface"));
+                        _config.Location = this.Location;
+                        _config.TransparentMouseMessage = this.TransparentMouseMessage;
+
+                        _config.Save();
+                }
 
                 /*
@@ -232 +273 @@
                 }
 
+                private void ApplyConfiguration()
+                {
+                        this.Opacity = (float)_config.Opacity / 100;
+                        this.PatternSize = (float)_config.PatternSize / 100;
+                        this.TransparentMouseMessage = _config.TransparentMouseMessage;
+
+                        RefreshPattern();
+                }
+
                 public float PatternSize
                 {
@@ -262 +312 @@
                         this.Update();
                 }
-
-                //
-                // ‹N“®
-                //
-                public void MainForm_Load(object sender, System.EventArgs e)
-                {
-                        // Ý’è
-                        _config = Configuration.GetInstance();
-                        _config.Load();
-
-
-                        // Šçƒpƒ^[ƒ““ǂݍž‚Ý
-                        bool result = false;
-                        if (Directory.Exists(_config.FaceDefPath))
-                        {
-                                result = LoadFaceDefine(_config.FaceDefPath);
-                                ApplyConfiguration();
-                                _updateTimer.Start();
-                        }
-
-                        if (!result)
-                        {
-                                if (!SelectFaceDefine(Application.StartupPath))
-                                {
-                                        Application.Exit();
-                                        return;
-                                }
-
-                        }
-                }
-
-                // 
-                // I—¹
-                //
-                private void MainForm_Closing(object sender, CancelEventArgs e)
-                {
-                        notifyIcon.Visible = false;
-
-                        // •Û‘¶
-                        _config.Opacity = (int) (this.Opacity * 100);
-                        _config.FaceDefPath = (_currentFaceDef != null ? _currentFaceDef.Path : Path.Combine(Application.StartupPath, "default.mcface"));
-                        _config.Location = this.Location;
-                        _config.TransparentMouseMessage = this.TransparentMouseMessage;
-
-                        _config.Save();
-                }
-
 
                 /*
@@ -333 +336 @@
                         }
                 }
-
-                private void ApplyConfiguration()
-                {
-                        this.Opacity = (float)_config.Opacity / 100;
-                        this.PatternSize = (float)_config.PatternSize / 100;
-                        this.Location = _config.Location;
-                        this.TransparentMouseMessage = _config.TransparentMouseMessage;
-
-                        RefreshPattern();
-                }
         }
 }