Commit Graph

56 Commits

Author SHA1 Message Date
Leena Miettinen
e2d33a85f2 QDS Property Editor: Replace "item" with "component" in UI text
- Write ID in all caps
- Some other small fixes

Task-number: QDS-3778
Change-Id: Ib959a2b8d31c7e51ea9ed1cae398b115b01e63f8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-18 13:07:22 +00:00
Henning Gruendl
db6ad528bb QmlDesigner: Implement new control design
* Update creator theme files and related enum
* Remove unused ActionIndicator functionality
* Update all controls (Colors, Positions, Sizes)
* Add global hover state and cleanup all other states
* Add global hover functionality to ButtonRow
* Add missing states
* Add new MenuItemWithIcon
* Add checkers.png for StateDelegate preview background
* Update copyright headers
* Replace AnchorButtons spacing
* Make ADS title bar buttons and tab bar buttons themeable
* Fix replace CSS colors to allow specifing alpha
* Fix replace CSS overwritting consecutive variables
* Make navigator icons and other elements themeable
* Make connection view themeable
* Make item library themeable
* Fix item library import path
* Update all HelperWidgets
* Fix GradientDialogPopup

Task-number: QDS-3768
Change-Id: I28a5fed178c95d098db052b8c2eabaa083d37b81
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-16 09:11:38 +00:00
Eike Ziller
3944162039 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
2020-08-10 15:56:54 +02:00
Henning Gruendl
9f2bb4abaf QmlDesigner: Fix ExpressionTextField popup
Fix the ListView/Popup which is shown on the ExpressionTextField when
requesting auto completion.

* Fix key behavior of the auto completion list
* Adapt to the look and feel of the property editor
* Fix size and position of the TextField and the overlayed Label

Task-number: QDS-2561
Change-Id: Ie8df6a2960b1c273600543532f0a136eb0c542b5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:57:01 +00:00
Leena Miettinen
cf652d8a11 Qt Quick Designer: Fix tooltips and UI text capitalization
Follow the guidelines for capitalizing UI text.
Try to shorten the tooltips and use standard phrasing.

Change-Id: I76a0fdd99101d21a8023881988b1c7446d65b40b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:55:35 +00:00
Henning Gruendl
1fb1e829ee QmlDesigner: Replace alias icon with font icon
Task-number: QDS-2559
Change-Id: Ibcc4c6565eff6a5c5f7011fbf39af2277da9eec0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:54:12 +00:00
Henning Gruendl
c898152621 QmlDesigner: Add change type name dialog
* Add a change type name dialog showing all incompatible properties
* Fix ExpressionTextField triggering twice on pressing enter
* Fix compare operator

Task-number: QDS-1946
Change-Id: Ic384f6dcce44297b43839c17874108b39af909da
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:10:02 +00:00
Henning Gruendl
58ea14aea7 QmlDesigner: Controls 1 cleanup
* Replace ScrollView Controls 1 with ScrollView Controls 2
* Replace TabView with TabBar and StackLayout
* Remove unused styles
* Replace Controls 1 imports
* Remove print statement in FontSection
* Fix layout width by correcting CheckBox width
* Remove TabView from QtObjectPane

Task-number: QDS-2454
Task-number: QDS-2455
Task-number: QDS-2456
Change-Id: I913d326afb012375dd5b804171cb8cd67681514c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 10:09:48 +00:00
Henning Gruendl
7f0a0d2c60 QmlDesigner: Property Editor cleanup
* Put align distribute section in separate file

Change-Id: I8f0219f32f847c11733833164c5287af5df429cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:35:16 +00:00
Henning Gruendl
ddde374b40 QmlDesigner: Set height according to active tab
* Add binding to current tab height
* Remove unused specficsOneHeight statement

Task-number: QDS-2051
Change-Id: Ia1ac6af4e65d3de5e1db96f2bcc2d1ec8eb08312
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:15:16 +00:00
Unseon Ryu
a2cedf76f2 fix scroll height of property editor
Fixes: QDS-2013
Change-Id: I43c3e6507f7f2052a86b0ccc485bd520c4dbabac
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-07 07:48:18 +00:00
Leena Miettinen
1f26c6d1b9 Qt Quick Designer: Fix UI text punctuation and capitalization
According to the guidelines in
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Id1f484855396c16d629b5743bef9710e84ba2cd6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-11 08:38:21 +00:00
Aleksei German
3f8da54e7d QmlDesigner: Annotation Multiselect
Change-Id: Ia7a84c321d5cd1e2522bf277a903c78ec24ce156
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-20 08:50:59 +00:00
Aleksei German
9a09dd8a88 QmlDesigner: minor fixes for Annotations
- Mac dialog window fix
 - Changed behavior on add new tabs action
 - Removed unused code

Change-Id: I0579b1ba85fb535464b2d5160a85a898f2e78a76
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-19 13:55:35 +00:00
Aleksei German
c81d672bb0 QmlDesigner: QDS Annotations
- Extended Auxiliary data support for Annotations
 - Extended Model Node interface
 - New Tool created
 - Form Editor & Property Editor visualization

Task: QDS-39
Change-Id: Idf15f9b295cb2b977fd5557acffbd40757f13a8e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-17 14:50:17 +00:00
Henning Gruendl
60f27c609a QmlDesigner: Add item layer properties
Task-number: QDS-1305
Change-Id: I0d6a390ac05f6bda9f11ecb25b461c95519d8bb3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-12-06 13:21:35 +00:00
Henning Gruendl
f15a323663 QmlDesigner: Add align and distribute feature
Change-Id: I99c57036c25e4aaf73f2c6014523da5da9d3cd21
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-29 18:56:27 +00:00
Henning Gruendl
cf6a88c3ae QmlDesigner: Cleanup layout specifics
* Add missing drag range property to AnchorRow, MarginSection and
   PaddingSection SpinBoxes
 * Use MarginSection for LayoutProperties

Change-Id: I656fc0df353a16477a1ad0279af7186899f5f7e6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-01 11:52:24 +00:00
Thomas Hartmann
898bdf12c0 QmlDesigner: Fix issue in loader resizing
Change-Id: Ie37b11672fdc6a1f29e2077ff4989a2bdd89c130
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2019-09-05 15:00:47 +00:00
Thomas Hartmann
8751d0c7d9 QmlDesigner: Resize Loader
Task-number: QDS-745
Change-Id: Idf126f5ed00cce74921a320d9bf17ef620ccd511
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-08-26 14:30:50 +00:00
Thomas Hartmann
aa30828f40 QmlDesigner: Disable horizontal scrollbar for property editor
Change-Id: Id6b9dc66ca86f775c7d8fd8a5c847becb5cf96cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:18:37 +00:00
Thomas Hartmann
68a6c5dfd9 QmlDesigner: Use sliderIndicatorVisible for some properties
Change-Id: I5827bd15c42f65f23f8b47a0f110c37311d26631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:08:29 +00:00
Thomas Hartmann
b6703b989d QmlDesigner: Remove focus when clicking outside
Change-Id: I400401c547461cfca22f7af026cf9c33704e8f6a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-06 13:07:57 +00:00
Thomas Hartmann
e5dde74b9f QmlDesigner: Work around layout issue
Layout.fillWidth: true does not work without an explicit size.

Change-Id: I4308016febddef1735d6e5261ac5bc989496bac9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-06 12:56:23 +00:00
Thomas Hartmann
218c1e3769 QmlDesigner: Add multi-selection to property editor
This implements basic multi selection for the property editor.
The property editor shows the most common type.
Values in the property editor show the values of the item that
was selected first.

Task-number: QDS-324
Change-Id: I5f03fa5aa9cfb0a0abaf285a29bf5f7e931635e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-05 13:27:48 +00:00
Tim Jenssen
1de5bbd378 QmlDesigner: introduce a real Theme class
- rename Theming -> Theme
 - made derived colors as Q_INVOKABLE methods available
 - rename registerIconProvider -> setupTheme
 - inside *.qml files use a singleton import instead of a context

Before this change, every request for a theme value copied the map into the
Qml context including the convert of values QVariant -> QJSString

Change-Id: I1c483fb591336b519d5adab8ad37b42bc5a06720
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-09 17:20:36 +00:00
Thomas Hartmann
8f74cc3b7c QmlDesigner: Avoid second error message
We get editingFinished twice. By checking visible we able to ignore
the second signal.

Change-Id: Ic5ab91e153b1d658a68321436c71b914e065c6dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-04 13:21:20 +00:00
Thomas Hartmann
796da79b2a QmlDesigner: Adding auto completion for changing types
We reuse the ExpressionTextField but adjust a couple of properties.

Change-Id: Ib11c13e028b1211402eab69ba5a3dd6c9442de7b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-22 09:50:41 +00:00
Thomas Hartmann
87ac4cfafe QmlDesigner: Implementing gui for changing type
This implements the gui to change the type of an item.
Double click the type name in the property editor
to change the type.

Change-Id: I071ad203394691cc6b44f4336d483c473366fc72
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:45:04 +00:00
Thomas Hartmann
8469da333b QmlDesigner: Unify tooltip
We had slightly different tooltips for the same functionality.
I use the tooltip from the navigator.

Change-Id: I0afa53d75c01f23ebbfa1311d69e2f5a895c9e34
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-18 07:51:59 +00:00
Alessandro Portale
b17c43b6d9 QmlDesigner: Make sure that the export alias icon is not scaled
SecondColumnLayout would otherwise scale it up, at least on HightDPI.

Change-Id: I5c1bd6357e8559deee26002b90128abfbacf449f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-13 14:48:18 +00:00
Thomas Hartmann
648a909918 QmlDesigner: Allow to toggle alias exporting in property editor
Change-Id: I8d293eb5a5fa7d6f7092f2fc857e19e9c4014c60
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-19 15:46:52 +00:00
Thomas Hartmann
a017138e58 QmlDesigner: Adding theming support for Qt Quick Designer
With this patch the Qt Quick Designer supports:

*Flat
*Flat Dark
*Flat Light
*Classic

I did not test the dark style.

I added a template engine for the .css files. The syntax for the .css
files
is identical to the QML syntax.

Known issues:
* The icons in the property editor do not play well with the
  Flat Light style. We have to get proper Core:Icon support for the
  icons
  and most icons have to be simplified/flattened to fit the new style/
  theme.
* Some colors in the connection editor are still dark and hardcoded. But
  this looks ok together with all themes.
* The highlight colors are not taken from the theme, yet.

Change-Id: I94f2b75f92db8e131c2b15867dbabe9ae4b2f25a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:23:29 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +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
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
Tim Jenssen
b4599aa250 QmlDesigner: fix binding loops while resizing
Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 13:58:03 +02:00
Thomas Hartmann
616f01bc2e QmlDesigner.PropertyEditor: Do not show ExtendedFunctionButton for id
Change-Id: I3ccc2e341591913d1645b3e748ee07acf7cecee7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 11:41:59 +02:00
Thomas Hartmann
b6211c2bc9 QmlDesigner.PropertyEditor: Allow changing of id in states
Task-number: QTCREATORBUG-12499
Change-Id: I62b4418acff320978cfb282e94ae8be797509d6e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-24 21:10:52 +02:00
Thomas Hartmann
594b184bb1 QmlDesigner.PropertyEditor: Fixing size of ScrollArea
When evaluating Component.onCompleted the childrenRect.height
was not properly set, yet.

Instead we use onChildRectHeightChanged.

Change-Id: I68f395555fbfccccea35fab4387dcc23ca7f1a92
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-17 11:33:14 +02:00
Thomas Hartmann
d01be9da1d QmlDesigner.PropertyEditor: Adjust size of TabView
The size of a TabView does not adjust to its contents.
We have to do this manually.
The minimum size is defined by the LayoutSection.

Task-number: QTCREATORBUG-12040
Change-Id: Icdf42cbc3788b3ce38b9cffdb0dc9afd15d32815
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-22 11:20:22 +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
85a8af7b16 QmlDesigner.PropertyEditor: Bringing back checkbox for TR
Change-Id: I350b8d8fa6c59a48d4a89935ed40c8cff028beaf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-08 16:26:44 +01:00
Thomas Hartmann
584a49c265 QmlDesigner.PropertyEditor: fix for ItemPane layout
An empty loader messes up the layout.

Change-Id: I6405fcc16a30ad012b517009ef7308138dbca836
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-31 12:51:36 +01:00
Thomas Hartmann
dc434e8e28 QmlDesigner.PropertyEditor: fixing templates
Change-Id: I37f9691a320cdf4c63f7de72b2384624b5f67132
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-29 16:07:14 +01:00
Friedemann Kleint
357ea64797 Message fixes in QML-Designer.
Change-Id: I309b3b74b0760b8b1a89c0f85ffb52cc875e5d85
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-25 08:23:25 +02:00
Thomas Hartmann
9351b1ce35 QmlDesigner.PropertyEditor: adjustment to layout of ItemPane
* Adding some space above the TabWidget
* Avoiding double black lines at the top

Change-Id: I0aedf151b548a665445d4219609738b2ab23c0be
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:21:57 +02:00
Thomas Hartmann
0cdb0724c2 QmlDesiger.PropertyEditor: adjust background color
Change-Id: I403c37f2cda84980dfe441746f3c5bed7258a4ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 14:21:16 +02:00
Thomas Hartmann
120d56c116 QmlDesigner.PropertyEditor: bringing back the templates
Template for auto generates pages now work with in Qt Quick 2.

Change-Id: Idd0a8fe8d82555bc69b192b21df7641dcdb634b4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-23 17:45:31 +02:00