diff --git a/AHK_ChangeIcon.ahk b/AHK_ChangeIcon.ahk index bcef496..180ca79 100644 --- a/AHK_ChangeIcon.ahk +++ b/AHK_ChangeIcon.ahk @@ -1,15 +1,15 @@ ;// @Name AHK-ChangeIcon ;// @Author iKineticate -;// @Version v2.5 +;// @Version v2.5.3 ;// @Destription:zh-CN 快速更换桌面快捷方式图标 ;// @Destription:en Quickly change of desktop shortcut icons ;// @HomepageURL https://github.com/iKineticate/AHK-ChangeIcon ;// @Icon Source https://www.iconfont.cn and https://www.flaticon.com ;// @Date 2024/03/04 -;@Ahk2Exe-SetVersion 2.5 -;@Ahk2Exe-SetFileVersion 2.5 -;@Ahk2Exe-SetProductVersion 2.5 +;@Ahk2Exe-SetVersion 2.5.3 +;@Ahk2Exe-SetFileVersion 2.5.3 +;@Ahk2Exe-SetProductVersion 2.5.3 ;@Ahk2Exe-SetName AHK-ChangeIcon ;@Ahk2Exe-ExeName AHK-ChangeIcon ;@Ahk2Exe-SetCompanyName AHK-ChangeIcon @@ -76,12 +76,12 @@ For Value in ["last_selected_other_path", "last_icons_folder_path"] ; 创建窗口 ;======================================================================================================== ; 创建现代风格GUI -ahkGUI := CreateModernGUI( {x:"center", y:"center", w:1200/2, h:650/2, back_color:"202020", gui_options:"-caption -Resize +Border", gui_name:"AHK-ChangeIcon", gui_font_options:"Bold cffffff s8", gui_font:"Microsoft YaHei UI", show_options:""} ) +ahkGUI := CreateModernGUI( {x:"center", y:"center", w:1200/2, h:650/2, back_color:"202020", gui_options:"-caption -Resize +Border +DPIScale", gui_name:"AHK-ChangeIcon", gui_font_options:"Bold cffffff s8", gui_font:"Microsoft YaHei UI", show_options:""} ) ; 创建窗口控制按钮（关闭、最大化、最小化） ahkGUI.CreateWindowsControlButton( {margin_top:"0", margin_right:"0", button_w:54/2, button_h:40/2, pen_width:3, active_color:"AD62FD"} ) ; 设置提示选项 MyGui.Tooltips := GuiCtrlTips(MyGui) -MyGui.ToolTips.Setfont(,"Microsoft YaHei UI",,) +MyGui.ToolTips.SetFont(,"Microsoft YaHei UI",,) MyGui.ToolTips.SetBkColor("0xff303030") MyGui.ToolTips.SetTxColor("0xff999999") @@ -97,10 +97,10 @@ MyGui.AddPicture("x" . 70/2 . " y" . 42/2 . " w" . 100/2 . " h" . 100/2 . " Back tab_prop := {} tab_prop.label_name := [Text.HOME, Text.Other, Text.LOG, Text.HELP, Text.ABOUT] tab_prop.label_prop := {distance:0, text_options:"center +0x200", font_options:"Bold cf5f5f5 s11", font:"", font_normal_color:"f5f5f5", font_active_color:"ad62fd"} ; 输入空格来调整标签按钮里的文本相对按钮的x位置 -tab_prop.label_active := {margin_left:0, margin_top:"center", w:220/2, h:72/2, R:24/2, color:"f5f5f5"} +tab_prop.label_active := {margin_left:0, margin_top:"center", w:220/2, h:72/2, R:24/2, color:"0xE6f5f5f5"} ;tab_prop.label_indicator := {margin_left:20/2, margin_top:"center", w:10/2, h:28/2, R:4/2, color:"ad62fd"} tab_prop.logo_symbol := {margin_left:2, font_name:"Segoe UI Symbol"} -tab_prop.logo_size := [22/2, 20/2, 24/2, 24/2, 30/2] +tab_prop.logo_size := [22/2, 20/2, 24/2, 24/2, 32/2] tab_prop.logo_unicode := ["0xE10F", "0xE292", "0x1F4DC", "0xE115", "0x24D8"] tab_item := CreateButton( {name:"logo", x:10/2, y:180/2, w:220/2, h:85/2} ).NewTab( tab_prop ) @@ -170,7 +170,7 @@ For Desktop in [A_Desktop, A_DesktopCommon] Add_Folder_Link_To_LV(Desktop, Mode := "") } ; 设置、调整列表 -LV.ModifyCol(1, 480/2) +LV.ModifyCol(1, 460/2) LV.ModifyCol(2, "+AutoHdr") LV.ModifyCol(3, "+AutoHdr") SetLV := LV_Colors(LV, 0, 0, 0) @@ -193,19 +193,19 @@ MyGui["Unchanged_Count"].Value := LV.GetCount() - MyGui["Changed_Count"].Value ; 第二个标签页：其他(其他) ;========================================================================== Tab.UseTab(2) -CreateButton( {name:"Add_Desktop", x:320/2, y:80/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"5D656B", active_color:"999999", text:Text.ADD_DESKTOP_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) +CreateButton( {name:"Add_Desktop", x:320/2, y:80/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"0x26ffffff", active_color:"909090", text:Text.ADD_DESKTOP_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) FontSymbol( {name:"Add_Desktop_Symbol", x:325/2, y:78/2, w:90/2, h:90/2, unicode:0xE2CB, font_name:"Segoe UI Symbol", text_color:"ffffff", back_color:"trans", font_options:"s" 90/4, text_options:"+0x200 center"} ) -CreateButton( {name:"Add_Start", x:320/2, y:190/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"5D656B", active_color:"999999", text:Text.ADD_START_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) +CreateButton( {name:"Add_Start", x:320/2, y:190/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"0x26ffffff", active_color:"909090", text:Text.ADD_START_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) FontSymbol( {name:"Add_Start_Symbol", x:325/2, y:191/2, w:90/2, h:90/2, unicode:0xE154, font_name:"Segoe UI Symbol", text_color:"ffffff", back_color:"trans", font_options:"s" 90/4, text_options:"+0x200 center"} ) -CreateButton( {name:"Add_Other", x:320/2, y:300/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"5D656B", active_color:"999999", text:Text.ADD_OTHER_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) +CreateButton( {name:"Add_Other", x:320/2, y:300/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"0x26ffffff", active_color:"909090", text:Text.ADD_OTHER_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) FontSymbol( {name:"Add_Other_Symbol", x:325/2, y:304/2, w:90/2, h:90/2, unicode:0xE1C1, font_name:"Segoe UI Symbol", text_color:"ffffff", back_color:"trans", font_options:"s" 90/5, text_options:"+0x200 center"} ) -CreateButton( {name:"Add_UWP_WSA", x:320/2, y:410/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"5D656B", active_color:"999999", text:Text.ADD_UWP_WSA_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) +CreateButton( {name:"Add_UWP_WSA", x:320/2, y:410/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"0x26ffffff", active_color:"909090", text:Text.ADD_UWP_WSA_TO_LV, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) FontSymbol( {name:"Add_UWP_WSA_Symbol", x:325/2, y:409/2, w:90/2, h:90/2, unicode:0xE2F8, font_name:"Segoe UI Symbol", text_color:"ffffff", back_color:"trans", font_options:"s" 90/3.5, text_options:"+0x200 center"} ) -CreateButton( {name:"Add_BackUp", x:320/2, y:520/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"5D656B", active_color:"999999", text:Text.BACKUP_LV_LINK, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) +CreateButton( {name:"Add_BackUp", x:320/2, y:520/2, w:800/2, h:90/2} ).Text( {R:24/2, normal_color:"0x26ffffff", active_color:"909090", text:Text.BACKUP_LV_LINK, text_options:"+0x200", text_margin:10, font_options:"cffffff s13", font:""} ) FontSymbol( {name:"Add_BackUp_Symbol", x:325/2, y:522/2, w:90/2, h:90/2, unicode:0xE17C, font_name:"Segoe UI Symbol", text_color:"ffffff", back_color:"trans", font_options:"s" 90/5, text_options:"+0x200 center"} ) @@ -227,11 +227,36 @@ Tab.UseTab(4) ; 第五个标签页：关于(About) ;========================================================================== Tab.UseTab(5) -CreateButton( {name:"software", x:320/2, y:80/2, w:800/2, h:90/2} ).Text( {R:16/2, normal_color:"5D656B", active_color:"0x00ffffff", text_options:"+0x200",text_margin:"3", font_options:"s12 cffffff", font:"Verdana", text:"AHK-ChangeIcon"} ) -CreateButton( {name:"version", x:320/2, y:190/2, w:800/2, h:90/2} ).Text( {R:16/2, normal_color:"5D656B", active_color:"0x00ffffff", text_options:"+0x200",text_margin:"3", font_options:"s12 cffffff", font:"Verdana", text:"Version: 2.5.2"} ) -CreateButton( {name:"github", x:320/2, y:300/2, w:800/2, h:90/2} ).Text( {R:16/2, normal_color:"5D656B", active_color:"0x00ffffff", text_options:"+0x200",text_margin:"3", font_options:"s12 cffffff", font:"Verdana", text:"Github: iKineticate"} ) -CreateButton( {name:"CoolMarket", x:320/2, y:410/2, w:800/2, h:90/2} ).Text( {R:16/2, normal_color:"5D656B", active_color:"0x00ffffff", text_options:"+0x200",text_margin:"3", font_options:"s12 cffffff", font:"", text:"酷安：林琼雅"} ) -CreateButton( {name:"logo_from", x:320/2, y:520/2, w:800/2, h:90/2} ).Text( {R:16/2, normal_color:"5D656B", active_color:"0x00ffffff", text_options:"+0x200",text_margin:"3", font_options:"s12 cffffff", font:"Verdana", text:"LOGO by iconfield from Flaticon"} ) +; 背景 +MyGui.AddPicture("vAbout_Background x" . 270/2 . " y" . 45/2 . " w" 900/2*(A_ScreenDPI/96) . " h" . 585/2*(A_ScreenDPI/96) . " BackgroundTrans +0xE -E0x200") +Gdip_SetPicRoundedRectangle(MyGui["About_Background"], "0x0Dffffff", 15, isFill:="true") +; 软件名 +MyGui.AddText("vsoftware x" 320/2 " y" 80/2 " w" 540/2 " h" 60/2 " 0x200 backgroundtrans", "AHK-ChangeIcon") +MyGui["software"].SetFont("s18 cffffff", "Verdana") +; 版本 +MyGui.AddText("vVersion x" 320/2 " y" 140/2 " w" 240/2 " h" 40/2 " 0x200 backgroundtrans", "Version 2.5.3 (x64)") +MyGui["Version"].SetFont("s10 cffffff", "Calibri") +; 作者 +MyGui.AddText("vAuthor x" 320/2 " y" 180/2 " w" 240/2 " h" 40/2 " 0x200 backgroundtrans", "Author: iKineticate") +MyGui["Author"].SetFont("s10 cffffff", "Calibri") +; 跳转至网页 +CreateButton( {name:"github", x:316/2, y:220/2, w:222/2, h:55/2} ).Text( {R:8/2, normal_color:"0x00ffffff", active_color:"0x1Affffff", text_options:"+0x200",text_margin:"2", font_options:"s11 c87eea3", font:"", text:TEXT.GITHUB} ) +CreateButton( {name:"download", x:316/2, y:275/2, w:222/2, h:55/2} ).Text( {R:8/2, normal_color:"0x00ffffff", active_color:"0x1Affffff", text_options:"+0x200",text_margin:"2", font_options:"s11 c87eea3", font:"", text:TEXT.DOWNLOAD} ) +CreateButton( {name:"help", x:316/2, y:330/2, w:222/2, h:55/2} ).Text( {R:8/2, normal_color:"0x00ffffff", active_color:"0x1Affffff", text_options:"+0x200",text_margin:"2", font_options:"s11 c87eea3", font:"", text:TEXT.ABOUT_HELP} ) +CreateButton( {name:"issues", x:316/2, y:385/2, w:222/2, h:55/2} ).Text( {R:8/2, normal_color:"0x00ffffff", active_color:"0x1Affffff", text_options:"+0x200",text_margin:"2", font_options:"s11 c87eea3", font:"", text:TEXT.ISSUES} ) +CreateButton( {name:"Contributors", x:316/2, y:440/2, w:222/2, h:55/2} ).Text( {R:8/2, normal_color:"0x00ffffff", active_color:"0x1Affffff", text_options:"+0x200",text_margin:"2", font_options:"s11 c87eea3", font:"", text:TEXT.CONTRIBUTORS} ) +MyGui.ToolTips.SetTip(MyGui["github_BUTTON"], "https://github.com/iKineticate/AHK-ChangeIcon") +MyGui.ToolTips.SetTip(MyGui["download_BUTTON"], "https://github.com/iKineticate/AHK-ChangeIcon/releases") +MyGui.ToolTips.SetTip(MyGui["help_BUTTON"], "https://github.com/iKineticate/AHK-ChangeIcon?tab=readme-ov-file#已知问题") ; 根据中英文更换链接 +MyGui.ToolTips.SetTip(MyGui["issues_BUTTON"], "https://github.com/iKineticate/AHK-ChangeIcon/issues") +MyGui.ToolTips.SetTip(MyGui["Contributors_BUTTON"], "https://github.com/iKineticate/AHK-ChangeIcon?tab=readme-ov-file#感谢") +; 灰色 +MyGui.SetFont("s10 c666666", "Calibri") +MyGui.AddText("vcopy_right x" 320/2 " y" 510/2 " w" 600/2 " h" 30/2 " 0x200 backgroundtrans", "Licensed under the MIT License") +MyGui.AddText("vicon_from x" 320/2 " y" 545/2 " w" 600/2 " h" 30/2 " 0x200 backgroundtrans", "Icons from www.iconfont.cn and www.flaticon.com") +MyGui.AddText("vlogo_from x" 320/2 " y" 580/2 " w" 600/2 " h" 30/2 " 0x200 backgroundtrans", "Logo by iconfield from www.flaticon.com") + + ;========================================================================== ; 深色模式(Drak Mode) @@ -253,7 +278,7 @@ DllCall("uxtheme\SetWindowTheme", "Ptr", MyGui["Log"].hWnd, "Str", "DarkMode_Exp ahkGUI.GuiShow(ahkGUI.show_options) ; 展示GUI OnMessage(0x200, WM_MOUSEMOVE) ; 检测MyGui内的鼠标移动 -OnMessage(0x2A3, WM_MOUSELEAVE) ; 监测MyGui外的鼠标移动 +;OnMessage(0x2A3, WM_MOUSELEAVE) ; 监测MyGui外的鼠标移动 ;========================================================================== Return @@ -360,6 +385,11 @@ ButtonFunc(GuiCtrlObj, Info, *) Case "Add_Other" : Add_Other_To_LV() Case "Add_UWP_WSA" : Add_UWP_APP_To_LV() Case "Add_BackUp" : Backup_LV_Link_To_Folder() + Case "github" : Run("https://github.com/iKineticate/AHK-ChangeIcon") + Case "download" : Run("https://github.com/iKineticate/AHK-ChangeIcon/releases") + Case "help" : Run("https://github.com/iKineticate/AHK-ChangeIcon?tab=readme-ov-file#已知问题") + Case "issues" : Run("https://github.com/iKineticate/AHK-ChangeIcon/issues") + Case "Contributors" : Run("https://github.com/iKineticate/AHK-ChangeIcon?tab=readme-ov-file#感谢") } } @@ -367,31 +397,30 @@ ButtonFunc(GuiCtrlObj, Info, *) ;========================================================================== ; 标签被点击的函数（选择并聚焦该标签页、取消其他标签页活跃态） ;========================================================================== -Tab_Click(tab_name) +Tab_Click(current_tab_name) { - If MyGui[tab_name] = MyGui.Focus_Tab + If MyGui[current_tab_name] = MyGui.Focus_Tab Return - Tab.Choose(StrReplace(tab_name, "_Tab_Button")) ; 选择对应的隐藏标签页 + Tab.Choose(StrReplace(current_tab_name, "_Tab_Button")) ; 选择对应的隐藏标签页 - For name in [MyGui.Focus_Tab.name, tab_name] + For name in [MyGui.Focus_Tab.name, current_tab_name] { active_name := StrReplace(name, "_Tab_Button", "_ACTIVE") indicator_name := StrReplace(name, "_Tab_Button", "_INDICATOR") - - MyGui[active_name].Visible := (name=tab_name) ? True:False - (tab_prop.HasOwnProp("label_indicator")) ? (MyGui[indicator_name].Visible := (name=tab_name) ? True:False) : False + MyGui[active_name].Visible := (name=current_tab_name) ? True:False + (tab_prop.HasOwnProp("label_indicator")) ? (MyGui[indicator_name].Visible := (name=current_tab_name) ? True:False) : False } ; 本次被点击标签页激活活跃态 - logo_symbol_name := StrReplace(MyGui[tab_name].name, "_Tab_Button", "_SYMBOL") - MyGui[tab_name].SetFont("c" . tab_prop.label_prop.font_active_color) + logo_symbol_name := StrReplace(MyGui[current_tab_name].name, "_Tab_Button", "_SYMBOL") + MyGui[current_tab_name].SetFont("c" . tab_prop.label_prop.font_active_color) (tab_prop.HasOwnProp("logo_symbol")) ? MyGui[logo_symbol_name].SetFont("c" . tab_prop.label_prop.font_active_color) : False ; 上次被点击的标签页恢复常态 logo_symbol_name := StrReplace(MyGui.Focus_Tab.name, "_Tab_Button", "_SYMBOL") MyGui.Focus_Tab.SetFont("c" . tab_prop.label_prop.font_normal_color) (tab_prop.HasOwnProp("logo_symbol")) ? MyGui[logo_symbol_name].SetFont("c" . tab_prop.label_prop.font_normal_color) : False ; 上次被点击标签页=本次 - MyGui.Focus_Tab := MyGui[tab_name] + MyGui.Focus_Tab := MyGui[current_tab_name] } @@ -415,19 +444,33 @@ Add_Folder_Link_To_LV(link_folder_path, Mode) ; Mode:="R"扫描子文件夹 If ((LV_link_from = "Start") AND (RegExMatch(A_LoopFileName, "i)uninstall|卸载"))) ; 若添加的是菜单，且快捷方式名为"卸载"，则下一轮循环（避免添加软件的卸载程序） Continue + link_path := A_LoopFilePath + COM_Link_Attribute(&link_path, &link_attribute, &link_icon_location) ; 调用WshShell对象的函数，获取快捷方式属性 + link_target_path := link_attribute.TargetPath + link_target_dir := (link_target_path AND !link_attribute.WorkingDirectory) ? RegExReplace(link_target_path, "\\[^\\]+$"):link_attribute.WorkingDirectory ; 解决目标目录未填写的情况 link_name := RegExReplace(A_LoopFileName, "i)\.lnk$") ; 去除了后缀名的快捷方式的名称 + ; 快捷方式的目标扩展名 + SplitPath(link_target_path,,, &link_target_ext) + Switch + { + Case !link_target_ext : ; 空则为UWP + link_target_ext := "uwp" + Case InStr(link_target_path, "WindowsSubsystemForAndroid") : ; 安卓应用 + link_target_ext := "app" + Case InStr(link_target_path, "schtasks") : ; 命令任务(计划程序)的快捷方式 + link_target_ext := "schtasks" + Default : + link_target_ext := StrLower(link_target_ext) + } + + key := link_name . link_target_ext - If link_map.Has(link_name . "LP") ; 上一次添加某快捷方式后，若数组存在重复名称(区分大小写)且二者扩展名称相同，则跳过（根据数组中是否存在对应键-值来判断） + ; 若本次循环快捷方式名称跟既往循环快捷方式名称相同(即数组存在)，且二者扩展名称相同，则跳过（有些同名称但目标扩展类型不同） + If link_map.Has(key) Continue - link_path := A_LoopFilePath - COM_Link_Attribute(&link_path, &link_attribute, &link_icon_location) ; 调用WshShell对象的函数，获取快捷方式属性 - link_target_path := link_attribute.TargetPath - link_target_dir := (link_target_path AND !link_attribute.WorkingDirectory) ? RegExReplace(link_target_path, "\\[^\\]+$"):link_attribute.WorkingDirectory - SplitPath(link_path,, &link_dir) ; 快捷方式的目录 - SplitPath(link_target_path,,, &link_target_ext) ; 快捷方式的目标扩展名 - + If !link_icon_location or link_icon_location = link_target_path or RegExMatch(link_icon_location, "i)%[^%]*%|WindowsSubsystemForAndroid|system32\\.*dll|\{[^\{]*\}\\[^\\]*\.exe$") ; WSA或系统图标 @@ -443,27 +486,18 @@ Add_Folder_Link_To_LV(link_folder_path, Mode) ; Mode:="R"扫描子文件夹 MyGui["Changed_Count"].Value += 1 } - Switch ; 快捷方式的目标扩展名转换为小写、记录为UWP、记录WSA软件为APP - { - Case link_target_ext = "" : - link_target_ext := "uwp" - Case InStr(link_target_path, "WindowsSubsystemForAndroid") : - link_target_ext := "app" - Default : - link_target_ext := StrLower(link_target_ext) - } - ; 以"快捷方式名称+路径英文缩写"为键，其对应的路径为值，填入link_map数组 ; LTP = Link Target Path = 快捷方式的目标路径（UWP无法查看） ; LTD = Link Target Dir = 快捷方式的目标目录（UWP无法查看） ; LP = Link Path = 快捷方式的路径 ; LD = Link Dir = 快捷方式的目录 - link_map[link_name . "LTP"] := (!link_target_path) ? Text.SAFE_UNAVAILABLE : link_target_path - link_map[link_name . "LTD"] := (!link_target_dir) ? Text.SAFE_UNAVAILABLE : link_target_dir - link_map[link_name . "LP"] := A_LoopFilePath - link_map[link_name . "LD"] := link_dir + link_map[key] := {} + link_map[key].LTP := (!link_target_path) ? Text.SAFE_UNAVAILABLE : link_target_path + link_map[key].LTD := (!link_target_dir) ? Text.SAFE_UNAVAILABLE : link_target_dir + link_map[key].LP := A_LoopFilePath + link_map[key].LD := link_dir - ; 调用DllCall_Get_Icon函数和图像列表替换函数，添加图标并赋予给icon_number--刷新列表左侧图标 + ; 调用DllCall_Get_Icon函数和图像列表替换函数，添加图标给数组，赋予给icon_number--刷新列表左侧图标 hIcon := DllCall_Get_Icon(A_LoopFilePath) icon_number := DllCall("ImageList_ReplaceIcon", "Ptr", image_list_ID, "Int", -1, "Ptr", hIcon) + 1 DllCall("DestroyIcon", "ptr", hIcon) @@ -498,8 +532,9 @@ DllCall_Get_Icon(link_target_path) Refresh_LV_Icon(LV, Item) { LV.Focus() - Link_Path := Link_Map[LV.GetText(Item, 1) . "LP"] - hIcon := DllCall_Get_Icon(Link_Path) + key := LV.GetText(Item, 1) . LV.GetText(Item, 3) + link_path := link_map[key].LP + hIcon := DllCall_Get_Icon(link_path) icon_number := DllCall("ImageList_ReplaceIcon", "Ptr", image_list_ID, "Int", -1, "Ptr", hIcon) + 1 ; 调用DllCall_Icon函数重新刷新列表指定项目图标 DllCall("DestroyIcon", "ptr", hIcon) LV.Modify(Item, "Icon" . icon_number) @@ -512,8 +547,9 @@ Refresh_LV_Icon(LV, Item) Refresh_Display_Icon(LV, Item) { LV.Focus() - Link_Path := Link_Map[LV.GetText(Item, 1) . "LP"] - link_target_path := Link_Map[LV.GetText(Item, 1) . "LTP"] + key := LV.GetText(Item, 1) . LV.GetText(Item, 3) + link_path := link_map[key].LP + link_target_path := link_map[key].LTP Try { @@ -546,8 +582,10 @@ Change_Link_Icon(LV, Item) MyGui.Opt("+OwnDialogs") ; 解除对话框(如Msgbox等)后才可于GUI窗口交互 link_name := LV.GetText(Item, 1) - link_path := Link_Map[link_name . "LP"] - link_target_path := Link_Map[link_name . "LTP"] + key := LV.GetText(Item, 1) . LV.GetText(Item, 3) + link_path := link_map[key].LP + link_target_path := link_map[key].LTP + COM_Link_Attribute(&Link_Path, &Link_Attribute, &Link_Icon_Location) ; 调用WshShell对象的函数，获取快捷方式属性 select_icon_path := FileSelect(3,, TEXT.SELECT_A_ICON, "Icon files(*.ico)") ; 选择文件格式为“.ico”的图标并赋予图标路径给该变量 @@ -568,7 +606,7 @@ Change_Link_Icon(LV, Item) ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") . Text.LOG_CHANGED_LINK . link_name . "`n`s" - . Text.Source_OF_ICON . select_icon_path . "`n`n======================================`n`n" + . Text.Source_OF_ICON . select_icon_path . "`n`n===========================================`n`n" } @@ -581,10 +619,11 @@ LV_Context_Menu(LV, Item, IsRightClick, X, Y) Return link_name := LV.GetText(Item, 1) ; 快捷方式的名称 - link_target_path := Link_Map[link_name . "LTP"] ; 快捷方式的目标路径 lnk[link_name].LTP - link_target_dir := Link_Map[link_name . "LTD"] ; 快捷方式的目标目录 lnk[link_name].LTD - link_path := Link_Map[link_name . "LP"] ; 快捷方式的路径 lnk[link_name].LP - link_dir := Link_Map[link_name . "LD"] ; 快捷方式的目录 lnk[link_name].LD + key := link_name . LV.GetText(Item, 3) + link_target_path := link_map[key].LTP + link_target_dir := link_map[key].LTD + link_path := link_map[key].LP + link_dir := link_map[key].LD COM_Link_Attribute(&link_path, &Link_Attribute, &Link_Icon_Location) ; 调用WshShell对象的函数，获取快捷方式属性 @@ -655,7 +694,7 @@ LV_Context_Menu(LV, Item, IsRightClick, X, Y) LV.Modify(Item,,,"") ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") - . Text.LOG_RESTORE_LINK . link_name . "`n`n======================================`n`n" + . Text.LOG_RESTORE_LINK . link_name . "`n`n===========================================`n`n" } Link_Rename(*) ; 重命名快捷方式名称的函数 @@ -663,29 +702,26 @@ LV_Context_Menu(LV, Item, IsRightClick, X, Y) MyGui.Opt("+OwnDialogs") ; 解除对话框后才可于GUI窗口交互 ; 重命名输入窗口 IB := InputBox(Text.RENAME_NEW_NAME, link_name, "W300 H100", Trim(link_name)) - If IB.Result="CANCEL" + If (IB.Result = "CANCEL") Return - ; 赋予新名称给变量，然后重命名 + ; 排除重复名称 IB.Value := RegExReplace(IB.Value, "i).lnk$") + Loop LV.GetCount() + { + If IB.Value = LV.GetText(A_Index, 1) + Return MsgBox(TEXT.SAME_NAME, "(・∀・(・∀・(・∀・*)", "icon!") + } + ; 赋予新名称给变量，然后重命名 new_link_path := link_dir . "\" . IB.Value . ".lnk" FileMove(link_path, new_link_path) ; 重命名后，添加新的键值和删除旧的键值于映射数组 - For Value in ["LP", "LTP", "LTD", "LD"] - { - Switch Value - { - Case "LP" : - Link_Map[IB.Value . Value] := new_link_path ; link_map[IB.Value] := {LP:新的, LD:不变, LTP:不变, LTD:不变} - Link_Map.Delete(link_name . Value) ; link_map.delete(link_name) - Default : - Link_Map[IB.Value . Value] := Link_Map[link_name . Value] - Link_Map.Delete(link_name . Value) - } - } - ; 添加至日志 + new_key := IB.Value . LV.GetText(Item, 3) + link_map[new_key] := {LP:new_link_path, LD:link_dir, LTP:link_target_path, LTD:link_target_dir} + link_map.Delete(key) + ; 记录日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") . Text.LOG_OLD_NAME . link_name . "`n`s" - . Text.LOG_NEW_NAME . IB.Value . "`n`n======================================`n`n" + . Text.LOG_NEW_NAME . IB.Value . "`n`n===========================================`n`n" ; 更新列表快捷方式名称（最后更新可避免过早更新使映射数组中的link_name发生改变而不能删除对应键值） LV.Modify(Item,, IB.Value) } @@ -697,7 +733,7 @@ LV_Context_Menu(LV, Item, IsRightClick, X, Y) FileCopy(link_path, A_Desktop) MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") ; 添加至日志 - . "“`s" . link_name . "`s”被添加至当前用户的桌面" . "`n`n======================================`n`n" + . "“`s" . link_name . "`s”被添加至当前用户的桌面" . "`n`n===========================================`n`n" Msgbox("成功添加“`s" . link_name . "`s”至当前用户的桌面", "Ciallo～(∠・ω< )⌒★") } @@ -765,7 +801,6 @@ Change_All_Shortcut_Icons(*) iniWrite(selected_folder_path, info_ini_path, "info", "last_icons_folder_path") ; 创建数组 changed_log_msgbox := "" - last_link_target_type := "" map_iconName_iconPath := map() map_both_name_same := map() ; 以被选择文件夹的图标名称为键，图标路径为值添加至映射数组(R：扫描包括子文件夹的文件) @@ -785,12 +820,14 @@ Change_All_Shortcut_Icons(*) no_space_icon_name := RegExReplace(icon_name, "[`s`n`t]") Loop LV.GetCount() { - link_name := LV.GetText(A_Index, 1), no_space_link_name := RegExReplace(link_name, "[`s`n`t]") + link_name := LV.GetText(A_Index, 1) + key := link_name . LV.GetText(A_Index, 3) + no_space_link_name := RegExReplace(link_name, "[`s`n`t]") + ; 若快捷方式已更换过与快捷方式相同名称的ICO图标，则跳过这一次循环（比如QQ音乐软件换了"QQ音乐"图标后，可能会更换"QQ"图标，因此需要截停） ; 注意：不能根据列表"√"来跳过循环（比如QQ音乐先换了"QQ"图标，要是跳过就不能换"QQ音乐"图标） ; 注意：若要跳过这一次循环，用Continue，Return会退出所有循环和函数 - If (LV.GetText(A_Index, 3) = last_link_target_type) - and (map_both_name_same.has(StrLower(link_name)) OR (map_both_name_same.has(StrLower(icon_name)))) + If (map_both_name_same.has(key) OR (map_both_name_same.has(key))) Continue ; 根据快捷方式和图标名称长度来检查二者的包含关系，包含则更换，不包含执行下一次循环 ; 优势：部分应用因版本不同而快捷方式名称不同，如Adobe PhtotShop 2024/2023/2022，使用该方法可以使图标名称只要是"PhtotShop即可匹配更换 @@ -806,12 +843,11 @@ Change_All_Shortcut_Icons(*) Case 0: If (no_space_link_name != no_space_icon_name) ; 若快捷方式名称与文件名称不同，则下一循环，相同给数组添加两个键 Continue - map_both_name_same[StrLower(link_name)] := "SAME" ; 此处标记，后续扫描跳过第二个循环中的该快捷方式（注意：数组的键是区分大小写的） - map_both_name_same[StrLower(icon_name)] := "SAME" ; 此处标记，后续扫描跳过第一个循环中的该图标（注意数组的键是区分大小写的） - last_link_target_type := LV.GetText(A_Index, 3) ; 此处记录，后续除了判断上述两个条件外，另需判断文件类型是否相同情况 + map_both_name_same[key] := "SAME" ; 此处标记，后续扫描跳过第二个循环中的该快捷方式（注意：数组的键是区分大小写的） + map_both_name_same[key] := "SAME" ; 此处标记，后续扫描跳过第一个循环中的该图标（注意数组的键是区分大小写的） } ; 获取快捷方式信息 - link_path := Link_Map[link_name . "LP"] + link_path := link_map[key].LP COM_Link_Attribute(&Link_Path, &Link_Attribute, &Link_Icon_Location) ; 若快捷方式图标的路径与文件图标的路径相同，则跳过这一次循环 If (Link_Icon_Location = icon_path) @@ -866,11 +902,12 @@ Restore_All_Shortcut_Icons(*) Continue link_name := LV.GetText(A_Index, 1) - link_path := Link_Map[Link_Name . "LP"] - link_target_path := Link_Map[Link_Name . "LTP"] + key := link_name . LV.GetText(A_Index, 3) + link_path := link_map[key].LP + link_target_path := link_map[key].LTP ; 获取快捷方式的属性，并恢复默认图标（即更换为目标文件图标） COM_Link_Attribute(&Link_Path, &Link_Attribute, &Link_Icon_Location) - Link_Attribute.IconLocation := Link_Target_Path + Link_Attribute.IconLocation := link_target_path Link_Attribute.Save() ; 更新显示的数据 If (LV.GetText(A_Index, 2) = "√") @@ -897,8 +934,8 @@ Restore_All_Shortcut_Icons(*) ;========================================================================== Clean_LV(*) { - LV.Delete() - Link_Map.Clear() ; 删除存储的数组 + LV.Delete() ; 清空列表 + link_map.Clear() ; 清空数组 MyGui["Changed_Count"].Value := 0 MyGui["Unchanged_Count"].Value := 0 MyGui["Total_Count"].Value := 0 @@ -928,7 +965,7 @@ Add_Desktop_To_LV(*) MyGui["Unchanged_Count"].Value := LV.GetCount() - MyGui["Changed_Count"].Value ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") - . Text.ADD_DESKTOP_TO_LV . "`n`n======================================`n`n" + . Text.ADD_DESKTOP_TO_LV . "`n`n===========================================`n`n" ; 返回主页 ControlClick(MyGui[StrReplace(tab_prop.label_name[1], "`s") . "_Tab_BUTTON"]) } @@ -957,7 +994,7 @@ Add_Sart_To_LV(*) MyGui["Unchanged_Count"].Value := LV.GetCount() - MyGui["Changed_Count"].Value ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") - . Text.ADD_START_TO_LV . "`n`n======================================`n`n" + . Text.ADD_START_TO_LV . "`n`n===========================================`n`n" ; 返回主页 ControlClick(MyGui[StrReplace(tab_prop.label_name[1], "`s") . "_Tab_BUTTON"]) TrayTip(Text.COMPLETED,"Ciallo～(∠・ω< )⌒★","Mute"), SetTimer(TrayTip, -2500) @@ -973,10 +1010,14 @@ Add_Other_To_LV(*) ; 确认是否添加 If Msgbox(Text.IS_ADD_OTHER, "Ciallo～(∠・ω< )⌒★", "Icon? OKCancel") = "Cancel" Return - ; 访问ini，选择文件，写入选择的文件夹路径ini - last_selected_other_path := iniRead(info_ini_path, "info", "last_selected_other_path") + ; 访问ini + last_selected_other_path := iniRead(info_ini_path, "info", "last_selected_other_path") + ; 选择目录 If not (selected_other_path := DirSelect("*" . last_selected_other_path, 0, Text.SELECT_ICONS_FOLDER)) Return + ; 检查文件夹名称的最后一个字符是否为反斜杠（避免文件名包含"\"，导致最终变成C:**\**\\这种错误格式） + (SubStr(selected_other_path, -1, 1) = "\") ? (selected_other_path := SubStr(selected_other_path, 1, -1)) : False + ; 写入ini iniWrite(selected_other_path, info_ini_path, "info", "last_selected_other_path") ; 清空列表、计数、数组 Clean_LV() @@ -989,7 +1030,7 @@ Add_Other_To_LV(*) MyGui["Unchanged_Count"].Value := LV.GetCount() - MyGui["Changed_Count"].Value ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") - . Text.ADD_OTHER_TO_LV . "`n`n======================================`n`n" + . Text.ADD_OTHER_TO_LV . "`n`n===========================================`n`n" ; 返回主页 ControlClick(MyGui[StrReplace(tab_prop.label_name[1], "`s") . "_Tab_BUTTON"]) TrayTip(Text.COMPLETED,"Ciallo～(∠・ω< )⌒★","Mute"), SetTimer(TrayTip, -2500) @@ -1028,13 +1069,14 @@ Backup_LV_Link_To_Folder(*) ; 循环复制粘贴快捷方式至备份文件夹 Loop LV.GetCount() { - Link_Name := LV.GetText(A_Index, 1) - Link_Path := Link_Map[Link_Name . "LP"] + link_name := LV.GetText(A_Index, 1) + key := LV.GetText(A_Index, 1) . LV.GetText(A_Index, 3) + link_path := link_map[key].LP FileCopy(Link_Path, backup_folder_path, 1) } ; 添加至日志 MyGui["Log"].Value .= FormatTime(A_Now, "`syyyy/MM/dd HH:mm:ss`n`s") - . Text.HAVE_BACKUP . StrReplace(backup_folder_path, A_DesktopCommon . "\") . "`n`n======================================`n`n" + . Text.HAVE_BACKUP . StrReplace(backup_folder_path, A_DesktopCommon . "\") . "`n`n===========================================`n`n" ; 提醒已完成 TrayTip(Text.COMPLETED,"Ciallo～(∠・ω< )⌒★","Mute"), SetTimer(TrayTip, -2500) } diff --git a/AHK_Language.ahk b/AHK_Language.ahk index dd206b7..752de1a 100644 --- a/AHK_Language.ahk +++ b/AHK_Language.ahk @@ -25,19 +25,19 @@ Text := { ; Label Name HOME_ZH : " 主 页" - ,HOME_EN : " Home" + ,HOME_EN : " Home" ,OTHER_ZH : " 其 他" - ,OTHER_EN : " Other" + ,OTHER_EN : " Other" ,LOG_ZH : " 日 志" - ,LOG_EN : "Log" + ,LOG_EN : " Log" ,HELP_ZH : " 设 置" - ,HELP_EN : " Settings" + ,HELP_EN : " Settings" ,ABOUT_ZH : " 关 于" - ,ABOUT_EN : " About" + ,ABOUT_EN : " About" ;========================================================================== ; Tab: Home @@ -54,35 +54,32 @@ Text := ; Change/Restore （改变/恢复按钮的消息） ,IS_RESTORE_ALL_ICON_ZH : "是否恢复列表的所有快捷方式图标为默认图标?" - ,IS_RESTORE_ALL_ICON_EN : "Do you want to restore the icons of all shortcuts in the list to the default icons?" + ,IS_RESTORE_ALL_ICON_EN : "Do you want to restore all shortcut icons in the list as the default?" ,COMPLETED_ZH : "已完成！" ,COMPLETED_EN : "Completed!" - ,RESTORE_ALL_LINK_ICON_ZH : "恢复所有快捷方式为默认图标" - ,RESTORE_ALL_LINK_ICON_EN : "Restore all shortcuts to default icons" - ; Right-click context menu (右键上下文菜单) - ,MENU_RUN_ZH : "打开快捷方式" - ,MENU_RUN_EN : "Launch Shortcut" + ,MENU_RUN_ZH : "运行快捷方式" + ,MENU_RUN_EN : "Launch" ,MENU_CHANGE_ZH : "更换文件图标" - ,MENU_CHANGE_EN : "Change its icon" + ,MENU_CHANGE_EN : "Change" ,MENU_RESTORE_ZH : "恢复默认图标" - ,MENU_RESTORE_EN : "Restore Default" + ,MENU_RESTORE_EN : "Restore" ,MENU_OPEN_ZH : "打开目标目录" - ,MENU_OPEN_EN : "Open File Location" + ,MENU_OPEN_EN : "Explore" ,MENU_RENAME_ZH : "重新命名文件" - ,MENU_RENAME_EN : "Rename Shortcut" + ,MENU_RENAME_EN : "Rename" ,MENU_PROPERTIES_ZH : "快捷方式属性" ,MENU_PROPERTIES_EN : "Properties" ,MENU_ADD_LINK_TO_DESKTOP_ZH : "添加其至桌面" - ,MENU_ADD_LINK_TO_DESKTOP_EN : "Add to the Desktop" + ,MENU_ADD_LINK_TO_DESKTOP_EN : "Generate" ,COPY_LINK_TARGET_PATH_ZH : "复制目标路径：" ,COPY_LINK_TARGET_PATH_EN : "Copy Target Path: " @@ -105,35 +102,38 @@ Text := ,TIP_RESTORE_ZH : "恢复所有快捷方式默认图标" ,TIP_RESTORE_EN : "Restore all shortcut icons to default" + ,SAME_NAME_ZH : "存在重复名称，请重新命名" + ,SAME_NAME_EN : "Duplicate name exists, please rename" + ;========================================================================== ; Tab: Other ;========================================================================== ,ADD_DESKTOP_TO_LV_ZH : "重新加载桌面快捷方式至主页列表" - ,ADD_DESKTOP_TO_LV_EN : "Reload Desktop shortcut to the list" + ,ADD_DESKTOP_TO_LV_EN : "Reload the desktop shortcuts" - ,ADD_START_TO_LV_ZH : "更换`"开始`"菜单的快捷方式的图标" - ,ADD_START_TO_LV_EN : "Change Start shortcuts to the list" + ,ADD_START_TO_LV_ZH : "管理`"开始`"菜单的快捷方式的图标" + ,ADD_START_TO_LV_EN : "Manage shortcuts to Start Menu" - ,ADD_OTHER_TO_LV_ZH : "更换其他文件夹的快捷方式的图标" - ,ADD_OTHER_TO_LV_EN : "Change Folder shortcuts to the list" + ,ADD_OTHER_TO_LV_ZH : "管理其他文件夹的快捷方式的图标" + ,ADD_OTHER_TO_LV_EN : "Manage shortcuts to other folder" ,ADD_UWP_WSA_TO_LV_ZH : "添加UWP/WSA的快捷方式至桌面" - ,ADD_UWP_WSA_TO_LV_EN : "Add UWP/WSA shortcuts to desktops" + ,ADD_UWP_WSA_TO_LV_EN : "Add UWP/WSA shortcuts to desktop" ,BACKUP_LV_LINK_ZH : "备份列表的快捷方式至桌面文件夹" ,BACKUP_LV_LINK_EN : "Backup shortcuts to a desktop folder" ,ERROE_ADD_LINK_TO_DESKTOP_ZH : "桌面已存在相同名称的快捷方式" - ,ERROE_ADD_LINK_TO_DESKTOP_EN : "A shortcut with the same name already exists in the desktop" + ,ERROE_ADD_LINK_TO_DESKTOP_EN : "A shortcut with the same name already exists on the desktop" ,IS_ADD_DESKTOP_TO_LV_ZH : "是否重新加载桌面的快捷方式至列表，并在`"主页`"进行更换图标等操作？" - ,IS_ADD_DESKTOP_TO_LV_EN : "Do you want to Reload desktop shortcuts to the listand change icons on the home page?" + ,IS_ADD_DESKTOP_TO_LV_EN : "Do you want to reload desktop shortcuts to the list and manage shortcuts on the home page?" - ,IS_ADD_START_TO_LV_ZH : "是否添加`"开始`"菜单的快捷方式至列表，并在`"主页`"进行更换图标等操作？`n`s①不建议使用更换所有`"开始`"菜单的快捷方式图标的功能`n`s②右键可添加`"开始`"菜单的快捷方式至桌面`n`s③`"开始`"菜单的文件夹中不存在UWP应用" - ,IS_ADD_START_TO_LV_EN : "Do you want to add Start Menu shortcuts to the list?`n`s①It is not recommended to change the icons of all shortcuts in Start Menu`n`s②Context menu has the function called `"Add to the desktop`"`n`s③There are no UWP apps in Start Menu" + ,IS_ADD_START_TO_LV_ZH : "是否添加`"开始`"菜单的快捷方式至列表，并在`"主页`"进行更换图标等操作？`n`s①对于开始菜单的快捷方式，不建议使用`"更换所有快捷方式图标`"的功能`n`s②右键可添加`"开始`"菜单的快捷方式至桌面`n`s③`"开始`"菜单的文件夹中不存在UWP应用" + ,IS_ADD_START_TO_LV_EN : "Do you want to add Start Menu shortcuts to the list and manage shortcuts on the home page?`n`s①It is not recommended to change the icons of all shortcuts in Start Menu`n`s②Context menu has the function called `"Add to the desktop`"`n`s③There are no UWP apps in Start Menu" ,IS_ADD_OTHER_ZH : "是否添加其他文件夹的快捷方式至列表，并在`"主页`"进行更换图标等操作？" - ,IS_ADD_OTHER_EN : "Do you want to add shortcuts from other folders to the list and change icons on the home page?" + ,IS_ADD_OTHER_EN : "Do you want to add shortcuts from other folder to the list and change icons on the home page?" ,IS_ADD_UWP_APP_TO_LV_ZH : "是否添加UWP或APP等应用的快捷方式至桌面？`n`s①建议从(`"开始`"菜单--所有应用)中拖拽UWP/APP快捷方式至桌面`n`s②右键呼出菜单并添加指定的快捷方式至桌面" ,IS_ADD_UWP_APP_TO_LV_EN : "Do you want to add UWP or APP shortcuts to the desktops?`n`s①Suggest dragging UWP or APP shortcuts from `"Start Menu--All Apps`" to the desktop`n`s②Context menu The menu has the function `"Add to the desktop`"" @@ -153,17 +153,14 @@ Text := ,PLEASE_INPUT_ZH : "请输入" ,PLEASE_INPUT_EN : "Please input" - ,ICON_FROM_ZH : "`s`s图标库：" - ,ICON_FROM_EN : "`s`sICON`sSETS: " - ,THE_LINK_NAME_ZH : "快捷方式的名称：" ,THE_LINK_NAME_EN : "The name of shortcut: " ,LOG_CHANGED_LINK_ZH : "更换对象：" - ,LOG_CHANGED_LINK_EN : "Shortcuts with replaced icons: " + ,LOG_CHANGED_LINK_EN : "A shortcut with a replaced icon: " ,LOG_RESTORE_LINK_ZH : "被恢复默认图标的快捷方式：" - ,LOG_RESTORE_LINK_EN : "Shortcut with restore icon: " + ,LOG_RESTORE_LINK_EN : "A shortcut with a restore icon: " ,LOG_OLD_NAME_ZH : "旧名称：" ,LOG_OLD_NAME_EN : "Old Name: " @@ -194,9 +191,24 @@ Text := ,NO_CHANGE_ZH : "未更换任何快捷方式的图标" ,NO_CHANGE_EN : "The icon for any shortcut has not been replaced" - - ,VERSION_ZH : "`s`s版本：2.5" - ,VERSION_EN : "`s`sVersion: 2.5" + + ;========================================================================== + ; Tab: About + ;========================================================================== + ,GITHUB_ZH : " 官 网" + ,GITHUB_EN : "Github" + + ,DOWNLOAD_ZH : " 下 载" + ,DOWNLOAD_EN : "Download" + + ,ABOUT_HELP_ZH : " 帮 助" + ,ABOUT_HELP_EN : "Help" + + ,ISSUES_ZH : " 反 馈" + ,ISSUES_EN : "Issues" + + ,CONTRIBUTORS_ZH : " 贡献者" + ,CONTRIBUTORS_EN : "Contributors" } For name, Descriptor in Text.OwnProps() diff --git a/README.md b/README.md index a6de745..6e7f3f3 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ 2.一键更换/恢复所有快捷方式图标： * **紫色**按钮：一键**更换**所有快捷方式的图标 * **红色**按钮：一键**恢复**所有快捷方式的默认图标 -* 图标文件的后缀格式为**.ico** +* 图标文件的后缀格式为 "**.ico**" * 图标的名称需按照以下规范命名 * 图标的全名称包含于快捷方式的名称（例如图标名称为"Chrome"，快捷方式名称为"Chrome Canary"） diff --git a/lib/AHK_Base64PNG.ahk b/lib/AHK_Base64PNG.ahk index aa1f4da..3bcf577 100644 --- a/lib/AHK_Base64PNG.ahk +++ b/lib/AHK_Base64PNG.ahk @@ -62,7 +62,7 @@ RESTORE_ALL_ACTIVE_PNG_BASE64 := ' ; 菜单：更换文件图标 MENU_CHANGE_PNG_BASE64 := ' ( - iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAMAAABrrFhUAAAB1FBMVEUAAAA9kUHs7/Hs7/Hs7/Hs7/Hq7vFElEjs8PKEwo9QsFRWs1rs7/Hs7/Hs7/Hr7/Ht7/KNxZPt7e1ClEZSsldWslns7/Dr7vBht2Xs8PHs7/FfomHr7/FvvnTs7/Jlqmnr7vCJwo2FuI5LmE9btWBElUhZtV5SnFVNmlFNmVFLmU9TnFdht2VTnFdkumjs7vHs7vBRnFVyvnhnqW1epGOCxIfs7e99tYF8xICYz59iuGfs7vFVsFrs7vFdtWDs7/BmuWpPrVNluWluvHLv7/Tr/v7s7/E4jjxMr1D/wQdCnkaVwJlXs1vM4tDk6+lkpmie0KP/ww/s7/D03ZL+xBTu69z/wgv124r313P31GjZ59340lr8yjL9xyTt7uzu6tnu6tbv6c7H3szx5Lj6zUX6zUL8yS3n7Ozt7OLU49m627/z36BrvG/31Wv40l9aoF5OsFL9xh3t7env58jw5sPy47Goy62o1Kzy4auh0aabxKDz35yGuYr12YH12H13sHv402NUnln50FNMrlD7yzjp7u7O49Ov1rOjyKjz4KTz4KKbz5+Zwp2XwpyXzZuPypOGxop8s4B0v3hsqnD31Wxnp2tgt2RctWBZq1350FL5z1BLmE/qIaJRAAAARnRSTlMA/ub5890R+EUG/vfwmX9qLBcO/vzv6b+5rKNtWllUQzIfG/Tz7uzcxLiqoJ6WkoqHemViWFFKRToS2b2yrquihH15bzINgsNSsAAABndJREFUeNrs2E1qwzAQBeCHbAkF/IcXMTHG+AbJKptSumnnAL3/YYpJTZzWbbzWe98NBknzNAMRERERERERERERERERERFh1dRl54vMkpAVvivrBrvF/mgJOvbXA55rK2fJclV4Vv4lt6Tl5xb/GBM+/YUb8JdwMgqvAZvevZHwEzbExF//Wh7xy5hI6O+TjfghUtVvlkU8mIju/00+YSXQ9L87H3BHkn+PTsBiMEoDvn0Q/P+2uBY3ZyN1AWaBLgEWecCsMloVABxIO8DMAcDViEUAvRF7A5Dk/m8vBzRGrUFt1GqURq1EZ9ReQDgIr3kUxuyzANkq7Itde1ttIorCOL6Kj+A7fWEhtExmchhzbg5NCUlIW0vpuaWCil6IeqG+rDfCLmmStQKLvWe3/b3B9x/myCx7Q3jhXgPghSNspXxcazwskmrWGuSTCp4BwhY61yN+pDq8aCN2BLVKnvCyRVpG3AhaacarNE8QNYLO+J7XqNYQM4JKp8nr5TGfBgSNTos3aURcgKAwHvFmdUSLoPCbJRPEiiBLWZR1ESmCqJKx7A8iRRDlrNFHnAiSTsIaA8SJILlmnR6iRBCUW/zf87wVEgTHrDRClAiCGmvF+XmAIGiw1hliRBA8sFacb4UEwYK1fiJGBEHCWjPEiCCoslYDMSIIMta6RYwIghZzyCehj/vn3/fmd/Mfl6eHsKcIMGCtFOYOL/+WnPn5LswRBDlr9WHs/U1pydtvBzBGEExYKTmCrU87pafu9mGLIKiw0hCmDm5KK+2cwhRBMgxyCdj9VVrnKywRJBeskoxhaHevtN47GCJI2i3WmMKE2++pAEGUskLShQW331cBgqjcZNkVLLj93goQZCdVljTbMOD2+ytAUKixIOvBgNvvsQBBY8obVT/AgNvvswBBozzbuP8zDLj9XgsQVMp1XiszPv5+CxCUvmS8WtP4/PdcgKDVvecVkivj67/vAgS9/uDJ/Nz6+cd7AcI2evXRo/XDtAITbr//AoQtVc5q01njtp72j2DE7fdeoED/Crv9PgsUJ4Db77VAYQK4/X4LFCWA2++5QEECuP2+CxQjgNvvvUAhArj9/gsUIYDbH6BAAQK4/SEKhA/g9gcpEDyA2x+qACEMtz9wAUIQbn/oAoQQ3P7gBf5xQ8coCANRFEV/7cYcJErqlGnEkCJdyAa0EFQs1OXaCB8xchnI58G88nX3SAC8Xy+gAfB+uYAIwPu1AosB7NrTdK7HrvFL1M8CywM0Uz+kzx7XVtjPAgEAh9uQvtZ3on4WCADYX1bpZ/dG0M8CEQBNn+ZWdYJ+EogAOD7T/IZR0A8CAQDbKv1drelnAQbI72cB7hcIMAD3g4CwnwUYgPtBQNjPAgzA/Sig62cBBuB+FtD1swADcD8L6PpZgAG4nwV0/SzAANzPAtJ+FrCofhdQ9rOAhfW7gLCfBSyu3wV0/Sxggf0uIOtnAQvs973WorGARfb7NmvNWMCy+wsTsNz+0gQss784AcvrL0/AsvoLFLCc/hIF3tzQQREAAAzCsPpXPQvwYlcJCYVfOUDudw4Q+6UDpH7rAKFfO0Dm9w4Q+cUDJH7zAInfPEDkFw+Q+b0DhH7tAKnfOkDslw6Q+50DFH7lAI3fOEDlFw7Q+X0DlH7dAK3fNkDtlw0w948H2Pu3AzzwTwf44F8O8MI/HOCHfzfAE/+xZ2+rCQNRFIbXXAXtVbBCIUhIrPUseEItpfRws9/LFy+tBSk14iF7Zkn29wbrh8yEJFgBsOwPVQA0+wMVAM/+MAVAtD9IATDtD1EAVPsDFADXfv8FQLbfewGw7fddAHT7PRcA336/BUC432sBCKXCAlUJUFigMgG8FUBdSPkp4DgPQX8FGngUWj4KtPEsvDwU6OJViOkXGOBDmKkXmGIp1LQLrFC7E2q6BSIAD8JNtUAfwEzIaRaYA/TPgGaBqAYAE2GnVmCMb9m9sFMq4DL8GAk9nQJD7MT0p4BOgSjGr0/hp1Agwc4NvAuoFOhhL28Kv5ILdHJgb81/E5RcwKX4o0X7aUyngFsAVS7gEvzTqtBT4BY4YP0k/Eop0Elx0KYit2EvR5HZDVyH1xaIEhyxmfC/Fl9VwA1jHBe/0R8FlxeIxhlOsBwR/y25vEDUn9dwqvT9pVnfboXUeQVco90dTFcwxhhjjDHGGGO+2oMDAQAAAABB/taDXAEAAAAwFaN9ZQ8N2CxbAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAMAAABrrFhUAAACZ1BMVEUAAACZ1v+Z1v+Z1v+Z1v+Z1v+Z1v8djcwjkM4ok9Exl9UrlNJwp89Dot0ultQcjMxbpNRGkcI2m9g9n9sij84nktArlNIrlNI8ntp5t+ZDot14tOFDot1Dot0nktFeiahDot2Z1v93s95Dot1Dot1Dot1Dot1Dot2Z1v8hj84jkM5omb6Z1v9Dot14tuQfjs10rtkkkM8mktBDot2Y1v+Z1v+Z1v8rlNI2m9dfiqqZ1v8gjs1zq9VyqdNDot1Dot2Z1v+Z1v9Dot0ok9GZ1v9ikbJDot2Z1v9hjq9Dot1Dot1Dot0sldOZ1v8sldOZ1v+Z1v91sNxxqNGZ1v9wps6Z1v9Dot1Dot0lkc+Z1v8lkdBrnsRpnMGZ1v9Dot1Dot1Dot1Dot2Z1v9Dot0qlNJDot1Dot1Dot1gja2Z1v9fi6tDot1Dot1ch6aZ1v9chqWZ1v8ij85uo8tuo8mZ1v9tociZ1v8mkdAnktBnmLtmlrkpk9GZ1v+Z1v9Dot2Z1v+Z1v+Z1v+Z1v+Z1v9Dot1vpc2Z1v9soMZsn8VqncImktBpm79llbiZ1v9kk7YplNFikLKZ1v9gjq8rldKZ1v8sldNch6YulM8ij86Z1v8ikM6MzvqZ1v8pk9Epk9FDot1Dot1kk7Upk9FDot2Z1v8qlNIqlNIrlNKZ1v8Xicl4uetDot2AwPAYisp5uut6uup6uelGpN+W1f6Nz/tZr+ZMqOFvve8bichIksE4jL+T0/2HzPiCyfZ+xvVquu1itepRq+N2tOJmpdBYmsYhicUtisF1wfFxr9tuq9dgoMslicNAj7+Av+3TpBUYAAAAqHRSTlMAKvVg1aAJ+dycE03ggBb7BQkYC+KoWVMe/fr5urOiKf769/HdkvXr6ejfqT0s+/Lw0rWrpZlZTzs38+zp5uLEtq+Xl4Fzb2lcWkUyMRwbEwz04uDd3NbOzMjHwrarpZ2Kend1cWZgT01KQ0EnIBYQ7uTW0tDNw7+uoJWPcWxTRzUmIhEO2dbIxbq3sI6Nh3tsY1hELCUY/Obi4MafioeGhISDgW9oYl33TAcXAAAJ60lEQVR42uzdTUsbURQG4GusXQiW2GwkTCAhX13ElVGKi2iDRFTEgLTiQq2KiijSRemqttZKd10UuikUWmgXB86qn4t+r/q76gFBim0yc+ZM7h1Onn/wJvPe3Lkz98Z0dXV1dXV1dcVF32WjG1zqMaoBJHqNZnBKdQ3glOoaUH7VNaD4qmtA4VXXgLKrrgFFV10DCq66BpRbdQ0otuoaUGjVNaDMqmtAkVXXgAKrrgHlVV0Diqu6BhRWdQ0oq+oaUFTVNaCgqmtAOVXXgGKqrgGFVF0Dyqi6BhRRdQ0ooOoaUD7VNaB4qmtA4VTXgLKprgFFU10DCqa6BpRLdQ2ASNZg4Mzm1szO7PXhoSsp47J5IJI1wAuy+XJhacJbfb29N2RcsXA0tjE6eTMHRLQG2FK64BW3h41VPYcrd8ehDX4N0IfSRHFm39hw/Kx6Dfzg1wD9KtR3Tkwnzfe+XAS/+DXAANIT652qw+P7l4CBUQMMaKlx1USuUk0AA6sGGFjam0mZyNCX/wQYuDVAjvyryC6DSjUHDPwaIE+pHskcYYz75fNrgFzpVfEBsbIMXPwaIF92TbQIPZPAx68BhpFfHzRCDkYZ3ZeoAYZTmzESmlMJYJCoAYblCYyG04z5rlQNMLT8dtirn1F+uRqggEyowfAh4+sXrAFKKD8wXMmnwCBYA5Rx2/A8ugsMkjVAIV6/YXg2DgyiNUApheHgtz0rwCBcAxRTCjoQPF8Ey6gGKCfbCDbzvwPWndYAJW0a/3YTYJ/0B4AD/m98c2AfowJSP4eH4ICzQVBW0fgxBfad/wzKWjPtjYJ95xMhaattZ79VsO98KixvJNk6/yRY5+tmiC8z6Pj17/N2mM9r8QlsgHX+F0T4Lfj/7z9wuLwkFmw+ULE+/2EsirJs/fv23/r8n7EszpOeNRcd3AQGZx+MtJa/uD5weRlY3Hw01lbtwlLpDWBx8uGoH0sp8xfW8qebj8d9yvy9/A0s7r0gwbw1XOAt/zv3ikwwDUcGAMZLUjKyO+ZML3C58pocT2nOGHI8DhYwXpQUV+g3xOIMINHr52XpN7eLayMZ71YJpWWsLIHx9wxcmXuwOVJGQevGHOVAwIuVjUqTcflzzDUyeRSS3msK3ALcO5zv9IaJuU2hD6FchZCW385b2jIzm8liaB8hnBtHNjdN7ddLGM67DxBCrtpje9tc/0AZw/gBIUweu7BxcnDrFrJ9eg9s18ac2Tq7U0Om78DWt+DQ5umTerbDI+CdXce2z+8VOjoCXnrk3AEKqWIWg/rM/u1runiERuCL4Bd3BJxy9BCVwSIG8g14pt09Rmc7jf795OZ3+SCl2bz/KcAXZn63j9IarkU8BZh2/TC1oaVIC7Dh/nF6J16EU4C+OByomFzD9n7zFj6S8ThSsx7RHHjxIC6Hqo5EUoDx57E5VjfpRTEHHovRwcqpCfk58Eqsjtbub7VK8pW1/rEQr8PVh2rCy2C7cTtef78sugw2Gr8/WLieFrwJXGzG8C82GoJz4N1Y/snKH/LurLWJKAwD8HeXuJDFWG0MGg0upJE0rYiNbRGphapVUKoUWwShQimW4r6CV+KKiuKCoqCg8h3MSe5s8cp9/VH6YV2iTZ2zzJyTnucfzNv3TTIzhbNG203gxvo8ZiexW9MA1m+r04OWDqzU8w1wpm6P2tqs5SfQkVj9Hra2ovoe4KVUAVZD/R63F9ugfg+wFqCOD1xsXKV6E0y/gev5yM0tSxWfAtEl1fWhq/vUHoMeq/9jdxerfAAsE/mbhiNgo9nLFd4EbwIBGFoINtq6SPo9yC6hUiOWloCN9tMvAClnQQR+N38eWGjve7nrvw9CkEQXgH0Gnkv5emedeABYagDbnGRy3mBou2gAZP52sEo3Z1JeIeJd0QAsnMEwZ1L4O/zukmAA9s0gXWFyPiGSIbEArJvBWJ7JSb6YrHOvUADWzWAHkzSBk5oTIgFYNoNYgUl6jb+0iARg1wzi0n//ygv8rUsgAKtmMJZhsr5UlXmh9wBsmsHtFJP1EatEGz0HYNEMRvNMVvktVmtPeA3Anhmkk0zaOP6tyWsA1sygp8IUBvCvFskATN0i5ziTVnmLUzjuLQA7ZhDbyeTxCZxSg6cArJhBMcUUvMEaZnkJwIYZdJeZgg9YU6tCABgKbAYXOFNQ/oy19csHENgD0+t5puQLTqcpIRCAiRmMdjI1n3B67RGFAPx/b5ArMzWvkMhOGYnBGQynmCL+2cM1tHoIwMQMRjo5UzWOXrT3CgQQ1AyuFzhT9hq9KT2oHYCZGZxKMXX0FNCr9qeyAZB7EdApPphkOvB3KCC7QCYA/TOIn+ooMy34BIo5uE4wAP0zGL28gzNdxlFYtisiFQBpUp7ByPkUZ/q8QRmlg6dnCwegPoOey3MzFabVa5RVmn+6TSAAtRmkh68cLSQ50+4DKik1hxuGbgHWJjeDuZM6CplUslLmzC+vXqAGUaxNbgYsIJW3aATNwIYAyu/QFJqB8QD4BJpDMzAcAB9Hk2gGZgO4mEWzaAYGAzgHkRCaRTMwFkAHALSV0CyagaEAdgIZQvOaIiYC6IMfGtC80LrgAzgEP7WgeaVZQQdwFMCqBDAcCTSAAfhTP1qAZhBUAHwQqu1BC9AMggmAXwGwMQGaQRABVG7Av46jDWgGvgeQSsNULqENaAY+B1CIw9Ra0QrhiL8BHIaaTqAVaAa+BcBPwlQs+k2INAPfAsiPwLRmmb8zQhKe7U8A52LwHwuiaIXQHB8CKF+F/2s0/4SE0AyYZpk0VLP6y0B7APwCeDVkwQy0TyAzDN71NqNR+j8EyzkQEu9Hg/R/DXaMgqiHJTSF6q81gGQ3SLhpagZUf50B8PMgqSuKBmi+GeJ9aZAW2RP4Dqj+GgPgO9Og5GYWA0X1/0398oug7FoIg6L5kRjvLIIOidagdkD11xZAua8IuvSGMQhUf10BpHJx0Glh2O8W6HwxwjtvgHaNJ0LoJ6q/ngDyg2Pgj2tZ9A3VX0cA+UM94KO2PVH0BdVfOQCeGSiC3xJdzagd1V81AF7I3YZgzDmRLaFOVH+lAMo7Dj+KQZDiT47rKwLVXzoAnpp7sghGzHvcEkJ1VH+pAHgy03mxB8zq7eo/GFLaA9W/thoX3nE4150Ge9x6drq1pT2Kwqj+Xv5Zuu/Q0YHB3Kmr3T0j6TGwVqwNBVH9ZxQUQ/WfWVAE1X+mwR/crD9BJI7WnyCiu/UnTtefOF1/4nT9idP1J07Xnzhdf+J0/YnT9SdO1584XX/idP2J0/UnTtefOF1/4nT9idP1J07Xnzhdf+J0/YnT9SdO1/9bu3RMBAAAw0DIv+vee+hG0EDo/qH7h+4fun/o/qH7h+4fun/o/qH7h+4/MzMzrw73IQuI1RfH7QAAAABJRU5ErkJggg== )' ; 菜单：恢复默认图标 @@ -83,7 +83,7 @@ MENU_RENAME_PNG_BASE64 := ' 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 )' -; 菜单的添加至桌面 +; 菜单：添加其他快捷方式至桌面 MENU_DESKTOP_PNG_BASE64 := ' ( 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 diff --git a/lib/Class_Button.ahk b/lib/Class_Button.ahk index 9556922..03500df 100644 --- a/lib/Class_Button.ahk +++ b/lib/Class_Button.ahk @@ -73,9 +73,10 @@ Class CreateButton Text( obj:={R:15, normal_color:"", active_color:"", Text:"", text_options:"+0x200 center", text_margin:"", font_options:"", font:""} ) { default_name := StrReplace(this._name, "`s") . "_NORMAL" - active_name := StrReplace(this._name, "`s") . "_ACTIVE" - button_name := StrReplace(this._name, "`s") . "_BUTTON" - + active_name := StrReplace(this._name, "`s") . "_ACTIVE" + button_name := StrReplace(this._name, "`s") . "_BUTTON" + obj.R := Obj.HasOwnProp("R") ? ((!obj.R) ? "0" : obj.R*(A_ScreenDPI/96)) : "0" + ; Change to the correct colour format (e.g. 0xff000000) For obj_name, descriptor in obj.OwnProps() { @@ -95,19 +96,25 @@ Class CreateButton } ; Normal PNG image (常态图片) - MyGui.AddPicture("x" . this._x . " y" . this._y . " w" . this._w*(A_ScreenDPI/96) . " h" . this._h*(A_ScreenDPI/96) . " v" . default_name . " +0xE -E0x200") + If !Instr(obj.normal_color, "0x00") + { + MyGui.AddPicture("x" . this._x . " y" . this._y . " w" . this._w*(A_ScreenDPI/96) . " h" . this._h*(A_ScreenDPI/96) . " v" . default_name . " +0xE -E0x200 BackgroundTrans") + Gdip_SetPicRoundedRectangle(MyGui[default_name], obj.normal_color, obj.r, isFill:="True") + } ; Active PNG image (活跃态图片) - MyGui.AddPicture("x" . this._x . " y" . this._y . " w" . this._w*(A_ScreenDPI/96) . " h" . this._h*(A_ScreenDPI/96) . " v" . active_name . " +0xE -E0x200 Hidden") - ; Setting the rounded corners of pictures（设置图片圆角） - obj.R := Obj.HasOwnProp("R") ? ((!obj.R) ? "0" : obj.R*(A_ScreenDPI/96)) : "0" - Gdip_SetPicRoundedRectangle(MyGui[default_name], obj.normal_color, obj.r, isFill:="True") - Gdip_SetPicRoundedRectangle(MyGui[active_name], obj.active_color, obj.r, isFill:="True") + If !Instr(obj.active_color, "0x00") + { + MyGui.AddPicture("x" . this._x . " y" . this._y . " w" . this._w*(A_ScreenDPI/96) . " h" . this._h*(A_ScreenDPI/96) . " v" . active_name . " +0xE -E0x200 Hidden BackgroundTrans") + Gdip_SetPicRoundedRectangle(MyGui[active_name], obj.active_color, obj.r, isFill:="True") + } + ; Top text button (顶层文本按钮) MyGui.AddText("x" . this._x . " y" . this._y . " w" . this._w . " h" . this._h . " v" . button_name . " BackgroundTrans " . obj.text_options, obj.Text) If (obj.HasOwnProp("font_options") and obj.HasOwnProp("font")) { MyGui[button_name].SetFont(obj.font_options, obj.font) } + ; If the active_color format is 0x00, the control is simply an image and not a button（若活跃态颜色是0x00，则返回，即创建图片而不是按钮） If Instr(obj.active_color, "0x00") Return @@ -176,16 +183,16 @@ Class CreateButton If (tab_prop.HasOwnProp("label_indicator")) { static indicator_x := tab_prop.label_indicator.margin_left="center" ? this._x + ((this._w - tab_prop.label_indicator.w) / 2) : (this._x + tab_prop.label_indicator.margin_left) - , indicator_y := tab_prop.label_indicator.margin_top="center" ? this._y + ((this._h - tab_prop.label_indicator.h) / 2) : (this._y + tab_prop.label_indicator.margin_top) - , indicator_r := (tab_prop.label_indicator.HasOwnProp("R") and tab_prop.label_indicator.R!="") ? tab_prop.label_indicator.R*(A_ScreenDPI/96) : "0" + , indicator_y := tab_prop.label_indicator.margin_top="center" ? this._y + ((this._h - tab_prop.label_indicator.h) / 2) : (this._y + tab_prop.label_indicator.margin_top) + , indicator_r := (tab_prop.label_indicator.HasOwnProp("R") and tab_prop.label_indicator.R!="") ? tab_prop.label_indicator.R*(A_ScreenDPI/96) : "0" } ; Set logo properties If (tab_prop.HasOwnProp("logo_symbol")) { static symbol_x := tab_prop.logo_symbol.margin_left="center" ? this._x : (this._x + tab_prop.logo_symbol.margin_left) - , symbol_y := this._y - , symbol_w := this._h - , symbol_h := this._h + , symbol_y := this._y + , symbol_w := this._h + , symbol_h := this._h } ; Change to the correct colour format (e.g. text color:=000000, active color:=0xff000000) For obj_name in tab_prop.OwnProps() @@ -211,7 +218,7 @@ Class CreateButton ; Loop to create labels to the tab Loop tab_prop.label_name.Length { - actve_name := StrReplace(tab_prop.label_name[A_Index], "`s") . "_ACTIVE" ; 使用StrReplace: 控件名称v不支持空格 + active_name := StrReplace(tab_prop.label_name[A_Index], "`s") . "_ACTIVE" ; 使用StrReplace: 控件名称v不支持空格 indicator_name := StrReplace(tab_prop.label_name[A_Index], "`s") . "_INDICATOR" button_name := StrReplace(tab_prop.label_name[A_Index], "`s") . "_Tab_BUTTON" symbol_name := StrReplace(tab_prop.label_name[A_Index], "`s") . "_SYMBOL" @@ -219,10 +226,10 @@ Class CreateButton ; Create the label to Hidden the Tab (创建标签至隐藏的标签页) Tab.Add([StrReplace(tab_prop.label_name[A_Index], "`s")]) ; 后续的文本按钮文本显示有空格，但文本按钮名称不包含空格，后续Tab_Click函数根据名称来判断，所以创建隐藏Tab也要去空格 ; Create active/indicator Picture (and Set Rounded Corners) （创建活跃图片、活跃指示器，并设置圆角） - MyGui.AddPicture("x" . active_x . " y" . ((this._h + label_distance)*(A_Index-1) + active_y) . " w" . tab_prop.label_active.w*(A_ScreenDPI/96) . " h" . tab_prop.label_active.h*(A_ScreenDPI/96) . " v" . actve_name . " backgroundtrans +0xE -E0x200 Hidden") - (tab_prop.HasOwnProp("label_indicator")) ? MyGui.AddPicture("x" . indicator_x . " y" . ((this._h + label_distance)*(A_Index-1) + indicator_y) . " w" . tab_prop.label_indicator.w*(A_ScreenDPI/96) . " h" . tab_prop.label_indicator.h*(A_ScreenDPI/96) . " v" . indicator_name . " backgroundtrans +0xE -E0x200 Hidden") : "" - Gdip_SetPicRoundedRectangle(MyGui[actve_name], tab_prop.label_active.color, active_r, isFill:="True") - (tab_prop.HasOwnProp("label_indicator")) ? Gdip_SetPicRoundedRectangle(MyGui[indicator_name], tab_prop.label_indicator.color, indicator_r, isFill:="True") : "" + MyGui.AddPicture("x" . active_x . " y" . ((this._h + label_distance)*(A_Index-1) + active_y) . " w" . tab_prop.label_active.w*(A_ScreenDPI/96) . " h" . tab_prop.label_active.h*(A_ScreenDPI/96) . " v" . active_name . " backgroundtrans +0xE -E0x200 Hidden") + Gdip_SetPicRoundedRectangle(MyGui[active_name], tab_prop.label_active.color, active_r, isFill:="True") + (tab_prop.HasOwnProp("label_indicator")) ? MyGui.AddPicture("x" . indicator_x . " y" . ((this._h + label_distance)*(A_Index-1) + indicator_y) . " w" . tab_prop.label_indicator.w*(A_ScreenDPI/96) . " h" . tab_prop.label_indicator.h*(A_ScreenDPI/96) . " v" . indicator_name . " backgroundtrans +0xE -E0x200 Hidden") : False + (tab_prop.HasOwnProp("label_indicator")) ? Gdip_SetPicRoundedRectangle(MyGui[indicator_name], tab_prop.label_indicator.color, indicator_r, isFill:="True") : False ; Create logo If tab_prop.HasOwnProp("logo_symbol") @@ -241,10 +248,10 @@ Class CreateButton If (A_Index != 1) Continue MyGui.Focus_Tab := MyGui[button_name] - MyGui[actve_name].Visible := True + MyGui[active_name].Visible := True (tab_prop.HasOwnProp("label_indicator")) ? (MyGui[indicator_name].Visible := True) : "" MyGui[button_name].SetFont("c" . tab_prop.label_prop.font_active_color) - (tab_prop.HasOwnProp("logo_symbol")) ? MyGui[symbol_name].Setfont("c" . tab_prop.label_prop.font_active_color) : "" + (tab_prop.HasOwnProp("logo_symbol")) ? MyGui[symbol_name].Setfont("c" . tab_prop.label_prop.font_active_color) : False } } }