Commit Graph

34 Commits

Author SHA1 Message Date
Leena Miettinen
5a3da74422 SCXML editor: Fix capitalization of UI text
Change-Id: I2a67d63495f665d8a9e365bf420957b1def4d1e0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-31 11:32:27 +00:00
Leena Miettinen
4a6d387cb7 SCXML editor: Fix UI text
... capitalization, punctualization, and grammar

Change-Id: I15205b899387e8a91529c3a6b6a2e81cf4315a4a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-04-05 14:18:13 +00:00
Ulf Hermann
c6e1bf6187 ScxmlEditor: Retain explicitly set "initial" attributes
If the user sets a state to be initial and then moves it around without
reparenting it, the initial attribute has to be retained. This is
achieved by saving a "removedInitial" attribute in the editor info when
the state is released from its parent and restoring the attribute when
it is reattached. This even works if the state is temporarily reparented
and across save/load cycles.

Change-Id: I65df959e4eb8d46177d59f71c8556d596e773c05
Task-number: QTCREATORBUG-17108
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-23 08:48:26 +00:00
Ulf Hermann
53a32f7fc6 ScxmlEditor: Don't generate invalid state names
'(' and ')' should be avoided when copy/pasting states.

Change-Id: Ic54528ed51b2f4596651bb1d23f282e70210f3a7
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-15 16:51:18 +00:00
Marco Benelli
a7809d4f5e SCXML Editor: fix behavior of else and elseif tags
SCXML specify that the <if> tag contains elements separated by tags
<else/> and <elseif/>.
The SCXML Editor used to nest instruction inside the <else/> and
<elseif/> tags.
This patch implement the correct behavior, so each new inserted element
is appended inside the wrapping <if>.  Note that the new elements are
always inserted as last child of <if>.

Task-number: QTCREATORBUG-17674
Change-Id: I327941bbbd8b0cc04b0c26553257ccb2a24c8306
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2017-02-24 12:18:09 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Alessandro Portale
6c682f4570 Utils: move pan icon from scxml to utils
It will also be used in Qt Quick Designer

Change-Id: Id4e16f417c5faf8baf9437c0d4845397f3ddb4fc
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-27 09:36:11 +00:00
Marco Benelli
f00e629227 SCXML editor: fix crash on pressing copy/cut
QtCreator used to crash when copy or cut button were pressed without
having selected an item.

Task-number: QTCREATORBUG-17637
Change-Id: Iceaea7a9f826ed16c4caee9fc28b4c14eb304c62
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-26 13:08:49 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Ulf Hermann
1b46022330 ScxmlEditor: Fix typo
Change-Id: Icd8ff982a3b8808af4798fb9adb5d8ebefd5a9af
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 14:26:10 +00:00
Alessandro Portale
1ff8b46d0a Utils: Create _TOOLBAR variants of some standard icons
And use these in scxmleditor. qmldesigner will also use them.

Change-Id: Ifd057531873a8cb8da3d6e033fbf606f17638c3e
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-12 14:19:29 +00:00
Tobias Hunger
b31bc37dca Scxml: Simplify code
Change-Id: Ia1ea8527054a9c94e5f40cca665f7f4b0a5c53e7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-29 15:23:04 +00:00
Tobias Hunger
e2fb126509 Scxml: Avoid possible nullptr dereference
Change-Id: Ie70da61f1c4f05d9247eb8b729fadad59b85cc45
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-29 15:22:44 +00:00
Tobias Hunger
15aab3ac45 Scxml: Initialize m_size in HistoryItem
Change-Id: I491405adc87a41886822e52a15679941545b388e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-29 15:18:41 +00:00
Tobias Hunger
c522d4d872 Scxml: Initialize m_size in FinalStateItem
Change-Id: I7a06e88655fed5d17cee7ecb624962be350143c4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-29 15:17:42 +00:00
Ulf Hermann
95d70a8957 SCXML Editor: Add some fall through markers
The parent/child relations between scxml tags are correct.

Change-Id: I58cd4153feee8b7cf8bdb74f89486e9fbc641839
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-29 14:53:13 +00:00
Jarek Kobus
96187594b5 Fix error messages
Change-Id: I88b72925c15e7bc70106cf5f8d9c21f558f8c918
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-15 15:14:31 +00:00
Sergey Belyashov
874683a15e Fix lacks of Q_OBJECT macro
Change-Id: I0de19ed983c45260c957ea88422093bf7faca6a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-11 13:15:49 +00:00
Alessandro Portale
2534cb017b ScxmlEditor: Fix the align* and adjust* icons
Use toolbar variants in the toolbar and menu variants in the menu.

Change-Id: Ie79631d80ff0f2c4c3b19b216def10d79bdd8454
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 15:30:29 +00:00
Alessandro Portale
d54da12af9 CPlusPlus, Utils: Move namespace icon from CPlusPlus to Utils
...so that it can be used in the ScxmlEditor plugin

Change-Id: I0e0ed050f7765bcc901db3bb2c3273456a228b5e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 10:45:06 +00:00
Alessandro Portale
77f68653b0 ScxmlEditor: Themable "Pan" icon
Change-Id: I2041801fb8d300515c3bea26bccda0c606cd2abe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-26 10:17:00 +00:00
Alessandro Portale
2428135319 ImageViewer, ScxmlEditor: Use the new "Fit to view" icon
Change-Id: I4261e2a91b2c2b310b571ac2657998dcc0756be6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 22:12:05 +00:00
Alessandro Portale
dc25b692fa ScxmlEditor: Themable toolbar icons for Adjust and Align actions
Change-Id: Ibd3a70a17362431fb1b11aecd18e9af6276b30c3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 20:21:49 +00:00
Alessandro Portale
d6c8a97429 ImageViewer, ScxmlEditor: Use the new "Zoom In"/"Zoom Out" icons
Change-Id: Ib01060918924644b57d35083a4269614fba900c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 15:29:28 +00:00
Jarek Kobus
ca4be197ef Revert "Replace virtual isModified method with a getter/setter/notifier"
This doesn't fix the issue with cleaning the clear state of undo stack.
This introduced the issue when ui file is opened it's marked as modified.
It reverts 59c90e00c1
and d0c537ca75

Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-21 09:19:56 +00:00
Alessandro Portale
c465a25edc ScxmlEditor: Themable, HighDPI-able export-canvas icon
Change-Id: I966dee7c22903921d814141bc749b39dec7cf8d7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-18 17:22:20 +00:00
Alessandro Portale
18f666aea5 ScxmlEditor: Use Utils::Icons::SNAPSHOT_TOOLBAR
Change-Id: Ic7b873aac60bf07780a11dbcfae10dac6a81035b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-18 17:13:50 +00:00
Alessandro Portale
d19f25c14a ScxmlEditor: toolbar variants of undo/redo/cut/copy/paste icons
In fact these icons should not be in the toolbar at all. But integrating
Cut/Copy/Paste into Qt Creator's ActionManager is too much for 4.2.

Change-Id: If9ec2f946dd1c500bb7d537d412a342aec929200
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-17 15:50:17 +00:00
Jarek Kobus
59c90e00c1 Replace virtual isModified method with a getter/setter/notifier
We have lacked the setter and dedicated notifier before.

Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-17 14:44:08 +00:00
Alessandro Portale
ef208bf8a4 ScxmlEditor: Remove duplicated icons
Some of the icons that came with the scxml editor were already present
elsewhere in Qt Creator in a themable/HighDPI-able form.

Remove the own .png files, use the existing icons.

Change-Id: I891305faee45eeb39dac4135d2ff96fc06727731
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-27 12:34:10 +00:00
Christian Stenger
950b665741 ScxmlEditor: Fix compile with Qt5.6
Change-Id: I07ed1737b9a72338aa74aab0c6277df414d95cb5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-19 07:22:33 +00:00
Orgad Shaneh
7fbbd8f2fd ScxmlEditor: Cleanup nullptr comparisons
Change-Id: I8b61929f1d23a6a7c46043b8967c1aebe333a7e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-18 10:20:03 +00:00
Orgad Shaneh
a9e796535a SCXMLEditor: Fix compilation
Add a missing include

Change-Id: I2adcfd721bdf54ad11f3e52918eadd97ddd7016a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-18 03:16:08 +00:00
Alessandro Portale
4ea332b062 ScxmlEditor: Initial import
Change-Id: I4701b77ebd4e2520f2616c42206ac17be3a12b60
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-09-16 12:39:49 +00:00