9 changed files
BExplorer/BetterExplorer | ||
BetterExplorer.csproj | ||
MainWindow.xaml.cs | ||
ConsoleControl | ||
ConsoleControl.cs | ||
Shell | ||
FileOperation | ||
IIFileOperation.cs | ||
Properties | ||
AssemblyInfo.cs | ||
ShellItem.cs | ||
ShellTreeViewEx.cs | ||
ShellViewEx.cs | ||
WpfControlLibrary1 | ||
4cy2oxal.tmp_proj + | ||
BetterExplorer.csproj
/BExplorer/BetterExplorer/BetterExplorer.csproj-1+1/BExplorer/BetterExplorer/BetterExplorer.csproj
Add comment 1174 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Add comment 1175 <ProjectExtensions>
Add comment 1176 <VisualStudio>
Add comment 1177 Minus <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UseGlobalSettings="True" />
Add comment 1177 Plus <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
Add comment 1178 </VisualStudio>
Add comment 1179 </ProjectExtensions>
Add comment 1180 <!-- <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-1+1/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 664 isChecked: item.ParsingName == lib.DefaultSaveFolder, onClick: miItem_Click));
Add comment 665 }
Add comment 666
Add comment 667 Minus btnDefSave.IsEnabled = !(lib.Count == 0);
Add comment 667 Plus btnDefSave.IsEnabled = lib.Count != 0;
Add comment 668 lib.Close();
Add comment 669 }
Add comment 670
Add comment 473 // Get the input.
Add comment 474 string input = richTextBoxConsole.Text.Substring(inputStart, richTextBoxConsole.SelectionStart - inputStart);
Add comment 475 WriteInput(input, Color.White);
Add comment 476 Minus
Add comment 477 476 }
Add comment 478 477 }
Add comment 479 478
IIFileOperation.cs
/Shell/FileOperation/IIFileOperation.cs-21+31/Shell/FileOperation/IIFileOperation.cs
Add comment 10
Add comment 11 namespace BExplorer.Shell {
Add comment 12 public class IIFileOperation : IDisposable {
Add comment 13 Plus /*
Add comment 13 14 [DllImport("shell32.dll", SetLastError = true, CharSet = CharSet.Unicode, PreserveSig = false)]
Add comment 14 15 [return: MarshalAs(UnmanagedType.Interface)]
Add comment 15 16 private static extern object SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath, IBindCtx pbc, ref Guid riid);
Add comment 17 Plus */
Add comment 16 18
Add comment 17 19 private static readonly Guid CLSID_FileOperation = new Guid("3ad05575-8857-4850-9277-11b85bdb8e09");
Add comment 18 20 private static readonly Type _fileOperationType = Type.GetTypeFromCLSID(CLSID_FileOperation);
Add comment 19 Minus private static Guid _shellItemGuid = typeof(IShellItem).GUID;
Add comment 21 Plus //private static Guid _shellItemGuid = typeof(IShellItem).GUID;
Add comment 20 22
Add comment 21 23 private bool _disposed;
Add comment 22 24 private IFileOperation _fileOperation;
Add comment 31 33 public IIFileOperation(FileOperationProgressSink callbackSink, IntPtr owner, Boolean isRecycle) {
Add comment 32 34 _callbackSink = callbackSink;
Add comment 33 35 _fileOperation = (IFileOperation)Activator.CreateInstance(_fileOperationType);
Add comment 34 Minus //TestDialog dlg = new TestDialog();
Add comment 35 Minus //_fileOperation.SetProgressDialog(dlg);
Add comment 36 if (isRecycle)
Add comment 37 _fileOperation.SetOperationFlags(FileOperationFlags.FOF_NOCONFIRMMKDIR | FileOperationFlags.FOF_ALLOWUNDO);
Add comment 38 else
Add comment 41 if (owner != IntPtr.Zero) _fileOperation.SetOwnerWindow((uint)owner);
Add comment 42 }
Add comment 43
Add comment 44 Minus [Obsolete("Not Used", true)]
Add comment 45 Minus public void CopyItem(string source, string destination, string newName) {
Add comment 44 Plus public void CopyItem(IShellItem source, ShellItem destination) {
Add comment 46 45 ThrowIfDisposed();
Add comment 47 Minus using (ComReleaser<IShellItem> sourceItem = CreateShellItem(source))
Add comment 48 Minus using (ComReleaser<IShellItem> destinationItem = CreateShellItem(destination)) {
Add comment 49 Minus _fileOperation.CopyItem(sourceItem.Item, destinationItem.Item, newName, null);
Add comment 50 Minus }
Add comment 46 Plus
Add comment 47 Plus /*
Add comment 48 Plus * Attempt to fix files not being created
Add comment 49 Plus *
Add comment 50 Plus var Name = System.IO.Path.GetFileName(Helpers.GetParsingName(source));
Add comment 51 Plus var Teest = Name.Split(new string[] { "." }, StringSplitOptions.None).Last();
Add comment 52 Plus var T1 = Name.Substring(0, Name.Length - (Teest.Length + 1));
Add comment 53 Plus var i = 1;
Add comment 54 Plus //while (System.IO.File.Exists(Name) || System.IO.Directory.Exists(Name)) {
Add comment 55 Plus
Add comment 56 Plus while (
Add comment 57 Plus !destination.Any(x => {
Add comment 58 Plus return x.DisplayName == Name;
Add comment 59 Plus })) {
Add comment 60 Plus
Add comment 61 Plus Name = T1 + " - Copy (" + i + ")" + "." + Teest;
Add comment 62 Plus i++;
Add comment 51 63 }
Add comment 52 64
Add comment 53 Minus public void CopyItem(IShellItem source, IShellItem destination, string newName) {
Add comment 54 Minus ThrowIfDisposed();
Add comment 55 Minus _fileOperation.CopyItem(source, destination, newName, null);
Add comment 56 Minus }
Add comment 65 Plus _fileOperation.CopyItem(source, destination.ComInterface, Name, null);
Add comment 66 Plus */
Add comment 57 67
Add comment 58 Minus [Obsolete("Not Used", true)]
Add comment 59 Minus public void MoveItem(string source, string destination, string newName) {
Add comment 60 Minus ThrowIfDisposed();
Add comment 61 Minus using (ComReleaser<IShellItem> sourceItem = CreateShellItem(source))
Add comment 62 Minus using (ComReleaser<IShellItem> destinationItem = CreateShellItem(destination)) {
Add comment 63 Minus _fileOperation.MoveItem(sourceItem.Item, destinationItem.Item, newName, null);
Add comment 64 Minus }
Add comment 68 Plus _fileOperation.CopyItem(source, destination.ComInterface, "", null);
Add comment 65 69 }
Add comment 66 70
Add comment 67 71 public void MoveItem(IShellItem source, IShellItem destination, string newName) {
Add comment 69 73 _fileOperation.MoveItem(source, destination, newName, null);
Add comment 70 74 }
Add comment 71 75
Add comment 76 Plus /*
Add comment 72 77 [Obsolete("Not Used", true)]
Add comment 73 78 public void RenameItem(string source, string newName) {
Add comment 74 79 ThrowIfDisposed();
Add comment 76 81 _fileOperation.RenameItem(sourceItem.Item, newName, null);
Add comment 77 82 }
Add comment 78 83 }
Add comment 84 Plus */
Add comment 79 85
Add comment 80 86 public void RenameItem(IShellItem source, string newName) {
Add comment 81 87 ThrowIfDisposed();
Add comment 82 88 _fileOperation.RenameItem(source, newName, null);
Add comment 83 89 }
Add comment 84 90
Add comment 91 Plus /*
Add comment 85 92 [Obsolete("Not Used", true)]
Add comment 86 93 public void DeleteItem(string source) {
Add comment 87 94 ThrowIfDisposed();
Add comment 89 96 _fileOperation.DeleteItem(sourceItem.Item, null);
Add comment 90 97 }
Add comment 91 98 }
Add comment 99 Plus */
Add comment 92 100
Add comment 93 101 public void DeleteItem(IShellItem source) {
Add comment 94 102 ThrowIfDisposed();
Add comment 110 118 _fileOperation.NewItem(folderName, attrs, name, string.Empty, _callbackSink);
Add comment 111 119 }
Add comment 112 120 */
Add comment 121 Plus
Add comment 113 122 public void PerformOperations() {
Add comment 114 123 ThrowIfDisposed();
Add comment 115 124 try {
Add comment 132 141 }
Add comment 133 142 }
Add comment 134 143
Add comment 144 Plus /*
Add comment 135 145 private static ComReleaser<IShellItem> CreateShellItem(string path) {
Add comment 136 146 return new ComReleaser<IShellItem>((IShellItem)SHCreateItemFromParsingName(path, null, ref _shellItemGuid));
Add comment 137 147 }
Add comment 138 Minus
Add comment 148 Plus */
Add comment 139 149 }
Add comment 140 150 }
Add comment 141 151
Add comment 31 //
Add comment 32 // You can specify all the values or you can default the Revision and Build Numbers
Add comment 33 // by using the '*' as shown below:
Add comment 34 Minus [assembly: AssemblyVersion("0.6.0.*")]
Add comment 35 Minus [assembly: AssemblyFileVersion("0.6.0")]
Add comment 34 Plus [assembly: AssemblyVersion("0.7.0.*")]
Add comment 35 Plus [assembly: AssemblyFileVersion("0.7.0")]
Add comment 36