From 561bd1fd04e085f59cbb230df8bea68a86e13150 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 14 Nov 2014 08:31:20 -0500 Subject: [PATCH] Moved Windows Forms common dialog functions into Windows Forms-specific UserInterface library --- .../Dialogs/DocumentPropertiesDialog.cs | 2 +- .../MainWindow.cs | 4 +-- .../CommonDialog.cs} | 28 +++++++++++-------- ...alEditor.UserInterface.WindowsForms.csproj | 1 + .../Collection/PictureCollectionEditor.cs | 2 +- .../UniversalEditor.Essential.csproj | 1 - 6 files changed, 21 insertions(+), 17 deletions(-) rename CSharp/{Plugins/UniversalEditor.Essential/Common/Dialog.cs => Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/CommonDialog.cs} (84%) diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DocumentPropertiesDialog.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DocumentPropertiesDialog.cs index 5a39d845..b24ce898 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DocumentPropertiesDialog.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DocumentPropertiesDialog.cs @@ -381,7 +381,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs SaveFileDialog sfd = new SaveFileDialog(); if (mvarDataFormat != null) { - sfd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(mvarDataFormat.MakeReference()); + sfd.Filter = UniversalEditor.UserInterface.WindowsForms.CommonDialog.GetCommonDialogFilter(mvarDataFormat.MakeReference()); } if (sfd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs index 7d4ec609..283166ba 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs @@ -1087,7 +1087,7 @@ namespace UniversalEditor.UserInterface.WindowsForms { SolutionObjectModel solution = new SolutionObjectModel(); OpenFileDialog ofd = new OpenFileDialog(); - ofd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(solution.MakeReference()); + ofd.Filter = UniversalEditor.UserInterface.WindowsForms.CommonDialog.GetCommonDialogFilter(solution.MakeReference()); ofd.Multiselect = false; if (ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { @@ -1190,7 +1190,7 @@ namespace UniversalEditor.UserInterface.WindowsForms List refs = new List(); SaveFileDialog sfd = new SaveFileDialog(); - sfd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(mvarCurrentSolution.MakeReference(), out refs); + sfd.Filter = UniversalEditor.UserInterface.WindowsForms.CommonDialog.GetCommonDialogFilter(mvarCurrentSolution.MakeReference(), out refs); sfd.FileName = mvarCurrentSolution.Title + ".sln"; if (sfd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { diff --git a/CSharp/Plugins/UniversalEditor.Essential/Common/Dialog.cs b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/CommonDialog.cs similarity index 84% rename from CSharp/Plugins/UniversalEditor.Essential/Common/Dialog.cs rename to CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/CommonDialog.cs index 7c8db37e..11c7aa77 100644 --- a/CSharp/Plugins/UniversalEditor.Essential/Common/Dialog.cs +++ b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/CommonDialog.cs @@ -1,10 +1,14 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text; -namespace UniversalEditor.Common +namespace UniversalEditor.UserInterface.WindowsForms { - public static class Dialog + /// + /// Contains methods useful for common file dialogs in Windows Forms. + /// + public static class CommonDialog { // UniversalDataStorage.Common.Methods public static string GetCommonDialogFilter(DataFormatReference dataFormatReference) @@ -43,7 +47,7 @@ namespace UniversalEditor.Common List dfrs = new List(); StringBuilder sb = new StringBuilder(); StringBuilder sbCompatible = new StringBuilder(); - DataFormatReference[] dataFormats = Reflection.GetAvailableDataFormats(objectModelReference); + DataFormatReference[] dataFormats = UniversalEditor.Common.Reflection.GetAvailableDataFormats(objectModelReference); DataFormatReference[] array = dataFormats; for (int k = 0; k < array.Length; k++) { @@ -73,15 +77,15 @@ namespace UniversalEditor.Common } } sb.Insert(0, string.Concat(new string[] - { - "All ", - objectModelReference.Title, - " files (", - sbCompatible.ToString(), - ")|", - sbCompatible.ToString(), - "|" - })); + { + "All ", + objectModelReference.Title, + " files (", + sbCompatible.ToString(), + ")|", + sbCompatible.ToString(), + "|" + })); sb.Append("All files (*.*)|*.*"); dataFormatReferences = dfrs; diff --git a/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj index c0ede29e..5b2cded1 100644 --- a/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj +++ b/CSharp/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj @@ -39,6 +39,7 @@ + UserControl diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Multimedia.UserInterface.WindowsForms/Editors/Multimedia/Picture/Collection/PictureCollectionEditor.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Multimedia.UserInterface.WindowsForms/Editors/Multimedia/Picture/Collection/PictureCollectionEditor.cs index 4e935732..2b5e725c 100644 --- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Multimedia.UserInterface.WindowsForms/Editors/Multimedia/Picture/Collection/PictureCollectionEditor.cs +++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.Multimedia.UserInterface.WindowsForms/Editors/Multimedia/Picture/Collection/PictureCollectionEditor.cs @@ -166,7 +166,7 @@ namespace UniversalEditor.Editors.Multimedia.Picture.Collection sfd.Title = "Export Current Frame"; ObjectModelReference omr = mvarCurrentPicture.MakeReference(); - sfd.Filter = UniversalEditor.Common.Dialog.GetCommonDialogFilter(omr); + sfd.Filter = UniversalEditor.UserInterface.WindowsForms.CommonDialog.GetCommonDialogFilter(omr); if (sfd.ShowDialog() == DialogResult.OK) { DataFormatReference[] dfrs = UniversalEditor.Common.Reflection.GetAvailableDataFormats(sfd.FileName); diff --git a/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj index 00b7895a..27fd5597 100644 --- a/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj +++ b/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj @@ -39,7 +39,6 @@ -