Commit Graph

931 Commits

Author SHA1 Message Date
Henning Gruendl
431667925e QmlDesigner: Update StateEditor layout
* Add alias properties to StudioControls AbstractButton
* Add color to StudioControls theme
* Update StateEditor layout due to issue with default label placement

Task-number: QDS-2623
Task-number: QDS-2615
Change-Id: If46daab2293d42dff7d73c4cf9a0c370442c5694
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-31 07:53:05 +00:00
Henning Gruendl
5a8d4c6fc1 QmlDesigner: Update icon font
* Update icon font
* Use newly added icons in EditableListView

Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:06:04 +00:00
Aleksei German
f642c02eb6 QmlDesigner: Annotations for States
- Added Annotations support for States

Task: QDS-2312

Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-27 10:05:44 +00:00
Henning Gruendl
d235a6d807 QmlDesigner: Fix focus on EditableListView
* Add an enum to the StudioControls ComboBox to indicate type of
  interaction
* Force focus on last used ComboBox if activated signal wasn't send
  due to editing of the ComboBoxInput

Task-number: QDS-2626
Change-Id: I20b1660a05923baacef30f91080642baacee0378
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-27 10:05:04 +00:00
Thomas Hartmann
98656b5e61 QmlDesigner: Provide Object3DPane
If the QtQuick3D import becomes before the QtQuick import,
then QtObject is not recognized as a prototype of the QtQuick3D types.

Workaround: provide a pane for Object3D.

Task-number: QDS-2648
Change-Id: I337a30d09233101a8e7b00cc2d145d8211933571
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 15:45:09 +00:00
Henning Gruendl
2fe5b9f9b3 QmlDesigner: Add Connections specifics
Change-Id: I161f05c82f8c4114294a9c2609e4e3b50081db61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:41 +00:00
Henning Gruendl
15296cecc9 QmlDesigner: Fix property editor template layout
Change-Id: Icc4dd3e1e0daabc98dbfd893e0511a4ac6d07b13
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:13 +00:00
Henning Gruendl
5946ff96f8 QmlDesigner: Add State specifics
Change-Id: Ia80688dc056eab190e80344ef4414d1be247c4e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:15:35 +00:00
Miikka Heikkinen
7adc062cf9 QmlDesigner: Allow plain expressions to be set with LineEdit control
Task-number: QDS-2603
Change-Id: I10a1b513bc21b8736683d4ddc2e290c29b39696d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-17 07:17:26 +00:00
Tim Jenssen
4fe5b923cd Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 06:39:40 +00:00
Miikka Heikkinen
6eee8aa99d QmlDesigner: Add 3d axis colors to theme
Task-number: QDS-2404
Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-11 06:55:09 +00:00
Miikka Heikkinen
d56d03e322 QmlDesigner: Don't highlight EditableListView items when not focused
Change-Id: I0897d57ad417f39fb72c6ce19c1349f8f6030c0b
Fixes: QDS-2416
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-06 14:29:51 +00:00
Henning Gruendl
52f971ce5e QmlDesigner: Fix StatesDelegate TextField size
Task-number: QDS-2572
Change-Id: I0b797724ce626870921649807246ec692c7c40d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-05 11:39:44 +00: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
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
Lukasz Ornatek
f074e205a0 Support multiline text, fix text format
Explicitly set TextFormat to "RichText" when using rich text editor

Task-number: QDS-2229
Change-Id: I8f0110415b8125465779231426e66ecc53eae5fe
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-22 14:27:46 +00:00
Lukasz Ornatek
a7c14b5493 Support multiline text
Use rich text editor widget as dialog for multiline text input

Change-Id: I13147e776867032fe1145d6a8a37fcd6976399e4
Task-number: QDS-2229
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-07-21 16:23:09 +00:00
Henning Gruendl
2fa261c132 QmlDesigner: Move zoom buttons to FormEditorWidget
* Move the zoom all and zoom selection button to the FormEditorWidget
  taskbar
* Add zoom in and zoom out actions/buttons
* Fix ZoomAction in and out direction
* Add update icon font

Change-Id: I9addba5652cafa5884450bc633a1e16087aae8dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-10 13:00:18 +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
Miikka Heikkinen
b508a98e6a QmlDesigner: Fix spinbox empty value handling
Force zero value when text value converts to NaN.

Also, onEditingFinished doesn't trigger if value is something not
accepted by the validator (the empty value), so do the equivalent
also on focus loss, if value is still dirty (meaning onEditingFinished
didn't happen). This ensures we're never left with different value
shown and written in qml file.

Change-Id: I3862d8d11adf7955f99b50b515e015ad132a5c78
Fixes: QDS-1539
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-08 08:41:36 +00:00
Thomas Hartmann
c16de88a12 QmlDesigner: Remove Controls 1 dependencies
Change-Id: I085d24265669c55777e0c63b5f6fb26a8d0fe631
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-07-06 13:03:42 +00:00
Thomas Hartmann
b978af12ae QmlDesigner: Remove ExtendedFunctionButton
Change-Id: Ia8b7933ccb9b33d5d09b2a7edd862937246d97d8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:30 +00:00
Thomas Hartmann
d1e21dd615 QmlDesigner: Remove custom controls 1 styles
Change-Id: I695813e7b97caf7355211550856e51a398566ae9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:16:04 +00:00
Thomas Hartmann
98f84cd539 QmlDesigner: Remove GroupBox
This is unused.

Change-Id: If128fe35d6dd925cd4ff4999b2050e61325230da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-06 07:15:46 +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
Thomas Hartmann
cd622fd0a7 QmlDesigner: Reset focus also for objects not derived from Item
Task-number: QDS-2369
Change-Id: Ifa9ce163751bad0de09db5d35f77609210dd0ac5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-26 07:59:24 +00:00
Thomas Hartmann
a5ef3260fa QmlDesigner: Adapt to QtQml.QtObject
* Adding QtObjectPane for QtQml support
* Allowing also QtQml.QtObject to determine major version

Change-Id: If82ea1c52cb4b78415d0f422e22b5423903b5abb
Reviewed-by: Christian Kamm <mail@ckamm.de>
2020-06-11 07:51:24 +00:00
Aleksei German
def4655042 QmlDesigner: Fix for Binding Editor launch pos
Task: QDS-1418

Change-Id: Id0c051d7187648a1477de70769fb7a47363ccdeb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 18:43:42 +00:00
Miikka Heikkinen
84cbbb4100 QmlDesigner: Add support for colors defined with vector3d property
Some QtQuick3D effects specify colors as vector3d. Added support for
vector3d colors to ColorEditor. Support can be enabled by setting
isVector3D property to true. The colors are still displayed as
regular "#ffffff" style color strings in the ColorEditor.

Task-number: QDS-2114
Change-Id: If62152b0351e452d753eb6da9d90cd59fe2c4c59
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-09 12:20:26 +00:00
Eike Ziller
c644e7c80a Merge remote-tracking branch 'origin/qds-1.59'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
	src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp

Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
2020-06-08 16:04:15 +02: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
Eike Ziller
bf490b62e0 Merge remote-tracking branch 'origin/4.12'
Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
Tim Jenssen
c5157368bd Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
2020-05-05 21:00:19 +02:00
Thomas Hartmann
417c96828a QmlDesigner: Add easing property for animations
Task-number: QDS-2014
Change-Id: Ie9ea81dd52f3ca941afe77e39a4f5e3a2a428a68
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-05-05 16:08:09 +00:00
Alessandro Portale
67828b4fe5 QmlDesigner: Add a missing import to the PropertyEditor Theme
Change-Id: I4b6151b1e12311334a0c32e2fa6f7c30db150c92
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-05 07:03:32 +00:00
Thomas Hartmann
8a59bf19fe QmlDesigner: Update icon font
Change-Id: Ic1b59e1a026c4422b116bc3b5b262d077f1a9a1a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-05-05 07:03:21 +00:00
Miikka Heikkinen
3e85e93243 QmlDesigner: Close property editor comboboxes on selection change
Change-Id: I6f063a4884367bcf97ff79a5dcac42caf4a01118
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-05-04 09:58:37 +00:00
Eike Ziller
be73f41ad4 Merge remote-tracking branch 'origin/4.12'
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
2020-05-04 10:52:34 +02:00
Brook Cronin
96cd1bffae Theme: add controls theme to creator themes and map to controls theme values
Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-30 15:43:45 +00:00
Thomas Hartmann
39249bd91d QmlDesigner: Fix font section
Change-Id: I48b772c5ae81fe7bfe9f5d21f0eca20954827c50
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-28 15:01:30 +00:00
Tim Jenssen
53d161c98e Merge remote-tracking branch 'origin/qds-1.59'
Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
2020-04-28 16:18:24 +02:00
Eike Ziller
e9661e43cb Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/qtcreatorcdbext/qtcreatorcdbextension.cpp

Change-Id: If6963d1ef7b5a1ea6343f68c8e7ce6fb5f482f21
2020-04-28 15:48:36 +02:00
Tim Jenssen
6c2ae3519e Merge remote-tracking branch 'origin/4.12' into qds-1.50
Change-Id: I9bc1f87c3ab4a5ff0c84efa05d22763b8a1084c3
2020-04-28 11:53:38 +02:00
Thomas Hartmann
4435a19979 QmlDesigner: Add Combo box for states
Change-Id: I91494e297cc2c1aa4b192081b5cd31acbca87ce9
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-27 11:21:14 +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
Thomas Hartmann
9c17fd0dbe QmlDesigner: Extend icon font support
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update icon font and related constants

Change-Id: I31ac33917d2db002697ce63f50f5c181c5fdb103
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-27 08:47:31 +00:00
Eike Ziller
d79febdde9 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
2020-04-24 13:58:05 +02:00
Thomas Hartmann
d5ac552314 QmlDesigner: Fix ComboBox for raw strings
Change-Id: Ie35bda95290042f2faaf938ee67b6ee02e8c55b1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:42:13 +00:00