Closes #110, Closes #111

alexzhornyak · Nov 17, 2023 · fb7c9ac · fb7c9ac
1 parent 93137ef
commit fb7c9ac
Show file tree

Hide file tree

Showing 14 changed files with 1,173 additions and 524 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 **[Video overview - v.2.2](https://youtu.be/30dyXAs-m1A)**
 
-# Scxml Editor 2.5.2
+# Scxml Editor 2.5.3
 Powerful tool for creating, editing and debugging SCXML charts.
 
 ![MainExample](Images/Inheritance_TV_example.gif)
@@ -24,6 +24,7 @@ Powerful tool for creating, editing and debugging SCXML charts.
 [![Discord](Images/Discord.svg)](https://discord.gg/5XWDsbEXzn)
 
 ### Changelog
+**2.5.3:** Chart Draw Constraints, Select Chart Elements
 **2.5.1:** [Fast Triggers](Doc/DebugScxmlStateCharts.md#transition-triggers) <br>
 **2.5:** [Virtual Invoke](Doc/VisualStateChartSplitting.md#virtual-invoke) <br>
 **2.4:** [Post Save Commands](Doc/ProjectTree.md#post-save-unit-actions), [Self-Transitions Inside](Doc/Transitions.md#self-transitions-inside-states) <br>
@@ -50,7 +51,7 @@ Powerful tool for creating, editing and debugging SCXML charts.
 ## Installation
 You can find portable version as attached Zip in ScxmlEditor Github Release page
 
-Latest version: **[2.5.2.1753]**
+Latest version: **[2.5.3.1759]**
 
 ### Windows Installation
 #### First Install

diff --git a/Src/KeyboardUtils.cpp b/Src/KeyboardUtils.cpp
@@ -49,12 +49,20 @@ namespace Keyboardutils {
 		return(GetAsyncKeyState(VK_SHIFT) & 0x8000) != 0;
 	}
 
-	bool __fastcall IsLeftMousePressed(void) {
-		return(GetAsyncKeyState(VK_LBUTTON) & 0x8000) != 0;
+	bool __fastcall IsAltPressed(void) {
+        return(GetAsyncKeyState(VK_MENU) & 0x8000) != 0;
 	}
 
-	bool __fastcall IsAltPressed(void) {
-		return(GetAsyncKeyState(VK_MENU) & 0x8000) != 0;
+	bool __fastcall IsXPressed(void) {
+		return(GetAsyncKeyState(0x58) & 0x8000) != 0;
+	}
+
+	bool __fastcall IsYPressed(void) {
+		return(GetAsyncKeyState(0x59) & 0x8000) != 0;
+	}
+
+	bool __fastcall IsLeftMousePressed(void) {
+		return(GetAsyncKeyState(VK_LBUTTON) & 0x8000) != 0;
 	}
 
 	bool __fastcall IsAnyKeyOrMousePressed() {

diff --git a/Src/KeyboardUtils.h b/Src/KeyboardUtils.h
@@ -39,6 +39,10 @@ namespace Keyboardutils {
 	bool __fastcall IsControlPressed(void);
 	bool __fastcall IsShiftPressed(void);
 	bool __fastcall IsAltPressed(void);
+
+   	bool __fastcall IsXPressed(void);
+	bool __fastcall IsYPressed(void);
+
 	bool __fastcall IsAnyKeyOrMousePressed(void);
 	bool __fastcall IsLeftMousePressed(void);
 

diff --git a/Src/ScxmlEditor.cbproj b/Src/ScxmlEditor.cbproj
@@ -1002,8 +1002,8 @@
 						<VersionInfo Name="AutoIncBuild">True</VersionInfo>
 						<VersionInfo Name="MajorVer">2</VersionInfo>
 						<VersionInfo Name="MinorVer">5</VersionInfo>
-						<VersionInfo Name="Release">1</VersionInfo>
-						<VersionInfo Name="Build">1750</VersionInfo>
+						<VersionInfo Name="Release">3</VersionInfo>
+						<VersionInfo Name="Build">1760</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
 						<VersionInfo Name="PreRelease">False</VersionInfo>
 						<VersionInfo Name="Special">False</VersionInfo>
@@ -1015,13 +1015,13 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName">alexander.zhornyak@gmail.com</VersionInfoKeys>
 						<VersionInfoKeys Name="FileDescription">Scxml State Charts Editor</VersionInfoKeys>
-						<VersionInfoKeys Name="FileVersion">2.5.1.1750</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">2.5.3.1760</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName"/>
 						<VersionInfoKeys Name="LegalCopyright">alexander.zhornyak@gmail.com</VersionInfoKeys>
 						<VersionInfoKeys Name="LegalTrademarks"/>
 						<VersionInfoKeys Name="OriginalFilename"/>
 						<VersionInfoKeys Name="ProductName">ScxmlEditor</VersionInfoKeys>
-						<VersionInfoKeys Name="ProductVersion">2.5.1.0</VersionInfoKeys>
+						<VersionInfoKeys Name="ProductVersion">2.5.3.0</VersionInfoKeys>
 						<VersionInfoKeys Name="Comments"/>
 					</VersionInfoKeys>
 					<Parameters>

diff --git a/Src/ScxmlEditor.res b/Src/ScxmlEditor.res
diff --git a/Src/ScxmlEditor_resources.rc b/Src/ScxmlEditor_resources.rc
@@ -1,40 +1,40 @@
-PngIf RCData "Images\\if_16_16.png"
-CompleteCPP RCData "complete_all_CPP.txt"
-PngLog RCData "Images\\log_16_16.png"
-PngError RCData "Images\\error_16.png"
-PngWatch RCData "Images\\watch_16_16.png"
-PngData RCData "Images\\data_16_16.png"
-PngAssign RCData "Images\\assign_16_16.png"
-PngParam RCData "Images\\param_16_16.png"
-PngSessionState RCData "Images\\statemachine_16_16.png"
-PngProtocol RCData "Images\\protocol_16_16.png"
-PngTransitionXML RCData "Images\\XMLText_Transition_16.png"
-CompletePython RCData "complete_all_python.txt"
-CompleteDebug RCData "complete_debug.lua"
-PngTrigger RCData "Images\\trigger_16_16.png"
-ResLogProperties RCData "ScxmlEditor.properties"
-PngScript RCData "Images\\script_16_16.png"
-PngCancel RCData "Images\\cancel_16_16.png"
-CompleteString RCData "complete_string.lua"
-PngProtocolWeak RCData "Images\\protocol_weak_16_16.png"
-PngSend RCData "Images\\send_16_16.png"
+PngFinalize RCData "Images\\finalize_16_16.png"
+PngForeach RCData "Images\\foreach_16_16.png"
+CompleteBasic RCData "complete_basic.lua"
+PngDatamodel RCData "Images\\datamodel_16_16.png"
 PngVirtualFolder RCData "Images\\virtual_folder_16_16.png"
+PngSend RCData "Images\\send_16_16.png"
 PngComment RCData "Images\\comment_16_16.png"
 PngRaise RCData "Images\\raise_16_16.png"
-CompleteBasic RCData "complete_basic.lua"
-PngDatamodel RCData "Images\\datamodel_16_16.png"
-CompleteEcmascript RCData "complete_all_js.txt"
-CompleteUtf8 RCData "complete_utf8.lua"
 PngExtraContent RCData "Images\\extracontent_16_16.png"
 CompleteTable RCData "complete_table.lua"
-PngForeach RCData "Images\\foreach_16_16.png"
-PngFinalize RCData "Images\\finalize_16_16.png"
-PngOnEntry RCData "Images\\onenter_16_16.png"
-PngSetValue RCData "Images\\setvalue_16_16.png"
-PngInvoke RCData "Images\\invoke_16_16.png"
-CompleteMath RCData "complete_math.lua"
-ResCurPan Cursor "Images\\PanningCursor.cur"
-PngContent RCData "Images\\content_16_16.png"
+CompleteEcmascript RCData "complete_all_js.txt"
+CompleteUtf8 RCData "complete_utf8.lua"
+PngOnExit RCData "Images\\onexit_16_16.png"
 PngDoneData RCData "Images\\donedata_16_16.png"
 CompleteOs RCData "complete_os.lua"
-PngOnExit RCData "Images\\onexit_16_16.png"
+PngInvoke RCData "Images\\invoke_16_16.png"
+PngSetValue RCData "Images\\setvalue_16_16.png"
+PngOnEntry RCData "Images\\onenter_16_16.png"
+PngContent RCData "Images\\content_16_16.png"
+ResCurPan Cursor "Images\\PanningCursor.cur"
+CompleteMath RCData "complete_math.lua"
+PngData RCData "Images\\data_16_16.png"
+PngAssign RCData "Images\\assign_16_16.png"
+PngProtocol RCData "Images\\protocol_16_16.png"
+PngParam RCData "Images\\param_16_16.png"
+PngSessionState RCData "Images\\statemachine_16_16.png"
+CompleteCPP RCData "complete_all_CPP.txt"
+PngIf RCData "Images\\if_16_16.png"
+PngError RCData "Images\\error_16.png"
+PngWatch RCData "Images\\watch_16_16.png"
+PngLog RCData "Images\\log_16_16.png"
+CompleteString RCData "complete_string.lua"
+PngCancel RCData "Images\\cancel_16_16.png"
+PngProtocolWeak RCData "Images\\protocol_weak_16_16.png"
+ResLogProperties RCData "ScxmlEditor.properties"
+PngScript RCData "Images\\script_16_16.png"
+PngTrigger RCData "Images\\trigger_16_16.png"
+PngTransitionXML RCData "Images\\XMLText_Transition_16.png"
+CompleteDebug RCData "complete_debug.lua"
+CompletePython RCData "complete_all_python.txt"