- several fixes
4edb674c
Dimitar Tsenev
committed
8 changed files
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-3+17
/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 3394 this.btnCancelNavigation.Visibility = Visibility.Visible;
Add comment 3395 this.btnGoNavigation.Visibility = Visibility.Collapsed;
Add comment 3396 this._ProgressTimer.Start();
Add comment 3397 Plus  
Add comment 3397 3398 }));
Add comment 3398 Minus   this.bcbc.SetPathWithoutNavigate(e.Folder.PIDL.ToString());
Add comment 3399 Plus  
Add comment 3400 Plus   if (this.bcbc.RootItem.Items.OfType<ShellItem>().Last().IsSearchFolder) {
Add comment 3401 Plus   this.bcbc.RootItem.Items.RemoveAt(this.bcbc.RootItem.Items.Count - 1);
Add comment 3402 Plus   }
Add comment 3403 Plus  
Add comment 3404 Plus   var pidl = e.Folder.PIDL.ToString();
Add comment 3405 Plus   this.bcbc.SetPathWithoutNavigate(pidl);
Add comment 3406 Plus  
Add comment 3399 3407 Dispatcher.Invoke(DispatcherPriority.Normal, (Action)(() => {
Add comment 3400 3408
Add comment 3401 3409 var tab = tcMain.SelectedItem as Wpf.Controls.TabItem;
Add comment 3410 3418 }));
Add comment 3411 3419
Add comment 3412 3420 if (e.Folder.IsSearchFolder) {
Add comment 3413 Minus   Dispatcher.Invoke(DispatcherPriority.Normal, (Action)(() => {
Add comment 3421 Plus   Dispatcher.Invoke(DispatcherPriority.Normal, (Action) (() => {
Add comment 3414 3422 var selectedTabItem = tcMain.SelectedItem as Wpf.Controls.TabItem;
Add comment 3415 3423 if (selectedTabItem != null) {
Add comment 3416 3424 selectedTabItem.Header = e.Folder.DisplayName;
Add comment 3417 Minus   selectedTabItem.Icon = e.Folder.ThumbnailSource(16, ShellThumbnailFormatOption.IconOnly, ShellThumbnailRetrievalOption.Default);
Add comment 3425 Plus   selectedTabItem.Icon = e.Folder.ThumbnailSource(16, ShellThumbnailFormatOption.IconOnly,
Add comment 3426 Plus   ShellThumbnailRetrievalOption.Default);
Add comment 3418 3427 selectedTabItem.ShellObject = e.Folder;
Add comment 3419 3428 selectedTabItem.ToolTip = e.Folder.ParsingName.Replace("%20", " ").Replace("%3A", ":").Replace("%5C", @"\");
Add comment 3420 3429 }
Add comment 3421 3430 }));
Add comment 3422 3431 }
Add comment 3432 Plus   else {
Add comment 3433 Plus   edtSearchBox.ClearSearchText();
Add comment 3434 Plus   }
Add comment 3435 Plus   this._ShellListView.Focus();
Add comment 3423 3436 }
Add comment 3424 3437
Add comment 3425 3438 void ShellTree_NodeClick(object sender, WIN.Forms.TreeNodeMouseClickEventArgs e) {
Add comment 3581 3594 this.bcbc.ProgressMaximum = 100;
Add comment 3582 3595 //this.bcbc.SetProgressValue(0, TimeSpan.FromSeconds(0));
Add comment 3583 3596 //}));
Add comment 3597 Plus  
Add comment 3584 3598 this._ShellListView.Focus();
Add comment 3585 3599 }
Add comment 3586 3600
BreadcrumbBar.cs
/BreadcrumbBar/BreadcrumbBar/BreadcrumbBar.cs
/BreadcrumbBar/BreadcrumbBar/BreadcrumbBar.cs
BreadcrumbButton.cs
/BreadcrumbBar/BreadcrumbBar/BreadcrumbButton.cs+1
/BreadcrumbBar/BreadcrumbBar/BreadcrumbButton.cs
Add comment 181 base.OnApplyTemplate();
Add comment 182 Dispatcher.BeginInvoke(DispatcherPriority.Background, (ThreadStart)(() => {
Add comment 183 var data = this.DataContext as ShellItem;
Add comment 184 Plus   if (data.DisplayName == "Search.search-ms") return;
Add comment 184 185 if (data != null && data.CachedParsingName != KnownFolders.Computer.ParsingName && data.CachedParsingName != KnownFolders.Desktop.ParsingName) {
Add comment 185 186 data = new ShellItem(data.CachedParsingName.ToShellParsingName());
Add comment 186 187 if (data.IsSearchFolder) return;
FileSystemListItem.cs
/Shell/_Plugin Interfaces/FileSystemListItem.cs
/Shell/_Plugin Interfaces/FileSystemListItem.cs
ShellThumbnail.cs
/Shell/Interop/ShellThumbnail.cs
/Shell/Interop/ShellThumbnail.cs
DefinitionOptions.cs
/Shell/KnownFolders/DefinitionOptions.cs
/Shell/KnownFolders/DefinitionOptions.cs
ShellViewEx.cs
/Shell/ShellViewEx.cs
/Shell/ShellViewEx.cs
SearchBox.xaml.cs
/WpfControlLibrary1/SearchBox.xaml.cs
/WpfControlLibrary1/SearchBox.xaml.cs