diff --git a/Helpers/WindowsExplorerSort.cs b/Helpers/WindowsExplorerSort.cs index d340eca..edbaf3c 100644 --- a/Helpers/WindowsExplorerSort.cs +++ b/Helpers/WindowsExplorerSort.cs @@ -5,12 +5,27 @@ namespace SystemTrayMenu.Helper { using System.Collections.Generic; + using System.IO; internal class WindowsExplorerSort : IComparer { public int Compare(string x, string y) { - return DllImports.NativeMethods.ShlwapiStrCmpLogicalW(x, y); + if (Properties.Settings.Default.SortFolderAndFilesByDate) + { + if (new FileInfo(x).LastWriteTime > new FileInfo(y).LastWriteTime) + { + return -1; + } + else + { + return 1; + } + } + else + { + return DllImports.NativeMethods.ShlwapiStrCmpLogicalW(x, y); + } } } } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 93239c1..82b351d 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.9.1")] -[assembly: AssemblyFileVersion("1.2.9.1")] +[assembly: AssemblyVersion("1.2.9.2")] +[assembly: AssemblyFileVersion("1.2.9.2")] diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index d6020e8..491cd86 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -299,6 +299,22 @@ namespace SystemTrayMenu.Properties } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SortFolderAndFilesByDate + { + get + { + return ((bool)(this["SortFolderAndFilesByDate"])); + } + set + { + this["SortFolderAndFilesByDate"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/Resources/Languages/lang.Designer.cs b/Resources/Languages/lang.Designer.cs index 2a2e37a..84129bb 100644 --- a/Resources/Languages/lang.Designer.cs +++ b/Resources/Languages/lang.Designer.cs @@ -249,6 +249,24 @@ namespace SystemTrayMenu.Resources.Languages { } } + /// + /// Looks up a localized string similar to By date. + /// + internal static string By_date { + get { + return ResourceManager.GetString("By date", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to By name. + /// + internal static string By_name { + get { + return ResourceManager.GetString("By name", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cache. /// @@ -997,6 +1015,15 @@ namespace SystemTrayMenu.Resources.Languages { } } + /// + /// Looks up a localized string similar to Sorting. + /// + internal static string Sorting { + get { + return ResourceManager.GetString("Sorting", resourceCulture); + } + } + /// /// Looks up a localized string similar to Stays open. /// diff --git a/Resources/Languages/lang.cs-CZ.resx b/Resources/Languages/lang.cs-CZ.resx index b4d7107..c306d0b 100644 --- a/Resources/Languages/lang.cs-CZ.resx +++ b/Resources/Languages/lang.cs-CZ.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 O @@ -468,4 +468,13 @@ Odeslat klávesovou zkratku do jiné instance + + Podle data + + + Podle jména + + + Řazení + \ No newline at end of file diff --git a/Resources/Languages/lang.de-DE.resx b/Resources/Languages/lang.de-DE.resx index 0b8281a..cee233c 100644 --- a/Resources/Languages/lang.de-DE.resx +++ b/Resources/Languages/lang.de-DE.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Über @@ -468,4 +468,13 @@ Hotkey an andere Instanz senden + + Nach Datum + + + Nach Name + + + Sortierung + \ No newline at end of file diff --git a/Resources/Languages/lang.es-ES.resx b/Resources/Languages/lang.es-ES.resx index 838ff8d..4202c7d 100644 --- a/Resources/Languages/lang.es-ES.resx +++ b/Resources/Languages/lang.es-ES.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Acerca de @@ -468,4 +468,13 @@ Enviar tecla de acceso directo a otra instancia + + Por fecha + + + Por nombre + + + Clasificación + \ No newline at end of file diff --git a/Resources/Languages/lang.fa-IR.resx b/Resources/Languages/lang.fa-IR.resx index fc800f8..2c8c77c 100644 --- a/Resources/Languages/lang.fa-IR.resx +++ b/Resources/Languages/lang.fa-IR.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 در باره @@ -468,4 +468,13 @@ کلید میانبر را به نمونه دیگر ارسال کنید + + بر اساس تاریخ + + + بر اساس اسم + + + مرتب سازی + \ No newline at end of file diff --git a/Resources/Languages/lang.fr-FR.resx b/Resources/Languages/lang.fr-FR.resx index 8a4fbcd..cc58614 100644 --- a/Resources/Languages/lang.fr-FR.resx +++ b/Resources/Languages/lang.fr-FR.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Au sujet de @@ -468,4 +468,13 @@ Envoyer le raccourci vers une autre instance + + Par date + + + De nom + + + Tri + \ No newline at end of file diff --git a/Resources/Languages/lang.it-IT.resx b/Resources/Languages/lang.it-IT.resx index c43ae4a..e1aa3f8 100644 --- a/Resources/Languages/lang.it-IT.resx +++ b/Resources/Languages/lang.it-IT.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Di @@ -468,4 +468,13 @@ Invia tasto di scelta rapida ad un'altra istanza + + Per data + + + Per nome + + + Ordinamento + \ No newline at end of file diff --git a/Resources/Languages/lang.ja-JP.resx b/Resources/Languages/lang.ja-JP.resx index c458062..0d53690 100644 --- a/Resources/Languages/lang.ja-JP.resx +++ b/Resources/Languages/lang.ja-JP.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 約 @@ -468,4 +468,13 @@ ホットキーを他のインスタンスに送信する + + 日付別 + + + 名前で + + + 並べ替え + \ No newline at end of file diff --git a/Resources/Languages/lang.ko-KR.resx b/Resources/Languages/lang.ko-KR.resx index 59be181..09e2661 100644 --- a/Resources/Languages/lang.ko-KR.resx +++ b/Resources/Languages/lang.ko-KR.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 약 @@ -468,4 +468,13 @@ 다른 인스턴스로 단축키 보내기 + + 날짜별 + + + 이름으로 + + + 정렬 + \ No newline at end of file diff --git a/Resources/Languages/lang.nl-NL.resx b/Resources/Languages/lang.nl-NL.resx index 81df167..c8b7f1b 100644 --- a/Resources/Languages/lang.nl-NL.resx +++ b/Resources/Languages/lang.nl-NL.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Over @@ -468,4 +468,13 @@ Sneltoets naar andere instantie verzenden + + Op datum + + + Bij naam + + + Sorteren + \ No newline at end of file diff --git a/Resources/Languages/lang.pt-BR.resx b/Resources/Languages/lang.pt-BR.resx index 582ff9f..da7c671 100644 --- a/Resources/Languages/lang.pt-BR.resx +++ b/Resources/Languages/lang.pt-BR.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Sobre @@ -468,4 +468,13 @@ Enviar tecla de atalho para outra instância + + Por data + + + Por nome + + + Ordenação + \ No newline at end of file diff --git a/Resources/Languages/lang.resx b/Resources/Languages/lang.resx index f06bb3e..8b96cd5 100644 --- a/Resources/Languages/lang.resx +++ b/Resources/Languages/lang.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 About @@ -468,4 +468,13 @@ Send hotkey to other instance + + By date + + + By name + + + Sorting + \ No newline at end of file diff --git a/Resources/Languages/lang.ru-RU.resx b/Resources/Languages/lang.ru-RU.resx index 6b51ade..aef543f 100644 --- a/Resources/Languages/lang.ru-RU.resx +++ b/Resources/Languages/lang.ru-RU.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 О программе @@ -468,4 +468,13 @@ Отправить горячую клавишу в другой экземпляр + + По дате + + + По имени + + + Сортировка + \ No newline at end of file diff --git a/Resources/Languages/lang.tr-TR.resx b/Resources/Languages/lang.tr-TR.resx index 44d59b2..55605ed 100644 --- a/Resources/Languages/lang.tr-TR.resx +++ b/Resources/Languages/lang.tr-TR.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Hakkında @@ -468,4 +468,13 @@ Başka bir örneğe kısayol tuşu gönder + + Tarihe göre + + + İsimle + + + Sıralama + \ No newline at end of file diff --git a/Resources/Languages/lang.vi-VN.resx b/Resources/Languages/lang.vi-VN.resx index 7bfaad4..fb0dc02 100644 --- a/Resources/Languages/lang.vi-VN.resx +++ b/Resources/Languages/lang.vi-VN.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Trong khoảng @@ -468,4 +468,13 @@ Gửi phím nóng đến phiên bản khác + + Theo ngày + + + Bằng tên + + + Sắp xếp + \ No newline at end of file diff --git a/Resources/Languages/lang.zh-CN.resx b/Resources/Languages/lang.zh-CN.resx index 5777c6e..7f9ee32 100644 --- a/Resources/Languages/lang.zh-CN.resx +++ b/Resources/Languages/lang.zh-CN.resx @@ -112,10 +112,10 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 关于 @@ -468,4 +468,13 @@ 向其他實例發送熱鍵 + + 按日期 + + + 按名字 + + + 排序 + \ No newline at end of file diff --git a/UserInterface/SettingsForm.Designer.cs b/UserInterface/SettingsForm.Designer.cs index 67f6a44..ccb1366 100644 --- a/UserInterface/SettingsForm.Designer.cs +++ b/UserInterface/SettingsForm.Designer.cs @@ -95,8 +95,12 @@ namespace SystemTrayMenu.UserInterface this.labelMaxMenuWidth = new System.Windows.Forms.Label(); this.tabPageAdvanced = new System.Windows.Forms.TabPage(); this.tableLayoutPanelAdvanced = new System.Windows.Forms.TableLayoutPanel(); + this.groupBoxSorting = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.radioButtonSortByDate = new System.Windows.Forms.RadioButton(); + this.radioButtonSortByName = new System.Windows.Forms.RadioButton(); this.groupBoxHiddenFilesAndFolders = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanelHiddenFilesAndFolders = new System.Windows.Forms.TableLayoutPanel(); this.radioButtonAlwaysShowHiddenFiles = new System.Windows.Forms.RadioButton(); this.radioButtonNeverShowHiddenFiles = new System.Windows.Forms.RadioButton(); this.radioButtonSystemSettingsShowHiddenFiles = new System.Windows.Forms.RadioButton(); @@ -351,8 +355,10 @@ namespace SystemTrayMenu.UserInterface ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMenuWidth)).BeginInit(); this.tabPageAdvanced.SuspendLayout(); this.tableLayoutPanelAdvanced.SuspendLayout(); + this.groupBoxSorting.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); this.groupBoxHiddenFilesAndFolders.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanelHiddenFilesAndFolders.SuspendLayout(); this.groupBoxClick.SuspendLayout(); this.tableLayoutPanelClick.SuspendLayout(); this.tabPageFolders.SuspendLayout(); @@ -1368,24 +1374,81 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelAdvanced.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.tableLayoutPanelAdvanced.ColumnCount = 1; this.tableLayoutPanelAdvanced.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelAdvanced.Controls.Add(this.groupBoxSorting, 0, 2); this.tableLayoutPanelAdvanced.Controls.Add(this.groupBoxHiddenFilesAndFolders, 0, 1); this.tableLayoutPanelAdvanced.Controls.Add(this.groupBoxClick, 0, 0); - this.tableLayoutPanelAdvanced.Controls.Add(this.buttonAdvancedDefault, 0, 2); + this.tableLayoutPanelAdvanced.Controls.Add(this.buttonAdvancedDefault, 0, 3); this.tableLayoutPanelAdvanced.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelAdvanced.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanelAdvanced.Name = "tableLayoutPanelAdvanced"; - this.tableLayoutPanelAdvanced.RowCount = 3; + this.tableLayoutPanelAdvanced.RowCount = 4; this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanelAdvanced.Size = new System.Drawing.Size(408, 407); this.tableLayoutPanelAdvanced.TabIndex = 0; // + // groupBoxSorting + // + this.groupBoxSorting.AutoSize = true; + this.groupBoxSorting.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.groupBoxSorting.Controls.Add(this.tableLayoutPanel5); + this.groupBoxSorting.Location = new System.Drawing.Point(3, 234); + this.groupBoxSorting.MaximumSize = new System.Drawing.Size(400, 0); + this.groupBoxSorting.MinimumSize = new System.Drawing.Size(400, 0); + this.groupBoxSorting.Name = "groupBoxSorting"; + this.groupBoxSorting.Size = new System.Drawing.Size(400, 72); + this.groupBoxSorting.TabIndex = 3; + this.groupBoxSorting.TabStop = false; + this.groupBoxSorting.Text = "groupBoxSorting"; + // + // tableLayoutPanel5 + // + this.tableLayoutPanel5.AutoSize = true; + this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel5.ColumnCount = 1; + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel5.Controls.Add(this.radioButtonSortByDate, 0, 1); + this.tableLayoutPanel5.Controls.Add(this.radioButtonSortByName, 0, 0); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 19); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + this.tableLayoutPanel5.RowCount = 2; + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.Size = new System.Drawing.Size(394, 50); + this.tableLayoutPanel5.TabIndex = 1; + // + // radioButtonSortByDate + // + this.radioButtonSortByDate.AutoSize = true; + this.radioButtonSortByDate.Dock = System.Windows.Forms.DockStyle.Fill; + this.radioButtonSortByDate.Location = new System.Drawing.Point(3, 28); + this.radioButtonSortByDate.Name = "radioButtonSortByDate"; + this.radioButtonSortByDate.Size = new System.Drawing.Size(388, 19); + this.radioButtonSortByDate.TabIndex = 1; + this.radioButtonSortByDate.TabStop = true; + this.radioButtonSortByDate.Text = "radioButtonSortByDate"; + this.radioButtonSortByDate.UseVisualStyleBackColor = true; + // + // radioButtonSortByName + // + this.radioButtonSortByName.AutoSize = true; + this.radioButtonSortByName.Dock = System.Windows.Forms.DockStyle.Fill; + this.radioButtonSortByName.Location = new System.Drawing.Point(3, 3); + this.radioButtonSortByName.Name = "radioButtonSortByName"; + this.radioButtonSortByName.Size = new System.Drawing.Size(388, 19); + this.radioButtonSortByName.TabIndex = 2; + this.radioButtonSortByName.TabStop = true; + this.radioButtonSortByName.Text = "radioButtonSortByName"; + this.radioButtonSortByName.UseVisualStyleBackColor = true; + // // groupBoxHiddenFilesAndFolders // this.groupBoxHiddenFilesAndFolders.AutoSize = true; this.groupBoxHiddenFilesAndFolders.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.groupBoxHiddenFilesAndFolders.Controls.Add(this.tableLayoutPanel1); + this.groupBoxHiddenFilesAndFolders.Controls.Add(this.tableLayoutPanelHiddenFilesAndFolders); this.groupBoxHiddenFilesAndFolders.Location = new System.Drawing.Point(3, 131); this.groupBoxHiddenFilesAndFolders.MaximumSize = new System.Drawing.Size(400, 0); this.groupBoxHiddenFilesAndFolders.MinimumSize = new System.Drawing.Size(400, 0); @@ -1395,24 +1458,24 @@ namespace SystemTrayMenu.UserInterface this.groupBoxHiddenFilesAndFolders.TabStop = false; this.groupBoxHiddenFilesAndFolders.Text = "groupBoxHiddenFilesAndFolders"; // - // tableLayoutPanel1 + // tableLayoutPanelHiddenFilesAndFolders // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.radioButtonAlwaysShowHiddenFiles, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.radioButtonNeverShowHiddenFiles, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.radioButtonSystemSettingsShowHiddenFiles, 0, 0); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 19); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(394, 75); - this.tableLayoutPanel1.TabIndex = 1; + this.tableLayoutPanelHiddenFilesAndFolders.AutoSize = true; + this.tableLayoutPanelHiddenFilesAndFolders.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanelHiddenFilesAndFolders.ColumnCount = 1; + this.tableLayoutPanelHiddenFilesAndFolders.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanelHiddenFilesAndFolders.Controls.Add(this.radioButtonAlwaysShowHiddenFiles, 0, 2); + this.tableLayoutPanelHiddenFilesAndFolders.Controls.Add(this.radioButtonNeverShowHiddenFiles, 0, 1); + this.tableLayoutPanelHiddenFilesAndFolders.Controls.Add(this.radioButtonSystemSettingsShowHiddenFiles, 0, 0); + this.tableLayoutPanelHiddenFilesAndFolders.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanelHiddenFilesAndFolders.Location = new System.Drawing.Point(3, 19); + this.tableLayoutPanelHiddenFilesAndFolders.Name = "tableLayoutPanelHiddenFilesAndFolders"; + this.tableLayoutPanelHiddenFilesAndFolders.RowCount = 3; + this.tableLayoutPanelHiddenFilesAndFolders.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelHiddenFilesAndFolders.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelHiddenFilesAndFolders.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelHiddenFilesAndFolders.Size = new System.Drawing.Size(394, 75); + this.tableLayoutPanelHiddenFilesAndFolders.TabIndex = 1; // // radioButtonAlwaysShowHiddenFiles // @@ -1534,7 +1597,7 @@ namespace SystemTrayMenu.UserInterface // this.buttonAdvancedDefault.AutoSize = true; this.buttonAdvancedDefault.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 240); + this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 318); this.buttonAdvancedDefault.Margin = new System.Windows.Forms.Padding(9, 9, 3, 9); this.buttonAdvancedDefault.MinimumSize = new System.Drawing.Size(75, 25); this.buttonAdvancedDefault.Name = "buttonAdvancedDefault"; @@ -4509,10 +4572,14 @@ namespace SystemTrayMenu.UserInterface this.tabPageAdvanced.PerformLayout(); this.tableLayoutPanelAdvanced.ResumeLayout(false); this.tableLayoutPanelAdvanced.PerformLayout(); + this.groupBoxSorting.ResumeLayout(false); + this.groupBoxSorting.PerformLayout(); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel5.PerformLayout(); this.groupBoxHiddenFilesAndFolders.ResumeLayout(false); this.groupBoxHiddenFilesAndFolders.PerformLayout(); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanelHiddenFilesAndFolders.ResumeLayout(false); + this.tableLayoutPanelHiddenFilesAndFolders.PerformLayout(); this.groupBoxClick.ResumeLayout(false); this.groupBoxClick.PerformLayout(); this.tableLayoutPanelClick.ResumeLayout(false); @@ -4953,7 +5020,7 @@ namespace SystemTrayMenu.UserInterface private System.Windows.Forms.CheckBox checkBoxCacheMainMenu; private System.Windows.Forms.TabPage tabPageSizeAndLocation; private System.Windows.Forms.GroupBox groupBoxHiddenFilesAndFolders; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanelHiddenFilesAndFolders; private System.Windows.Forms.RadioButton radioButtonAlwaysShowHiddenFiles; private System.Windows.Forms.RadioButton radioButtonNeverShowHiddenFiles; private System.Windows.Forms.RadioButton radioButtonSystemSettingsShowHiddenFiles; @@ -4974,5 +5041,9 @@ namespace SystemTrayMenu.UserInterface private System.Windows.Forms.CheckBox checkBoxUseFading; private System.Windows.Forms.Button buttonAppearanceDefault; private System.Windows.Forms.CheckBox checkBoxSendHotkeyInsteadKillOtherInstances; + private System.Windows.Forms.GroupBox groupBoxSorting; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; + private System.Windows.Forms.RadioButton radioButtonSortByDate; + private System.Windows.Forms.RadioButton radioButtonSortByName; } } \ No newline at end of file diff --git a/UserInterface/SettingsForm.cs b/UserInterface/SettingsForm.cs index 2f66357..e791d7f 100644 --- a/UserInterface/SettingsForm.cs +++ b/UserInterface/SettingsForm.cs @@ -153,6 +153,9 @@ namespace SystemTrayMenu.UserInterface radioButtonSystemSettingsShowHiddenFiles.Text = Translator.GetText("Use operating system settings"); radioButtonNeverShowHiddenFiles.Text = Translator.GetText("Never show hidden files, folders or drives"); radioButtonAlwaysShowHiddenFiles.Text = Translator.GetText("Always Show hidden files, folders or drives"); + groupBoxSorting.Text = Translator.GetText("Sorting"); + radioButtonSortByName.Text = Translator.GetText("By name"); + radioButtonSortByDate.Text = Translator.GetText("By date"); buttonAdvancedDefault.Text = Translator.GetText("Default"); tabPageFolders.Text = Translator.GetText("Folders"); @@ -399,6 +402,8 @@ namespace SystemTrayMenu.UserInterface radioButtonSystemSettingsShowHiddenFiles.Checked = Settings.Default.SystemSettingsShowHiddenFiles; radioButtonNeverShowHiddenFiles.Checked = Settings.Default.NeverShowHiddenFiles; radioButtonAlwaysShowHiddenFiles.Checked = Settings.Default.AlwaysShowHiddenFiles; + radioButtonSortByName.Checked = !Settings.Default.SortFolderAndFilesByDate; + radioButtonSortByDate.Checked = Settings.Default.SortFolderAndFilesByDate; checkBoxShowOnlyAsSearchResult.Checked = Settings.Default.ShowOnlyAsSearchResult; try @@ -833,6 +838,7 @@ namespace SystemTrayMenu.UserInterface Settings.Default.SystemSettingsShowHiddenFiles = radioButtonSystemSettingsShowHiddenFiles.Checked; Settings.Default.AlwaysShowHiddenFiles = radioButtonAlwaysShowHiddenFiles.Checked; Settings.Default.NeverShowHiddenFiles = radioButtonNeverShowHiddenFiles.Checked; + Settings.Default.SortFolderAndFilesByDate = radioButtonSortByDate.Checked; Settings.Default.ShowOnlyAsSearchResult = checkBoxShowOnlyAsSearchResult.Checked; SaveFolders(); @@ -1131,6 +1137,9 @@ namespace SystemTrayMenu.UserInterface radioButtonSystemSettingsShowHiddenFiles.Checked = true; radioButtonNeverShowHiddenFiles.Checked = false; radioButtonAlwaysShowHiddenFiles.Checked = false; + + radioButtonSortByName.Checked = true; + radioButtonSortByDate.Checked = false; } private void CheckBoxStayOpenWhenFocusLost_CheckedChanged(object sender, EventArgs e)