Commit: 43 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 43 (tree)
• Time: 2016-05-09 00:32:10
• Author: c477

Log Message

MainFrameを置き換えやすくするため、MainクラスをApplicationContextに変更

Change Summary

• modified: trunk/starter/Starter.cs
• modified: trunk/framework/framework/Main.cs
• modified: trunk/framework/ui/mainframe/MainFrame.cs

Incremental Difference

--- trunk/starter/Starter.cs	(revision 42)
+++ trunk/starter/Starter.cs	(revision 43)
@@ -35,7 +35,7 @@
 
 		private static void run( string[] args ) {
             // start the game
-			Application.Run(new MainFrame(args));
+            Application.Run(new Main(args));
 		}
 
 

--- trunk/framework/framework/Main.cs	(revision 42)
+++ trunk/framework/framework/Main.cs	(revision 43)
@@ -20,101 +20,100 @@
 	/// <summary>
 	/// Entry point to other static instances in the NeoFreeTrain framework.
 	/// </summary>
-	public sealed class Main
-	{
-		// no instantiation
-		private Main() {}		
+    // [参考] https://msdn.microsoft.com/ja-jp/library/system.windows.forms.applicationcontext(v=vs.110).aspx
+    public sealed class Main : ApplicationContext {
+	
+       public Main(string[] args) {
+            I18n.LoadFile(Directories.AppBaseDir + "nftfw.resource.xml");
 
-		/// <summary> the main window frame </summary>
-		private static MainFrame theFrame;
-		public static IBarHostFrame mainFrame
-		{	get{ return theFrame; } 	}
+            theFrame = CreateFrame();
 
-		/// <summary> Main resources. </summary>
+            // Handle the ApplicationExit event to know when the application is exiting.
+            Application.ApplicationExit += new EventHandler(this.OnApplicationExit);
+
+            InitDirectoriesAndAssemblies(args);
+
+            using (Splash s = new Splash()) {
+                s.Show();
+                ProgressMonitor monitor = CreateProgressMonitor(new ProgressHandler(s.updateMessage));
+                InitPlugins(monitor);
+            }
+
+            FireInitCompleteEvent();
+        }
+
+        /// <summary> the main window frame </summary>
+        private static IBarHostFrame theFrame;
+        public static IBarHostFrame mainFrame { get { return theFrame; } }
+
+        private EventHandler InitComplete;
+
+        /// <summary> Main resources. </summary>
         //public static readonly NftProperties resources = NftProperties.LoadFromFile(Directories.AppBaseDir + "nftfw.resource.xml", false);
 
-		/// <summary> Plug-ins. </summary>
-		public static readonly PluginManager pluginManager = new PluginManager();
+        /// <summary> Plug-ins. </summary>
+        public static readonly PluginManager pluginManager = new PluginManager();
 
-		#region sound and BGM
-/*		
-		/// <summary>
-		/// Handles BGM playback.
-		/// Should be instanciated by attaching the main window.
-		/// </summary>
-		public static BGMManager bgmManager { get { return _bgmManager; } }
+        // Exit entire application.
+        public void Exit() {
+            ExitThread();
+        }
 
-		/// <summary>
-		/// Handles SFX.
-		/// Should be instanciated by attaching the main window.
-		/// </summary>
-		public static SoundEffectManager soundEffectManager { get { return _soundEffectManager; } }
-		
+        private IBarHostFrame CreateFrame() {
+            MainFrame frame = new MainFrame(null);
+            frame.FormClosed += delegate(object o, FormClosedEventArgs arg) {
+                Exit();
+            };
+            
+            InitComplete += delegate(object o, EventArgs arg){
+                frame.Show();
+            };
+            return frame;
+        }
 
-		private static SoundEffectManager _soundEffectManager;
-		private static BGMManager _bgmManager;
-*/
-		#endregion
-
-		/// <summary>
-		/// Initializes the framework.
-		/// Should be called once and only once.
-		/// </summary>
-		/// <param name="additionalPluginDirs">
-		/// additional directories from which plug-ins are loaded.
-		/// </param>
-		/// <param name="owner">application's main window.</param>
-		/// <param name="bgmMenuItem">"BGM" sub-menu</param>
-		/// <param name="progressHandler">
-		/// Receives initializtion progress report. Can be null.
-		/// </param>
-		public static void init( string[] args, MainFrame frame ) 
-		{
-            I18n.LoadFile(Directories.AppBaseDir + "nftfw.resource.xml");
-			Hashtable h_args = paresArgs(args);
+        private void InitDirectoriesAndAssemblies(string[] args) {
+            Hashtable h_args = paresArgs(args);
             InitializeAssemblies();
             Directories.Initialize(h_args);
+        }
 
-            //InformationService service = new InformationService();
-			theFrame = frame;
-			// To avoid ReBar trouble, we need to show MainFrame
-			// before Splash window created.
+        private void InitPlugins(ProgressMonitor monitor) {
+            new FiberSample().Test();
 
-			using(Splash s = new Splash()) 
-			{
-				s.Show();
-                new FiberSample().Test();
-				ProgressMonitor monitor = new ProgressMonitor(2);
-				monitor.SetMaximum(1,5);
-				monitor.OnProgress += new ProgressHandler(s.updateMessage);
-				Application.DoEvents();
-				// load global modules;
-				GlobalModules.Initialize();
-				// load plug-ins
-				Main.pluginManager.init(new string[]{Directories.PluginDir}, monitor);
-			}
+            Application.DoEvents();
+            // load global modules;
+            GlobalModules.Initialize();
+            // load plug-ins
+            Main.pluginManager.init(new string[] { Directories.PluginDir }, monitor);
+        }
 
-			//new PluginListDialog().ShowDialog();
+        private void OnApplicationExit(object sender, EventArgs e) {
+            Debug.WriteLine("## Application Exit ##");
+        }
 
-			
-//			_soundEffectManager = new SoundEffectManager(owner);
-//			_bgmManager = new BGMManager(bgmMenuItem);
-		}
+        private ProgressMonitor CreateProgressMonitor(ProgressHandler progressHandler) {
+            ProgressMonitor monitor = new ProgressMonitor(2);
+            monitor.SetMaximum(1, 5);
+            if (progressHandler != null) monitor.OnProgress += progressHandler;
+            return monitor;
+        }
 
-        private static Hashtable paresArgs(string[] args)
-		{
-			Hashtable table = new Hashtable();
-			for(int i=0;i<args.Length;i++)
-			{
-				string[] v = args[i].Split(new char[]{'='},2);
-				if(v.Length==2)
-					table.Add(v[0].ToUpper(),v[1]);
-				else
-					table.Add(v[0].ToUpper(),string.Empty);
-			}
-			return table;
-		}
+        private static Hashtable paresArgs(string[] args) {
+            Hashtable table = new Hashtable();
+            for (int i = 0; i < args.Length; i++) {
+                string[] v = args[i].Split(new char[] { '=' }, 2);
+                if (v.Length == 2)
+                    table.Add(v[0].ToUpper(), v[1]);
+                else
+                    table.Add(v[0].ToUpper(), string.Empty);
+            }
+            return table;
+        }
 
+        private void FireInitCompleteEvent() {
+            if (InitComplete != null) InitComplete(this, new EventArgs());
+        }
+
         private static void InitializeAssemblies() {
             AppDomain.CurrentDomain.AssemblyLoad += new AssemblyLoadEventHandler(AssemblyInitializer);
             Assembly[] asms = AppDomain.CurrentDomain.GetAssemblies();
@@ -125,14 +124,15 @@
 
         private static void AssemblyInitializer(object sender, AssemblyLoadEventArgs args) {
             Assembly asm = args.LoadedAssembly;
-            if (asm.GlobalAssemblyCache) 
+            if (asm.GlobalAssemblyCache)
                 return;
             // force static constructors in types specified by InitializeOnLoad
             object[] attributes = asm.GetCustomAttributes(typeof(InitializeOnLoadAttribute), false);
             foreach (InitializeOnLoadAttribute attr in attributes) {
                 System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor(attr.Type.TypeHandle);
-                Debug.WriteLine("Init class on load assembly: class="+attr.Type.FullName+ ", module="+ Path.GetFileName(asm.CodeBase));
+                Debug.WriteLine("Init class on load assembly: class=" + attr.Type.FullName + ", module=" + Path.GetFileName(asm.CodeBase));
             }
         }
+
 	}
 }

--- trunk/framework/ui/mainframe/MainFrame.cs	(revision 42)
+++ trunk/framework/ui/mainframe/MainFrame.cs	(revision 43)
@@ -57,8 +57,7 @@
                 Debug.WriteLine(", b2="+GC.GetGeneration(b2));
             }
             */
-			Main.init(args, this);
-            Show();
+			
 		}
 
         void MainFrame_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) {
@@ -389,7 +388,11 @@
         public void SetStatusText(string txt) {
             messageLabel.Text = txt;
         }
-		#endregion
 
-	}
+        public IToolWindowsManager ToolWindows {
+            get { return toolWindowsManager; }
+        }
+        #endregion
+
+    }
 }