aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designmodewidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* ADS: Integrate newest base repository commitsHenning Gruendl2020-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Activate new ADS feature focus highlight * Remove resources.qrc and related *.svg files * Clean up new and existing source Base repository was merged until commit 3de877fe5635ff51a6d1205ca98aad85d204427f Merged changes from base repository include the following: * Fix wrong current index when removing a widget from DockAreaLayout * Fix invisible TabWidget for DockWidgets that are not part of a restored state * Enable ClickFocus for DockWidget to support focussing in case the content does not support it * Move focus related functionality into DockFocusController class * Add new DockManger config flag FocusStyling * Add support for focus styling of FloatingWidgetTitleBar * Improve focus handling when dropping a DockWidget * Improve highlighting focused DockWidget * Improve setting of DockWidgetTab focus * Add styling of focused DockWidget * Fix docking of floating widgets for macOS * Fix setting of DockingStateReader file version - use internal file version instead of user file version * Fix saveState() and restoreState() version handling to work like the function from QMainWindow * Fix escape key handling in native window event function if event WM_EXITSIZEMOVE occurs * Implement windows drag handling with native WM_ nonclient area messages * Fix showing DockArea when inserting a DockWidget in a hidden DockArea * Fix setting DockAreaTabBar index to prevent showing of tab 0 when inserting a DockWidget into an area with no current index tab * Fix wrong insertion order of DockWidget when dropping a floating widget to the left or top container drop area * Fix tab changes position when redocking it to the same position * Add nullptr check to fix potential nullptr access when closing a FloatingDockContainer * Fix single DockArea cannot be split * Fix visibility issue when adding dock widget after all other dock widgets have ben closed * Fix FloatingDragPreview flashing of hidden overlay when dragging the last visible DockWidget in non opaque docking mode * Fix FloatingDragPreview preventing dock widget from floating when dragging over another dock widget * Fix DockWidget::setWidget function to test for QAbstractScrollArea instead of QScrollArea. Now setWidget properly supports ItemViews like QTreeView or QTableView * Fix wrong display of center drop area when dragging over invisible dock area title bar * Fix bug that drop overlay sometimes was not visible when moving the drag preview over a floating window * Fix dropping of FloatingDragPreview into center of dock container with only one single visible dock area. If this happens the dropped dock widget needs to get tabified * Fix crash when trying to make a DockWidget floating in non-opaque mode if the DockWidget is not floatable * Fix DockWidgetTab to provide the right size when starting floating * Add DockWidget functions setAsCurrentTab, raise, isCurrentTab, isTabbed * Add new config flag HideSingleCentralWidgetTitleBar to enable a central single dock widget in the main dock container (dock manager) without titlebar * Fix DockContainerWidget::hasTopLevelDockWidget() and DockContainerWidget::topLevelDockArea() to work properly also for the main non floating dock container * Fix ElidingLabel to properly support Qt::ElideNone * Add setElideMode function to DockWidgetTab * Add setFullScreen(), setNormal() and isFullScreen() function to DockWidget * Fix takeWidget() function and fixed setWidget() function to handle case when there is already a content widget Task-number: QDS-2180 Change-Id: Ie30648ba329016c91fd19e9b4e12e31e47614b18 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/qds-1.59'Eike Ziller2020-06-081-0/+10
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
| * Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59Tim Jenssen2020-05-061-1/+1
| |\ | | | | | | | | | Change-Id: Ic3ae0fd8c779c0bac8a0f01e87043251b3ce7fd4
| | * Merge remote-tracking branch 'origin/4.12' into qds-1.50Tim Jenssen2020-05-051-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Ib971309305e4955a582f85de17e2e2c3365b0e92
| * | | Merge remote-tracking branch 'origin/qds-1.50' into qds-1.59Tim Jenssen2020-05-051-0/+10
| |\| | | | | | | | | | | | | | Change-Id: Id492d324031d4d5fb919eca80ffae4baa50f247f
| | * | QmlDesigner: Move designer action to the center of the tool barThomas Hartmann2020-05-051-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I7d6b38ea31ebefe0c01acd9360271fc5ba062ffe Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * | QmlDesigner: Extend icon font supportThomas Hartmann2020-04-271-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-061-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
| * | | Theme: fix file navigation breadcrumb bar to use theme colorBrook Cronin2020-05-051-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: Ice727823e6081c02e492c7469ed2f305e81bcb5a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/qds-1.59'Tim Jenssen2020-04-281-0/+35
|\ \ \ | | |/ | |/| | | | Change-Id: I8a5d7d98b4d75379fe3953fe00bdb939d1722676
| * | QmlDesigner: Global Annotations EditorAleksei German2020-04-221-0/+13
| | | | | | | | | | | | | | | | | | | | | Task: QDS-1904 Change-Id: I92682b235f9c69dd7069172807954f0a99a946b0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | Merge remote-tracking branch 'origin/4.12' into qds-1.59Tim Jenssen2020-04-221-17/+2
| |\| | | | | | | | | | Change-Id: I39a979aba39c735ab6885808b6371e5c8c02d37b
| * | QmlDesigner: Extend icon font supportHenning Gruendl2020-04-201-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 RichTextEditor * Update icon font and related constants Task-number: QDS-1913 Change-Id: I7212f4dfe480dbb340fd042f59c69b8f5ca7a8e4 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-141-17/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
| * | QmlDesigner: Fix connectionHenning Gruendl2020-04-091-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QDS-1639 Change-Id: I10d5e9c4945f7e6afeced5a67a58eb71eb1a4608 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Link OutputPane visible to DockWidgetHenning Gruendl2020-04-091-17/+2
| |/ | | | | | | | | | | Task-number: QDS-1639 Change-Id: I8f384669d402d961683e85ff237a224b6d26cf34 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-161-0/+25
|\| | | | | | | | | | | | | Conflicts: src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
| * ADS: Add workspace switcher ComboBox to ToolbarHenning Gruendl2020-03-131-0/+25
| | | | | | | | | | Change-Id: Ice2e38ac8fd7a0a4ef174d443b9f7e308239aa40 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-111-6/+31
|\| | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/designmodewidget.cpp Change-Id: I94a94a15df433d6caa8922fccaa69918b5e4e365
| * ADS: Hide detached window if not in design modeHenning Gruendl2020-03-091-0/+18
| | | | | | | | | | | | Task-number: QDS-1672 Change-Id: Ia20113cb9025c19194d87920cf060d2b9791e52a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * ADS: Disable workspace menu if not in design modeHenning Gruendl2020-03-091-5/+12
| | | | | | | | | | | | Task-number: QDS-1741 Change-Id: I8ab9f9f130d74c1dd426077d1b8b9500534b380f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Move some actions to a "View" menuEike Ziller2020-03-061-2/+2
|/ | | | | | | | | | A "View" menu seems to be what many users are looking for when they want to show or hide panes/views, so move corresponding actions there. Window management / split actions stay in the "Window" menu. Fixes: QTCREATORBUG-23610 Change-Id: Id683addc681de99abb35697a735fdbc9dc0d00cd Reviewed-by: hjk <hjk@qt.io>
* ADS: Cleanup workspace manager workflowHenning Gruendl2020-03-051-109/+11
| | | | | | | | | | | | | - Add workspace presets - Add reset button to workspace manager - Fix last workspace settings save/restore - Move functionality from DesignModeWidget to DockManager - Remove factory default workspace - Cleanup a few if statements Task-number: QDS-1699 Change-Id: I282dd6162a5a36041f8cd2aacd7407750d54cc22 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove dead codeTobias Hunger2020-03-031-10/+0
| | | | | Change-Id: Ia9db826ff5237755b2794a1ebee8df2a7bedace6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Integrate Edit3D view into CreatorMiikka Heikkinen2020-02-241-0/+1
| | | | | | | | | Edit3D view is now a tab alongside Form Editor. Buttons were moved to a Creator side task bar on Edit 3D view. Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e Fixes: QDS-1570 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Integrate ADS in QtCreatorHenning Gruendl2020-02-201-217/+261
| | | | | | | | | | | | | | | - Integrate DockManager in DesignModeWidget (create factory default workspace, create menu items, add qds constants, remove unused shortcuts) - Remove unused functions and variables due to new docking system usage - Add DockWidget style sheet to resources - Fix scrollbar style by merging base and scrollbar style sheets - Fix update of StatesEditorWidget when switching tabs - Add missing unique ids in widget info - Set minimum size on ItemLibraryWidget Change-Id: I08be6d753233fc767037a33b41af335cec6d43b1 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Remove usages of deprecated APIs of QLayoutSona Kurazyan2019-09-021-3/+3
| | | | | | | | | | Replaced: QLayout::setMargin() -> QLayout::setContentsMargins() QLayout::margin() -> QLayout::getContentsMargins() Task-number: QTBUG-76491 Change-Id: If28ef6910b3afe5d04e4746b74f9362a3e3b3c8e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-281-1/+1
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Help: Move resolution of help from multiple candidate IDs to HelpItemEike Ziller2019-02-011-1/+1
| | | | | | | | No need for code duplication. Change-Id: I3d2c795d072b8de5818e1844b8126e526339c0da Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Qt Quick Designer: Adapt to naming change in IContextEike Ziller2019-01-291-2/+2
| | | | | | | | Since context help is no longer based solely on an ID. Change-Id: I34bb81b70632df9fb75bdcf28b022418d4aa764b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Rename IContext::HelpIdCallback -> IContext::HelpCallbackEike Ziller2019-01-291-1/+1
| | | | | | | | It no longer takes an ID but a HelpItem. Change-Id: I0aa738549fea4fcfd0151adc2dfd642c63f0f60d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: ModernizeAlessandro Portale2018-07-251-12/+9
| | | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init modernize-use-equals-default Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Prefer using 'override' instead of 'virtual'Alessandro Portale2018-07-111-4/+4
| | | | | | | | warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override] Change-Id: I6dac7a62b627fa1353b4455e1af92f869c2571cc Reviewed-by: Marco Benelli <marco.benelli@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: Fix black barThomas Hartmann2018-04-101-1/+1
| | | | | | | The color was not renamed in this inline css. Change-Id: Ib23977fcc9f3c5925ef5183dba0fc2c0216ab465 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Fix NavigationWidgetFactory retrievalhjk2018-02-221-3/+2
| | | | | | | They aren't in the global object pool anymore. Change-Id: I4f0ae69ebabe33f0276dbfd7137a4f8adbaad489 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Avoid use of global object poolhjk2018-02-071-3/+2
| | | | | | | Plus some code cosmetics. Change-Id: I6fde62da5a99e750131d20336d35565280ac7bef Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-071-6/+32
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/locator/locator.cpp src/plugins/imageviewer/imageviewerplugin.cpp src/plugins/remotelinux/remotelinuxplugin.cpp src/tools/clangbackend/source/tokeninfo.cpp tests/unit/unittest/data/highlightingmarks.cpp Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
| * Add project tab to navigatorThomas Hartmann2018-02-021-6/+32
| | | | | | | | | | | | | | | | This makes navigation the project a lot easier and the layout of the side bars can be locked. Change-Id: I3ad7b85cb8704aedf8f5ec9ea9b2930c5a0986d1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-011-2/+4
|\| | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml-type-descriptions/qmlproject.qmltypes src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
| * QmlDesigner: Allow adding of resourcesThomas Hartmann2018-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | * Allows adding of multiple files * Files are copied * Files are added to the project * Supported file types can be extended Change-Id: I41d1d18c4a3fc9c6c50e0629070d9a2cbf082976 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-01-231-1/+1
|\| | | | | | | Change-Id: I49e8b8442e2b5edffbea19cb2bba97443ebc3d2a
| * QmlDesigner: Avoid detachsThomas Hartmann2018-01-231-1/+1
| | | | | | | | | | | | | | | | | | The non const overloads of first() and last() do detach if the reference count is higher than 1. Therefore we use constFirst() and constLast() instead. Change-Id: I737cfc428f1c21f16185b9b51175e181c0ec7068 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: Use more direct access to NavigationWidgetFactorieshjk2018-01-231-1/+1
|/ | | | | Change-Id: Ib3871131f03f92ffc5e427a09cb5bb26c55268bd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Core: Return context help id by callbackNikolai Kosjar2018-01-181-3/+4
| | | | | | | ...to support asynchronous providers. Change-Id: I483489c74e7886d5bc2bf00b65540c3d2c7afee0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Proper background for crumble barAlessandro Portale2017-11-131-6/+2
| | | | | | | Using Utils::StyledBar, and getting rid of one stylesheet. Change-Id: Idf4db461e6beb60e15cae9b295f13ec489146f4f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: just color the backgroundTim Jenssen2017-11-091-7/+16
| | | | | | | | Keep the style responsibility add the widget. So coloring the background with a helper widget is enough here. Change-Id: I24bb82786e2a8ef4af01b9719d2bad4aa1997f1f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Assign the stylesheet to the tab-bar that contains the timelineKnud Dollereder2017-11-011-0/+3
| | | | | Change-Id: Idd0e16bd6557bff7fd956e60b8b991b35feb5ea0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: initialize actions only at showTim Jenssen2017-08-291-0/+3
| | | | | Change-Id: Iff6438daf70840116f02fcc439a6327c9401c32c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: use initializer listsTim Jenssen2017-04-261-1/+1
| | | | | Change-Id: Ibdc46d30ad3f2b703d4cbdd796a1032030bd17cd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 00:17:31 +0000