Skip to content

Commit db04b97

Browse files
committed
* Fixed bug in *Compare variables* of *If Statements* window.
* Added tray tip during Playback. * Forced floating toolbar to show inside limits of the current screen size.
1 parent 7ecd875 commit db04b97

File tree

5 files changed

+30
-13
lines changed

5 files changed

+30
-13
lines changed

Documentation/About.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Author: Pulover \[Rodolfo U. Batista\]
88
Copyright © 2012-2020 Rodolfo U. Batista
99

10-
Version: 5.2.9
10+
Version: 5.3.0
1111
Release Date: October, 2020
1212
AutoHotkey Version: 1.1.32.00
1313

@@ -37,6 +37,9 @@ chosen1ft for fixing the mixing rows bug when saving a project.
3737

3838
# Change Log
3939

40+
## Version 5.3.0
41+
* Fixed bug in *Compare variables* of *If Statements* window.
42+
4043
## Version 5.2.9
4144
* Updated *Compare variables* in *If Statements* window to use expressions with symbols operators only.
4245
* Fixed bugs in duplicate and paste in groups.

Documentation/MacroCreator_Help.ahk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
Library: Pulover's Macro Creator
33
4-
# Version: 5.2.9
4+
# Version: 5.3.0
55
[www.macrocreator.com](https://www.macrocreator.com)
66
[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
77

LIB/Playback.ahk

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
, NextStep, NStep, NTimesX, NType, NTarget, NWindow, _each, _value, _key, _depth, _pair, _index, _point
77
, pbParams, VarName, VarValue, Oper, RowData, ActiveRows, Increment := 0, TabIdx, RowIdx, LabelFound, Row_Type, TargetLabel, TargetFunc
88
, ScopedParams := [], UserGlobals, GlobalList, VarsList, CursorX, CursorY, TakeAction, PbCoordModes
9-
, Func_Result, SVRef, FuncPars, ParamIdx := 1, EvalResult, IsUserFunc := false
9+
, Func_Result, SVRef, FuncPars, ParamIdx := 1, EvalResult, IsUserFunc := false, ProgressTip
1010

1111
Gui, 1:-OwnDialogs
1212

@@ -118,15 +118,17 @@
118118

119119
If ((ShowProgBar = 1) && (RunningFunction = "") && (FlowControl.Break = 0) && (FlowControl.Continue = 0) && (FlowControl.If = 0))
120120
{
121+
ProgressTip := "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
122+
Menu, Tray, Tip, %ProgressTip%
121123
If Type not in %cType7%,%cType17%,%cType21%,%cType35%,%cType38%,%cType39%,%cType40%,%cType41%,%cType44%,%cType45%,%cType46%,%cType47%,%cType48%,%cType49%,%cType42%
122124
{
123125
GuiControl, 28:, OSCProg, %mListRow%
124-
GuiControl, 28:, OSCProgTip, % "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
126+
GuiControl, 28:, OSCProgTip, %ProgressTip%
125127
}
126128
Else If (ManualKey)
127129
{
128130
GuiControl, 28:, OSCProg, %mListRow%
129-
GuiControl, 28:, OSCProgTip, % "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
131+
GuiControl, 28:, OSCProgTip, %ProgressTip%
130132
}
131133
}
132134

@@ -936,6 +938,7 @@
936938
If (StopIt)
937939
{
938940
Try Menu, Tray, Icon, %DefaultIcon%, 1
941+
Menu, Tray, Tip, Pulovers's Macro Creator
939942
Menu, Tray, Default, %w_Lang005%
940943
break 3
941944
}
@@ -1058,6 +1061,7 @@
10581061
If (!aHK_Timer0)
10591062
{
10601063
Try Menu, Tray, Icon, %DefaultIcon%, 1
1064+
Menu, Tray, Tip, Pulovers's Macro Creator
10611065
Menu, Tray, Default, %w_Lang005%
10621066
PlayOSOn := 0
10631067
tbOSC.ModifyButtonInfo(1, "Image", 48)
@@ -2109,12 +2113,12 @@ SplitStep(CustomVars, Step)
21092113
return Pars
21102114
}
21112115

2112-
IfEval(_Name, _Operator, _Value)
2116+
IfEval(_Name, _Operator, _Value, _Step)
21132117
{
21142118
Switch _Operator
21152119
{
21162120
Case "=", "==","!=", "<>", ">", "<", ">=", "<=":
2117-
result := Eval(_Name " " _Operator " " _Value)[1]
2121+
result := Eval(_Step)[1]
21182122
Case "in":
21192123
If _Name in %_Value%
21202124
result := true
@@ -2270,7 +2274,6 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
22702274
Case If1:
22712275
IfWinActive, % Win[1], % Win[2], % Win[3], % Win[4]
22722276
return 0
2273-
22742277
Case If2:
22752278
IfWinNotActive, % Win[1], % Win[2], % Win[3], % Win[4]
22762279
return 0
@@ -2339,7 +2342,7 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
23392342
Else
23402343
VarName := %VarName%
23412344
VarValue := StrReplace(VarValue, "``n", "`n")
2342-
If (IfEval(VarName, Oper, VarValue))
2345+
If (IfEval(VarName, Oper, VarValue, Step))
23432346
return 0
23442347
Case If15:
23452348
EvalResult := Eval(Step, CustomVars)

MacroCreator.ahk

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; Author: Pulover [Rodolfo U. Batista]
66
; Home: https://www.macrocreator.com
77
; Forum: https://www.autohotkey.com/boards/viewforum.php?f=63
8-
; Version: 5.2.9
8+
; Version: 5.3.0
99
; Release Date: October, 2020
1010
; AutoHotkey Version: 1.1.32.00
1111
; Copyright © 2012-2020 Rodolfo U. Batista
@@ -74,7 +74,7 @@ https://www.macrocreator.com/project/
7474
; Compiler Settings
7575
;@Ahk2Exe-SetName Pulover's Macro Creator
7676
;@Ahk2Exe-SetDescription Pulover's Macro Creator
77-
;@Ahk2Exe-SetVersion 5.2.9
77+
;@Ahk2Exe-SetVersion 5.3.0
7878
;@Ahk2Exe-SetCopyright Copyright © 2012-2020 Rodolfo U. Batista
7979
;@Ahk2Exe-SetOrigFilename MacroCreator.exe
8080

@@ -141,7 +141,7 @@ Loop
141141
break
142142
}
143143

144-
CurrentVersion := "5.2.9", ReleaseDate := "October, 2020"
144+
CurrentVersion := "5.3.0", ReleaseDate := "October, 2020"
145145

146146
;##### Ini File Read #####
147147

@@ -11555,6 +11555,10 @@ Gui, 28:Font
1155511555
Gui, 28:Font, s6 Bold
1155611556
Gui, 28:Add, Text, -Wrap yp x+0 W180 r1 vOSCProgTip
1155711557
Gui, 28:Add, Slider, yp-2 x+0 W65 H10 vOSTrans gTrans NoTicks Thick20 ToolTip Range25-255, %OSTrans%
11558+
OSCPos := StrSplit(OSCPos, " ")
11559+
OSCPos[1] := (SubStr(OSCPos[1], 2) > A_ScreenWidth || SubStr(OSCPos[1], 2) < 400) ? "X0" : OSCPos[1]
11560+
OSCPos[2] := (SubStr(OSCPos[2], 2) > A_ScreenHeight || SubStr(OSCPos[2], 2) < 25) ? "Y0" : OSCPos[1]
11561+
OSCPos := OSCPos[1] " " OSCPos[2]
1155811562
Gui, 28:Show, % OSCPos (ShowProgBar ? " H40" : " H30") " W380 NoActivate Hide", %AppName%
1155911563
WinSet, Transparent, %OSTrans%, ahk_id %PMCOSC%
1156011564
return
@@ -14405,6 +14409,7 @@ If (Record)
1440514409
}
1440614410
GoSub, RowCheck
1440714411
Try Menu, Tray, Icon, %DefaultIcon%, 1
14412+
Menu, Tray, Tip, Pulovers's Macro Creator
1440814413
tbOSC.ModifyButtonInfo(1, "Image", 48)
1440914414
Tooltip
1441014415
return
@@ -14851,7 +14856,13 @@ WinSet, Transparent, %OSTrans%, ahk_id %PMCOSC%
1485114856
GuiControl, 28:, OSTrans, 255
1485214857
Gui, 28:-Caption
1485314858
If (WinExist("ahk_id " PMCOSC))
14859+
{
14860+
OSCPos := StrSplit(OSCPos, " ")
14861+
OSCPos[1] := (SubStr(OSCPos[1], 2) > A_ScreenWidth || SubStr(OSCPos[1], 2) < 400) ? "X0" : OSCPos[1]
14862+
OSCPos[2] := (SubStr(OSCPos[2], 2) > A_ScreenHeight || SubStr(OSCPos[2], 2) < 25) ? "Y0" : OSCPos[1]
14863+
OSCPos := OSCPos[1] " " OSCPos[2]
1485414864
Gui, 28:Show, % OSCPos (ShowProgBar ? "H40" : "H30") " W415 NoActivate", %AppName%
14865+
}
1485514866
GuiControl, 1:, CoordTip, <a>CoordMode</a>: %CoordMouse%
1485614867
GuiControl, 1:, TModeTip, <a>TitleMatchMode</a>: %TitleMatch%
1485714868
GuiControl, 1:, TSendModeTip, <a>SendMode</a>: %KeyMode%

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Pulover's Macro Creator is a Free Automation Tool and Script Generator based on
44

55
[www.macrocreator.com](https://www.macrocreator.com)
66

7-
**Current Version:** 5.2.9
7+
**Current Version:** 5.3.0
88

99
### Supported platforms
1010

0 commit comments

Comments
 (0)