Commit Graph

21 Commits

Author SHA1 Message Date
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Mahmoud Badri
a7a4c9773b QmlDesigner: Add a default validator to ItemFilterComboBox
Change-Id: Iba8f3f42d7028bc5da5b5abd6d3581f67184376b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-03-14 08:58:18 +00:00
Pranta Dastider
411d5087ee QmlDesigner: Update Tooltips for Mouse Area Section
This patch update tooltip text for Mouse Area Section fields
in Property editor.

Fixes: QDS-9000
Change-Id: Ia48517504646e0fb16ed256e3b4bee722c03ef48
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-06 10:05:37 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Henning Gruendl
55082986e1 QmlDesigner: Introduce blocked state for labels
* Create blocked states for PropertyLabel, ControlLabel and
  MultiIconLabel
* Rename and cleanup the MCU blocked state properties
* Add missing MCU related control blocked states
* Remove majorQtQuickVersion usage
* Add context for the translator
* Fix a nested SecondColumnLayout
* Add missing property control in Column- and RowLayout
* Remove comments from EditableListView

Task-number: QDS-4692
Change-Id: Icb93fe153241f015ced54409a953a3318c7763ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 08:03:15 +00:00
Leena Miettinen
ffd94f1138 QML Designer: Fix UI text in Properties view
- Check capitalization of UI text (titles, headings and captions
  should use title case; labels should use sentence case)
- Fix some label text
- Fix some tooltips

Task-number: QTCREATORBUG-25915
Change-Id: Ifaffe77fa5ad3f9f310bd470ef59b021c1cf6456
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-07-02 13:52:08 +00:00
Henning Gruendl
66cd1a41c9 QmlDesigner: PropertyEditor redesign
* Add responsive resizing for property editor width
* Adapt custom component templates
* Fix custom component template generation if no properties defined
* Adapt Animation specifics and sections
* Adapt HelperWidgets specifics and sections
* Update ColorEditor and its components
* Remove SimpleColorPalette and its components
* Add ColorPaletteSingleton
* Implement eye dropper for ColorEditor
* Add TextExtrasSection and FontExtrasSection
* Move Component section to a new file
* Remove Advanced tab make its content a section
* Redesign TabBar and TabButton
* Make QtQuick.Controls 2 specifics part of QtCreator repository for now
* Update import versions
* Add new constants
* Update icon font
* Fix/update StudioControls and HelperWidgets
* Fix a few undefined warnings

Task-number: QDS-4582
Task-number: QDS-4562
Task-number: QDS-4555
Task-number: QDS-4554
Task-number: QDS-4553
Task-number: QDS-4299
Task-number: QDS-4296
Task-number: QDS-3769
Change-Id: Ia9677fd97f26e0e31a45da7a4136db1c9e1a5bf2
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-06-22 14:08:30 +00:00
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
Eike Ziller
3b76714290 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ListViewSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/MouseAreaSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RowSpecifics.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
	share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml

Change-Id: Ie5deacd39ae4f3c0966e7cb41a8fd832dcefbb09
2020-09-03 12:18:02 +02:00
Aleksei German
f43b81ae6f QmlDesigner: Disable Properties unavailable in QUL
Disabling properties in:
 MouseArea
 Flickable
 Image
 Text (including Font)

Change-Id: Id0a44fa73ff80bf4749c0bdc0f9eac3e2f488762
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-01 10:03:53 +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
104852e09d QmlDesigner: Update properties in property editor
Add missing and cleanup existing properties in property editor.

Task-number: QDS-1502
Change-Id: I7bff7bad32b3bfd0742dd1d06f7c3ba12ef1bbca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 08:47:57 +00:00
Henning Gruendl
4cd3b10069 QmlDesigner: Layout and source cleanup
* Cleanup positioner specifics, mostly by adding ExpandingSpacer
 * Fix GridViewSpecifics SpinBox Label distance
 * Remove some semicolons
 * Add missing label (true/false) to CheckBoxes
 * Fix a few indentions

Change-Id: I2b86dde58ddfc1aa78ed3e11c41b0f4eedfc412b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-08-23 08:06:56 +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
Tim Jenssen
67fef99766 QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere

Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:47:05 +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
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
1b59d8e2ce QmlDesigner.PropertyEditor: Adding MouseAreaSpecifics
Change-Id: I1bbab5f662788644e7190b0880e434c51a380eeb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-09 16:15:41 +02:00