aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scxmleditor
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Rename FileName to FilePathhjk2019-05-283-6/+6
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt Creator CMake portCristian Adam2019-05-171-0/+94
| | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Replace static_casts by QOverload where possiblehjk2019-02-262-2/+3
| | | | | | | | | Mainly to get rid of the QProcess::finished deprecation warning. Also adjust coding style in the surrounding connects when needed. Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Prepare for potential QVariant::QVariant(const char *) deprecationhjk2019-01-243-6/+9
| | | | | Change-Id: I772f7b454e8f015c9e5bfc8e165e64deb2e3089a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* use initializer listsTim Jenssen2019-01-213-3/+3
| | | | | Change-Id: I82b04601f1db52197b3dc625b6b7e0f143c1c8b6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix warning: "Missing emit keyword on signal call"Alessandro Portale2019-01-171-1/+1
| | | | | | | [-Wclazy-incorrect-emit] Change-Id: I93bdc6e23cdaccf35c9899ae16870ccc65a54f80 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix warning: "Don't call QHash::operator[]() on temporary"Alessandro Portale2019-01-171-2/+2
| | | | | | | [-Wclazy-detaching-temporary] Change-Id: Ide503c9260af285fa1dbedb63f7819c8ad616db6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ScxmlEditor: ModernizeAlessandro Portale2018-12-1019-43/+39
| | | | | | | modernize-* Change-Id: I72a72cf5e9327956fdc0e5fc6f552bfc03d2122c Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* ScxmlEditor: Use ICore::dialogParent() as dialog parentAlessandro Portale2018-12-022-2/+7
| | | | | Change-Id: I0f8f0cb29b4fca1ecaf400ddc0b79e0616b27c79 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix build with Qt 5.12: fully-qualify base classThiago Macieira2018-10-251-1/+1
| | | | | | | | | | | | | | | Without the full name, moc will generate invalid code. This will happen for any base class whose name exactly matches the namespace it is in, because in struct A : public B::B inside class A, B is the injected name of the parent class, not the namespace, which in turn means B::B is the constructor. Change-Id: If7e743cf8476463880ccfffd155f3f51aa29e8b9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ScxmlEditor: Use override consistentlyTobias Hunger2018-05-073-3/+3
| | | | | | | clang-tidy fixes from modernize-use-override check. Change-Id: I636077ee65961a797677ecab39741870470566e0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Utils: Purge qtcfallthrough.hOrgad Shaneh2018-04-095-8/+0
| | | | | | | No longer needed. Change-Id: I9b0bee014df89d4c567f1d2431b5ff9404f5f925 Reviewed-by: hjk <hjk@qt.io>
* Don't translate default windowTitle again and againRobert Loehning2018-03-065-5/+5
| | | | | Change-Id: I4b4ff16e02c517bcd5a7c5ae73f62dd2a5bcc7cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* ScxmlEditor: Avoid use of global object poolhjk2018-02-084-27/+12
| | | | | | | Including some code cosmetics. Change-Id: I6d7f11404ea489020d0c74e43cbe25cdcaa48e85 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-251-5/+6
|\ | | | | | | Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94
| * Introduce Q_FALLTHROUGH()Friedemann Kleint2018-01-241-5/+6
| | | | | | | | | | | | | | Silence g++ 7.X warnings. Change-Id: I9d06d04b496c9ec060e13e1be6f43d8fbadb1f3b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-232-2/+2
|\| | | | | | | Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
| * Improve translated strings and make them consistentRobert Loehning2018-01-222-2/+2
| | | | | | | | | | Change-Id: I88a6e6ceaa44b22539449037faa788caa9f349fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | DesignMode: Apply 'static pattern'hjk2018-01-233-7/+5
|/ | | | | | | | | | | | | | Also: - and replace some occurrences of DesignMode::instance()->id() by Core::Constants::MODE_DESIGN for less dependence on the lifetime of the DesignMode object (and less indirection) - remove storage if DesignMode::instance() values when direct use of the static functions suffice - remove some unused items from the interface - use member-initialization in DesignMode::Private. Change-Id: Ie66c06da0fc0a3ccc588b8079e51db6b39284152 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ScxmlEditor: Avoid soft asserts when changing nullptr tagsUlf Hermann2017-12-142-15/+28
| | | | | | | | | | At least TagCurrentChanged can be triggered with a nullptr tag. That means the current tag is reset to "none". We should thus handle nullptr in all receivers of beginTagChange and endTagChange. Change-Id: Ife558beca9fb1ed5ab246b76bbaab19c1c227e8a Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
* ScxmlEditor: Mark the plugin non-experimentalAlessandro Portale2017-11-141-1/+0
| | | | | | | | | | The SCXML editor has been introduxed a couple of versions ago, and it got quite some maintenance in the meantime. It is time to mark it non-experimental. Task-number: QTCREATORBUG-17637 Change-Id: I7c0b0fb52e4ce5749b38fdb303f9900433d44c5d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ScxmlEditor: label data item in structure model by using "id"Tomasz Olszak2017-11-081-0/+1
| | | | | | | | | | Currently structure "modeldata" contains numerous "data" elements. It is hard to edit because one need to click on data element to check what's the element "id" which corresponds to variable name in e.g. when model type is ecmastript. Change-Id: I47687627a71a46c21f172d4dc50df2c9b9359edd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-10-255-10/+10
|\ | | | | | | Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
| * SCXML Editor: Fix UI textLeena Miettinen2017-10-205-10/+10
| | | | | | | | | | Change-Id: I2d6794682dfb05eaa3a926f33fffa039947afa87 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ScxmlEditor: Remove unused variableRobert Loehning2017-10-241-1/+1
| | | | | | | | | | | | Change-Id: I32218cb3cc24232240b1f81e745e815017f6252b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Replace manual signal blocking/unblocking with QSignalBlockerTobias Hunger2017-10-043-6/+3
|/ | | | | | Change-Id: Ibb59fab4e37d045e506c5a8172b6f5cbb955b028 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ScxmlEditor: silent fallthrough warningsNikita Baryshnikov2017-09-184-2/+9
| | | | | Change-Id: I7bd7140f05e8342a2e10713eb1646e0bd3f028ff Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* ScxmlEditor: Fix crash in WarningModelUlf Hermann2017-09-061-5/+6
| | | | | | | | | | Destroyed warnings were not properly removed, as qobject_cast on a QObject that's being destroyed returns nullptr. Also, call endRemoveRows() to finalize removing of rows, not endResetModel(), and avoid searching the vector twice. Change-Id: I70c0ac6ef897496adc71a5010929d71e91666ad4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-09-052-3/+1
|\ | | | | | | Change-Id: Ic9a1cf3b40b259d9c77f2f542405d189171e0fbf
| * SCXML editor: allow eventless transitionsMarco Benelli2017-09-042-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to SCXML specification (https://www.w3.org/TR/scxml/), the 'event' attribute is not mandatory in 'transition' tags. Also, as specified in section 3.12.1, eventless transitions are handled differently, and will be taken whenever the 'cond' attribute evaluates to 'true'. This patch removes the automatic assignment of 'event' property in the tag constructors, but restore it when a new transition is done in the editor. In this way, the user can delete the unneeded events without them being restored when reloading the document. Task-number: QTCREATORBUG-18345 Change-Id: I96d6860ad3ed58ab49e83d3328e88ef984f40fa4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Orgad Shaneh2017-08-301-1/+1
|\| | | | | | | Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
| * Fix copyright year in plugin info, --version, and macOS infoEike Ziller2017-08-241-1/+1
| | | | | | | | | | | | | | | | By using the new QTCREATOR_COPYRIGHT_YEAR variable Task-number: QTCREATORBUG-18612 Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | ScxmlEditor.TransitionItem: fix signed overflow warningNikita Baryshnikov2017-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | transitionitem.cpp:247: warning: assuming signed overflow does not occur when assuming that (X - c) <= X is always true [-Wstrict-overflow] if (idSnap >= 0 && idSnap < m_cornerPoints.count()) { ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Icc0b21c21326663f801ffef2b82fdd4b2679bf07 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-08-153-5/+3
|\| | | | | | | | | | | | | | | | | Conflicts: src/tools/clangbackend/ipcsource/clangiasyncjob.cpp src/tools/clangbackend/ipcsource/clangjobrequest.cpp src/tools/clangbackend/ipcsource/clangjobrequest.h Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
| * ScxmlEditor: Make the Attribute Editor table themableAlessandro Portale2017-08-091-3/+1
| | | | | | | | | | | | | | | | ...by not using hardcoded colors. Task-number: QTCREATORBUG-18685 Change-Id: Idbe694b4112cb2c7d82738598fb04c68c510c609 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
| * SCXML editor: Fix capitalization of UI textLeena Miettinen2017-07-312-2/+2
| | | | | | | | | | Change-Id: I2a67d63495f665d8a9e365bf420957b1def4d1e0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-251-10/+10
|\| | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
| * Plugins: Fix that mimetype definition was not valid JSONEike Ziller2017-07-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | JSON officially does not support multiline strings, so we should use the same mechanism that we already use for the plugin description (i.e. additionally support arrays of strings which are interpreted as lines). This just happens to work because Qt's JSON parser eats it without choking. Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-181-0/+3
|\| | | | | | | Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
| * Add Q_FALLTHROUGH for Qt < 5.8Christian Kandeler2017-07-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and make use of it. With gcc 7, the new option -Wimplicit-fallthrough is introduced and added to the -Wextra set, triggering dozens of warnings in our sources. Therefore, we annotate all obviously intended fall-throughs. The ones that are still left are unclear and need to be checked by the respective maintainer. Change-Id: I44ead33cd42a4b41c28ee5fcb5a31db272710bbc Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Scxml: use qobject_cast instead of static_castTim Jenssen2017-07-181-1/+1
|/ | | | | Change-Id: Ibcaca17a91856f041fcf9f28c8be6bdc2df63fe6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* SCXML editor: Fix UI textLeena Miettinen2017-04-056-13/+13
| | | | | | | ... capitalization, punctualization, and grammar Change-Id: I15205b899387e8a91529c3a6b6a2e81cf4315a4a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ScxmlEditor: Retain explicitly set "initial" attributesUlf Hermann2017-03-231-1/+9
| | | | | | | | | | | | | 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>
* Scxml: Use Qt5-style connectOrgad Shaneh2017-03-201-1/+1
| | | | | Change-Id: I59d0678e109ba778ef5a0b6f2fb8fb75b1aa437a Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* ScxmlEditor: Don't generate invalid state namesUlf Hermann2017-03-151-1/+1
| | | | | | | '(' and ')' should be avoided when copy/pasting states. Change-Id: Ic54528ed51b2f4596651bb1d23f282e70210f3a7 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* ScxmlEditor: Write real value into real variableRobert Loehning2017-03-031-1/+1
| | | | | | Change-Id: Ie5bc7e0026b7a81b2d6357f44dab69aafae3ef34 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Move mimetype definitions to plugin specsEike Ziller2017-02-276-21/+12
| | | | | | | | | | | | - Avoids the hassle of QRC files and manually registering mime types - Avoids performance regressions because of mime types that are registered after mime database has been used - Makes it technically possible to detect that a disabled plugin could handle a mime type if it was enabled Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* SCXML Editor: fix behavior of else and elseif tagsMarco Benelli2017-02-243-1/+14
| | | | | | | | | | | | | | 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>
* Remove spaces in initializer listsTim Jenssen2017-02-222-78/+78
| | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* Utils: move pan icon from scxml to utilsAlessandro Portale2017-01-274-3/+1
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 09:12:07 +0000