From bd836fd758c2f33d908f1841da3763f050fabe63 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Mon, 15 Feb 2021 22:18:11 -0500 Subject: [PATCH] migrate Settings codebase from MBS.Framework.UserInterface to MBS.Framework [from MBS.Framework a594833] --- .../UniversalEditor.UserInterface/Dialogs/NewDialog.cs | 7 +++++-- .../FileSystemEditorDocumentPropertiesSettingsProvider.cs | 3 ++- .../Editors/Markup/MarkupEditor.cs | 3 +++ .../UniversalEditor.UserInterface/ExtensionMethods.cs | 7 +++++-- .../Editors/Fixture/FixtureEditor.cs | 2 ++ .../Audio/Synthesized/Views/PianoRoll/PianoRollView.cs | 1 + .../Map/MapDocumentPropertiesSettingsProvider.cs | 3 ++- .../Editors/NewWorldComputing/Map/MapEditor.cs | 1 + .../Editors/BootstrapScriptEditor.cs | 2 ++ 9 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs index 35f051d5..5d400dd8 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs @@ -21,6 +21,9 @@ using System; using System.Collections.Generic; + +using MBS.Framework; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Controls.ListView; @@ -307,14 +310,14 @@ namespace UniversalEditor.UserInterface.Dialogs case ProjectTypeVariableType.FileOpen: { FileSetting co = new FileSetting(ptv.Name, ptv.Title); - co.Mode = FileDialogMode.Open; + co.Mode = FileSettingMode.Open; sg.Settings.Add(co); break; } case ProjectTypeVariableType.FileSave: { FileSetting co = new FileSetting(ptv.Name, ptv.Title); - co.Mode = FileDialogMode.Save; + co.Mode = FileSettingMode.Save; sg.Settings.Add(co); break; } diff --git a/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorDocumentPropertiesSettingsProvider.cs b/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorDocumentPropertiesSettingsProvider.cs index 98bf1bd5..137a09b4 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorDocumentPropertiesSettingsProvider.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorDocumentPropertiesSettingsProvider.cs @@ -19,7 +19,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . using System; -using MBS.Framework.UserInterface; +using MBS.Framework; +using MBS.Framework.Settings; using UniversalEditor.ObjectModels.FileSystem; namespace UniversalEditor.Editors.FileSystem diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs index b82a8274..308cfc17 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs @@ -21,6 +21,9 @@ using System; using System.Text; + +using MBS.Framework; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Controls.ListView; diff --git a/Libraries/UniversalEditor.UserInterface/ExtensionMethods.cs b/Libraries/UniversalEditor.UserInterface/ExtensionMethods.cs index d393c70a..824a3a0b 100644 --- a/Libraries/UniversalEditor.UserInterface/ExtensionMethods.cs +++ b/Libraries/UniversalEditor.UserInterface/ExtensionMethods.cs @@ -21,6 +21,9 @@ using System; using System.Collections.Generic; using System.Text; + +using MBS.Framework; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Dialogs; @@ -87,8 +90,8 @@ namespace UniversalEditor.UserInterface FileSetting fs = new FileSetting(option.PropertyName, option.Title, (string)option.GetValue()); switch (option.DialogMode) { - case CustomOptionFileDialogMode.Open: fs.Mode = FileDialogMode.Open; break; - case CustomOptionFileDialogMode.Save: fs.Mode = FileDialogMode.Save; break; + case CustomOptionFileDialogMode.Open: fs.Mode = FileSettingMode.Open; break; + case CustomOptionFileDialogMode.Save: fs.Mode = FileSettingMode.Save; break; } sg.Settings.Add(fs); } diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Lighting.UserInterface/Editors/Fixture/FixtureEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Lighting.UserInterface/Editors/Fixture/FixtureEditor.cs index d4e47e22..f6f4e944 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Lighting.UserInterface/Editors/Fixture/FixtureEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Lighting.UserInterface/Editors/Fixture/FixtureEditor.cs @@ -19,6 +19,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . using System; +using MBS.Framework; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Dialogs; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/Views/PianoRoll/PianoRollView.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/Views/PianoRoll/PianoRollView.cs index e9ec4e08..b9e06c5e 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/Views/PianoRoll/PianoRollView.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Synthesized/Views/PianoRoll/PianoRollView.cs @@ -24,6 +24,7 @@ using System.Collections.Generic; using MBS.Framework; using MBS.Framework.Drawing; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Dialogs; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapDocumentPropertiesSettingsProvider.cs b/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapDocumentPropertiesSettingsProvider.cs index 52795141..34c28ffb 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapDocumentPropertiesSettingsProvider.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapDocumentPropertiesSettingsProvider.cs @@ -19,7 +19,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . using System; -using MBS.Framework.UserInterface; +using MBS.Framework; +using MBS.Framework.Settings; using UniversalEditor.ObjectModels.NewWorldComputing.Map; namespace UniversalEditor.Plugins.NewWorldComputing.UserInterface.Editors.NewWorldComputing.Map diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapEditor.cs index 07e956f7..e2c63ec0 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.NewWorldComputing.UserInterface/Editors/NewWorldComputing/Map/MapEditor.cs @@ -19,6 +19,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . using System; +using MBS.Framework; using MBS.Framework.UserInterface; using UniversalEditor.ObjectModels.NewWorldComputing.Map; using UniversalEditor.UserInterface; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs index 8b9f24d1..a89afd86 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs @@ -20,6 +20,8 @@ // along with this program. If not, see . using System; using System.Collections.Generic; +using MBS.Framework; +using MBS.Framework.Settings; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Controls.ListView;