The Great MBS Rebranding

This commit is contained in:
Michael Becker 2019-09-17 02:34:07 -04:00
parent eb8607f3ed
commit 698f4f5147
54 changed files with 208 additions and 192 deletions

View File

@ -174,7 +174,7 @@
<Name>UniversalEditor.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{23ACD09E-E096-4B05-A6CE-6853EDDC589A}</Project>
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
</ItemGroup>

View File

@ -20,7 +20,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit.Drawing;
using MBS.Framework.UserInterface.Drawing;
namespace UniversalEditor.Printing
{

View File

@ -39,14 +39,18 @@
<Project>{2D4737E6-6D95-408A-90DB-8DFF38147E85}</Project>
<Name>UniversalEditor.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
<Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
<Name>UniversalEditor.Essential</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{

View File

@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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;

View File

@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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

View File

@ -1,6 +1,6 @@
using System;
using UniversalWidgetToolkit;
using UniversalWidgetToolkit.Controls;
using MBS.Framework.UserInterface;
using MBS.Framework.UserInterface.Controls;
namespace UniversalEditor.UserInterface.Dialogs
{

View File

@ -20,10 +20,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface.Dialogs
{

View File

@ -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;

View File

@ -19,12 +19,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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

View File

@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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

View File

@ -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
{

View File

@ -20,10 +20,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -20,10 +20,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -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
{
/// <summary>
/// Provides an interface for custom editor implementations not using the Universal Widget Toolkit.
/// </summary>
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();

View File

@ -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<CONVERSION_DATA>("converter");

View File

@ -20,11 +20,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -19,10 +19,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -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
{

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.Editors.FileSystem
{

View File

@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -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
{

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.Editors.Text.Plain
{

View File

@ -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"];

View File

@ -1,6 +1,6 @@
using System;
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{

View File

@ -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;
}

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{

View File

@ -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
{

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.UserInterface
{

View File

@ -19,9 +19,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -20,9 +20,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -20,9 +20,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -20,10 +20,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -148,18 +148,18 @@
<Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
<Name>UniversalEditor.Essential</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{23ACD09E-E096-4B05-A6CE-6853EDDC589A}</Project>
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\UniversalEditor.Printing\UniversalEditor.Printing.csproj">
<Project>{868A6888-EDB9-407E-A710-40F297D4EAB8}</Project>
<Name>UniversalEditor.Printing</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Panels\" />

View File

@ -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
{

View File

@ -45,10 +45,6 @@
<Project>{868A6888-EDB9-407E-A710-40F297D4EAB8}</Project>
<Name>UniversalEditor.Printing</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
<Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
<Name>UniversalEditor.Essential</Name>
@ -57,6 +53,10 @@
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -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;

View File

@ -36,10 +36,6 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\UniversalEditor.UserInterface\UniversalEditor.UserInterface.csproj">
<Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
<Name>UniversalEditor.UserInterface</Name>
@ -65,9 +61,13 @@
<Name>UniversalEditor.Plugins.AddressBook</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{23ACD09E-E096-4B05-A6CE-6853EDDC589A}</Project>
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Editors\" />

View File

@ -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)
});

View File

@ -49,14 +49,18 @@
<Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
<Name>UniversalEditor.UserInterface</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Plugins\UniversalEditor.Plugins.Executable\UniversalEditor.Plugins.Executable.csproj">
<Project>{791A36F8-5D96-452B-89D2-78BA74596A1E}</Project>
<Name>UniversalEditor.Plugins.Executable</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -54,14 +54,18 @@
<Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
<Name>UniversalEditor.UserInterface</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Plugins\UniversalEditor.Plugins.Genealogy\UniversalEditor.Plugins.Genealogy.csproj">
<Project>{74A835FD-93B8-4268-B120-1ACAA128AC7B}</Project>
<Name>UniversalEditor.Plugins.Genealogy</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using UniversalWidgetToolkit.Drawing;
using MBS.Framework.UserInterface;
using MBS.Framework.UserInterface.Drawing;
using MBS.Framework.Drawing;

View File

@ -19,8 +19,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using UniversalWidgetToolkit;
using UniversalWidgetToolkit.Layouts;
using MBS.Framework.UserInterface;
using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.Multimedia.Picture
{
partial class PictureEditor

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.Plugins.Multimedia.UserInterface.SettingsProviders
{

View File

@ -56,18 +56,18 @@
<Project>{BE4D0BA3-0888-42A5-9C09-FC308A4509D2}</Project>
<Name>UniversalEditor.Plugins.Multimedia</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\UniversalEditor.UserInterface\UniversalEditor.UserInterface.csproj">
<Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
<Name>UniversalEditor.UserInterface</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{23ACD09E-E096-4B05-A6CE-6853EDDC589A}</Project>
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -20,10 +20,10 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
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
{

View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using UniversalWidgetToolkit;
using MBS.Framework.UserInterface;
namespace UniversalEditor.SettingsProviders
{

View File

@ -50,10 +50,6 @@
<Project>{2D4737E6-6D95-408A-90DB-8DFF38147E85}</Project>
<Name>UniversalEditor.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\UniversalWidgetToolkit\Libraries\UniversalWidgetToolkit\UniversalWidgetToolkit.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>UniversalWidgetToolkit</Name>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\UniversalEditor.UserInterface\UniversalEditor.UserInterface.csproj">
<Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
<Name>UniversalEditor.UserInterface</Name>
@ -62,5 +58,13 @@
<Project>{CC5C9010-83EF-491D-9262-2CED509D895D}</Project>
<Name>UniversalEditor.Plugins.SoftwareDevelopment</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
<Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
<Name>MBS.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
<Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
<Name>MBS.Framework.UserInterface</Name>
</ProjectReference>
</ItemGroup>
</Project>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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