Commit Graph

36 Commits

Author SHA1 Message Date
Thomas Hartmann
f11ade3353 QmlDesigner: Implementing exporting QML file as image
Task-number: QTCREATORBUG-11494
Change-Id: Ifcfef6f9434637c0be0a727d9f80dfed1ef1c11b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-19 08:31:30 +00:00
Thomas Hartmann
b872a38040 QmlDesigner: Some cleanup
Change-Id: If1369124ca694bd5313213625636cf39a14af247
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 15:26:25 +00:00
Thomas Hartmann
e575f054db QmlDesigner: Adding a toolbar
* Icons are not the final ones.

* I fixed a couple of glitches and cleaned up the code.
   - Action for copy and paste/delete were not properly updated
   - Delete had no icon
   - Using std::function for action predicates and operations
   - The context menu has no icons. This way we avoid having to define 2
icons.

Change-Id: Ic23cbc78ba299c19e07e8de775eb813aae55db9b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-05 16:44:32 +00:00
Orgad Shaneh
fc64192312 QmlDesigner: Fix compilation with Qt 5.6
Broke by 5da074f95a.

Change-Id: Icd0400e7b19a564ba2777e1cceadd4994eb867f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-17 07:50:22 +00:00
Thomas Hartmann
5da074f95a QmlDesigner: Fix ESC issues
We do not want to switch to the editor whenever pressing ESCAPE.
Using shortcut override does not work for QQuickWidget.

Therefore we register our own action and disable it.

Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-14 15:20:00 +00:00
Thomas Hartmann
fafb99d910 QmlDesigner: Reformat .ui.qml files when saving
The feature can be turned off using a setting,
if there are serious issues with the reformating.

Change-Id: If90475af2db8aaade8bc52af0fb7cd14bfa1c121
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-10 07:13:03 +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
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
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin.
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 07:18:14 +00:00
Friedemann Kleint
fe2addf515 Clean exported headers of the TextEditor plugin.
Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-26 13:15:29 +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
9c7019f0b2 License update.
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 15:19:55 +02:00
Erik Verbruggen
a83bf58b88 Project Explorer: fix possible nullptr derefs and remove dead
The dead store is not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I18084c357696311b6556c7bc60832a72b3318e92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-11 15:36:27 +02:00
Nikolai Kosjar
bb9edec99a Add copyright comment
Change-Id: Ia16f38f4823a0d740391ef4450b858d10f3184e5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-22 10:06:51 +02:00
Eike Ziller
6772ba622a Fix closing editor with ctrl+w or "x" or File > Close
If there are other editors on the document visible in some split, it
should not close the document, but only the editor.

Task-number: QTCREATORBUG-9346
Change-Id: Idce1ae2f518d4c6e875d86f9831d41c46c06361c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-22 08:54:34 +02:00
Eike Ziller
18af5ceff7 EditorManager: closeOtherEditors --> closeOtherDocuments
Change-Id: Id8b225ed7ba6ea88669db06943d862793aa2671d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-18 14:14:18 +02:00
Thomas Hartmann
a21a55b59b QmlDesigner.ShortcutManager: Fix CLANG static analysis warnings
Change-Id: I9600439e1236c52b347c667bac6b6d79e2335375
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-04 15:52:05 +02:00
Eike Ziller
98ae1bf67b Make document model API more consistent with entry vs document
Change-Id: Iae2fe480d9fcb564d566f1dcca142c21c99c2d5b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-13 17:37:31 +02:00
Orgad Shaneh
88de3bb21d QmlDesigner: Avoid repetitive calls
Change-Id: Id33e46f925c94a970b001e7f34b7deb56224cc97
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-22 14:24:41 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 11:48:30 +02:00
Eike Ziller
8c1c106a4f Merge remote-tracking branch 'origin/3.1' 2014-04-14 16:53:23 +02:00
Thomas Hartmann
21566e5bd5 QmlDesigner: Use backspace to delete items on Mac OS X
On all platforms backspace will delete the selected item(s),
but on Mac OS X the backspace key will be shown as the shortcut
in the menu.

Just creating the QAction did nothing.

Task-number: QTCREATORBUG-10658
Change-Id: I476ee8bd6b03dd7453cbfa1b5814aca9b1c0634d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-09 16:17:00 +02:00
Marco Bubke
c525d8657b QmlDesigner: Change Full Screen in Sidebars
The text was really ...

Task-number: QTCREATORBUG-6268
Change-Id: I49909cfda5ea8a2c17e985d917fec5b1da6831ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-25 15:22:43 +01:00
hjk
eb724f3772 EditorManager: Use interface directly instead of going through ICore
In the majority of cases we were doing that anyways, having two
ways is just needlessly confusing.

Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:25:51 +02:00
Thomas Hartmann
0c0c3faa12 QmlDesigner: renaming constant
DELETE is provoking a name clash even in the namespace.

Change-Id: I5aeb99b527db5308808a3fc077a6710d5a20cdfb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-12 18:24:21 +02:00
Thomas Hartmann
b108f72bc7 QmlDesigner: remove DesignDocument::goIntoSelectedComponent()
This function is highly confusing as a member of DesignDocument
and the logic can be implemented directly in the ShortcutManager.

Change-Id: Id722dcb71b542b4780614c9f895f06150ccb67ca
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-05 16:40:25 +02:00
Eike Ziller
354cd410b0 Make document model static and add some document related methods
Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:55:59 +02:00
Eike Ziller
7b1941c792 OpenEditorsModel API: Use 'document' more where is about documents.
Rename OpenEditorsModel to DocumentModel.
In the DocumentModel also make the distinction between "restored"
document (i.e. just info about file name, display name, id), "opened
document" (i.e. document with IEditor and IDocument), and "document"
(which refers to any).

Change-Id: I01ebe10ec84aab5fe81e54be6bec14f653f28771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-12 11:46:19 +02:00
Eike Ziller
113c5600c9 Move displayName from IEditor to IDocument
The display name is not editor instance specific, but belongs to the
document.

Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-10 17:26:15 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Eike Ziller
c531970b57 Add EditorModel::openDocumentCount and use it.
As is, EditorModel::rowCount() could also be used, but this will most
probably change later. So we simply add a method that is independent
from all the "model" methods.

Change-Id: I39a2338d765ed6a269bf8977b816a5eda371afdf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-02 12:17:30 +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
Marco Bubke
b3c63795bf QmlDesigner: Cleanup design document
Change-Id: Iba5a1ba44ec8dc9619eb8fcc93f8498c1d1f2f7f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-12 12:53:29 +01:00
Marco Bubke
2b128ac692 QmlDesigner: Update actions for design mode switch
Change-Id: If5ad9d7da6e6c16653153fa78bc37e948e86b0fc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-12 11:51:01 +01:00
Marco Bubke
3e1f2521cc Qmldesigner: Change action registration
Context variables don't worked, so the context was registered.

Change-Id: Ic0efb8dc68d4762656e7858c1011e9fb759a7d81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-11 15:36:03 +01:00
Marco Bubke
8d9710c074 Refactoring document handling
The document handling in the qml designer was complicated source
code, which was initially intended for a non creator application.
To integrate new views it has to be changed and cleaned up. This
is the first major step in that direction.

Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-23 14:53:28 +01:00