diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index 98d0352a..74beb2a1 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index 6d2d7d8a..eabc56ed 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index d8f93dde..d76e9d3b 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll
index 0152c00e..775e6f5f 100644
Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index a0237027..a3c2ea10 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI/Static/UDir.cs b/SunnyUI/Static/UDir.cs
index 731ed6cc..b1ebcab0 100644
--- a/SunnyUI/Static/UDir.cs
+++ b/SunnyUI/Static/UDir.cs
@@ -49,12 +49,12 @@ namespace Sunny.UI
/// 返回true则path为选择文件夹路径
/// 显示新建文件夹按钮
/// 是否选择文件夹
- public static bool SelectDir(string desc, out string dir, bool showNewButton = true)
+ public static bool SelectDir(string desc, ref string dir, bool showNewButton = true)
{
- dir = string.Empty;
bool bOk = false;
using (FolderBrowserDialog fd = new FolderBrowserDialog { Description = desc, ShowNewFolderButton = showNewButton })
{
+ fd.SelectedPath = dir;
if (fd.ShowDialog() == DialogResult.OK)
{
dir = fd.SelectedPath.DealPath();
@@ -65,6 +65,27 @@ namespace Sunny.UI
return bOk;
}
+ ///
+ /// 选择文件夹
+ ///
+ /// 说明
+ /// 返回true则path为选择文件夹路径
+ /// 是否选择文件夹
+ public static bool SelectDirEx(string desc, ref string dir)
+ {
+ bool bOk = false;
+ using (FolderBrowserDialogEx fd = new FolderBrowserDialogEx { Description = desc, DirectoryPath = dir })
+ {
+ if (fd.ShowDialog(null) == DialogResult.OK)
+ {
+ dir = fd.DirectoryPath.DealPath();
+ bOk = true;
+ }
+ }
+
+ return bOk;
+ }
+
///
/// Temp文件夹，末尾包括\
///
diff --git a/SunnyUI/Units/UFolderBrowserDialogEx.cs b/SunnyUI/Units/UFolderBrowserDialogEx.cs
new file mode 100644
index 00000000..a50cd2a1
--- /dev/null
+++ b/SunnyUI/Units/UFolderBrowserDialogEx.cs
@@ -0,0 +1,232 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+// ReSharper disable UnusedMember.Local
+
+namespace Sunny.UI
+{
+ #region Editor
+ ///
+ /// FolderBrowser 的设计器基类
+ ///
+ public class FolderNameEditorEx : UITypeEditor
+ {
+ public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+ {
+ return UITypeEditorEditStyle.Modal;
+ }
+ public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+ {
+ FolderBrowserDialogEx browser = new FolderBrowserDialogEx();
+ if (value != null)
+ {
+ browser.DirectoryPath = string.Format("{0}", value);
+ }
+ if (browser.ShowDialog(null) == DialogResult.OK)
+ return browser.DirectoryPath;
+ return value;
+ }
+ }
+ #endregion
+
+ #region FolderBrowserDialog Base
+
+ ///
+ /// Vista 样式的选择文件对话框的基类
+ ///
+ [Description("提供一个Vista样式的选择文件对话框")]
+ [Editor(typeof(FolderNameEditorEx), typeof(UITypeEditor))]
+ [ToolboxItem(false)]
+ public class FolderBrowserDialogEx : Component
+ {
+ #region Public Property
+
+ //
+ // 摘要:
+ // 获取或设置对话框中在树视图控件上显示的说明文本。
+ //
+ // 返回结果:
+ // 要显示的说明。 默认值为空字符串("")。
+ ///
+ /// 标题
+ ///
+ [Browsable(true)]
+ [DefaultValue(null)]
+ [Localizable(true)]
+ [Description("自定义标题")]
+ public string Description { get; set; }
+
+ ///
+ /// 选择的文件夹路径（也可以设置默认选择的路径）
+ ///
+ [Browsable(true)]
+ [DefaultValue(null)]
+ [Description("默认路径/返回路径")]
+ public string DirectoryPath { get; set; }
+ ///
+ /// 强制显示隐藏文件和文件夹
+ ///
+ [Browsable(true)]
+ [DefaultValue(false)]
+ [Description("显示隐藏文件")]
+ public bool ShowHidden { get; set; }
+ ///
+ /// 向用户显示 FolderBrowser 的对话框
+ ///
+ /// 任何实现 System.Windows.Forms.IWin32Window（表示将拥有模式对话框的顶级窗口）的对象。
+ ///
+ public DialogResult ShowDialog(IWin32Window owner)
+ {
+ IntPtr handle = owner?.Handle ?? GetActiveWindow();
+ IFileOpenDialog dialog = (IFileOpenDialog)new FileOpenDialog();
+ try
+ {
+ IShellItem item;
+ //如果选择路径不为空，则设置默认文件夹
+ if (!string.IsNullOrEmpty(DirectoryPath))
+ {
+ IntPtr idl;
+ uint atts = 0;
+ if (SHILCreateFromPath(DirectoryPath, out idl, ref atts) == 0)
+ {
+ if (SHCreateShellItem(IntPtr.Zero, IntPtr.Zero, idl, out item) == 0)
+ {
+ dialog.SetFolder(item);
+ }
+ }
+ }
+ //自定义标题
+ if (!string.IsNullOrEmpty(Description))
+ {
+ dialog.SetTitle(Description);
+ }
+ //是否显示隐藏文件
+ if (ShowHidden)
+ {
+ //本人扩展的项目
+ dialog.SetOptions(FOS.FOS_PICKFOLDERS | FOS.FOS_FORCEFILESYSTEM | FOS.FOS_FORCESHOWHIDDEN);
+ }
+ else
+ {
+ //原作者代码
+ dialog.SetOptions(FOS.FOS_PICKFOLDERS | FOS.FOS_FORCEFILESYSTEM);
+ }
+ uint hr = dialog.Show(handle);
+ if (hr == ERROR_CANCELLED)
+ return DialogResult.Cancel;
+
+ if (hr != 0)
+ return DialogResult.Abort;
+ dialog.GetResult(out item);
+ string path;
+ item.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out path);
+ DirectoryPath = path;
+ return DialogResult.OK;
+ }
+ finally
+ {
+ Marshal.ReleaseComObject(dialog);
+ }
+ }
+ #endregion
+
+ #region BaseType
+ [DllImport("shell32.dll")]
+ private static extern int SHILCreateFromPath([MarshalAs(UnmanagedType.LPWStr)] string pszPath, out IntPtr ppIdl, ref uint rgflnOut);
+ [DllImport("shell32.dll")]
+ private static extern int SHCreateShellItem(IntPtr pidlParent, IntPtr psfParent, IntPtr pidl, out IShellItem ppsi);
+ [DllImport("user32.dll")]
+ private static extern IntPtr GetActiveWindow();
+ private const uint ERROR_CANCELLED = 0x800704C7;
+ [ComImport]
+ [Guid("DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7")]
+ private class FileOpenDialog
+ {
+ }
+ [ComImport]
+ [Guid("42f85136-db7e-439c-85f1-e4075d135fc8")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ private interface IFileOpenDialog
+ {
+ [PreserveSig]
+ uint Show([In] IntPtr parent); // IModalWindow
+ void SetFileTypes(); // not fully defined
+ void SetFileTypeIndex([In] uint iFileType);
+ void GetFileTypeIndex(out uint piFileType);
+ void Advise(); // not fully defined
+ void Unadvise();
+ void SetOptions([In] FOS fos);
+ void GetOptions(out FOS pfos);
+ void SetDefaultFolder(IShellItem psi);
+ void SetFolder(IShellItem psi);
+ void GetFolder(out IShellItem ppsi);
+ void GetCurrentSelection(out IShellItem ppsi);
+ void SetFileName([In, MarshalAs(UnmanagedType.LPWStr)] string pszName);
+ void GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName);
+ void SetTitle([In, MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
+ void SetOkButtonLabel([In, MarshalAs(UnmanagedType.LPWStr)] string pszText);
+ void SetFileNameLabel([In, MarshalAs(UnmanagedType.LPWStr)] string pszLabel);
+ void GetResult(out IShellItem ppsi);
+ void AddPlace(IShellItem psi, int alignment);
+ void SetDefaultExtension([In, MarshalAs(UnmanagedType.LPWStr)] string pszDefaultExtension);
+ void Close(int hr);
+ void SetClientGuid(); // not fully defined
+ void ClearClientData();
+ void SetFilter([MarshalAs(UnmanagedType.Interface)] IntPtr pFilter);
+ void GetResults([MarshalAs(UnmanagedType.Interface)] out IntPtr ppenum); // not fully defined
+ void GetSelectedItems([MarshalAs(UnmanagedType.Interface)] out IntPtr ppsai); // not fully defined
+ }
+ [ComImport]
+ [Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ private interface IShellItem
+ {
+ void BindToHandler(); // not fully defined
+ void GetParent(); // not fully defined
+ void GetDisplayName([In] SIGDN sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
+ void GetAttributes(); // not fully defined
+ void Compare(); // not fully defined
+ }
+
+ private enum SIGDN : uint
+ {
+ SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000,
+ SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
+ SIGDN_FILESYSPATH = 0x80058000,
+ SIGDN_NORMALDISPLAY = 0,
+ SIGDN_PARENTRELATIVE = 0x80080001,
+ SIGDN_PARENTRELATIVEEDITING = 0x80031001,
+ SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001,
+ SIGDN_PARENTRELATIVEPARSING = 0x80018001,
+ SIGDN_URL = 0x80068000
+ }
+ [Flags]
+ private enum FOS
+ {
+ FOS_ALLNONSTORAGEITEMS = 0x80,
+ FOS_ALLOWMULTISELECT = 0x200, //需要采用GetResults获取结果，未实现
+ FOS_CREATEPROMPT = 0x2000,
+ FOS_DEFAULTNOMINIMODE = 0x20000000,
+ FOS_DONTADDTORECENT = 0x2000000,
+ FOS_FILEMUSTEXIST = 0x1000,
+ FOS_FORCEFILESYSTEM = 0x40,
+ FOS_FORCESHOWHIDDEN = 0x10000000, //强制显示隐藏文件
+ FOS_HIDEMRUPLACES = 0x20000,
+ FOS_HIDEPINNEDPLACES = 0x40000,
+ FOS_NOCHANGEDIR = 8,
+ FOS_NODEREFERENCELINKS = 0x100000,
+ FOS_NOREADONLYRETURN = 0x8000,
+ FOS_NOTESTFILECREATE = 0x10000,
+ FOS_NOVALIDATE = 0x100,
+ FOS_OVERWRITEPROMPT = 2,
+ FOS_PATHMUSTEXIST = 0x800,
+ FOS_PICKFOLDERS = 0x20,
+ FOS_SHAREAWARE = 0x4000,
+ FOS_STRICTFILETYPES = 4
+ }
+ #endregion
+ }
+ #endregion
+}
\ No newline at end of file