summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner.PropertyEditor: Always set current model on context objectThomas Hartmann2018-05-162-12/+9
| | | | | | | | | | | | We just set the first model once. This means that many functions only worked on the file that was the first one opened. This bug was undetected for some time, because the checks were silent. Replacing all related checks by proper QTC_ASSERTs. Change-Id: If46cb7fb7d0d3ae2bb9772a93eece5fcf1fe450b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-05-161-0/+2
|\ | | | | | | Change-Id: I0ef2f6ac30fb0c020e0f59d2a014d0dd3bab7d81
| * QmlDesigner: Disable shortcut if document did not changeThomas Hartmann2018-05-151-0/+2
| | | | | | | | | | Change-Id: I95f67379d507ab599d2435cc042f96fc28d8d7cd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: Use a less expensive QColor constructorAlessandro Portale2018-05-143-3/+3
|/ | | | | Change-Id: Ib49bd177cc8106c3995401e93f816a4ec052b4e7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove outdated Qt version conditionsOrgad Shaneh2018-05-112-4/+0
| | | | | Change-Id: I7fa3147afbdc07814f8710a44140072e7bbd8511 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Consistently use nullptrTobias Hunger2018-05-0866-79/+79
| | | | | | | Fixed by clang-tidy modernize-use-nullptr. Change-Id: Ia2ba90d137365292e95ac340166ed5d1f66a2a56 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Use override consistentlyTobias Hunger2018-05-0793-158/+158
| | | | | | | clang-tidy fixes from modernize-use-override check. Change-Id: I7d2025b076a18bb42babf63e13129c89469d2d2a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Move file also in for qbsNikolai Kosjar2018-05-031-2/+2
| | | | | Change-Id: I6c42d4cabee5792069ec27def80bf8ab3df4acb4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: move ZoomAction to compentcoreTim Jenssen2018-05-034-2/+2
| | | | | | | it is used by other plugins now Change-Id: I778faf73be003e3341471ecff84333d0d7dac56e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: export ZoomAction to Designer pluginsTim Jenssen2018-05-031-1/+3
| | | | | Change-Id: I53574fd1a7303b2b45d038b82bce8d18348a89c6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: try to keep zoom combo box smallerTim Jenssen2018-05-031-0/+1
| | | | | | | | Not sure why it takes so much space, tried different tricks, nothing was working - so just take the half and hope. Change-Id: Ib9ea475281b860838391f370c4f1eed98e327903 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: add resetZoomLevel to ZoomActionTim Jenssen2018-05-032-1/+16
| | | | | | | we always start from 100% Change-Id: I7877fe36430e1a80dc5258ee4ed2ed68ffaadd81 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix compileThomas Hartmann2018-05-031-2/+2
| | | | | | | | * formattedDataSize was added in Qt 5.10 * We simply use KB instead Change-Id: I2b09eb865ce27e097bc5fb2164f3da73b2437b5d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Refactor adding resourcesThomas Hartmann2018-05-038-28/+250
| | | | | | | | We show now a dialog that allows to optional change the target direcotory and gives an overview of the operations. Change-Id: I3f3337be1049b1c35bfa783c5840fd49d1952806 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: remove unused environment variableTim Jenssen2018-05-031-1/+0
| | | | | Change-Id: I110455905fe91ac8bcc061812e67ed26214f6e38 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: remove unused variableTim Jenssen2018-05-031-2/+0
| | | | | Change-Id: I75c4d8ce2a861e421c204809d28dea156d3e6a88 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Only the rewriter for the document should block UIThomas Hartmann2018-05-023-2/+13
| | | | | | | | We use different rewriter for different purposes. Only the rewriter that manages the current document should disable the UI. Change-Id: Ic410f7ee62ce13bb0eef133619f93c05b5632a56 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Clean up options page category display name and icon set upEike Ziller2018-04-231-3/+0
| | | | | | | | | | | | | | In cases where plugins extend an existing settings category of a plugin that they depend on anyhow, they do not need to specify the translated display name and icon for that category. Some options pages were already not setting the icon, but still the translated name, which makes even less sense. Clean up this mess, only setting display name and icon if that is necessary. Change-Id: I8bc9d0c51b11d48f1d847337838704d663e70b45 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Escape @ for annotationsThomas Hartmann2018-04-201-2/+19
| | | | | | | | | We use the @ for property names in annotations, but this is no correct QML. So we replace @ by __AT__ Change-Id: I9437f3b7b1e0489619bc89a20452cc2586be8f12 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crashThomas Hartmann2018-04-201-0/+3
| | | | | | | | The QML code for the annotations can be syntactically incorrect. We have to check this case. Change-Id: I5428b7963e905c65d65d8524316b2f81c952cb40 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Rename QmlTimelineFrames to QmlTimelineKeyframeGroupThomas Hartmann2018-04-208-110/+111
| | | | | Change-Id: I7b1a325e0e9567ddd9b887e3ea013b67d0bde3a8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QtQuickDeisgner: reformat and use algorithmsTim Jenssen2018-04-201-8/+6
| | | | | Change-Id: Ib98f625b86da671c7fc42594a9bc61682782a1b5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QtQuickDesigner: remove unnecessary list memberTim Jenssen2018-04-203-9/+1
| | | | | | | | no need to keep an extra list since we have access to m_designerActionManager Change-Id: I20e449beb24ab194a59b46dc4c677cd1e8152cca Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Set TextToModelMerger active to false when returningThomas Hartmann2018-04-201-2/+5
| | | | | Change-Id: I188237d1ca3257f13691063d306e877137a5936d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Rename Keyframes to KeyframeGroupThomas Hartmann2018-04-182-3/+3
| | | | | Change-Id: Ib43d892a3319a0c5ef700147b245e2ba5d3a593b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: restore auxiliary data when file is loadedThomas Hartmann2018-04-171-0/+1
| | | | | Change-Id: Iacf8ef63d8e841a637fadd5eb78ed8facd2cb5c5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Write annotations if file is savedThomas Hartmann2018-04-171-0/+10
| | | | | Change-Id: I729205715493f65b83e2de6f09d3d968187afe7a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove annotations if auxiliary data is emptyThomas Hartmann2018-04-171-5/+5
| | | | | Change-Id: I1692fbafbac747936e1dbb303f306bef311ca5f8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Slightly increase font size on high DPI displaysThomas Hartmann2018-04-171-1/+1
| | | | | | Change-Id: I8ed2bd45217aa5ff41768048f5fa6627a5895f4f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Brook Cronin <brook.cronin@qt.io>
* QmlDesigner: Add a couple of new theme colorsThomas Hartmann2018-04-172-6/+2
| | | | | Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Revert "QmlDesigner: remove testing code"Tim Jenssen2018-04-171-0/+3
| | | | | | | | | This reverts commit b3a92fc58e327e1c0289c753d1928d3d2c85fccd. If this is missing some general actions in the selection tab have an empty clickable icon area then. Change-Id: I143cc7c4d0e2ac11959ddd3c3a58154e4cb0cb3f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner/ShortcutManager: CleanupEike Ziller2018-04-162-27/+20
| | | | | | | | Remove some unneeded 0-parents, use nullptr, and do not use parameter actions when they are not needed. Change-Id: Ia556f83f7f1ce296fc08fa76cced7f41102d110f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Do not access clipboard if not requested to by userEike Ziller2018-04-161-11/+1
| | | | | | | | | | | | | | | | | | | QClipboard documentation states for X11: "Lastly, the X11 clipboard is event driven, i.e. the clipboard will not function properly if the event loop is not running. Similarly, it is recommended that the contents of the clipboard are stored or retrieved in direct response to user-input events, e.g. mouse button or key presses and releases. You should not store or retrieve the clipboard contents in response to timer or non-user-input events." So do not request the clipboard data when the QClipboard signals that the data has changed, because that locks up if the application providing the data is unresponsive. Task-number: QTCREATORBUG-20262 Change-Id: Ifd10150e1de62c8153ab2bb93a3e953a36fb243a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-136-5/+44
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * Qml tooling: Support Qt 5.11Alessandro Portale2018-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | QtQuick 2.11 QtQuick.Controls 2.4 QtQuick.Window 2.11 Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Add missing enum scopeThomas Hartmann2018-04-051-1/+1
| | | | | | | | | | Change-Id: Iadb96854c43d94f70d6b6d8bd398e2e265bff21a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Catch exception in ModelMergerThomas Hartmann2018-04-051-1/+7
| | | | | | | | | | | | | | | | Exceptions in the merger are very rare but not impossible. Therefore we have to catch potential exceptions. Change-Id: I83b2e9e41aa7b21374c06e2401c13df984fe0fd5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Do not dispatch commands when already in destructorThomas Hartmann2018-04-052-0/+6
| | | | | | | | | | | | | | | | | | | | On Linux destructing the local sockets leads to commands being dispatched synchronously. This is not expected and totally unrequired. When we shutdown the instance server no commands have to be dispatched anymore. Change-Id: Ieeca7ac2103e7b463137d76f85cd326888cc38ce Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Do not show icons for the itemlibrary in resourcesThomas Hartmann2018-04-051-1/+28
| | | | | | | | | | | | | | | | | | | | Everything that is in or below a designer folder with a *.metainfo file is not supposed to show up in the resource browser. The code is written very defensive way and we check a maximum of 3 directories above the current file. Change-Id: I14b3ae8a7e47208e15e9adfc1696c531a8589231 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Fix potential crashThomas Hartmann2018-04-041-1/+1
| | | | | | | | | | Change-Id: I850778e9534da4546e09c7d6368639b35488df33 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Stretch factor has to be set after inserting widgetsThomas Hartmann2018-04-111-2/+2
| | | | | | | | | | Change-Id: I90c48c6ca5d7eee51b0d0192ab045ff11a8a7c97 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Open states editor as expandedThomas Hartmann2018-04-111-1/+1
| | | | | | | | | | Change-Id: I690aa94f3990f9dd5ab18ab327e37b9a1e42be08 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Remove magic numberThomas Hartmann2018-04-111-1/+1
| | | | | | | | | | Change-Id: Id493ef001293afd9271dc5b8142d190f1f434633 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix build on LinuxTobias Hunger2018-04-101-0/+1
| | | | | | | | | | Change-Id: I342a8004f117292cd955530729ae29571094d5cf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix old naming convention in cssThomas Hartmann2018-04-101-1/+1
| | | | | | | | | | | | Change-Id: I0d73064d18f688d02aa15d13c733b98ee08b74a5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Slightly increase size of selection labelThomas Hartmann2018-04-101-2/+2
| | | | | | | | | | Change-Id: I39892bce5a30208fbecc0998405b8d577bc369f0 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Do not set if high dpi scaling is not enabledThomas Hartmann2018-04-101-1/+2
| | | | | | | | | | | | | | | | Qt::AA_EnableHighDpiScaling is the default for the puppet and setting QT_AUTO_SCREEN_SCALE_FACTOR will lead to artefacts in this case. Change-Id: I6f466559de8daf538dd59975674f6b438e771cba Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Adjust font pixel size if pixel density is highThomas Hartmann2018-04-1011-21/+60
| | | | | | | | | | | | | | | | We define some fonts in pixel size and those have to be increased if the pixel density is high. Change-Id: I88e932d967aaa9d8757e733048d457e9e7c17f5b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Allow custom disabling of viewsThomas Hartmann2018-04-108-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | If the document contains errors we disable views. Since the navigator view contains also the project view it should not be completetely disabled. Just the item navigator has to be disabled. To allow this we move the disable/enable logic to a virtual function that is overridden in NavigatorView. Change-Id: Ifb5b44fa19c36712cfebbe53b59c2d431e81cad4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Rename occurrences of mutator to timelineThomas Hartmann2018-04-105-11/+11
| | | | | | | | | | Change-Id: Icf747c4b8dd11c7fa71902188c6c39e920be401a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
View Lorry Controller Status