- fixed wrong column sorting...
e94656b3
Dimitar Tsenev
committed
10 changed files
AssemblyInfo.cs
/BExplorer/BetterExplorer/Properties/AssemblyInfo.cs-5+5
/BExplorer/BetterExplorer/Properties/AssemblyInfo.cs
Add comment 11 [assembly: AssemblyDescription("A better file manager.")]
Add comment 12 [assembly: AssemblyConfiguration("")]
Add comment 13 [assembly: AssemblyCompany("Dimitar Tsenev / Jayke R. Huempfner")]
Add comment 14 Minus  [assembly: AssemblyProduct("Better Explorer 2.5 Alpha 2")]
Add comment 15 Minus  [assembly: AssemblyCopyright("Copyright © 2012-2013 Dimitar Tsenev and Jayke R. Huempfner")]
Add comment 14 Plus  [assembly: AssemblyProduct("Better Explorer 2.5 Beta 1")]
Add comment 15 Plus  [assembly: AssemblyCopyright("Copyright © 2012-2015 Dimitar Tsenev and Jayke R. Huempfner")]
Add comment 16 [assembly: AssemblyTrademark("")]
Add comment 17 [assembly: AssemblyCulture("")]
Add comment 18
Add comment 51 // You can specify all the values or you can default the Build and Revision Numbers
Add comment 52 // by using the '*' as shown below:
Add comment 53 // [assembly: AssemblyVersion("1.0.*")]
Add comment 54 Minus  [assembly: AssemblyVersion("2.5.0.33052")]
Add comment 55 Minus  [assembly: AssemblyFileVersion("2.5.0.33052")]
Add comment 56 Minus  [assembly: AssemblyInformationalVersion("2.5.0.140510.22052 Alpha 2")]
Add comment 54 Plus  [assembly: AssemblyVersion("2.5.0.55149")]
Add comment 55 Plus  [assembly: AssemblyFileVersion("2.5.0.55149")]
Add comment 56 Plus  [assembly: AssemblyInformationalVersion("2.5.0.150114.55149 Beta 1")]
Add comment 57
MainWindow.xaml
/BExplorer/BetterExplorer/MainWindow.xaml+5
/BExplorer/BetterExplorer/MainWindow.xaml
Add comment 342 FontSize="14"
Add comment 343 FontStyle="Italic"
Add comment 344 FontWeight="Bold" />
Add comment 345 Plus   <Label Margin="20,0,40,0"
Add comment 346 Plus   Content="Aaron Kampf"
Add comment 347 Plus   FontSize="14"
Add comment 348 Plus   FontStyle="Italic"
Add comment 349 Plus   FontWeight="Bold" />
Add comment 345 350 <!--<Label Margin="20,0,40,0"
Add comment 346 351 Content="Alexey Barkalov"
Add comment 347 352 FontSize="14"
MainWindow.xaml.cs
/BExplorer/BetterExplorer/MainWindow.xaml.cs-5+8
/BExplorer/BetterExplorer/MainWindow.xaml.cs
Add comment 275
Add comment 276 try {
Add comment 277 foreach (Collumns item in ShellListView.Collumns.Where(x => x != null)) {
Add comment 278 Minus   var IsChecked1 = (item.pkey.fmtid == ShellListView.Collumns[ShellListView.LastSortedColumnIndex].pkey.fmtid) && (item.pkey.pid == ShellListView.Collumns[ShellListView.LastSortedColumnIndex].pkey.pid);
Add comment 278 Plus   var lastSortedColumn = ShellListView.Collumns.Where(w => w.ID == this.ShellListView.LastSortedColumnId).SingleOrDefault();
Add comment 279 Plus   if (lastSortedColumn != null) {
Add comment 280 Plus   var IsChecked1 = (item.pkey.fmtid == lastSortedColumn.pkey.fmtid) && (item.pkey.pid == lastSortedColumn.pkey.pid);
Add comment 279 281 btnSort.Items.Add(Utilities.Build_MenuItem(item.Name, item, checkable: true, isChecked: IsChecked1, GroupName: "GR2", onClick: mi_Click));
Add comment 282 Plus   }
Add comment 280 283 var IsCheckable2 = ShellListView.LastGroupCollumn != null && (item.pkey.fmtid == ShellListView.LastGroupCollumn.pkey.fmtid) && (item.pkey.pid == ShellListView.LastGroupCollumn.pkey.pid);
Add comment 281 284 btnGroup.Items.Add(Utilities.Build_MenuItem(item.Name, item, checkable: true, isChecked: IsCheckable2, GroupName: "GR3", onClick: mig_Click));
Add comment 282 285 }
Add comment 359 362
Add comment 360 363 void misd_Click(object sender, RoutedEventArgs e) {
Add comment 361 364 foreach (var item in btnSort.Items.OfType<MenuItem>().Where(item => item.IsChecked && item != (sender as MenuItem))) {
Add comment 362 Minus   ShellListView.SetSortCollumn(ShellListView.Collumns.IndexOf((Collumns)item.Tag), WIN.Forms.SortOrder.Descending);
Add comment 365 Plus   ShellListView.SetSortCollumn((Collumns)item.Tag, WIN.Forms.SortOrder.Descending);
Add comment 363 366 }
Add comment 364 367 }
Add comment 365 368
Add comment 366 369 void misa_Click(object sender, RoutedEventArgs e) {
Add comment 367 370 foreach (var item in btnSort.Items.OfType<MenuItem>().Where(item => item.IsChecked && item != (sender as MenuItem))) {
Add comment 368 Minus   ShellListView.SetSortCollumn(ShellListView.Collumns.IndexOf((Collumns)item.Tag), WIN.Forms.SortOrder.Ascending);
Add comment 371 Plus   ShellListView.SetSortCollumn((Collumns)item.Tag, WIN.Forms.SortOrder.Ascending);
Add comment 369 372 }
Add comment 370 373 }
Add comment 371 374
Add comment 2193 2196 var ascitem = (MenuItem)parentButton.Items[parentButton.Items.IndexOf(misa)];
Add comment 2194 2197
Add comment 2195 2198 var Sort = ascitem.IsChecked ? WIN.Forms.SortOrder.Ascending : WIN.Forms.SortOrder.Descending;
Add comment 2196 Minus   ShellListView.SetSortCollumn(ShellListView.Collumns.IndexOf((Collumns)item.Tag), Sort);
Add comment 2199 Plus   ShellListView.SetSortCollumn((Collumns)item.Tag, Sort);
Add comment 2197 2200 }
Add comment 2198 2201
Add comment 2199 2202 void misng_Click(object sender, RoutedEventArgs e) {
Add comment 4691 4694 var button = sender as DropDownButton;
Add comment 4692 4695 foreach (MenuItem item in button.Items) {
Add comment 4693 4696 var column = item.Tag as Collumns;
Add comment 4694 Minus   if (column == this.ShellListView.Collumns[this.ShellListView.LastSortedColumnIndex]) {
Add comment 4697 Plus   if (column == this.ShellListView.Collumns.Where(w => w.ID == this.ShellListView.LastSortedColumnId).SingleOrDefault()) {
Add comment 4695 4698 item.IsChecked = true;
Add comment 4696 4699 break;
Add comment 4697 4700 }
FolderSettings.cs
/Shell/FolderSettings.cs
/Shell/FolderSettings.cs
MessageHandler.cs
/Shell/MessageHandler.cs
/Shell/MessageHandler.cs
ShellContextMenu.cs
/Shell/ShellContextMenu.cs
/Shell/ShellContextMenu.cs
ShellItem.cs
/Shell/ShellItem.cs
/Shell/ShellItem.cs
ShellLibrary.cs
/Shell/ShellLibrary.cs
/Shell/ShellLibrary.cs
ShellTreeViewEx.cs
/Shell/ShellTreeViewEx.cs
/Shell/ShellTreeViewEx.cs
ShellViewEx.cs
/Shell/ShellViewEx.cs
/Shell/ShellViewEx.cs