diff --git a/Core/CapslockX-Config.ahk b/Core/CapslockX-Config.ahk index e1d110f6..f9775821 100644 --- a/Core/CapslockX-Config.ahk +++ b/Core/CapslockX-Config.ahk @@ -1,5 +1,27 @@ ; 保存为 save with UTF8 with DOM -; + +if (!!CapsLockXConfigPath){ + 清洗为_UTF16_WITH_BOM_型编码(CapsLockXConfigPath) + ; 基本设定 + ; [Core] + global T_AskRunAsAdmin := CapsLockX_Config("Core", "T_AskRunAsAdmin", 1, "是否请求提升权限(例如模拟鼠标等功能需要管理员权限才能正常运行,如果不需要可以关掉)") + global T_XKeyAs := CapsLockX_Config("Core", "T_XKeyAs", 1, "使用 Insert、CapsLock、Space、ScrollLock 作为引导键的开关,默认只启用 Space 和 CapsLock") + global T_XKeyAsSpace := CapsLockX_Config("Core", "T_XKeyAsSpace", 1, "使用 Space 作为引导键") + global T_XKeyAsCapsLock := CapsLockX_Config("Core", "T_XKeyAsCapsLock", 1, "使用 CapsLock 作为引导键") + global T_XKeyAsInsert := CapsLockX_Config("Core", "T_XKeyAsInsert", 0, "使用 Insert 作为引导键") + global T_XKeyAsScrollLock := CapsLockX_Config("Core", "T_XKeyAsScrollLock", 0, "使用 ScrollLock 作为引导键") + global T_XKeyAsRAlt := CapsLockX_Config("Core", "T_XKeyAsRAlt", 0, "使用 右 Alt 作为引导键") + global T_UseScrollLockLight := CapsLockX_Config("Core", "T_UseScrollLockLight", 0, "是否使用 ScrollLock 灯来显示 CapsLockX 状态(不建议") + global T_UseCapsLockLight := CapsLockX_Config("Core", "T_UseCapsLockLight", 0, "是否使用 CapsLockX 灯来显示 CapsLockX 状态(强烈不建议") + global T_SwitchSound := CapsLockX_Config("Core", "T_SwitchSound", 0, "是否开启声音提示(默认不开)") + global T_SwitchSoundOn := CapsLockX_Config("Core", "T_SwitchSoundOn", "./Data/NoteG.mp3", "CapsLockX按下声音提示路径") + global T_SwitchSoundOff := CapsLockX_Config("Core", "T_SwitchSoundOff", "./Data/NoteC.mp3", "CapsLockX弹起声音提示路径") + ; 不同模式下的拖盘图标 + ; global T_SwitchTrayIconDefault := CapsLockX_Config("Core", "T_SwitchTrayIconDefault", "./Data/XIconWhite.ico", "CapsLockX默认托盘显示图标,默认" "./Data/XIconWhite.ico") + global T_SwitchTrayIconOff := CapsLockX_Config("Core", "T_SwitchTrayIconOff", "./Data/XIconWhite.ico", "CapsLockX弹起托盘显示图标,默认" "./Data/XIconWhite.ico") + global T_SwitchTrayIconOn := CapsLockX_Config("Core", "T_SwitchTrayIconOn", "./Data/XIconBlue.ico", "CapsLockX按下托盘显示图标,默认" "./Data/XIconBlue.ico") +} + 清洗为_UTF16_WITH_BOM_型编码(path){ static 锁 := 0 if(锁) @@ -15,7 +37,6 @@ CapsLockX_ConfigSet(field, varName, setValue, comment := ""){ MsgBox, 配置文件目录设定异常 return } - 清洗为_UTF16_WITH_BOM_型编码(CapsLockXConfigPath) content := setValue ; 对配置自动重新排序 if(comment){ @@ -32,7 +53,6 @@ CapsLockX_Config(field, varName, defaultValue, comment := ""){ MsgBox, 配置文件目录设定异常 return } - 清洗为_UTF16_WITH_BOM_型编码(CapsLockXConfigPath) IniRead, %varName%, %CapsLockXConfigPath%, %field%, %varName%, %defaultValue% content := %varName% ; 千层套路XD ; 对配置自动重新排序 @@ -44,24 +64,3 @@ CapsLockX_Config(field, varName, defaultValue, comment := ""){ IniWrite, %content%, %CapsLockXConfigPath%, %field%, %varName% return content } - -if (!!CapsLockXConfigPath){ - ; 基本设定 - ; [Core] - global T_AskRunAsAdmin := CapsLockX_Config("Core", "T_AskRunAsAdmin", 1, "是否请求提升权限(例如模拟鼠标等功能需要管理员权限才能正常运行,如果不需要可以关掉)") - global T_XKeyAs := CapsLockX_Config("Core", "T_XKeyAs", 1, "使用 Insert、CapsLock、Space、ScrollLock 作为引导键的开关,默认只启用 Space 和 CapsLock") - global T_XKeyAsSpace := CapsLockX_Config("Core", "T_XKeyAsSpace", 1, "使用 Space 作为引导键") - global T_XKeyAsCapsLock := CapsLockX_Config("Core", "T_XKeyAsCapsLock", 1, "使用 CapsLock 作为引导键") - global T_XKeyAsInsert := CapsLockX_Config("Core", "T_XKeyAsInsert", 0, "使用 Insert 作为引导键") - global T_XKeyAsScrollLock := CapsLockX_Config("Core", "T_XKeyAsScrollLock", 0, "使用 ScrollLock 作为引导键") - global T_XKeyAsRAlt := CapsLockX_Config("Core", "T_XKeyAsRAlt", 0, "使用 右 Alt 作为引导键") - global T_UseScrollLockLight := CapsLockX_Config("Core", "T_UseScrollLockLight", 0, "是否使用 ScrollLock 灯来显示 CapsLockX 状态(不建议") - global T_UseCapsLockLight := CapsLockX_Config("Core", "T_UseCapsLockLight", 0, "是否使用 CapsLockX 灯来显示 CapsLockX 状态(强烈不建议") - global T_SwitchSound := CapsLockX_Config("Core", "T_SwitchSound", 0, "是否开启声音提示(默认不开)") - global T_SwitchSoundOn := CapsLockX_Config("Core", "T_SwitchSoundOn", "./Data/NoteG.mp3", "CapsLockX按下声音提示路径") - global T_SwitchSoundOff := CapsLockX_Config("Core", "T_SwitchSoundOff", "./Data/NoteC.mp3", "CapsLockX弹起声音提示路径") - ; 不同模式下的拖盘图标 - ; global T_SwitchTrayIconDefault := CapsLockX_Config("Core", "T_SwitchTrayIconDefault", "./Data/XIconWhite.ico", "CapsLockX默认托盘显示图标,默认" "./Data/XIconWhite.ico") - global T_SwitchTrayIconOff := CapsLockX_Config("Core", "T_SwitchTrayIconOff", "./Data/XIconWhite.ico", "CapsLockX弹起托盘显示图标,默认" "./Data/XIconWhite.ico") - global T_SwitchTrayIconOn := CapsLockX_Config("Core", "T_SwitchTrayIconOn", "./Data/XIconBlue.ico", "CapsLockX按下托盘显示图标,默认" "./Data/XIconBlue.ico") -} \ No newline at end of file diff --git "a/Modules/\345\272\224\347\224\250-\345\256\232\346\227\266\344\273\273\345\212\241.ahk" "b/Modules/\345\272\224\347\224\250-\345\256\232\346\227\266\344\273\273\345\212\241.ahk" index f08c0bf1..7de614f2 100644 --- "a/Modules/\345\272\224\347\224\250-\345\256\232\346\227\266\344\273\273\345\212\241.ahk" +++ "b/Modules/\345\272\224\347\224\250-\345\256\232\346\227\266\344\273\273\345\212\241.ahk" @@ -27,15 +27,15 @@ Return global T_ScheduleTasks_UsingHighPerformanceTime := CapsLockX_Config("ScheduleTasks", "T_UsingHighPerformanceTime", "0", "") if(T_ScheduleTasks_UsingHighPerformanceTime) return - ToolTip, 正在配置系统高精度时间 - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "FrequencyCorrectRate" /t REG_DWORD /d 2 /f - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "UpdateInterval" /t REG_DWORD /d 100 /f - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MaxPollInterval" /t REG_DWORD /d 6 /f - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MinPollInterval" /t REG_DWORD /d 6 /f - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MaxAllowedPhaseOffset" /t REG_DWORD /d 0 /f - RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\TimeProviders\NtpClient" /v "SpecialPollInterval" /t REG_DWORD /d 64 /f - RunWait net stop w32time - RunWait net start w32time + ToolTip, 定时任务开启,正在为您配置系统高精度时间 + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "FrequencyCorrectRate" /t REG_DWORD /d 2 /f,, Hide + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "UpdateInterval" /t REG_DWORD /d 100 /f,, Hide + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MaxPollInterval" /t REG_DWORD /d 6 /f,, Hide + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MinPollInterval" /t REG_DWORD /d 6 /f,, Hide + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\Config" /v "MaxAllowedPhaseOffset" /t REG_DWORD /d 0 /f,, Hide + RunWait reg add "HKLM\SYSTEM\CurrentControlSet\Services\W32Time\TimeProviders\NtpClient" /v "SpecialPollInterval" /t REG_DWORD /d 64 /f,, Hide + RunWait net stop w32time,, Hide + RunWait net start w32time,, Hide CapsLockX_ConfigSet("ScheduleTasks", "T_UsingHighPerformanceTime", "1", "") ToolTip }