diff --git a/ContextMenuManager/AppConfig.cs b/ContextMenuManager/AppConfig.cs index 4d63c83..fb51e26 100644 --- a/ContextMenuManager/AppConfig.cs +++ b/ContextMenuManager/AppConfig.cs @@ -58,8 +58,8 @@ namespace ContextMenuManager private static readonly IniWriter ConfigWriter = new IniWriter(ConfigIni); private static string GetGeneralValue(string key) => ConfigWriter.GetValue("General", key); private static void SetGeneralValue(string key, object value) => ConfigWriter.SetValue("General", key, value); - public static string LanguageIniPath => $@"{LangsDir}\{Language}.ini"; + public static string Language { get diff --git a/ContextMenuManager/AppString.cs b/ContextMenuManager/AppString.cs index 00fd56d..36be920 100644 --- a/ContextMenuManager/AppString.cs +++ b/ContextMenuManager/AppString.cs @@ -241,6 +241,7 @@ namespace ContextMenuManager public static string WinXSorted => GetValue("WinXSorted"); public static string RestoreDefault => GetValue("RestoreDefault"); public static string DeleteGroup => GetValue("DeleteGroup"); + public static string FailedToReadNetworkFile => GetValue("FailedToReadNetworkFile"); } /// 其他文本 diff --git a/ContextMenuManager/ContextMenuManager.csproj b/ContextMenuManager/ContextMenuManager.csproj index 09339ab..2d3e068 100644 --- a/ContextMenuManager/ContextMenuManager.csproj +++ b/ContextMenuManager/ContextMenuManager.csproj @@ -34,7 +34,7 @@ AnyCPU true full - false + true bin\Debug\ DEBUG;TRACE prompt @@ -151,6 +151,9 @@ + + Component + diff --git a/ContextMenuManager/Controls/AboutApp.cs b/ContextMenuManager/Controls/AboutApp.cs index 72b63ee..b22bae7 100644 --- a/ContextMenuManager/Controls/AboutApp.cs +++ b/ContextMenuManager/Controls/AboutApp.cs @@ -291,12 +291,16 @@ namespace ContextMenuManager.Controls cmbEngine.Items.AddRange(new[] { "Bing", "Baidu", "Google", "DuckDuckGo", "DogeDoge", "Sogou", "360", AppString.Other.CustomEngine }); cmbUpdate.Items.AddRange(new[] { AppString.Other.OnceAWeek, AppString.Other.OnceAMonth, AppString.Other.OnceASeason, AppString.Other.NeverCheck }); + lblUpdate.Click += (sender, e) => Updater.Update(true); + this.VisibleChanged += (sender, e) => this.Enabled = this.Visible; btnConfigDir.MouseDown += (sender, e) => ExternalProgram.JumpExplorer(AppConfig.ConfigDir); btnBackupDir.MouseDown += (sender, e) => ExternalProgram.JumpExplorer(AppConfig.BackupDir); - lblUpdate.Click += (sender, e) => - { - if(!Updater.Update()) MessageBoxEx.Show(AppString.Message.VersionIsLatest); - }; + cmbRepo.SelectionChangeCommitted += (sender, e) => AppConfig.RequestUseGithub = cmbRepo.SelectedIndex == 0; + chkBackup.MouseDown += (sender, e) => AppConfig.AutoBackup = chkBackup.Checked = !chkBackup.Checked; + chkProtect.MouseDown += (sender, e) => AppConfig.ProtectOpenItem = chkProtect.Checked = !chkProtect.Checked; + chkWinXSortable.MouseDown += (sender, e) => AppConfig.WinXSortable = chkWinXSortable.Checked = !chkWinXSortable.Checked; + chkOpenMoreRegedit.MouseDown += (sender, e) => AppConfig.OpenMoreRegedit = chkOpenMoreRegedit.Checked = !chkOpenMoreRegedit.Checked; + chkHideDisabledItems.MouseDown += (sender, e) => AppConfig.HideDisabledItems = chkHideDisabledItems.Checked = !chkHideDisabledItems.Checked; cmbConfigDir.SelectionChangeCommitted += (sender, e) => { string newPath = (cmbConfigDir.SelectedIndex == 0) ? AppConfig.AppDataConfigDir : AppConfig.AppConfigDir; @@ -349,13 +353,6 @@ namespace ContextMenuManager.Controls } AppConfig.UpdateFrequency = day; }; - this.VisibleChanged += (sender, e) => this.Enabled = this.Visible; - cmbRepo.SelectionChangeCommitted += (sender, e) => AppConfig.RequestUseGithub = cmbRepo.SelectedIndex == 0; - chkBackup.MouseDown += (sender, e) => AppConfig.AutoBackup = chkBackup.Checked = !chkBackup.Checked; - chkProtect.MouseDown += (sender, e) => AppConfig.ProtectOpenItem = chkProtect.Checked = !chkProtect.Checked; - chkWinXSortable.MouseDown += (sender, e) => AppConfig.WinXSortable = chkWinXSortable.Checked = !chkWinXSortable.Checked; - chkOpenMoreRegedit.MouseDown += (sender, e) => AppConfig.OpenMoreRegedit = chkOpenMoreRegedit.Checked = !chkOpenMoreRegedit.Checked; - chkHideDisabledItems.MouseDown += (sender, e) => AppConfig.HideDisabledItems = chkHideDisabledItems.Checked = !chkHideDisabledItems.Checked; chkShowFilePath.MouseDown += (sender, e) => { chkShowFilePath.Checked = !chkShowFilePath.Checked; diff --git a/ContextMenuManager/Controls/DonateListDialog.cs b/ContextMenuManager/Controls/DonateListDialog.cs index 52a3d11..d7a3879 100644 --- a/ContextMenuManager/Controls/DonateListDialog.cs +++ b/ContextMenuManager/Controls/DonateListDialog.cs @@ -1,5 +1,6 @@ using BluePointLilac.Methods; using System; +using System.ComponentModel; using System.Drawing; using System.Windows.Forms; @@ -80,13 +81,11 @@ namespace ContextMenuManager.Controls string[] values = lines[n].Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); dgvDonate.Rows.Add(values); } - - DateTime date = new DateTime(); + dgvDonate.Sort(dgvDonate.Columns[0], ListSortDirection.Descending); + DateTime date = Convert.ToDateTime(dgvDonate.Rows[0].Cells[0].Value); float money = 0; foreach(DataGridViewRow row in dgvDonate.Rows) { - DateTime temp = Convert.ToDateTime(row.Cells[0].Value); - if(temp > date) date = temp; money += Convert.ToSingle(row.Cells[3].Value); } dgvDonate.Columns[4].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; diff --git a/ContextMenuManager/Controls/EnhanceMenusItem.cs b/ContextMenuManager/Controls/EnhanceMenusItem.cs index f74db24..c437351 100644 --- a/ContextMenuManager/Controls/EnhanceMenusItem.cs +++ b/ContextMenuManager/Controls/EnhanceMenusItem.cs @@ -40,7 +40,7 @@ namespace ContextMenuManager.Controls { if(valueXN == null) return; XmlNode szXN = valueXN.SelectSingleNode("REG_SZ"); - XmlNode binaryXN = valueXN.SelectSingleNode("REG_SZ"); + XmlNode binaryXN = valueXN.SelectSingleNode("REG_BINARY"); XmlNode dwordXN = valueXN.SelectSingleNode("REG_DWORD"); XmlNode expand_szXN = valueXN.SelectSingleNode("REG_EXPAND_SZ"); using(RegistryKey key = RegistryEx.GetRegistryKey(regPath, true, true)) diff --git a/ContextMenuManager/Controls/EnhanceMenusList.cs b/ContextMenuManager/Controls/EnhanceMenusList.cs index 48b4009..3d9f25e 100644 --- a/ContextMenuManager/Controls/EnhanceMenusList.cs +++ b/ContextMenuManager/Controls/EnhanceMenusList.cs @@ -33,7 +33,7 @@ namespace ContextMenuManager.Controls this.AddItem(groupItem); XmlDocument doc = new XmlDocument(); try { doc.LoadXml(File.ReadAllText(xmlPath, EncodingType.GetType(xmlPath))); } - catch { return; } + catch { throw; } foreach(XmlNode xn in doc.DocumentElement.ChildNodes) { try @@ -167,7 +167,6 @@ namespace ContextMenuManager.Controls { if(!tip.IsNullOrWhiteSpace()) tip += "\n"; tip += AppString.Tip.CommandFiles; - //if(System.Diagnostics.Debugger.IsAttached) item.ChkVisible.Checked = item.ItemVisible = true;//调试状态 } MyToolTip.SetToolTip(item.ChkVisible, tip); this.AddItem(item); @@ -199,7 +198,6 @@ namespace ContextMenuManager.Controls public static bool JudgeOSVersion(XmlElement itemXE) { - //if(System.Diagnostics.Debugger.IsAttached) return true;//调试状态 bool JudgeOne(XmlElement osXE) { Version ver = new Version(osXE.InnerText); @@ -232,7 +230,6 @@ namespace ContextMenuManager.Controls private static bool FileExists(XmlElement itemXE) { - //if(System.Diagnostics.Debugger.IsAttached) return true;//调试状态 foreach(XmlElement feXE in itemXE.SelectNodes("FileExists")) { string path = Environment.ExpandEnvironmentVariables(feXE.InnerText); @@ -243,13 +240,17 @@ namespace ContextMenuManager.Controls public static byte[] ConvertToBinary(string value) { - string[] strs = value.Split(' '); - byte[] bs = new byte[strs.Length]; - for(int i = 0; i < strs.Length; i++) + try { - bs[i] = Convert.ToByte(strs[i], 16); + string[] strs = value.Split(' '); + byte[] bs = new byte[strs.Length]; + for(int i = 0; i < strs.Length; i++) + { + bs[i] = Convert.ToByte(strs[i], 16); + } + return bs; } - return bs; + catch { return null; } } } } \ No newline at end of file diff --git a/ContextMenuManager/Properties/AssemblyInfo.cs b/ContextMenuManager/Properties/AssemblyInfo.cs index 408255e..e78c7dd 100644 --- a/ContextMenuManager/Properties/AssemblyInfo.cs +++ b/ContextMenuManager/Properties/AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("35190ec1-2515-488d-a2e9-825d6ff67aa2")] -[assembly: AssemblyVersion("3.3.0.0")] -[assembly: AssemblyFileVersion("3.3.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.3.1.0")] +[assembly: AssemblyFileVersion("3.3.1.0")] \ No newline at end of file diff --git a/ContextMenuManager/Properties/Resources.Designer.cs b/ContextMenuManager/Properties/Resources.Designer.cs index 546116b..cc72baf 100644 --- a/ContextMenuManager/Properties/Resources.Designer.cs +++ b/ContextMenuManager/Properties/Resources.Designer.cs @@ -105,7 +105,7 @@ namespace ContextMenuManager.Properties { ///;翻译：可帮助作者为此程序提供翻译并提交到Github，以下内容中等号右侧内容替换为翻译文本， ///;General-Translator为翻译贡献者，General-Language为语言名称，如en-US 美国英语 ///;翻译文件保存在Config\languages目录中，文件名保存为en-US.ini - ///;翻译说明：暂时不翻译的值保留为空即可，字典内赋值换行请使用\n进行转义 + ///;翻译说明：暂时不翻译的值保留为空即可，字典内赋值换行使用\r\n或\n进行转义 /// ///[General] ///Language = zh-CN 简体中文 @@ -126,7 +126,7 @@ namespace ContextMenuManager.Properties { ///Background = 目录背景 ///Desktop = 桌面背景 ///Drive = 磁盘分区 - ///AllObjects [字符串的其余部分被截断]"; 的本地化字符串。 + ///AllObje [字符串的其余部分被截断]"; 的本地化字符串。 /// internal static string AppLanguageDic { get { @@ -407,21 +407,20 @@ namespace ContextMenuManager.Properties { /// /// 查找类似 <?xml version="1.0" encoding="utf-8"?> ///<!-- 微软在Win10右键菜单中新增的UWP模块, 非Shell、ShellEx类型, - ///但是可通过GUID锁定屏蔽来禁用右键菜单项目, + ///但是可通过GUID锁定屏蔽来禁用相关右键菜单项目, ///GUID查找位置：HKEY_CLASSES_ROOT\PackagedCom\Package\[包名]\Class\[GUID], ///Scene的各子节点为菜单项目出现位置, Item必须有Guid属性， ///UwpName、Text、Icon、Tip等属性写在GuidInfosDic.ini里面--> /// ///<Scene> - /// <File> - /// <Item Guid='776dbc8d-7347-478c-8d71-791e12ef49d8'/> - /// </File> - /// <Directory> - /// <Item Guid='9f156763-7844-4dc4-b2b1-901f640f5155'/> - /// </Directory> - /// <Background> - /// <Item Guid='9f156763-7844-4dc4-b2b1-901f640f5155'/> - /// </Backg [字符串的其余部分被截断]"; 的本地化字符串。 + /// <File> + /// <Item Guid='776dbc8d-7347-478c-8d71-791e12ef49d8'/> + /// </File> + /// <Directory> + /// <Item Guid='9f156763-7844-4dc4-b2b1-901f640f5155'/> + /// </Directory> + /// <Background> + /// <Item Guid='9f156763-7844-4dc4-b2b1-901f640f5155 [字符串的其余部分被截断]"; 的本地化字符串。 /// internal static string UwpModeItemsDic { get { diff --git a/ContextMenuManager/Properties/Resources/Texts/AppLanguageDic.ini b/ContextMenuManager/Properties/Resources/Texts/AppLanguageDic.ini index 7ee9b2b..d38da53 100644 --- a/ContextMenuManager/Properties/Resources/Texts/AppLanguageDic.ini +++ b/ContextMenuManager/Properties/Resources/Texts/AppLanguageDic.ini @@ -209,6 +209,7 @@ AuthorityProtection = 此菜单注册表项目可能受安全软件保护,\r\n WinXSorted = 为优化排序功能已对部分项目重新编号，\r\n需要重启文件资源管理器应用效果 RestoreDefault = 确认还原为默认菜单项目？ DeleteGroup = 确认永久删除此组及组内所有菜单项目？ +FailedToReadNetworkFile = 网络文件读取失败! [Tip] RestartExplorer = 重启Explorer会使桌面闪烁片刻, 正常现象无需担心,\r\n或者你也可以稍后重启或注销计算机使你的操作生效 diff --git a/ContextMenuManager/Properties/Resources/Texts/EnhanceMenusDic.xml b/ContextMenuManager/Properties/Resources/Texts/EnhanceMenusDic.xml index 45584be..74d52b2 100644 --- a/ContextMenuManager/Properties/Resources/Texts/EnhanceMenusDic.xml +++ b/ContextMenuManager/Properties/Resources/Texts/EnhanceMenusDic.xml @@ -279,15 +279,6 @@ Tip属性为鼠标悬浮在开关上时的提示信息，从每个Item节点开 - - 10.0 - - - - - - - diff --git a/languages/zh-CN.ini b/languages/zh-CN.ini index 7ee9b2b..d38da53 100644 --- a/languages/zh-CN.ini +++ b/languages/zh-CN.ini @@ -209,6 +209,7 @@ AuthorityProtection = 此菜单注册表项目可能受安全软件保护,\r\n WinXSorted = 为优化排序功能已对部分项目重新编号，\r\n需要重启文件资源管理器应用效果 RestoreDefault = 确认还原为默认菜单项目？ DeleteGroup = 确认永久删除此组及组内所有菜单项目？ +FailedToReadNetworkFile = 网络文件读取失败! [Tip] RestartExplorer = 重启Explorer会使桌面闪烁片刻, 正常现象无需担心,\r\n或者你也可以稍后重启或注销计算机使你的操作生效