Merge branch 'master' into forceclose

Author: n-elie

.github/workflows/linux-builds.yml

@@ -16,6 +16,7 @@ jobs:
       run: |
         sudo apt-get update --fix-missing
         sudo apt-get install qt5-default
+        sudo apt-get install libqt5x11extras5-dev
     - name: qmake
       run: qmake
     - name: make

.gitignore

@@ -382,3 +382,4 @@ MigrationBackup/
 FodyWeavers.xsd
 / build
 /Settings.ini
+.vscode/settings.json

.travis.yml

@@ -9,6 +9,8 @@ matrix:
     os: linux
     dist: trusty
     group: stable
+    before_install:
+      - sudo apt-get install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -18,6 +20,7 @@ matrix:
         packages:
         - qt55base
         - qt55tools
+        - qt55x11extras
         - gcc-9
         - g++-9
     script:
@@ -35,6 +38,8 @@ matrix:
     services:
         - xvfb
     compiler: gcc
+    before_install:
+      - sudo apt-get install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -44,6 +49,7 @@ matrix:
         packages:
         - qt514base
         - qt514tools
+        - qt514x11extras
         - gcc-9
         - g++-9
         - libc6-i386
@@ -66,6 +72,8 @@ matrix:
         - xvfb
     compiler: gcc
     addons:
+    before_install:
+      - sudo apt-get install libqt5x11extras5-dev    
       apt:
         sources:
         - ubuntu-toolchain-r-test
@@ -74,6 +82,7 @@ matrix:
         packages:
         - qt514base
         - qt514tools
+        - qt514x11extras
         - gcc-9
         - g++-9
         - libc6-i386
@@ -95,6 +104,8 @@ matrix:
     services:
         - xvfb
     compiler: gcc
+    before_install:
+      - sudo apt-get install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -104,6 +115,7 @@ matrix:
         packages:
         - qt514base
         - qt514tools
+        - qt514x11extras
         - gcc-9
         - g++-9
         - libc6-i386
@@ -131,6 +143,8 @@ matrix:
     services:
         - xvfb
     compiler: gcc
+    before_install:
+      - sudo apt-get install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -140,6 +154,7 @@ matrix:
         packages:
         - qt514base
         - qt514tools
+        - qt514x11extras
         - gcc-9
         - g++-9
         - libc6-i386

README.md

@@ -1,6 +1,6 @@
 # Advanced Docking System for Qt
 
-[![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
+[![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
 [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)
 
@@ -59,6 +59,7 @@ know it from Visual Studio.
   - [QmixElements](#qmixelements)
   - [ezEditor](#ezeditor)
   - [D-Tect X](#d-tect-x)
+  - [HiveWE](#hivewe)
 
 ### Docking everywhere - no central widget
 
@@ -312,36 +313,48 @@ If this project help you reduce time to develop or if you just like it, you can
 From version 4.12 on, Qt Creator uses the Advanced Docking Framework for its
 Qt Quick Designer. This improves the usability when using multiple screens.
 
-![Qt Creator](doc/qtcreator.png)
+![Qt Creator](doc/showcase_qtcreator.png)
 
 ### [Qt Design Studio](https://www.qt.io/ui-design-tools)
 
 Taken from the [Qt Blog](https://www.qt.io/blog/qt-design-studio-1.5-beta-released):
 
 > The most obvious change in [Qt Design Studio 1.5](https://www.qt.io/blog/qt-design-studio-1.5-beta-released) is the integration of dock widgets using the Qt Advanced Docking System. This allows the user to fully customize the workspace and also to undock any view into its own top level window. This especially improves the usability when using multiple screens.
 
-![Qt Design Studio](doc/qt_design_studio.png)
+![Qt Design Studio](doc/showcase_qt_design_studio.png)
 
 ### [QmixElements](https://www.cetoni.com/products/qmixelements/)
 
 The QmixElements software from [CETONI](https://www.cetoni.com) is a comprehensive, 
 plugin-based and modular laboratory automation software for controlling CETONI devices using a joint graphical user interface. The software features a powerful script system to automate processes. This [blog post](https://www.cetoni.com/blog/qmixelements-advanced-docking-system/) gives a nice overview about the use of the Qt
 Advanced Docking System in the QmixElements sofware.
 
-![QmixElements](doc/qmix_elements.png)
+![QmixElements](doc/showcase_qmix_elements.png)
 
 ### [ezEditor](https://github.com/ezEngine/ezEngine)
 
 The ezEditor is a full blown graphical editor used for editing scenes and
 importing and authoring assets for the [ezEngine](https://github.com/ezEngine/ezEngine) -
 an open source C++ game engine in active development.
 
-![ezEditor](doc/ezEngine_editor.png)
+![ezEditor](doc/showcase_ezEngine_editor.png)
 
 ### [D-Tect X](https://www.duerr-ndt.com/products/ndt-software/d-tect-xray-inspection-software.html)
 
 D-Tect X is a X-ray inspection software for industrial radiography. It is a state-of-the-art 64-bit application which supports GPU (Graphics Processing Unit) acceleration and takes full advantage of computers with multiple CPU cores. A large set of tools assist the user in image analysis and evaluation. Thanks to the Qt Advanced Docking System the flexible and intuitive user interface can be completely customized to  each user’s preference.
 
 [learn more...](https://www.duerr-ndt.com/products/ndt-software/d-tect-xray-inspection-software.html)
 
-![D-TectX](doc/d-tect-x.jpg)
+![D-TectX](doc/showcase_d-tect-x.jpg)
+
+### [HiveWE](https://github.com/stijnherfst/HiveWE)
+
+HiveWE is a Warcraft III world editor. It focusses on speed and ease of use,
+especially for large maps where the regular World Editor is often too slow and clunky.
+It has a JASS editor with syntax hightlighting, tabs, code completion and more.
+The JASS editor uses the Qt Advanced Docking System for the management and layout
+of the open editor windows.
+
+[learn more...](https://github.com/stijnherfst/HiveWE)
+
+![HiveWE](doc/showcase_hivewe.png)

adsConfig.cmake

@@ -2,4 +2,5 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
+find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")

demo/MainWindow.cpp

@@ -400,8 +400,8 @@ void MainWindowPrivate::createContent()
 	ads::CDockComponentsFactory::setFactory(new CCustomComponentsFactory());
 	auto TopDockArea = DockManager->addDockWidget(ads::TopDockWidgetArea, FileSystemWidget);
 	// Uncomment the next line if you would like to test the
-	// setHideSingleWidgetTitleBar() functionality
-	// TopDockArea->setHideSingleWidgetTitleBar(true);
+	// HideSingleWidgetTitleBar functionality
+	// TopDockArea->setDockAreaFlag(ads::CDockAreaWidget::HideSingleWidgetTitleBar, true);
 	ads::CDockComponentsFactory::resetDefaultFactory();
 
 	// We create a calendar widget and clear all flags to prevent the dock area

demo/demo.py

@@ -202,6 +202,9 @@ def create_content(self):
         # Test custom factory - we inject a help button into the title bar
         QtAds.CDockComponentsFactory.setFactory(CCustomComponentsFactory())
         top_dock_area = self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, file_system_widget)
+        # Uncomment the next line if you would like to test the
+        # setHideSingleWidgetTitleBar() functionality
+        # top_dock_area.setHideSingleWidgetTitleBar(True)
         QtAds.CDockComponentsFactory.resetDefaultFactory()
 
         # We create a calendar widget and clear all flags to prevent the dock area
@@ -310,6 +313,7 @@ def create_actions(self):
 
     def closeEvent(self, event: QCloseEvent):
         self.save_state()
+        self.dock_manager.deleteLater()
         super().closeEvent(event)
 
     def on_actionSaveState_triggered(self, state: bool):