Skip to content

Commit

Permalink
v1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
EnhancedJax committed Nov 27, 2021
1 parent 30a7e54 commit 6a63e0c
Show file tree
Hide file tree
Showing 8 changed files with 209 additions and 43 deletions.
Binary file added @Resources/Actions/nircmd.exe
Binary file not shown.
52 changes: 51 additions & 1 deletion @Resources/Lua/Func.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function Initialize()
local CheckDots = tonumber(SKIN:GetVariable('CheckDots'))
local StayOnDesktop = tonumber(SKIN:GetVariable('StayOnDesktop'))
local Resource = SKIN:GetVariable('@')
if CheckDots == 1 then
if CheckDots == 0 then
SKIN:Bang('!DisableMouseActionGroup', 'LeftMouseUpAction', 'Stroke')
SKIN:Bang('!UpdateMEterGroup', 'Stroke')
end
Expand All @@ -24,6 +24,15 @@ function Initialize()
SKIN:Bang('!Execute [\"#@#Actions\\AHKv1.exe\" \"#@#Actions\\Source Code\\QuickNote.ahk\"]')
end
end

if tonumber(SKIN:GetVariable('EfficiencyHotkey')) == 0 or tonumber(SKIN:GetVariable('StayOnDesktop')) == 1 then
print('Turning off efficiency hotkeys...')
for i=1, 9 do
SKIN:Bang('!CommandMeasure', 'Key'..i, 'Stop')
end
end
SKIN:Bang('!CommandMEasure', 'KeyTab', 'Stop')
-- SKIN:Bang('!CommandMEasure', 'KeyShiftTab', 'Stop')
end

function CheckFullScreen()
Expand All @@ -43,6 +52,47 @@ function CheckFullScreen()
end
end

-- -------------------------------------------------------------------------- --
-- Hotkey functions --
-- -------------------------------------------------------------------------- --

function turnHotkey(bool)
if tonumber(SKIN:GetVariable('EfficiencyHotkey')) == 1 and tonumber(SKIN:GetVariable('StayOnDesktop')) == 0 then
if bool == 1 then
for i=1, 9 do
SKIN:Bang('!CommandMeasure', 'Key'..i, 'Start')
end
else
for i=1, 9 do
SKIN:Bang('!CommandMeasure', 'Key'..i, 'Stop')
end
end
end
end

function tabControl(bool)
if tonumber(SKIN:GetVariable('EfficiencyHotkey')) == 1 and tonumber(SKIN:GetVariable('StayOnDesktop')) == 0 then
if bool == 1 then
SKIN:Bang('!CommandMeasure', 'KeyTab', 'Start')
-- SKIN:Bang('!CommandMEasure', 'KeyShiftTab', 'Start')
else
SKIN:Bang('!CommandMeasure', 'KeyTab', 'Stop')
-- SKIN:Bang('!CommandMEasure', 'KeyShiftTab', 'Stop')
end
end
end

function editNextLine(dir)
local CurrentLine = SKIN:GetVariable('Editing'):gsub('Line', '')
local NextLine = CurrentLine + dir
print(CurrentLine, NextLine)
SKIN:Bang('!PauseMeasure', 'mToggle')
SKIN:Bang('!SetVariable', 'Editing', 'Line'..NextLine)
SKIN:Bang('!SetOption', 'mInput', 'X', SKIN:GetMeter('Line'..NextLine):GetX())
SKIN:Bang('!SetOption', 'mInput', 'Y', SKIN:GetMeter('Line'..NextLine):GetY())
SKIN:Bang('!UpdateMeasure', 'mOpenInput')
end

-- -------------------------------------------------------------------------- --
-- Row manipulation functions --
-- -------------------------------------------------------------------------- --
Expand Down
4 changes: 3 additions & 1 deletion @Resources/Vars.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
Scale=1
UseHotkey=1
HideOnStart=1
EfficiencyHotkey=1
StayOnDesktop=0

DragAmount=1
ScreenPadding=30
R=10

Animation=1
Animation=0
TransitionalAnimations=1
TweenTime1=600

Expand Down
2 changes: 1 addition & 1 deletion @Resources/Version.inc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[Variables]
Version=1.15
Version=1.3
35 changes: 35 additions & 0 deletions Core/Appearance.inc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,21 @@ MeterStyle=Set.Div:S
Meter=String
Text=Skin scale
MeterStyle=Set.String:S | Set.OptionName:S
[Set.Div:12123138]
Meter=Shape
MeterStyle=Set.Div:S
[Option03]
Meter=String
Text=Corner rounding
MeterStyle=Set.String:S | Set.OptionName:S
[Set.Div:1238]
Meter=Shape
MeterStyle=Set.Div:S
[Option04]
Meter=String
Text=Distance of panel from top edge
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
MeterStyle=Set.String:S | Set.OptionName:S

;================================================================================================================================================================================

Expand Down Expand Up @@ -110,6 +125,26 @@ Y=([Option02:Y]-#Set.P#+(-30/2+8)*[Set.S])
Meter=String
Text=#Scale#
MeterStyle=Set.String:S | Set.Value:S
[R]
Meter=Shape
MeterStyle=Set.Textbox:S
Type=Num|0|30
Y=([Option03:Y]-#Set.P#+(-30/2+8)*[Set.S])
[Value03]
Meter=String
Text=#R#
MeterStyle=Set.String:S | Set.Value:S
[ScreenPadding]
Meter=Shape
MeterStyle=Set.Textbox:S
Hidden=#StayOnDesktop#
Type=Num|0|50
Y=([Option04:Y]-#Set.P#+(-30/2+8)*[Set.S])
[Value04]
Meter=String
Text=#ScreenPadding#
Hidden=#StayOnDesktop#
MeterStyle=Set.String:S | Set.Value:S

[Animation]
Meter=Shape
Expand Down
49 changes: 19 additions & 30 deletions Core/General.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@ Meter=Shape
MeterStyle=Set.Div:S
[Option01]
Meter=String
Text=HotKey
Text=Use hotkey in addition to dragging from top left of the screen
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
MeterStyle=Set.String:S | Set.OptionName:S
[Set.Div:S19131238]
Meter=Shape
MeterStyle=Set.Div:S
[Option02]
Meter=String
Text=Use this hotkey in addition to dragging from top left of the screen
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
Text=Activation hotKey
FontColor=#Set.Text_Color#,(255-150*(#StayOnDesktop# || (1-#UseHotkey#) = 1 ? 1 : 0))
MeterStyle=Set.String:S | Set.OptionName:S
[Set.Div:12]
Meter=Shape
MeterStyle=Set.Div:S
[Option03]
Meter=String
Text=Automatically hide on startup (doesn't affect refreshes)
Text=Automatically hide on startup (doesn't affect refreshes)1
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
MeterStyle=Set.String:S | Set.OptionName:S
[Set.Div:1238]
Meter=Shape
MeterStyle=Set.Div:S
[Option04]
Meter=String
Text=Distance of panel from top edge
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
Text=Efficiency Hotkeys#CRLF#- Use tab to move to next line#CRLF#- use number keys to quickly edit rows 1-9
MeterStyle=Set.String:S | Set.OptionName:S
FontColor=#Set.Text_Color#,(255-150*#StayOnDesktop#)
;================================================================================================================================================================================

; [Time]
Expand All @@ -62,46 +62,35 @@ Meter=Shape
MeterStyle=Set.Bool:S
Y=([Option00:Y]-#Set.P#+(-20/2+8)*[Set.S])

[Button01]
[UseHotkey]
Meter=Shape
MeterStyle=Set.Button:S
Y=([Option01:Y]-#Set.P#+(-30/2+8)*[Set.S])
MeterStyle=Set.Bool:S
Hidden=#StayOnDesktop#
Y=([Option01:Y]-#Set.P#+(-20/2+8)*[Set.S])

[Button02]
Meter=Shape
MeterStyle=Set.Button:S
Y=([Option02:Y]-#Set.P#+(-30/2+8)*[Set.S])
Hidden=(#StayOnDesktop# || (1-#UseHotkey#) = 1 ? 1 : 0)
Act=[!CommandMeasure Func "startSide('Hotkey')"]
[Value01]
Meter=String
Text=#KeyInString#
Hidden=#StayOnDesktop#
Hidden=(#StayOnDesktop# || (1-#UseHotkey#) = 1 ? 1 : 0)
MeterStyle=Set.String:S | Set.Value:S

[UseHotkey]
Meter=Shape
MeterStyle=Set.Bool:S
Hidden=#StayOnDesktop#
Y=([Option02:Y]-#Set.P#+(-20/2+8)*[Set.S])

[HideOnStart]
Meter=Shape
MeterStyle=Set.Bool:S
Hidden=#StayOnDesktop#
Y=([Option03:Y]-#Set.P#+(-20/2+8)*[Set.S])

[ScreenPadding]
[EfficiencyHotkey]
Meter=Shape
MeterStyle=Set.Textbox:S
Hidden=#StayOnDesktop#
Type=Num|0|50
Y=([Option04:Y]-#Set.P#+(-30/2+8)*[Set.S])
[Value04]
Meter=String
Text=#ScreenPadding#
MeterStyle=Set.Bool:S
Hidden=#StayOnDesktop#
MeterStyle=Set.String:S | Set.Value:S

; [AutoNextLine]
; Meter=Shape
; MeterStyle=Set.Bool:S
; Y=([Option11:Y]-#Set.P#+(-20/2+8)*[Set.S])
Y=([Option04:Y]-#Set.P#+(-20/2+8)*[Set.S])

; [CheckDots]
; Meter=Shape
Expand Down
6 changes: 3 additions & 3 deletions Main/Accessories/DropStyles/File.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MeterStyle=Div:S
[2]
Meter=String
MeterStyle=String:S
Text=Right click to rename
Text=Poll
[13]
Meter=Shape
MeterStyle=Div:S
Expand All @@ -30,11 +30,11 @@ MeterStyle=Div:S
[4]
Meter=String
MeterStyle=String:S
Text=Quick Note
Text=Right click to rename
[15]
Meter=Shape
MeterStyle=Div:S
[5]
Meter=String
MeterStyle=String:S
Text=To-do
Text=Testing ground
Loading

0 comments on commit 6a63e0c

Please sign in to comment.