diff --git a/CSharp/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/CSharp/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
index 75dae92b..54a944b5 100644
--- a/CSharp/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
+++ b/CSharp/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
@@ -174,7 +174,7 @@
UniversalEditor.Core
- {23ACD09E-E096-4B05-A6CE-6853EDDC589A}
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
MBS.Framework
diff --git a/CSharp/Libraries/UniversalEditor.Printing/PrintHandler.cs b/CSharp/Libraries/UniversalEditor.Printing/PrintHandler.cs
index b7b0c1c3..f6b4bb6b 100644
--- a/CSharp/Libraries/UniversalEditor.Printing/PrintHandler.cs
+++ b/CSharp/Libraries/UniversalEditor.Printing/PrintHandler.cs
@@ -20,7 +20,7 @@
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface.Drawing;
namespace UniversalEditor.Printing
{
diff --git a/CSharp/Libraries/UniversalEditor.Printing/UniversalEditor.Printing.csproj b/CSharp/Libraries/UniversalEditor.Printing/UniversalEditor.Printing.csproj
index 5ac3b607..cbf79283 100644
--- a/CSharp/Libraries/UniversalEditor.Printing/UniversalEditor.Printing.csproj
+++ b/CSharp/Libraries/UniversalEditor.Printing/UniversalEditor.Printing.csproj
@@ -39,14 +39,18 @@
{2D4737E6-6D95-408A-90DB-8DFF38147E85}
UniversalEditor.Core
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{30467E5C-05BC-4856-AADC-13906EF4CADD}
UniversalEditor.Essential
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
+
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
+ MBS.Framework
+
\ No newline at end of file
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/CommandBar.cs b/CSharp/Libraries/UniversalEditor.UserInterface/CommandBar.cs
index 79c14aaa..799c3070 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/CommandBar.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/CommandBar.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs
index 1fcc5dbe..d45de88a 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs
@@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Input.Keyboard;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Input.Keyboard;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Layouts;
using System.Collections.ObjectModel;
using System.Collections.Generic;
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/UniversalEditorFileBrowserControl.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/UniversalEditorFileBrowserControl.cs
index 6d831331..267dbfa4 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/UniversalEditorFileBrowserControl.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/UniversalEditorFileBrowserControl.cs
@@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Layouts;
-using UniversalWidgetToolkit.Controls.FileBrowser;
-using UniversalWidgetToolkit.Controls;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Layouts;
+using MBS.Framework.UserInterface.Controls.FileBrowser;
+using MBS.Framework.UserInterface.Controls;
using System.Collections.Generic;
namespace UniversalEditor.UserInterface.Controls
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs
index eca259bf..ab0a7542 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs
@@ -1,6 +1,6 @@
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
namespace UniversalEditor.UserInterface.Dialogs
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
index b54efff5..94e493ac 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
@@ -20,10 +20,10 @@
// along with this program. If not, see .
using System;
using System.Collections.Generic;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Dialogs
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DataFormatAboutDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DataFormatAboutDialog.cs
index 7da642cf..befa1c59 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DataFormatAboutDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DataFormatAboutDialog.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface.Dialogs
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
index 2cc28e98..765a875c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
@@ -22,9 +22,9 @@ using System;
using System.Collections.Generic;
using System.Text;
using UniversalEditor.Accessors;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Drawing;
using MBS.Framework.Drawing;
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
index b9c7bf43..f2302a4c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
@@ -19,12 +19,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface;
using MBS.Framework.Drawing;
-using UniversalWidgetToolkit.Layouts;
-using UniversalWidgetToolkit.Controls.FileBrowser;
-using UniversalWidgetToolkit.Dialogs;
+using MBS.Framework.UserInterface.Layouts;
+using MBS.Framework.UserInterface.Controls.FileBrowser;
+using MBS.Framework.UserInterface.Dialogs;
using UniversalEditor.UserInterface.Controls;
namespace UniversalEditor.UserInterface.Dialogs
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs
index f874530a..ea715287 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs
@@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
using MBS.Framework.Drawing;
namespace UniversalEditor.UserInterface.Dialogs
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
index d98fda49..517bdc2c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs
@@ -22,9 +22,9 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Input.Keyboard;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Input.Keyboard;
namespace UniversalEditor.UserInterface.Dialogs
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
index 49bc6fc6..c1498d69 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.Designer.cs
@@ -20,10 +20,10 @@
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Dialogs
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
index f0b9d4ac..8f6cd363 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
@@ -20,10 +20,10 @@
// along with this program. If not, see .
using System;
using System.Collections.Generic;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Dialogs
{
@@ -271,7 +271,7 @@ namespace UniversalEditor.UserInterface.Dialogs
});
if (!String.IsNullOrEmpty(dt.LargeIconImageFileName))
{
- // lvi.Image = UniversalWidgetToolkit.Drawing.Image.FromFile(dt.LargeIconImageFileName);
+ // lvi.Image = MBS.Framework.UserInterface.Drawing.Image.FromFile(dt.LargeIconImageFileName);
}
else
{
@@ -475,7 +475,7 @@ namespace UniversalEditor.UserInterface.Dialogs
});
if (!String.IsNullOrEmpty(dt.LargeIconImageFileName))
{
- // lvi.Image = UniversalWidgetToolkit.Drawing.Image.FromFile(dt.LargeIconImageFileName);
+ // lvi.Image = MBS.Framework.UserInterface.Drawing.Image.FromFile(dt.LargeIconImageFileName);
}
else
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editor.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editor.cs
index 9e77f854..2422ef3c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editor.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editor.cs
@@ -7,15 +7,15 @@ using UniversalEditor.Accessors;
using UniversalEditor.DataFormats.PropertyList.XML;
using UniversalEditor.ObjectModels.PropertyList;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Input.Keyboard;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Input.Keyboard;
namespace UniversalEditor.UserInterface
{
///
/// Provides an interface for custom editor implementations not using the Universal Widget Toolkit.
///
- public abstract class Editor : UniversalWidgetToolkit.Container
+ public abstract class Editor : MBS.Framework.UserInterface.Container
{
public EditorSelection.EditorSelectionCollection Selections { get; } = new EditorSelection.EditorSelectionCollection();
public abstract void UpdateSelections();
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs
index f964214e..4596ca49 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs
@@ -23,12 +23,12 @@ using System.Text;
using MBS.Framework.Drawing;
using UniversalEditor.ObjectModels.Binary;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Controls.HexEditor;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Drawing;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Controls.HexEditor;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Drawing;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.Binary
{
@@ -353,7 +353,7 @@ namespace UniversalEditor.Editors.Binary
public BinaryEditor()
{
- this.Layout = new BoxLayout(UniversalWidgetToolkit.Orientation.Vertical);
+ this.Layout = new BoxLayout(MBS.Framework.UserInterface.Orientation.Vertical);
this.hexedit = new HexEditorControl();
this.hexedit.SelectionChanged += Hexedit_SelectionChanged;
@@ -487,9 +487,9 @@ namespace UniversalEditor.Editors.Binary
{
}
- void Txt_KeyDown(object sender, UniversalWidgetToolkit.Input.Keyboard.KeyEventArgs e)
+ void Txt_KeyDown(object sender, MBS.Framework.UserInterface.Input.Keyboard.KeyEventArgs e)
{
- if (e.Key == UniversalWidgetToolkit.Input.Keyboard.KeyboardKey.Enter)
+ if (e.Key == MBS.Framework.UserInterface.Input.Keyboard.KeyboardKey.Enter)
{
TextBox ctl = sender as TextBox;
CONVERSION_DATA converter = ctl.GetExtraData("converter");
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
index 0a532b44..c011c97a 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Binary/FieldDefinitionPropertiesDialog.cs
@@ -20,11 +20,11 @@
// along with this program. If not, see .
using System;
using MBS.Framework.Drawing;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Drawing;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Drawing;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.Binary
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.Designer.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.Designer.cs
index 320a02b1..da6e16b6 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.Designer.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.Designer.cs
@@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Input.Mouse;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Input.Mouse;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.FileSystem
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
index 03e58f3a..ee1d0e2e 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
@@ -23,11 +23,11 @@ using System.Collections.Generic;
using UniversalEditor.ObjectModels.FileSystem;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.DragDrop;
-using UniversalWidgetToolkit.Input.Keyboard;
-using UniversalWidgetToolkit.Input.Mouse;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.DragDrop;
+using MBS.Framework.UserInterface.Input.Keyboard;
+using MBS.Framework.UserInterface.Input.Mouse;
namespace UniversalEditor.Editors.FileSystem
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
index fc141a09..5507431d 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.Editors.FileSystem
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.Designer.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.Designer.cs
index 672e1c67..46f0c50e 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.Designer.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.Designer.cs
@@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.PropertyList
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditor.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditor.cs
index 010cba6e..25680e9f 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditor.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditor.cs
@@ -23,9 +23,9 @@ using System;
using UniversalEditor.ObjectModels.Text.Plain;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.Text.Plain
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditorSettingsProvider.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditorSettingsProvider.cs
index 47e7a99b..ecca8cd7 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditorSettingsProvider.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/Text/Plain/PlainTextEditorSettingsProvider.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.Editors.Text.Plain
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
index 56544035..20553a0e 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -13,11 +13,11 @@ using UniversalEditor.ObjectModels.Markup;
using UniversalEditor.DataFormats.FileSystem.UXT;
using UniversalEditor.DataFormats.PropertyList.UniversalPropertyList;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Drawing;
using UniversalEditor.UserInterface.Dialogs;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Input.Keyboard;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Input.Keyboard;
using MBS.Framework.Drawing;
namespace UniversalEditor.UserInterface
@@ -100,7 +100,7 @@ namespace UniversalEditor.UserInterface
// Glue.ApplicationInformation.ApplicationID = new Guid("{b359fe9a-080a-43fc-ae38-00ba7ac1703e}");
- UniversalWidgetToolkit.Application.Initialize();
+ MBS.Framework.UserInterface.Application.Initialize();
}
protected void MainLoop ()
@@ -142,7 +142,7 @@ namespace UniversalEditor.UserInterface
// Application.ThreadException += Application_ThreadException;
#endif
- UniversalWidgetToolkit.Application.Start();
+ MBS.Framework.UserInterface.Application.Start();
// Glue.Common.Methods.SendApplicationEvent(new Glue.ApplicationEventEventArgs(Glue.Common.Constants.EventNames.ApplicationStop));
}
@@ -175,12 +175,12 @@ namespace UniversalEditor.UserInterface
}
else
{
- UniversalWidgetToolkit.Dialogs.AboutDialog dlg = new UniversalWidgetToolkit.Dialogs.AboutDialog ();
+ MBS.Framework.UserInterface.Dialogs.AboutDialog dlg = new MBS.Framework.UserInterface.Dialogs.AboutDialog ();
dlg.ProgramName = "Universal Editor";
dlg.Version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
dlg.Copyright = "(c) 1997-2019 Michael Becker";
dlg.Comments = "A modular, extensible document editor";
- dlg.LicenseType = UniversalWidgetToolkit.LicenseType.GPL30;
+ dlg.LicenseType = MBS.Framework.UserInterface.LicenseType.GPL30;
dlg.ShowDialog();
}
}
@@ -203,7 +203,7 @@ namespace UniversalEditor.UserInterface
protected void StopApplicationInternal ()
{
- UniversalWidgetToolkit.Application.Stop ();
+ MBS.Framework.UserInterface.Application.Stop ();
}
@@ -1239,7 +1239,7 @@ namespace UniversalEditor.UserInterface
// LocalConfiguration.SplashScreen.Image = System.Drawing.Image.FromStream(ms);
// when I did this back in ... who knows when, Universal Widget Toolkit didn't
- // exist, let alone have a UniversalWidgetToolkit.Drawing.Image class...
+ // exist, let alone have a MBS.Framework.UserInterface.Drawing.Image class...
}
UniversalEditor.ObjectModels.FileSystem.File fileSplashScreenSound = fsom.Files["SplashScreen.wav"];
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/EngineMainMenu.cs b/CSharp/Libraries/UniversalEditor.UserInterface/EngineMainMenu.cs
index 51f8007f..e3c193fc 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/EngineMainMenu.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/EngineMainMenu.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
index ebaf8d2c..0c2b787c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
@@ -8,22 +8,22 @@ using UniversalEditor.ObjectModels.Text.Plain;
using UniversalEditor.UserInterface.Dialogs;
using UniversalEditor.UserInterface.Panels;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Controls.Docking;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.DragDrop;
-using UniversalWidgetToolkit.Input.Keyboard;
-using UniversalWidgetToolkit.Input.Mouse;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Controls.Docking;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.DragDrop;
+using MBS.Framework.UserInterface.Input.Keyboard;
+using MBS.Framework.UserInterface.Input.Mouse;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface.Drawing;
using MBS.Framework.Drawing;
// TODO: We need to work on UWT signaling to native objects...
-using UniversalWidgetToolkit.Layouts;
-using UniversalWidgetToolkit.Controls.Ribbon;
+using MBS.Framework.UserInterface.Layouts;
+using MBS.Framework.UserInterface.Controls.Ribbon;
using UniversalEditor.Printing;
-using UniversalWidgetToolkit.Printing;
+using MBS.Framework.UserInterface.Printing;
using UniversalEditor.UserInterface.Pages;
using UniversalEditor.ObjectModels.Binary;
using UniversalEditor.DataFormats.Binary;
@@ -148,7 +148,7 @@ namespace UniversalEditor.UserInterface
foreach (CommandItem ci in Engine.CurrentEngine.MainMenu.Items)
{
- UniversalWidgetToolkit.MenuItem mi = LoadMenuItem(ci);
+ MBS.Framework.UserInterface.MenuItem mi = LoadMenuItem(ci);
if (mi == null)
continue;
@@ -461,7 +461,7 @@ namespace UniversalEditor.UserInterface
protected override void OnClosed(EventArgs e)
{
- UniversalWidgetToolkit.Application.Stop();
+ MBS.Framework.UserInterface.Application.Stop();
}
protected override void OnCreated(EventArgs e)
{
@@ -471,7 +471,7 @@ namespace UniversalEditor.UserInterface
}, DragDropEffect.Copy, MouseButtons.Primary | MouseButtons.Secondary, KeyboardModifierKey.None);
}
- private UniversalWidgetToolkit.MenuItem LoadMenuItem(CommandItem ci)
+ private MBS.Framework.UserInterface.MenuItem LoadMenuItem(CommandItem ci)
{
if (ci is CommandReferenceCommandItem)
{
@@ -487,7 +487,7 @@ namespace UniversalEditor.UserInterface
{
foreach (CommandItem ci1 in cmd.Items)
{
- UniversalWidgetToolkit.MenuItem mi1 = LoadMenuItem(ci1);
+ MBS.Framework.UserInterface.MenuItem mi1 = LoadMenuItem(ci1);
mi.Items.Add(mi1);
}
}
@@ -505,7 +505,7 @@ namespace UniversalEditor.UserInterface
}
else if (ci is SeparatorCommandItem)
{
- return new UniversalWidgetToolkit.SeparatorMenuItem();
+ return new MBS.Framework.UserInterface.SeparatorMenuItem();
}
return null;
}
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Page.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Page.cs
index 3c6ebeee..fefc2290 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Page.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Page.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
index 414725ce..58681666 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
@@ -25,9 +25,9 @@ using System.Text;
using UniversalEditor.Accessors;
using UniversalEditor.ObjectModels.FileSystem;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface.Pages
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Panel.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Panel.cs
index b839eec1..8aa690e0 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Panel.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Panel.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs
index 78b00281..11c24837 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs
@@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Panels
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
index d6f2f0c9..9dc91b82 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
@@ -20,9 +20,9 @@
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Panels
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/StartPagePanel.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/StartPagePanel.cs
index 789bbf6a..abbe5719 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Panels/StartPagePanel.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Panels/StartPagePanel.cs
@@ -20,9 +20,9 @@
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Panels
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/SplashScreenWindow.cs b/CSharp/Libraries/UniversalEditor.UserInterface/SplashScreenWindow.cs
index ac6e90eb..59ffa707 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/SplashScreenWindow.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/SplashScreenWindow.cs
@@ -20,10 +20,10 @@
// along with this program. If not, see .
using System;
using MBS.Framework.Drawing;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Drawing;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Drawing;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface
{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj b/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
index 35df0970..207a7cdd 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
@@ -148,18 +148,18 @@
{30467E5C-05BC-4856-AADC-13906EF4CADD}
UniversalEditor.Essential
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
- {23ACD09E-E096-4B05-A6CE-6853EDDC589A}
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
MBS.Framework
{868A6888-EDB9-407E-A710-40F297D4EAB8}
UniversalEditor.Printing
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
diff --git a/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/Text/Plain/PlainTextPrintHandler.cs b/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/Text/Plain/PlainTextPrintHandler.cs
index b0de89b9..2bada74f 100644
--- a/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/Text/Plain/PlainTextPrintHandler.cs
+++ b/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/Text/Plain/PlainTextPrintHandler.cs
@@ -22,7 +22,7 @@ using System;
using MBS.Framework.Drawing;
using UniversalEditor.ObjectModels.Text.Plain;
using UniversalEditor.Printing;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface.Drawing;
namespace UniversalEditor.Plugins.Generic.Printing.Text.Plain
{
diff --git a/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/UniversalEditor.Plugins.Generic.Printing.csproj b/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/UniversalEditor.Plugins.Generic.Printing.csproj
index 27e73b0f..6b6bb6f3 100644
--- a/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/UniversalEditor.Plugins.Generic.Printing.csproj
+++ b/CSharp/Plugins.Printing/UniversalEditor.Plugins.Generic.Printing/UniversalEditor.Plugins.Generic.Printing.csproj
@@ -45,10 +45,6 @@
{868A6888-EDB9-407E-A710-40F297D4EAB8}
UniversalEditor.Printing
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{30467E5C-05BC-4856-AADC-13906EF4CADD}
UniversalEditor.Essential
@@ -57,6 +53,10 @@
{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
MBS.Framework
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
\ No newline at end of file
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
index 8205a153..13777d73 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs
@@ -22,9 +22,9 @@ using System;
using UniversalEditor.UserInterface;
using UniversalEditor.ObjectModels.Contact;
-using UniversalWidgetToolkit.Layouts;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
+using MBS.Framework.UserInterface.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
using MBS.Framework.Drawing;
using System.Text;
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface.csproj
index eb2e6f33..30d9da88 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface.csproj
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface.csproj
@@ -36,10 +36,6 @@
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{8622EBC4-8E20-476E-B284-33D472081F5C}
UniversalEditor.UserInterface
@@ -65,9 +61,13 @@
UniversalEditor.Plugins.AddressBook
- {23ACD09E-E096-4B05-A6CE-6853EDDC589A}
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
MBS.Framework
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/ExecutableEditor.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/ExecutableEditor.cs
index 974287ee..afd719c1 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/ExecutableEditor.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/ExecutableEditor.cs
@@ -21,11 +21,11 @@
using System;
using UniversalEditor.ObjectModels.Executable;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Dialogs;
-using UniversalWidgetToolkit.Input.Mouse;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Dialogs;
+using MBS.Framework.UserInterface.Input.Mouse;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable
{
@@ -109,9 +109,9 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable
this.contextMenuItemSelected = new Menu();
- this.contextMenuItemSelected.Items.AddRange(new UniversalWidgetToolkit.MenuItem[]
+ this.contextMenuItemSelected.Items.AddRange(new MBS.Framework.UserInterface.MenuItem[]
{
- new UniversalWidgetToolkit.CommandMenuItem("_Copy to", null, ContextMenu_CopyTo_Click)
+ new MBS.Framework.UserInterface.CommandMenuItem("_Copy to", null, ContextMenu_CopyTo_Click)
});
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/UniversalEditor.Plugins.Executable.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/UniversalEditor.Plugins.Executable.UserInterface.csproj
index a2bad354..77923cb3 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/UniversalEditor.Plugins.Executable.UserInterface.csproj
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/UniversalEditor.Plugins.Executable.UserInterface.csproj
@@ -49,14 +49,18 @@
{8622EBC4-8E20-476E-B284-33D472081F5C}
UniversalEditor.UserInterface
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{791A36F8-5D96-452B-89D2-78BA74596A1E}
UniversalEditor.Plugins.Executable
+
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
+ MBS.Framework
+
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
\ No newline at end of file
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface.csproj
index 7f908848..08ab4688 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface.csproj
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface/UniversalEditor.Plugins.Genealogy.UserInterface.csproj
@@ -54,14 +54,18 @@
{8622EBC4-8E20-476E-B284-33D472081F5C}
UniversalEditor.UserInterface
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{74A835FD-93B8-4268-B120-1ACAA128AC7B}
UniversalEditor.Plugins.Genealogy
+
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
+ MBS.Framework
+
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
\ No newline at end of file
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs
index d7021309..c7cf19df 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Controls/DrawingArea/DrawingAreaControl.cs
@@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Drawing;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Drawing;
using MBS.Framework.Drawing;
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Picture/PictureEditor.Designer.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Picture/PictureEditor.Designer.cs
index 7d08cd37..bdd0fcfa 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Picture/PictureEditor.Designer.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Picture/PictureEditor.Designer.cs
@@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-using UniversalWidgetToolkit;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.Multimedia.Picture
{
partial class PictureEditor
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
index e6c36bcc..5d59d5bc 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.Plugins.Multimedia.UserInterface.SettingsProviders
{
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj
index d7d507c7..deff192c 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface.csproj
@@ -56,18 +56,18 @@
{BE4D0BA3-0888-42A5-9C09-FC308A4509D2}
UniversalEditor.Plugins.Multimedia
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{8622EBC4-8E20-476E-B284-33D472081F5C}
UniversalEditor.UserInterface
- {23ACD09E-E096-4B05-A6CE-6853EDDC589A}
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
MBS.Framework
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
\ No newline at end of file
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/Editors/Syntax/SyntaxEditor.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/Editors/Syntax/SyntaxEditor.cs
index 737fdc51..6395e961 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/Editors/Syntax/SyntaxEditor.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/Editors/Syntax/SyntaxEditor.cs
@@ -20,10 +20,10 @@
// along with this program. If not, see .
using System;
using UniversalEditor.UserInterface;
-using UniversalWidgetToolkit.Controls;
-using UniversalWidgetToolkit.Layouts;
+using MBS.Framework.UserInterface.Controls;
+using MBS.Framework.UserInterface.Layouts;
using UniversalEditor.ObjectModels.SourceCode;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.Plugins.SoftwareDevelopment.UserInterface.Editors.Syntax
{
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
index 0d43381e..e0a4dd71 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
@@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
using System;
-using UniversalWidgetToolkit;
+using MBS.Framework.UserInterface;
namespace UniversalEditor.SettingsProviders
{
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface.csproj b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface.csproj
index 9b4294a0..85632f58 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface.csproj
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface.csproj
@@ -50,10 +50,6 @@
{2D4737E6-6D95-408A-90DB-8DFF38147E85}
UniversalEditor.Core
-
- {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
- UniversalWidgetToolkit
-
{8622EBC4-8E20-476E-B284-33D472081F5C}
UniversalEditor.UserInterface
@@ -62,5 +58,13 @@
{CC5C9010-83EF-491D-9262-2CED509D895D}
UniversalEditor.Plugins.SoftwareDevelopment
+
+ {00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}
+ MBS.Framework
+
+
+ {29E1C1BB-3EA5-4062-B62F-85EEC703FE07}
+ MBS.Framework.UserInterface
+
\ No newline at end of file
diff --git a/CSharp/UniversalEditor.sln b/CSharp/UniversalEditor.sln
index 824c8218..2f7de865 100644
--- a/CSharp/UniversalEditor.sln
+++ b/CSharp/UniversalEditor.sln
@@ -23,9 +23,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Essential",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{20F315E0-52AE-479F-AF43-3402482C1FC8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalWidgetToolkit", "..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj", "{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBS.Framework.UserInterface", "..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj", "{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalWidgetToolkit.Engines.GTK", "..\..\UniversalWidgetToolkit\Engines\GTK\UniversalWidgetToolkit.Engines.GTK\UniversalWidgetToolkit.Engines.GTK.csproj", "{62DC7CF9-C608-49E5-8C39-305B2E3E93F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBS.Framework.UserInterface.Engines.GTK", "..\..\MBS.Framework.UserInterface\Engines\GTK\MBS.Framework.UserInterface.Engines.GTK\MBS.Framework.UserInterface.Engines.GTK.csproj", "{62DC7CF9-C608-49E5-8C39-305B2E3E93F6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBS.Framework", "..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj", "{23ACD09E-E096-4B05-A6CE-6853EDDC589A}"
EndProject
@@ -127,7 +127,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Sof
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.AddressBook.UserInterface", "Plugins.UserInterface\UniversalEditor.Plugins.AddressBook.UserInterface\UniversalEditor.Plugins.AddressBook.UserInterface.csproj", "{E94B6C34-660F-4280-AEEC-D28AC6A3F528}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalWidgetToolkit.Engines.WindowsForms", "..\..\UniversalWidgetToolkit\Engines\WindowsForms\UniversalWidgetToolkit.Engines.WindowsForms\UniversalWidgetToolkit.Engines.WindowsForms.csproj", "{B8573BB1-A0CD-41F4-A775-E0CB79555C59}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MBS.Framework.UserInterface.Engines.WindowsForms", "..\..\MBS.Framework.UserInterface\Engines\WindowsForms\MBS.Framework.UserInterface.Engines.WindowsForms\MBS.Framework.UserInterface.Engines.WindowsForms.csproj", "{B8573BB1-A0CD-41F4-A775-E0CB79555C59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Genealogy", "Plugins\UniversalEditor.Plugins.Genealogy\UniversalEditor.Plugins.Genealogy.csproj", "{74A835FD-93B8-4268-B120-1ACAA128AC7B}"
EndProject
diff --git a/CSharp/uwt-install-gtk.sh b/CSharp/uwt-install-gtk.sh
index 5c2b0799..69b25c2a 100755
--- a/CSharp/uwt-install-gtk.sh
+++ b/CSharp/uwt-install-gtk.sh
@@ -1,5 +1,5 @@
-cd ../../UniversalWidgetToolkit
-cp Output/Debug/UniversalWidgetToolkit.Engines.GTK.dll ../UniversalEditor/CSharp/Output/Debug
-cp Output/Debug/UniversalWidgetToolkit.Engines.GTK.dll.config ../UniversalEditor/CSharp/Output/Debug
-cp Output/Debug/UniversalWidgetToolkit.Engines.GTK.pdb ../UniversalEditor/CSharp/Output/Debug
+cd ../../MBS.Framework.UserInterface
+cp Output/Debug/MBS.Framework.UserInterface.Engines.GTK.dll ../UniversalEditor/CSharp/Output/Debug
+cp Output/Debug/MBS.Framework.UserInterface.Engines.GTK.dll.config ../UniversalEditor/CSharp/Output/Debug
+cp Output/Debug/MBS.Framework.UserInterface.Engines.GTK.pdb ../UniversalEditor/CSharp/Output/Debug
diff --git a/CSharp/uwt-install-wf.sh b/CSharp/uwt-install-wf.sh
index f1356345..30347e30 100755
--- a/CSharp/uwt-install-wf.sh
+++ b/CSharp/uwt-install-wf.sh
@@ -1,5 +1,5 @@
-cd ../../UniversalWidgetToolkit
-cp Output/Debug/UniversalWidgetToolkit.Engines.WindowsForms.dll ../UniversalEditor/CSharp/Output/Debug
-# cp Output/Debug/UniversalWidgetToolkit.Engines.WindowsForms.dll.config ../UniversalEditor/CSharp/Output/Debug
-cp Output/Debug/UniversalWidgetToolkit.Engines.WindowsForms.pdb ../UniversalEditor/CSharp/Output/Debug
+cd ../../MBS.Framework.UserInterface
+cp Output/Debug/MBS.Framework.UserInterface.Engines.WindowsForms.dll ../UniversalEditor/CSharp/Output/Debug
+# cp Output/Debug/MBS.Framework.UserInterface.Engines.WindowsForms.dll.config ../UniversalEditor/CSharp/Output/Debug
+cp Output/Debug/MBS.Framework.UserInterface.Engines.WindowsForms.pdb ../UniversalEditor/CSharp/Output/Debug
diff --git a/CSharp/uwt-remove-gtk.sh b/CSharp/uwt-remove-gtk.sh
index 68e5ab3d..6061cb70 100755
--- a/CSharp/uwt-remove-gtk.sh
+++ b/CSharp/uwt-remove-gtk.sh
@@ -1,3 +1,3 @@
-rm Output/Debug/UniversalWidgetToolkit.Engines.GTK.dll
-rm Output/Debug/UniversalWidgetToolkit.Engines.GTK.pdb
+rm Output/Debug/MBS.Framework.UserInterface.Engines.GTK.dll
+rm Output/Debug/MBS.Framework.UserInterface.Engines.GTK.pdb
diff --git a/CSharp/uwt-remove-wf.sh b/CSharp/uwt-remove-wf.sh
index 4e80d931..9ba6b10e 100755
--- a/CSharp/uwt-remove-wf.sh
+++ b/CSharp/uwt-remove-wf.sh
@@ -1,3 +1,3 @@
-rm Output/Debug/UniversalWidgetToolkit.Engines.WindowsForms.dll
-rm Output/Debug/UniversalWidgetToolkit.Engines.WindowsForms.pdb
+rm Output/Debug/MBS.Framework.UserInterface.Engines.WindowsForms.dll
+rm Output/Debug/MBS.Framework.UserInterface.Engines.WindowsForms.pdb