- fixed missing search box icons...
c41404c4
DimitarCC
committed
10 changed files
MainWindow.xaml
/BExplorer/BetterExplorer/MainWindow.xaml-2+2
/BExplorer/BetterExplorer/MainWindow.xaml
Add comment 224 <ColumnDefinition />
Add comment 225 </Grid.ColumnDefinitions>
Add comment 226 <Ribbon:SeparatorTabItem Header="{StaticResource mmSupportCP}" Style="{DynamicResource InnerBackstageSeparatorTabItemStyle}" VerticalAlignment="Top" Margin="15,10,10,0" />
Add comment 227 Minus   <Ribbon:Button Header="{StaticResource btnUpdateCheckCP}" HorizontalAlignment="Left" IsDefinitive="True" Ribbon:KeyTip.Keys="U" Ribbon:KeyTip.VerticalAlignment="Bottom" Click="Button_Click_6" LargeIcon="Images\updater32.png" Icon="Images\updater16.png" Style="{DynamicResource ButtonBackstageStyle}" VerticalAlignment="Top" Margin="20,45,0,0" Name="btnUpdateCheck">
Add comment 227 Plus   <Ribbon:Button Header="{StaticResource btnUpdateCheckCP}" HorizontalAlignment="Left" IsDefinitive="True" Ribbon:KeyTip.Keys="U" Ribbon:KeyTip.VerticalAlignment="Bottom" Click="Button_Click_6" LargeIcon="Images\updater32.png" Icon="Images\updater16.png" Style="{DynamicResource ButtonBackstageStyle}" VerticalAlignment="Top" Margin="20,45,0,0" Name="btnUpdateCheck" Height="88">
Add comment 228 <Ribbon:Button.ToolTip>
Add comment 229 <Ribbon:ScreenTip
Add comment 230 Title="{StaticResource btnUpdateCheckHCP}"
Add comment 236 </Ribbon:Button>
Add comment 237 <Label Content="{StaticResource btnUpdateCheckHCP}" FontWeight="Bold" FontSize="12" Margin="105,45,10,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
Add comment 238 <TextBlock Text="{StaticResource btnUpdateCheckICP}" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="110,75,10,0" Height="50" VerticalAlignment="Top" />
Add comment 239 Minus   <Ribbon:Button Header="{StaticResource btnOpenWebsite}" HorizontalAlignment="Left" IsDefinitive="True" Ribbon:KeyTip.Keys="W" Ribbon:KeyTip.VerticalAlignment="Bottom" Click="Button_Click_7" LargeIcon="Images\webconnect_32.png" Icon="Images\webconnect_16.png" Style="{DynamicResource ButtonBackstageStyle}" VerticalAlignment="Top" Margin="20,140,0,0" />
Add comment 239 Plus   <Ribbon:Button Header="{StaticResource btnOpenWebsite}" HorizontalAlignment="Left" IsDefinitive="True" Ribbon:KeyTip.Keys="W" Ribbon:KeyTip.VerticalAlignment="Bottom" Click="Button_Click_7" LargeIcon="Images\webconnect_32.png" Icon="Images\webconnect_16.png" Style="{DynamicResource ButtonBackstageStyle}" VerticalAlignment="Top" Margin="20,140,0,0" Height="88"/>
Add comment 240 <Label Content="{StaticResource btnOpenWebsiteHCP}" FontWeight="Bold" FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="105,140,10,0" />
Add comment 241 <TextBlock Text="{StaticResource btnOpenWebsiteICP}" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="110,170,10,0" Height="50" VerticalAlignment="Top" />
Add comment 242 <Separator Grid.Column="0" HorizontalAlignment="Right"/>
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-221+484
/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 652 {
Add comment 653 try
Add comment 654 {
Add comment 655 Minus   this.Title = "Better Explorer - " + e.NewLocation.GetDisplayName(DisplayNameType.Default);
Add comment 655 Plus   // this.Title = "Better Explorer - " + e.NewLocation.GetDisplayName(DisplayNameType.Default);
Add comment 656
Add comment 657
Add comment 658
Add comment 659 Dispatcher.BeginInvoke(DispatcherPriority.Normal, (ThreadStart)(() =>
Add comment 660 {
Add comment 661 Minus   ConstructMoveToCopyToMenu();
Add comment 662 Minus   if (e.NewLocation.IsFileSystemObject || e.NewLocation.IsNetDrive || e.NewLocation.ParsingName.StartsWith(@"\\"))
Add comment 663 Minus   {
Add comment 661 Plus   // ConstructMoveToCopyToMenu();
Add comment 662 Plus   // if (e.NewLocation.IsFileSystemObject || e.NewLocation.IsNetDrive || e.NewLocation.ParsingName.StartsWith(@"\\"))
Add comment 663 Plus   // {
Add comment 664
Add comment 665 Minus   try
Add comment 666 Minus   {
Add comment 667 Minus   fsw_AC = new FileSystemWatcher(e.NewLocation.ParsingName);
Add comment 668 Minus   fsw_AC.EnableRaisingEvents = true;
Add comment 669 Minus   fsw_AC.Created += new FileSystemEventHandler(fsw_AC_Created);
Add comment 670 Minus   fsw_AC.Deleted += new FileSystemEventHandler(fsw_AC_Deleted);
Add comment 671 Minus   }
Add comment 672 Minus   catch
Add comment 673 Minus   {
Add comment 665 Plus   // try
Add comment 666 Plus   // {
Add comment 667 Plus   // fsw_AC = new FileSystemWatcher(e.NewLocation.ParsingName);
Add comment 668 Plus   // fsw_AC.EnableRaisingEvents = true;
Add comment 669 Plus   // fsw_AC.Created += new FileSystemEventHandler(fsw_AC_Created);
Add comment 670 Plus   // fsw_AC.Deleted += new FileSystemEventHandler(fsw_AC_Deleted);
Add comment 671 Plus   // }
Add comment 672 Plus   // catch
Add comment 673 Plus   // {
Add comment 674
Add comment 675 Minus   }
Add comment 676 Minus   }
Add comment 675 Plus   // }
Add comment 676 Plus   // }
Add comment 677
Add comment 678 Minus   if (e.NewLocation.IsFileSystemObject)
Add comment 679 Minus   {
Add comment 680 Minus   btnSizeChart.IsEnabled = true;
Add comment 681 Minus   }
Add comment 682 Minus   else
Add comment 683 Minus   {
Add comment 684 Minus   btnSizeChart.IsEnabled = false;
Add comment 685 Minus   }
Add comment 678 Plus   // if (e.NewLocation.IsFileSystemObject)
Add comment 679 Plus   // {
Add comment 680 Plus   // btnSizeChart.IsEnabled = true;
Add comment 681 Plus   // }
Add comment 682 Plus   // else
Add comment 683 Plus   // {
Add comment 684 Plus   // btnSizeChart.IsEnabled = false;
Add comment 685 Plus   // }
Add comment 686 Plus   //
Add comment 686 687
Add comment 688 Plus   // btnAutosizeColls.IsEnabled =
Add comment 689 Plus   // Explorer.ContentOptions.ViewMode == ExplorerBrowserViewMode.Details ?
Add comment 690 Plus   // true : false;
Add comment 687 691
Add comment 688 Minus   btnAutosizeColls.IsEnabled =
Add comment 689 Minus   Explorer.ContentOptions.ViewMode == ExplorerBrowserViewMode.Details ?
Add comment 690 Minus   true : false;
Add comment 691 Minus  
Add comment 692 Minus   this.breadcrumbBarControl1.LoadDirectory(e.NewLocation);
Add comment 693 Minus   this.breadcrumbBarControl1.LastPath = e.NewLocation.ParsingName;
Add comment 694 Minus   //}));
Add comment 692 Plus   // this.breadcrumbBarControl1.LoadDirectory(e.NewLocation);
Add comment 693 Plus   // this.breadcrumbBarControl1.LastPath = e.NewLocation.ParsingName;
Add comment 694 Plus   // //}));
Add comment 695 bool IsChanged = (Explorer.GetSelectedItemsCount() > 0);
Add comment 696 bool isFuncAvail;
Add comment 697 if (Explorer.SelectedItems.Count == 1)
Add comment 717 btnSelNone.IsEnabled = IsChanged;
Add comment 718 btnUpLevel.IsEnabled = !(Explorer.NavigationLog.CurrentLocation.Parent == null);
Add comment 719
Add comment 720 Minus   IntPtr pIDL = IntPtr.Zero;
Add comment 720 Plus   // IntPtr pIDL = IntPtr.Zero;
Add comment 721
Add comment 722 Minus   try
Add comment 723 Minus   {
Add comment 724 Minus   uint iAttribute;
Add comment 725 Minus   SHParseDisplayName(Explorer.NavigationLog.CurrentLocation.ParsingName,
Add comment 726 Minus   IntPtr.Zero, out pIDL, (uint)0, out iAttribute);
Add comment 722 Plus   // try
Add comment 723 Plus   // {
Add comment 724 Plus   // uint iAttribute;
Add comment 725 Plus   // SHParseDisplayName(Explorer.NavigationLog.CurrentLocation.ParsingName,
Add comment 726 Plus   // IntPtr.Zero, out pIDL, (uint)0, out iAttribute);
Add comment 727
Add comment 728 Minus   WindowsAPI.SHFILEINFO sfi = new WindowsAPI.SHFILEINFO();
Add comment 729 Minus   IntPtr Res = IntPtr.Zero;
Add comment 730 Minus   if (pIDL != IntPtr.Zero)
Add comment 731 Minus   {
Add comment 732 Minus   if (!Explorer.NavigationLog.CurrentLocation.IsFileSystemObject)
Add comment 733 Minus   {
Add comment 734 Minus   Res = WindowsAPI.SHGetFileInfo(pIDL, 0, ref sfi, (uint)Marshal.SizeOf(sfi), WindowsAPI.SHGFI.IconLocation | WindowsAPI.SHGFI.SmallIcon | WindowsAPI.SHGFI.PIDL);
Add comment 735 Minus   }
Add comment 728 Plus   // WindowsAPI.SHFILEINFO sfi = new WindowsAPI.SHFILEINFO();
Add comment 729 Plus   // IntPtr Res = IntPtr.Zero;
Add comment 730 Plus   // if (pIDL != IntPtr.Zero)
Add comment 731 Plus   // {
Add comment 732 Plus   // if (!Explorer.NavigationLog.CurrentLocation.IsFileSystemObject)
Add comment 733 Plus   // {
Add comment 734 Plus   // Res = WindowsAPI.SHGetFileInfo(pIDL, 0, ref sfi, (uint)Marshal.SizeOf(sfi), WindowsAPI.SHGFI.IconLocation | WindowsAPI.SHGFI.SmallIcon | WindowsAPI.SHGFI.PIDL);
Add comment 735 Plus   // }
Add comment 736
Add comment 737 Minus   }
Add comment 737 Plus   // }
Add comment 738
Add comment 739 Minus   if (Explorer.NavigationLog.CurrentLocation.IsFileSystemObject)
Add comment 740 Minus   {
Add comment 741 Minus   WindowsAPI.SHGetFileInfo(Explorer.NavigationLog.CurrentLocation.ParsingName, 0, ref sfi, (uint)Marshal.SizeOf(sfi), (uint)WindowsAPI.SHGFI.IconLocation | (uint)WindowsAPI.SHGFI.SmallIcon);
Add comment 739 Plus   // if (Explorer.NavigationLog.CurrentLocation.IsFileSystemObject)
Add comment 740 Plus   // {
Add comment 741 Plus   // WindowsAPI.SHGetFileInfo(Explorer.NavigationLog.CurrentLocation.ParsingName, 0, ref sfi, (uint)Marshal.SizeOf(sfi), (uint)WindowsAPI.SHGFI.IconLocation | (uint)WindowsAPI.SHGFI.SmallIcon);
Add comment 742
Add comment 743 Minus   }
Add comment 744 Minus   JumpTask JTask = new JumpTask();
Add comment 745 Minus   JTask.ApplicationPath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
Add comment 746 Minus   JTask.Arguments = "\"" + Explorer.NavigationLog.CurrentLocation.ParsingName + "\"";
Add comment 747 Minus   JTask.Title = Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default);
Add comment 748 Minus   JTask.IconResourcePath = sfi.szDisplayName;
Add comment 749 Minus   JTask.IconResourceIndex = sfi.iIcon;
Add comment 750 Minus   JumpList.AddToRecentCategory(JTask);
Add comment 751 Minus   AppJL.Apply();
Add comment 743 Plus   // }
Add comment 744 Plus   // JumpTask JTask = new JumpTask();
Add comment 745 Plus   // JTask.ApplicationPath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
Add comment 746 Plus   // JTask.Arguments = "\"" + Explorer.NavigationLog.CurrentLocation.ParsingName + "\"";
Add comment 747 Plus   // JTask.Title = Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default);
Add comment 748 Plus   // JTask.IconResourcePath = sfi.szDisplayName;
Add comment 749 Plus   // JTask.IconResourceIndex = sfi.iIcon;
Add comment 750 Plus   // JumpList.AddToRecentCategory(JTask);
Add comment 751 Plus   // AppJL.Apply();
Add comment 752
Add comment 753 Minus   }
Add comment 754 Minus   finally
Add comment 755 Minus   {
Add comment 753 Plus   // }
Add comment 754 Plus   // finally
Add comment 755 Plus   // {
Add comment 756
Add comment 757 Minus   if (pIDL != IntPtr.Zero)
Add comment 758 Minus   Marshal.FreeCoTaskMem(pIDL);
Add comment 759 Minus   }
Add comment 757 Plus   // if (pIDL != IntPtr.Zero)
Add comment 758 Plus   // Marshal.FreeCoTaskMem(pIDL);
Add comment 759 Plus   // }
Add comment 760
Add comment 761 Minus   try
Add comment 762 Minus   {
Add comment 761 Plus   // try
Add comment 762 Plus   // {
Add comment 763
Add comment 764 Minus   //CloseableTabItem it = new CloseableTabItem();
Add comment 765 Minus   //CreateTabbarRKMenu(it);
Add comment 766 Minus   Explorer.NavigationLog.CurrentLocation.Thumbnail.CurrentSize = new System.Windows.Size(16, 16);
Add comment 767 Minus   Explorer.NavigationLog.CurrentLocation.Thumbnail.FormatOption = ShellThumbnailFormatOption.IconOnly;
Add comment 768 Minus   (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Header = Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default);
Add comment 769 Minus   (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).TabIcon = Explorer.NavigationLog.CurrentLocation.Thumbnail.BitmapSource;
Add comment 770 Minus   (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Path = Explorer.NavigationLog.CurrentLocation;
Add comment 771 Minus   if (!isGoingBackOrForward)
Add comment 772 Minus   {
Add comment 773 Minus   (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CurrentLocation = Explorer.NavigationLog.CurrentLocation;
Add comment 774 Minus   }
Add comment 764 Plus   // //CloseableTabItem it = new CloseableTabItem();
Add comment 765 Plus   // //CreateTabbarRKMenu(it);
Add comment 766 Plus   // Explorer.NavigationLog.CurrentLocation.Thumbnail.CurrentSize = new System.Windows.Size(16, 16);
Add comment 767 Plus   // Explorer.NavigationLog.CurrentLocation.Thumbnail.FormatOption = ShellThumbnailFormatOption.IconOnly;
Add comment 768 Plus   // (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Header = Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default);
Add comment 769 Plus   // (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).TabIcon = Explorer.NavigationLog.CurrentLocation.Thumbnail.BitmapSource;
Add comment 770 Plus   // (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Path = Explorer.NavigationLog.CurrentLocation;
Add comment 771 Plus   // if (!isGoingBackOrForward)
Add comment 772 Plus   // {
Add comment 773 Plus   // (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CurrentLocation = Explorer.NavigationLog.CurrentLocation;
Add comment 774 Plus   // }
Add comment 775
Add comment 776 Minus   isGoingBackOrForward = false;
Add comment 776 Plus   // isGoingBackOrForward = false;
Add comment 777
Add comment 778 Minus   leftNavBut.IsEnabled = (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CanNavigateBackwards;
Add comment 779 Minus   rightNavBut.IsEnabled = (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CanNavigateForwards;
Add comment 778 Plus   // leftNavBut.IsEnabled = (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CanNavigateBackwards;
Add comment 779 Plus   // rightNavBut.IsEnabled = (tabControl1.Items[CurrentTabIndex] as CloseableTabItem).log.CanNavigateForwards;
Add comment 780
Add comment 781 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragEnter += new DragEventHandler(newt_DragEnter);
Add comment 782 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragLeave += new DragEventHandler(newt_DragLeave);
Add comment 783 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragOver += new DragEventHandler(newt_DragOver);
Add comment 784 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Drop += new DragEventHandler(newt_Drop);
Add comment 785 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).AllowDrop = true;
Add comment 786 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Index = CurrentTabIndex;
Add comment 787 Minus   //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).CloseTab += new RoutedEventHandler(cti_CloseTab);
Add comment 788 Minus   //tabControl1.Items[CurrentTabIndex] = it;
Add comment 789 Minus   tabControl1.SelectedIndex = CurrentTabIndex;
Add comment 781 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragEnter += new DragEventHandler(newt_DragEnter);
Add comment 782 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragLeave += new DragEventHandler(newt_DragLeave);
Add comment 783 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).DragOver += new DragEventHandler(newt_DragOver);
Add comment 784 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Drop += new DragEventHandler(newt_Drop);
Add comment 785 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).AllowDrop = true;
Add comment 786 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).Index = CurrentTabIndex;
Add comment 787 Plus   // //(tabControl1.Items[CurrentTabIndex] as CloseableTabItem).CloseTab += new RoutedEventHandler(cti_CloseTab);
Add comment 788 Plus   // //tabControl1.Items[CurrentTabIndex] = it;
Add comment 789 Plus   // tabControl1.SelectedIndex = CurrentTabIndex;
Add comment 790
Add comment 791
Add comment 792 Minus   }
Add comment 793 Minus   catch (Exception)
Add comment 794 Minus   {
Add comment 792 Plus   // }
Add comment 793 Plus   // catch (Exception)
Add comment 794 Plus   // {
Add comment 795
Add comment 796 Minus   }
Add comment 797 Minus   bool isinLibraries = false;
Add comment 798 Minus   if (Explorer.NavigationLog.CurrentLocation.Parent != null)
Add comment 799 Minus   {
Add comment 800 Minus   if (Explorer.NavigationLog.CurrentLocation.Parent.ParsingName ==
Add comment 801 Minus   KnownFolders.Libraries.ParsingName)
Add comment 802 Minus   {
Add comment 803 Minus   isinLibraries = true;
Add comment 804 Minus   }
Add comment 805 Minus   else
Add comment 806 Minus   {
Add comment 807 Minus   isinLibraries = false;
Add comment 808 Minus   }
Add comment 809 Minus   }
Add comment 796 Plus   // }
Add comment 797 Plus   // bool isinLibraries = false;
Add comment 798 Plus   // if (Explorer.NavigationLog.CurrentLocation.Parent != null)
Add comment 799 Plus   // {
Add comment 800 Plus   // if (Explorer.NavigationLog.CurrentLocation.Parent.ParsingName ==
Add comment 801 Plus   // KnownFolders.Libraries.ParsingName)
Add comment 802 Plus   // {
Add comment 803 Plus   // isinLibraries = true;
Add comment 804 Plus   // }
Add comment 805 Plus   // else
Add comment 806 Plus   // {
Add comment 807 Plus   // isinLibraries = false;
Add comment 808 Plus   // }
Add comment 809 Plus   // }
Add comment 810
Add comment 811 Minus   btnCreateFolder.IsEnabled = Explorer.NavigationLog.CurrentLocation.IsFileSystemObject ||
Add comment 812 Minus   (Explorer.NavigationLog.CurrentLocation.ParsingName == KnownFolders.Libraries.ParsingName) ||
Add comment 813 Minus   (isinLibraries);
Add comment 814 Minus   if (Explorer.NavigationLog.CurrentLocation.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 815 Minus   {
Add comment 816 Minus   btnCreateFolder.Header = FindResource("btnNewLibraryCP"); //"New Library";
Add comment 817 Minus   stNewFolder.Title = FindResource("btnNewLibraryCP").ToString();//"New Library";
Add comment 818 Minus   stNewFolder.Text = "Creates a new library in the current folder.";
Add comment 819 Minus   stNewFolder.Image = new BitmapImage(new Uri(@"/BetterExplorer;component/Images/newlib32.png", UriKind.Relative));
Add comment 820 Minus   btnCreateFolder.LargeIcon = @"..\Images\newlib32.png";
Add comment 821 Minus   btnCreateFolder.Icon = @"..\Images\newlib16.png";
Add comment 822 Minus   }
Add comment 823 Minus   else
Add comment 824 Minus   {
Add comment 825 Minus   btnCreateFolder.Header = FindResource("btnNewFolderCP");//"New Folder";
Add comment 826 Minus   stNewFolder.Title = FindResource("btnNewFolderCP").ToString(); //"New Folder";
Add comment 827 Minus   stNewFolder.Text = "Creates a new folder in the current folder";
Add comment 828 Minus   stNewFolder.Image = new BitmapImage(new Uri(@"/BetterExplorer;component/Images/folder_new32.png", UriKind.Relative));
Add comment 829 Minus   btnCreateFolder.LargeIcon = @"..\Images\folder_new32.png";
Add comment 830 Minus   btnCreateFolder.Icon = @"..\Images\folder_new16.png";
Add comment 831 Minus   }
Add comment 832 Minus   if (Explorer.NavigationLog.CurrentLocation.IsFolder && !Explorer.NavigationLog.CurrentLocation.IsDrive &&
Add comment 833 Minus   !Explorer.NavigationLog.CurrentLocation.IsSearchFolder)
Add comment 834 Minus   {
Add comment 835 Minus   ctgFolderTools.Visibility = Visibility.Visible;
Add comment 836 Minus   }
Add comment 811 Plus   // btnCreateFolder.IsEnabled = Explorer.NavigationLog.CurrentLocation.IsFileSystemObject ||
Add comment 812 Plus   // (Explorer.NavigationLog.CurrentLocation.ParsingName == KnownFolders.Libraries.ParsingName) ||
Add comment 813 Plus   // (isinLibraries);
Add comment 814 Plus   // if (Explorer.NavigationLog.CurrentLocation.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 815 Plus   // {
Add comment 816 Plus   // btnCreateFolder.Header = FindResource("btnNewLibraryCP"); //"New Library";
Add comment 817 Plus   // stNewFolder.Title = FindResource("btnNewLibraryCP").ToString();//"New Library";
Add comment 818 Plus   // stNewFolder.Text = "Creates a new library in the current folder.";
Add comment 819 Plus   // stNewFolder.Image = new BitmapImage(new Uri(@"/BetterExplorer;component/Images/newlib32.png", UriKind.Relative));
Add comment 820 Plus   // btnCreateFolder.LargeIcon = @"..\Images\newlib32.png";
Add comment 821 Plus   // btnCreateFolder.Icon = @"..\Images\newlib16.png";
Add comment 822 Plus   // }
Add comment 823 Plus   // else
Add comment 824 Plus   // {
Add comment 825 Plus   // btnCreateFolder.Header = FindResource("btnNewFolderCP");//"New Folder";
Add comment 826 Plus   // stNewFolder.Title = FindResource("btnNewFolderCP").ToString(); //"New Folder";
Add comment 827 Plus   // stNewFolder.Text = "Creates a new folder in the current folder";
Add comment 828 Plus   // stNewFolder.Image = new BitmapImage(new Uri(@"/BetterExplorer;component/Images/folder_new32.png", UriKind.Relative));
Add comment 829 Plus   // btnCreateFolder.LargeIcon = @"..\Images\folder_new32.png";
Add comment 830 Plus   // btnCreateFolder.Icon = @"..\Images\folder_new16.png";
Add comment 831 Plus   // }
Add comment 832 Plus   // if (Explorer.NavigationLog.CurrentLocation.IsFolder && !Explorer.NavigationLog.CurrentLocation.IsDrive &&
Add comment 833 Plus   // !Explorer.NavigationLog.CurrentLocation.IsSearchFolder)
Add comment 834 Plus   // {
Add comment 835 Plus   // ctgFolderTools.Visibility = Visibility.Visible;
Add comment 836 Plus   // }
Add comment 837
Add comment 838 Minus   if (Explorer.NavigationLog.CurrentLocation.ParsingName.Contains(KnownFolders.Libraries.ParsingName) &&
Add comment 839 Minus   Explorer.NavigationLog.CurrentLocation.ParsingName != KnownFolders.Libraries.ParsingName)
Add comment 840 Minus   {
Add comment 841 Minus   ctgLibraries.Visibility = System.Windows.Visibility.Visible;
Add comment 842 Minus   ctgFolderTools.Visibility = System.Windows.Visibility.Collapsed;
Add comment 843 Minus   ctgImage.Visibility = System.Windows.Visibility.Collapsed;
Add comment 844 Minus   ctgArchive.Visibility = System.Windows.Visibility.Collapsed;
Add comment 845 Minus   ctgExe.Visibility = System.Windows.Visibility.Collapsed;
Add comment 846 Minus   inLibrary = true;
Add comment 838 Plus   // if (Explorer.NavigationLog.CurrentLocation.ParsingName.Contains(KnownFolders.Libraries.ParsingName) &&
Add comment 839 Plus   // Explorer.NavigationLog.CurrentLocation.ParsingName != KnownFolders.Libraries.ParsingName)
Add comment 840 Plus   // {
Add comment 841 Plus   // ctgLibraries.Visibility = System.Windows.Visibility.Visible;
Add comment 842 Plus   // ctgFolderTools.Visibility = System.Windows.Visibility.Collapsed;
Add comment 843 Plus   // ctgImage.Visibility = System.Windows.Visibility.Collapsed;
Add comment 844 Plus   // ctgArchive.Visibility = System.Windows.Visibility.Collapsed;
Add comment 845 Plus   // ctgExe.Visibility = System.Windows.Visibility.Collapsed;
Add comment 846 Plus   // inLibrary = true;
Add comment 847
Add comment 848 Minus   //MessageBox.Show("In Library");
Add comment 849 Minus   try
Add comment 850 Minus   {
Add comment 851 Minus   ShellLibrary lib =
Add comment 852 Minus   ShellLibrary.Load(Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default), false);
Add comment 853 Minus   IsFromSelectionOrNavigation = true;
Add comment 854 Minus   chkPinNav.IsChecked = lib.IsPinnedToNavigationPane;
Add comment 855 Minus   IsFromSelectionOrNavigation = false;
Add comment 856 Minus   foreach (ShellObject item in lib)
Add comment 857 Minus   {
Add comment 858 Minus   MenuItem miItem = new MenuItem();
Add comment 859 Minus   miItem.Header = item.GetDisplayName(DisplayNameType.Default);
Add comment 860 Minus   miItem.Tag = item;
Add comment 861 Minus   item.Thumbnail.FormatOption = ShellThumbnailFormatOption.IconOnly;
Add comment 862 Minus   item.Thumbnail.CurrentSize = new System.Windows.Size(16, 16);
Add comment 863 Minus   miItem.Icon = item.Thumbnail.BitmapSource;
Add comment 864 Minus   miItem.GroupName = "GRDS1";
Add comment 865 Minus   miItem.IsCheckable = true;
Add comment 866 Minus   miItem.IsChecked = (item.ParsingName == lib.DefaultSaveFolder);
Add comment 867 Minus   miItem.Click += new RoutedEventHandler(miItem_Click);
Add comment 868 Minus   btnDefSave.Items.Add(miItem);
Add comment 869 Minus   }
Add comment 848 Plus   // //MessageBox.Show("In Library");
Add comment 849 Plus   // try
Add comment 850 Plus   // {
Add comment 851 Plus   // ShellLibrary lib =
Add comment 852 Plus   // ShellLibrary.Load(Explorer.NavigationLog.CurrentLocation.GetDisplayName(DisplayNameType.Default), false);
Add comment 853 Plus   // IsFromSelectionOrNavigation = true;
Add comment 854 Plus   // chkPinNav.IsChecked = lib.IsPinnedToNavigationPane;
Add comment 855 Plus   // IsFromSelectionOrNavigation = false;
Add comment 856 Plus   // foreach (ShellObject item in lib)
Add comment 857 Plus   // {
Add comment 858 Plus   // MenuItem miItem = new MenuItem();
Add comment 859 Plus   // miItem.Header = item.GetDisplayName(DisplayNameType.Default);
Add comment 860 Plus   // miItem.Tag = item;
Add comment 861 Plus   // item.Thumbnail.FormatOption = ShellThumbnailFormatOption.IconOnly;
Add comment 862 Plus   // item.Thumbnail.CurrentSize = new System.Windows.Size(16, 16);
Add comment 863 Plus   // miItem.Icon = item.Thumbnail.BitmapSource;
Add comment 864 Plus   // miItem.GroupName = "GRDS1";
Add comment 865 Plus   // miItem.IsCheckable = true;
Add comment 866 Plus   // miItem.IsChecked = (item.ParsingName == lib.DefaultSaveFolder);
Add comment 867 Plus   // miItem.Click += new RoutedEventHandler(miItem_Click);
Add comment 868 Plus   // btnDefSave.Items.Add(miItem);
Add comment 869 Plus   // }
Add comment 870
Add comment 871 Minus   btnDefSave.IsEnabled = !(lib.Count == 0);
Add comment 872 Minus   lib.Close();
Add comment 873 Minus   }
Add comment 874 Minus   catch
Add comment 875 Minus   {
Add comment 871 Plus   // btnDefSave.IsEnabled = !(lib.Count == 0);
Add comment 872 Plus   // lib.Close();
Add comment 873 Plus   // }
Add comment 874 Plus   // catch
Add comment 875 Plus   // {
Add comment 876
Add comment 877 Minus   }
Add comment 878 Minus   }
Add comment 879 Minus   else
Add comment 880 Minus   {
Add comment 881 Minus   if (!Explorer.NavigationLog.CurrentLocation.ParsingName.ToLowerInvariant().EndsWith("library-ms"))
Add comment 882 Minus   {
Add comment 883 Minus   btnDefSave.Items.Clear();
Add comment 884 Minus   ctgLibraries.Visibility = System.Windows.Visibility.Collapsed;
Add comment 885 Minus   inLibrary = false;
Add comment 886 Minus   }
Add comment 887 Minus   //MessageBox.Show("Not in Library");
Add comment 888 Minus   }
Add comment 889 Minus   if (Explorer.NavigationLog.CurrentLocation.IsDrive)
Add comment 890 Minus   {
Add comment 891 Minus   ctgDrive.Visibility = System.Windows.Visibility.Visible;
Add comment 892 Minus   inDrive = true;
Add comment 893 Minus   //MessageBox.Show("In Drive");
Add comment 894 Minus   }
Add comment 895 Minus   else
Add comment 896 Minus   {
Add comment 897 Minus   ctgDrive.Visibility = System.Windows.Visibility.Collapsed;
Add comment 898 Minus   inDrive = false;
Add comment 899 Minus   //MessageBox.Show("Not In Drive");
Add comment 900 Minus   }
Add comment 901 Minus   if (isinLibraries)
Add comment 902 Minus   {
Add comment 903 Minus   ctgFolderTools.Visibility = Visibility.Collapsed;
Add comment 904 Minus   }
Add comment 877 Plus   // }
Add comment 878 Plus   // }
Add comment 879 Plus   // else
Add comment 880 Plus   // {
Add comment 881 Plus   // if (!Explorer.NavigationLog.CurrentLocation.ParsingName.ToLowerInvariant().EndsWith("library-ms"))
Add comment 882 Plus   // {
Add comment 883 Plus   // btnDefSave.Items.Clear();
Add comment 884 Plus   // ctgLibraries.Visibility = System.Windows.Visibility.Collapsed;
Add comment 885 Plus   // inLibrary = false;
Add comment 886 Plus   // }
Add comment 887 Plus   // //MessageBox.Show("Not in Library");
Add comment 888 Plus   // }
Add comment 889 Plus   // if (Explorer.NavigationLog.CurrentLocation.IsDrive)
Add comment 890 Plus   // {
Add comment 891 Plus   // ctgDrive.Visibility = System.Windows.Visibility.Visible;
Add comment 892 Plus   // inDrive = true;
Add comment 893 Plus   // //MessageBox.Show("In Drive");
Add comment 894 Plus   // }
Add comment 895 Plus   // else
Add comment 896 Plus   // {
Add comment 897 Plus   // ctgDrive.Visibility = System.Windows.Visibility.Collapsed;
Add comment 898 Plus   // inDrive = false;
Add comment 899 Plus   // //MessageBox.Show("Not In Drive");
Add comment 900 Plus   // }
Add comment 901 Plus   // if (isinLibraries)
Add comment 902 Plus   // {
Add comment 903 Plus   // ctgFolderTools.Visibility = Visibility.Collapsed;
Add comment 904 Plus   // }
Add comment 905
Add comment 906 }
Add comment 907 ));
Add comment 911 }
Add comment 912 catch (Exception exe)
Add comment 913 {
Add comment 914 Minus   ShellObject ne = e.NewLocation;
Add comment 915 Minus   bool isinLibraries = false;
Add comment 916 Minus   bool itisLibraries = false;
Add comment 914 Plus   // ShellObject ne = e.NewLocation;
Add comment 915 Plus   // bool isinLibraries = false;
Add comment 916 Plus   // bool itisLibraries = false;
Add comment 917
Add comment 918 Minus   if (ne.Parent.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 919 Minus   {
Add comment 920 Minus   isinLibraries = true;
Add comment 921 Minus   }
Add comment 922 Minus   else
Add comment 923 Minus   {
Add comment 924 Minus   isinLibraries = false;
Add comment 925 Minus   }
Add comment 918 Plus   // if (ne.Parent.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 919 Plus   // {
Add comment 920 Plus   // isinLibraries = true;
Add comment 921 Plus   // }
Add comment 922 Plus   // else
Add comment 923 Plus   // {
Add comment 924 Plus   // isinLibraries = false;
Add comment 925 Plus   // }
Add comment 926
Add comment 927 Minus   if (ne.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 928 Minus   {
Add comment 929 Minus   itisLibraries = true;
Add comment 930 Minus   }
Add comment 931 Minus   else
Add comment 932 Minus   {
Add comment 933 Minus   itisLibraries = false;
Add comment 934 Minus   }
Add comment 927 Plus   // if (ne.ParsingName == KnownFolders.Libraries.ParsingName)
Add comment 928 Plus   // {
Add comment 929 Plus   // itisLibraries = true;
Add comment 930 Plus   // }
Add comment 931 Plus   // else
Add comment 932 Plus   // {
Add comment 933 Plus   // itisLibraries = false;
Add comment 934 Plus   // }
Add comment 935
Add comment 936 Minus   //if (MessageBox.Show("An error occurred while loading a folder. Please report this issue at http://bexplorer.codeplex.com/. \r\n\r\nHere is some information about the folder being loaded:\r\n\r\nName: " + ne.GetDisplayName(DisplayNameType.Default) + "\r\nLocation: " + ne.ParsingName +
Add comment 937 Minus   // "\r\n\r\nFolder, Drive, or Library: " + GetYesNoFromBoolean(ne.IsFolder) + "\r\nDrive: " + GetYesNoFromBoolean(ne.IsDrive) + "\r\nNetwork Drive: " + GetYesNoFromBoolean(ne.IsNetDrive) + "\r\nRemovable: " + GetYesNoFromBoolean(ne.IsRemovable) +
Add comment 938 Minus   // "\r\nSearch Folder: " + GetYesNoFromBoolean(ne.IsSearchFolder) + "\r\nShared: " + GetYesNoFromBoolean(ne.IsShared) + "\r\nShortcut: " + GetYesNoFromBoolean(ne.IsLink) + "\r\nLibrary: " + GetYesNoFromBoolean(isinLibraries) + "\r\nLibraries Folder: " + GetYesNoFromBoolean(itisLibraries) +
Add comment 939 Minus   // "\r\n\r\n Would you like to see additional information? Click No to try continuing the program.", "Error Occurred on Completing Navigation", MessageBoxButton.YesNo, MessageBoxImage.Error) == MessageBoxResult.Yes)
Add comment 940 Minus   //{
Add comment 941 Minus   // MessageBox.Show("An error occurred while loading a folder. Please report this issue at http://bexplorer.codeplex.com/. \r\n\r\nHere is additional information about the error: \r\n\r\n" + exe.Message + "\r\n\r\n" + exe.ToString(), "Additional Error Data", MessageBoxButton.OK, MessageBoxImage.Error);
Add comment 942 Minus   //}
Add comment 936 Plus   // //if (MessageBox.Show("An error occurred while loading a folder. Please report this issue at http://bexplorer.codeplex.com/. \r\n\r\nHere is some information about the folder being loaded:\r\n\r\nName: " + ne.GetDisplayName(DisplayNameType.Default) + "\r\nLocation: " + ne.ParsingName +
Add comment 937 Plus   // // "\r\n\r\nFolder, Drive, or Library: " + GetYesNoFromBoolean(ne.IsFolder) + "\r\nDrive: " + GetYesNoFromBoolean(ne.IsDrive) + "\r\nNetwork Drive: " + GetYesNoFromBoolean(ne.IsNetDrive) + "\r\nRemovable: " + GetYesNoFromBoolean(ne.IsRemovable) +
Add comment 938 Plus   // // "\r\nSearch Folder: " + GetYesNoFromBoolean(ne.IsSearchFolder) + "\r\nShared: " + GetYesNoFromBoolean(ne.IsShared) + "\r\nShortcut: " + GetYesNoFromBoolean(ne.IsLink) + "\r\nLibrary: " + GetYesNoFromBoolean(isinLibraries) + "\r\nLibraries Folder: " + GetYesNoFromBoolean(itisLibraries) +
Add comment 939 Plus   // // "\r\n\r\n Would you like to see additional information? Click No to try continuing the program.", "Error Occurred on Completing Navigation", MessageBoxButton.YesNo, MessageBoxImage.Error) == MessageBoxResult.Yes)
Add comment 940 Plus   // //{
Add comment 941 Plus   // // MessageBox.Show("An error occurred while loading a folder. Please report this issue at http://bexplorer.codeplex.com/. \r\n\r\nHere is additional information about the error: \r\n\r\n" + exe.Message + "\r\n\r\n" + exe.ToString(), "Additional Error Data", MessageBoxButton.OK, MessageBoxImage.Error);
Add comment 942 Plus   // //}
Add comment 943 }
Add comment 944
Add comment 945 Explorer.ExplorerSetFocus();
Add comment 1341 e.Cancel = IsCancel;
Add comment 1342 if (IsAfterRename)
filter16.png
/WpfControlLibrary1/Images/filter16.png
/WpfControlLibrary1/Images/filter16.png
filter32.png
/WpfControlLibrary1/Images/filter32.png
/WpfControlLibrary1/Images/filter32.png
filter48.png
/WpfControlLibrary1/Images/filter48.png
/WpfControlLibrary1/Images/filter48.png
search.png
/WpfControlLibrary1/Images/search.png
/WpfControlLibrary1/Images/search.png
search16.png
/WpfControlLibrary1/Images/search16.png
/WpfControlLibrary1/Images/search16.png
search32.png
/WpfControlLibrary1/Images/search32.png
/WpfControlLibrary1/Images/search32.png
search48.png
/WpfControlLibrary1/Images/search48.png
/WpfControlLibrary1/Images/search48.png
BetterExplorerControls.csproj
/WpfControlLibrary1/BetterExplorerControls.csproj
/WpfControlLibrary1/BetterExplorerControls.csproj