Skip to content

Commit

Permalink
* Fixed bug in *Compare variables* of *If Statements* window.
Browse files Browse the repository at this point in the history
* Added tray tip during Playback.
* Forced floating toolbar to show inside limits of the current screen size.
  • Loading branch information
Pulover committed Oct 17, 2020
1 parent 7ecd875 commit db04b97
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 13 deletions.
5 changes: 4 additions & 1 deletion Documentation/About.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Author: Pulover \[Rodolfo U. Batista\]
Copyright © 2012-2020 Rodolfo U. Batista

Version: 5.2.9
Version: 5.3.0
Release Date: October, 2020
AutoHotkey Version: 1.1.32.00

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

# Change Log

## Version 5.3.0
* Fixed bug in *Compare variables* of *If Statements* window.

## Version 5.2.9
* Updated *Compare variables* in *If Statements* window to use expressions with symbols operators only.
* Fixed bugs in duplicate and paste in groups.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/MacroCreator_Help.ahk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
Library: Pulover's Macro Creator
# Version: 5.2.9
# Version: 5.3.0
[www.macrocreator.com](https://www.macrocreator.com)
[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
Expand Down
17 changes: 10 additions & 7 deletions LIB/Playback.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, NextStep, NStep, NTimesX, NType, NTarget, NWindow, _each, _value, _key, _depth, _pair, _index, _point
, pbParams, VarName, VarValue, Oper, RowData, ActiveRows, Increment := 0, TabIdx, RowIdx, LabelFound, Row_Type, TargetLabel, TargetFunc
, ScopedParams := [], UserGlobals, GlobalList, VarsList, CursorX, CursorY, TakeAction, PbCoordModes
, Func_Result, SVRef, FuncPars, ParamIdx := 1, EvalResult, IsUserFunc := false
, Func_Result, SVRef, FuncPars, ParamIdx := 1, EvalResult, IsUserFunc := false, ProgressTip

Gui, 1:-OwnDialogs

Expand Down Expand Up @@ -118,15 +118,17 @@

If ((ShowProgBar = 1) && (RunningFunction = "") && (FlowControl.Break = 0) && (FlowControl.Continue = 0) && (FlowControl.If = 0))
{
ProgressTip := "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
Menu, Tray, Tip, %ProgressTip%
If Type not in %cType7%,%cType17%,%cType21%,%cType35%,%cType38%,%cType39%,%cType40%,%cType41%,%cType44%,%cType45%,%cType46%,%cType47%,%cType48%,%cType49%,%cType42%
{
GuiControl, 28:, OSCProg, %mListRow%
GuiControl, 28:, OSCProgTip, % "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
GuiControl, 28:, OSCProgTip, %ProgressTip%
}
Else If (ManualKey)
{
GuiControl, 28:, OSCProg, %mListRow%
GuiControl, 28:, OSCProgTip, % "M" Macro_On " [Loop: " (iLoopIndex ? 1 "/" (LoopCount[LoopDepth][1] + 1) : mLoopIndex "/" mLoopSize) " | Row: " A_Index "/" m_ListCount "]"
GuiControl, 28:, OSCProgTip, %ProgressTip%
}
}

Expand Down Expand Up @@ -936,6 +938,7 @@
If (StopIt)
{
Try Menu, Tray, Icon, %DefaultIcon%, 1
Menu, Tray, Tip, Pulovers's Macro Creator
Menu, Tray, Default, %w_Lang005%
break 3
}
Expand Down Expand Up @@ -1058,6 +1061,7 @@
If (!aHK_Timer0)
{
Try Menu, Tray, Icon, %DefaultIcon%, 1
Menu, Tray, Tip, Pulovers's Macro Creator
Menu, Tray, Default, %w_Lang005%
PlayOSOn := 0
tbOSC.ModifyButtonInfo(1, "Image", 48)
Expand Down Expand Up @@ -2109,12 +2113,12 @@ SplitStep(CustomVars, Step)
return Pars
}

IfEval(_Name, _Operator, _Value)
IfEval(_Name, _Operator, _Value, _Step)
{
Switch _Operator
{
Case "=", "==","!=", "<>", ">", "<", ">=", "<=":
result := Eval(_Name " " _Operator " " _Value)[1]
result := Eval(_Step)[1]
Case "in":
If _Name in %_Value%
result := true
Expand Down Expand Up @@ -2270,7 +2274,6 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
Case If1:
IfWinActive, % Win[1], % Win[2], % Win[3], % Win[4]
return 0

Case If2:
IfWinNotActive, % Win[1], % Win[2], % Win[3], % Win[4]
return 0
Expand Down Expand Up @@ -2339,7 +2342,7 @@ IfStatement(ThisError, CustomVars, Action, Step, TimesX, DelayX, Type, Target, W
Else
VarName := %VarName%
VarValue := StrReplace(VarValue, "``n", "`n")
If (IfEval(VarName, Oper, VarValue))
If (IfEval(VarName, Oper, VarValue, Step))
return 0
Case If15:
EvalResult := Eval(Step, CustomVars)
Expand Down
17 changes: 14 additions & 3 deletions MacroCreator.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
; Author: Pulover [Rodolfo U. Batista]
; Home: https://www.macrocreator.com
; Forum: https://www.autohotkey.com/boards/viewforum.php?f=63
; Version: 5.2.9
; Version: 5.3.0
; Release Date: October, 2020
; AutoHotkey Version: 1.1.32.00
; Copyright © 2012-2020 Rodolfo U. Batista
Expand Down Expand Up @@ -74,7 +74,7 @@ https://www.macrocreator.com/project/
; Compiler Settings
;@Ahk2Exe-SetName Pulover's Macro Creator
;@Ahk2Exe-SetDescription Pulover's Macro Creator
;@Ahk2Exe-SetVersion 5.2.9
;@Ahk2Exe-SetVersion 5.3.0
;@Ahk2Exe-SetCopyright Copyright © 2012-2020 Rodolfo U. Batista
;@Ahk2Exe-SetOrigFilename MacroCreator.exe

Expand Down Expand Up @@ -141,7 +141,7 @@ Loop
break
}

CurrentVersion := "5.2.9", ReleaseDate := "October, 2020"
CurrentVersion := "5.3.0", ReleaseDate := "October, 2020"

;##### Ini File Read #####

Expand Down Expand Up @@ -11555,6 +11555,10 @@ Gui, 28:Font
Gui, 28:Font, s6 Bold
Gui, 28:Add, Text, -Wrap yp x+0 W180 r1 vOSCProgTip
Gui, 28:Add, Slider, yp-2 x+0 W65 H10 vOSTrans gTrans NoTicks Thick20 ToolTip Range25-255, %OSTrans%
OSCPos := StrSplit(OSCPos, " ")
OSCPos[1] := (SubStr(OSCPos[1], 2) > A_ScreenWidth || SubStr(OSCPos[1], 2) < 400) ? "X0" : OSCPos[1]
OSCPos[2] := (SubStr(OSCPos[2], 2) > A_ScreenHeight || SubStr(OSCPos[2], 2) < 25) ? "Y0" : OSCPos[1]
OSCPos := OSCPos[1] " " OSCPos[2]
Gui, 28:Show, % OSCPos (ShowProgBar ? " H40" : " H30") " W380 NoActivate Hide", %AppName%
WinSet, Transparent, %OSTrans%, ahk_id %PMCOSC%
return
Expand Down Expand Up @@ -14405,6 +14409,7 @@ If (Record)
}
GoSub, RowCheck
Try Menu, Tray, Icon, %DefaultIcon%, 1
Menu, Tray, Tip, Pulovers's Macro Creator
tbOSC.ModifyButtonInfo(1, "Image", 48)
Tooltip
return
Expand Down Expand Up @@ -14851,7 +14856,13 @@ WinSet, Transparent, %OSTrans%, ahk_id %PMCOSC%
GuiControl, 28:, OSTrans, 255
Gui, 28:-Caption
If (WinExist("ahk_id " PMCOSC))
{
OSCPos := StrSplit(OSCPos, " ")
OSCPos[1] := (SubStr(OSCPos[1], 2) > A_ScreenWidth || SubStr(OSCPos[1], 2) < 400) ? "X0" : OSCPos[1]
OSCPos[2] := (SubStr(OSCPos[2], 2) > A_ScreenHeight || SubStr(OSCPos[2], 2) < 25) ? "Y0" : OSCPos[1]
OSCPos := OSCPos[1] " " OSCPos[2]
Gui, 28:Show, % OSCPos (ShowProgBar ? "H40" : "H30") " W415 NoActivate", %AppName%
}
GuiControl, 1:, CoordTip, <a>CoordMode</a>: %CoordMouse%
GuiControl, 1:, TModeTip, <a>TitleMatchMode</a>: %TitleMatch%
GuiControl, 1:, TSendModeTip, <a>SendMode</a>: %KeyMode%
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pulover's Macro Creator is a Free Automation Tool and Script Generator based on

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

**Current Version:** 5.2.9
**Current Version:** 5.3.0

### Supported platforms

Expand Down

0 comments on commit db04b97

Please sign in to comment.