|
6 | 6 | , NextStep, NStep, NTimesX, NType, NTarget, NWindow, _each, _value, _key, _depth, _pair, _index, _point
|
7 | 7 | , pbParams, VarName, VarValue, Oper, RowData, ActiveRows, Increment := 0, TabIdx, RowIdx, LabelFound, Row_Type, TargetLabel, TargetFunc
|
8 | 8 | , 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 |
10 | 10 |
|
11 | 11 | Gui, 1:-OwnDialogs
|
12 | 12 |
|
|
118 | 118 |
|
119 | 119 | If ((ShowProgBar = 1) && (RunningFunction = "") && (FlowControl.Break = 0) && (FlowControl.Continue = 0) && (FlowControl.If = 0))
|
120 | 120 | {
|
| 121 | + ProgressTip := "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]" |
| 122 | + Menu, Tray, Tip, %ProgressTip% |
121 | 123 | If Type not in %cType7%,%cType17%,%cType21%,%cType35%,%cType38%,%cType39%,%cType40%,%cType41%,%cType44%,%cType45%,%cType46%,%cType47%,%cType48%,%cType49%,%cType42%
|
122 | 124 | {
|
123 | 125 | 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% |
125 | 127 | }
|
126 | 128 | Else If (ManualKey)
|
127 | 129 | {
|
128 | 130 | 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% |
130 | 132 | }
|
131 | 133 | }
|
132 | 134 |
|
|
936 | 938 | If (StopIt)
|
937 | 939 | {
|
938 | 940 | Try Menu, Tray, Icon, %DefaultIcon%, 1
|
| 941 | + Menu, Tray, Tip, Pulovers's Macro Creator |
939 | 942 | Menu, Tray, Default, %w_Lang005%
|
940 | 943 | break 3
|
941 | 944 | }
|
|
1058 | 1061 | If (!aHK_Timer0)
|
1059 | 1062 | {
|
1060 | 1063 | Try Menu, Tray, Icon, %DefaultIcon%, 1
|
| 1064 | + Menu, Tray, Tip, Pulovers's Macro Creator |
1061 | 1065 | Menu, Tray, Default, %w_Lang005%
|
1062 | 1066 | PlayOSOn := 0
|
1063 | 1067 | tbOSC.ModifyButtonInfo(1, "Image", 48)
|
@@ -2109,12 +2113,12 @@ SplitStep(CustomVars, Step)
|
2109 | 2113 | return Pars
|
2110 | 2114 | }
|
2111 | 2115 |
|
2112 |
| -IfEval(_Name, _Operator, _Value) |
| 2116 | +IfEval(_Name, _Operator, _Value, _Step) |
2113 | 2117 | {
|
2114 | 2118 | Switch _Operator
|
2115 | 2119 | {
|
2116 | 2120 | Case "=", "==","!=", "<>", ">", "<", ">=", "<=":
|
2117 |
| - result := Eval(_Name " " _Operator " " _Value)[1] |
| 2121 | + result := Eval(_Step)[1] |
2118 | 2122 | Case "in":
|
2119 | 2123 | If _Name in %_Value%
|
2120 | 2124 | result := true
|
@@ -2270,7 +2274,6 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
|
2270 | 2274 | Case If1:
|
2271 | 2275 | IfWinActive, % Win[1], % Win[2], % Win[3], % Win[4]
|
2272 | 2276 | return 0
|
2273 |
| - |
2274 | 2277 | Case If2:
|
2275 | 2278 | IfWinNotActive, % Win[1], % Win[2], % Win[3], % Win[4]
|
2276 | 2279 | return 0
|
@@ -2339,7 +2342,7 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
|
2339 | 2342 | Else
|
2340 | 2343 | VarName := %VarName%
|
2341 | 2344 | VarValue := StrReplace(VarValue, "``n", "`n")
|
2342 |
| - If (IfEval(VarName, Oper, VarValue)) |
| 2345 | + If (IfEval(VarName, Oper, VarValue, Step)) |
2343 | 2346 | return 0
|
2344 | 2347 | Case If15:
|
2345 | 2348 | EvalResult := Eval(Step, CustomVars)
|
|
0 commit comments