Commit Graph

31 Commits

Author SHA1 Message Date
Thomas Hartmann
f23c0db1a2 QmlDesigner: Simplify reading a setting
Change-Id: I754b3ac1635699e5d9ceab376ae70752a966082f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:16:02 +00:00
Tim Jenssen
fa84524c0c QmlDesigner: rename RewriterError -> DocumentMessage
Change-Id: I8cbb1b8b83ec10c33e416de96a09281208be8773
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-10 16:22:23 +00:00
Thomas Hartmann
759db2b7b6 QmlDesigner: Polish error handling for integrated text editor
The integrated text editor requires a couple of fixes and features
in the error handling.

The errors are now handled by the model and not the document management
anymore.
The text editor does not get disabled if there is an error. Instead
we show the error in a status bar.
The form editor is blocked if there is a QML an error and we show the
error message inside the form editor.

Change-Id: I4bfb9b33b09e444ec1de31dd531ce83b32cbcf88
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-10 15:58:36 +00:00
Tim Jenssen
357cefe67c QmlDesigner: Cleanup DebugView messages
These messages are purely technical and relate to implementation
details. Therefore the strings should not be translated.
We keep the original method names.

Change-Id: I3f98aea7b9df3890bca097d1e6b77789204c8e19
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-13 16:32:08 +00:00
Orgad Shaneh
7b3642cce4 Merge remote-tracking branch 'origin/4.2'
Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
2016-11-28 15:27:51 +02:00
Thomas Hartmann
b3119d1994 QmlDesigner: Using passive consistently in AbstractView api
Using "changed" for all methods of AbstractView.

Change-Id: Idd607d7e6087b83954b081fb49fd39e0bd196c3d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-28 10:20:38 +00:00
Thomas Hartmann
677965d1dc QmlDesigner: Fix debug message
Change-Id: Ifb019f4d888c2235a75a082e0f261c60a61070bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-28 08:42:38 +00:00
Orgad Shaneh
a96cdb04bc QmlDesigner: Fix memory leak
Detected by memcheck.

Change-Id: I297dfc99c83f35c87cba9416db972beaccaf842d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-13 13:09:18 +00:00
Tim Jenssen
ff3ccba7c1 QmlDesigner: improve settings for easy adding new values
- move settings keys constants to the settings file
 - transform settings to a QHash

Change-Id: I1d41476421ce569cea3a4bd1c956d3bc0c6643f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-01-21 09:48:45 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Leena Miettinen
46cb547dcc Qt Quick Designer: make log messages more consistent
- Use sentence style capitalization
- Use human readable text instead of property names

Change-Id: Iefa6ae7d3ca1df2692699063a87fdbbf13fe0751
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-27 14:48:50 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Thomas Hartmann
f63e405649 QmlDesiger: Add diagnostics to DebugView
Change-Id: Ibce886a9b11c2d4b2a4a3f0ddf1f3a0eaa0de2ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:00:07 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Thomas Hartmann
7d5d5fa311 QmlDesigner.DebugView: Add output for selection changes
Change-Id: Ice4a3bbeedd48712429e2fdfdcb325fa25b68727
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:44:52 +02:00
Marco Bubke
4743217eac QmlDesigner: Exchange QLatin1String with QStringLiteral
Change-Id: Iaefe0ea33ee17795cb402da33e4e7f0da747d4d5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-13 15:05:38 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Thomas Hartmann
97bda33341 QmlDesigner.DebugView: only show status if enabled
Change-Id: Idd8738409965251767a5fbd26421acb32b54dd15
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-31 14:24:36 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
Marco Bubke
1882a7706f QmlDesigner: Add toImportString and change toString in Import
Change-Id: Ic6d4fc225b7f1ccc78593b28a0a96dc4fefec614
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-14 15:14:03 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:37:29 +02:00
Marco Bubke
8143031599 QmlDesigner: Remove QmlModelView
And use NodeInstanceView directly. There is still more cleanup required
for the view handling.

Change-Id: I62417644ceefb25fb9f3bb93a894b71ae0929cb0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:21:20 +02:00
Marco Bubke
8671bd182c QmlDesigner: Remove empty notifier from QmlModelView
QmlModelView is abstract and should not hide other notifier.

Change-Id: Ic992829e8e62ecf6142f84251dc1a86d35e35c2d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-24 17:26:07 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 14:09:58 +02:00
Thomas Hartmann
221dabf543 QmlDesigner: fix warning
Change-Id: I78ccdcc43bf9d34a4b3549a6aad59e6164f2d166
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-02 16:21:20 +02:00
Thomas Hartmann
bb1a76c0a4 QmlDesigner.Model: Adding SignalHandlerProperty
SignalHandlerProperty allows editing convenient editing of signal
handlers like onMousePress in the model.
The interface is analogous to BindingProperty.

Since mos views do not care about SignalHandlerProperties and
they should not be mixed up with BindingProperties they are different
types.

I also added the signalHandlerPropertiesChanged() notifier to AbstractView.

Change-Id: I68bc7d2c5d3b991944e8f8d698212a1dfef218bf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-02 14:32:09 +02:00
Thomas Hartmann
e367a39c71 QmlDesigner: adding interface to customize toolbar buttons
WidgetInfo contains now a factory for the toolbar buttons.
The ownership of the factory is taken by the SideBarItem.

Change-Id: Iffa32359cd3f0cb5b378abc5371d810aee31649c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-25 13:55:59 +01:00
Thomas Hartmann
fde76ae8ed QmlDesigner: QLatin1Fix
Change-Id: Ida35d96b958be68f498df085ef2429f33ca570f5
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit c15b1d8819)
2013-03-25 13:51:42 +01:00
Thomas Hartmann
368b3acbdb QmlDesigner.AbstractView: remove widget()
We use now widgetInfo() instead.

Change-Id: Icaea8f012b380368b6479fa81d370236ea5a6781
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 54431a090c)
2013-03-25 13:40:11 +01:00
Thomas Hartmann
9201833389 QmlDesigner: adding debug view
This view improves debugging of the Qt Quick Designer.

Change-Id: I01a0240fd304c48707021d4445b2c09c9243d868
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 15f58b16fd)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-25 13:39:02 +01:00