Skip to content

Commit fc22d30

Browse files
alexzhornyakalexzhornyak
committed
Closes #113, Fixes #114, Closes #115, Closes #116 
1 parent 8983c53 commit fc22d30

13 files changed

+334
-164
lines changed

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
**[Video overview - v.2.2](https://youtu.be/30dyXAs-m1A)**
1515

16-
# Scxml Editor 2.5.3
16+
# Scxml Editor 2.5.4
1717
Powerful tool for creating, editing and debugging SCXML charts.
1818

1919
![MainExample](Images/Inheritance_TV_example.gif)
@@ -24,6 +24,7 @@ Powerful tool for creating, editing and debugging SCXML charts.
2424
[![Discord](Images/Discord.svg)](https://discord.gg/5XWDsbEXzn)
2525

2626
### Changelog
27+
**2.5.4:** Nested initial state indication <br>
2728
**2.5.3:** Chart Draw Constraints, Select Chart Elements <br>
2829
**2.5.1:** [Fast Triggers](Doc/DebugScxmlStateCharts.md#transition-triggers) <br>
2930
**2.5:** [Virtual Invoke](Doc/VisualStateChartSplitting.md#virtual-invoke) <br>
@@ -51,7 +52,7 @@ Powerful tool for creating, editing and debugging SCXML charts.
5152
## Installation
5253
You can find portable version as attached Zip in ScxmlEditor Github Release page
5354

54-
Latest version: **[2.5.3.1759]**
55+
Latest version: **[2.5.4.1768]**
5556

5657
### Windows Installation
5758
#### First Install

‎Src/ScxmlEditor.cbproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,13 +1015,13 @@
10151015
<VersionInfoKeys>
10161016
<VersionInfoKeys Name="CompanyName">alexander.zhornyak@gmail.com</VersionInfoKeys>
10171017
<VersionInfoKeys Name="FileDescription">Scxml State Charts Editor</VersionInfoKeys>
1018-
<VersionInfoKeys Name="FileVersion">2.5.3.1760</VersionInfoKeys>
1018+
<VersionInfoKeys Name="FileVersion">2.5.4.1768</VersionInfoKeys>
10191019
<VersionInfoKeys Name="InternalName"/>
10201020
<VersionInfoKeys Name="LegalCopyright">alexander.zhornyak@gmail.com</VersionInfoKeys>
10211021
<VersionInfoKeys Name="LegalTrademarks"/>
10221022
<VersionInfoKeys Name="OriginalFilename"/>
10231023
<VersionInfoKeys Name="ProductName">ScxmlEditor</VersionInfoKeys>
1024-
<VersionInfoKeys Name="ProductVersion">2.5.3.0</VersionInfoKeys>
1024+
<VersionInfoKeys Name="ProductVersion">2.5.4.0</VersionInfoKeys>
10251025
<VersionInfoKeys Name="Comments"/>
10261026
</VersionInfoKeys>
10271027
<Parameters>

‎Src/ScxmlEditor.res‎

-4 Bytes
Binary file not shown.

‎Src/ScxmlEditor_resources.rc‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
PngFinalize RCData "Images\\finalize_16_16.png"
2-
PngForeach RCData "Images\\foreach_16_16.png"
3-
CompleteBasic RCData "complete_basic.lua"
4-
PngDatamodel RCData "Images\\datamodel_16_16.png"
5-
PngVirtualFolder RCData "Images\\virtual_folder_16_16.png"
1+
PngIf RCData "Images\\if_16_16.png"
2+
CompleteCPP RCData "complete_all_CPP.txt"
3+
PngLog RCData "Images\\log_16_16.png"
4+
PngError RCData "Images\\error_16.png"
5+
PngWatch RCData "Images\\watch_16_16.png"
6+
PngData RCData "Images\\data_16_16.png"
7+
PngAssign RCData "Images\\assign_16_16.png"
8+
PngParam RCData "Images\\param_16_16.png"
9+
PngSessionState RCData "Images\\statemachine_16_16.png"
10+
PngProtocol RCData "Images\\protocol_16_16.png"
11+
PngTransitionXML RCData "Images\\XMLText_Transition_16.png"
12+
CompletePython RCData "complete_all_python.txt"
13+
CompleteDebug RCData "complete_debug.lua"
14+
PngTrigger RCData "Images\\trigger_16_16.png"
15+
ResLogProperties RCData "ScxmlEditor.properties"
16+
PngScript RCData "Images\\script_16_16.png"
17+
PngCancel RCData "Images\\cancel_16_16.png"
18+
CompleteString RCData "complete_string.lua"
19+
PngProtocolWeak RCData "Images\\protocol_weak_16_16.png"
620
PngSend RCData "Images\\send_16_16.png"
21+
PngVirtualFolder RCData "Images\\virtual_folder_16_16.png"
722
PngComment RCData "Images\\comment_16_16.png"
823
PngRaise RCData "Images\\raise_16_16.png"
9-
PngExtraContent RCData "Images\\extracontent_16_16.png"
10-
CompleteTable RCData "complete_table.lua"
24+
CompleteBasic RCData "complete_basic.lua"
25+
PngDatamodel RCData "Images\\datamodel_16_16.png"
1126
CompleteEcmascript RCData "complete_all_js.txt"
1227
CompleteUtf8 RCData "complete_utf8.lua"
13-
PngOnExit RCData "Images\\onexit_16_16.png"
14-
PngDoneData RCData "Images\\donedata_16_16.png"
15-
CompleteOs RCData "complete_os.lua"
16-
PngInvoke RCData "Images\\invoke_16_16.png"
17-
PngSetValue RCData "Images\\setvalue_16_16.png"
28+
PngExtraContent RCData "Images\\extracontent_16_16.png"
29+
CompleteTable RCData "complete_table.lua"
30+
PngForeach RCData "Images\\foreach_16_16.png"
31+
PngFinalize RCData "Images\\finalize_16_16.png"
1832
PngOnEntry RCData "Images\\onenter_16_16.png"
19-
PngContent RCData "Images\\content_16_16.png"
20-
ResCurPan Cursor "Images\\PanningCursor.cur"
33+
PngSetValue RCData "Images\\setvalue_16_16.png"
34+
PngInvoke RCData "Images\\invoke_16_16.png"
2135
CompleteMath RCData "complete_math.lua"
22-
PngData RCData "Images\\data_16_16.png"
23-
PngAssign RCData "Images\\assign_16_16.png"
24-
PngProtocol RCData "Images\\protocol_16_16.png"
25-
PngParam RCData "Images\\param_16_16.png"
26-
PngSessionState RCData "Images\\statemachine_16_16.png"
27-
CompleteCPP RCData "complete_all_CPP.txt"
28-
PngIf RCData "Images\\if_16_16.png"
29-
PngError RCData "Images\\error_16.png"
30-
PngWatch RCData "Images\\watch_16_16.png"
31-
PngLog RCData "Images\\log_16_16.png"
32-
CompleteString RCData "complete_string.lua"
33-
PngCancel RCData "Images\\cancel_16_16.png"
34-
PngProtocolWeak RCData "Images\\protocol_weak_16_16.png"
35-
ResLogProperties RCData "ScxmlEditor.properties"
36-
PngScript RCData "Images\\script_16_16.png"
37-
PngTrigger RCData "Images\\trigger_16_16.png"
38-
PngTransitionXML RCData "Images\\XMLText_Transition_16.png"
39-
CompleteDebug RCData "complete_debug.lua"
40-
CompletePython RCData "complete_all_python.txt"
36+
ResCurPan Cursor "Images\\PanningCursor.cur"
37+
PngContent RCData "Images\\content_16_16.png"
38+
PngDoneData RCData "Images\\donedata_16_16.png"
39+
CompleteOs RCData "complete_os.lua"
40+
PngOnExit RCData "Images\\onexit_16_16.png"

‎Src/TreeEditor/TreeEditorEx.cpp‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,14 @@ void __fastcall TTreeEditorEx::OnDectivateTreeEditor(TObject *Sender) {
222222

223223
// ---------------------------------------------------------------------------
224224
void __fastcall TTreeEditorEx::DoInvalidateTrees() {
225-
if (NodeTree && IsWindowVisible(NodeTree->Handle)) {
226-
NodeTree->Invalidate();
225+
try {
226+
if (NodeTree && IsWindowVisible(NodeTree->Handle)) {
227+
NodeTree->Invalidate();
228+
}
229+
DoInvalidateFocusedTheTree();
230+
}
231+
catch(Exception * e) {
227232
}
228-
DoInvalidateFocusedTheTree();
229233
}
230234

231235
// ---------------------------------------------------------------------------
@@ -1119,8 +1123,12 @@ void __fastcall TTreeEditorEx::PopupNodePopup(System::TObject* Sender) {
11191123

11201124
// ---------------------------------------------------------------------------
11211125
void __fastcall TTreeEditorEx::DoInvalidateFocusedTheTree(void) {
1122-
if (TheTree && IsWindowVisible(TheTree->Handle) && TheTree->Focused()) {
1123-
this->InvalidateTheTreeWithTemp();
1126+
try {
1127+
if (TheTree && IsWindowVisible(TheTree->Handle) && TheTree->Focused()) {
1128+
this->InvalidateTheTreeWithTemp();
1129+
}
1130+
}
1131+
catch(Exception * E) {
11241132
}
11251133
}
11261134

0 commit comments

Comments
 (0)