Commit: 5 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 5 (tree)
• Time: 2013-11-26 21:54:17
• Author: c477

Log Message

プラグイン一覧フォームとエラーフォームの微修正

Change Summary

• modified: NeoFT.suo
• modified: plugins/test/plugin.xml
• modified: plugins/system/plugin.xml
• modified: framework/framework/plugin/FixedClassContributionFactory.cs
• modified: framework/framework/plugin/InheritableContributionFactory.cs
• modified: framework/framework/plugin/PluginManager.cs
• modified: framework/framework/plugin/CustomContributionFactory.cs
• modified: framework/framework/plugin/ContributionFactory.cs
• modified: framework/framework/loader/XmlParamParser.cs
• modified: framework/util/UIUtil.cs
• modified: ui_jp/ui/system/ErrorMessageBox.cs
• modified: ui_jp/ui/system/PluginListDialog.cs

Incremental Difference

--- plugins/test/plugin.xml	(revision 4)
+++ plugins/test/plugin.xml	(revision 5)
@@ -15,17 +15,11 @@
 		<class name="nft.framework.plugin.FixedClassContributionFactory"/>
 		<implementation name="nft.framework.plugin.DummyContribution" />
 	</contribution>
-	
-	<contribution type="factory" id="F_ImageSource">
-		<name>image resource factory</name>
-		<basetype name="nft.contributions.graphics.CtbImageResource" codebase=".Core"/>
-		<declare type="ImageResource"/>
-	</contribution>
 
-	<contribution type="ImageResource" id="tex112x136x96">
+	<contribution type="Image" id="tex112x136x96">
 		<src>cube112x136x96.bmp</src>
 	</contribution>
-	<contribution type="ImageResource" id="tex32x48x56">
+	<contribution type="Image" id="tex32x48x56">
 		<src>cube32x48x56.bmp</src>
 	</contribution>
 	

--- plugins/system/plugin.xml	(revision 4)
+++ plugins/system/plugin.xml	(revision 5)
@@ -17,65 +17,71 @@
   </contribution>
   <contribution type="factory" id="F_SubForm">
     <name>SubForm</name>
+    <description>Child GUI forms</description>
     <implementation name="nft.contributions.ui.CtbSubform"/>
   </contribution>
   <contribution type="factory" id="F_MenuItems">
-    <name>MenuItem factory</name>
+    <name>Menu items</name>
     <implementation name="nft.contributions.ui.CtbMenuItem"/>
     <declare type="MenuItems"/>
   </contribution>
   <contribution type="factory" id="F_ToolButtons">
-    <name>Tool button factory</name>
+    <name>Tool buttons</name>
     <implementation name="nft.contributions.ui.CtbToolButton"/>
     <declare type="ToolButtons"/>
   </contribution>
   <contribution type="factory" id="F_Command">
-    <name>User command factory</name>
+    <name>User commands</name>
     <implementation name="nft.contributions.ui.CtbCommandEntity"/>
     <declare type="Command"/>
   </contribution>
   <contribution type="factory" id="F_CommandUI">
-    <name>CommandUI factory</name>
+    <name>Command UIs</name>
     <implementation name="nft.contributions.ui.CtbCommandUI"/>
     <declare type="CommandUI"/>
   </contribution>
   <contribution type="factory" id="F_CommandUIGroup">
-    <name>CommandUI Group definition</name>
+    <name>Command UI Group definition</name>
     <implementation name="nft.contributions.ui.CtbCommandUIGroup"/>
     <declare type="CommandUIGroup"/>
   </contribution>
+  <contribution type="factory" id="F_ImageSource">
+    <name>Image Resources</name>
+    <basetype name="nft.contributions.graphics.CtbImageResource" codebase=".Core"/>
+    <declare type="Image"/>
+  </contribution>
   <contribution type="factory" id="F_TerrainGenerator">
-    <name>TerrainGenerator factory</name>
+    <name>Terrain generators</name>
     <class name="nft.framework.plugin.InheritableContributionFactory"/>
     <basetype name="nft.contributions.game.CtbTerrainGenerator" codebase=".Core"/>
     <declare type="TerrainGenerator"/>
   </contribution>
   <contribution type="factory" id="F_WorldDivider">
-    <name>WorldDivider factory</name>
+    <name>World dividers</name>
     <class name="nft.framework.plugin.InheritableContributionFactory"/>
     <basetype name="nft.contributions.game.CtbWorldDivider" codebase=".Core"/>
     <declare type="WorldDivider"/>
   </contribution>
   <contribution type="factory" id="F_GroundTextrue">
-    <name>Terrain(ground) textrue factory</name>
+    <name>Terrain(ground) textrue sets</name>
     <class name="nft.contributions.terrain.CtbGroundTextureFactory" codebase=".Core"/>
     <basetype name="nft.contributions.terrain.CtbSimpleGroundTexture" codebase=".Core"/>
     <declare type="GroundTexture"/>
   </contribution>
   <contribution type="factory" id="F_CliffTexture">
-    <name>Cliff texture factory</name>
+    <name>Cliff texture sets</name>
     <class name="nft.contributions.terrain.CtbCliffTextureFactory" codebase=".Core"/>
     <basetype name="nft.contributions.terrain.CtbSimpleCliffTexture" codebase=".Core"/>
     <declare type="CliffTexture"/>
   </contribution>
   <contribution type="factory" id="F_HeightCutPlaneTexture">
-    <name>Height-cut plane texture factory</name>
+    <name>Height-cut plane texture sets</name>
     <class name="nft.contributions.terrain.CtbHeightCutPlaneTextureFactory" codebase=".Core"/>
     <basetype name="nft.contributions.terrain.CtbHeightCutPlaneTexture" codebase=".Core"/>
     <declare type="HeightCutPlaneTexture"/>
   </contribution>
   <contribution type="factory" id="F_HeightCutSlopeTexture">
-    <name>Height-cut slope (terrain) texture factory</name>
+    <name>Height-cut slope (terrain) texture sets</name>
     <class name="nft.contributions.terrain.CtbHeightCutSlopeTextureFactory" codebase=".Core"/>
     <basetype name="nft.contributions.terrain.CtbHeightCutSlopeTexture" codebase=".Core"/>
     <declare type="HeightCutSlopeTexture"/>

--- framework/framework/plugin/FixedClassContributionFactory.cs	(revision 4)
+++ framework/framework/plugin/FixedClassContributionFactory.cs	(revision 5)
@@ -29,5 +29,9 @@
         public Contribution load(Plugin owner, ParamsReader e) {
 			return (Contribution)Activator.CreateInstance(concreteType,new object[]{owner, e});
 		}
+
+        public string Description {
+            get { return null; }
+        }
 	}
 }

--- framework/framework/plugin/InheritableContributionFactory.cs	(revision 4)
+++ framework/framework/plugin/InheritableContributionFactory.cs	(revision 5)
@@ -37,5 +37,9 @@
 					"{0} is incorrect for this contribution (expected:{1})",
 					contrib.GetType().FullName, baseType.FullName ));
 		}
+
+        public string Description {
+            get { return null; }
+        }
 	}
 }

--- framework/framework/plugin/PluginManager.cs	(revision 4)
+++ framework/framework/plugin/PluginManager.cs	(revision 5)
@@ -465,21 +465,35 @@
 		/// </summary>
 		public void AddContributionFactory( string name, IContributionFactory factory ) 
 		{
-			if( contributionFactories.ContainsKey(name) )
-				throw new Exception(string.Format(
-					"contribution type \"{0}\" is already registered.",name));
-
-			contributionFactories.Add(name,factory);
+            string anam = AdjustFactoryName(name);
+            if (contributionFactories.ContainsKey(anam)) {
+                string msg;
+                if (anam.Equals(name)) {
+                    msg = string.Format(
+                    "contribution type \"{0}\" is already registered.", anam);
+                } else {
+                    msg = string.Format(
+                    "contribution type \"{0}\" is already registered as \"{1}\".", name, anam);
+                }
+                throw new Exception(msg);
+            }
+            contributionFactories.Add(anam, factory);
 		}
 
 		// 
 		public IContributionFactory GetContributionFactory( string name ) {
-			IContributionFactory factory = contributionFactories[name];
+            string anam = AdjustFactoryName(name);
+            IContributionFactory factory = contributionFactories[anam];
 			if(factory==null)
-				throw new Exception(name+"は未知のコントリビューションです");
+                throw new Exception(name + "は未知のコントリビューションです");
 			else
 				return factory;
 		}
+
+        static string AdjustFactoryName(string orignam) {
+            if(orignam==null) return null;
+            return orignam.Trim().ToLower();
+        }
 		#endregion
 
 		/// <summary>
@@ -517,7 +531,7 @@
             }
         }
 
-        public IEnumerable<IContributionFactory> Factories {
+        public IEnumerable<KeyValuePair<string,IContributionFactory>> Factories {
             get {
                 return new FactoryEnumerator();
             }
@@ -573,13 +587,13 @@
 		}
 
 
-        internal class FactoryEnumerator : IEnumerable<IContributionFactory>
+        internal class FactoryEnumerator : IEnumerable<KeyValuePair<string, IContributionFactory>>
         {
             public FactoryEnumerator() {
             }
 
-            public IEnumerator<IContributionFactory> GetEnumerator() {
-                foreach (IContributionFactory fct in PluginManager.theInstance.contributionFactories.Values)
+            public IEnumerator<KeyValuePair<string, IContributionFactory>> GetEnumerator() {
+                foreach (KeyValuePair<string,IContributionFactory> fct in PluginManager.theInstance.contributionFactories)
                     yield return fct;
             }
 

--- framework/framework/plugin/CustomContributionFactory.cs	(revision 4)
+++ framework/framework/plugin/CustomContributionFactory.cs	(revision 5)
@@ -29,5 +29,10 @@
         }
 
         protected abstract Contribution Cretate(Plugin owner, ParamsReader e);
+
+
+        public string Description {
+            get { return null; }
+        }
     }
 }

--- framework/framework/plugin/ContributionFactory.cs	(revision 4)
+++ framework/framework/plugin/ContributionFactory.cs	(revision 5)
@@ -20,6 +20,8 @@
 		Contribution load( Plugin owner, ParamsReader e );
 
 		Type OutputType { get; }
+
+        string Description { get; }
 	}
 
     public class DefaultContributionFactory : Contribution, IContributionFactory
@@ -47,5 +49,16 @@
 					"{0} is incorrect for this contribution (expected:{1})",
 					contrib.GetType().FullName, baseType.FullName ));
 		}
+
+        public override string Description {
+            get {
+                string dbase = base.Description;
+                if (dbase != null & dbase.Length > 0) {
+                    return dbase;
+                } else {
+                    return base.Name;
+                }
+            }
+        }
     }
 }

--- framework/framework/loader/XmlParamParser.cs	(revision 4)
+++ framework/framework/loader/XmlParamParser.cs	(revision 5)
@@ -45,12 +45,13 @@
         }
 
         public IFileSource GetFileSource(string path) {
-            Uri uri= XmlUtil.resolve(node, path);
-            if (uri.IsFile) {
-                return new LocalFile(uri.LocalPath);
-            } else {
-                return null;
+            if (path != null && path.Length > 0) {
+                Uri uri = XmlUtil.resolve(node, path);
+                if (uri.IsFile) {
+                    return new LocalFile(uri.LocalPath);
+                }
             }
+            return null;
         }
     }
 

--- framework/util/UIUtil.cs	(revision 4)
+++ framework/util/UIUtil.cs	(revision 5)
@@ -125,9 +125,13 @@
 		{
 			Assembly asm = Assembly.LoadFrom(Directories.AppBaseDir+"NFT.UI.DLL");
 			Type t = asm.GetType("nft.ui.system.ErrorMessageBox");
-			object ret = t.InvokeMember("Show",BindingFlags.Public|BindingFlags.Static|BindingFlags.InvokeMethod,null,null,new object[]{owner,msg,e});
-            if (ret is bool && (bool)ret) {
-                throw e;
+            BindingFlags flags = BindingFlags.Public|BindingFlags.Static|BindingFlags.InvokeMethod;
+			object ret = t.InvokeMember("Show",flags ,null,null,new object[]{owner,msg,e});
+            if ((bool)ret && Main.mainFrame!=null) {
+                DialogResult r2 = MessageBox.Show(null, "Are you sure to QUIT?", "NeoFT", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+                if (r2 == DialogResult.Yes) {
+                    Environment.Exit(-2);
+                }
             }
 		}
 	}

--- ui_jp/ui/system/ErrorMessageBox.cs	(revision 4)
+++ ui_jp/ui/system/ErrorMessageBox.cs	(revision 5)
@@ -33,6 +33,7 @@
 		private System.Windows.Forms.Button copyButton;
         private System.Windows.Forms.Label note;
         private Button throwButton;
+        private Button abortButton;
 
 		private readonly Exception exception;
 
@@ -99,6 +100,7 @@
             this.copyButton = new System.Windows.Forms.Button();
             this.note = new System.Windows.Forms.Label();
             this.throwButton = new System.Windows.Forms.Button();
+            this.abortButton = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.icon)).BeginInit();
             this.SuspendLayout();
             // 
@@ -130,11 +132,11 @@
             this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
             this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.okButton.Location = new System.Drawing.Point(512, 219);
+            this.okButton.Location = new System.Drawing.Point(408, 219);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(80, 24);
             this.okButton.TabIndex = 3;
-            this.okButton.Text = "&OK";
+            this.okButton.Text = "続行(&C)";
             // 
             // msg
             // 
@@ -155,8 +157,7 @@
             this.linkLabel1.Size = new System.Drawing.Size(112, 16);
             this.linkLabel1.TabIndex = 4;
             this.linkLabel1.TabStop = true;
-            this.linkLabel1.TargetUrl = "http://www.kohsuke.org/freetrain/wiki/pukiwiki.php?%A5%D0%A5%B0%CA%F3%B9%F0%A4%CE" +
-    "%BC%EA%BD%E7";
+            this.linkLabel1.TargetUrl = "https://sourceforge.jp/users/c477/pf/NeoFT.Workshop/ticket/";
             this.linkLabel1.Text = " バグの報告先";
             this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
@@ -187,14 +188,25 @@
             // throwButton
             // 
             this.throwButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.throwButton.Location = new System.Drawing.Point(200, 220);
+            this.throwButton.Location = new System.Drawing.Point(190, 220);
             this.throwButton.Name = "throwButton";
-            this.throwButton.Size = new System.Drawing.Size(146, 23);
+            this.throwButton.Size = new System.Drawing.Size(134, 23);
             this.throwButton.TabIndex = 7;
             this.throwButton.Text = "再throw(開発用)";
             this.throwButton.UseVisualStyleBackColor = true;
             this.throwButton.Click += new System.EventHandler(this.throwButton_Click);
             // 
+            // abortButton
+            // 
+            this.abortButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.abortButton.DialogResult = System.Windows.Forms.DialogResult.Abort;
+            this.abortButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.abortButton.Location = new System.Drawing.Point(494, 219);
+            this.abortButton.Name = "abortButton";
+            this.abortButton.Size = new System.Drawing.Size(98, 24);
+            this.abortButton.TabIndex = 3;
+            this.abortButton.Text = "アプリ終了(&X)";
+            // 
             // ErrorMessageBox
             // 
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
@@ -203,6 +215,7 @@
             this.Controls.Add(this.note);
             this.Controls.Add(this.copyButton);
             this.Controls.Add(this.linkLabel1);
+            this.Controls.Add(this.abortButton);
             this.Controls.Add(this.okButton);
             this.Controls.Add(this.detail);
             this.Controls.Add(this.msg);

--- ui_jp/ui/system/PluginListDialog.cs	(revision 4)
+++ ui_jp/ui/system/PluginListDialog.cs	(revision 5)
@@ -300,9 +300,8 @@
 
 			// construct tree
 			tree.Nodes.Clear();
-            foreach (IContributionFactory f in PluginManager.theInstance.Factories) {
-                Type t = f.OutputType;
-                tree.Nodes.Add(CreateTreeItem(f));
+            foreach (KeyValuePair<string, IContributionFactory> fent in PluginManager.theInstance.Factories) {
+                tree.Nodes.Add(CreateTreeItem(fent));
             }
             //foreach (Plugin p in PluginManager.theInstance.Plugins)
 				//tree.Nodes.Add( CreateTreeItem(p) );
@@ -583,10 +582,18 @@
 		{
 		}
 	
-		private TreeNode CreateTreeItem(IContributionFactory f)
+		private TreeNode CreateTreeItem(KeyValuePair<string,IContributionFactory> kvp)
 		{
-			int icon = 6;
-			TreeNode node = new TreeNode(f.OutputType.Name, icon, icon, new TreeNode[]{new TreeNode("")} );
+            IContributionFactory f = kvp.Value;
+            string caption;
+            Contribution ctb = f as Contribution;
+            if (ctb != null && ctb.Description != null && ctb.Description.Trim().Length>0 ) {
+                caption = string.Format("{0}: {1}", kvp.Key, ctb.Description);
+            } else {
+                caption = kvp.Key;
+            }
+            int icon = 6;
+            TreeNode node = new TreeNode(caption, icon, icon, new TreeNode[] { new TreeNode("") });
 			node.Tag = f;
 			node.Checked = true;
 			return node;