From 99b88d09917965df2696d9130bdd1e6fc843391c Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 4 Dec 2015 20:53:16 +0000 Subject: [PATCH] Fixed Example project namespaces --- Example/Forms/Dialogs/DialogAbout.Designer.cs | 24 +++++++------- Example/Forms/Dialogs/DialogAbout.cs | 2 +- Example/Forms/Dialogs/DialogTest.Designer.cs | 32 ++++++++++--------- Example/Forms/Dialogs/DialogTest.cs | 3 +- Example/Forms/Docking/DockConsole.Designer.cs | 11 ++++--- Example/Forms/Docking/DockConsole.cs | 3 +- Example/Forms/Docking/DockDocument.cs | 4 ++- Example/Forms/Docking/DockHistory.Designer.cs | 11 ++++--- Example/Forms/Docking/DockHistory.cs | 3 +- Example/Forms/Docking/DockLayers.Designer.cs | 11 ++++--- Example/Forms/Docking/DockLayers.cs | 3 +- Example/Forms/Docking/DockProject.Designer.cs | 11 ++++--- Example/Forms/Docking/DockProject.cs | 3 +- .../Forms/Docking/DockProperties.Designer.cs | 6 ++-- Example/Forms/Docking/DockProperties.cs | 2 +- Example/Forms/MainForm.Designer.cs | 25 ++++++++------- Example/Forms/MainForm.cs | 4 ++- 17 files changed, 94 insertions(+), 64 deletions(-) diff --git a/Example/Forms/Dialogs/DialogAbout.Designer.cs b/Example/Forms/Dialogs/DialogAbout.Designer.cs index 9dbf1ed..53f5a23 100644 --- a/Example/Forms/Dialogs/DialogAbout.Designer.cs +++ b/Example/Forms/Dialogs/DialogAbout.Designer.cs @@ -1,4 +1,6 @@ -namespace Example +using DarkUI.Controls; + +namespace Example { partial class DialogAbout { @@ -30,11 +32,11 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogAbout)); this.pnlMain = new System.Windows.Forms.Panel(); - this.lblVersion = new DarkUI.DarkLabel(); - this.darkLabel3 = new DarkUI.DarkLabel(); - this.darkLabel2 = new DarkUI.DarkLabel(); - this.darkLabel1 = new DarkUI.DarkLabel(); - this.lblHeader = new DarkUI.DarkLabel(); + this.lblVersion = new DarkLabel(); + this.darkLabel3 = new DarkLabel(); + this.darkLabel2 = new DarkLabel(); + this.darkLabel1 = new DarkLabel(); + this.lblHeader = new DarkLabel(); this.pnlMain.SuspendLayout(); this.SuspendLayout(); // @@ -137,10 +139,10 @@ #endregion private System.Windows.Forms.Panel pnlMain; - private DarkUI.DarkLabel lblHeader; - private DarkUI.DarkLabel darkLabel1; - private DarkUI.DarkLabel darkLabel3; - private DarkUI.DarkLabel darkLabel2; - private DarkUI.DarkLabel lblVersion; + private DarkLabel lblHeader; + private DarkLabel darkLabel1; + private DarkLabel darkLabel3; + private DarkLabel darkLabel2; + private DarkLabel lblVersion; } } \ No newline at end of file diff --git a/Example/Forms/Dialogs/DialogAbout.cs b/Example/Forms/Dialogs/DialogAbout.cs index e3cc762..b33b110 100644 --- a/Example/Forms/Dialogs/DialogAbout.cs +++ b/Example/Forms/Dialogs/DialogAbout.cs @@ -1,4 +1,4 @@ -using DarkUI; +using DarkUI.Forms; using System.Windows.Forms; namespace Example diff --git a/Example/Forms/Dialogs/DialogTest.Designer.cs b/Example/Forms/Dialogs/DialogTest.Designer.cs index a71be7e..34abf47 100644 --- a/Example/Forms/Dialogs/DialogTest.Designer.cs +++ b/Example/Forms/Dialogs/DialogTest.Designer.cs @@ -1,4 +1,6 @@ -namespace Example +using DarkUI.Controls; + +namespace Example { partial class DialogTest { @@ -31,15 +33,15 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogTest)); this.pnlMain = new System.Windows.Forms.Panel(); this.tblMain = new System.Windows.Forms.TableLayoutPanel(); - this.pnlTreeView = new DarkUI.DarkSectionPanel(); - this.treeTest = new DarkUI.DarkTreeView(); - this.pnlListView = new DarkUI.DarkSectionPanel(); - this.lstTest = new DarkUI.DarkListView(); - this.pnlMessageBox = new DarkUI.DarkSectionPanel(); + this.pnlTreeView = new DarkSectionPanel(); + this.treeTest = new DarkTreeView(); + this.pnlListView = new DarkSectionPanel(); + this.lstTest = new DarkListView(); + this.pnlMessageBox = new DarkSectionPanel(); this.panel1 = new System.Windows.Forms.Panel(); - this.btnMessageBox = new DarkUI.DarkButton(); + this.btnMessageBox = new DarkButton(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnDialog = new DarkUI.DarkButton(); + this.btnDialog = new DarkButton(); this.pnlMain.SuspendLayout(); this.tblMain.SuspendLayout(); this.pnlTreeView.SuspendLayout(); @@ -198,14 +200,14 @@ private System.Windows.Forms.Panel pnlMain; private System.Windows.Forms.TableLayoutPanel tblMain; - private DarkUI.DarkSectionPanel pnlTreeView; - private DarkUI.DarkTreeView treeTest; - private DarkUI.DarkSectionPanel pnlListView; - private DarkUI.DarkListView lstTest; - private DarkUI.DarkSectionPanel pnlMessageBox; + private DarkSectionPanel pnlTreeView; + private DarkTreeView treeTest; + private DarkSectionPanel pnlListView; + private DarkListView lstTest; + private DarkSectionPanel pnlMessageBox; private System.Windows.Forms.Panel panel1; - private DarkUI.DarkButton btnMessageBox; + private DarkButton btnMessageBox; private System.Windows.Forms.Panel panel2; - private DarkUI.DarkButton btnDialog; + private DarkButton btnDialog; } } \ No newline at end of file diff --git a/Example/Forms/Dialogs/DialogTest.cs b/Example/Forms/Dialogs/DialogTest.cs index bfb7c59..c64518f 100644 --- a/Example/Forms/Dialogs/DialogTest.cs +++ b/Example/Forms/Dialogs/DialogTest.cs @@ -1,4 +1,5 @@ -using DarkUI; +using DarkUI.Controls; +using DarkUI.Forms; namespace Example { diff --git a/Example/Forms/Docking/DockConsole.Designer.cs b/Example/Forms/Docking/DockConsole.Designer.cs index 0ee49df..ef96f59 100644 --- a/Example/Forms/Docking/DockConsole.Designer.cs +++ b/Example/Forms/Docking/DockConsole.Designer.cs @@ -1,4 +1,7 @@ -namespace Example +using DarkUI.Config; +using DarkUI.Controls; + +namespace Example { partial class DockConsole { @@ -28,7 +31,7 @@ /// private void InitializeComponent() { - this.lstConsole = new DarkUI.DarkListView(); + this.lstConsole = new DarkListView(); this.SuspendLayout(); // // lstConsole @@ -46,7 +49,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.lstConsole); - this.DockArea = DarkUI.DarkDockArea.Bottom; + this.DockArea = DarkDockArea.Bottom; this.DockText = "Console"; this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::Example.Icons.Console; @@ -58,6 +61,6 @@ #endregion - private DarkUI.DarkListView lstConsole; + private DarkListView lstConsole; } } diff --git a/Example/Forms/Docking/DockConsole.cs b/Example/Forms/Docking/DockConsole.cs index 2985d81..ecf4227 100644 --- a/Example/Forms/Docking/DockConsole.cs +++ b/Example/Forms/Docking/DockConsole.cs @@ -1,4 +1,5 @@ -using DarkUI; +using DarkUI.Controls; +using DarkUI.Docking; namespace Example { diff --git a/Example/Forms/Docking/DockDocument.cs b/Example/Forms/Docking/DockDocument.cs index bc478b1..4ce1416 100644 --- a/Example/Forms/Docking/DockDocument.cs +++ b/Example/Forms/Docking/DockDocument.cs @@ -1,4 +1,6 @@ -using DarkUI; +using DarkUI.Config; +using DarkUI.Docking; +using DarkUI.Forms; using System.Windows.Forms; namespace Example diff --git a/Example/Forms/Docking/DockHistory.Designer.cs b/Example/Forms/Docking/DockHistory.Designer.cs index 0cd4a7a..84d5a8f 100644 --- a/Example/Forms/Docking/DockHistory.Designer.cs +++ b/Example/Forms/Docking/DockHistory.Designer.cs @@ -1,4 +1,7 @@ -namespace Example +using DarkUI.Config; +using DarkUI.Controls; + +namespace Example { partial class DockHistory { @@ -28,7 +31,7 @@ /// private void InitializeComponent() { - this.lstHistory = new DarkUI.DarkListView(); + this.lstHistory = new DarkListView(); this.SuspendLayout(); // // lstHistory @@ -45,7 +48,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.lstHistory); - this.DockArea = DarkUI.DarkDockArea.Bottom; + this.DockArea = DarkDockArea.Bottom; this.DockText = "History"; this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::Example.Icons.RefactoringLog_12810; @@ -57,6 +60,6 @@ #endregion - private DarkUI.DarkListView lstHistory; + private DarkListView lstHistory; } } diff --git a/Example/Forms/Docking/DockHistory.cs b/Example/Forms/Docking/DockHistory.cs index 19f5c48..e546654 100644 --- a/Example/Forms/Docking/DockHistory.cs +++ b/Example/Forms/Docking/DockHistory.cs @@ -1,4 +1,5 @@ -using DarkUI; +using DarkUI.Controls; +using DarkUI.Docking; namespace Example { diff --git a/Example/Forms/Docking/DockLayers.Designer.cs b/Example/Forms/Docking/DockLayers.Designer.cs index 955126b..a7cb796 100644 --- a/Example/Forms/Docking/DockLayers.Designer.cs +++ b/Example/Forms/Docking/DockLayers.Designer.cs @@ -1,4 +1,7 @@ -namespace Example +using DarkUI.Config; +using DarkUI.Controls; + +namespace Example { partial class DockLayers { @@ -28,7 +31,7 @@ /// private void InitializeComponent() { - this.lstLayers = new DarkUI.DarkListView(); + this.lstLayers = new DarkListView(); this.SuspendLayout(); // // lstLayers @@ -45,7 +48,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.lstLayers); - this.DockArea = DarkUI.DarkDockArea.Right; + this.DockArea = DarkDockArea.Right; this.DockText = "Layers"; this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::Example.Icons.Collection_16xLG; @@ -57,6 +60,6 @@ #endregion - private DarkUI.DarkListView lstLayers; + private DarkListView lstLayers; } } diff --git a/Example/Forms/Docking/DockLayers.cs b/Example/Forms/Docking/DockLayers.cs index 575fede..14bf7c4 100644 --- a/Example/Forms/Docking/DockLayers.cs +++ b/Example/Forms/Docking/DockLayers.cs @@ -1,4 +1,5 @@ -using DarkUI; +using DarkUI.Controls; +using DarkUI.Docking; namespace Example { diff --git a/Example/Forms/Docking/DockProject.Designer.cs b/Example/Forms/Docking/DockProject.Designer.cs index 284084d..78a526b 100644 --- a/Example/Forms/Docking/DockProject.Designer.cs +++ b/Example/Forms/Docking/DockProject.Designer.cs @@ -1,4 +1,7 @@ -namespace Example +using DarkUI.Config; +using DarkUI.Controls; + +namespace Example { partial class DockProject { @@ -28,7 +31,7 @@ /// private void InitializeComponent() { - this.treeProject = new DarkUI.DarkTreeView(); + this.treeProject = new DarkTreeView(); this.SuspendLayout(); // // treeProject @@ -48,7 +51,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.treeProject); - this.DockArea = DarkUI.DarkDockArea.Left; + this.DockArea = DarkDockArea.Left; this.DockText = "Project Explorer"; this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::Example.Icons.application_16x; @@ -60,6 +63,6 @@ #endregion - private DarkUI.DarkTreeView treeProject; + private DarkTreeView treeProject; } } diff --git a/Example/Forms/Docking/DockProject.cs b/Example/Forms/Docking/DockProject.cs index 2e00e33..9fb539e 100644 --- a/Example/Forms/Docking/DockProject.cs +++ b/Example/Forms/Docking/DockProject.cs @@ -1,4 +1,5 @@ -using DarkUI; +using DarkUI.Controls; +using DarkUI.Docking; namespace Example { diff --git a/Example/Forms/Docking/DockProperties.Designer.cs b/Example/Forms/Docking/DockProperties.Designer.cs index c47ae7c..6bd766a 100644 --- a/Example/Forms/Docking/DockProperties.Designer.cs +++ b/Example/Forms/Docking/DockProperties.Designer.cs @@ -1,4 +1,6 @@ -namespace Example +using DarkUI.Config; + +namespace Example { partial class DockProperties { @@ -34,7 +36,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.DockArea = DarkUI.DarkDockArea.Right; + this.DockArea = DarkDockArea.Right; this.DockText = "Properties"; this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = global::Example.Icons.properties_16xLG; diff --git a/Example/Forms/Docking/DockProperties.cs b/Example/Forms/Docking/DockProperties.cs index 655df52..c32ad3b 100644 --- a/Example/Forms/Docking/DockProperties.cs +++ b/Example/Forms/Docking/DockProperties.cs @@ -1,4 +1,4 @@ -using DarkUI; +using DarkUI.Docking; namespace Example { diff --git a/Example/Forms/MainForm.Designer.cs b/Example/Forms/MainForm.Designer.cs index a7dc2d9..80d3c3a 100644 --- a/Example/Forms/MainForm.Designer.cs +++ b/Example/Forms/MainForm.Designer.cs @@ -1,4 +1,7 @@ -namespace Example +using DarkUI.Controls; +using DarkUI.Docking; + +namespace Example { partial class MainForm { @@ -29,7 +32,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.mnuMain = new DarkUI.DarkMenuStrip(); + this.mnuMain = new DarkMenuStrip(); this.mnuFile = new System.Windows.Forms.ToolStripMenuItem(); this.mnuNewFile = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -45,14 +48,14 @@ this.mnuHistory = new System.Windows.Forms.ToolStripMenuItem(); this.mnuHelp = new System.Windows.Forms.ToolStripMenuItem(); this.mnuAbout = new System.Windows.Forms.ToolStripMenuItem(); - this.toolMain = new DarkUI.DarkToolStrip(); + this.toolMain = new DarkToolStrip(); this.btnNewFile = new System.Windows.Forms.ToolStripButton(); - this.stripMain = new DarkUI.DarkStatusStrip(); + this.stripMain = new DarkStatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel6 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel5 = new System.Windows.Forms.ToolStripStatusLabel(); - this.DockPanel = new DarkUI.DarkDockPanel(); - this.darkSeparator1 = new DarkUI.DarkSeparator(); + this.DockPanel = new DarkDockPanel(); + this.darkSeparator1 = new DarkSeparator(); this.mnuMain.SuspendLayout(); this.toolMain.SuspendLayout(); this.stripMain.SuspendLayout(); @@ -321,9 +324,9 @@ #endregion - private DarkUI.DarkMenuStrip mnuMain; - private DarkUI.DarkToolStrip toolMain; - private DarkUI.DarkStatusStrip stripMain; + private DarkMenuStrip mnuMain; + private DarkToolStrip toolMain; + private DarkStatusStrip stripMain; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel6; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel5; @@ -338,13 +341,13 @@ private System.Windows.Forms.ToolStripButton btnNewFile; private System.Windows.Forms.ToolStripMenuItem mnuNewFile; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private DarkUI.DarkDockPanel DockPanel; + private DarkDockPanel DockPanel; private System.Windows.Forms.ToolStripMenuItem mnuProject; private System.Windows.Forms.ToolStripMenuItem mnuProperties; private System.Windows.Forms.ToolStripMenuItem mnuConsole; private System.Windows.Forms.ToolStripMenuItem mnuLayers; private System.Windows.Forms.ToolStripMenuItem mnuHistory; - private DarkUI.DarkSeparator darkSeparator1; + private DarkSeparator darkSeparator1; } } diff --git a/Example/Forms/MainForm.cs b/Example/Forms/MainForm.cs index 244caab..0e7c0cd 100644 --- a/Example/Forms/MainForm.cs +++ b/Example/Forms/MainForm.cs @@ -1,4 +1,6 @@ -using DarkUI; +using DarkUI.Docking; +using DarkUI.Forms; +using DarkUI.Win32; using System; using System.Windows.Forms;