no commit message

BaseUI/Toolbar.cs

@@ -463,7 +463,7 @@ namespace Framework.BaseUI
 			Dictionary<string, BarActionButton> dictionary = GetAllButtonsByName();
 			foreach (KeyValuePair<string, BarActionButton> kvp in dictionary)
 			{
-				if (kvp.Key == "CloseForm")
+				if (kvp.Key == "CloseForm" || kvp.Key == "RestoreCustomStyle")
 				{
 					continue;
 				}
@@ -497,7 +497,7 @@ namespace Framework.BaseUI
 			Dictionary<string, BarActionButton> dictionary = GetAllButtonsByName();
 			foreach (KeyValuePair<string, BarActionButton> kvp in dictionary)
 			{
-				if (kvp.Key == "CloseForm")
+				if (kvp.Key == "CloseForm" || kvp.Key == "RestoreCustomStyle")
 				{
 					continue;
 				}

BaseUI/ToolbarBaseForm.cs

@@ -94,7 +94,19 @@ namespace Framework.BaseUI
 			}
 		}
 
-		[Action(Name = "关闭", Permission = false, BeginGroup = true, Order = 1001)]
+		[Action(Name = "默认布局", Image = Toolbar.wizard, Permission = false, BeginGroup = true, Order = 1001)]
+		protected virtual void RestoreCustomStyle() //工具栏上的关闭窗体是无条件必须有的
+		{
+			if (!MsgBox.Confirm("您确定要恢复默认布局吗？"))
+			{
+				return;
+			}
+
+			this.ClearStyle();
+			MsgBox.Show("默认布局恢复成功，请重新打开当前窗体");
+		}
+
+		[Action(Name = "关闭", Permission = false, Order = 1002)]
 		protected virtual void CloseForm() //工具栏上的关闭窗体是无条件必须有的
 		{
 			this.Close();

Components/LayoutHelper.cs

@@ -123,6 +123,16 @@ namespace Infrastructure.Components
 			}
 		}
 
+		public static void ClearStyle(this Form form)
+		{
+			string formName = form.GetType().FullName;
+			string path = GetLayoutPath("");
+			foreach (string f in Directory.GetFiles(path, formName + "*"))
+			{
+				File.Delete(f);
+			}
+		}
+
 		/***************************************************************/
 
 		public static void SaveStyle(this Form form)
@@ -167,11 +177,5 @@ namespace Infrastructure.Components
 			return path;
 		}
 
-
-		public static string layoutSettingFileName
-		{
-			get;
-			set;
-		}
 	}
 }