From c8f4a219412161f79c770028b23e686f12bb9cbf Mon Sep 17 00:00:00 2001 From: Jax <80020581+EnhancedJax@users.noreply.github.com> Date: Tue, 14 Dec 2021 22:30:08 +0800 Subject: [PATCH] v1.5 patch 2 --- @Resources/Act.inc | 41 +--------------------------------- @Resources/Actions/Hotkeys.ini | 28 ++--------------------- @Resources/KeylaunchVars.txt | 1 - Core/Actions.inc | 2 +- Core/GenKeylaunchKey.lua | 5 +++++ 5 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 @Resources/KeylaunchVars.txt diff --git a/@Resources/Act.inc b/@Resources/Act.inc index f06bf52..a1088b0 100644 --- a/@Resources/Act.inc +++ b/@Resources/Act.inc @@ -1,41 +1,2 @@ [Variables] -Total=13 -1Name=Discord -1Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Discord Inc\Discord.lnk"] -1Icon=Discord_lnk -2Name=Spotify -2Action=["C:\Users\enhan\AppData\Roaming\Spotify\Spotify.exe"] -2Icon=Spotify_exe -3Name=Edge -3Action=["C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"] -3Icon=msedge_exe -4Name=Office -4Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\WPS Office\WPS Office.lnk"] -4Icon=WPS Office_lnk -5Name=Vscode -5Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Vscode.lnk"] -5Icon=Vscode_lnk -6Name=GitDesk -6Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\GitHub Desktop.lnk"] -6Icon=GitHub Desktop_lnk -7Name=Notion Enhanced -7Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup\Notion Enhanced.lnk"] -7Icon=Notion Enhanced_lnk -8Name=Badlion Client -8Action=["C:\Users\enhan\Desktop\Launchers\Badlion Client.lnk"] -8Icon=Badlion Client_lnk -9Name=JaxCore -9Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\JaxCore.lnk"] -9Icon=JaxCore_lnk -10Name=After Effects -10Action=["C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Adobe After Effects 2021.lnk"] -10Icon=Adobe After Effects 2021_lnk -11Name=osu! -11Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\osu!.lnk"] -11Icon=osu!_lnk -12Name=Medal -12Action=["C:\Users\enhan\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Medal B.V\Medal.lnk"] -12Icon=Medal_lnk -13Name=Fortnite -13Action=["C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Fortnite.url"] -13Icon=Fortnite_url +Total=0 \ No newline at end of file diff --git a/@Resources/Actions/Hotkeys.ini b/@Resources/Actions/Hotkeys.ini index ffecbf3..9043de5 100644 --- a/@Resources/Actions/Hotkeys.ini +++ b/@Resources/Actions/Hotkeys.ini @@ -1,28 +1,4 @@ [Variables] RMPATH=C:\Program Files\Rainmeter\Rainmeter.exe -Key1=^!+D -Key1InString=Ctrl Alt Shift D -Key2=^!+S -Key2InString=Ctrl Alt Shift S -Key3=^!+E -Key3InString=Ctrl Alt Shift E -Key4=^!+W -Key4InString=Ctrl Alt Shift W -Key5=^!+V -Key5InString=Ctrl Alt Shift V -Key6=^!+G -Key6InString=Ctrl Alt Shift G -Key7=^!+N -Key7InString=Ctrl Alt Shift N -Key8=^!+B -Key8InString=Ctrl Alt Shift B -Key9=^!+C -Key9InString=Ctrl Alt Shift C -Key10=^!+A -Key10InString=Ctrl Alt Shift A -Key11=^!+O -Key11InString=Ctrl Alt Shift O -Key12=^!+M -Key12InString= Ctrl Alt Shift M -Key13=^!+F -Key13InString= Ctrl Alt Shift F +Key1= +Key1InString=Edit... diff --git a/@Resources/KeylaunchVars.txt b/@Resources/KeylaunchVars.txt deleted file mode 100644 index c2f4f47..0000000 --- a/@Resources/KeylaunchVars.txt +++ /dev/null @@ -1 +0,0 @@ -Keylaunch\@Resources\Vars.inc | Keylaunch\@Resources\Act.inc | Keylaunch\@Resources\Actions\Hotkeys.ini \ No newline at end of file diff --git a/Core/Actions.inc b/Core/Actions.inc index 5e87dbf..8abf8ae 100644 --- a/Core/Actions.inc +++ b/Core/Actions.inc @@ -79,7 +79,7 @@ MeterStyle=Set.Button:S OverColor=255,0,50,150 LeaveColor=255,0,50,100 Y=([Option91:Y]-#Set.P#+(-30/2+8)*[Set.S]) -Act=[!WriteKeyValue Variables Total 0 "#Sec.SaveLocation#"][!Refresh] +Act=[!CommandMeasure Script:M "Reset()"] [Value91] Meter=String Text=[\xf053] diff --git a/Core/GenKeylaunchKey.lua b/Core/GenKeylaunchKey.lua index b085ac1..50f81e0 100644 --- a/Core/GenKeylaunchKey.lua +++ b/Core/GenKeylaunchKey.lua @@ -107,6 +107,11 @@ function Remove(initSelection, startingIndex) end end +function Reset() + Write(1, 2, 3) + SKIN:Bang('!Refresh') +end + function Write(t1, t2, t3) -- -------------------------------------------------------------------------- -- -- Write settings --