Merge pull request #774 from Gama11/VistaFolderNameEditor

elsassph · elsassph · commit 4b92fb128a44 · 2015-06-30T22:05:16.000+01:00
Use the VistaFolderBrowserDialog in the settings PropertyGrid
diff --git a/External/Plugins/AS2Context/AS2Settings.cs b/External/Plugins/AS2Context/AS2Settings.cs
@@ -7,6 +7,7 @@
 using System.Windows.Forms.Design;
 using System.IO;
 using ASCompletion.Context;
+using Ookii.Dialogs;
 using PluginCore.Localization;
 using PluginCore;
 
@@ -249,7 +250,7 @@ public string MtascCheckParameters
 
         [DisplayName("Flash IDE Classpath")]
         [LocalizedCategory("ASCompletion.Category.Language"), LocalizedDescription("AS2Context.Description.MMClassPath")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public string MMClassPath
         {
             get { return mmClassPath; }
diff --git a/External/Plugins/AS3Context/AS3Settings.cs b/External/Plugins/AS3Context/AS3Settings.cs
@@ -7,6 +7,7 @@
 using PluginCore.Localization;
 using PluginCore;
 using System.IO;
+using Ookii.Dialogs;
 
 namespace AS3Context
 {
@@ -210,7 +211,7 @@ public string DefaultFlashVersion
 
         [DisplayName("AS3 Classpath")]
         [LocalizedCategory("ASCompletion.Category.Language"), LocalizedDescription("AS3Context.Description.AS3Classpath"), DefaultValue(DEFAULT_AS3LIBRARY)]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public string AS3ClassPath
         {
             get { return as3ClassPath; }
diff --git a/External/Plugins/ASCompletion/Settings/GeneralSettings.cs b/External/Plugins/ASCompletion/Settings/GeneralSettings.cs
@@ -5,6 +5,7 @@
 using System.Drawing.Design;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
+using Ookii.Dialogs;
 using PluginCore.Localization;
 
 namespace ASCompletion.Settings
@@ -196,7 +197,7 @@ public string AddSpaceAfter
 
         [DisplayName("Path To Flash IDE")]
         [LocalizedCategory("ASCompletion.Category.FlashIDE"), LocalizedDescription("ASCompletion.Description.PathToFlashIDE")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public string PathToFlashIDE
         {
             get { return pathToFlashIDE; }
diff --git a/External/Plugins/FileExplorer/Settings.cs b/External/Plugins/FileExplorer/Settings.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Collections.Generic;
 using System.Windows.Forms.Design;
+using Ookii.Dialogs;
 using PluginCore.Localization;
 
 namespace FileExplorer
@@ -21,7 +22,7 @@ public class Settings
         /// </summary>
         [DisplayName("Active Path")]
         [LocalizedDescription("FileExplorer.Description.FilePath"), DefaultValue("C:\\")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String FilePath 
         {
             get { return this.filePath; }
diff --git a/External/Plugins/FlashDebugger/Settings.cs b/External/Plugins/FlashDebugger/Settings.cs
@@ -5,6 +5,7 @@
 using System.Windows.Forms.Design;
 using PluginCore.Localization;
 using LayoutManager.Controls;
+using Ookii.Dialogs;
 
 namespace FlashDebugger
 {
@@ -31,7 +32,7 @@ public override String ToString()
             return m_Value;
         }
 
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String Path
         {
             get { return m_Value; }
diff --git a/External/Plugins/LayoutManager/Settings.cs b/External/Plugins/LayoutManager/Settings.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Windows.Forms.Design;
 using System.Collections.Generic;
+using Ookii.Dialogs;
 using PluginCore.Localization;
 
 namespace LayoutManager
@@ -35,7 +36,7 @@ public static Settings Instance
         /// </summary>
         [DisplayName("Custom Layout File Directory")]
         [LocalizedDescription("LayoutManager.Description.CustomLayoutPath"), DefaultValue("")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String CustomLayoutPath
         {
             get { return this.customLayoutPath; }
diff --git a/External/Plugins/LoomContext/LoomSettings.cs b/External/Plugins/LoomContext/LoomSettings.cs
@@ -210,7 +210,7 @@ public string DefaultFlashVersion
 
         [DisplayName("AS3 Classpath")]
         [LocalizedCategory("ASCompletion.Category.Language"), LocalizedDescription("AS3Context.Description.AS3Classpath"), DefaultValue(DEFAULT_AS3LIBRARY)]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public string AS3ClassPath
         {
             get { return as3ClassPath; }
diff --git a/FlashDevelop/Settings/Accessors.cs b/FlashDevelop/Settings/Accessors.cs
@@ -10,6 +10,7 @@
 using System.Windows.Forms.Design;
 using PluginCore.Localization;
 using System.Windows.Forms;
+using Ookii.Dialogs;
 using PluginCore.Managers;
 using ScintillaNet;
 using PluginCore;
@@ -753,6 +754,7 @@ public Int32 LatestCommand
         [DisplayName("Last Active Path")]
         [LocalizedCategory("FlashDevelop.Category.State")]
         [LocalizedDescription("FlashDevelop.Description.LatestDialogPath")]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String LatestDialogPath
         {
             get { return this.latestDialogPath; }
@@ -905,7 +907,7 @@ public String InsertionTriggers
         [DisplayName("Custom Snippet Directory")]
         [LocalizedCategory("FlashDevelop.Category.Paths")]
         [LocalizedDescription("FlashDevelop.Description.CustomSnippetDir")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String CustomSnippetDir
         {
             get { return this.customSnippetDir; }
@@ -916,7 +918,7 @@ public String CustomSnippetDir
         [DisplayName("Custom Template Directory")]
         [LocalizedCategory("FlashDevelop.Category.Paths")]
         [LocalizedDescription("FlashDevelop.Description.CustomTemplateDir")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String CustomTemplateDir
         {
             get { return this.customTemplateDir; }
@@ -927,7 +929,7 @@ public String CustomTemplateDir
         [DisplayName("Custom Projects Directory")]
         [LocalizedCategory("FlashDevelop.Category.Paths")]
         [LocalizedDescription("FlashDevelop.Description.CustomProjectsDir")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String CustomProjectsDir
         {
             get { return this.customProjectsDir; }
diff --git a/PluginCore/Ookii.Dialogs/VistaFolderNameEditor.cs b/PluginCore/Ookii.Dialogs/VistaFolderNameEditor.cs
@@ -0,0 +1,29 @@
+﻿using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace Ookii.Dialogs
+{
+    public class VistaFolderNameEditor : UITypeEditor
+    {
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.Modal;
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            VistaFolderBrowserDialog browser = new VistaFolderBrowserDialog();
+            if (value != null)
+            {
+                browser.SelectedPath = string.Format("{0}", value);
+            }
+
+            if (browser.ShowDialog(null) == DialogResult.OK)
+                return browser.SelectedPath;
+
+            return value;
+        }
+    }
+}
diff --git a/PluginCore/PluginCore.csproj b/PluginCore/PluginCore.csproj
@@ -307,6 +307,7 @@
     <Compile Include="Ookii.Dialogs\VistaFolderBrowserDialog.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Ookii.Dialogs\VistaFolderNameEditor.cs" />
     <Compile Include="PluginCore\Bridge\IBridgeSettings.cs" />
     <Compile Include="PluginCore\Controls\Common.cs">
       <SubType>Component</SubType>
diff --git a/PluginCore/PluginCore/DataClasses.cs b/PluginCore/PluginCore/DataClasses.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Windows.Forms.Design;
 using System.Drawing.Design;
+using Ookii.Dialogs;
 
 namespace PluginCore
 {
@@ -101,7 +102,7 @@ public class InstalledSDK
         private InstalledSDKOwner owner;
 
         [Category("Location")]
-        [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]
+        [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]
         public String Path
         {
             get { return this.path; }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using PluginCore.Localization;`
`8`	`8`	`using PluginCore;`
`9`	`9`	`using System.IO;`
	`10`	`+using Ookii.Dialogs;`
`10`	`11`
`11`	`12`	`namespace AS3Context`
`12`	`13`	`{`
`@@ -210,7 +211,7 @@ public string DefaultFlashVersion`
`210`	`211`
`211`	`212`	`[DisplayName("AS3 Classpath")]`
`212`	`213`	`[LocalizedCategory("ASCompletion.Category.Language"), LocalizedDescription("AS3Context.Description.AS3Classpath"), DefaultValue(DEFAULT_AS3LIBRARY)]`
`213`		`- [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]`
	`214`	`+ [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]`
`214`	`215`	`public string AS3ClassPath`
`215`	`216`	`{`
`216`	`217`	`get { return as3ClassPath; }`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Windows.Forms.Design;`
`6`	`6`	`using PluginCore.Localization;`
`7`	`7`	`using LayoutManager.Controls;`
	`8`	`+using Ookii.Dialogs;`
`8`	`9`
`9`	`10`	`namespace FlashDebugger`
`10`	`11`	`{`
`@@ -31,7 +32,7 @@ public override String ToString()`
`31`	`32`	`return m_Value;`
`32`	`33`	`}`
`33`	`34`
`34`		`- [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]`
	`35`	`+ [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]`
`35`	`36`	`public String Path`
`36`	`37`	`{`
`37`	`38`	`get { return m_Value; }`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public string DefaultFlashVersion`
`210`	`210`
`211`	`211`	`[DisplayName("AS3 Classpath")]`
`212`	`212`	`[LocalizedCategory("ASCompletion.Category.Language"), LocalizedDescription("AS3Context.Description.AS3Classpath"), DefaultValue(DEFAULT_AS3LIBRARY)]`
`213`		`- [Editor(typeof(FolderNameEditor), typeof(UITypeEditor))]`
	`213`	`+ [Editor(typeof(VistaFolderNameEditor), typeof(UITypeEditor))]`
`214`	`214`	`public string AS3ClassPath`
`215`	`215`	`{`
`216`	`216`	`get { return as3ClassPath; }`