18 changed files
BExplorer/BetterExplorer | ||
FolderSizeWindow.xaml | ||
FolderSizeWindow.xaml.cs | ||
MainWindow.xaml | ||
MainWindow.xaml.cs | ||
Fluent.Ribbon-develop/Fluent.Ribbon/Themes | ||
Colors | ||
BaseDark.xaml | ||
BaseLight.xaml | ||
Styles.xaml | ||
Shell | ||
_Plugin Interfaces | ||
FileSystemListItem.cs | ||
Extensions.cs | ||
FilesystemTreeViewItem.cs + | ||
HandlingEventTrigger.cs + | ||
LeftMarginMultiplierConverter.cs + | ||
Shell.csproj | ||
ShellItem.cs | ||
ShellTreeView.xaml + | ||
ShellTreeView.xaml.cs + | ||
TreeViewHelper.cs + | ||
WpfControlLibrary1 | ||
AirspacePopup.cs | ||
FolderSizeWindow.xaml
/BExplorer/BetterExplorer/FolderSizeWindow.xaml-4+1/BExplorer/BetterExplorer/FolderSizeWindow.xaml
Add comment 27 </my:PieChartLayout.ColorSelector>
Add comment 28 </my:PieChartLayout>
Add comment 29 <ProgressBar Height="12" Name="progressBar1" VerticalAlignment="Bottom" />
Add comment 30 Minus <TextBlock HorizontalAlignment="Center" Name="textBlock1wfx" Text="Getting size of subfolders..." VerticalAlignment="Bottom" Margin="0,0,0,15" Foreground="{DynamicResource BlackBrush}">
Add comment 31 Minus <TextBlock.Effect><BlurEffect Radius="8.0" KernelType="Box"/></TextBlock.Effect>
Add comment 32 Minus </TextBlock>
Add comment 33 Minus <TextBlock HorizontalAlignment="Center" Name="textBlock1" Text="Getting size of subfolders..." Foreground="{DynamicResource BlackBrush}" VerticalAlignment="Bottom" Margin="0,0,0,15">
Add comment 30 Plus <TextBlock HorizontalAlignment="Center" Name="txtGettingSizes" Text="Getting size of subfolders..." Foreground="{DynamicResource BlackBrush}" VerticalAlignment="Bottom" Margin="0,0,0,15">
Add comment 34 31 </TextBlock>
Add comment 35 32 </Grid>
Add comment 36 33 </Ribbon:RibbonWindow>
FolderSizeWindow.xaml.cs
/BExplorer/BetterExplorer/FolderSizeWindow.xaml.cs-4+3/BExplorer/BetterExplorer/FolderSizeWindow.xaml.cs
Add comment 173 private void bgw_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
Add comment 174 progressBar1.Value = progressBar1.Maximum;
Add comment 175 progressBar1.Visibility = System.Windows.Visibility.Collapsed;
Add comment 176 Minus textBlock1.Visibility = System.Windows.Visibility.Collapsed;
Add comment 177 Minus textBlock1wfx.Visibility = System.Windows.Visibility.Collapsed;
Add comment 176 Plus txtGettingSizes.Visibility = System.Windows.Visibility.Collapsed;
Add comment 178 177 FInfo = new ObservableCollection<FolderSizeInfoClass>(FSI.Where(w => w.FSize > 0).OrderBy(o => o.FSize));
Add comment 179 178 this.DataContext = FInfo;
Add comment 180 179 }
Add comment 194 193 if (findHandle != INVALID_HANDLE_VALUE) {
Add comment 195 194 do {
Add comment 196 195 if (bgw.CancellationPending) {
Add comment 197 Minus this.bgw_RunWorkerCompleted(this.bgw, new RunWorkerCompletedEventArgs(null,null,true));
Add comment 196 Plus this.bgw_RunWorkerCompleted(this.bgw, new RunWorkerCompletedEventArgs(null, null, true));
Add comment 198 197 break;
Add comment 199 198 }
Add comment 200 199
Add comment 278 277 GC.Collect();
Add comment 279 278 //GC.WaitForPendingFinalizers();
Add comment 280 279 Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Normal,
Add comment 281 Minus (Action) (() => { this.bgw_RunWorkerCompleted(this.bgw, new RunWorkerCompletedEventArgs(null, null, true)); }));
Add comment 280 Plus (Action)(() => { this.bgw_RunWorkerCompleted(this.bgw, new RunWorkerCompletedEventArgs(null, null, true)); }));
Add comment 282 281 if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
Add comment 283 282 BExplorer.Shell.Interop.Shell32.SetProcessWorkingSetSize(System.Diagnostics.Process.GetCurrentProcess().Handle, -1, -1);
Add comment 284 283 }
MainWindow.xaml
/BExplorer/BetterExplorer/MainWindow.xaml-6+2/BExplorer/BetterExplorer/MainWindow.xaml
Add comment 4166 <ColumnDefinition Width="2" />
Add comment 4167 <ColumnDefinition Width="*" />
Add comment 4168 </Grid.ColumnDefinitions>
Add comment 4169 Minus <Helper:NoFlickerWindowsFormsHost
Add comment 4170 Minus x:Name="ShellTreeHost"
Add comment 4171 Minus Grid.Column="0"
Add comment 4172 Minus Background="{DynamicResource WhiteBrush}"
Add comment 4173 Minus SizeChanged="ShellTreeHost_SizeChanged" />
Add comment 4169 Plus <shell:ShellTreeView x:Name="stvTreeView"></shell:ShellTreeView>
Add comment 4174 4170 <GridSplitter
Add comment 4175 4171 x:Name="TreeSplitter"
Add comment 4176 4172 Grid.Column="1"
Add comment 4177 4173 Width="2"
Add comment 4178 4174 HorizontalAlignment="Center"
Add comment 4179 4175 VerticalAlignment="Stretch"
Add comment 4180 Minus Background="LightGray" />
Add comment 4176 Plus Background="{DynamicResource Fluent.Ribbon.Brushes.RibbonTabControl.Content.Background}" />
Add comment 4181 4177 <Grid Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
Add comment 4182 4178 <Grid.ColumnDefinitions>
Add comment 4183 4179 <ColumnDefinition Width="*"/>
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-2+2/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 1652 this.grdItemTextColor.ItemsSource = this.LVItemsColorCol;
Add comment 1653 this._keyjumpTimer.Interval = 1000;
Add comment 1654 this._keyjumpTimer.Tick += this._keyjumpTimer_Tick;
Add comment 1655 Minus this.ShellTreeHost.Child = this.ShellTree;
Add comment 1655 Plus //this.ShellTreeHost.Child = this.ShellTree;
Add comment 1656 this.ShellViewHost.Child = this._ShellListView;
Add comment 1657
Add comment 1658 Minus this.ShellTree.ShellListView = this._ShellListView;
Add comment 1658 Plus this.stvTreeView.ShellListView = this._ShellListView;
Add comment 1659 //this.ctrlConsole.ShellListView = this._ShellListView;
Add comment 1660 this.autoUpdater.UpdateAvailable += this.AutoUpdater_UpdateAvailable;
Add comment 1661 this.updateCheckTimer.Interval = 10000;//3600000 * 3;
BaseDark.xaml
/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Colors/BaseDark.xaml+6/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Colors/BaseDark.xaml
Add comment 24 <Color x:Key="Gray8">#FF454545</Color>
Add comment 25 <Color x:Key="Gray9">#5EC9C9C9</Color>
Add comment 26 <Color x:Key="Gray10">#FF2F2F2F</Color>
Add comment 27 Plus <Color x:Key="Gray11">#171717</Color>
Add comment 27 28
Add comment 28 29 <Color x:Key="TransparentWhiteColor">#00FFFFFF</Color>
Add comment 29 30 <Color x:Key="Fluent.Ribbon.Colors.HighTransparentWhiteColor">#17FFFFFF</Color>
Add comment 83 84 Color="{StaticResource Gray10}" />
Add comment 84 85
Add comment 85 86 <SolidColorBrush
Add comment 87 Plus x:Key="GrayBrush11"
Add comment 88 Plus options:Freeze="True"
Add comment 89 Plus Color="{StaticResource Gray11}" />
Add comment 90 Plus
Add comment 91 Plus <SolidColorBrush
Add comment 86 92 x:Key="TransparentWhiteBrush"
Add comment 87 93 options:Freeze="True"
Add comment 88 94 Color="{StaticResource TransparentWhiteColor}" />
BaseLight.xaml
/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Colors/BaseLight.xaml+5/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Colors/BaseLight.xaml
Add comment 24 <Color x:Key="Gray8">#FFE0E0E0</Color>
Add comment 25 <Color x:Key="Gray9">#5EC9C9C9</Color>
Add comment 26 <Color x:Key="Gray10">#FFF7F7F7</Color>
Add comment 27 Plus <Color x:Key="Gray11">#FFF7F7F7</Color>
Add comment 27 28
Add comment 28 29 <Color x:Key="TransparentWhiteColor">#00FFFFFF</Color>
Add comment 29 30 <Color x:Key="Fluent.Ribbon.Colors.HighTransparentWhiteColor">#17FFFFFF</Color>
Add comment 81 82 x:Key="GrayBrush10"
Add comment 82 83 options:Freeze="True"
Add comment 83 84 Color="{StaticResource Gray10}" />
Add comment 85 Plus <SolidColorBrush
Add comment 86 Plus x:Key="GrayBrush11"
Add comment 87 Plus options:Freeze="True"
Add comment 88 Plus Color="{StaticResource Gray11}" />
Add comment 84 89
Add comment 85 90 <SolidColorBrush
Add comment 86 91 x:Key="TransparentWhiteBrush"
Styles.xaml
/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Styles.xaml/Fluent.Ribbon-develop/Fluent.Ribbon/Themes/Styles.xaml
FileSystemListItem.cs
/Shell/_Plugin Interfaces/FileSystemListItem.cs/Shell/_Plugin Interfaces/FileSystemListItem.cs
LeftMarginMultiplierConverter.cs
/Shell/LeftMarginMultiplierConverter.cs/Shell/LeftMarginMultiplierConverter.cs