diff --git a/DarkUI/Controls/DarkButton.cs b/DarkUI/Controls/DarkButton.cs
index 610a82c..6f84d45 100644
--- a/DarkUI/Controls/DarkButton.cs
+++ b/DarkUI/Controls/DarkButton.cs
@@ -6,12 +6,6 @@ using System.Windows.Forms;
namespace DarkUI.Controls
{
- public enum DarkButtonStyle
- {
- Normal,
- Flat
- }
-
[ToolboxBitmap(typeof(Button))]
[DefaultEvent("Click")]
public class DarkButton : Button
diff --git a/DarkUI/Controls/DarkButtonStyle.cs b/DarkUI/Controls/DarkButtonStyle.cs
new file mode 100644
index 0000000..6d8bf6b
--- /dev/null
+++ b/DarkUI/Controls/DarkButtonStyle.cs
@@ -0,0 +1,8 @@
+namespace DarkUI.Controls
+{
+ public enum DarkButtonStyle
+ {
+ Normal,
+ Flat
+ }
+}
diff --git a/DarkUI/Controls/DarkContentAlignment.cs b/DarkUI/Controls/DarkContentAlignment.cs
new file mode 100644
index 0000000..378f971
--- /dev/null
+++ b/DarkUI/Controls/DarkContentAlignment.cs
@@ -0,0 +1,9 @@
+namespace DarkUI.Controls
+{
+ public enum DarkContentAlignment
+ {
+ Center,
+ Left,
+ Right
+ }
+}
diff --git a/DarkUI/Controls/DarkControl.cs b/DarkUI/Controls/DarkControl.cs
deleted file mode 100644
index 7738bb2..0000000
--- a/DarkUI/Controls/DarkControl.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace DarkUI.Controls
-{
- public enum DarkControlState
- {
- Normal,
- Hover,
- Pressed
- }
-
- public enum DarkContentAlignment
- {
- Center,
- Left,
- Right
- }
-
- public class DarkControl : Control
- {
- #region Property Region
-
- [Browsable(false)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
- public new Image BackgroundImage
- {
- get { return base.BackgroundImage; }
- }
-
- [Browsable(false)]
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
- public new ImageLayout BackgroundImageLayout
- {
- get { return base.BackgroundImageLayout; }
- }
-
- #endregion
- }
-}
diff --git a/DarkUI/Controls/DarkControlState.cs b/DarkUI/Controls/DarkControlState.cs
new file mode 100644
index 0000000..8d11cc1
--- /dev/null
+++ b/DarkUI/Controls/DarkControlState.cs
@@ -0,0 +1,9 @@
+namespace DarkUI.Controls
+{
+ public enum DarkControlState
+ {
+ Normal,
+ Hover,
+ Pressed
+ }
+}
diff --git a/DarkUI/Controls/DarkScrollBar.cs b/DarkUI/Controls/DarkScrollBar.cs
index 20f9f19..4b9ab16 100644
--- a/DarkUI/Controls/DarkScrollBar.cs
+++ b/DarkUI/Controls/DarkScrollBar.cs
@@ -7,23 +7,7 @@ using System.Windows.Forms;
namespace DarkUI.Controls
{
- public enum DarkScrollOrientation
- {
- Vertical,
- Horizontal
- }
-
- public class ScrollValueEventArgs : EventArgs
- {
- public int Value { get; private set; }
-
- public ScrollValueEventArgs(int value)
- {
- Value = value;
- }
- }
-
- public class DarkScrollBar : DarkControl
+ public class DarkScrollBar : Control
{
#region Event Region
diff --git a/DarkUI/Controls/DarkScrollBase.cs b/DarkUI/Controls/DarkScrollBase.cs
index 560c354..e5c9bbc 100644
--- a/DarkUI/Controls/DarkScrollBase.cs
+++ b/DarkUI/Controls/DarkScrollBase.cs
@@ -6,7 +6,7 @@ using System.Windows.Forms;
namespace DarkUI.Controls
{
- public abstract class DarkScrollBase : DarkControl
+ public abstract class DarkScrollBase : Control
{
#region Event Region
diff --git a/DarkUI/Controls/DarkScrollOrientation.cs b/DarkUI/Controls/DarkScrollOrientation.cs
new file mode 100644
index 0000000..36e2c0b
--- /dev/null
+++ b/DarkUI/Controls/DarkScrollOrientation.cs
@@ -0,0 +1,8 @@
+namespace DarkUI.Controls
+{
+ public enum DarkScrollOrientation
+ {
+ Vertical,
+ Horizontal
+ }
+}
diff --git a/DarkUI/Controls/DarkSeparator.cs b/DarkUI/Controls/DarkSeparator.cs
index 10921fd..adf17ae 100644
--- a/DarkUI/Controls/DarkSeparator.cs
+++ b/DarkUI/Controls/DarkSeparator.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
namespace DarkUI.Controls
{
- public class DarkSeparator : DarkControl
+ public class DarkSeparator : Control
{
#region Constructor Region
diff --git a/DarkUI/Controls/ScrollValueEventArgs.cs b/DarkUI/Controls/ScrollValueEventArgs.cs
new file mode 100644
index 0000000..6e9b784
--- /dev/null
+++ b/DarkUI/Controls/ScrollValueEventArgs.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace DarkUI.Controls
+{
+ public class ScrollValueEventArgs : EventArgs
+ {
+ public int Value { get; private set; }
+
+ public ScrollValueEventArgs(int value)
+ {
+ Value = value;
+ }
+ }
+}
diff --git a/DarkUI/DarkUI.csproj b/DarkUI/DarkUI.csproj
index a88243f..1cc2d07 100644
--- a/DarkUI/DarkUI.csproj
+++ b/DarkUI/DarkUI.csproj
@@ -12,6 +12,10 @@
v4.0
512
Client
+ SAK
+ SAK
+ SAK
+ SAK
true
@@ -42,15 +46,16 @@
+
Component
-
- Component
-
+
+
Component
+
Component
@@ -76,7 +81,9 @@
Component
-
+
+ Component
+
Component
@@ -96,7 +103,11 @@
Component
-
+
+
+
+ UserControl
+
Component
@@ -109,12 +120,14 @@
UserControl
+
UserControl
+
@@ -123,6 +136,7 @@
DarkDialog.cs
+
Form
@@ -132,6 +146,7 @@
DarkMessageBox.cs
+
Form
diff --git a/DarkUI/Docking/DarkDockArea.cs b/DarkUI/Docking/DarkDockArea.cs
new file mode 100644
index 0000000..652ceed
--- /dev/null
+++ b/DarkUI/Docking/DarkDockArea.cs
@@ -0,0 +1,10 @@
+namespace DarkUI.Docking
+{
+ public enum DarkDockArea
+ {
+ Document,
+ Left,
+ Right,
+ Bottom
+ }
+}
diff --git a/DarkUI/Docking/DarkDockContent.cs b/DarkUI/Docking/DarkDockContent.cs
index e64bfdc..91bac6e 100644
--- a/DarkUI/Docking/DarkDockContent.cs
+++ b/DarkUI/Docking/DarkDockContent.cs
@@ -5,16 +5,6 @@ using System.Windows.Forms;
namespace DarkUI.Docking
{
- public class DockContentEventArgs : EventArgs
- {
- public DarkDockContent Content { get; private set; }
-
- public DockContentEventArgs(DarkDockContent content)
- {
- Content = content;
- }
- }
-
[ToolboxItem(false)]
public class DarkDockContent : UserControl
{
diff --git a/DarkUI/Docking/DarkDockPanel.cs b/DarkUI/Docking/DarkDockPanel.cs
index 425ece9..85326de 100644
--- a/DarkUI/Docking/DarkDockPanel.cs
+++ b/DarkUI/Docking/DarkDockPanel.cs
@@ -7,14 +7,6 @@ using System.Windows.Forms;
namespace DarkUI.Docking
{
- public enum DarkDockArea
- {
- Document,
- Left,
- Right,
- Bottom
- }
-
public class DarkDockPanel : UserControl
{
#region Event Region
diff --git a/DarkUI/Docking/DarkDockRegion.cs b/DarkUI/Docking/DarkDockRegion.cs
index 8610bf1..18e3bff 100644
--- a/DarkUI/Docking/DarkDockRegion.cs
+++ b/DarkUI/Docking/DarkDockRegion.cs
@@ -104,7 +104,7 @@ namespace DarkUI.Docking
public List GetContents()
{
var result = new List();
-
+
foreach (var group in _groups)
result.AddRange(group.GetContents());
diff --git a/DarkUI/Docking/DarkDockSplitter.cs b/DarkUI/Docking/DarkDockSplitter.cs
index f1746a2..aef13b2 100644
--- a/DarkUI/Docking/DarkDockSplitter.cs
+++ b/DarkUI/Docking/DarkDockSplitter.cs
@@ -5,14 +5,6 @@ using System.Windows.Forms;
namespace DarkUI.Docking
{
- public enum DarkSplitterType
- {
- Left,
- Right,
- Top,
- Bottom
- }
-
public class DarkDockSplitter
{
#region Field Region
diff --git a/DarkUI/Docking/DarkSplitterType.cs b/DarkUI/Docking/DarkSplitterType.cs
new file mode 100644
index 0000000..9a6c349
--- /dev/null
+++ b/DarkUI/Docking/DarkSplitterType.cs
@@ -0,0 +1,10 @@
+namespace DarkUI.Docking
+{
+ public enum DarkSplitterType
+ {
+ Left,
+ Right,
+ Top,
+ Bottom
+ }
+}
diff --git a/DarkUI/Docking/DockContentEvenArgs.cs b/DarkUI/Docking/DockContentEvenArgs.cs
new file mode 100644
index 0000000..13ae74d
--- /dev/null
+++ b/DarkUI/Docking/DockContentEvenArgs.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace DarkUI.Docking
+{
+ public class DockContentEventArgs : EventArgs
+ {
+ public DarkDockContent Content { get; private set; }
+
+ public DockContentEventArgs(DarkDockContent content)
+ {
+ Content = content;
+ }
+ }
+}
diff --git a/DarkUI/Forms/DarkDialog.cs b/DarkUI/Forms/DarkDialog.cs
index e728dd1..c3ee43a 100644
--- a/DarkUI/Forms/DarkDialog.cs
+++ b/DarkUI/Forms/DarkDialog.cs
@@ -5,17 +5,6 @@ using System.Windows.Forms;
namespace DarkUI.Forms
{
- public enum DarkDialogButton
- {
- Ok,
- Close,
- OkCancel,
- YesNo,
- YesNoCancel,
- AbortRetryIgnore,
- RetryCancel
- }
-
public partial class DarkDialog : DarkForm
{
#region Field Region
diff --git a/DarkUI/Forms/DarkDialogButton.cs b/DarkUI/Forms/DarkDialogButton.cs
new file mode 100644
index 0000000..e579bbd
--- /dev/null
+++ b/DarkUI/Forms/DarkDialogButton.cs
@@ -0,0 +1,13 @@
+namespace DarkUI.Forms
+{
+ public enum DarkDialogButton
+ {
+ Ok,
+ Close,
+ OkCancel,
+ YesNo,
+ YesNoCancel,
+ AbortRetryIgnore,
+ RetryCancel
+ }
+}
diff --git a/DarkUI/Forms/DarkMessageBox.cs b/DarkUI/Forms/DarkMessageBox.cs
index e6d1d55..76e2429 100644
--- a/DarkUI/Forms/DarkMessageBox.cs
+++ b/DarkUI/Forms/DarkMessageBox.cs
@@ -6,14 +6,6 @@ using System.Windows.Forms;
namespace DarkUI.Forms
{
- public enum DarkMessageBoxIcon
- {
- None,
- Information,
- Warning,
- Error
- }
-
public partial class DarkMessageBox : DarkDialog
{
#region Field Region
diff --git a/DarkUI/Forms/DarkMessageBoxIcon.cs b/DarkUI/Forms/DarkMessageBoxIcon.cs
new file mode 100644
index 0000000..358d5eb
--- /dev/null
+++ b/DarkUI/Forms/DarkMessageBoxIcon.cs
@@ -0,0 +1,10 @@
+namespace DarkUI.Forms
+{
+ public enum DarkMessageBoxIcon
+ {
+ None,
+ Information,
+ Warning,
+ Error
+ }
+}