Commit Graph

24 Commits

Author SHA1 Message Date
Tim Jenßen
19a81c13df ADS: compile fix against Qt 6.2.x
Change-Id: Iad2b44dd056dbd37ba47133dd972e8bfbf11f7cc
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-08 11:08:47 +00:00
Ali Kianian
bb690b4ccc QmlDesigner: Fix the bug for showing focused widget-based scrollbars
Fixes: QDS-11474
Change-Id: Ibfc156893812ab7a541fe01e995fe528a1d80d2f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-07 15:58:05 +00:00
Henning Gruendl
e16a302a43 ADS: Integrate newest base repository commits
* Update to newest version of ADS
* Fix memory leak in DockContainerWidget

Base repository was merged until commit
59b4dfb89c0c9c0e6035fe580088432312ed2d09

Change-Id: I357b21888fe6f0ec2160c8688d84cb7ecdcad079
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 16:16:00 +00:00
Henning Gruendl
7613710727 ADS: Enable minimumSizeHint from content
* Fix minimumSizeHint handling
* Set DockWidget to not force scroll area
* Set background color on dock widgets
* Add setting to activate/deactivate minimumSizeHint handling
* Fix missing ADS changes from last merge
* Fix ADS comments

Task-number: QDS-10925
Change-Id: I7e8e0d2e7c3f9ee6636a2dc0796f6bd1fff3b2ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-24 10:09:11 +00:00
Henning Gruendl
1327a2c7ce QmlDesigner: Add transient scroll bar
Add transient scroll bar to connections editor

Change-Id: Id4afd661da2fcdeacd2a4a0de0e0b9999c14dec2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-13 16:55:12 +00:00
Henning Gruendl
b2ee8acafa QmlDesigner: Add QML views transient scrollbars
* Add transient scrollbars to all QML based views
* Remove version from QtQuick imports
* Fix missing AssetsLibraryBackend reference in AssetsDelegate

Task-number: QDS-9549
Change-Id: I7ab2e52106efae07caa37763b5b0592cfbf57c2e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-01 13:54:14 +00:00
Henning Gruendl
315da21424 ADS: Delete implicit ScrollArea
* Delete implicit ScrollArea when content widget is deleted in
  hideDockWidget()

Base repository commit
2178b52621ed16f9846d6f80ecb59706b9d31921

Change-Id: I2e593f3be77fc8ad988e7882707619803ef70cfc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-30 16:16:54 +00:00
Thomas Hartmann
c78e0965c0 QmlDesigner: Implement transient scrollbar for widgets in studiostyle
Task-number: QDS-9556
Task-number: QDS-10368
Task-number: QDS-10385
Change-Id: Idcbc70db3075f7741a754376580f48d7df40e67a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-16 10:28:40 +00:00
Henning Gruendl
bb635325e7 ADS: Integrate newest base repository commits
* Add drag and drop to auto hide

Base repository was merged until commit
65600a4dcd072fd2773b661823816db6392c34eb

Change-Id: I09dd6613869368d3cf0c701055a6972db915561d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-07-20 11:00:54 +00:00
Henning Gruendl
16ef838f23 ADS: Integrate newest base repository commits
* Update to newest version of ADS
* Remove native window and title bar support on linux

Base repository was merged until commit
8d4507e9d83434be976ff8c7bc9f59733937a08d

Task-number: QDS-10242
Change-Id: If74b6b50421be3b759c61b0f76f4a330991f71fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-07-20 11:00:24 +00:00
Tim Jenssen
1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
2023-05-22 21:13:40 +02:00
Ali Kianian
5b8d79e7a7 QmlDesigner: Consider DockWidget size in floating mode
Task-number: QDS-9836
Change-Id: Ic7f95b8feb757c021a88110b7d529b1720fe83d0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-19 12:25:28 +00:00
Friedemann Kleint
ebb3b90dce ADS: Use only one logging category
Change-Id: I0366338d5605fea7b4b096605577e90dfa79c389
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-02-24 06:41:20 +00:00
hjk
38a6ab6cd6 AdvancedDockingSystem: Fix file licenses
Amends a7956df3ca which accidentally dropped the (L)GPL part.

Change-Id: I22e3f5cdb12b15ee777524cac04aa888606026c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-04 07:31:44 +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
Jarek Kobus
024dbd18b6 DockWidget: Avoid using sender()
The toggleView() was used as a signal handler for
m_toggleViewAction and as a public method. In the latter
case checking the sender doesn't make any sense.
Add a lambda as a direct signal handler for m_toggleViewAction
and perform a custom modification of the open arg before
calling toggleView().

Simplify setToggleViewActionChecked() implementation.

Change-Id: If3799110b3f1dcf6fe0c653ebcfd23f9716cb2f3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-08-22 08:59:23 +00:00
Henning Gruendl
a98c254c59 ADS: Integrate newest base repository commits
* 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>
2020-06-24 07:56:37 +00:00
Henning Gruendl
92c7662acb ADS: Integrate newest base repository commits
998fe9fa11939eb28dd021ca11d5302c4fe2a005
28dc374fc25fcf5a4100c7ad929cb8da690530ed
0e88467f94194d5bea209f6ddc364358ab92899e
d0f4ce324890197683869eafda0f3938ae619b8d
c541f2c69b519eceb76ffc54589175c9fd0da8a6
37d305e50d2c0829f031b71a61e290361eea9f07

- Fix/workaround for escape key issue with remaining overlays
- Clean up if statements according to style guide

Task-number: QDS-1883
Change-Id: I44ddaed67458a75aca91bdd74cd2b5890bd23c38
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-24 11:48:32 +00:00
Tobias Hunger
b329b7220b ADS: Do not re-use variables
Change-Id: I2aee3d6684d40077acfe652638292901bd660ea6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 14:59:39 +00:00
Tobias Hunger
3efa2a6af0 ADS: Prevent nullptr access in DockWidget
Change-Id: I071fd6a86d8e6951305d4e2d82d2025afafd4fc6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 13:26:41 +00:00
Tobias Hunger
79efcb76f6 ADS: No more structs in DockWidget
We do not use struct in QtCreator.

Change-Id: I97988dfc5d549d89fe78bfd710b922c11d6fb8fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 13:14:56 +00:00
Henning Gruendl
9684a5f269 QmlDesigner: Integrate upstream commits
- Integrate the newest commits from the base repository
  dec170ed24679fd49f9fb54af91f61146838f852
  34cb2ae91790fc65ca5c0f7b81bb928de22a32e5
- Cleanup a few if statements
- Cleanup a comment

Change-Id: I158bff610f701e7a30680cfb8383f64475199bbe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-26 13:59:57 +00:00
Christian Stenger
bd428b2f13 ADS: Do not enable debug log by default
Change-Id: I9e3f9608b5710b03c3e6089b5bfa40b651a865dc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-21 09:07:52 +00:00
Henning Gruendl
8f686e985c Add Advanced Docking System library
This library is a fork of the following repository
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
Development started from the following commit
1de42a9766134eecd2611c2b4e209d3e0ede74d2
Incorporate all commits until
3ffbbfb6d01ff211d8349027221a19b1419296b5

 - Rename variables and files to follow the Qt style guide
 - General code cleanup (remove goto, fix typos, add overrides, remove
   explicit slots specifier, replace string-based with functor-based
   connections, replace dynamic_cast with qobject_cast)
 - Replace most preprocessor instructions Q_OS_LINUX/Q_OS_MACOS with
   Utils::HostOsInfo
 - Remove all QT_VERSION preprocessor instructions below 5.11
 - Change loading and storage of workspaces. Store workspaces in
   separate file instead of a list in the Settings.ini
 - Add workspace dialog, model and view for managing workspaces
 - Rename XML tags and use enum/bool instead of ascii art/numbers as
   attribute values. Use base64 instead of hex for storing geometry info
 - Remove internal style sheets
 - Add more build systems (qmake, qbs)
 - Adapt copyright header
 - Remove unix specific build rules
 - Replace ADS_PRINT with QLoggingCategory
 - Replace Java-style with STL-style iterators

Change-Id: Icf8c2fbaccec9680df83c6e2100e3446a090a437
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-20 16:14:52 +00:00