Fix using escape button when dragging non-opaque preview to cancel drag operation (#114 )

* Added missing overrides. * Escape button to cancel dragging was not working in Windows either. Using the event filter added for Linux works.
Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
2020-02-07 23:07:07 +01:00 · 2020-02-07 22:54:02 +01:00 · 2020-02-07 22:49:10 +01:00 · 2020-02-07 14:41:35 +01:00 · 2020-02-07 14:29:02 +01:00 · 2020-02-07 13:42:11 +01:00
119 changed files with 10757 additions and 1200 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -0,0 +1,160 @@
 version: '2.3.2.{build}'
 branches:
  only:
    - master
 image: Visual Studio 2015
 clone_depth: 1
 environment:
  global:
    # Appveyor doesn't have Qt 12 yet
    LatestLTSQtVersion: 5.9
    LatestQtVersion: 5.11
  matrix:
    # Latest version of Qt, dll, 64bit, MSVC 2015, qmake
  - QT5: C:\Qt\%LatestQtVersion%\msvc2015_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "false"
    use_cmake: "false"
 # 32 bit builds
 # MSVC 2015 builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: x86
    use_mingw: "false"
    use_static: "false"
    use_cmake: "false"
    # LTS version of Qt, dll, 32bit, MSVC 2015, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: x86
    use_mingw: "false"
    use_static: "false"
    use_cmake: "true"
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MSVC 2015, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: x86
    use_mingw: "false"
    use_static: "true"
    use_cmake: "false"
    # LTS version of Qt, static, 32bit, MSVC 2015, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: x86
    use_mingw: "false"
    use_static: "true"
    use_cmake: "true"
 # end Static Library builds
 # end MSVC 2015 builds
 # MinGW builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 32bit, MinGW, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
    COMPILER: C:\Qt\Tools\mingw530_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "false"
    use_cmake: "false"
    # LTS version of Qt, dll, 32bit, MinGW, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
    COMPILER: C:\Qt\Tools\mingw530_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "false"
    use_cmake: "true"
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MinGW, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
    COMPILER: C:\Qt\Tools\mingw530_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "true"
    use_cmake: "false"
    # LTS version of Qt, static, 32bit, MinGW, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
    COMPILER: C:\Qt\Tools\mingw530_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "true"
    use_cmake: "true"
 # end Static Library builds
 # end MinGW builds
 # end 32 bit builds
 # 64 bit builds
 # MSVC 2015 builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "false"
    use_cmake: "false"
    # LTS version of Qt, dll, 64bit, MSVC 2015, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "false"
    use_cmake: "true"
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 64bit, MSVC 2015, qmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "false"
    # LTS version of Qt, static, 64bit, MSVC 2015, cmake
  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "true"
 # end Static Library builds
 # end MSVC 2015 builds
 # end 64 bit builds
 matrix:
  fast_finish: true
 before_build:
 - set PATH=%COMPILER%\bin;%QT5%\bin;%PATH%
 - set originalWD=%CD%
 - call "%QT5%\bin\qtenv2.bat"
 - cd %originalWD%
 - if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
 - if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
 - if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
 - if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
 - if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
 build_script:
 - if %use_cmake%==true mkdir .\build 
 - if %use_cmake%==true cd .\build
 - if %use_cmake%==true cmake --version
 - if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
 - if %use_cmake%==true cmake --build .
 - if %use_cmake%==true cmake --build . --target install
 - if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
 - if %use_cmake%==true cmake --build .
 - if %use_cmake%==true cmake --build . --target install
 - if %use_cmake%==false if %use_static%==true qmake "CONFIG+=adsBuildStatic"
 - if %use_cmake%==false if %use_static%==false qmake
 - if %use_cmake%==false %MAKEENGINE% debug
 - if %use_cmake%==false %MAKEENGINE% install
 - if %use_cmake%==false %MAKEENGINE% release
 - if %use_cmake%==false %MAKEENGINE% install
 after_build:
 - if %use_mingw%==true set PATH=C:\Program Files\Git\usr\bin;%PATH%
--- a/.cproject
+++ b/.cproject
@@ -83,6 +83,7 @@
 			</target>
 			<target name="Clean" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -99,7 +100,6 @@
 			<target name="qmake" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>qmake</buildCommand>
 				<buildArguments>-recursive ../ads.pro</buildArguments>
 				<buildTarget/>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
@@ -122,7 +122,6 @@
 			</target>
 			<target name="Clean" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -139,7 +138,6 @@
 			<target name="qmake" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>qmake</buildCommand>
 				<buildArguments>-recursive ../../src/src.pro</buildArguments>
 				<buildTarget/>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
@@ -152,6 +150,46 @@
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="Build all" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>mingw32-make</buildCommand>
 				<buildArguments>-j</buildArguments>
 				<buildTarget>all</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="Clean" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="Debug Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>mingw32-make</buildCommand>
 				<buildArguments>-j6</buildArguments>
 				<buildTarget>debug</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="qmake" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>qmake</buildCommand>
 				<buildArguments>-recursive ../../example/example.pro</buildArguments>
 				<buildTarget/>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="Release Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>mingw32-make</buildCommand>
 				<buildArguments>-j4</buildArguments>
 				<buildTarget>release</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
 			</target>
 			<target name="Build all" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>mingw32-make</buildCommand>
 				<buildArguments>-j</buildArguments>
@@ -162,7 +200,6 @@
 			</target>
 			<target name="Clean" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -179,7 +216,6 @@
 			<target name="qmake" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>qmake</buildCommand>
 				<buildArguments>-recursive ../../demo/demo.pro</buildArguments>
 				<buildTarget/>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
@@ -202,6 +238,7 @@
 			</target>
 			<target name="Clean" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -240,6 +277,7 @@
 			</target>
 			<target name="Clean" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -278,6 +316,7 @@
 			</target>
 			<target name="Clean" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments/>
 				<buildTarget>clean</buildTarget>
 				<stopOnError>false</stopOnError>
 				<useDefaultCommand>true</useDefaultCommand>
@@ -294,7 +333,6 @@
 			<target name="qmake" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>qmake</buildCommand>
 				<buildArguments>-recursive ../../AdvancedDockingSystem/src.pro</buildArguments>
 				<buildTarget/>
 				<stopOnError>true</stopOnError>
 				<useDefaultCommand>false</useDefaultCommand>
 				<runAllBuilders>false</runAllBuilders>
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
 PyQtAds/_version.py export-subst
--- a/.github/workflows/linux-builds.yml
+++ b/.github/workflows/linux-builds.yml
@@ -0,0 +1,22 @@
 name: linux-builds
 on: [push]
 jobs:
  build:
    strategy:
      matrix:
        os: [ubuntu-latest, ubuntu-18.04, ubuntu-16.04]
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v1
    - name: install qt
      run: |
        sudo apt-get update --fix-missing
        sudo apt-get install qt5-default
    - name: qmake
      run: qmake
    - name: make
      run: make -j4
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,19 @@
 *.pro.user
-/ build
+/build
 *.o
 *.dylib
 *.app
 qrc_*
 moc_*
 ui_*
 Makefile
 # IDEs
 .idea
 # Python
 .eggs
 *.pyc
 *.pyd
 __pycache__
 PyQtAds/rc.py
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,155 @@
 language: cpp
 # gcc is clang on mac
 compiler: gcc
 git:
  depth: 1
 matrix:
  fast_finish: true
  include:
  - name: Ubuntu qmake Qt5.5.1
    os: linux
    dist: trusty
    group: stable
    addons:
      apt:
        sources:
        - ubuntu-toolchain-r-test
        - sourceline: 'ppa:beineri/opt-qt551-trusty'
        update: true
        packages:
        - qt55base
        - qt55tools
        - gcc-6
        - g++-6
        - libc6-i386
    script:
        - PATH="/opt/qt55/bin:$PATH"
        - CXX="g++-6"
        - CC="gcc-6"
        - qt55-env.sh
        - qmake
        - make
        - make install
  - name: Ubuntu qmake dll
    os: linux
    dist: xenial
    group: stable
    addons:
      apt:
        sources:
        - ubuntu-toolchain-r-test
        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
        update: true
        packages:
        - qt512base
        - qt512tools
        - gcc-6
        - g++-6
        - libc6-i386
        - libgl-dev
        - libgl1-mesa-dev
        - mesa-common-dev
    script:
        - PATH="/opt/qt512/bin:$PATH"
        - CXX="g++-6"
        - CC="gcc-6"
        - qt512-env.sh
        - qmake
        - make
        - make install
  - name: Ubuntu qmake static
    os: linux
    dist: xenial
    group: stable
    addons:
      apt:
        sources:
        - ubuntu-toolchain-r-test
        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
        update: true
        packages:
        - qt512base
        - qt512tools
        - gcc-6
        - g++-6
        - libc6-i386
        - libgl-dev
        - libgl1-mesa-dev
        - mesa-common-dev
    script:
        - PATH="/opt/qt512/bin:$PATH"
        - CXX="g++-6"
        - CC="gcc-6"
        - qt512-env.sh
        - qmake "CONFIG+=adsBuildStatic"
        - make
        - make install
  - name: macOS CMake dll
    os: osx
    osx_image: xcode10.1
    addons:
      homebrew:
        packages:
        - qt
        update: true
    script:
        - PATH="/usr/local/opt/qt5/bin:$PATH"
        - mkdir -p build
        - cd build
        - cmake --version
        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
        - cmake --build .
        - cmake --build . --target install
        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
        - cmake --build .
        - cmake --build . --target install
  - name: macOS CMake static
    os: osx
    osx_image: xcode10.1
    addons:
      homebrew:
        packages:
        - qt
        update: true
    script:
        - PATH="/usr/local/opt/qt5/bin:$PATH"
        - mkdir -p build
        - cd build
        - cmake --version
        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
        - cmake --build .
        - cmake --build . --target install
        - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
        - cmake --build .
        - cmake --build . --target install
  - name: macOS qmake dll
    os: osx
    osx_image: xcode10.1
    addons:
      homebrew:
        packages:
        - qt
        update: true
    script:
        - PATH="/usr/local/opt/qt5/bin:$PATH"
        - qmake
        - make
        - make install
  - name: macOS qmake static
    os: osx
    osx_image: xcode10.1
    addons:
      homebrew:
        packages:
        - qt
        update: true
    script:
        - PATH="/usr/local/opt/qt5/bin:$PATH"
        - qmake "CONFIG+=adsBuildStatic"
        - make
        - make install
 notifications:
  email: false
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,127 @@
 cmake_minimum_required(VERSION 3.3)
 set(ads_VERSION "2.3.2")
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 project(QtAdvancedDockingSystem VERSION ${ads_VERSION})
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
 set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
 message(STATUS "Found Qt ${Qt5Core_VERSION}")
 set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
 set(ads_INCLUDE ${ads_INCLUDE} "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(ads_LIBS ${ads_LIBS} ${Qt5Core_LIBRARIES})
 set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS})
 set(ads_LIBS ${ads_LIBS} ${Qt5Gui_LIBRARIES})
 set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
 set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
 set(ads_LIBS ${ads_LIBS} ${Qt5Widgets_LIBRARIES})
 set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
 set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
 if(BUILD_STATIC)
    set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
 endif()
 set(ads_SRCS
    src/ads_globals.cpp
    src/DockAreaTabBar.cpp
    src/DockAreaTitleBar.cpp
    src/DockAreaWidget.cpp
    src/DockContainerWidget.cpp
    src/DockManager.cpp
    src/DockOverlay.cpp
    src/DockSplitter.cpp
    src/DockWidget.cpp
    src/DockWidgetTab.cpp
 	src/DockingStateReader.cpp
    src/ElidingLabel.cpp
    src/FloatingDockContainer.cpp
 	src/FloatingDragPreview.cpp
 	src/IconProvider.cpp
    src/ads.qrc
    src/linux/FloatingWidgetTitleBar.cpp
 )
 set(ads_INSTALL_INCLUDE 
    src/ads_globals.h
    src/DockAreaTabBar.h
    src/DockAreaTitleBar.h
    src/DockAreaWidget.h
    src/DockContainerWidget.h
    src/DockManager.h
    src/DockOverlay.h
    src/DockSplitter.h
    src/DockWidget.h
    src/DockWidgetTab.h
 	src/DockingStateReader.h
    src/ElidingLabel.h
    src/FloatingDockContainer.h
 	src/FloatingDragPreview.h
 	src/IconProvider.h
    src/linux/FloatingWidgetTitleBar.h
 )
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
    set(ads_PlatformDir "x86")
 else()
    set(ads_PlatformDir "x64")
 endif()
 if(BUILD_STATIC)
    add_library(qtadvanceddocking STATIC ${ads_SRCS})
    target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
 else()
    add_library(qtadvanceddocking SHARED ${ads_SRCS})
    set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
 endif()
 install(FILES ${ads_INSTALL_INCLUDE}
    DESTINATION include 
    COMPONENT headers
 )
 install(FILES 
    "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
    "${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md"
    DESTINATION license 
    COMPONENT license
 )
 install(TARGETS qtadvanceddocking
    EXPORT adsTargets
    RUNTIME DESTINATION bin
    LIBRARY DESTINATION lib
    ARCHIVE DESTINATION lib
    INCLUDES DESTINATION include
 )
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file("adsConfigVersion.cmake"
    VERSION ${ads_VERSION}
    COMPATIBILITY SameMajorVersion
 )
 install(EXPORT adsTargets
    FILE adsTargets.cmake
    NAMESPACE ads::
    DESTINATION lib/cmake/ads
 )
 install(FILES "adsConfig.cmake" "${CMAKE_BINARY_DIR}/adsConfigVersion.cmake"
    DESTINATION lib/cmake/ads
 )
 target_include_directories(qtadvanceddocking PUBLIC 
    "$<BUILD_INTERFACE:${ads_INCLUDE}>"
    $<INSTALL_INTERFACE:include>
    )
 target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})
 target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE})
 set_target_properties(qtadvanceddocking PROPERTIES 
    VERSION ${ads_VERSION}
    EXPORT_NAME "QtAdvancedDockingSystem"
    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
 )
 if(BUILD_EXAMPLES)
    add_subdirectory(example)
    add_subdirectory(demo)
 endif()
--- a/504
+++ b/504
@@ -0,0 +1,504 @@
                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 2.1, February 1999
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 [This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]
                            Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.
  This license, the Lesser General Public License, applies to some
 specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
 strategy to use in any particular case, based on the explanations below.
  When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
 you have the freedom to distribute copies of free software (and charge
 for this service if you wish); that you receive source code or can get
 it if you want it; that you can change the software and use pieces of
 it in new free programs; and that you are informed that you can do
 these things.
  To protect your rights, we need to make restrictions that forbid
 distributors to deny you these rights or to ask you to surrender these
 rights.  These restrictions translate to certain responsibilities for
 you if you distribute copies of the library or if you modify it.
  For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
 code.  If you link other code with the library, you must provide
 complete object files to the recipients, so that they can relink them
 with the library after making changes to the library and recompiling
 it.  And you must show them these terms so they know their rights.
  We protect your rights with a two-step method: (1) we copyright the
 library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
  To protect each distributor, we want to make it very clear that
 there is no warranty for the free library.  Also, if the library is
 modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
 restrictive license from a patent holder.  Therefore, we insist that
 any patent license obtained for a version of the library must be
 consistent with the full freedom of use specified in this license.
  Most GNU software, including some libraries, is covered by the
 ordinary GNU General Public License.  This license, the GNU Lesser
 General Public License, applies to certain designated libraries, and
 is quite different from the ordinary General Public License.  We use
 this license for certain libraries in order to permit linking those
 libraries into non-free programs.
  When a program is linked with a library, whether statically or using
 a shared library, the combination of the two is legally speaking a
 combined work, a derivative of the original library.  The ordinary
 General Public License therefore permits such linking only if the
 entire combination fits its criteria of freedom.  The Lesser General
 Public License permits more lax criteria for linking other code with
 the library.
  We call this license the "Lesser" General Public License because it
 does Less to protect the user's freedom than the ordinary General
 Public License.  It also provides other free software developers Less
 of an advantage over competing non-free programs.  These disadvantages
 are the reason we use the ordinary General Public License for many
 libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
  For example, on rare occasions, there may be a special need to
 encourage the widest possible use of a certain library, so that it becomes
 a de-facto standard.  To achieve this, non-free programs must be
 allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
  In other cases, permission to use a particular library in non-free
 programs enables a greater number of people to use a large body of
 free software.  For example, permission to use the GNU C Library in
 non-free programs enables many more people to use the whole GNU
 operating system, as well as its variant, the GNU/Linux operating
 system.
  Although the Lesser General Public License is Less protective of the
 users' freedom, it does ensure that the user of a program that is
 linked with the Library has the freedom and the wherewithal to run
 that program using a modified version of the Library.
  The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License Agreement applies to any software library or other
 program which contains a notice placed by the copyright holder or
 other authorized party saying it may be distributed under the terms of
 this Lesser General Public License (also called "this License").
 Each licensee is addressed as "you".
  A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
 (which use some of those functions and data) to form executables.
  The "Library", below, refers to any such software library or work
 which has been distributed under these terms.  A "work based on the
 Library" means either the Library or any derivative work under
 copyright law: that is to say, a work containing the Library or a
 portion of it, either verbatim or with modifications and/or translated
 straightforwardly into another language.  (Hereinafter, translation is
 included without limitation in the term "modification".)
  "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
  Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
 running a program using the Library is not restricted, and output from
 such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
  1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
 appropriate copyright notice and disclaimer of warranty; keep intact
 all the notices that refer to this License and to the absence of any
 warranty; and distribute a copy of this License along with the
 Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
    a) The modified work must itself be a software library.
    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.
    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.
    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.
    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Library,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Library, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
 entire whole, and thus to each and every part regardless of who wrote
 it.
 Thus, it is not the intent of this section to claim rights or contest
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Library.
 In addition, mere aggregation of another work not based on the Library
 with the Library (or with a work based on the Library) on a volume of
 a storage or distribution medium does not bring the other work under
 the scope of this License.
  3. You may opt to apply the terms of the ordinary GNU General Public
 License instead of this License to a given copy of the Library.  To do
 this, you must alter all the notices that refer to this License, so
 that they refer to the ordinary GNU General Public License, version 2,
 instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
  This option is useful when you wish to copy part of the code of
 the Library into a program that is not a library.
  4. You may copy and distribute the Library (or a portion or
 derivative of it, under Section 2) in object code or executable form
 under the terms of Sections 1 and 2 above provided that you accompany
 it with the complete corresponding machine-readable source code, which
 must be distributed under the terms of Sections 1 and 2 above on a
 medium customarily used for software interchange.
  If distribution of object code is made by offering access to copy
 from a designated place, then offering equivalent access to copy the
 source code from the same place satisfies the requirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
  5. A program that contains no derivative of any portion of the
 Library, but is designed to work with the Library by being compiled or
 linked with it, is called a "work that uses the Library".  Such a
 work, in isolation, is not a derivative work of the Library, and
 therefore falls outside the scope of this License.
  However, linking a "work that uses the Library" with the Library
 creates an executable that is a derivative of the Library (because it
 contains portions of the Library), rather than a "work that uses the
 library".  The executable is therefore covered by this License.
 Section 6 states terms for distribution of such executables.
  When a "work that uses the Library" uses material from a header file
 that is part of the Library, the object code for the work may be a
 derivative work of the Library even though the source code is not.
 Whether this is true is especially significant if the work can be
 linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
  If such an object file uses only numerical parameters, data
 structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
 Library will still fall under Section 6.)
  Otherwise, if the work is a derivative of the Library, you may
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
 modification of the work for the customer's own use and reverse
 engineering for debugging such modifications.
  You must give prominent notice with each copy of the work that the
 Library is used in it and that the Library and its use are covered by
 this License.  You must supply a copy of this License.  If the work
 during execution displays copyright notices, you must include the
 copyright notice for the Library among them, as well as a reference
 directing the user to the copy of this License.  Also, you must do one
 of these things:
    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)
    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.
    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.
    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.
    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.
  For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
 the materials to be distributed need not include anything that is
 normally distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
  It may happen that this requirement contradicts the license
 restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
 library, provided that the separate distribution of the work based on
 the Library and of the other library facilities is otherwise
 permitted, and provided that you do these two things:
    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.
    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.
  8. You may not copy, modify, sublicense, link with, or distribute
 the Library except as expressly provided under this License.  Any
 attempt otherwise to copy, modify, sublicense, link with, or
 distribute the Library is void, and will automatically terminate your
 rights under this License.  However, parties who have received copies,
 or rights, from you under this License will not have their licenses
 terminated so long as such parties remain in full compliance.
  9. You are not required to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Library or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Library (or any work based on the
 Library), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Library or works based on it.
  10. Each time you redistribute the Library (or any work based on the
 Library), the recipient automatically receives a license from the
 original licensor to copy, distribute, link with or modify the Library
 subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Library at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Library by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 If any portion of this section is held invalid or unenforceable under any
 particular circumstance, the balance of the section is intended to apply,
 and the section as a whole is intended to apply in other circumstances.
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system which is
 implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
 to distribute software through any other system and a licensee cannot
 impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
  12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Library under this License may add
 an explicit geographical distribution limitation excluding those countries,
 so that distribution is permitted only in or among countries not thus
 excluded.  In such case, this License incorporates the limitation as if
 written in the body of this License.
  13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.
 Each version is given a distinguishing version number.  If the Library
 specifies a version number of this License which applies to it and
 "any later version", you have the option of following the terms and
 conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
 copyrighted by the Free Software Foundation, write to the Free
 Software Foundation; we sometimes make exceptions for this.  Our
 decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
                            NO WARRANTY
  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
 KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
 LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
 THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
 WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
 AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
 FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
 CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
 LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
 RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
 FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
                     END OF TERMS AND CONDITIONS
           How to Apply These Terms to Your New Libraries
  If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
 everyone can redistribute and change.  You can do so by permitting
 redistribution under these terms (or, alternatively, under the terms of the
 ordinary General Public License).
  To apply these terms, attach the following notices to the library.  It is
 safest to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
    USA
 Also add information on how to contact you by electronic and paper mail.
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if
 necessary.  Here is a sample; alter the names:
  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random
  Hacker.
  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice
 That's all there is to it!
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,15 +0,0 @@
 Qt Advanced Docking System
 Copyright (C) 2017 Uwe Kindler
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public
 License along with this library; If not, see <http://www.gnu.org/licenses/>.
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
 include versioneer.py
 include PyQtAds/_version.py
--- a/PyQtAds/QtAds/init.py
+++ b/PyQtAds/QtAds/init.py
@@ -0,0 +1,10 @@
 from .ads import ads
 from .._version import *
 import inspect
 for name, member in inspect.getmembers(ads):
    if not name.startswith('_'):
        globals()[name] = member
 del ads
--- a/PyQtAds/init.py
+++ b/PyQtAds/init.py
@@ -0,0 +1,9 @@
 from .rc import *
 from ._version import get_versions
 __version__ = get_versions()['version']
 short_version = __version__
 version = __version__
 full_version = __version__
 git_revision = get_versions()['full-revisionid']
 release = not get_versions()['dirty']
 del get_versions
--- a/PyQtAds/_version.py
+++ b/PyQtAds/_version.py
@@ -0,0 +1,520 @@
 # This file helps to compute a version number in source trees obtained from
 # git-archive tarball (such as those provided by githubs download-from-tag
 # feature). Distribution tarballs (built by setup.py sdist) and build
 # directories (produced by setup.py build) will contain a much shorter file
 # that just contains the computed version number.
 # This file is released into the public domain. Generated by
 # versioneer-0.18 (https://github.com/warner/python-versioneer)
 """Git implementation of _version.py."""
 import errno
 import os
 import re
 import subprocess
 import sys
 def get_keywords():
    """Get the keywords needed to look up the version information."""
    # these strings will be replaced by git during git-archive.
    # setup.py/versioneer.py will grep for the variable names, so they must
    # each be defined on a line of their own. _version.py will just call
    # get_keywords().
    git_refnames = "$Format:%d$"
    git_full = "$Format:%H$"
    git_date = "$Format:%ci$"
    keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
    return keywords
 class VersioneerConfig:
    """Container for Versioneer configuration parameters."""
 def get_config():
    """Create, populate and return the VersioneerConfig() object."""
    # these strings are filled in when 'setup.py versioneer' creates
    # _version.py
    cfg = VersioneerConfig()
    cfg.VCS = "git"
    cfg.style = "pep440"
    cfg.tag_prefix = ""
    cfg.parentdir_prefix = "None"
    cfg.versionfile_source = "PyQtAds/_version.py"
    cfg.verbose = False
    return cfg
 class NotThisMethod(Exception):
    """Exception raised if a method is not valid for the current scenario."""
 LONG_VERSION_PY = {}
 HANDLERS = {}
 def register_vcs_handler(vcs, method):  # decorator
    """Create decorator to mark a method as the handler of a VCS."""
    def decorate(f):
        """Store f in HANDLERS[vcs][method]."""
        if vcs not in HANDLERS:
            HANDLERS[vcs] = {}
        HANDLERS[vcs][method] = f
        return f
    return decorate
 def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
                env=None):
    """Call the given command(s)."""
    assert isinstance(commands, list)
    p = None
    for c in commands:
        try:
            dispcmd = str([c] + args)
            # remember shell=False, so use git.cmd on windows, not just git
            p = subprocess.Popen([c] + args, cwd=cwd, env=env,
                                 stdout=subprocess.PIPE,
                                 stderr=(subprocess.PIPE if hide_stderr
                                         else None))
            break
        except EnvironmentError:
            e = sys.exc_info()[1]
            if e.errno == errno.ENOENT:
                continue
            if verbose:
                print("unable to run %s" % dispcmd)
                print(e)
            return None, None
    else:
        if verbose:
            print("unable to find command, tried %s" % (commands,))
        return None, None
    stdout = p.communicate()[0].strip()
    if sys.version_info[0] >= 3:
        stdout = stdout.decode()
    if p.returncode != 0:
        if verbose:
            print("unable to run %s (error)" % dispcmd)
            print("stdout was %s" % stdout)
        return None, p.returncode
    return stdout, p.returncode
 def versions_from_parentdir(parentdir_prefix, root, verbose):
    """Try to determine the version from the parent directory name.
    Source tarballs conventionally unpack into a directory that includes both
    the project name and a version string. We will also support searching up
    two directory levels for an appropriately named parent directory
    """
    rootdirs = []
    for i in range(3):
        dirname = os.path.basename(root)
        if dirname.startswith(parentdir_prefix):
            return {"version": dirname[len(parentdir_prefix):],
                    "full-revisionid": None,
                    "dirty": False, "error": None, "date": None}
        else:
            rootdirs.append(root)
            root = os.path.dirname(root)  # up a level
    if verbose:
        print("Tried directories %s but none started with prefix %s" %
              (str(rootdirs), parentdir_prefix))
    raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
@register_vcs_handler("git", "get_keywords")
 def git_get_keywords(versionfile_abs):
    """Extract version information from the given file."""
    # the code embedded in _version.py can just fetch the value of these
    # keywords. When used from setup.py, we don't want to import _version.py,
    # so we do it with a regexp instead. This function is not used from
    # _version.py.
    keywords = {}
    try:
        f = open(versionfile_abs, "r")
        for line in f.readlines():
            if line.strip().startswith("git_refnames ="):
                mo = re.search(r'=\s*"(.*)"', line)
                if mo:
                    keywords["refnames"] = mo.group(1)
            if line.strip().startswith("git_full ="):
                mo = re.search(r'=\s*"(.*)"', line)
                if mo:
                    keywords["full"] = mo.group(1)
            if line.strip().startswith("git_date ="):
                mo = re.search(r'=\s*"(.*)"', line)
                if mo:
                    keywords["date"] = mo.group(1)
        f.close()
    except EnvironmentError:
        pass
    return keywords
@register_vcs_handler("git", "keywords")
 def git_versions_from_keywords(keywords, tag_prefix, verbose):
    """Get version information from git keywords."""
    if not keywords:
        raise NotThisMethod("no keywords at all, weird")
    date = keywords.get("date")
    if date is not None:
        # git-2.2.0 added "%cI", which expands to an ISO-8601 -compliant
        # datestamp. However we prefer "%ci" (which expands to an "ISO-8601
        # -like" string, which we must then edit to make compliant), because
        # it's been around since git-1.5.3, and it's too difficult to
        # discover which version we're using, or to work around using an
        # older one.
        date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
    refnames = keywords["refnames"].strip()
    if refnames.startswith("$Format"):
        if verbose:
            print("keywords are unexpanded, not using")
        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
    refs = set([r.strip() for r in refnames.strip("()").split(",")])
    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
    TAG = "tag: "
    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
    if not tags:
        # Either we're using git < 1.8.3, or there really are no tags. We use
        # a heuristic: assume all version tags have a digit. The old git %d
        # expansion behaves like git log --decorate=short and strips out the
        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
        # between branches and tags. By ignoring refnames without digits, we
        # filter out many common branch names like "release" and
        # "stabilization", as well as "HEAD" and "master".
        tags = set([r for r in refs if re.search(r'\d', r)])
        if verbose:
            print("discarding '%s', no digits" % ",".join(refs - tags))
    if verbose:
        print("likely tags: %s" % ",".join(sorted(tags)))
    for ref in sorted(tags):
        # sorting will prefer e.g. "2.0" over "2.0rc1"
        if ref.startswith(tag_prefix):
            r = ref[len(tag_prefix):]
            if verbose:
                print("picking %s" % r)
            return {"version": r,
                    "full-revisionid": keywords["full"].strip(),
                    "dirty": False, "error": None,
                    "date": date}
    # no suitable tags, so version is "0+unknown", but full hex is still there
    if verbose:
        print("no suitable tags, using unknown + full revision id")
    return {"version": "0+unknown",
            "full-revisionid": keywords["full"].strip(),
            "dirty": False, "error": "no suitable tags", "date": None}
@register_vcs_handler("git", "pieces_from_vcs")
 def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
    """Get version from 'git describe' in the root of the source tree.
    This only gets called if the git-archive 'subst' keywords were *not*
    expanded, and _version.py hasn't already been rewritten with a short
    version string, meaning we're inside a checked out source tree.
    """
    GITS = ["git"]
    if sys.platform == "win32":
        GITS = ["git.cmd", "git.exe"]
    out, rc = run_command(GITS, ["rev-parse", "--git-dir"], cwd=root,
                          hide_stderr=True)
    if rc != 0:
        if verbose:
            print("Directory %s not under git control" % root)
        raise NotThisMethod("'git rev-parse --git-dir' returned error")
    # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
    # if there isn't one, this yields HEX[-dirty] (no NUM)
    describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
                                          "--always", "--long",
                                          "--match", "%s*" % tag_prefix],
                                   cwd=root)
    # --long was added in git-1.5.5
    if describe_out is None:
        raise NotThisMethod("'git describe' failed")
    describe_out = describe_out.strip()
    full_out, rc = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
    if full_out is None:
        raise NotThisMethod("'git rev-parse' failed")
    full_out = full_out.strip()
    pieces = {}
    pieces["long"] = full_out
    pieces["short"] = full_out[:7]  # maybe improved later
    pieces["error"] = None
    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
    # TAG might have hyphens.
    git_describe = describe_out
    # look for -dirty suffix
    dirty = git_describe.endswith("-dirty")
    pieces["dirty"] = dirty
    if dirty:
        git_describe = git_describe[:git_describe.rindex("-dirty")]
    # now we have TAG-NUM-gHEX or HEX
    if "-" in git_describe:
        # TAG-NUM-gHEX
        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
        if not mo:
            # unparseable. Maybe git-describe is misbehaving?
            pieces["error"] = ("unable to parse git-describe output: '%s'"
                               % describe_out)
            return pieces
        # tag
        full_tag = mo.group(1)
        if not full_tag.startswith(tag_prefix):
            if verbose:
                fmt = "tag '%s' doesn't start with prefix '%s'"
                print(fmt % (full_tag, tag_prefix))
            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
                               % (full_tag, tag_prefix))
            return pieces
        pieces["closest-tag"] = full_tag[len(tag_prefix):]
        # distance: number of commits since tag
        pieces["distance"] = int(mo.group(2))
        # commit: short hex revision ID
        pieces["short"] = mo.group(3)
    else:
        # HEX: no tags
        pieces["closest-tag"] = None
        count_out, rc = run_command(GITS, ["rev-list", "HEAD", "--count"],
                                    cwd=root)
        pieces["distance"] = int(count_out)  # total number of commits
    # commit date: see ISO-8601 comment in git_versions_from_keywords()
    date = run_command(GITS, ["show", "-s", "--format=%ci", "HEAD"],
                       cwd=root)[0].strip()
    pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
    return pieces
 def plus_or_dot(pieces):
    """Return a + if we don't already have one, else return a ."""
    if "+" in pieces.get("closest-tag", ""):
        return "."
    return "+"
 def render_pep440(pieces):
    """Build up version string, with post-release "local version identifier".
    Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
    get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
    Exceptions:
    1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        if pieces["distance"] or pieces["dirty"]:
            rendered += plus_or_dot(pieces)
            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
            if pieces["dirty"]:
                rendered += ".dirty"
    else:
        # exception #1
        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
                                          pieces["short"])
        if pieces["dirty"]:
            rendered += ".dirty"
    return rendered
 def render_pep440_pre(pieces):
    """TAG[.post.devDISTANCE] -- No -dirty.
    Exceptions:
    1: no tags. 0.post.devDISTANCE
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        if pieces["distance"]:
            rendered += ".post.dev%d" % pieces["distance"]
    else:
        # exception #1
        rendered = "0.post.dev%d" % pieces["distance"]
    return rendered
 def render_pep440_post(pieces):
    """TAG[.postDISTANCE[.dev0]+gHEX] .
    The ".dev0" means dirty. Note that .dev0 sorts backwards
    (a dirty tree will appear "older" than the corresponding clean one),
    but you shouldn't be releasing software with -dirty anyways.
    Exceptions:
    1: no tags. 0.postDISTANCE[.dev0]
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        if pieces["distance"] or pieces["dirty"]:
            rendered += ".post%d" % pieces["distance"]
            if pieces["dirty"]:
                rendered += ".dev0"
            rendered += plus_or_dot(pieces)
            rendered += "g%s" % pieces["short"]
    else:
        # exception #1
        rendered = "0.post%d" % pieces["distance"]
        if pieces["dirty"]:
            rendered += ".dev0"
        rendered += "+g%s" % pieces["short"]
    return rendered
 def render_pep440_old(pieces):
    """TAG[.postDISTANCE[.dev0]] .
    The ".dev0" means dirty.
    Exceptions:
    1: no tags. 0.postDISTANCE[.dev0]
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        if pieces["distance"] or pieces["dirty"]:
            rendered += ".post%d" % pieces["distance"]
            if pieces["dirty"]:
                rendered += ".dev0"
    else:
        # exception #1
        rendered = "0.post%d" % pieces["distance"]
        if pieces["dirty"]:
            rendered += ".dev0"
    return rendered
 def render_git_describe(pieces):
    """TAG[-DISTANCE-gHEX][-dirty].
    Like 'git describe --tags --dirty --always'.
    Exceptions:
    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        if pieces["distance"]:
            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
    else:
        # exception #1
        rendered = pieces["short"]
    if pieces["dirty"]:
        rendered += "-dirty"
    return rendered
 def render_git_describe_long(pieces):
    """TAG-DISTANCE-gHEX[-dirty].
    Like 'git describe --tags --dirty --always -long'.
    The distance/hash is unconditional.
    Exceptions:
    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
    """
    if pieces["closest-tag"]:
        rendered = pieces["closest-tag"]
        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
    else:
        # exception #1
        rendered = pieces["short"]
    if pieces["dirty"]:
        rendered += "-dirty"
    return rendered
 def render(pieces, style):
    """Render the given version pieces into the requested style."""
    if pieces["error"]:
        return {"version": "unknown",
                "full-revisionid": pieces.get("long"),
                "dirty": None,
                "error": pieces["error"],
                "date": None}
    if not style or style == "default":
        style = "pep440"  # the default
    if style == "pep440":
        rendered = render_pep440(pieces)
    elif style == "pep440-pre":
        rendered = render_pep440_pre(pieces)
    elif style == "pep440-post":
        rendered = render_pep440_post(pieces)
    elif style == "pep440-old":
        rendered = render_pep440_old(pieces)
    elif style == "git-describe":
        rendered = render_git_describe(pieces)
    elif style == "git-describe-long":
        rendered = render_git_describe_long(pieces)
    else:
        raise ValueError("unknown style '%s'" % style)
    return {"version": rendered, "full-revisionid": pieces["long"],
            "dirty": pieces["dirty"], "error": None,
            "date": pieces.get("date")}
 def get_versions():
    """Get version information or return default if unable to do so."""
    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
    # __file__, we can work backwards from there to the root. Some
    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
    # case we can only use expanded keywords.
    cfg = get_config()
    verbose = cfg.verbose
    try:
        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
                                          verbose)
    except NotThisMethod:
        pass
    try:
        root = os.path.realpath(__file__)
        # versionfile_source is the relative path from the top of the source
        # tree (where the .git directory might live) to this file. Invert
        # this to find the root from __file__.
        for i in cfg.versionfile_source.split('/'):
            root = os.path.dirname(root)
    except NameError:
        return {"version": "0+unknown", "full-revisionid": None,
                "dirty": None,
                "error": "unable to find root of source tree",
                "date": None}
    try:
        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
        return render(pieces, cfg.style)
    except NotThisMethod:
        pass
    try:
        if cfg.parentdir_prefix:
            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
    except NotThisMethod:
        pass
    return {"version": "0+unknown", "full-revisionid": None,
            "dirty": None,
            "error": "unable to compute version", "date": None}
--- a/README.md
+++ b/README.md
@@ -1,10 +1,17 @@
 # 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://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)
 Qt Advanced Docking System lets you create customizable layouts using a full 
 featured window docking system similar to what is found in many popular 
-integrated development environements (IDEs) such as Visual Studio. 
+integrated development environments (IDEs) such as Visual Studio. 
 [![Video Advanced Docking](doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc)
 Everything is implemented with standard Qt functionality without any
-platform specific code. Basic usage of QWidgets an QLayouts and using basic 
+platform specific code. Basic usage of QWidgets and QLayouts and using basic 
 styles as much as possible.
 This work is based on and inspired by the 
@@ -14,7 +21,36 @@ code quality, readibility and to fix all issues from the issue tracker
 of his docking system project.
 ## Features
 ### Overview
 - [Advanced Docking System for Qt](#advanced-docking-system-for-qt)
  - [Features](#features)
    - [Overview](#overview)
    - [Docking everywhere - no central widget](#docking-everywhere---no-central-widget)
    - [Docking inside floating windows](#docking-inside-floating-windows)
    - [Grouped dragging](#grouped-dragging)
    - [Perspectives for fast switching of the complete main window layout](#perspectives-for-fast-switching-of-the-complete-main-window-layout)
    - [Opaque and non-opaque splitter resizing](#opaque-and-non-opaque-splitter-resizing)
    - [Opaque and non-opaque undocking](#opaque-and-non-opaque-undocking)
    - [Tab-menu for easy handling of many tabbed dock widgets](#tab-menu-for-easy-handling-of-many-tabbed-dock-widgets)
    - [Many different ways to detach dock widgets](#many-different-ways-to-detach-dock-widgets)
    - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
  - [Tested Compatible Environments](#tested-compatible-environments)
    - [Windows](#windows)
    - [macOS](#macos)
    - [Linux](#linux)
  - [Build](#build)
  - [Getting started / Example](#getting-started--example)
  - [Developers](#developers)
  - [License information](#license-information)
  - [Alternative Docking System Implementations](#alternative-docking-system-implementations)
    - [KDDockWidgets](#kddockwidgets)
    - [QtitanDocking](#qtitandocking)
  - [Donation](#donation)
 ### Docking everywhere - no central widget
 There is no central widget like in the Qt docking system. You can dock on every
 border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.
@@ -24,6 +60,7 @@ free to dock almost everywhere.
 ![Dropping widgets](doc/preview-dragndrop_dark.png)
 ### Docking inside floating windows
 There is no difference between the main window and a floating window. Docking
 into floating windows is supported.
@@ -32,36 +69,207 @@ into floating windows is supported.
 ![Docking inside floating windows](doc/floating-widget-dragndrop_dark.png)
 ### Grouped dragging
 When dragging the titlebar of a dock, all the tabs that are tabbed with it are 
 going to be dragged. So you can move complete groups of tabbed widgets into
 a floating widget or from one dock area to another one.
-![Grouped dragging](doc/grouped-dragging.png)\
+![Grouped dragging](doc/grouped-dragging.gif)\
 \
 ![Grouped dragging](doc/grouped-dragging_dark.png)
 ### Perspectives for fast switching of the complete main window layout
 A perspective defines the set and layout of dock windows in the main
 window. You can save the current layout of the dockmanager into a named
 perspective to make your own custom perspective. Later you can simply
 select a perspective from the perspective list to quickly switch the complete 
 main window layout.
-![Perspective](doc/perspectives.png)\
+![Perspective](doc/perspectives.gif)\
 \
 ![Perspective](doc/perspectives_dark.png)
 ### Opaque and non-opaque splitter resizing
 The advanced docking system uses standard QSplitters as resize separators and thus supports opaque and non-opaque resizing functionality of QSplitter. In some rare cases, for very complex widgets or on slow machines resizing via separator on the fly may cause flicking and glaring of rendered content inside a widget. The global dock manager flag `OpaqueSplitterResize` configures the resizing behaviour of the splitters. If this flag is set, then widgets are resized dynamically (opaquely) while interactively moving the splitters. 
 ![Opaque resizing](doc/opaque_resizing.gif)
 If this flag is cleared, the widget resizing is deferred until the mouse button is released - this is some kind of lazy resizing separator.
 ![Non-opaque resizing](doc/non_opaque_resizing.gif)
 ### Opaque and non-opaque undocking
 By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediatelly. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
 The drag preview widget can be configured by a number of global dock manager flags:
 - `DragPreviewIsDynamic`: if this flag is enabled, the preview will be adjusted dynamically to the drop area
 - `DragPreviewShowsContentPixmap`: the created drag preview window shows a static copy of the content of the dock widget / dock are that is dragged
 - `DragPreviewHasWindowFrame`: this flag configures if the drag preview is frameless like a QRubberBand or looks like a real window
 The best way to test non-opaque undocking is to set the standard flags: `CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig)`.
 ### Tab-menu for easy handling of many tabbed dock widgets
 Tabs are a good way to quickly switch between dockwidgets in a dockarea. However, if the number of dockwidgets in a dockarea is too large, this may affect the usability of the tab bar. To keep track in this situation, you can use the tab menu. The menu allows you to quickly select the dockwidget you want to activate from a drop down menu.
 ![Tab menu](doc/tab_menu.gif)
 ### Many different ways to detach dock widgets
 You can detach dock widgets and also dock areas in the following ways:
 - by dragging the dock widget tab or the dock area title bar
 - by double clicking the tab or title bar
 - by using the detach menu entry from the tab and title bar drop down menu
 ### Supports deletion of dynamically created dock widgets
 Normally clicking the close button of a dock widget will just hide the widget and the user can show it again using the toggleView() action of the dock widget. This is meant for user interfaces with a static amount of widgets. But the advanced docking system also supports dynamic dock widgets that will get deleted on close. If you set the dock widget flag `DockWidgetDeleteOnClose` for a certain dock widget, then it will be deleted as soon as you close this dock widget. This enables the implementation of user interfaces with dynamically created editors, like in word processing applications or source code development tools.
 ## Tested Compatible Environments
- Windows 10
+
 ### Windows
 Windows 10 [![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)
 The library was developed on and for Windows. It is used in a commercial Windows application and is therefore constantly tested.
 ### macOS
 macOS [![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
 The application can be compiled for macOS. A user reported, that the library works on macOS. If have not tested it.
 ![Advanced Docking on macOS](doc/macos.png)
 ### Linux
 Ubuntu [![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)
 The application can be compiled for Linux and has been developed and tested with **Kubuntu 18.04** and **Kubuntu 19.10**.
 ![Advanced Docking on Kubuntu Linux](doc/linux_kubuntu_1804.png)
 and with **Ubuntu 19.10**
 ![Advanced Docking on Ubuntu Linux](doc/linux_ubuntu_1910.png)
 ## Build
 Open the `ads.pro` with QtCreator and start the build, that's it.
 You can run the demo project and test it yourself.
 ## Getting started / Example
 The following example shows the minimum code required to use the advanced Qt docking system.
 *MainWindow.h*
 ```cpp
 #include <QMainWindow>
 #include "DockManager.h"
 namespace Ui {
 class MainWindow;
 }
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
 public:
    explicit MainWindow(QWidget *parent = 0);
    ~MainWindow();
 private:
    Ui::MainWindow *ui;
    // The main container for docking
    ads::CDockManager* m_DockManager;
 };
 ```
 *MainWindow.cpp*
 ```cpp
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 #include <QLabel>
 MainWindow::MainWindow(QWidget *parent) :
    QMainWindow(parent),
    ui(new Ui::MainWindow)
 {
    ui->setupUi(this);
    // Create the dock manager. Because the parent parameter is a QMainWindow
    // the dock manager registers itself as the central widget.
    m_DockManager = new ads::CDockManager(this);
    // Create example content label - this can be any application specific
    // widget
    QLabel* l = new QLabel();
    l->setWordWrap(true);
    l->setAlignment(Qt::AlignTop | Qt::AlignLeft);
    l->setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. ");
    // Create a dock widget with the title Label 1 and set the created label
    // as the dock widget content
    ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
    DockWidget->setWidget(l);
    // Add the toggleViewAction of the dock widget to the menu to give
    // the user the possibility to show the dock widget if it has been closed
    ui->menuView->addAction(DockWidget->toggleViewAction());
    // Add the dock widget to the top dock widget area
    m_DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
 }
 MainWindow::~MainWindow()
 {
    delete ui;
 }
 ```
 ## Developers
 - Uwe Kindler, Project Maintainer
 - Manuel Freiholz 
 ## License information
 [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)
 This project uses the [LGPLv2.1 license](gnu-lgpl-v2.1.md)
 ## Alternative Docking System Implementations
 If this Qt Advanced Docking System does not fit to your needs you may consider some of the alternative docking system solutions for Qt.
 ### KDDockWidgets
 This is an advanced docking framework for Qt from [KDAB](https://www.kdab.com/). The interesting thing is, that they separated GUI code from logic, so they can easily provide a QtQuick backend in the future.
 - [Blog post about KDDockWidgets](https://www.kdab.com/kddockwidgets/)
 - [GitHub project](https://github.com/KDAB/KDDockWidgets)
 ### QtitanDocking
 This is a commercial component from [Developer Machines](https://www.devmachines.com/) for Qt Framework that allows to create a Microsoft like dockable user interface. They also offer a lot of other interesting and useful components for Qt.
 - [Product page](https://www.devmachines.com/qtitandocking-overview.html)
 ## Donation
 If this project help you reduce time to develop or if you just like it, you can give me a cup of coffee :coffee::wink:.
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=85R64TMMSY9T6">
  <img src="doc/donate.png" alt="Donate with PayPal" width="160"/>
 </a>
--- a/ads.pro
+++ b/ads.pro
@@ -1,6 +1,9 @@
 TEMPLATE = subdirs
 CONFIG   += ordered
 SUBDIRS = \
 	src \
-	demo
+	demo \
 	example
 demo.depends = src
 example.depends = src
--- a/adsConfig.cmake
+++ b/adsConfig.cmake
@@ -0,0 +1,5 @@
 include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
--- a/demo.py
+++ b/demo.py
@@ -0,0 +1,316 @@
 import datetime
 import logging
 from PyQt5.QtCore import (QCoreApplication, QDir, Qt, QSettings, QSignalBlocker,
                         QRect)
 from PyQt5.QtGui import QGuiApplication
 from PyQt5.QtWidgets import (QCalendarWidget, QFileSystemModel, QFrame, QLabel,
                            QMenu, QTreeView, QAction, QWidgetAction,
                            QComboBox, QStyle, QSizePolicy, QInputDialog)
 from PyQt5 import QtWidgets
 from PyQtAds import QtAds
 class _State:
    label_count = 0
    calendar_count = 0
    file_system_count = 0
 def create_long_text_label_dock_widget(view_menu: QMenu) -> QtAds.CDockWidget:
    '''
    Create long text label dock widget
    Parameters
    ----------
    view_menu : QMenu
    Returns
    -------
    value : QtAds.CDockWidget
    '''
    label = QLabel()
    label.setWordWrap(True)
    label.setAlignment(Qt.AlignTop | Qt.AlignLeft)
    label.setText('''\
 Label {} {} - Lorem ipsum dolor sit amet, consectetuer
 adipiscing elit.  Aenean commodo ligula eget dolor. Aenean massa. Cum
 sociis natoque penatibus et magnis dis parturient montes, nascetur
 ridiculus mus.  Donec quam felis, ultricies nec, pellentesque eu, pretium
 quis, sem.  Nulla consequat massa quis enim. Donec pede justo, fringilla
 vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut,
 imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis
 pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.
 Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu,
 consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra
 quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet.
    '''.format(_State.label_count, str(datetime.datetime.now())))
    _State.label_count += 1
    dock_widget = QtAds.CDockWidget("Label {}".format(_State.label_count))
    dock_widget.setWidget(label)
    view_menu.addAction(dock_widget.toggleViewAction())
    return dock_widget
 def create_calendar_dock_widget(view_menu: QMenu) -> QtAds.CDockWidget:
    '''
    Create calendar dock widget
    Parameters
    ----------
    view_menu : QMenu
    Returns
    -------
    value : QtAds.CDockWidget
    '''
    widget = QCalendarWidget()
    dock_widget = QtAds.CDockWidget("Calendar {}".format(_State.calendar_count))
    _State.calendar_count += 1
    dock_widget.setWidget(widget)
    dock_widget.setToggleViewActionMode(QtAds.CDockWidget.ActionModeShow)
    view_menu.addAction(dock_widget.toggleViewAction())
    return dock_widget
 def create_file_system_tree_dock_widget(view_menu: QMenu) -> QtAds.CDockWidget:
    '''
    Create file system tree dock widget
    Parameters
    ----------
    view_menu : QMenu
    Returns
    -------
    value : QtAds.CDockWidget
    '''
    widget = QTreeView()
    widget.setFrameShape(QFrame.NoFrame)
    m = QFileSystemModel(widget)
    m.setRootPath(QDir.currentPath())
    widget.setModel(m)
    dock_widget = QtAds.CDockWidget("Filesystem {}".format(_State.file_system_count))
    _State.file_system_count += 1
    dock_widget.setWidget(widget)
    view_menu.addAction(dock_widget.toggleViewAction())
    return dock_widget
 class MainWindow(QtWidgets.QMainWindow):
    save_perspective_action: QAction
    perspective_list_action: QWidgetAction
    perspective_combo_box: QComboBox
    dock_manager: QtAds.CDockManager
    def __init__(self, parent=None):
        super().__init__(parent)
        self.save_perspective_action = None
        self.perspective_list_action = None
        self.perspective_combo_box = None
        self.dock_manager = None
        self.setup_ui()
        self.dock_manager = QtAds.CDockManager(self)
        self.perspective_combo_box.activated[str].connect(self.dock_manager.openPerspective)
        self.create_content()
        self.resize(800, 600)
        self.restore_state()
        self.restore_perspectives()
    def setup_ui(self):
        self.setObjectName("MainWindow")
        self.resize(400, 300)
        self.setDockOptions(QtWidgets.QMainWindow.AllowTabbedDocks)
        self.centralWidget = QtWidgets.QWidget(self)
        self.centralWidget.setObjectName("centralWidget")
        self.setCentralWidget(self.centralWidget)
        self.status_bar = QtWidgets.QStatusBar(self)
        self.status_bar.setObjectName("statusBar")
        self.setStatusBar(self.status_bar)
        self.menu_bar = QtWidgets.QMenuBar(self)
        self.menu_bar.setGeometry(QRect(0, 0, 400, 21))
        self.menu_bar.setObjectName("menuBar")
        self.menu_file = QtWidgets.QMenu(self.menu_bar)
        self.menu_file.setObjectName("menuFile")
        self.menu_view = QtWidgets.QMenu(self.menu_bar)
        self.menu_view.setObjectName("menuView")
        self.menu_about = QtWidgets.QMenu(self.menu_bar)
        self.menu_about.setObjectName("menuAbout")
        self.setMenuBar(self.menu_bar)
        self.tool_bar = QtWidgets.QToolBar(self)
        self.tool_bar.setObjectName("toolBar")
        self.addToolBar(Qt.TopToolBarArea, self.tool_bar)
        self.action_exit = QtWidgets.QAction(self)
        self.action_exit.setObjectName("actionExit")
        self.action_save_state = QtWidgets.QAction(self)
        self.action_save_state.setObjectName("actionSaveState")
        self.action_save_state.triggered.connect(self.saveState)
        self.action_restore_state = QtWidgets.QAction(self)
        self.action_restore_state.setObjectName("actionRestoreState")
        self.action_restore_state.triggered.connect(self.restore_state)
        self.menu_file.addAction(self.action_exit)
        self.menu_file.addAction(self.action_save_state)
        self.menu_file.addAction(self.action_restore_state)
        self.menu_bar.addAction(self.menu_file.menuAction())
        self.menu_bar.addAction(self.menu_view.menuAction())
        self.menu_bar.addAction(self.menu_about.menuAction())
        self.setWindowTitle("MainWindow")
        self.menu_file.setTitle("File")
        self.menu_view.setTitle("View")
        self.menu_about.setTitle("About")
        self.tool_bar.setWindowTitle("toolBar")
        self.action_exit.setText("Exit")
        self.action_save_state.setText("Save State")
        self.action_restore_state.setText("Restore State")
        self.create_actions()
    def create_actions(self):
        '''
        Creates the toolbar actions
        '''
        self.tool_bar.addAction(self.action_save_state)
        self.action_save_state.setIcon(self.style().standardIcon(QStyle.SP_DialogSaveButton))
        self.tool_bar.addAction(self.action_restore_state)
        self.action_restore_state.setIcon(self.style().standardIcon(QStyle.SP_DialogOpenButton))
        self.save_perspective_action = QAction("Save Perspective", self)
        self.save_perspective_action.triggered.connect(self.save_perspective)
        self.perspective_list_action = QWidgetAction(self)
        self.perspective_combo_box = QComboBox(self)
        self.perspective_combo_box.setSizeAdjustPolicy(QComboBox.AdjustToContents)
        self.perspective_combo_box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
        self.perspective_list_action.setDefaultWidget(self.perspective_combo_box)
        self.tool_bar.addSeparator()
        self.tool_bar.addAction(self.perspective_list_action)
        self.tool_bar.addAction(self.save_perspective_action)
    def create_content(self):
        '''
        Fill the dock manager with dock widgets
        '''
        # Test container docking
        view_menu = self.menu_view
        dock_widget = create_calendar_dock_widget(view_menu)
        dock_widget.setIcon(self.style().standardIcon(QStyle.SP_DialogOpenButton))
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetClosable, False)
        self.dock_manager.addDockWidget(QtAds.LeftDockWidgetArea, dock_widget)
        self.dock_manager.addDockWidget(QtAds.LeftDockWidgetArea, create_long_text_label_dock_widget(view_menu))
        file_system_widget = create_file_system_tree_dock_widget(view_menu)
        tool_bar = file_system_widget.createDefaultToolBar()
        tool_bar.addAction(self.action_save_state)
        tool_bar.addAction(self.action_restore_state)
        self.dock_manager.addDockWidget(QtAds.BottomDockWidgetArea, file_system_widget)
        file_system_widget = create_file_system_tree_dock_widget(view_menu)
        tool_bar = file_system_widget.createDefaultToolBar()
        tool_bar.addAction(self.action_save_state)
        tool_bar.addAction(self.action_restore_state)
        file_system_widget.setFeature(QtAds.CDockWidget.DockWidgetMovable, False)
        top_dock_area = self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, file_system_widget)
        dock_widget = create_calendar_dock_widget(view_menu)
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetClosable, False)
        dock_widget.setTabToolTip("Tab ToolTip\nHodie est dies magna")
        self.dock_manager.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, top_dock_area)
        # Test dock area docking
        right_dock_area = self.dock_manager.addDockWidget(
            QtAds.RightDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), top_dock_area)
        self.dock_manager.addDockWidget(
            QtAds.TopDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), right_dock_area)
        bottom_dock_area = self.dock_manager.addDockWidget(
            QtAds.BottomDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), right_dock_area)
        self.dock_manager.addDockWidget(
            QtAds.RightDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), right_dock_area)
        self.dock_manager.addDockWidget(
            QtAds.CenterDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), bottom_dock_area)
    def save_state(self):
        '''
        Saves the dock manager state and the main window geometry
        '''
        settings = QSettings("Settings.ini", QSettings.IniFormat)
        settings.setValue("mainWindow/Geometry", self.saveGeometry())
        settings.setValue("mainWindow/State", self.saveState())
        settings.setValue("mainWindow/DockingState", self.dock_manager.saveState())
    def save_perspectives(self):
        '''
        Save the list of perspectives
        '''
        settings = QSettings("Settings.ini", QSettings.IniFormat)
        self.dock_manager.savePerspectives(settings)
    def restore_state(self):
        '''
        Restores the dock manager state
        '''
        settings = QSettings("Settings.ini", QSettings.IniFormat)
        geom = settings.value("mainWindow/Geometry")
        if geom is not None:
            self.restoreGeometry(geom)
        state = settings.value("mainWindow/State")
        if state is not None:
            self.restoreState(state)
        state = settings.value("mainWindow/DockingState")
        if state is not None:
            self.dock_manager.restore_state(state)
    def restore_perspectives(self):
        '''
        Restore the perspective listo of the dock manager
        '''
        settings = QSettings("Settings.ini", QSettings.IniFormat)
        self.dock_manager.loadPerspectives(settings)
        self.perspective_combo_box.clear()
        self.perspective_combo_box.addItems(self.dock_manager.perspectiveNames())
    def save_perspective(self):
        perspective_name, ok = QInputDialog.getText(self, 'Save perspective', 'Enter unique name:')
        if ok and perspective_name:
            self.dock_manager.addPerspective(perspective_name)
            _ = QSignalBlocker(self.perspective_combo_box)
            self.perspective_combo_box.clear()
            self.perspective_combo_box.addItems(self.dock_manager.perspectiveNames())
            self.perspective_combo_box.setCurrentText(perspective_name)
            self.save_perspectives()
 def main(app_):
    main_window = MainWindow()
    main_window.show()
    state = main_window.dock_manager.saveState()
    # print('This is what the saved state looks like in XML:')
    # print(str(state, 'utf-8'))
    # print()
    # main_window.dock_manager.restore_state(state)
    return main_window
 if __name__ == '__main__':
    # logging.basicConfig(level='DEBUG')
    QCoreApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
    QGuiApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
    app = QtWidgets.QApplication([])
    window = main(app)
    window.show()
    app.exec_()
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -0,0 +1,54 @@
 cmake_minimum_required(VERSION 3.3)
 set (CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 project(ads_demo VERSION "1.0") 
 set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
 set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Core_LIBRARIES})
 set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
 set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS} )
 set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Gui_LIBRARIES})
 set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
 set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
 set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Widgets_LIBRARIES})
 set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
 set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
 if(WIN32)
 	find_package(Qt5AxContainer ${REQUIRED_QT_VERSION} REQUIRED)
 	set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5AxContainer_LIBRARIES})
 	set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5AxContainer_INCLUDE_DIRS})
 	set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5AxContainer_COMPILE_DEFINITIONS})
 endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_demo_SRCS
    main.cpp
    MainWindow.cpp
    mainwindow.ui
 	demo.qrc
 )
 add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})
 if(BUILD_STATIC)
    set(ads_demo_DEFINE ${ads_demo_DEFINE} ADS_STATIC)
 endif()
 add_dependencies(AdvancedDockingSystemDemo qtadvanceddocking)
 target_include_directories(AdvancedDockingSystemDemo PUBLIC 
    $<BUILD_INTERFACE:${ads_demo_INCLUDE}>
    $<INSTALL_INTERFACE:include>
    )
 target_include_directories(AdvancedDockingSystemDemo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src"  ${ads_demo_INCLUDE})
 target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking ${ads_demo_LIBS})
 target_compile_definitions(AdvancedDockingSystemDemo PRIVATE ${ads_demo_DEFINE})
 set_target_properties(AdvancedDockingSystemDemo PROPERTIES 
    VERSION "1.0"
    SOVERSION 1
    EXPORT_NAME "Qt Advanced Docking System Demo"
    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
 )
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -50,6 +50,19 @@
 #include <QWidgetAction>
 #include <QComboBox>
 #include <QInputDialog>
 #include <QRubberBand>
 #include <QPlainTextEdit>
 #include <QTableWidget>
 #include <QScreen>
 #include <QStyle>
 #include <QMessageBox>
 #include <QMenu>
 #include <QToolButton>
 #ifdef Q_OS_WIN
 #include <QAxWidget>
 #endif
 #include <QMap>
 #include <QElapsedTimer>
@@ -57,7 +70,9 @@
 #include "DockManager.h"
 #include "DockWidget.h"
 #include "DockAreaWidget.h"
-#include "AnimatedLabel.h"
+#include "DockAreaTitleBar.h"
 #include "DockAreaTabBar.h"
 #include "FloatingDockContainer.h"
 //============================================================================
@@ -89,6 +104,44 @@ static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
 }
 /**
 * Function returns a features string with closable (c), movable (m) and floatable (f)
 * features. i.e. The following string is for a not closable but movable and floatable
 * widget: c- m+ f+
 */
 static QString featuresString(ads::CDockWidget* DockWidget)
 {
 	auto f = DockWidget->features();
 	return QString("c%1 m%2 f%3")
 		.arg(f.testFlag(ads::CDockWidget::DockWidgetClosable) ? "+" : "-")
 		.arg(f.testFlag(ads::CDockWidget::DockWidgetMovable) ? "+" : "-")
 		.arg(f.testFlag(ads::CDockWidget::DockWidgetFloatable) ? "+" : "-");
 }
 /**
 * Appends the string returned by featuresString() to the window title of
 * the given DockWidget
 */
 static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
 {
 	DockWidget->setWindowTitle(DockWidget->windowTitle()
 		+  QString(" (%1)").arg(featuresString(DockWidget)));
 }
 /**
 * Helper function to create an SVG icon
 */
 static QIcon svgIcon(const QString& File)
 {
 	// This is a workaround, because in item views SVG icons are not
 	// properly scaled an look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
 	return SvgIcon;
 }
 //============================================================================
 static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu)
 {
@@ -97,6 +150,7 @@ static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu)
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++));
 	DockWidget->setWidget(w);
 	DockWidget->setToggleViewActionMode(ads::CDockWidget::ActionModeShow);
 	DockWidget->setIcon(svgIcon(":/adsdemo/images/date_range.svg"));
 	ViewMenu->addAction(DockWidget->toggleViewAction());
 	return DockWidget;
 }
@@ -111,12 +165,81 @@ static ads::CDockWidget* createFileSystemTreeDockWidget(QMenu* ViewMenu)
 	QFileSystemModel* m = new QFileSystemModel(w);
 	m->setRootPath(QDir::currentPath());
 	w->setModel(m);
-	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Filesystem %1").arg(FileSystemCount++));
+	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Filesystem %1")
 		.arg(FileSystemCount++));
 	DockWidget->setWidget(w);
 	ViewMenu->addAction(DockWidget->toggleViewAction());
    return DockWidget;
 }
 //============================================================================
 static ads::CDockWidget* createEditorWidget(QMenu* ViewMenu)
 {
 	static int EditorCount = 0;
 	QPlainTextEdit* w = new QPlainTextEdit();
 	w->setPlaceholderText("This is an editor. If you close the editor, it will be "
 		"deleted. Enter your text here.");
 	w->setStyleSheet("border: none");
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Editor %1").arg(EditorCount++));
 	DockWidget->setWidget(w);
 	DockWidget->setIcon(svgIcon(":/adsdemo/images/edit.svg"));
 	DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
 	ViewMenu->addAction(DockWidget->toggleViewAction());
 	QMenu* OptionsMenu = new QMenu(DockWidget);
 	OptionsMenu->setTitle(QObject::tr("Options"));
 	OptionsMenu->setToolTip(OptionsMenu->title());
 	OptionsMenu->setIcon(svgIcon(":/adsdemo/images/custom-menu-button.svg"));
 	auto MenuAction = OptionsMenu->menuAction();
 	// The object name of the action will be set for the QToolButton that
 	// is created in the dock area title bar. You can use this name for CSS
 	// styling
 	MenuAction->setObjectName("optionsMenu");
 	DockWidget->setTitleBarActions({OptionsMenu->menuAction()});
 	auto a = OptionsMenu->addAction(QObject::tr("Clear Editor"));
 	w->connect(a, SIGNAL(triggered()), SLOT(clear()));
 	return DockWidget;
 }
 //============================================================================
 static ads::CDockWidget* createTableWidget(QMenu* ViewMenu)
 {
   static int TableCount = 0;
   QTableWidget* w = new QTableWidget();
   ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Table %1").arg(TableCount++));
   static int colCount = 5;
   static int rowCount = 30;
   w->setColumnCount(colCount);
   w->setRowCount(rowCount);
   for (int col = 0; col < colCount; ++col)
   {
      w->setHorizontalHeaderItem(col, new QTableWidgetItem(QString("Col %1").arg(col+1)));
      for (int row = 0; row < rowCount; ++row)
      {
         w->setItem(row, col, new QTableWidgetItem(QString("T %1-%2").arg(row + 1).arg(col+1)));
      }
   }
   DockWidget->setWidget(w);
   DockWidget->setIcon(svgIcon(":/adsdemo/images/grid_on.svg"));
   ViewMenu->addAction(DockWidget->toggleViewAction());
   return DockWidget;
 }
 #ifdef Q_OS_WIN
 //============================================================================
 static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = nullptr)
 {
   static int ActiveXCount = 0;
   QAxWidget* w = new QAxWidget("{6bf52a52-394a-11d3-b153-00c04f79faa6}", parent);
   ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Active X %1").arg(ActiveXCount++));
   DockWidget->setWidget(w);
   ViewMenu->addAction(DockWidget->toggleViewAction());
   return DockWidget;
 }
 #endif
 //============================================================================
 /**
@@ -128,7 +251,7 @@ struct MainWindowPrivate
 	Ui::MainWindow ui;
 	QAction* SavePerspectiveAction = nullptr;
 	QWidgetAction* PerspectiveListAction = nullptr;
-	QComboBox* PerspectiveComboBox = nullptr;;
+	QComboBox* PerspectiveComboBox = nullptr;
 	ads::CDockManager* DockManager = nullptr;
 	MainWindowPrivate(CMainWindow* _public) : _this(_public) {}
@@ -164,16 +287,23 @@ struct MainWindowPrivate
 	void restorePerspectives();
 };
 //============================================================================
 void MainWindowPrivate::createContent()
 {
 	// Test container docking
 	QMenu* ViewMenu = ui.menuView;
 	auto DockWidget = createCalendarDockWidget(ViewMenu);
 	DockWidget->setIcon(_this->style()->standardIcon(QStyle::SP_DialogOpenButton));
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, false);
-	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
+	DockWidget->setFeature(ads::CDockWidget::DockWidgetMovable, false);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetFloatable, false);
 	auto SpecialDockArea = DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
 	// For this Special Dock Area we want to avoid dropping on the center of it (i.e. we don't want this widget to be ever tabbified):
 	{
 		SpecialDockArea->setAllowedAreas(ads::OuterDockAreas);
 		//SpecialDockArea->setAllowedAreas({ads::LeftDockWidgetArea, ads::RightDockWidgetArea}); // just for testing
 	}
 	DockManager->addDockWidget(ads::LeftDockWidgetArea, createLongTextLabelDockWidget(ViewMenu));
 	auto FileSystemWidget = createFileSystemTreeDockWidget(ViewMenu);
 	auto ToolBar = FileSystemWidget->createDefaultToolBar();
@@ -186,17 +316,58 @@ void MainWindowPrivate::createContent()
 	ToolBar->addAction(ui.actionSaveState);
 	ToolBar->addAction(ui.actionRestoreState);
 	FileSystemWidget->setFeature(ads::CDockWidget::DockWidgetMovable, false);
 	FileSystemWidget->setFeature(ads::CDockWidget::DockWidgetFloatable, false);
 	appendFeaturStringToWindowTitle(FileSystemWidget);
 	auto TopDockArea = DockManager->addDockWidget(ads::TopDockWidgetArea, FileSystemWidget);
 	// We create a calender widget and clear all flags to prevent the dock area
 	// from closing
 	DockWidget = createCalendarDockWidget(ViewMenu);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, false);
-	DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
+	DockWidget->setFeature(ads::CDockWidget::DockWidgetMovable, false);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetFloatable, false);
 	DockWidget->setTabToolTip(QString("Tab ToolTip\nHodie est dies magna"));
 	auto DockArea = DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
 	// Now we add a custom button to the dock area title bar that will create
 	// new editor widgets when clicked
 	auto CustomButton = new QToolButton(DockArea);
 	CustomButton->setToolTip(QObject::tr("Create Editor"));
 	CustomButton->setIcon(svgIcon(":/adsdemo/images/plus.svg"));
 	CustomButton->setAutoRaise(true);
 	auto TitleBar = DockArea->titleBar();
 	int Index = TitleBar->indexOf(TitleBar->tabBar());
 	TitleBar->insertWidget(Index + 1, CustomButton);
 	QObject::connect(CustomButton, &QToolButton::clicked, [=]()
 	{
 		auto DockWidget = createEditorWidget(ui.menuView);
 		DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 		DockManager->addDockWidgetTabToArea(DockWidget, DockArea);
 		_this->connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));
 	});
 	// Test dock area docking
 	auto RighDockArea = DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), TopDockArea);
 	DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	auto BottomDockArea = DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
-	DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
+	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);
    auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
 #ifdef Q_OS_WIN
    if (!DockManager->configFlags().testFlag(ads::CDockManager::OpaqueUndocking))
    {
    	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(ViewMenu), RighDockArea);
    }
 #endif
 	for (auto DockWidget : DockManager->dockWidgetsMap())
 	{
 		_this->connect(DockWidget, SIGNAL(viewToggled(bool)), SLOT(onViewToggled(bool)));
 		_this->connect(DockWidget, SIGNAL(visibilityChanged(bool)), SLOT(onViewVisibilityChanged(bool)));
 	}
 }
@@ -204,11 +375,13 @@ void MainWindowPrivate::createContent()
 void MainWindowPrivate::createActions()
 {
 	ui.toolBar->addAction(ui.actionSaveState);
-	ui.actionSaveState->setIcon(_this->style()->standardIcon(QStyle::SP_DialogSaveButton));
+	ui.toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
 	ui.actionSaveState->setIcon(svgIcon(":/adsdemo/images/save.svg"));
 	ui.toolBar->addAction(ui.actionRestoreState);
-	ui.actionRestoreState->setIcon(_this->style()->standardIcon(QStyle::SP_DialogOpenButton));
+	ui.actionRestoreState->setIcon(svgIcon(":/adsdemo/images/restore.svg"));
-	SavePerspectiveAction = new QAction("Save Perspective", _this);
+	SavePerspectiveAction = new QAction("Create Perspective", _this);
 	SavePerspectiveAction->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
 	_this->connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
 	PerspectiveListAction = new QWidgetAction(_this);
 	PerspectiveComboBox = new QComboBox(_this);
@@ -218,6 +391,16 @@ void MainWindowPrivate::createActions()
 	ui.toolBar->addSeparator();
 	ui.toolBar->addAction(PerspectiveListAction);
 	ui.toolBar->addAction(SavePerspectiveAction);
 	QAction* a = ui.toolBar->addAction("Create Editor");
 	a->setToolTip("Creates floating dynamic dockable editor windows that are deleted on close");
 	a->setIcon(svgIcon(":/adsdemo/images/note_add.svg"));
 	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
 	a = ui.toolBar->addAction("Create Table");
 	a->setToolTip("Creates floating dynamic dockable table with millions of entries");
 	a->setIcon(svgIcon(":/adsdemo/images/grid_on.svg"));
 	_this->connect(a, SIGNAL(triggered()), SLOT(createTable()));
 }
@@ -268,23 +451,55 @@ CMainWindow::CMainWindow(QWidget *parent) :
 {
 	using namespace ads;
 	d->ui.setupUi(this);
 	d->createActions();
 	// uncomment the following line if the tab close button should be
 	// a QToolButton instead of a QPushButton
 	// CDockManager::setConfigFlags(CDockManager::configFlags() | CDockManager::TabCloseButtonIsToolButton);
    // comment the following line if you want to use opaque undocking and
 	// opaque splitter resizing
    CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig);
    // uncomment the following line if you want a fixed tab width that does
 	// not change if the visibility of the close button changes
    //CDockManager::setConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden, true);
 	// uncomment the following line if you don't want close button on DockArea's title bar
 	//CDockManager::setConfigFlag(CDockManager::DockAreaHasCloseButton, false);
 	// uncomment the following line if you don't want undock button on DockArea's title bar
 	//CDockManager::setConfigFlag(CDockManager::DockAreaHasUndockButton, false);
 	// uncomment the following line if you don't want tabs menu button on DockArea's title bar
 	//CDockManager::setConfigFlag(CDockManager::DockAreaHasTabsMenuButton, false);
 	// uncomment the following line if you don't want disabled buttons to appear on DockArea's title bar
 	//CDockManager::setConfigFlag(CDockManager::DockAreaHideDisabledButtons, true);
 	// uncomment the following line if you want to show tabs menu button on DockArea's title bar only when there are more than one tab and at least of them has elided title
 	//CDockManager::setConfigFlag(CDockManager::DockAreaDynamicTabsMenuButtonVisibility, true);
 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);
-	// Uncomment the following line to have the old style where the dock
+	// uncomment the following line to have the old style where the dock
 	// area close button closes the active tab
-	//d->DockManager->setConfigFlags({
+	// CDockManager::setConfigFlags({CDockManager::DockAreaHasCloseButton
-	//	CDockManager::DockAreaHasCloseButton | CDockManager::DockAreaCloseButtonClosesTab});
+	//	| CDockManager::DockAreaCloseButtonClosesTab});
 	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
 		d->DockManager, SLOT(openPerspective(const QString&)));
 	d->createContent();
-	// Default window geometry
+	// Default window geometry - center on screen
-	resize(800, 600);
+    resize(1280, 720);
    setGeometry(QStyle::alignedRect(
        Qt::LeftToRight, Qt::AlignCenter, frameSize(),
        QGuiApplication::primaryScreen()->availableGeometry()
    ));
-	d->restoreState();
+	//d->restoreState();
 	d->restorePerspectives();
 }
@@ -338,3 +553,64 @@ void CMainWindow::savePerspective()
 	d->savePerspectives();
 }
 //============================================================================
 void CMainWindow::onViewToggled(bool Open)
 {
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
 	if (!DockWidget)
 	{
 		return;
 	}
 	qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
 }
 //============================================================================
 void CMainWindow::onViewVisibilityChanged(bool Visible)
 {
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
    if (!DockWidget)
    {
        return;
    }
    qDebug() << DockWidget->objectName() << " visibilityChanged(" << Visible << ")";
 }
 //============================================================================
 void CMainWindow::createEditor()
 {
 	auto DockWidget = createEditorWidget(d->ui.menuView);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 	auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
    FloatingWidget->move(QPoint(20, 20));
    connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));
 }
 //============================================================================
 void CMainWindow::onEditorCloseRequested()
 {
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
 	int Result = QMessageBox::question(this, "Close Editor", QString("Editor %1 "
 		"contains unsaved changes? Would you like to close it?")
 		.arg(DockWidget->windowTitle()));
 	if (QMessageBox::Yes == Result)
 	{
 		DockWidget->closeDockWidget();
 	}
 }
 //============================================================================
 void CMainWindow::createTable()
 {
 	auto DockWidget = createTableWidget(d->ui.menuView);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 	auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
    FloatingWidget->move(QPoint(40, 40));
 }
--- a/demo/MainWindow.h
+++ b/demo/MainWindow.h
@@ -58,6 +58,11 @@ private slots:
 	void on_actionSaveState_triggered(bool);
 	void on_actionRestoreState_triggered(bool);
 	void savePerspective();
 	void onViewToggled(bool Open);
 	void onViewVisibilityChanged(bool Visible);
 	void createEditor();
 	void createTable();
 	void onEditorCloseRequested();
 };
 #endif // MAINWINDOW_H
--- a/demo/app.css
+++ b/demo/app.css
@@ -0,0 +1,4 @@
 ads--CTitleBarButton::menu-indicator
 {
    image: none;
 }
--- a/demo/demo.pro
+++ b/demo/demo.pro
@@ -1,31 +1,51 @@
 ADS_ROOT = $${PWD}/..
 ADS_OUT_ROOT = $${OUT_PWD}/..
 TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
 QT += core gui widgets
 CONFIG *= c++14
 win32 {
 QT += axcontainer
 }
 CONFIG += c++14
 CONFIG += debug_and_release
 DEFINES += QT_DEPRECATED_WARNINGS
 adsBuildStatic {
    DEFINES += ADS_STATIC
 }
 SOURCES += \
 	main.cpp \
 	MainWindow.cpp
 HEADERS += \
 	MainWindow.h
 FORMS += \
 	mainwindow.ui
-RESOURCES += main.qrc
+RESOURCES += demo.qrc
 LIBS += -L$${ADS_OUT_ROOT}/lib
 # Dependency: AdvancedDockingSystem (shared)
-win32:CONFIG(release, debug|release): LIBS += -lqtadvanceddocking
+CONFIG(debug, debug|release){
-else:win32:CONFIG(debug, debug|release): LIBS += -lqtadvanceddockingd
+    win32 {
-else:unix: LIBS += -lAdvancedDockingSystem
+        LIBS += -lqtadvanceddockingd
    }
    else:mac {
        LIBS += -lqtadvanceddocking_debug
    }
    else {
        LIBS += -lqtadvanceddocking
    }
 }
 else{
    LIBS += -lqtadvanceddocking
 }
 INCLUDEPATH += ../src
 DEPENDPATH += ../src
--- a/demo/demo.qrc
+++ b/demo/demo.qrc
@@ -0,0 +1,16 @@
 <RCC>
    <qresource prefix="/adsdemo">
        <file>images/folder.svg</file>
        <file>images/folder_open.svg</file>
        <file>images/note_add.svg</file>
        <file>images/picture_in_picture.svg</file>
        <file>images/restore.svg</file>
        <file>images/save.svg</file>
        <file>images/date_range.svg</file>
        <file>images/edit.svg</file>
        <file>images/grid_on.svg</file>
        <file>images/custom-menu-button.svg</file>
        <file>app.css</file>
        <file>images/plus.svg</file>
    </qresource>
 </RCC>
--- a/demo/images/custom-menu-button.svg
+++ b/demo/images/custom-menu-button.svg
@@ -0,0 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16px" height="16px" viewBox="0 0 16 16" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="38 - menu bar lines option list hamburger web.svg">
  <defs id="defs4">
    <pattern y="0" x="0" height="6" width="6" patternUnits="userSpaceOnUse" id="EMFhbasepattern"/>
    <pattern y="0" x="0" height="6" width="6" patternUnits="userSpaceOnUse" id="EMFhbasepattern-4"/>
    <pattern y="0" x="0" height="6" width="6" patternUnits="userSpaceOnUse" id="EMFhbasepattern-3"/>
    <pattern y="0" x="0" height="6" width="6" patternUnits="userSpaceOnUse" id="EMFhbasepattern-8"/>
  </defs>
  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627417" inkscape:cx="6.2316889" inkscape:cy="7.4271635" inkscape:document-units="px" inkscape:current-layer="g5228" showgrid="true" units="px" inkscape:window-width="1366" inkscape:window-height="705" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" inkscape:snap-global="true">
    <inkscape:grid type="xygrid" id="grid3336"/>
  </sodipodi:namedview>
  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1036.3622)">
    <g transform="translate(628,-140.49998)" id="g5228">
      <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M 4.484375 4 A 0.50005 0.50005 0 0 0 4.5351562 5 L 11.464844 5 A 0.50005 0.50005 0 1 0 11.464844 4 L 4.5351562 4 A 0.50005 0.50005 0 0 0 4.484375 4 z M 4.484375 7 A 0.50005 0.50005 0 0 0 4.5351562 8 L 11.464844 8 A 0.50005 0.50005 0 1 0 11.464844 7 L 4.5351562 7 A 0.50005 0.50005 0 0 0 4.484375 7 z M 4.484375 10 A 0.50005 0.50005 0 0 0 4.5351562 11 L 11.464844 11 A 0.50005 0.50005 0 1 0 11.464844 10 L 4.5351562 10 A 0.50005 0.50005 0 0 0 4.484375 10 z " transform="translate(-628,1176.8622)" id="path3340"/>
    </g>
  </g>
 	<metadata>
 		<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dc="http://purl.org/dc/elements/1.1/">
 			<rdf:Description about="https://iconscout.com/legal#licenses" dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web" dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web" dc:publisher="Iconscout" dc:date="2016-12-14" dc:format="image/svg+xml" dc:language="en">
 				<dc:creator>
 					<rdf:Bag>
 						<rdf:li>Jemis Mali</rdf:li>
 					</rdf:Bag>
 				</dc:creator>
 			</rdf:Description>
 		</rdf:RDF>
    </metadata></svg>
--- a/demo/images/date_range.svg
+++ b/demo/images/date_range.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>date_range icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M896,256v597.33c0,46.93 -38.4,85.34 -85.33,85.34h-597.34c-47.36,0 -85.33,-38.41 -85.33,-85.34l0.43,-597.33c0,-46.93 37.54,-85.33 84.9,-85.33h42.67v-85.34h85.33v85.34h341.34v-85.34h85.33v85.34h42.67c46.93,0 85.33,38.4 85.33,85.33zM810.67,384h-597.34v469.33h597.34zM384,554.67h-85.33v-85.34h85.33zM554.67,554.67h-85.34v-85.34h85.34zM725.33,554.67h-85.33v-85.34h85.33z"/>
 	</g>
 </svg>
--- a/demo/images/edit.svg
+++ b/demo/images/edit.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>create icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M599.89,264.11l160,160l-471.89,471.89h-160v-160zM805.55,378.45l-160,-160l78.08,-78.08c16.64,-16.64 43.52,-16.64 60.16,0l99.84,99.84c16.64,16.64 16.64,43.52 0,60.16z"/>
 	</g>
 </svg>
--- a/demo/images/folder.svg
+++ b/demo/images/folder.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>folder icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M512,256h341.33c46.93,0 85.34,38.4 85.34,85.33v426.67c0,46.93 -38.41,85.33 -85.34,85.33h-682.66c-46.93,0 -85.34,-38.4 -85.34,-85.33l0.43,-512c0,-46.93 37.98,-85.33 84.91,-85.33h256z"/>
 	</g>
 </svg>
--- a/demo/images/folder_open.svg
+++ b/demo/images/folder_open.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>folder_open icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M938.67,341.33v426.67c0,46.93 -38.41,85.33 -85.34,85.33h-682.66c-46.93,0 -85.34,-38.4 -85.34,-85.33l0.43,-512c0,-46.93 37.98,-85.33 84.91,-85.33h256l85.33,85.33h341.33c46.93,0 85.34,38.4 85.34,85.33zM853.33,341.33h-682.66v426.67h682.66z"/>
 	</g>
 </svg>
--- a/demo/images/grid_on.svg
+++ b/demo/images/grid_on.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>grid_on icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M938.67,170.67v682.66c0,46.93 -38.41,85.34 -85.34,85.34h-682.66c-46.93,0 -85.34,-38.41 -85.34,-85.34v-682.66c0,-46.93 38.41,-85.34 85.34,-85.34h682.66c46.93,0 85.34,38.41 85.34,85.34zM341.33,170.67h-170.66v170.66h170.66zM341.33,682.67h-170.66v170.66h170.66zM341.33,426.67h-170.66v170.66h170.66zM597.33,170.67h-170.66v170.66h170.66zM853.33,170.67h-170.66v170.66h170.66zM597.33,682.67h-170.66v170.66h170.66zM597.33,426.67h-170.66v170.66h170.66zM853.33,682.67h-170.66v170.66h170.66zM853.33,426.67h-170.66v170.66h170.66z"/>
 	</g>
 </svg>
--- a/demo/images/material_icons_license.txt
+++ b/demo/images/material_icons_license.txt
@@ -0,0 +1,211 @@
   The Google Material icons and modifications can be used free of charge for
   commerical and non-commerical projects according to the Apache License 2.0. 
   An attribution to https://material.io/icons/ and/or https://iconfu.com on
   your website or in your app's "about" screen would be wonderful.
   Please do not re-sell the icons.
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
--- a/demo/images/note_add.svg
+++ b/demo/images/note_add.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>note_add icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M853.33,341.33v512c0,46.93 -38.4,85.34 -85.33,85.34h-512.43c-46.93,0 -84.9,-38.41 -84.9,-85.34l0.42,-682.66c0,-46.93 37.98,-85.34 84.91,-85.34h341.33zM682.67,597.33h-128v-128h-85.34v128h-128v85.34h128v128h85.34v-128h128zM789.33,384l-234.66,-234.67v234.67z"/>
 	</g>
 </svg>
--- a/demo/images/picture_in_picture.svg
+++ b/demo/images/picture_in_picture.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>picture_in_picture icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M981.33,213.33v597.34c0,46.93 -38.4,84.48 -85.33,84.48h-768c-46.93,0 -85.33,-37.55 -85.33,-84.48v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33zM896,212.48h-768v598.61h768zM810.67,554.67h-341.34v-256h341.34z"/>
 	</g>
 </svg>
--- a/demo/images/plus.svg
+++ b/demo/images/plus.svg
@@ -0,0 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="16px"
   height="16px"
   viewBox="0 0 16 16"
   id="svg2"
   version="1.1"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
   sodipodi:docname="plus.svg">
  <defs
     id="defs4">
    <pattern
       y="0"
       x="0"
       height="6"
       width="6"
       patternUnits="userSpaceOnUse"
       id="EMFhbasepattern" />
    <pattern
       y="0"
       x="0"
       height="6"
       width="6"
       patternUnits="userSpaceOnUse"
       id="EMFhbasepattern-4" />
    <pattern
       y="0"
       x="0"
       height="6"
       width="6"
       patternUnits="userSpaceOnUse"
       id="EMFhbasepattern-3" />
    <pattern
       y="0"
       x="0"
       height="6"
       width="6"
       patternUnits="userSpaceOnUse"
       id="EMFhbasepattern-8" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="22.627417"
     inkscape:cx="-2.5629517"
     inkscape:cy="7.4271635"
     inkscape:document-units="px"
     inkscape:current-layer="g5228"
     showgrid="true"
     units="px"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     inkscape:window-x="1912"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:snap-bbox="true"
     inkscape:bbox-paths="true"
     inkscape:bbox-nodes="true"
     inkscape:snap-bbox-edge-midpoints="true"
     inkscape:snap-bbox-midpoints="true"
     inkscape:snap-global="true">
    <inkscape:grid
       type="xygrid"
       id="grid3336" />
  </sodipodi:namedview>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(0,-1036.3622)">
    <g
       transform="translate(628,-140.49998)"
       id="g5228">
      <path
         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
         d="m -620.5,1189.8622 v -11"
         id="path822-5"
         inkscape:connector-curvature="0" />
      <path
         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
         d="m -615,1184.3622 h -11"
         id="path822-5-2"
         inkscape:connector-curvature="0" />
    </g>
  </g>
  <metadata
     id="metadata12">
    <rdf:RDF>
      <rdf:Description
         about="https://iconscout.com/legal#licenses"
         dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
         dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
         dc:publisher="Iconscout"
         dc:date="2016-12-14"
         dc:format="image/svg+xml"
         dc:language="en">
        <dc:creator>
          <rdf:Bag>
            <rdf:li>Jemis Mali</rdf:li>
          </rdf:Bag>
        </dc:creator>
      </rdf:Description>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
 </svg>
--- a/demo/images/restore.svg
+++ b/demo/images/restore.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>restore icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M938.67,512c0,212.05 -171.95,384 -384,384c-106.24,0 -201.81,-43.09 -271.36,-112.64l60.58,-60.59c53.76,54.19 128.43,87.9 210.78,87.9c165.12,0 298.66,-133.55 298.66,-298.67c0,-165.12 -133.54,-298.67 -298.66,-298.67c-165.12,0 -298.67,133.55 -298.67,298.67h128l-172.37,171.95l-2.99,-5.98l-165.97,-165.97h128c0,-212.05 171.95,-384 384,-384c212.05,0 384,171.95 384,384zM576,341.33v181.34l149.33,88.74l-30.72,51.63l-182.61,-108.37v-213.34z"/>
 	</g>
 </svg>
--- a/demo/images/save.svg
+++ b/demo/images/save.svg
@@ -0,0 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
 	<desc>save icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
 	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
 		<path d="M896,298.67v512c0,46.93 -38.4,85.33 -85.33,85.33h-597.34c-47.36,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 37.97,-85.33 85.33,-85.33h512zM640,213.33h-426.67v170.67h426.67zM640,682.67c0,-70.83 -57.17,-128 -128,-128c-70.83,0 -128,57.17 -128,128c0,70.83 57.17,128 128,128c70.83,0 128,-57.17 128,-128z"/>
 	</g>
 </svg>
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -1,5 +1,3 @@
 #include <windows.h>
 #include <MainWindow.h>
 #include <QString>
 #include <QFile>
@@ -38,10 +36,19 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
 int main(int argc, char *argv[])
 {
 	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #if QT_VERSION >= 0x050600
    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 	std::shared_ptr<int> b;
 	QApplication a(argc, argv);
 	a.setQuitOnLastWindowClosed(true);
 	QFile StyleSheetFile(":/adsdemo/app.css");
 	StyleSheetFile.open(QIODevice::ReadOnly);
 	QTextStream StyleSheetStream(&StyleSheetFile);
 	a.setStyleSheet(StyleSheetStream.readAll());
 	StyleSheetFile.close();
 	qInstallMessageHandler(myMessageOutput);
 	qDebug() << "Message handler test";
--- a/demo/main.qrc
+++ b/demo/main.qrc
@@ -1,7 +0,0 @@
 <RCC>
    <qresource prefix="/main">
        <file>bricks.gif</file>
        <file>bricks_orange.gif</file>
        <file>bricks.apng</file>
    </qresource>
 </RCC>
--- a/doc/ads_icon.svg
+++ b/doc/ads_icon.svg
@@ -0,0 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   viewBox="0,0,1024,1024"
   id="svg1145"
   sodipodi:docname="ads_icon.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
   inkscape:export-filename="C:\CodingXP\cetoni_projects\QtAdvancedDockingSystem\doc\ads_icon_256.png"
   inkscape:export-xdpi="24"
   inkscape:export-ydpi="24">
  <metadata
     id="metadata1151">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs1149" />
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1920"
     inkscape:window-height="1017"
     id="namedview1147"
     showgrid="false"
     inkscape:zoom="0.32593202"
     inkscape:cx="256.13402"
     inkscape:cy="235.82602"
     inkscape:window-x="1912"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg1145" />
  <desc
     id="desc1129">window_size icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
  <path
     id="path1797-1"
     visibility="hidden"
     d="M 71.53142,291.89723 H 950.1828 l 0.6743,0.6742 v 586.08 l -0.6743,0.6743 H 71.53142 l -0.6743,-0.6743 v -586.08 z"
     inkscape:connector-curvature="0"
     style="visibility:hidden;mix-blend-mode:normal;fill:#ffffff;fill-rule:nonzero;stroke-width:0.99999988;fill-opacity:1" />
  <rect
     transform="rotate(-90)"
     y="412.13489"
     x="-911.34436"
     height="560.90375"
     width="327.70862"
     id="rect1739-8"
     style="opacity:1;fill:#ffd292;fill-opacity:1;stroke:none;stroke-width:37.79526901;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
  <path
     id="path1799"
     d="M 988.40121,578.11175 V 651.2546 H 409.96541 V 578.11175 Z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
  <rect
     style="opacity:1;fill:#b3c3cb;fill-opacity:1;stroke:none;stroke-width:37.79526901;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
     id="rect1739-6-1"
     width="655.41724"
     height="338.99207"
     x="-914.85529"
     y="38.243896"
     transform="rotate(-90)" />
  <path
     id="path1801-7"
     d="m 73.1429,73.14287 h 877.7142 c 40.2857,0 73.1429,32.86857 73.1429,73.14285 V 914.2857 c 0,20.12571 -16.4458,36.57142 -36.5715,36.57142 H 36.5714 C 16.4343,950.85712 0,934.42284 0,914.2857 V 146.28572 C 0,106.00001 32.8571,73.14287 73.1429,73.14287 Z m 0,219.42856 V 877.71427 H 950.8571 V 292.57143 Z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
  <path
     id="path1799-6"
     d="M 359.8801,276.79402 H 433.023 V 886.78767 H 359.8801 Z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#546e7a;fill-rule:nonzero;stroke-width:0.99999988" />
  <circle
     r="36.81749"
     cy="169.78555"
     cx="920.66248"
     id="path1917-42"
     style="opacity:1;fill:#ffa726;fill-opacity:1;stroke:none;stroke-width:63.79999924;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
  <circle
     r="36.81749"
     cy="169.78555"
     cx="817.22302"
     id="path1917-4-6"
     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:63.79999924;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
  <path
     id="path1799-8"
     d="m 615.67076,292.13464 v 73.14285 H 433.023 v -73.14285 z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#95abb6;fill-rule:nonzero;stroke-width:0.99999994;fill-opacity:1" />
  <path
     id="path1799-8-1"
     d="m 798.31852,292.13464 v 73.14285 H 615.67076 v -73.14285 z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#c7d4d9;fill-rule:nonzero;stroke-width:0.99999994;fill-opacity:1" />
  <path
     id="path1799-8-7"
     d="m 255.79066,292.57143 v 73.14285 H 73.1429 v -73.14285 z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#dfe5e9;fill-opacity:1;fill-rule:nonzero;stroke-width:0.99999994" />
  <path
     id="path1799-8-7-6"
     d="m 616.34083,651.15739 v 73.14285 H 433.69307 v -73.14285 z"
     inkscape:connector-curvature="0"
     style="mix-blend-mode:normal;fill:#ffba56;fill-opacity:1;fill-rule:nonzero;stroke-width:0.99999994" />
 </svg>
--- a/doc/ads_icon_256.png
+++ b/doc/ads_icon_256.png
--- a/doc/ads_icon_512.png
+++ b/doc/ads_icon_512.png
--- a/doc/ads_qt_marketplace_description.md
+++ b/doc/ads_qt_marketplace_description.md
@@ -0,0 +1,109 @@
 # Advanced Docking System for Qt
 Qt Advanced Docking System lets you create customizable layouts using a full
 featured window docking system similar to what is found in many popular
 integrated development environments (IDEs) such as Visual Studio.
 [![Video Advanced Docking](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc)
 Everything is implemented with standard Qt functionality without any
 platform specific code. Basic usage of QWidgets and QLayouts and using basic 
 styles as much as possible.
 ## Features
 ### Overview
 - [Advanced Docking System for Qt](#advanced-docking-system-for-qt)
  - [Features](#features)
    - [Overview](#overview)
    - [Docking everywhere - no central widget](#docking-everywhere---no-central-widget)
    - [Docking inside floating windows](#docking-inside-floating-windows)
    - [Grouped dragging](#grouped-dragging)
    - [Perspectives for fast switching of the complete main window layout](#perspectives-for-fast-switching-of-the-complete-main-window-layout)
    - [Opaque and non-opaque splitter resizing](#opaque-and-non-opaque-splitter-resizing)
    - [Opaque and non-opaque undocking](#opaque-and-non-opaque-undocking)
    - [Tab-menu for easy handling of many tabbed dock widgets](#tab-menu-for-easy-handling-of-many-tabbed-dock-widgets)
    - [Many different ways to detach dock widgets](#many-different-ways-to-detach-dock-widgets)
    - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
 ### Docking everywhere - no central widget
 There is no central widget like in the Qt docking system. You can dock on every
 border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.
 ![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop.png)\
 \
 ![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop_dark.png)
 ### Docking inside floating windows
 There is no difference between the main window and a floating window. Docking
 into floating windows is supported.
 ![Docking inside floating windows](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/floating-widget-dragndrop.png)\
 \
 ![Docking inside floating windows](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/floating-widget-dragndrop_dark.png)
 ### Grouped dragging
 When dragging the titlebar of a dock, all the tabs that are tabbed with it are 
 going to be dragged. So you can move complete groups of tabbed widgets into
 a floating widget or from one dock area to another one.
 ![Grouped dragging](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/grouped-dragging.gif)\
 \
 ![Grouped dragging](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/grouped-dragging_dark.png)
 ### Perspectives for fast switching of the complete main window layout
 A perspective defines the set and layout of dock windows in the main
 window. You can save the current layout of the dockmanager into a named
 perspective to make your own custom perspective. Later you can simply
 select a perspective from the perspective list to quickly switch the complete 
 main window layout.
 ![Perspective](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/perspectives.gif)\
 \
 ![Perspective](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/perspectives_dark.png)
 ### Opaque and non-opaque splitter resizing
 The advanced docking system uses standard QSplitters as resize separators and thus supports opaque and non-opaque resizing functionality of QSplitter. In some rare cases, for very complex widgets or on slow machines resizing via separator on the fly may cause flicking and glaring of rendered content inside a widget. The global dock manager flag `OpaqueSplitterResize` configures the resizing behaviour of the splitters. If this flag is set, then widgets are resized dynamically (opaquely) while interactively moving the splitters. 
 ![Opaque resizing](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/opaque_resizing.gif)
 If this flag is cleared, the widget resizing is deferred until the mouse button is released - this is some kind of lazy resizing separator.
 ![Non-opaque resizing](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/non_opaque_resizing.gif)
 ### Opaque and non-opaque undocking
 By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediatelly. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
 The drag preview widget can be configured by a number of global dock manager flags:
 - `DragPreviewIsDynamic`: if this flag is enabled, the preview will be adjusted dynamically to the drop area
 - `DragPreviewShowsContentPixmap`: the created drag preview window shows a static copy of the content of the dock widget / dock are that is dragged
 - `DragPreviewHasWindowFrame`: this flag configures if the drag preview is frameless like a QRubberBand or looks like a real window
 The best way to test non-opaque undocking is to set the standard flags: `CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig)`.
 ### Tab-menu for easy handling of many tabbed dock widgets
 Tabs are a good way to quickly switch between dockwidgets in a dockarea. However, if the number of dockwidgets in a dockarea is too large, this may affect the usability of the tab bar. To keep track in this situation, you can use the tab menu. The menu allows you to quickly select the dockwidget you want to activate from a drop down menu.
 ![Tab menu](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/tab_menu.gif)
 ### Many different ways to detach dock widgets
 You can detach dock widgets and also dock areas in the following ways:
 - by dragging the dock widget tab or the dock area title bar
 - by double clicking the tab or title bar
 - by using the detach menu entry from the tab and title bar drop down menu
 ### Supports deletion of dynamically created dock widgets
 Normally clicking the close button of a dock widget will just hide the widget and the user can show it again using the toggleView() action of the dock widget. This is meant for user interfaces with a static amount of widgets. But the advanced docking system also supports dynamic dock widgets that will get deleted on close. If you set the dock widget flag `DockWidgetDeleteOnClose` for a certain dock widget, then it will be deleted as soon as you close this dock widget. This enables the implementation of user interfaces with dynamically created editors, like in word processing applications or source code development tools.
--- a/doc/ads_qt_marketplace_manifest.json
+++ b/doc/ads_qt_marketplace_manifest.json
@@ -0,0 +1,30 @@
 {
    "$schema": "http://qt.io/schema/extension-schema-v1#",
    "title": "Qt Advanced Docking System",
    "extensionType": [
        "library"
    ],
    "version": "3.0.0",
    "vendor": {
        "name": "githubuser0xFFFF",
        "url": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System"
    },
    "contact": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues",
    "icon": "https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/ads_icon_512.png",
    "licenses": [
      { "licenseType": "LGPLv2.1",
        "licenseUrl": "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" }
    ],
    "created": "2017-03-30",
    "lastUpdate": "2020-01-16",
    "platforms": [
        "Windows 7-10", "Kubuntu 18.04", "Kubuntu 19.10", "Ubuntu 19.10"
    ],
    "qtVersions": [
        "5.5.1 or newer"
    ],
    "tags": [
        "Widgets", "Docking"],
    "bugUrl": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues",
    "sourceRepoUrl": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System"
 }
--- a/doc/advanced-docking_video.png
+++ b/doc/advanced-docking_video.png
--- a/doc/donate.png
+++ b/doc/donate.png
--- a/doc/floating-widget-dragndrop.png
+++ b/doc/floating-widget-dragndrop.png
--- a/doc/grouped-dragging.gif
+++ b/doc/grouped-dragging.gif
--- a/doc/grouped-dragging.png
+++ b/doc/grouped-dragging.png
--- a/doc/linux_kubuntu_1804.png
+++ b/doc/linux_kubuntu_1804.png
--- a/doc/linux_ubuntu_1910.png
+++ b/doc/linux_ubuntu_1910.png
--- a/doc/macos.png
+++ b/doc/macos.png
--- a/doc/non_opaque_resizing.gif
+++ b/doc/non_opaque_resizing.gif
--- a/doc/opaque_resizing.gif
+++ b/doc/opaque_resizing.gif
--- a/doc/perspectives.gif
+++ b/doc/perspectives.gif
--- a/doc/preview-dragndrop.png
+++ b/doc/preview-dragndrop.png
--- a/doc/tab_menu.gif
+++ b/doc/tab_menu.gif
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -0,0 +1,46 @@
 cmake_minimum_required(VERSION 3.3)
 set (CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 project(ads_example VERSION "1.0") 
 set(REQUIRED_QT_VERSION 5.5.0)
 find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
 set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Core_LIBRARIES})
 set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
 set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS} )
 set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Gui_LIBRARIES})
 set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
 set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
 set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Widgets_LIBRARIES})
 set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
 set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_example_SRCS
    main.cpp
    MainWindow.cpp
    MainWindow.ui
 )
 add_executable(Example1 WIN32 ${ads_example_SRCS})
 if(BUILD_STATIC)
    set(ads_example_DEFINE ${ads_example_DEFINE} ADS_STATIC)
 endif()
 add_dependencies(Example1 qtadvanceddocking)
 target_include_directories(Example1 PUBLIC 
    $<BUILD_INTERFACE:${ads_example_INCLUDE}>
    $<INSTALL_INTERFACE:include>
    )
 target_include_directories(Example1 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src"  ${ads_example_INCLUDE})
 target_link_libraries(Example1 PRIVATE qtadvanceddocking ${ads_example_LIBS})
 target_compile_definitions(Example1 PRIVATE ${ads_example_DEFINE})
 set_target_properties(Example1 PROPERTIES 
    VERSION "1.0"
    SOVERSION 1
    EXPORT_NAME "Qt Advanced Docking System Example"
    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
 )
--- a/example/MainWindow.cpp
+++ b/example/MainWindow.cpp
@@ -0,0 +1,39 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
 #include <QLabel>
 MainWindow::MainWindow(QWidget *parent) :
    QMainWindow(parent),
    ui(new Ui::MainWindow)
 {
    ui->setupUi(this);
    // Create the dock manager. Because the parent parameter is a QMainWindow
    // the dock manager registers itself as the central widget.
 	m_DockManager = new ads::CDockManager(this);
 	// Create example content label - this can be any application specific
 	// widget
 	QLabel* l = new QLabel();
 	l->setWordWrap(true);
 	l->setAlignment(Qt::AlignTop | Qt::AlignLeft);
 	l->setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. ");
 	// Create a dock widget with the title Label 1 and set the created label
 	// as the dock widget content
 	ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
 	DockWidget->setWidget(l);
 	// Add the toggleViewAction of the dock widget to the menu to give
 	// the user the possibility to show the dock widget if it has been closed
 	ui->menuView->addAction(DockWidget->toggleViewAction());
 	// Add the dock widget to the top dock widget area
 	m_DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
 }
 MainWindow::~MainWindow()
 {
    delete ui;
 }
--- a/example/MainWindow.h
+++ b/example/MainWindow.h
@@ -0,0 +1,24 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #include <QMainWindow>
 #include "DockManager.h"
 namespace Ui {
 class MainWindow;
 }
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
 public:
    explicit MainWindow(QWidget *parent = 0);
    ~MainWindow();
 private:
    Ui::MainWindow *ui;
    ads::CDockManager* m_DockManager;
 };
 #endif // MAINWINDOW_H
--- a/example/MainWindow.ui
+++ b/example/MainWindow.ui
@@ -0,0 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
 <class>MainWindow</class>
 <widget class="QMainWindow" name="MainWindow">
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
    <width>400</width>
    <height>300</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>MainWindow</string>
  </property>
  <widget class="QWidget" name="centralWidget"/>
  <widget class="QMenuBar" name="menuBar">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>21</height>
    </rect>
   </property>
   <widget class="QMenu" name="menuView">
    <property name="title">
     <string>View</string>
    </property>
   </widget>
   <addaction name="menuView"/>
  </widget>
  <widget class="QStatusBar" name="statusBar"/>
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <resources/>
 <connections/>
 </ui>
--- a/example/example.pro
+++ b/example/example.pro
@@ -0,0 +1,47 @@
 ADS_OUT_ROOT = $${OUT_PWD}/..
 QT += core gui widgets
 TARGET = Example1
 DESTDIR = $${ADS_OUT_ROOT}/lib
 TEMPLATE = app
 CONFIG += c++14
 CONFIG += debug_and_release
 adsBuildStatic {
    DEFINES += ADS_STATIC
 }
 DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
        main.cpp \
        MainWindow.cpp
 HEADERS += \
        MainWindow.h
 FORMS += \
        MainWindow.ui
 LIBS += -L$${ADS_OUT_ROOT}/lib
 # Dependency: AdvancedDockingSystem (shared)
 CONFIG(debug, debug|release){
    win32 {
        LIBS += -lqtadvanceddockingd
    }
    else:mac {
        LIBS += -lqtadvanceddocking_debug
    }
    else {
        LIBS += -lqtadvanceddocking
    }
 }
 else{
    LIBS += -lqtadvanceddocking
 }
 INCLUDEPATH += ../src
 DEPENDPATH += ../src    
--- a/example/main.cpp
+++ b/example/main.cpp
@@ -0,0 +1,11 @@
 #include "MainWindow.h"
 #include <QApplication>
 int main(int argc, char *argv[])
 {
    QApplication a(argc, argv);
    MainWindow w;
    w.show();
    return a.exec();
 }
--- a/recipes/meta.yaml
+++ b/recipes/meta.yaml
@@ -0,0 +1,41 @@
 {% set data = load_setup_py_data() %}
 package:
    name: pyqtads
    version: {{ data.get('version') }}
 source:
    path: ../
 build:
    number: 0
    script: python setup.py install --single-version-externally-managed --record=record.txt --conda-recipe
 requirements:
    build:
        - python
        - setuptools
        - pyqt>=5.9
        - sip>=4.19
    run:
        - python
        - pyqt>=5.9
        - sip>=4.19
        - pywin32  [win]
 test:
    imports:
        - PyQtAds
 about:
    home: {{ data.get('url') }}
    license: {{ data.get('license') }}
    license_family: LGPL
    license_file: 'LICENSE.md'
    summary: {{ data.get('description') }}
    description: {{ data.get('description') }}
    doc_url: ''
    dev_url: {{ data.get('url') }}
 extra:
    recipe-maintainers: 'nicolas.elie@cnrs.fr'
--- a/setup.cfg
+++ b/setup.cfg
@@ -0,0 +1,7 @@
 [versioneer]
 VCS = git
 style = pep440
 versionfile_source = PyQtAds/_version.py
 versionfile_build  = PyQtAds/_version.py
 tag_prefix =
--- a/setup.py
+++ b/setup.py
@@ -0,0 +1,294 @@
 import os
 import sys
 import shlex
 import subprocess
 import glob
 import versioneer
 from setuptools import setup, find_packages
 from setuptools.command.build_py import build_py
 from setuptools.extension import Extension
 from distutils import sysconfig, dir_util, spawn, log, cmd
 from distutils.dep_util import newer
 import sipdistutils
 import sipconfig
 from PyQt5.QtCore import PYQT_CONFIGURATION
 from PyQt5.pyrcc_main import processResourceFile
 MODULE_NAME = "ads"
 SRC_PATH = "PyQtAds"
 REQUIRE_PYQT = True
 if "--conda-recipe" in sys.argv:
    REQUIRE_PYQT = False
    sys.argv.remove("--conda-recipe")
 class HostPythonConfiguration(object):
    def __init__(self):
        self.platform = sys.platform
        self.version = sys.hexversion>>8
        self.inc_dir = sysconfig.get_python_inc()
        self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
        self.module_dir = sysconfig.get_python_lib(plat_specific=1)
        if sys.platform == 'win32':
            self.data_dir = sys.prefix
            self.lib_dir = sys.prefix +'\\libs'
        else:
            self.data_dir = sys.prefix + '/share'
            self.lib_dir = sys.prefix + '/lib'
 class TargetQtConfiguration(object):
    def __init__(self, qmake):
        pipe = os.popen(' '.join([qmake, '-query']))
        for l in pipe:
            l = l.strip()
            tokens = l.split(':', 1)
            if isinstance(tokens, list):
                if len(tokens) != 2:
                    error("Unexpected output from qmake: '%s'\n" % l)
                name, value = tokens
            else:
                name = tokens
                value = None
            name = name.replace('/', '_')
            setattr(self, name, value)
        pipe.close()
 class build_ext(sipdistutils.build_ext):
    description = "Builds the " + MODULE_NAME + " module."
    user_options = sipdistutils.build_ext.user_options + [
        ('qmake-bin=', None, "Path to qmake binary"),
        ('sip-bin=', None, "Path to sip binary"),
        ('qt-include-dir=', None, "Path to Qt headers"),
        ('pyqt-sip-dir=', None, "Path to PyQt's SIP files"),
        ('pyqt-sip-flags=', None, "SIP flags used to generate PyQt bindings"),
        ('sip-dir=', None, "Path to module's SIP files"),
        ('inc-dir=', None, "Path to module's include files")
    ]
    def initialize_options (self):
        super().initialize_options()
        self.qmake_bin = 'qmake'
        self.sip_bin = None
        self.qt_include_dir = None
        self.qt_libinfix = ''
        self.pyqt_sip_dir = None
        self.pyqt_sip_flags = None
        self.sip_files_dir = None
        self.sip_inc_dir = None
        self.inc_dir = None
        self.pyconfig = HostPythonConfiguration()
        self.qtconfig = TargetQtConfiguration(self.qmake_bin)
        self.config = sipconfig.Configuration()    
        self.config.default_mod_dir = ("/usr/local/lib/python%i.%i/dist-packages" %
                                      (sys.version_info.major, sys.version_info.minor))
    def finalize_options (self):
        super().finalize_options()
        if not self.qt_include_dir:
            self.qt_include_dir = self.qtconfig.QT_INSTALL_HEADERS
        if not self.qt_libinfix:
            try:
                with open(os.path.join(self.qtconfig.QT_INSTALL_PREFIX, 'mkspecs', 'qconfig.pri'), 'r') as f:
                    for line in f.readlines():
                        if line.startswith('QT_LIBINFIX'):
                            self.qt_libinfix = line.split('=')[1].strip('\n').strip()
            except (FileNotFoundError, IndexError):
                pass
        if not self.pyqt_sip_dir:
            self.pyqt_sip_dir = os.path.join(self.pyconfig.data_dir, 'sip', 'PyQt5')
        if not self.pyqt_sip_flags:
            self.pyqt_sip_flags = PYQT_CONFIGURATION.get('sip_flags', '')
        if not self.sip_files_dir:
            self.sip_files_dir = os.path.abspath(os.path.join(".", "sip"))
        if not self.sip_inc_dir:
            self.sip_inc_dir = self.pyconfig.venv_inc_dir
        if not self.inc_dir:
            self.inc_dir = os.path.abspath(os.path.join(".", "src"))
        if not self.qt_include_dir:
            raise SystemExit('Could not find Qt5 headers. '
                             'Please specify via --qt-include-dir=')
        if not self.pyqt_sip_dir:
            raise SystemExit('Could not find PyQt SIP files. '
                             'Please specify containing directory via '
                             '--pyqt-sip-dir=')
        if not self.pyqt_sip_flags:
            raise SystemExit('Could not find PyQt SIP flags. '
                             'Please specify via --pyqt-sip-flags=')
    def _find_sip(self):
        """override _find_sip to allow for manually speficied sip path."""
        return self.sip_bin or super()._find_sip()
    def _sip_compile(self, sip_bin, source, sbf): 
        cmd = [sip_bin]
        if hasattr(self, 'sip_opts'):
            cmd += self.sip_opts
        if hasattr(self, '_sip_sipfiles_dir'):
            cmd += ['-I', self._sip_sipfiles_dir()]
        cmd += [
            "-I", self.sip_files_dir,
            "-I", self.pyqt_sip_dir,
            "-I", self.sip_inc_dir,
            "-I", self.inc_dir,
            "-c", self._sip_output_dir(),
            "-b", sbf,
            "-w", "-o"]
        cmd += shlex.split(self.pyqt_sip_flags)  # use same SIP flags as for PyQt5
        cmd.append(source)
        self.spawn(cmd)
    def swig_sources (self, sources, extension=None):
        if not self.extensions:
            return
        # Add the local include directory to the include path
        if extension is not None:
            extension.extra_compile_args += ['-D', 'QT_CORE_LIB',
                                             '-D', 'QT_GUI_LIB',
                                             '-D', 'QT_WIDGETS_LIB',
                                             '-D', 'ADS_SHARED_EXPORT']
            extension.include_dirs += [self.qt_include_dir, self.inc_dir,
                            os.path.join(self.qt_include_dir, 'QtCore'),
                            os.path.join(self.qt_include_dir, 'QtGui'),
                            os.path.join(self.qt_include_dir, 'QtWidgets')]
            extension.libraries += ['Qt5Core' + self.qt_libinfix,
                                    'Qt5Gui' + self.qt_libinfix,
                                    'Qt5Widgets' + self.qt_libinfix]
            if sys.platform == 'win32':
                extension.library_dirs += [self.qtconfig.QT_INSTALL_LIBS,
                                       self.inc_dir, self._sip_output_dir()]
            elif sys.platform == 'darwin':
                extension.extra_compile_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
                    '-std=c++11', '-stdlib=libc++', '-mmacosx-version-min=10.9']
                extension.extra_link_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
                    '-mmacosx-version-min=10.9']
            elif sys.platform == 'linux':
                extension.extra_compile_args += ['-std=c++11']
        return super().swig_sources(sources, extension)
    def build_extension(self, ext):
        cppsources = [source for source in ext.sources if source.endswith(".cpp")]
        dir_util.mkpath(self.build_temp, dry_run=self.dry_run)
        # Run moc on all header files.
        for source in cppsources:
            header = source.replace(".cpp", ".h")
            if os.path.exists(header):
                moc_file = "moc_" + os.path.basename(header).replace(".h", ".cpp")
                out_file = os.path.join(self.build_temp, moc_file)
                if newer(header, out_file) or self.force:
                    call_arg = ["moc", "-o", out_file, header]
                    spawn.spawn(call_arg, dry_run=self.dry_run)
                if os.path.getsize(out_file) > 0:
                    ext.sources.append(out_file)
        # Add the temp build directory to include path, for compiler to find
        # the created .moc files
        ext.include_dirs += [self._sip_output_dir()]
        sipdistutils.build_ext.build_extension(self, ext)
 class ProcessResourceCommand(cmd.Command):
    """A custom command to compile the resource file into a Python file"""
    description = "Compile the qrc file into a python file"
    def initialize_options(self):
        return
    def finalize_options(self):
        return
    def run(self):
        processResourceFile([os.path.join('src', 'ads.qrc')],
                            os.path.join(SRC_PATH, 'rc.py'), False)
 class BuildPyCommand(build_py):
    """Custom build command to include ProcessResource command"""
    def run(self):
        self.run_command("process_resource")
        build_py.run(self)
 setup_requires = ["PyQt5"] if REQUIRE_PYQT else []
 cpp_sources = glob.glob(os.path.join('src', '*.cpp'))
 sip_sources = [os.path.join('sip', MODULE_NAME + '.sip')]
 if sys.platform == 'linux':
    cpp_sources += glob.glob(os.path.join('src', 'linux', '*.cpp'))
 ext_modules = [Extension('PyQtAds.QtAds.ads', cpp_sources + sip_sources)]
 install_requires = ["PyQt5"]
 if sys.platform == 'win32':
    install_requires.append("pywin32")
 with open('README.md', 'r') as f:
    LONG_DESCRIPTION = f.read()
 setup(
    name = SRC_PATH,
    author = "Nicolas Elie",
    author_email = "nicolas.elie@cnrs.fr",
    url = "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
    version = versioneer.get_version(),
    description = "Advanced Docking System for Qt",
    long_description = LONG_DESCRIPTION,
    keywords = ["qt"],
    license = "LGPLv2+",
    classifiers = ["Development Status :: 4 - Beta",
                   "Intended Audience :: Developers",
                   "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
                   "Operating System :: OS Independent",
                   "Topic :: Software Development :: Libraries :: Python Modules",
                   "Environment :: Win32 (MS Windows)",
                   "Environment :: MacOS X",
                   "Environment :: X11 Applications :: Qt",
                   "Programming Language :: Python :: 3",
                   "Programming Language :: Python :: 3.2",
                   "Programming Language :: Python :: 3.3",
                   "Programming Language :: Python :: 3.4",
                   "Programming Language :: Python :: 3.5",
                   "Programming Language :: Python :: 3.6",
                   "Programming Language :: Python :: 3.7"],
    ext_modules = ext_modules,
    cmdclass = versioneer.get_cmdclass({'process_resource': ProcessResourceCommand,
                                        'build_py': BuildPyCommand,
                                        'build_ext': build_ext}),
    packages = find_packages(),
    setup_requires = setup_requires,
    install_requires = install_requires,
    zip_safe=False
 )
--- a/simple.py
+++ b/simple.py
@@ -0,0 +1,82 @@
 import logging
 from PyQt5 import QtWidgets, QtCore
 from PyQt5.QtCore import Qt
 from PyQtAds import QtAds
 class MainWindow(QtWidgets.QMainWindow):
    def __init__(self, parent=None):
        super().__init__(parent)
        self.setup_ui()
        self.dock_manager = QtAds.CDockManager(self)
        self.dock_widgets = []
        for label_text, area in (
                ('1 Top', QtAds.TopDockWidgetArea),
                ('2 Bottom', QtAds.BottomDockWidgetArea),
                ('3 Left', QtAds.LeftDockWidgetArea),
                ('4 Right', QtAds.RightDockWidgetArea),
        ):
            # Create example content label - this can be any application specific
            # widget
            label = QtWidgets.QLabel()
            label.setWordWrap(True)
            label.setAlignment(Qt.AlignTop | Qt.AlignLeft)
            label.setText(f"{label_text}: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. ")
            # Create a dock widget with the title Label 1 and set the created label
            # as the dock widget content
            dock_widget = QtAds.CDockWidget(label_text)
            dock_widget.setWidget(label)
            self.dock_widgets.append(dock_widget)
            # Add the toggleViewAction of the dock widget to the menu to give
            # the user the possibility to show the dock widget if it has been closed
            self.menu_view.addAction(dock_widget.toggleViewAction())
            # Add the dock widget to the top dock widget area
            self.dock_manager.addDockWidget(area, dock_widget)
    def setup_ui(self):
        self.setWindowTitle("MainWindow")
        self.setObjectName("MainWindow")
        self.resize(400, 300)
        self.central_widget = QtWidgets.QWidget(self)
        self.central_widget.setObjectName("central_widget")
        self.setCentralWidget(self.central_widget)
        self.menu_bar = QtWidgets.QMenuBar(self)
        self.menu_bar.setGeometry(QtCore.QRect(0, 0, 400, 21))
        self.menu_bar.setObjectName("menuBar")
        self.menu_view = QtWidgets.QMenu(self.menu_bar)
        self.menu_view.setObjectName("menu_view")
        self.menu_view.setTitle("View")
        self.setMenuBar(self.menu_bar)
        self.status_bar = QtWidgets.QStatusBar(self)
        self.status_bar.setObjectName("statusBar")
        self.setStatusBar(self.status_bar)
        self.menu_bar.addAction(self.menu_view.menuAction())
 def main(app):
    main = MainWindow()
    main.show()
    state = main.dock_manager.saveState()
    print('This is what the saved state looks like in XML:')
    print(state)
    print()
    main.dock_manager.restoreState(state)
    return main
 if __name__ == '__main__':
    logging.basicConfig(level='DEBUG')
    app = QtWidgets.QApplication([])
    window = main(app)
    window.show()
    print('shown')
    app.exec_()
--- a/sip/DockAreaTabBar.sip
+++ b/sip/DockAreaTabBar.sip
@@ -0,0 +1,57 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockAreaTabBar : QScrollArea
 {
    %TypeHeaderCode
    #include <DockAreaTabBar.h>
    %End
 protected:
 	virtual void wheelEvent(QWheelEvent* Event);
 	virtual void mousePressEvent(QMouseEvent* ev);
 	virtual void mouseReleaseEvent(QMouseEvent* ev);
 	virtual void mouseMoveEvent(QMouseEvent* ev);
 	virtual void mouseDoubleClickEvent(QMouseEvent *event);
 	void startFloating(const QPoint& Offset);
 	ads::IFloatingWidget* makeAreaFloating(const QPoint& Offset,
 		ads::eDragState DragState);
    ads::eDragState dragState() const;
 public:
 	CDockAreaTabBar(ads::CDockAreaWidget* parent /TransferThis/);
 	virtual ~CDockAreaTabBar();
 	void insertTab(int Index, ads::CDockWidgetTab* Tab /Transfer/);
 	void removeTab(ads::CDockWidgetTab* Tab) /TransferBack/;
 	int count() const;
 	int currentIndex() const;
 	ads::CDockWidgetTab* currentTab() const;
 	ads::CDockWidgetTab* tab(int Index) const;
 	virtual bool eventFilter(QObject *watched, QEvent *event);
 	bool isTabOpen(int Index) const;
 	virtual QSize minimumSizeHint() const;
 	virtual QSize sizeHint() const;
 public slots:
 	void setCurrentIndex(int Index);
 	void closeTab(int Index);
 signals:
 	void currentChanging(int Index);
 	void currentChanged(int Index);
 	void tabBarClicked(int index);
 	void tabCloseRequested(int index);
 	void tabClosed(int index);
 	void tabOpened(int index);
 	void tabMoved(int from, int to);
 	void removingTab(int index);
 	void tabInserted(int index);
 };
 };
 %End
--- a/sip/DockAreaTitleBar.sip
+++ b/sip/DockAreaTitleBar.sip
@@ -0,0 +1,32 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockAreaTitleBar : QFrame
 {
    %TypeHeaderCode
    #include <DockAreaTitleBar.h>
    %End
 public slots:
 	void markTabsMenuOutdated();
 public:
 	CDockAreaTitleBar(ads::CDockAreaWidget* parent /TransferThis/);
 	virtual ~CDockAreaTitleBar();
 	ads::CDockAreaTabBar* tabBar() const;
 	QAbstractButton* button(ads::TitleBarButton which) const;
 	virtual void setVisible(bool Visible);
 signals:
 	void tabBarClicked(int index);
 };
 };
 %End
--- a/sip/DockAreaWidget.sip
+++ b/sip/DockAreaWidget.sip
@@ -0,0 +1,65 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockAreaWidget : QFrame
 {
    %TypeHeaderCode
    #include <DockAreaWidget.h>
    %End
 protected:
 	void insertDockWidget(int index, ads::CDockWidget* DockWidget /Transfer/, bool Activate = true);
 	void addDockWidget(ads::CDockWidget* DockWidget /Transfer/);
 	void removeDockWidget(ads::CDockWidget* DockWidget) /TransferBack/;
 	void toggleDockWidgetView(ads::CDockWidget* DockWidget, bool Open);
 	CDockWidget* nextOpenDockWidget(ads::CDockWidget* DockWidget) const;
 	int index(ads::CDockWidget* DockWidget);
 	void hideAreaWithNoVisibleContent();
 	void updateTitleBarVisibility();
 	void internalSetCurrentDockWidget(ads::CDockWidget* DockWidget /Transfer/);
 	void markTitleBarMenuOutdated();
 protected slots:
 	void toggleView(bool Open);
 public:
 	CDockAreaWidget(ads::CDockManager* DockManager /TransferThis/, ads::CDockContainerWidget* parent /TransferThis/);
 	virtual ~CDockAreaWidget();
 	ads::CDockManager* dockManager() const;
 	ads::CDockContainerWidget* dockContainer() const;
 	QRect titleBarGeometry() const;
 	QRect contentAreaGeometry() const;
 	int dockWidgetsCount() const;
 	QList<ads::CDockWidget*> dockWidgets() const;
 	int openDockWidgetsCount() const;
 	QList<ads::CDockWidget*> openedDockWidgets() const;
 	ads::CDockWidget* dockWidget(int Index) const;
 	int currentIndex() const;
 	int indexOfFirstOpenDockWidget() const;
 	ads::CDockWidget* currentDockWidget() const;
 	void setCurrentDockWidget(ads::CDockWidget* DockWidget /Transfer/);
 	void saveState(QXmlStreamWriter& Stream) const;
 	ads::CDockWidget::DockWidgetFeatures features() const;
 	QAbstractButton* titleBarButton(ads::TitleBarButton which) const;
 	virtual void setVisible(bool Visible);
 public slots:
 	void setCurrentIndex(int index);
 	void closeArea();
 	void closeOtherAreas();
 signals:
 	void tabBarClicked(int index);
    void currentChanging(int index);
 	void currentChanged(int index);
 	void viewToggled(bool Open);
 };
 };
 %End
--- a/sip/DockContainerWidget.sip
+++ b/sip/DockContainerWidget.sip
@@ -0,0 +1,155 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 /**
 * Container that manages a number of dock areas with single dock widgets
 * or tabyfied dock widgets in each area.
 * Each window that support docking has a DockContainerWidget. That means
 * the main application window and all floating windows are ore contain
 * an DockContainerWidget.
 */
 class CDockContainerWidget : QFrame
 {
    %TypeHeaderCode
    #include <DockContainerWidget.h>
    %End
 protected:
 	virtual bool event(QEvent *e);
 	QSplitter* rootSplitter() const;
 	void createRootSplitter();
 	void dropFloatingWidget(ads::CFloatingDockContainer* FloatingWidget, const QPoint& TargetPos);
    void dropWidget(QWidget* widget, const QPoint& TargetPos);
 	void addDockArea(ads::CDockAreaWidget* DockAreaWidget /Transfer/, ads::DockWidgetArea area = ads::CenterDockWidgetArea);
 	void removeDockArea(ads::CDockAreaWidget* area /Transfer/);
 	void saveState(QXmlStreamWriter& Stream) const;
 	bool restoreState(CDockingStateReader& Stream, bool Testing);
 	ads::CDockAreaWidget* lastAddedDockAreaWidget(ads::DockWidgetArea area) const;
 	bool hasTopLevelDockWidget() const;
 	ads::CDockWidget* topLevelDockWidget() const;
 	ads::CDockAreaWidget* topLevelDockArea() const;
    QList<ads::CDockWidget*> dockWidgets() const;
 public:
 	/**
 	 * Default Constructor
 	 */
 	CDockContainerWidget(ads::CDockManager* DockManager /TransferThis/, QWidget* parent /TransferThis/ = 0);
 	/**
 	 * Virtual Destructor
 	 */
 	virtual ~CDockContainerWidget();
 	/**
 	 * Adds dockwidget into the given area.
 	 * If DockAreaWidget is not null, then the area parameter indicates the area
 	 * into the DockAreaWidget. If DockAreaWidget is null, the Dockwidget will
 	 * be dropped into the container.
 	 * \return Returns the dock area widget that contains the new DockWidget
 	 */
 	ads::CDockAreaWidget* addDockWidget(ads::DockWidgetArea area, ads::CDockWidget* Dockwidget /Transfer/,
 		ads::CDockAreaWidget* DockAreaWidget /Transfer/ = 0);
 	/**
 	 * Removes dockwidget
 	 */
 	void removeDockWidget(ads::CDockWidget* Dockwidget) /TransferBack/;
 	/**
 	 * Returns the current zOrderIndex
 	 */
 	virtual unsigned int zOrderIndex() const;
 	/**
 	 * This function returns true if this container widgets z order index is
 	 * higher than the index of the container widget given in Other parameter
 	 */
 	bool isInFrontOf(ads::CDockContainerWidget* Other) const;
 	/**
 	 * Returns the dock area at teh given global position or 0 if there is no
 	 * dock area at this position
 	 */
 	ads::CDockAreaWidget* dockAreaAt(const QPoint& GlobalPos) const;
 	/**
 	 * Returns the dock area at the given Index or 0 if the index is out of
 	 * range
 	 */
 	ads::CDockAreaWidget* dockArea(int Index) const;
 	/**
 	 * Returns the list of dock areas that are not closed
 	 * If all dock widgets in a dock area are closed, the dock area will be closed
 	 */
 	QList<ads::CDockAreaWidget*> openedDockAreas() const;
 	/**
 	 * Returns the number of dock areas in this container
 	 */
 	int dockAreaCount() const;
 	/**
 	 * Returns the number of visible dock areas
 	 */
 	int visibleDockAreaCount() const;
 	/**
 	 * This function returns true, if this container is in a floating widget
 	 */
 	bool isFloating() const;
 	/**
 	 * Dumps the layout for debugging purposes
 	 */
 	void dumpLayout();
 	/**
 	 * This functions returns the dock widget features of all dock widget in
 	 * this container.
 	 * A bitwise and is used to combine the flags of all dock widgets. That
 	 * means, if only dock widget does not support a certain flag, the whole
 	 * dock are does not support the flag.
 	 */
 	ads::CDockWidget::DockWidgetFeatures features() const;
 	/**
 	 * If this dock container is in a floating widget, this function returns
 	 * the floating widget.
 	 * Else, it returns a nullptr.
 	 */
 	ads::CFloatingDockContainer* floatingWidget() const;
 	/**
 	 * Call this function to close all dock areas except the KeepOpenArea
 	 */
 	void closeOtherAreas(ads::CDockAreaWidget* KeepOpenArea);
 signals:
 	/**
 	 * This signal is emitted if one or multiple dock areas has been added to
 	 * the internal list of dock areas.
 	 * If multiple dock areas are inserted, this signal is emitted only once
 	 */
 	void dockAreasAdded();
 	/**
 	 * This signal is emitted if one or multiple dock areas has been removed
 	 */
 	void dockAreasRemoved();
 	/**
 	 * This signal is emitted if a dock area is opened or closed via
 	 * toggleView() function
 	 */
 	void dockAreaViewToggled(ads::CDockAreaWidget* DockArea, bool Open);
 }; // class DockContainerWidget
 };
 // namespace ads
 %End
--- a/sip/DockManager.sip
+++ b/sip/DockManager.sip
@@ -0,0 +1,216 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 %MappedType QMap<QString, ads::CDockWidget*>
        /TypeHint="Dict[QString, CDockWidget*]", TypeHintValue="{}"/
 {
 %TypeHeaderCode
 #include <qmap.h>
 %End
 %ConvertFromTypeCode
    PyObject *d = PyDict_New();
    if (!d)
        return 0;
    QMap<QString, ads::CDockWidget*>::const_iterator it = sipCpp->constBegin();
    QMap<QString, ads::CDockWidget*>::const_iterator end = sipCpp->constEnd();
    while (it != end)
    {
        QString *k = new QString(it.key());
        PyObject *kobj = sipConvertFromType(k, sipType_QString,
                sipTransferObj);
        if (!kobj)
        {
            delete k;
            Py_DECREF(d);
            return 0;
        }
        PyObject *vobj = sipConvertFromType(it.value(), sipType_ads_CDockWidget,
                sipTransferObj);
        if (!vobj)
        {
            Py_DECREF(kobj);
            Py_DECREF(d);
            return 0;
        }
        int rc = PyDict_SetItem(d, kobj, vobj);
        Py_DECREF(vobj);
        Py_DECREF(kobj);
        if (rc < 0)
        {
            Py_DECREF(d);
            return 0;
        }
        ++it;
    }
    return d;
 %End
 %ConvertToTypeCode
    if (!sipIsErr)
            return PyDict_Check(sipPy);
    QMap<QString, ads::CDockWidget*> *qm = new QMap<QString, ads::CDockWidget*>;
    Py_ssize_t pos = 0;
    PyObject *kobj, *vobj;
    while (PyDict_Next(sipPy, &pos, &kobj, &vobj))
    {
        int kstate;
        QString *k = reinterpret_cast<QString *>(
                sipForceConvertToType(kobj, sipType_QString, sipTransferObj,
                        SIP_NOT_NONE, &kstate, sipIsErr));
        if (*sipIsErr)
        {
            PyErr_Format(PyExc_TypeError,
                    "a dict key has type '%s' but '_TYPE1_' is expected",
                    sipPyTypeName(Py_TYPE(kobj)));
            delete qm;
            return 0;
        }
        int vstate;
        ads::CDockWidget *v = reinterpret_cast<ads::CDockWidget *>(
                sipForceConvertToType(vobj, sipType_ads_CDockWidget, sipTransferObj,
                        SIP_NOT_NONE, &vstate, sipIsErr));
        if (*sipIsErr)
        {
            PyErr_Format(PyExc_TypeError,
                    "a dict value has type '%s' but '_TYPE2_' is expected",
                    sipPyTypeName(Py_TYPE(vobj)));
            sipReleaseType(k, sipType_QString, kstate);
            delete qm;
            return 0;
        }
        qm->insert(*k, v);
        sipReleaseType(v, sipType_ads_CDockWidget, vstate);
        sipReleaseType(k, sipType_QString, kstate);
    }
    *sipCppPtr = qm;
    return sipGetState(sipTransferObj);
 %End
 };
 namespace ads
 {
 class CDockManager : ads::CDockContainerWidget
 {
    %TypeHeaderCode
    #include <DockManager.h>
    %End
 protected:
 	void registerFloatingWidget(ads::CFloatingDockContainer* FloatingWidget /Transfer/);
 	void removeFloatingWidget(ads::CFloatingDockContainer* FloatingWidget) /TransferBack/;
 	void registerDockContainer(ads::CDockContainerWidget* DockContainer /Transfer/);
 	void removeDockContainer(ads::CDockContainerWidget* DockContainer /TransferBack/);
 	ads::CDockOverlay* containerOverlay() const;
 	ads::CDockOverlay* dockAreaOverlay() const;
 public:
 	enum eViewMenuInsertionOrder
 	{
 		MenuSortedByInsertion,
 		MenuAlphabeticallySorted
 	};
 	enum eConfigFlag
 	{
 		ActiveTabHasCloseButton, 
 		DockAreaHasCloseButton,
 		DockAreaCloseButtonClosesTab,
 		OpaqueSplitterResize,
 		XmlAutoFormattingEnabled,
 		XmlCompressionEnabled,
 		TabCloseButtonIsToolButton,
 		AllTabsHaveCloseButton,
 		RetainTabSizeWhenCloseButtonHidden,
        OpaqueUndocking,
        DragPreviewIsDynamic,
        DragPreviewShowsContentPixmap,
        DragPreviewHasWindowFrame,
 		DefaultConfig,
        DefaultNonOpaqueConfig,
        NonOpaqueWithWindowFrame,
 	};
    typedef QFlags<ads::CDockManager::eConfigFlag> ConfigFlags;
 	CDockManager(QWidget* parent /TransferThis/ = 0);
 	virtual ~CDockManager();
 	static ads::CDockManager::ConfigFlags configFlags();
 	static void setConfigFlags(const ads::CDockManager::ConfigFlags Flags);
 	static void setConfigFlag(ads::CDockManager::eConfigFlag Flag, bool On = true);
    static ads::CIconProvider& iconProvider();
 	ads::CDockAreaWidget* addDockWidget(ads::DockWidgetArea area, ads::CDockWidget* Dockwidget /Transfer/,
 		ads::CDockAreaWidget* DockAreaWidget /Transfer/ = 0);
 	ads::CDockAreaWidget* addDockWidgetTab(ads::DockWidgetArea area,
 		ads::CDockWidget* Dockwidget /Transfer/);
 	ads::CDockAreaWidget* addDockWidgetTabToArea(ads::CDockWidget* Dockwidget /Transfer/,
 		ads::CDockAreaWidget* DockAreaWidget /Transfer/);
    ads::CFloatingDockContainer* addDockWidgetFloating(ads::CDockWidget* DockWidget /Transfer/);
 	ads::CDockWidget* findDockWidget(const QString& ObjectName) const;
 	void removeDockWidget(ads::CDockWidget* Dockwidget) /TransferBack/;
 	QMap<QString, ads::CDockWidget*> dockWidgetsMap() const;
 	const QList<ads::CDockContainerWidget*> dockContainers() const;
 	const QList<ads::CFloatingDockContainer*> floatingWidgets() const;
 	virtual unsigned int zOrderIndex() const;
 	QByteArray saveState(int version = 1) const;
 	bool restoreState(const QByteArray &state, int version = 1);
 	void addPerspective(const QString& UniquePrespectiveName);
 	void removePerspective(const QString& Name);
 	void removePerspectives(const QStringList& Names);
 	QStringList perspectiveNames() const;
 	void savePerspectives(QSettings& Settings) const;
 	void loadPerspectives(QSettings& Settings);
 	QAction* addToggleViewActionToMenu(QAction* ToggleViewAction /Transfer/,
 		const QString& Group = QString(), const QIcon& GroupIcon = QIcon());
 	QMenu* viewMenu() const;
 	void setViewMenuInsertionOrder(ads::CDockManager::eViewMenuInsertionOrder Order);
 	bool isRestoringState() const;
 	static int startDragDistance();
 public slots:
 	void openPerspective(const QString& PerspectiveName);
 signals:
 	void perspectiveListChanged();
 	void perspectivesRemoved();
 	void restoringState();
    void stateRestored();
    void openingPerspective(const QString& PerspectiveName);
    void perspectiveOpened(const QString& PerspectiveName);
    void dockAreaCreated(ads::CDockAreaWidget* DockArea);
    void dockWidgetAboutToBeRemoved(ads::CDockWidget* DockWidget);
    void dockWidgetRemoved(ads::CDockWidget* DockWidget);
 };
 };
 %End
--- a/sip/DockOverlay.sip
+++ b/sip/DockOverlay.sip
@@ -0,0 +1,77 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockOverlay : public QFrame
 {
    %TypeHeaderCode
    #include <DockOverlay.h>
    %End
 public:
 	enum eMode
 	{
 		ModeDockAreaOverlay,
 		ModeContainerOverlay
 	};
 	CDockOverlay(QWidget* parent /TransferThis/, eMode Mode = ads::CDockOverlay::ModeDockAreaOverlay);
 	virtual ~CDockOverlay();
 	void setAllowedAreas(ads::DockWidgetAreas areas);
 	ads::DockWidgetAreas allowedAreas() const;
 	ads::DockWidgetArea dropAreaUnderCursor() const;
 	ads::DockWidgetArea showOverlay(QWidget* target);
 	void hideOverlay();
 	void enableDropPreview(bool Enable);
 	QRect dropOverlayRect() const;
 	virtual bool event(QEvent *e);
 protected:
 	virtual void paintEvent(QPaintEvent *e);
 	virtual void showEvent(QShowEvent* e);
 	virtual void hideEvent(QHideEvent* e);
 };
 class CDockOverlayCross : public QWidget
 {
 public:
 	enum eIconColor
 	{
 		FrameColor,
 		WindowBackgroundColor,
 		OverlayColor,
 		ArrowColor,
 		ShadowColor
 	};
 protected:
    QString iconColors() const;
    QColor iconColor() const;
    void setIconFrameColor(const QColor& Color);
    void setIconBackgroundColor(const QColor& Color);
    void setIconOverlayColor(const QColor& Color);
    void setIconArrowColor(const QColor& Color);
    void setIconShadowColor(const QColor& Color);
 public:
 	CDockOverlayCross(ads::CDockOverlay* overlay /TransferThis/);
 	virtual ~CDockOverlayCross();
 	void setIconColor(ads::CDockOverlayCross::eIconColor ColorIndex, const QColor& Color);
 	QColor iconColor(ads::CDockOverlayCross::eIconColor ColorIndex) const;
 	ads::DockWidgetArea cursorLocation() const;
 	void setupOverlayCross(ads::CDockOverlay::eMode Mode);
 	void updateOverlayIcons();
 	void reset();
 	void updatePosition();
    void setIconColors(const QString& Colors);
 };
 };
 %End
--- a/sip/DockSplitter.sip
+++ b/sip/DockSplitter.sip
@@ -0,0 +1,23 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockSplitter : QSplitter
 {
    %TypeHeaderCode
    #include <DockSplitter.h>
    %End
 public:
 	CDockSplitter(QWidget *parent /TransferThis/ = 0);
 	CDockSplitter(Qt::Orientation orientation, QWidget *parent /TransferThis/ = 0);
 	virtual ~CDockSplitter();
 	bool hasVisibleContent() const;
 };
 };
 %End
--- a/sip/DockWidget.sip
+++ b/sip/DockWidget.sip
@@ -0,0 +1,106 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockWidget : QFrame
 {
    %TypeHeaderCode
    #include <DockWidget.h>
    %End
 protected:
 	void setDockManager(ads::CDockManager* DockManager /Transfer/);
 	void setDockArea(ads::CDockAreaWidget* DockArea /Transfer/);
 	void setToggleViewActionChecked(bool Checked);
 	void saveState(QXmlStreamWriter& Stream) const;
 	void flagAsUnassigned();
 	static void emitTopLevelEventForWidget(ads::CDockWidget* TopLevelDockWidget, bool Floating);
 	void emitTopLevelChanged(bool Floating);
 	void setClosedState(bool Closed);
 	void toggleViewInternal(bool Open);
 public:
 	enum DockWidgetFeature
 	{
 		DockWidgetClosable,
 		DockWidgetMovable,
 		DockWidgetFloatable,
 		DockWidgetDeleteOnClose,
 		AllDockWidgetFeatures,
 		NoDockWidgetFeatures
 	};
    typedef QFlags<ads::CDockWidget::DockWidgetFeature> DockWidgetFeatures;
 	enum eState
 	{
 		StateHidden,
 		StateDocked,
 		StateFloating
 	};
 	enum eInsertMode
 	{
 		AutoScrollArea,
 		ForceScrollArea,
 		ForceNoScrollArea
 	};
 	enum eToggleViewActionMode
 	{
 		ActionModeToggle,
 		ActionModeShow
 	};
 	CDockWidget(const QString &title, QWidget* parent /TransferThis/ = 0);
 	virtual ~CDockWidget();
 	virtual QSize minimumSizeHint() const;
 	void setWidget(QWidget* widget /Transfer/, ads::CDockWidget::eInsertMode InsertMode = AutoScrollArea);
 	QWidget* takeWidget() /TransferBack/;
 	QWidget* widget() const;
 	ads::CDockWidgetTab* tabWidget() const;
 	void setFeatures(ads::CDockWidget::DockWidgetFeatures features);
 	void setFeature(ads::CDockWidget::DockWidgetFeature flag, bool on);
 	ads::CDockWidget::DockWidgetFeatures features() const;
 	ads::CDockManager* dockManager() const;
 	ads::CDockContainerWidget* dockContainer() const;
 	ads::CDockAreaWidget* dockAreaWidget() const;
 	bool isFloating() const;
 	bool isInFloatingContainer() const;
 	bool isClosed() const;
 	QAction* toggleViewAction() const;
 	void setToggleViewActionMode(ads::CDockWidget::eToggleViewActionMode Mode);
 	void setIcon(const QIcon& Icon);
 	QIcon icon() const;
 	QToolBar* toolBar() const;
 	QToolBar* createDefaultToolBar();
 	void setToolBar(QToolBar* ToolBar);
 	void setToolBarStyle(Qt::ToolButtonStyle Style, ads::CDockWidget::eState State);
 	Qt::ToolButtonStyle toolBarStyle(ads::CDockWidget::eState State) const;
 	void setToolBarIconSize(const QSize& IconSize, ads::CDockWidget::eState State);
 	QSize toolBarIconSize(eState State) const;
 	void setTabToolTip(const QString &text);
 public:
 	virtual bool event(QEvent *e);
 public slots:
 	void toggleView(bool Open = true);
    void setFloating();
    void deleteDockWidget();
 signals:
 	void viewToggled(bool Open);
 	void closed();
 	void titleChanged(const QString& Title);
 	void topLevelChanged(bool topLevel);
 	void visibilityChanged(bool visible);
    void featuresChanged(ads::CDockWidget::DockWidgetFeatures features);
 };
 };
 %End
--- a/sip/DockWidgetTab.sip
+++ b/sip/DockWidgetTab.sip
@@ -0,0 +1,50 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockWidgetTab : QFrame
 {
    %TypeHeaderCode
    #include <DockWidgetTab.h>
    %End
 protected:
 	virtual void mousePressEvent(QMouseEvent* ev);
 	virtual void mouseReleaseEvent(QMouseEvent* ev);
 	virtual void mouseMoveEvent(QMouseEvent* ev);
 	virtual void contextMenuEvent(QContextMenuEvent* ev);
 	virtual void mouseDoubleClickEvent(QMouseEvent *event);
 public:
 	CDockWidgetTab(ads::CDockWidget* DockWidget /TransferThis/, QWidget* parent /TransferThis/ = 0);
 	virtual ~CDockWidgetTab();
 	bool isActiveTab() const;
 	void setActiveTab(bool active);
 	ads::CDockWidget* dockWidget() const;
 	void setDockAreaWidget(ads::CDockAreaWidget* DockArea /Transfer/);
 	ads::CDockAreaWidget* dockAreaWidget() const;
 	void setIcon(const QIcon& Icon);
 	const QIcon& icon() const;
 	QString text() const;
 	void setText(const QString& title);
 	bool isClosable() const;
 	virtual bool event(QEvent *e);
 public slots:
 	virtual void setVisible(bool visible);
 signals:
 	void activeTabChanged();
 	void clicked();
 	void closeRequested();
 	void closeOtherTabsRequested();
 	void moved(const QPoint& GlobalPos);
 }; // class DockWidgetTab
 };
 // namespace ads
 %End
--- a/sip/DockingStateReader.sip
+++ b/sip/DockingStateReader.sip
@@ -0,0 +1,21 @@
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CDockingStateReader : QXmlStreamReader
 {
    %TypeHeaderCode
    #include <DockingStateReader.h>
    %End
 public:
 	void setFileVersion(int FileVersion);
 	int fileVersion() const;
 };
 };
 %End
--- a/sip/ElidingLabel.sip
+++ b/sip/ElidingLabel.sip
@@ -0,0 +1,40 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CElidingLabel : QLabel
 {
    %TypeHeaderCode
    #include <ElidingLabel.h>
    %End
 protected:
 	virtual void mouseReleaseEvent(QMouseEvent* event);
    virtual void resizeEvent( QResizeEvent *event );
    virtual void mouseDoubleClickEvent( QMouseEvent *ev );
 public:
 	CElidingLabel(QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
 	CElidingLabel(const QString& text, QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
 	virtual ~CElidingLabel();
 	Qt::TextElideMode elideMode() const;
 	void setElideMode(Qt::TextElideMode mode);
 public:
 	virtual QSize minimumSizeHint() const;
 	virtual QSize sizeHint() const;
 	void setText(const QString &text);
 	QString text() const;
 signals:
 	void clicked();
 	void doubleClicked();
 };
 };
 %End
--- a/sip/FloatingDockContainer.sip
+++ b/sip/FloatingDockContainer.sip
@@ -0,0 +1,65 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class IFloatingWidget
 {
    %TypeHeaderCode
    #include <FloatingDockContainer.h>
    %End
 public:
 	virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
        ads::eDragState DragState, QWidget* MouseEventHandler) = 0;
 	virtual void moveFloating() = 0;
 	virtual void finishDragging() = 0;
 };
 class CFloatingDockContainer : QWidget, ads::IFloatingWidget
 {
    %TypeHeaderCode
    #include <FloatingDockContainer.h>
    %End
 protected:
 	virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
        ads::eDragState DragState, QWidget* MouseEventHandler);
    void startDragging(const QPoint& DragStartMousePos, const QSize& Size,
        QWidget* MouseEventHandler);
 	virtual void finishDragging();
 	void initFloatingGeometry(const QPoint& DragStartMousePos, const QSize& Size);
 	void moveFloating();
 	bool restoreState(ads::CDockingStateReader& Stream, bool Testing);
 	void updateWindowTitle();
 protected:
 	virtual void changeEvent(QEvent *event);
 	virtual void moveEvent(QMoveEvent *event);
 	virtual bool event(QEvent *e);
 	virtual void closeEvent(QCloseEvent *event);
 	virtual void hideEvent(QHideEvent *event);
 	virtual void showEvent(QShowEvent *event);
 	virtual bool eventFilter(QObject *watched, QEvent *event);
 public:
 	CFloatingDockContainer(ads::CDockManager* DockManager /TransferThis/);
 	CFloatingDockContainer(ads::CDockAreaWidget* DockArea /TransferThis/);
 	CFloatingDockContainer(ads::CDockWidget* DockWidget /TransferThis/);
 	virtual ~CFloatingDockContainer();
 	ads::CDockContainerWidget* dockContainer() const;
    bool isClosable() const;
    bool hasTopLevelDockWidget() const;
    ads::CDockWidget* topLevelDockWidget() const;
    QList<ads::CDockWidget*> dockWidgets() const;
 };
 };
 %End
--- a/sip/FloatingDragPreview.sip
+++ b/sip/FloatingDragPreview.sip
@@ -0,0 +1,38 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CFloatingDragPreview : QWidget, ads::IFloatingWidget
 {
    %TypeHeaderCode
    #include <FloatingDragPreview.h>
    %End
 public:
    CFloatingDragPreview(ads::CDockWidget* Content /TransferThis/ );
    CFloatingDragPreview(ads::CDockAreaWidget* Content /TransferThis/ );
    virtual ~CFloatingDragPreview();
    virtual bool eventFilter(QObject* watched, QEvent* event);
    virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
        ads::eDragState DragState, QWidget* MouseEventHandler);
    virtual void moveFloating();
    virtual void finishDragging();
 signals:
    void draggingCanceled();
 };
 };
 %End
--- a/sip/IconProvider.sip
+++ b/sip/IconProvider.sip
@@ -0,0 +1,28 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
 class CIconProvider
 {
    %TypeHeaderCode
    #include <IconProvider.h>
    %End
 public:
    CIconProvider();
  	virtual ~CIconProvider();
    QIcon customIcon(eIcon IconId);
    void registerCustomIcon(eIcon IconId, const QIcon& icon /TransferThis/ );
 };
 };
 %End
--- a/sip/ads.sip
+++ b/sip/ads.sip
@@ -0,0 +1,23 @@
 %Module(name=PyQtAds.QtAds.ads, call_super_init=True, keyword_arguments="Optional", use_limited_api=True)
 %Import QtCore/QtCoremod.sip
 %DefaultSupertype sip.simplewrapper
 %Platforms {Linux macOS Windows}
 %Include ads_globals.sip
 %Include DockWidget.sip
 %Include DockAreaTabBar.sip
 %Include DockAreaTitleBar.sip
 %Include DockAreaWidget.sip
 %Include DockContainerWidget.sip
 %Include DockingStateReader.sip
 %Include DockManager.sip
 %Include DockOverlay.sip
 %Include DockSplitter.sip
 %Include DockWidgetTab.sip
 %Include ElidingLabel.sip
 %Include FloatingDockContainer.sip
 %Include FloatingDragPreview.sip
 %Include IconProvider.sip
 %If (Linux)
    %Include linux/FloatingWidgetTitleBar.sip
 %End
--- a/sip/ads_globals.sip
+++ b/sip/ads_globals.sip
@@ -0,0 +1,54 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
    %TypeHeaderCode
    #include <ads_globals.h>
    %End
    enum DockWidgetArea
    {
        NoDockWidgetArea,
        LeftDockWidgetArea,
        RightDockWidgetArea,
        TopDockWidgetArea,
        BottomDockWidgetArea,
        CenterDockWidgetArea,
        InvalidDockWidgetArea,
        OuterDockAreas,
        AllDockAreas
    };
    typedef QFlags<ads::DockWidgetArea> DockWidgetAreas;
    enum TitleBarButton
    {
        TitleBarButtonTabsMenu,
        TitleBarButtonUndock,
        TitleBarButtonClose
    };
    enum eDragState
    {
        DraggingInactive,
        DraggingMousePressed,
        DraggingTab,
        DraggingFloatingWidget
    };
    enum eIcon
    {
        TabCloseIcon,
        DockAreaMenuIcon,
        DockAreaUndockIcon,
        DockAreaCloseIcon,
        IconCount,
    };
 };
 %End
--- a/sip/linux/FloatingWidgetTitleBar.sip
+++ b/sip/linux/FloatingWidgetTitleBar.sip
@@ -0,0 +1,31 @@
 %Import QtWidgets/QtWidgetsmod.sip
 %If (Qt_5_0_0 -)
 namespace ads
 {
    %TypeHeaderCode
    #include <FloatingWidgetTitleBar.h>
    %End
 class CFloatingWidgetTitleBar : QWidget
 {
 protected:
 	virtual void mousePressEvent(QMouseEvent *ev);
 	virtual void mouseReleaseEvent(QMouseEvent *ev);
 	virtual void mouseMoveEvent(QMouseEvent *ev);
 public:
 	explicit CFloatingWidgetTitleBar(CFloatingDockContainer *parent /TransferThis/ = 0);
 	virtual ~CFloatingWidgetTitleBar();
 	void enableCloseButton(bool Enable);
 	void setTitle(const QString &Text);
 signals:
 	void closeRequested();
 };
 };
 %End
--- a/src/DockAreaTabBar.cpp
+++ b/src/DockAreaTabBar.cpp
@@ -27,6 +27,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
 #include <FloatingDragPreview.h>
 #include "DockAreaTabBar.h"
 #include <QMouseEvent>
@@ -53,9 +54,7 @@ namespace ads
 struct DockAreaTabBarPrivate
 {
 	CDockAreaTabBar* _this;
 	QPoint DragStartMousePos;
 	CDockAreaWidget* DockArea;
 	CFloatingDockContainer* FloatingWidget = nullptr;
 	QWidget* TabsContainerWidget;
 	QBoxLayout* TabsLayout;
 	int CurrentIndex = -1;
@@ -113,23 +112,24 @@ CDockAreaTabBar::CDockAreaTabBar(CDockAreaWidget* parent) :
 	d(new DockAreaTabBarPrivate(this))
 {
 	d->DockArea = parent;
-	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Ignored);
+	setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 	setFrameStyle(QFrame::NoFrame);
 	setWidgetResizable(true);
 	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	d->TabsContainerWidget = new QWidget();
 	d->TabsContainerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 	d->TabsContainerWidget->setObjectName("tabsContainerWidget");
 	setWidget(d->TabsContainerWidget);
 	d->TabsLayout = new QBoxLayout(QBoxLayout::LeftToRight);
 	d->TabsLayout->setContentsMargins(0, 0, 0, 0);
 	d->TabsLayout->setSpacing(0);
 	d->TabsLayout->addStretch(1);
 	d->TabsContainerWidget->setLayout(d->TabsLayout);
 	setWidget(d->TabsContainerWidget);
 }
 //============================================================================
 CDockAreaTabBar::~CDockAreaTabBar()
 {
@@ -153,108 +153,6 @@ void CDockAreaTabBar::wheelEvent(QWheelEvent* Event)
 }
 //============================================================================
 void CDockAreaTabBar::mousePressEvent(QMouseEvent* ev)
 {
 	if (ev->button() == Qt::LeftButton)
 	{
 		ev->accept();
 		d->DragStartMousePos = ev->pos();
 		return;
 	}
 	QScrollArea::mousePressEvent(ev);
 }
 //============================================================================
 void CDockAreaTabBar::mouseReleaseEvent(QMouseEvent* ev)
 {
 	if (ev->button() == Qt::LeftButton)
 	{
 		qDebug() << "CTabsScrollArea::mouseReleaseEvent";
 		ev->accept();
 		d->FloatingWidget = nullptr;
 		d->DragStartMousePos = QPoint();
 		return;
 	}
 	QScrollArea::mouseReleaseEvent(ev);
 }
 //============================================================================
 void CDockAreaTabBar::mouseMoveEvent(QMouseEvent* ev)
 {
 	QScrollArea::mouseMoveEvent(ev);
 	if (ev->buttons() != Qt::LeftButton)
 	{
 		return;
 	}
 	if (d->FloatingWidget)
 	{
 		d->FloatingWidget->moveFloating();
 		return;
 	}
 	// If this is the last dock area in a dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
 	if (d->DockArea->dockContainer()->isFloating()
 	 && d->DockArea->dockContainer()->visibleDockAreaCount() == 1)
 	{
 		return;
 	}
 	int DragDistance = (d->DragStartMousePos - ev->pos()).manhattanLength();
 	if (DragDistance >= CDockManager::startDragDistance())
 	{
 		qDebug() << "CTabsScrollArea::startFloating";
 		startFloating(d->DragStartMousePos);
 		auto Overlay = d->DockArea->dockManager()->containerOverlay();
 		Overlay->setAllowedAreas(OuterDockAreas);
 	}
 	return;
 }
 //============================================================================
 void CDockAreaTabBar::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	// If this is the last dock area in a dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
 	if (d->DockArea->dockContainer()->isFloating() && d->DockArea->dockContainer()->dockAreaCount() == 1)
 	{
 		return;
 	}
 	startFloating(event->pos());
 }
 //============================================================================
 CFloatingDockContainer* CDockAreaTabBar::makeAreaFloating(const QPoint& Pos)
 {
 	QSize Size = d->DockArea->size();
 	CFloatingDockContainer* FloatingWidget = new CFloatingDockContainer(d->DockArea);
 	FloatingWidget->startFloating(Pos, Size);
 	auto TopLevelDockWidget = FloatingWidget->topLevelDockWidget();
 	if (TopLevelDockWidget)
 	{
 		TopLevelDockWidget->emitTopLevelChanged(true);
 	}
 	return FloatingWidget;
 }
 //============================================================================
 void CDockAreaTabBar::startFloating(const QPoint& Pos)
 {
 	d->FloatingWidget = makeAreaFloating(Pos);
 }
 //============================================================================
 void CDockAreaTabBar::setCurrentIndex(int index)
 {
@@ -272,6 +170,7 @@ void CDockAreaTabBar::setCurrentIndex(int index)
    emit currentChanging(index);
 	d->CurrentIndex = index;
 	d->updateTabs();
 	updateGeometry();
 	emit currentChanged(index);
 }
@@ -292,12 +191,15 @@ void CDockAreaTabBar::insertTab(int Index, CDockWidgetTab* Tab)
 	connect(Tab, SIGNAL(closeRequested()), this, SLOT(onTabCloseRequested()));
 	connect(Tab, SIGNAL(closeOtherTabsRequested()), this, SLOT(onCloseOtherTabsRequested()));
 	connect(Tab, SIGNAL(moved(const QPoint&)), this, SLOT(onTabWidgetMoved(const QPoint&)));
 	connect(Tab, SIGNAL(elidedChanged(bool)), this, SIGNAL(elidedChanged(bool)));
 	Tab->installEventFilter(this);
 	emit tabInserted(Index);
-	if (Index <= d->CurrentIndex)
+	if (Index <= d->CurrentIndex || d->CurrentIndex == -1)
 	{
 		setCurrentIndex(d->CurrentIndex + 1);
 	}
 	updateGeometry();
 }
@@ -308,7 +210,7 @@ void CDockAreaTabBar::removeTab(CDockWidgetTab* Tab)
 	{
 		return;
 	}
-	qDebug() << "CDockAreaTabBar::removeTab ";
+    ADS_PRINT("CDockAreaTabBar::removeTab ");
 	int NewCurrentIndex = currentIndex();
 	int RemoveIndex = d->TabsLayout->indexOf(Tab);
 	if (count() == 1)
@@ -351,7 +253,7 @@ void CDockAreaTabBar::removeTab(CDockWidgetTab* Tab)
 	d->TabsLayout->removeWidget(Tab);
 	Tab->disconnect(this);
 	Tab->removeEventFilter(this);
-	qDebug() << "NewCurrentIndex " << NewCurrentIndex;
+    ADS_PRINT("NewCurrentIndex " << NewCurrentIndex);
 	if (NewCurrentIndex != d->CurrentIndex)
 	{
 		setCurrentIndex(NewCurrentIndex);
@@ -360,6 +262,8 @@ void CDockAreaTabBar::removeTab(CDockWidgetTab* Tab)
 	{
 		d->updateTabs();
 	}
 	updateGeometry();
 }
@@ -421,7 +325,20 @@ void CDockAreaTabBar::onCloseOtherTabsRequested()
 		auto Tab = tab(i);
 		if (Tab->isClosable() && !Tab->isHidden() && Tab != Sender)
 		{
 			// If the dock widget is deleted with the closeTab() call, its tab
 			// it will no longer be in the layout, and thus the index needs to
 			// be updated to not skip any tabs
 			int Offset = Tab->dockWidget()->features().testFlag(
 				CDockWidget::DockWidgetDeleteOnClose) ? 1 : 0;
 			closeTab(i);
 			// If the the dock widget blocks closing, i.e. if the flag
 			// CustomCloseHandling is set, and the dock widget is still open,
 			// then we do not need to correct the index
 			if (Tab->dockWidget()->isClosed())
 			{
 				i -= Offset;
 			}
 		}
 	}
 }
@@ -479,7 +396,7 @@ void CDockAreaTabBar::onTabWidgetMoved(const QPoint& GlobalPos)
 	{
 		if (MousePos.x() > tab(count() - 1)->geometry().right())
 		{
-			qDebug() << "after all tabs";
+            ADS_PRINT("after all tabs");
 			toIndex = count() - 1;
 		}
 		else
@@ -492,13 +409,12 @@ void CDockAreaTabBar::onTabWidgetMoved(const QPoint& GlobalPos)
 	d->TabsLayout->insertWidget(toIndex, MovingTab);
 	if (toIndex >= 0)
 	{
-		qDebug() << "tabMoved from " << fromIndex << " to " << toIndex;
+        ADS_PRINT("tabMoved from " << fromIndex << " to " << toIndex);
 		emit tabMoved(fromIndex, toIndex);
 		setCurrentIndex(toIndex);
 	}
 }
 //===========================================================================
 void CDockAreaTabBar::closeTab(int Index)
 {
@@ -513,7 +429,6 @@ void CDockAreaTabBar::closeTab(int Index)
 		return;
 	}
 	emit tabCloseRequested(Index);
 	Tab->hide();
 }
@@ -530,9 +445,15 @@ bool CDockAreaTabBar::eventFilter(QObject *watched, QEvent *event)
 	switch (event->type())
 	{
 	case QEvent::Hide:
-		 emit tabClosed(d->TabsLayout->indexOf(Tab)); break;
+		 emit tabClosed(d->TabsLayout->indexOf(Tab));
 		 updateGeometry();
 		 break;
 	case QEvent::Show:
-		 emit tabOpened(d->TabsLayout->indexOf(Tab)); break;
+		 emit tabOpened(d->TabsLayout->indexOf(Tab));
 		 updateGeometry();
 		 break;
 	default:
 		break;
 	}
@@ -552,7 +473,24 @@ bool CDockAreaTabBar::isTabOpen(int Index) const
 	return !tab(Index)->isHidden();
 }
 //===========================================================================
 QSize CDockAreaTabBar::minimumSizeHint() const
 {
 	QSize Size = sizeHint();
 	Size.setWidth(10);
 	return Size;
 }
 //===========================================================================
 QSize CDockAreaTabBar::sizeHint() const
 {
 	return d->TabsContainerWidget->sizeHint();
 }
 } // namespace ads
 //---------------------------------------------------------------------------
 // EOF DockAreaTabBar.cpp
--- a/src/DockAreaTabBar.h
+++ b/src/DockAreaTabBar.h
@@ -30,6 +30,7 @@
 //                                   INCLUDES
 //============================================================================
 #include <QScrollArea>
 #include "ads_globals.h"
 namespace ads
 {
@@ -38,18 +39,23 @@ class CDockWidgetTab;
 struct DockAreaTabBarPrivate;
 class CDockAreaTitleBar;
 class CFloatingDockContainer;
 class IFloatingWidget;
 /**
 * Custom tabbar implementation for tab area that is shown on top of a
 * dock area widget.
 * The tabbar displays the tab widgets of the contained dock widgets.
 * We cannot use QTabBar here because it does a lot of fancy animations
 * that will crash the application if a tab is removed while the animation
 * has not finished. And we need to remove a tab, if the user drags a
 * a dock widget out of a group of tabbed widgets
 */
-class CDockAreaTabBar : public QScrollArea
+class ADS_EXPORT CDockAreaTabBar : public QScrollArea
 {
 	Q_OBJECT
 private:
 	DockAreaTabBarPrivate* d; ///< private data (pimpl)
-	friend class DockAreaTabBarPrivate;
+	friend struct DockAreaTabBarPrivate;
 	friend class CDockAreaTitleBar;
 private slots:
@@ -60,40 +66,11 @@ private slots:
 protected:
 	virtual void wheelEvent(QWheelEvent* Event) override;
 	/**
 	 * Stores mouse position to detect dragging
 	 */
 	virtual void mousePressEvent(QMouseEvent* ev) override;
 	/**
 	 * Stores mouse position to detect dragging
 	 */
 	virtual void mouseReleaseEvent(QMouseEvent* ev) override;
 	/**
 	 * Starts floating the complete docking area including all dock widgets,
 	 * if it is not the last dock area in a floating widget
 	 */
 	virtual void mouseMoveEvent(QMouseEvent* ev) override;
 	/**
 	 * Double clicking the title bar also starts floating of the complete area
 	 */
 	virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
 	/**
 	 * Starts floating
 	 */
 	void startFloating(const QPoint& Pos);
 	/**
 	 * Makes the dock area loating
 	 */
 	CFloatingDockContainer* makeAreaFloating(const QPoint& Pos);
 public:
 	using Super = QScrollArea;
 	/**
 	 * Default Constructor
 	 */
@@ -148,6 +125,21 @@ public:
 	 */
 	bool isTabOpen(int Index) const;
 	/**
 	 * Overrides the minimumSizeHint() function of QScrollArea
 	 * The minimumSizeHint() is bigger than the sizeHint () for the scroll
 	 * area because even if the scrollbars are invisible, the required speace
 	 * is reserved in the minimumSizeHint(). This override simply returns
 	 * sizeHint();
 	 */
 	virtual QSize minimumSizeHint() const override;
 	/**
 	 * The function provides a sizeHint that matches the height of the
 	 * internal viewport.
 	 */
 	virtual QSize sizeHint() const override;
 public slots:
 	/**
 	 * This property sets the index of the tab bar's visible tab
@@ -211,6 +203,11 @@ signals:
 	 * This signal is emitted if a tab has been inserted
 	 */
 	void tabInserted(int index);
 	/**
 	 * This signal is emitted when a tab title elide state has been changed
 	 */
 	void elidedChanged(bool elided);
 }; // class CDockAreaTabBar
 } // namespace ads
 //-----------------------------------------------------------------------------
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -37,34 +37,46 @@
 #include <QScrollArea>
 #include <QMouseEvent>
 #include <QDebug>
 #include <QPointer>
 #include "ads_globals.h"
 #include "FloatingDockContainer.h"
 #include "FloatingDragPreview.h"
 #include "DockAreaWidget.h"
 #include "DockOverlay.h"
 #include "DockManager.h"
 #include "DockWidget.h"
 #include "DockWidgetTab.h"
 #include "DockAreaTabBar.h"
 #include "IconProvider.h"
 #include <iostream>
 namespace ads
 {
-using tTileBarButton = QToolButton;
+using tTitleBarButton = QToolButton;
 /**
 * Private data class of CDockAreaTitleBar class (pimpl)
 */
 struct DockAreaTitleBarPrivate
 {
 	CDockAreaTitleBar* _this;
-	tTileBarButton* TabsMenuButton;
+	QPointer<tTitleBarButton> TabsMenuButton;
-	tTileBarButton* UndockButton;
+	QPointer<tTitleBarButton> UndockButton;
-	tTileBarButton* CloseButton;
+	QPointer<tTitleBarButton> CloseButton;
-	QBoxLayout* TopLayout;
+	QBoxLayout* Layout;
 	CDockAreaWidget* DockArea;
 	CDockAreaTabBar* TabBar;
 	bool MenuOutdated = true;
 	QMenu* TabsMenu;
 	QList<tTitleBarButton*> DockWidgetActionsButtons;
 	QPoint DragStartMousePos;
 	eDragState DragState = DraggingInactive;
 	IFloatingWidget* FloatingWidget = nullptr;
 	/**
 	 * Private data constructor
@@ -92,13 +104,110 @@ struct DockAreaTitleBarPrivate
 	/**
 	 * Returns true if the given config flag is set
 	 */
-	bool testConfigFlag(CDockManager::eConfigFlag Flag) const
+	static bool testConfigFlag(CDockManager::eConfigFlag Flag)
 	{
-		return DockArea->dockManager()->configFlags().testFlag(Flag);
+		return CDockManager::configFlags().testFlag(Flag);
 	}
 	/**
 	 * Test function for current drag state
 	 */
 	bool isDraggingState(eDragState dragState) const
 	{
 		return this->DragState == dragState;
 	}
 	/**
 	 * Starts floating
 	 */
 	void startFloating(const QPoint& Offset);
 	/**
 	 * Makes the dock area floating
 	 */
 	IFloatingWidget* makeAreaFloating(const QPoint& Offset, eDragState DragState);
 };// struct DockAreaTitleBarPrivate
 /**
 * Title bar button of a dock area that customizes tTitleBarButton appearance/behaviour
 * according to various config flags such as:
 * CDockManager::DockAreaHas_xxx_Button - if set to 'false' keeps the button always invisible
 * CDockManager::DockAreaHideDisabledButtons - if set to 'true' hides button when it is disabled
 */
 class CTitleBarButton : public tTitleBarButton
 {
 	Q_OBJECT
 	bool Visible = true;
 	bool HideWhenDisabled = false;
 public:
 	using Super = tTitleBarButton;
 	CTitleBarButton(bool visible = true, QWidget* parent = nullptr)
 		: tTitleBarButton(parent),
 		  Visible(visible),
 		  HideWhenDisabled(DockAreaTitleBarPrivate::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
 	{}
 	/**
 	 * Adjust this visibility change request with our internal settings:
 	 */
 	virtual void setVisible(bool visible) override
 	{
 		// 'visible' can stay 'true' if and only if this button is configured to generaly visible:
 		visible = visible && this->Visible;
 		// 'visible' can stay 'true' unless: this button is configured to be invisible when it is disabled and it is currently disabled:
 		if(visible && HideWhenDisabled)
 		{
 			visible = isEnabled();
 		}
 		Super::setVisible(visible);
 	}
 protected:
 	/**
 	 * Handle EnabledChanged signal to set button invisible if the configured
 	 */
 	bool event(QEvent *ev) override
 	{
 		if(QEvent::EnabledChange == ev->type() && HideWhenDisabled)
 		{
 			// force setVisible() call 
 			// Calling setVisible() directly here doesn't work well when button is expected to be shown first time
 			QMetaObject::invokeMethod(this, "setVisible", Qt::QueuedConnection, Q_ARG(bool, isEnabled()));
 		}
 		return Super::event(ev);
 	}
 };
 /**
 * This spacer widget is here because of the following problem.
 * The dock area title bar handles mouse dragging and moving the floating widget.
 * The  problem is, that if the title bar becomes invisible, i.e. if the dock
 * area contains only one single dock widget and the dock area is moved
 * into a floating widget, then mouse events are not handled anymore and dragging
 * of the floating widget stops.
 */
 class CSpacerWidget : public QWidget
 {
 	Q_OBJECT
 public:
 	using Super = QWidget;
 	CSpacerWidget(QWidget* Parent = 0)
 	    : Super(Parent)
 	{
 	    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	    setStyleSheet("border: none; background: none;");
 	}
 	virtual QSize sizeHint() const override {return QSize(0, 0);}
 	virtual QSize minimumSizeHint() const override {return QSize(0, 0);}
 };
 //============================================================================
 DockAreaTitleBarPrivate::DockAreaTitleBarPrivate(CDockAreaTitleBar* _public) :
@@ -111,52 +220,52 @@ DockAreaTitleBarPrivate::DockAreaTitleBarPrivate(CDockAreaTitleBar* _public) :
 //============================================================================
 void DockAreaTitleBarPrivate::createButtons()
 {
-	TabsMenuButton = new tTileBarButton();
+	QSizePolicy ButtonSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	// Tabs menu button
 	TabsMenuButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasTabsMenuButton));
 	TabsMenuButton->setObjectName("tabsMenuButton");
 	TabsMenuButton->setAutoRaise(true);
 	TabsMenuButton->setPopupMode(QToolButton::InstantPopup);
-	TabsMenuButton->setIcon(_this->style()->standardIcon(QStyle::SP_TitleBarUnshadeButton));
+	internal::setButtonIcon(TabsMenuButton, QStyle::SP_TitleBarUnshadeButton, ads::DockAreaMenuIcon);
 	QMenu* TabsMenu = new QMenu(TabsMenuButton);
 #ifndef QT_NO_TOOLTIP
 	TabsMenu->setToolTipsVisible(true);
 #endif
 	_this->connect(TabsMenu, SIGNAL(aboutToShow()), SLOT(onTabsMenuAboutToShow()));
 	TabsMenuButton->setMenu(TabsMenu);
-	TabsMenuButton->setToolTip(QObject::tr("List all tabs"));
+	internal::setToolTip(TabsMenuButton, QObject::tr("List all tabs"));
-	TabsMenuButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+	TabsMenuButton->setSizePolicy(ButtonSizePolicy);
-	TopLayout->addWidget(TabsMenuButton, 0);
+	Layout->addWidget(TabsMenuButton, 0);
 	_this->connect(TabsMenuButton->menu(), SIGNAL(triggered(QAction*)),
 		SLOT(onTabsMenuActionTriggered(QAction*)));
 	// Undock button
-	UndockButton = new tTileBarButton();
+	UndockButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasUndockButton));
 	UndockButton->setObjectName("undockButton");
 	UndockButton->setAutoRaise(true);
-	UndockButton->setToolTip(QObject::tr("Detach Group"));
+	internal::setToolTip(UndockButton, QObject::tr("Detach Group"));
-	UndockButton->setIcon(_this->style()->standardIcon(QStyle::SP_TitleBarNormalButton));
+	internal::setButtonIcon(UndockButton, QStyle::SP_TitleBarNormalButton, ads::DockAreaUndockIcon);
-	UndockButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+	UndockButton->setSizePolicy(ButtonSizePolicy);
-	TopLayout->addWidget(UndockButton, 0);
+	Layout->addWidget(UndockButton, 0);
 	_this->connect(UndockButton, SIGNAL(clicked()), SLOT(onUndockButtonClicked()));
-	CloseButton = new tTileBarButton();
+	// Close button
 	CloseButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasCloseButton));
 	CloseButton->setObjectName("closeButton");
 	CloseButton->setAutoRaise(true);
-
+	internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, ads::DockAreaCloseIcon);
 	// The standard icons do not look good on high DPI screens
 	QIcon CloseIcon =  _this->style()->standardIcon(QStyle::SP_TitleBarCloseButton);
 	QPixmap normalPixmap = _this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton, 0, CloseButton);
 	QPixmap disabledPixmap = internal::createTransparentPixmap(normalPixmap, 0.25);
 	CloseIcon.addPixmap(disabledPixmap, QIcon::Disabled);
 	CloseButton->setIcon(CloseIcon);
 	if (testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
 	{
-		CloseButton->setToolTip(QObject::tr("Close Active Tab"));
+		internal::setToolTip(CloseButton, QObject::tr("Close Active Tab"));
 	}
 	else
 	{
-		CloseButton->setToolTip(QObject::tr("Close Group"));
+		internal::setToolTip(CloseButton, QObject::tr("Close Group"));
 	}
-	CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+	CloseButton->setSizePolicy(ButtonSizePolicy);
-	TopLayout->addWidget(CloseButton, 0);
+	CloseButton->setIconSize(QSize(16, 16));
 	Layout->addWidget(CloseButton, 0);
 	_this->connect(CloseButton, SIGNAL(clicked()), SLOT(onCloseButtonClicked()));
 }
@@ -165,7 +274,8 @@ void DockAreaTitleBarPrivate::createButtons()
 void DockAreaTitleBarPrivate::createTabBar()
 {
 	TabBar = new CDockAreaTabBar(DockArea);
-	TopLayout->addWidget(TabBar);
+    TabBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
 	Layout->addWidget(TabBar);
 	_this->connect(TabBar, SIGNAL(tabClosed(int)), SLOT(markTabsMenuOutdated()));
 	_this->connect(TabBar, SIGNAL(tabOpened(int)), SLOT(markTabsMenuOutdated()));
 	_this->connect(TabBar, SIGNAL(tabInserted(int)), SLOT(markTabsMenuOutdated()));
@@ -173,6 +283,51 @@ void DockAreaTitleBarPrivate::createTabBar()
 	_this->connect(TabBar, SIGNAL(tabMoved(int, int)), SLOT(markTabsMenuOutdated()));
 	_this->connect(TabBar, SIGNAL(currentChanged(int)), SLOT(onCurrentTabChanged(int)));
 	_this->connect(TabBar, SIGNAL(tabBarClicked(int)), SIGNAL(tabBarClicked(int)));
 	_this->connect(TabBar, SIGNAL(elidedChanged(bool)), SLOT(markTabsMenuOutdated()));
 }
 //============================================================================
 IFloatingWidget* DockAreaTitleBarPrivate::makeAreaFloating(const QPoint& Offset, eDragState DragState)
 {
 	QSize Size = DockArea->size();
 	this->DragState = DragState;
 	bool OpaqueUndocking = CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking) ||
 		(DraggingFloatingWidget != DragState);
 	CFloatingDockContainer* FloatingDockContainer = nullptr;
 	IFloatingWidget* FloatingWidget;
 	if (OpaqueUndocking)
 	{
 		FloatingWidget = FloatingDockContainer = new CFloatingDockContainer(DockArea);
 	}
 	else
 	{
 		auto w = new CFloatingDragPreview(DockArea);
 		QObject::connect(w, &CFloatingDragPreview::draggingCanceled, [=]()
 		{
 			this->DragState = DraggingInactive;
 		});
 		FloatingWidget = w;
 	}
    FloatingWidget->startFloating(Offset, Size, DragState, nullptr);
    if (FloatingDockContainer)
    {
 		auto TopLevelDockWidget = FloatingDockContainer->topLevelDockWidget();
 		if (TopLevelDockWidget)
 		{
 			TopLevelDockWidget->emitTopLevelChanged(true);
 		}
    }
 	return FloatingWidget;
 }
 //============================================================================
 void DockAreaTitleBarPrivate::startFloating(const QPoint& Offset)
 {
 	FloatingWidget = makeAreaFloating(Offset, DraggingFloatingWidget);
 }
@@ -184,21 +339,35 @@ CDockAreaTitleBar::CDockAreaTitleBar(CDockAreaWidget* parent) :
 	d->DockArea = parent;
 	setObjectName("dockAreaTitleBar");
-	d->TopLayout = new QBoxLayout(QBoxLayout::LeftToRight);
+	d->Layout = new QBoxLayout(QBoxLayout::LeftToRight);
-	d->TopLayout->setContentsMargins(0, 0, 0, 0);
+	d->Layout->setContentsMargins(0, 0, 0, 0);
-	d->TopLayout->setSpacing(0);
+	d->Layout->setSpacing(0);
-	setLayout(d->TopLayout);
+	setLayout(d->Layout);
-	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+	setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	d->createTabBar();
 	d->Layout->addWidget(new CSpacerWidget(this));
 	d->createButtons();
 }
 //============================================================================
 CDockAreaTitleBar::~CDockAreaTitleBar()
 {
 	if (!d->CloseButton.isNull())
 	{
 		delete d->CloseButton;
 	}
 	if (!d->TabsMenuButton.isNull())
 	{
 		delete d->TabsMenuButton;
 	}
 	if (!d->UndockButton.isNull())
 	{
 		delete d->UndockButton;
 	}
 	delete d;
 }
@@ -209,14 +378,31 @@ CDockAreaTabBar* CDockAreaTitleBar::tabBar() const
 	return d->TabBar;
 }
 //============================================================================
 void CDockAreaTitleBar::markTabsMenuOutdated()
 {
 	if(DockAreaTitleBarPrivate::testConfigFlag(CDockManager::DockAreaDynamicTabsMenuButtonVisibility))
 	{
 		bool hasElidedTabTitle = false;
 		for (int i = 0; i < d->TabBar->count(); ++i)
 		{
 			if (!d->TabBar->isTabOpen(i))
 			{
 				continue;
 			}
 			CDockWidgetTab* Tab = d->TabBar->tab(i);
 			if(Tab->isTitleElided())
 			{
 				hasElidedTabTitle = true;
 				break;
 			}
 		}
 		bool visible = (hasElidedTabTitle && (d->TabBar->count() > 1));
 		QMetaObject::invokeMethod(d->TabsMenuButton, "setVisible", Qt::QueuedConnection, Q_ARG(bool, visible));
 	}
 	d->MenuOutdated = true;
 }
 //============================================================================
 void CDockAreaTitleBar::onTabsMenuAboutToShow()
 {
@@ -235,6 +421,7 @@ void CDockAreaTitleBar::onTabsMenuAboutToShow()
 		}
 		auto Tab = d->TabBar->tab(i);
 		QAction* Action = menu->addAction(Tab->icon(), Tab->text());
 		internal::setToolTip(Action, Tab->toolTip());
 		Action->setData(i);
 	}
@@ -245,7 +432,7 @@ void CDockAreaTitleBar::onTabsMenuAboutToShow()
 //============================================================================
 void CDockAreaTitleBar::onCloseButtonClicked()
 {
-	qDebug() << "CDockAreaTitleBar::onCloseButtonClicked";
+    ADS_PRINT("CDockAreaTitleBar::onCloseButtonClicked");
 	if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
 	{
 		d->TabBar->closeTab(d->TabBar->currentIndex());
@@ -260,7 +447,10 @@ void CDockAreaTitleBar::onCloseButtonClicked()
 //============================================================================
 void CDockAreaTitleBar::onUndockButtonClicked()
 {
-	d->TabBar->makeAreaFloating(mapFromGlobal(QCursor::pos()));
+	if (d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
 		d->makeAreaFloating(mapFromGlobal(QCursor::pos()), DraggingInactive);
 	}
 }
@@ -273,6 +463,40 @@ void CDockAreaTitleBar::onTabsMenuActionTriggered(QAction* Action)
 }
 //============================================================================
 void CDockAreaTitleBar::updateDockWidgetActionsButtons()
 {
 	CDockWidget* DockWidget = d->TabBar->currentTab()->dockWidget();
 	if (!d->DockWidgetActionsButtons.isEmpty())
 	{
 		for (auto Button : d->DockWidgetActionsButtons)
 		{
 			d->Layout->removeWidget(Button);
 			delete Button;
 		}
 		d->DockWidgetActionsButtons.clear();
 	}
 	auto Actions = DockWidget->titleBarActions();
 	if (Actions.isEmpty())
 	{
 		return;
 	}
 	int InsertIndex = indexOf(d->TabsMenuButton);
 	for (auto Action : Actions)
 	{
 		auto Button = new CTitleBarButton(true, this);
 		Button->setDefaultAction(Action);
 		Button->setAutoRaise(true);
 		Button->setPopupMode(QToolButton::InstantPopup);
 		Button->setObjectName(Action->objectName());
 		d->Layout->insertWidget(InsertIndex++, Button, 0);
 		d->DockWidgetActionsButtons.append(Button);
 	}
 }
 //============================================================================
 void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 {
@@ -286,6 +510,8 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 		CDockWidget* DockWidget = d->TabBar->tab(Index)->dockWidget();
 		d->CloseButton->setEnabled(DockWidget->features().testFlag(CDockWidget::DockWidgetClosable));
 	}
 	updateDockWidgetActionsButtons();
 }
@@ -307,10 +533,146 @@ QAbstractButton* CDockAreaTitleBar::button(TitleBarButton which) const
 void CDockAreaTitleBar::setVisible(bool Visible)
 {
 	Super::setVisible(Visible);
 	markTabsMenuOutdated();
 }
 //============================================================================
 void CDockAreaTitleBar::mousePressEvent(QMouseEvent* ev)
 {
 	if (ev->button() == Qt::LeftButton)
 	{
 		ev->accept();
 		d->DragStartMousePos = ev->pos();
 		d->DragState = DraggingMousePressed;
 		return;
 	}
 	Super::mousePressEvent(ev);
 }
 //============================================================================
 void CDockAreaTitleBar::mouseReleaseEvent(QMouseEvent* ev)
 {
 	if (ev->button() == Qt::LeftButton)
 	{
        ADS_PRINT("CDockAreaTitleBar::mouseReleaseEvent");
 		ev->accept();
 		auto CurrentDragState = d->DragState;
 		d->DragStartMousePos = QPoint();
 		d->DragState = DraggingInactive;
 		if (DraggingFloatingWidget == CurrentDragState)
 		{
 			d->FloatingWidget->finishDragging();
 		}
 		return;
 	}
 	Super::mouseReleaseEvent(ev);
 }
 //============================================================================
 void CDockAreaTitleBar::mouseMoveEvent(QMouseEvent* ev)
 {
 	Super::mouseMoveEvent(ev);
 	if (!(ev->buttons() & Qt::LeftButton) || d->isDraggingState(DraggingInactive))
 	{
 		d->DragState = DraggingInactive;
 		return;
 	}
    // move floating window
    if (d->isDraggingState(DraggingFloatingWidget))
    {
        d->FloatingWidget->moveFloating();
        return;
    }
 	// If this is the last dock area in a dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
 	if (d->DockArea->dockContainer()->isFloating()
 	 && d->DockArea->dockContainer()->visibleDockAreaCount() == 1)
 	{
 		return;
 	}
 	// If one single dock widget in this area is not floatable then the whole
 	// area is not floatable
 	if (!d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
 		return;
 	}
 	int DragDistance = (d->DragStartMousePos - ev->pos()).manhattanLength();
 	if (DragDistance >= CDockManager::startDragDistance())
 	{
        ADS_PRINT("CTabsScrollArea::startFloating");
 		d->startFloating(d->DragStartMousePos);
 		auto Overlay = d->DockArea->dockManager()->containerOverlay();
 		Overlay->setAllowedAreas(OuterDockAreas);
 	}
 	return;
 }
 //============================================================================
 void CDockAreaTitleBar::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	// If this is the last dock area in a dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
 	if (d->DockArea->dockContainer()->isFloating() && d->DockArea->dockContainer()->dockAreaCount() == 1)
 	{
 		return;
 	}
 	if (!d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
 		return;
 	}
 	d->makeAreaFloating(event->pos(), DraggingInactive);
 }
 //============================================================================
 void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev)
 {
 	ev->accept();
 	if (d->isDraggingState(DraggingFloatingWidget))
 	{
 		return;
 	}
 	QMenu Menu(this);
 	auto Action = Menu.addAction(tr("Detach Area"), this, SLOT(onUndockButtonClicked()));
 	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable));
 	Menu.addSeparator();
 	Action = Menu.addAction(tr("Close Area"), this, SLOT(onCloseButtonClicked()));
 	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetClosable));
 	Menu.addAction(tr("Close Other Areas"), d->DockArea, SLOT(closeOtherAreas()));
 	Menu.exec(ev->globalPos());
 }
 //============================================================================
 void CDockAreaTitleBar::insertWidget(int index, QWidget *widget)
 {
 	d->Layout->insertWidget(index, widget);
 }
 //============================================================================
 int CDockAreaTitleBar::indexOf(QWidget *widget) const
 {
 	return d->Layout->indexOf(widget);
 }
 } // namespace ads
 #include "DockAreaTitleBar.moc"
 //---------------------------------------------------------------------------
 // EOF DockAreaTitleBar.cpp
--- a/src/DockAreaTitleBar.h
+++ b/src/DockAreaTitleBar.h
@@ -43,25 +43,62 @@ class CDockAreaWidget;
 struct DockAreaTitleBarPrivate;
 /**
- * Title bar of a dock area
+ * Title bar of a dock area.
 * The title bar contains a tabbar with all tabs for a dock widget group and
 * with a tabs menu button, a undock button and a close button.
 */
-class CDockAreaTitleBar : public QFrame
+class ADS_EXPORT CDockAreaTitleBar : public QFrame
 {
 	Q_OBJECT
 private:
 	DockAreaTitleBarPrivate* d; ///< private data (pimpl)
-	friend class DockAreaTitleBarPrivate;
+	friend struct DockAreaTitleBarPrivate;
 private slots:
 	void markTabsMenuOutdated();
 	void onTabsMenuAboutToShow();
 	void onCloseButtonClicked();
 	void onUndockButtonClicked();
 	void onTabsMenuActionTriggered(QAction* Action);
 	void onCurrentTabChanged(int Index);
 protected:
 		/**
 	 * Stores mouse position to detect dragging
 	 */
 	virtual void mousePressEvent(QMouseEvent* ev) override;
 	/**
 	 * Stores mouse position to detect dragging
 	 */
 	virtual void mouseReleaseEvent(QMouseEvent* ev) override;
 	/**
 	 * Starts floating the complete docking area including all dock widgets,
 	 * if it is not the last dock area in a floating widget
 	 */
 	virtual void mouseMoveEvent(QMouseEvent* ev) override;
 	/**
 	 * Double clicking the title bar also starts floating of the complete area
 	 */
 	virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
 	/**
 	 * Show context menu
 	 */
 	virtual void contextMenuEvent(QContextMenuEvent *event);
 public slots:
 	/**
 	 * Call this slot to tell the title bar that it should update the tabs menu
 	 * the next time it is shown.
 	 */
 	void markTabsMenuOutdated();
 public:
 	using Super = QFrame;
 	/**
 	 * Default Constructor
 	 */
@@ -83,10 +120,34 @@ public:
 	QAbstractButton* button(TitleBarButton which) const;
 	/**
-	 * This function is here for debug reasons
+	 * Updates the visibility of the dock widget actions in the title bar
 	 */
 	void updateDockWidgetActionsButtons();
 	/**
 	 * Marks the tabs menu outdated before it calls its base class
 	 * implementation
 	 */
 	virtual void setVisible(bool Visible) override;
 	/**
 	 * Inserts a custom widget at position index into this title bar.
 	 * If index is negative, the widget is added at the end.
 	 * You can use this function to insert custom widgets into the title bar.
 	 */
 	void insertWidget(int index, QWidget *widget);
 	/**
 	 * Searches for widget widget in this title bar.
 	 * You can use this function, to get the position of the default
 	 * widget in the tile bar.
 	 * \code
 	 * int tabBarIndex = TitleBar->indexOf(TitleBar->tabBar());
 	 * int closeButtonIndex = TitleBar->indexOf(TitleBar->button(TitleBarButtonClose));
 	 * \endcode
 	 */
 	int indexOf(QWidget *widget) const;
 signals:
 	/**
 	 * This signal is emitted if a tab in the tab bar is clicked by the user
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1,17 +1,17 @@
 /*******************************************************************************
 ** Qt Advanced Docking System
 ** Copyright (C) 2017 Uwe Kindler
-** 
+**
 ** This library is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU Lesser General Public
 ** License as published by the Free Software Foundation; either
 ** version 2.1 of the License, or (at your option) any later version.
-** 
+**
 ** This library is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ** Lesser General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU Lesser General Public
 ** License along with this library; If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
@@ -28,7 +28,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <DockWidgetTab.h>
+#include "DockWidgetTab.h"
 #include "DockAreaWidget.h"
 #include <QStackedLayout>
@@ -61,13 +61,13 @@ namespace ads
 {
 static const char* const INDEX_PROPERTY = "index";
 static const char* const ACTION_PROPERTY = "action";
 static const char* const DOCKWIDGET_PROPERTY = "dockwidget";
 static const int APPEND = -1;
 /**
- * New dock area layout mimics stack layout but only inserts the current
+ * Internal dock area layout mimics stack layout but only inserts the current
- * widget into the internal QLayout object
+ * widget into the internal QLayout object.
 * \warning Only the current widget has a parent. All other widgets
 * do not have a parent. That means, a widget that is in this layout may
 * return nullptr for its parent() function if it is not the current widget.
 */
 class CDockAreaLayout
 {
@@ -101,7 +101,7 @@ public:
 	 */
 	void insertWidget(int index, QWidget* Widget)
 	{
-		Widget->setParent(0);
+		Widget->setParent(nullptr);
 		if (index < 0)
 		{
 			index = m_Widgets.count();
@@ -121,7 +121,7 @@ public:
 	}
 	/**
-	 * Removes the given widget from the lyout
+	 * Removes the given widget from the layout
 	 */
 	void removeWidget(QWidget* Widget)
 	{
@@ -130,7 +130,7 @@ public:
 			auto LayoutItem = m_ParentLayout->takeAt(1);
 			if (LayoutItem)
 			{
-				LayoutItem->widget()->setParent(0);
+				LayoutItem->widget()->setParent(nullptr);
 			}
 			m_CurrentWidget = nullptr;
 			m_CurrentIndex = -1;
@@ -170,7 +170,7 @@ public:
 		auto LayoutItem = m_ParentLayout->takeAt(1);
 		if (LayoutItem)
 		{
-			LayoutItem->widget()->setParent(0);
+			LayoutItem->widget()->setParent(nullptr);
 		}
 		m_ParentLayout->addWidget(next);
@@ -239,12 +239,13 @@ using DockAreaLayout = CDockAreaLayout;
 */
 struct DockAreaWidgetPrivate
 {
-	CDockAreaWidget* _this;
+	CDockAreaWidget*	_this			= nullptr;
-	QBoxLayout* Layout;
+	QBoxLayout*			Layout			= nullptr;
-	DockAreaLayout* ContentsLayout;
+	DockAreaLayout*		ContentsLayout	= nullptr;
-	CDockAreaTitleBar* TitleBar;
+	CDockAreaTitleBar*	TitleBar		= nullptr;
-	CDockManager* DockManager = nullptr;
+	CDockManager*		DockManager		= nullptr;
-	bool UpdateCloseButton = false;
+	bool UpdateTitleBarButtons = false;
 	DockWidgetAreas		AllowedAreas	= AllDockAreas;
 	/**
 	 * Private data constructor
@@ -298,9 +299,9 @@ struct DockAreaWidgetPrivate
 	}
 	/**
-	 * Udpates the enable state of the close button
+	 * Udpates the enable state of the close and detach button
 	 */
-	void updateCloseButtonState();
+	void updateTitleBarButtonStates();
 };
 // struct DockAreaWidgetPrivate
@@ -318,27 +319,27 @@ void DockAreaWidgetPrivate::createTitleBar()
 {
 	TitleBar = new CDockAreaTitleBar(_this);
 	Layout->addWidget(TitleBar);
-	_this->connect(tabBar(), SIGNAL(tabCloseRequested(int)),
+	QObject::connect(tabBar(), &CDockAreaTabBar::tabCloseRequested, _this, &CDockAreaWidget::onTabCloseRequested);
-		SLOT(onTabCloseRequested(int)));
+	QObject::connect(TitleBar, &CDockAreaTitleBar::tabBarClicked, _this, &CDockAreaWidget::setCurrentIndex);
-	_this->connect(TitleBar, SIGNAL(tabBarClicked(int)),
+	QObject::connect(tabBar(), &CDockAreaTabBar::tabMoved, _this, &CDockAreaWidget::reorderDockWidget);
 		SLOT(setCurrentIndex(int)));
 	_this->connect(tabBar(), SIGNAL(tabMoved(int, int)),
 		SLOT(reorderDockWidget(int, int)));
 }
 //============================================================================
-void DockAreaWidgetPrivate::updateCloseButtonState()
+void DockAreaWidgetPrivate::updateTitleBarButtonStates()
 {
 	if (_this->isHidden())
 	{
-		UpdateCloseButton = true;
+		UpdateTitleBarButtons = true;
 		return;
 	}
 	TitleBar->button(TitleBarButtonClose)->setEnabled(
 		_this->features().testFlag(CDockWidget::DockWidgetClosable));
-	UpdateCloseButton = false;
+	TitleBar->button(TitleBarButtonUndock)->setEnabled(
 		_this->features().testFlag(CDockWidget::DockWidgetFloatable));
 	TitleBar->updateDockWidgetActionsButtons();
 	UpdateTitleBarButtons = false;
 }
@@ -355,12 +356,16 @@ CDockAreaWidget::CDockAreaWidget(CDockManager* DockManager, CDockContainerWidget
 	d->createTitleBar();
 	d->ContentsLayout = new DockAreaLayout(d->Layout);
 	if (d->DockManager)
 	{
 		emit d->DockManager->dockAreaCreated(this);
 	}
 }
 //============================================================================
 CDockAreaWidget::~CDockAreaWidget()
 {
-	qDebug() << "~CDockAreaWidget()";
+    ADS_PRINT("~CDockAreaWidget()");
 	delete d->ContentsLayout;
 	delete d;
 }
@@ -406,28 +411,29 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 		setCurrentIndex(index);
 	}
 	DockWidget->setDockArea(this);
-	d->updateCloseButtonState();
+	d->updateTitleBarButtonStates();
 }
 //============================================================================
 void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 {
-	qDebug() << "CDockAreaWidget::removeDockWidget";
+    ADS_PRINT("CDockAreaWidget::removeDockWidget");
 	auto NextOpenDockWidget = nextOpenDockWidget(DockWidget);
 	d->ContentsLayout->removeWidget(DockWidget);
 	auto TabWidget = DockWidget->tabWidget();
 	TabWidget->hide();
 	d->tabBar()->removeTab(TabWidget);
 	CDockContainerWidget* DockContainer = dockContainer();
 	if (NextOpenDockWidget)
 	{
 		setCurrentDockWidget(NextOpenDockWidget);
 	}
-	else if (d->ContentsLayout->isEmpty())
+	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() > 1)
 	{
-		qDebug() << "Dock Area empty";
+        ADS_PRINT("Dock Area empty");
-		dockContainer()->removeDockArea(this);
+		DockContainer->removeDockArea(this);
 		this->deleteLater();
 	}
 	else
@@ -438,16 +444,15 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 		hideAreaWithNoVisibleContent();
 	}
-	d->updateCloseButtonState();
+	d->updateTitleBarButtonStates();
 	updateTitleBarVisibility();
-	auto TopLevelDockWidget = dockContainer()->topLevelDockWidget();
+	auto TopLevelDockWidget = DockContainer->topLevelDockWidget();
 	if (TopLevelDockWidget)
 	{
 		TopLevelDockWidget->emitTopLevelChanged(true);
 	}
 #if (ADS_DEBUG_LEVEL > 0)
 	CDockContainerWidget* DockContainer = dockContainer();
 	DockContainer->dumpLayout();
 #endif
 }
@@ -487,8 +492,17 @@ void CDockAreaWidget::hideAreaWithNoVisibleContent()
 //============================================================================
 void CDockAreaWidget::onTabCloseRequested(int Index)
 {
-	qDebug() << "CDockAreaWidget::onTabCloseRequested " << Index;
+    ADS_PRINT("CDockAreaWidget::onTabCloseRequested " << Index);
-	dockWidget(Index)->toggleView(false);
+    auto* DockWidget = dockWidget(Index);
    if (DockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
    {
    	//DockWidget->deleteDockWidget();
    	DockWidget->closeDockWidgetInternal();
    }
    else
    {
    	DockWidget->toggleView(false);
    }
 }
@@ -540,6 +554,13 @@ void CDockAreaWidget::setCurrentIndex(int index)
 		return;
    }
 	auto cw = d->ContentsLayout->currentWidget();
 	auto nw = d->ContentsLayout->widget(index);
 	if (cw == nw && !nw->isHidden())
 	{
 		return;
 	}
    emit currentChanging(index);
    TabBar->setCurrentIndex(index);
 	d->ContentsLayout->setCurrentIndex(index);
@@ -650,11 +671,11 @@ CDockWidget* CDockAreaWidget::dockWidget(int Index) const
 //============================================================================
 void CDockAreaWidget::reorderDockWidget(int fromIndex, int toIndex)
 {
-	qDebug() << "CDockAreaWidget::reorderDockWidget";
+    ADS_PRINT("CDockAreaWidget::reorderDockWidget");
 	if (fromIndex >= d->ContentsLayout->count() || fromIndex < 0
     || toIndex >= d->ContentsLayout->count() || toIndex < 0 || fromIndex == toIndex)
 	{
-		qDebug() << "Invalid index for tab movement" << fromIndex << toIndex;
+        ADS_PRINT("Invalid index for tab movement" << fromIndex << toIndex);
 		return;
 	}
@@ -683,10 +704,29 @@ void CDockAreaWidget::updateTitleBarVisibility()
 		return;
 	}
-	d->TitleBar->setVisible(!Container->isFloating() || !Container->hasTopLevelDockWidget());
+    if (CDockManager::configFlags().testFlag(CDockManager::AlwaysShowTabs))
    {
        return;
    }
 	if (d->TitleBar)
 	{
 		d->TitleBar->setVisible(!Container->isFloating() || !Container->hasTopLevelDockWidget());
 	}
 }
 //============================================================================
 void CDockAreaWidget::markTitleBarMenuOutdated()
 {
 	if (d->TitleBar)
 	{
 		d->TitleBar->markTabsMenuOutdated();
 	}
 }
 //============================================================================
 void CDockAreaWidget::saveState(QXmlStreamWriter& s) const
 {
@@ -695,8 +735,8 @@ void CDockAreaWidget::saveState(QXmlStreamWriter& s) const
 	auto CurrentDockWidget = currentDockWidget();
 	QString Name = CurrentDockWidget ? CurrentDockWidget->objectName() : "";
 	s.writeAttribute("Current", Name);
-	qDebug() << "CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
+    ADS_PRINT("CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
-			<< " Current: " << Name;
+            << " Current: " << Name);
 	for (int i = 0; i < d->ContentsLayout->count(); ++i)
 	{
 		dockWidget(i)->saveState(s);
@@ -732,15 +772,26 @@ CDockWidget* CDockAreaWidget::nextOpenDockWidget(CDockWidget* DockWidget) const
 //============================================================================
-CDockWidget::DockWidgetFeatures CDockAreaWidget::features() const
+CDockWidget::DockWidgetFeatures CDockAreaWidget::features(eBitwiseOperator Mode) const
 {
-	CDockWidget::DockWidgetFeatures Features(CDockWidget::AllDockWidgetFeatures);
+	if (BitwiseAnd == Mode)
 	for (const auto DockWidget : dockWidgets())
 	{
-		Features &= DockWidget->features();
+		CDockWidget::DockWidgetFeatures Features(CDockWidget::AllDockWidgetFeatures);
 		for (const auto DockWidget : dockWidgets())
 		{
 			Features &= DockWidget->features();
 		}
 		return Features;
 	}
 	else
 	{
 		CDockWidget::DockWidgetFeatures Features(CDockWidget::NoDockWidgetFeatures);
 		for (const auto DockWidget : dockWidgets())
 		{
 			Features |= DockWidget->features();
 		}
 		return Features;
 	}
 	return Features;
 }
@@ -757,12 +808,21 @@ void CDockAreaWidget::toggleView(bool Open)
 void CDockAreaWidget::setVisible(bool Visible)
 {
 	Super::setVisible(Visible);
-	if (d->UpdateCloseButton)
+	if (d->UpdateTitleBarButtons)
 	{
-		d->updateCloseButtonState();
+		d->updateTitleBarButtonStates();
 	}
 }
 void CDockAreaWidget::setAllowedAreas(DockWidgetAreas areas)
 {
 	d->AllowedAreas = areas;
 }
 DockWidgetAreas CDockAreaWidget::allowedAreas() const
 {
 	return d->AllowedAreas;
 }
 //============================================================================
 QAbstractButton* CDockAreaWidget::titleBarButton(TitleBarButton which) const
@@ -774,10 +834,34 @@ QAbstractButton* CDockAreaWidget::titleBarButton(TitleBarButton which) const
 //============================================================================
 void CDockAreaWidget::closeArea()
 {
-	for (auto DockWidget : openedDockWidgets())
+	// If there is only one single dock widget and this widget has the
 	// DeleteOnClose feature, then we delete the dock widget now
 	auto OpenDockWidgets = openedDockWidgets();
 	if (OpenDockWidgets.count() == 1 && OpenDockWidgets[0]->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
 	{
-		DockWidget->toggleView(false);
+		OpenDockWidgets[0]->closeDockWidgetInternal();
 	}
 	else
 	{
 		for (auto DockWidget : openedDockWidgets())
 		{
 			DockWidget->toggleView(false);
 		}
 	}
 }
 //============================================================================
 void CDockAreaWidget::closeOtherAreas()
 {
 	dockContainer()->closeOtherAreas(this);
 }
 //============================================================================
 CDockAreaTitleBar* CDockAreaWidget::titleBar() const
 {
 	return d->TitleBar;
 }
 } // namespace ads
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -43,7 +43,8 @@ namespace ads
 struct DockAreaWidgetPrivate;
 class CDockManager;
 class CDockContainerWidget;
-struct DockContainerWidgetPrivate;
+class DockContainerWidgetPrivate;
 class CDockAreaTitleBar;
 /**
@@ -58,11 +59,12 @@ private:
 	DockAreaWidgetPrivate* d; ///< private data (pimpl)
 	friend struct DockAreaWidgetPrivate;
 	friend class CDockContainerWidget;
-	friend struct DockContainerWidgetPrivate;
+	friend class DockContainerWidgetPrivate;
 	friend class CDockWidgetTab;
 	friend struct DockWidgetPrivate;
 	friend class CDockWidget;
 	friend struct DockManagerPrivate;
 	friend class CDockManager;
 private slots:
 	void onTabCloseRequested(int Index);
@@ -130,6 +132,11 @@ protected:
 	 */
 	void internalSetCurrentDockWidget(CDockWidget* DockWidget);
 	/**
 	 * Marks tabs menu to update
 	 */
 	void markTitleBarMenuOutdated();
 protected slots:
 	void toggleView(bool Open);
@@ -179,12 +186,12 @@ public:
 	QList<CDockWidget*> dockWidgets() const;
 	/**
-	 * Returns the number of dock widgets in this area
+	 * Returns the number of open dock widgets in this area
 	 */
 	int openDockWidgetsCount() const;
 	/**
-	 * Returns a list of dock widgets that are not closed
+	 * Returns a list of dock widgets that are not closed.
 	 */
 	QList<CDockWidget*> openedDockWidgets() const;
@@ -230,10 +237,12 @@ public:
 	 * This functions returns the dock widget features of all dock widget in
 	 * this area.
 	 * A bitwise and is used to combine the flags of all dock widgets. That
-	 * means, if only dock widget does not support a certain flag, the whole
+	 * means, if only one single dock widget does not support a certain flag,
-	 * dock are does not support the flag.
+	 * the whole dock are does not support the flag. I.e. if one single
 	 * dock widget in this area is not closable, the whole dock are is not
 	 * closable.
 	 */
-	CDockWidget::DockWidgetFeatures features() const;
+	CDockWidget::DockWidgetFeatures features(eBitwiseOperator Mode = BitwiseAnd) const;
 	/**
 	 * Returns the title bar button corresponding to the given title bar
@@ -246,6 +255,21 @@ public:
 	 */
 	virtual void setVisible(bool Visible) override;
 	/**
 	 * Configures the areas of this particular dock area that are allowed for docking
 	 */
 	void setAllowedAreas(DockWidgetAreas areas);
 	/**
 	 * Returns flags with all allowed drop areas of this particular dock area
 	 */
 	DockWidgetAreas allowedAreas() const;
 	/**
 	 * Returns the title bar of this dock area
 	 */
 	CDockAreaTitleBar* titleBar() const;
 public slots:
 	/**
 	 * This activates the tab for the given tab index.
@@ -259,6 +283,11 @@ public slots:
 	 */
 	void closeArea();
 	/**
 	 * This function closes all other areas except of this area
 	 */
 	void closeOtherAreas();
 signals:
 	/**
 	 * This signal is emitted when user clicks on a tab at an index.
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -36,7 +36,7 @@
 #include "DockWidget.h"
 class QXmlStreamWriter;
-class QXmlStreamReader;
+
 namespace ads
 {
@@ -47,17 +47,23 @@ class CDockManager;
 struct DockManagerPrivate;
 class CFloatingDockContainer;
 struct FloatingDockContainerPrivate;
 class CFloatingDragPreview;
 struct FloatingDragPreviewPrivate;
 class CDockingStateReader;
 /**
 * Container that manages a number of dock areas with single dock widgets
- * or tabyfied dock widgets in each area
+ * or tabyfied dock widgets in each area.
 * Each window that support docking has a DockContainerWidget. That means
 * the main application window and all floating windows are ore contain
 * an DockContainerWidget.
 */
 class ADS_EXPORT CDockContainerWidget : public QFrame
 {
 	Q_OBJECT
 private:
 	DockContainerWidgetPrivate* d; ///< private data (pimpl)
-	friend struct DockContainerWidgetPrivate;
+    friend class DockContainerWidgetPrivate;
 	friend class CDockManager;
 	friend struct DockManagerPrivate;
 	friend class CDockAreaWidget;
@@ -65,7 +71,8 @@ private:
 	friend class CFloatingDockContainer;
 	friend struct FloatingDockContainerPrivate;
 	friend class CDockWidget;
-	Q_PRIVATE_SLOT(d, void onDockAreaViewToggled(bool Visible))
+	friend class CFloatingDragPreview;
 	friend struct FloatingDragPreviewPrivate;
 protected:
 	/**
@@ -88,6 +95,11 @@ protected:
 	 */
 	void dropFloatingWidget(CFloatingDockContainer* FloatingWidget, const QPoint& TargetPos);
 	/**
 	 * Drop a dock area or a dock widget given in widget parameter
 	 */
 	void dropWidget(QWidget* Widget, const QPoint& TargetPos);
 	/**
 	 * Adds the given dock area to this container widget
 	 */
@@ -109,7 +121,7 @@ protected:
 	 * stream but does not restore anything. You can use this check for
 	 * faulty files before you start restoring the state
 	 */
-	bool restoreState(QXmlStreamReader& Stream, bool Testing);
+	bool restoreState(CDockingStateReader& Stream, bool Testing);
 	/**
 	 * This function returns the last added dock area widget for the given
@@ -118,14 +130,6 @@ protected:
 	 */
 	CDockAreaWidget* lastAddedDockAreaWidget(DockWidgetArea area) const;
 	/**
 	 * This function returns true if this dock area has only one single
 	 * visible dock widget.
 	 * A top level widget is a real floating widget. Only the isFloating()
 	 * function of top level widgets may returns true.
 	 */
 	bool hasTopLevelDockWidget() const;
 	/**
 	 * If hasSingleVisibleDockWidget() returns true, this function returns the
 	 * one and only visible dock widget. Otherwise it returns a nullptr.
@@ -168,6 +172,11 @@ public:
 	CDockAreaWidget* addDockWidget(DockWidgetArea area, CDockWidget* Dockwidget,
 		CDockAreaWidget* DockAreaWidget = nullptr);
 	/**
 	 * Removes dockwidget
 	 */
 	void removeDockWidget(CDockWidget* Dockwidget);
 	/**
 	 * Returns the current zOrderIndex
 	 */
@@ -197,6 +206,14 @@ public:
 	 */
 	QList<CDockAreaWidget*> openedDockAreas() const;
    /**
     * This function returns true if this dock area has only one single
     * visible dock widget.
     * A top level widget is a real floating widget. Only the isFloating()
     * function of top level widgets may returns true.
     */
    bool hasTopLevelDockWidget() const;
 	/**
 	 * Returns the number of dock areas in this container
 	 */
@@ -233,6 +250,11 @@ public:
 	 */
 	CFloatingDockContainer* floatingWidget() const;
 	/**
 	 * Call this function to close all dock areas except the KeepOpenArea
 	 */
 	void closeOtherAreas(CDockAreaWidget* KeepOpenArea);
 signals:
 	/**
 	 * This signal is emitted if one or multiple dock areas has been added to
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -28,7 +28,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <DockWidgetTab.h>
+#include "DockWidgetTab.h"
 #include "DockManager.h"
 #include <algorithm>
@@ -42,7 +42,6 @@
 #include <QFile>
 #include <QAction>
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
 #include <QSettings>
 #include <QMenu>
 #include <QApplication>
@@ -52,10 +51,15 @@
 #include "DockWidget.h"
 #include "ads_globals.h"
 #include "DockAreaWidget.h"
 #include "IconProvider.h"
 #include "DockingStateReader.h"
 namespace ads
 {
 static CDockManager::ConfigFlags StaticConfigFlags = CDockManager::DefaultOpaqueConfig;
 /**
 * Private data class of CDockManager class (pimpl)
 */
@@ -72,7 +76,7 @@ struct DockManagerPrivate
 	QMenu* ViewMenu;
 	CDockManager::eViewMenuInsertionOrder MenuInsertionOrder = CDockManager::MenuAlphabeticallySorted;
 	bool RestoringState = false;
-	CDockManager::ConfigFlags ConfigFlags{CDockManager::DefaultConfig};
+	QVector<CFloatingDockContainer*> UninitializedFloatingWidgets;
 	/**
 	 * Private data constructor
@@ -101,7 +105,7 @@ struct DockManagerPrivate
 	void hideFloatingWidgets()
 	{
-		// Hide updates of floating widgets from use
+		// Hide updates of floating widgets from user
 		for (auto FloatingWidget : FloatingWidgets)
 		{
 			FloatingWidget->hide();
@@ -119,7 +123,7 @@ struct DockManagerPrivate
 	/**
 	 * Restores the container with the given index
 	 */
-	bool restoreContainer(int Index, QXmlStreamReader& stream, bool Testing);
+	bool restoreContainer(int Index, CDockingStateReader& stream, bool Testing);
 	/**
 	 * Loads the stylesheet
@@ -145,7 +149,11 @@ DockManagerPrivate::DockManagerPrivate(CDockManager* _public) :
 void DockManagerPrivate::loadStylesheet()
 {
 	QString Result;
 #ifdef Q_OS_LINUX
    QFile StyleSheetFile(":ads/stylesheets/default_linux.css");
 #else
 	QFile StyleSheetFile(":ads/stylesheets/default.css");
 #endif
 	StyleSheetFile.open(QIODevice::ReadOnly);
 	QTextStream StyleSheetStream(&StyleSheetFile);
 	Result = StyleSheetStream.readAll();
@@ -155,7 +163,7 @@ void DockManagerPrivate::loadStylesheet()
 //============================================================================
-bool DockManagerPrivate::restoreContainer(int Index, QXmlStreamReader& stream, bool Testing)
+bool DockManagerPrivate::restoreContainer(int Index, CDockingStateReader& stream, bool Testing)
 {
 	if (Testing)
 	{
@@ -170,7 +178,7 @@ bool DockManagerPrivate::restoreContainer(int Index, QXmlStreamReader& stream, b
 	}
 	else
 	{
-		qDebug() << "d->Containers[i]->restoreState ";
+        ADS_PRINT("d->Containers[i]->restoreState ");
 		auto Container = Containers[Index];
 		if (Container->isFloating())
 		{
@@ -197,27 +205,32 @@ bool DockManagerPrivate::checkFormat(const QByteArray &state, int version)
 bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int version,
 	bool Testing)
 {
 	Q_UNUSED(version);
    if (state.isEmpty())
    {
        return false;
    }
-    QXmlStreamReader s(state);
+    CDockingStateReader s(state);
    s.readNextStartElement();
    if (s.name() != "QtAdvancedDockingSystem")
    {
    	return false;
    }
-    qDebug() << s.attributes().value("Version");
+    ADS_PRINT(s.attributes().value("Version"));
    bool ok;
    int v = s.attributes().value("Version").toInt(&ok);
-    if (!ok || v != version)
+    if (!ok || v > CurrentVersion)
    {
    	return false;
    }
    s.setFileVersion(v);
    bool Result = true;
 #ifdef ADS_DEBUG_PRINT
    int  DockContainers = s.attributes().value("Containers").toInt();
-    qDebug() << DockContainers;
+#endif
    ADS_PRINT(DockContainers);
    int DockContainerCount = 0;
    while (s.readNextStartElement())
    {
@@ -257,13 +270,14 @@ void DockManagerPrivate::restoreDockWidgetsOpenState()
    // toggle view action the next time
    for (auto DockWidget : DockWidgetsMap)
    {
-    	if (DockWidget->property("dirty").toBool())
+    	if (DockWidget->property(internal::DirtyProperty).toBool())
    	{
    		DockWidget->flagAsUnassigned();
            emit DockWidget->viewToggled(false);
    	}
    	else
    	{
-    		DockWidget->toggleViewInternal(!DockWidget->property("closed").toBool());
+    		DockWidget->toggleViewInternal(!DockWidget->property(internal::ClosedProperty).toBool());
    	}
    }
 }
@@ -336,11 +350,12 @@ void DockManagerPrivate::emitTopLevelEvents()
 //============================================================================
-bool DockManagerPrivate::restoreState(const QByteArray &state, int version)
+bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
 {
 	QByteArray state = State.startsWith("<?xml") ? State : qUncompress(State);
    if (!checkFormat(state, version))
    {
-    	qDebug() << "checkFormat: Error checking format!!!!!!!";
+        ADS_PRINT("checkFormat: Error checking format!!!!!!!");
    	return false;
    }
@@ -350,7 +365,7 @@ bool DockManagerPrivate::restoreState(const QByteArray &state, int version)
    if (!restoreStateFromXml(state, version))
    {
-    	qDebug() << "restoreState: Error restoring state!!!!!!!";
+        ADS_PRINT("restoreState: Error restoring state!!!!!!!");
    	return false;
    }
@@ -425,7 +440,7 @@ CDockManager::~CDockManager()
 void CDockManager::registerFloatingWidget(CFloatingDockContainer* FloatingWidget)
 {
 	d->FloatingWidgets.append(FloatingWidget);
-	qDebug() << "d->FloatingWidgets.count() " << d->FloatingWidgets.count();
+    ADS_PRINT("d->FloatingWidgets.count() " << d->FloatingWidgets.count());
 }
@@ -489,11 +504,12 @@ unsigned int CDockManager::zOrderIndex() const
 //============================================================================
-QByteArray CDockManager::saveState(eXmlMode XmlMode, int version) const
+QByteArray CDockManager::saveState(int version) const
 {
    QByteArray xmldata;
    QXmlStreamWriter s(&xmldata);
-	s.setAutoFormatting(XmlAutoFormattingEnabled == XmlMode);
+    auto ConfigFlags = CDockManager::configFlags();
 	s.setAutoFormatting(ConfigFlags.testFlag(XmlAutoFormattingEnabled));
    s.writeStartDocument();
 		s.writeStartElement("QtAdvancedDockingSystem");
 		s.writeAttribute("Version", QString::number(version));
@@ -506,7 +522,8 @@ QByteArray CDockManager::saveState(eXmlMode XmlMode, int version) const
 		s.writeEndElement();
    s.writeEndDocument();
-    return xmldata;
+    return ConfigFlags.testFlag(XmlCompressionEnabled)
    	? qCompress(xmldata, 9) : xmldata;
 }
@@ -547,6 +564,48 @@ bool CDockManager::restoreState(const QByteArray &state, int version)
 }
 //============================================================================
 CFloatingDockContainer* CDockManager::addDockWidgetFloating(CDockWidget* Dockwidget)
 {
 	d->DockWidgetsMap.insert(Dockwidget->objectName(), Dockwidget);
 	CDockAreaWidget* OldDockArea = Dockwidget->dockAreaWidget();
 	if (OldDockArea)
 	{
 		OldDockArea->removeDockWidget(Dockwidget);
 	}
 	Dockwidget->setDockManager(this);
 	CFloatingDockContainer* FloatingWidget = new CFloatingDockContainer(Dockwidget);
 	FloatingWidget->resize(Dockwidget->size());
 	if (isVisible())
 	{
 		FloatingWidget->show();
 	}
 	else
 	{
 		d->UninitializedFloatingWidgets.append(FloatingWidget);
 	}
 	return FloatingWidget;
 }
 //============================================================================
 void CDockManager::showEvent(QShowEvent *event)
 {
 	Super::showEvent(event);
 	if (d->UninitializedFloatingWidgets.empty())
 	{
 		return;
 	}
 	for (auto FloatingWidget : d->UninitializedFloatingWidgets)
 	{
 		FloatingWidget->show();
 	}
 	d->UninitializedFloatingWidgets.clear();
 }
 //============================================================================
 CDockAreaWidget* CDockManager::addDockWidget(DockWidgetArea area,
 	CDockWidget* Dockwidget, CDockAreaWidget* DockAreaWidget)
@@ -565,9 +624,13 @@ CDockAreaWidget* CDockManager::addDockWidgetTab(DockWidgetArea area,
 	{
 		return addDockWidget(ads::CenterDockWidgetArea, Dockwidget, AreaWidget);
 	}
 	else if (!openedDockAreas().isEmpty())
 	{
 		return addDockWidget(area, Dockwidget, openedDockAreas().last());
 	}
 	else
 	{
-		return addDockWidget(area, Dockwidget, AreaWidget);
+		return addDockWidget(area, Dockwidget, nullptr);
 	}
 }
@@ -586,6 +649,14 @@ CDockWidget* CDockManager::findDockWidget(const QString& ObjectName) const
 	return d->DockWidgetsMap.value(ObjectName, nullptr);
 }
 //============================================================================
 void CDockManager::removeDockWidget(CDockWidget* Dockwidget)
 {
 	emit dockWidgetAboutToBeRemoved(Dockwidget);
 	d->DockWidgetsMap.remove(Dockwidget->objectName());
 	CDockContainerWidget::removeDockWidget(Dockwidget);
 	emit dockWidgetRemoved(Dockwidget);
 }
 //============================================================================
 QMap<QString, CDockWidget*> CDockManager::dockWidgetsMap() const
@@ -747,18 +818,40 @@ int CDockManager::startDragDistance()
 //===========================================================================
-CDockManager::ConfigFlags CDockManager::configFlags() const
+CDockManager::ConfigFlags CDockManager::configFlags()
 {
-	return d->ConfigFlags;
+	return StaticConfigFlags;
 }
 //===========================================================================
 void CDockManager::setConfigFlags(const ConfigFlags Flags)
 {
-	d->ConfigFlags = Flags;
+	StaticConfigFlags = Flags;
 }
 //===========================================================================
 void CDockManager::setConfigFlag(eConfigFlag Flag, bool On)
 {
 	internal::setFlag(StaticConfigFlags, Flag, On);
 }
 //===========================================================================
 bool CDockManager::testConfigFlag(eConfigFlag Flag)
 {
    return configFlags().testFlag(Flag);
 }
 //===========================================================================
 CIconProvider& CDockManager::iconProvider()
 {
 	static CIconProvider Instance;
 	return Instance;
 }
 } // namespace ads
 //---------------------------------------------------------------------------
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -30,10 +30,18 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include "DockContainerWidget.h"
+#include <ads_globals.h>
-#include <QIcon>
+#include <DockContainerWidget.h>
-
+#include <DockWidget.h>
-#include "ads_globals.h"
+#include <FloatingDockContainer.h>
 #include <qbytearray.h>
 #include <qflags.h>
 #include <qlist.h>
 #include <qmap.h>
 #include <qobjectdefs.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <QtGui/qicon.h>
 class QSettings;
 class QMenu;
@@ -44,14 +52,25 @@ struct DockManagerPrivate;
 class CFloatingDockContainer;
 struct FloatingDockContainerPrivate;
 class CDockContainerWidget;
 class DockContainerWidgetPrivate;
 class CDockOverlay;
 class CDockAreaTabBar;
 class CDockWidgetTab;
 struct DockWidgetTabPrivate;
 struct DockAreaWidgetPrivate;
 class CIconProvider;
 /**
- * The central dock manager that maintains the complete docking system
+ * The central dock manager that maintains the complete docking system.
 * With the configuration flags you can globally control the functionality
 * of the docking system. The dock manager uses an internal stylesheet to
 * style its components like splitters, tabs and buttons. If you want to
 * disable this stylesheet because your application uses its own,
 * just call the function for settings the stylesheet with an empty
 * string.
 * \code
 * DockManager->setStyleSheet("");
 * \endcode
 **/
 class ADS_EXPORT CDockManager : public CDockContainerWidget
 {
@@ -62,10 +81,14 @@ private:
 	friend class CFloatingDockContainer;
 	friend struct FloatingDockContainerPrivate;
 	friend class CDockContainerWidget;
 	friend class DockContainerWidgetPrivate;
 	friend class CDockAreaTabBar;
 	friend class CDockWidgetTab;
 	friend struct DockAreaWidgetPrivate;
 	friend struct DockWidgetTabPrivate;
 	friend class CFloatingDragPreview;
 	friend struct FloatingDragPreviewPrivate;
 	friend class CDockAreaTitleBar;
 protected:
 	/**
@@ -101,30 +124,63 @@ protected:
 	 */
 	CDockOverlay* dockAreaOverlay() const;
 	/**
 	 * Show the floating widgets that has been created floating
 	 */
 	virtual void showEvent(QShowEvent *event) override;
 public:
 	using Super = CDockContainerWidget;
 	enum eViewMenuInsertionOrder
 	{
 		MenuSortedByInsertion,
 		MenuAlphabeticallySorted
 	};
 	enum eXmlMode
 	{
 		XmlAutoFormattingDisabled,
 		XmlAutoFormattingEnabled
 	};
 	/**
 	 * These global configuration flags configure some global dock manager
 	 * settings.
 	 */
 	enum eConfigFlag
 	{
-		ActiveTabHasCloseButton = 0x01,    //!< If this flag is set, the active tab in a tab area has a close button
+		ActiveTabHasCloseButton = 0x0001,    //!< If this flag is set, the active tab in a tab area has a close button
-		DockAreaHasCloseButton = 0x02,     //!< If the flag is set each dock area has a close button
+		DockAreaHasCloseButton = 0x0002,     //!< If the flag is set each dock area has a close button
-		DockAreaCloseButtonClosesTab = 0x04,//!< If the flag is set, the dock area close button closes the active tab, if not set, it closes the complete cock area
+		DockAreaCloseButtonClosesTab = 0x0004,//!< If the flag is set, the dock area close button closes the active tab, if not set, it closes the complete dock area
-		OpaqueSplitterResize = 0x08, //!< See QSplitter::setOpaqueResize() documentation
+		OpaqueSplitterResize = 0x0008, //!< See QSplitter::setOpaqueResize() documentation
-		DefaultConfig = ActiveTabHasCloseButton | DockAreaHasCloseButton | OpaqueSplitterResize, ///< the default configuration
+		XmlAutoFormattingEnabled = 0x0010,//!< If enabled, the XML writer automatically adds line-breaks and indentation to empty sections between elements (ignorable whitespace).
 		XmlCompressionEnabled = 0x0020,//!< If enabled, the XML output will be compressed and is not human readable anymore
 		TabCloseButtonIsToolButton = 0x0040,//! If enabled the tab close buttons will be QToolButtons instead of QPushButtons - disabled by default
 		AllTabsHaveCloseButton = 0x0080, //!< if this flag is set, then all tabs that are closable show a close button
 		RetainTabSizeWhenCloseButtonHidden = 0x0100, //!< if this flag is set, the space for the close button is reserved even if the close button is not visible
 		OpaqueUndocking = 0x0200,///< If enabled, the widgets are immediately undocked into floating widgets, if disabled, only a draw preview is undocked and the real undocking is deferred until the mouse is released
 		DragPreviewIsDynamic = 0x0400,///< If opaque undocking is disabled, this flag defines the behavior of the drag preview window, if this flag is enabled, the preview will be adjusted dynamically to the drop area
 		DragPreviewShowsContentPixmap = 0x0800,///< If opaque undocking is disabled, the created drag preview window shows a copy of the content of the dock widget / dock are that is dragged
 		DragPreviewHasWindowFrame = 0x1000,///< If opaque undocking is disabled, then this flag configures if the drag preview is frameless or looks like a real window
 		AlwaysShowTabs = 0x2000,///< If this option is enabled, the tab of a dock widget is always displayed - even if it is the only visible dock widget in a floating widget.
 		DockAreaHasUndockButton = 0x4000,     //!< If the flag is set each dock area has an undock button
 		DockAreaHasTabsMenuButton = 0x8000,     //!< If the flag is set each dock area has a tabs menu button
 		DockAreaHideDisabledButtons = 0x10000,    //!< If the flag is set disabled dock area buttons will not appear on the tollbar at all (enabling them will bring them back)
 		DockAreaDynamicTabsMenuButtonVisibility = 0x20000,     //!< If the flag is set dock area will disable a tabs menu button when there is only one tab in the area
        DefaultDockAreaButtons = DockAreaHasCloseButton
 							   | DockAreaHasUndockButton
 		                       | DockAreaHasTabsMenuButton,///< default configuration of dock area title bar buttons
 		DefaultBaseConfig = DefaultDockAreaButtons
 		                  | ActiveTabHasCloseButton
 		                  | XmlCompressionEnabled,///< default base configuration settings
        DefaultOpaqueConfig = DefaultBaseConfig
 		                    | OpaqueSplitterResize
 		                    | OpaqueUndocking, ///< the default configuration with opaque operations - this may cause issues if ActiveX or Qt 3D windows are involved
 		DefaultNonOpaqueConfig = DefaultBaseConfig
 		              | DragPreviewShowsContentPixmap, ///< the default configuration for non opaque operations
 		NonOpaqueWithWindowFrame = DefaultNonOpaqueConfig
 		              | DragPreviewHasWindowFrame ///< the default configuration for non opaque operations that show a real window with frame
 	};
 	Q_DECLARE_FLAGS(ConfigFlags, eConfigFlag)
@@ -133,7 +189,7 @@ public:
 	 * If the given parent is a QMainWindow, the dock manager sets itself as the
 	 * central widget.
 	 * Before you create any dock widgets, you should properly setup the
-	 * configuration flags via setConfigFlags()
+	 * configuration flags via setConfigFlags().
 	 */
 	CDockManager(QWidget* parent = 0);
@@ -145,13 +201,30 @@ public:
 	/**
 	 * This function returns the global configuration flags
 	 */
-	ConfigFlags configFlags() const;
+	static ConfigFlags configFlags();
 	/**
 	 * Sets the global configuration flags for the whole docking system.
 	 * Call this function before you create your first dock widget.
 	 */
-	void setConfigFlags(const ConfigFlags Flags);
+	static void setConfigFlags(const ConfigFlags Flags);
 	/**
 	 * Set a certain config flag
 	 */
 	static void setConfigFlag(eConfigFlag Flag, bool On = true);
 	/**
 	 * Returns true if the given config flag is set
 	 */
 	static bool testConfigFlag(eConfigFlag Flag);
 	/**
 	 * Returns the global icon provider.
 	 * The icon provider enables the use of custom icons in case using
 	 * styleheets for icons is not an option.
 	 */
 	static CIconProvider& iconProvider();
 	/**
 	 * Adds dockwidget into the given area.
@@ -185,6 +258,12 @@ public:
 	CDockAreaWidget* addDockWidgetTabToArea(CDockWidget* Dockwidget,
 		CDockAreaWidget* DockAreaWidget);
 	/**
 	 * Adds the given DockWidget floating and returns the created
 	 * CFloatingDockContainer instance.
 	 */
 	CFloatingDockContainer* addDockWidgetFloating(CDockWidget* Dockwidget);
 	/**
 	 * Searches for a registered doc widget with the given ObjectName
 	 * \return Return the found dock widget or nullptr if a dock widget with the
@@ -192,6 +271,11 @@ public:
 	 */
 	CDockWidget* findDockWidget(const QString& ObjectName) const;
 	/**
 	 * Remove the given Dock from the dock manager
 	 */
 	void removeDockWidget(CDockWidget* Dockwidget);
 	/**
 	 * This function returns a readable reference to the internal dock
 	 * widgets map so that it is possible to iterate over all dock widgets
@@ -213,7 +297,7 @@ public:
 	 * This function always return 0 because the main window is always behind
 	 * any floating widget
 	 */
-	virtual unsigned int zOrderIndex() const;
+	unsigned int zOrderIndex() const override;
 	/**
 	 * Saves the current state of the dockmanger and all its dock widgets
@@ -223,7 +307,7 @@ public:
 	 * The XmlMode XmlAutoFormattingDisabled is better if you would like to have
 	 * a more compact XML output - i.e. for storage in ini files.
 	 */
-	QByteArray saveState(eXmlMode XmlMode = XmlAutoFormattingDisabled, int version = 0) const;
+	QByteArray saveState(int version = Version1) const;
 	/**
 	 * Restores the state of this dockmanagers dockwidgets.
@@ -232,7 +316,7 @@ public:
 	 * returns false; otherwise, the state is restored, and this function
 	 * returns true.
 	 */
-	bool restoreState(const QByteArray &state, int version = 0);
+	bool restoreState(const QByteArray &state, int version = Version1);
 	/**
 	 * Saves the current perspective to the internal list of perspectives.
@@ -365,6 +449,27 @@ signals:
     * perspective
     */
    void perspectiveOpened(const QString& PerspectiveName);
    /**
     * This signal is emitted, if a new DockArea has been created.
     * An application can use this signal to set custom icons or custom
     * tooltips for the DockArea buttons.
     */
    void dockAreaCreated(CDockAreaWidget* DockArea);
    /**
     * This signal is emitted just before the given dock widget is removed
     * from the
     */
    void dockWidgetAboutToBeRemoved(CDockWidget* DockWidget);
    /**
     * This signal is emitted if a dock widget has been removed with the remove
     * removeDockWidget() function.
     * If this signal is emitted, the dock widget has been removed from the
     * docking system but it is not deleted yet.
     */
    void dockWidgetRemoved(CDockWidget* DockWidget);
 }; // class DockManager
 } // namespace ads
 //-----------------------------------------------------------------------------
--- a/src/DockOverlay.cpp
+++ b/src/DockOverlay.cpp
@@ -52,7 +52,6 @@ struct DockOverlayPrivate
 	DockWidgetAreas AllowedAreas = InvalidDockWidgetArea;
 	CDockOverlayCross* Cross;
 	QPointer<QWidget> TargetWidget;
 	QRect TargetRect;
 	DockWidgetArea LastLocation = InvalidDockWidgetArea;
 	bool DropPreviewEnabled = true;
 	CDockOverlay::eMode Mode = CDockOverlay::ModeDockAreaOverlay;
@@ -132,6 +131,21 @@ struct DockOverlayCrossPrivate
 		return Color;
 	}
    //============================================================================
    /**
     * Helper function that returns the drop indicator width depending on the
     * operating system
     */
    qreal dropIndicatiorWidth(QLabel* l) const
    {
    #ifdef Q_OS_LINUX
        Q_UNUSED(l)
        return 40;
    #else
        return static_cast<qreal>(l->fontMetrics().height()) * 3.f;
    #endif
    }
 	//============================================================================
 	QWidget* createDropIndicatorWidget(DockWidgetArea DockWidgetArea,
@@ -140,7 +154,7 @@ struct DockOverlayCrossPrivate
 		QLabel* l = new QLabel();
 		l->setObjectName("DockWidgetAreaLabel");
-		const qreal metric = static_cast<qreal>(l->fontMetrics().height()) * 3.f;
+        const qreal metric = dropIndicatiorWidth(l);
 		const QSizeF size(metric, metric);
 		l->setPixmap(createHighDpiDropIndicatorPixmap(size, DockWidgetArea, Mode));
@@ -154,7 +168,7 @@ struct DockOverlayCrossPrivate
 	void updateDropIndicatorIcon(QWidget* DropIndicatorWidget)
 	{
 		QLabel* l = qobject_cast<QLabel*>(DropIndicatorWidget);
-		const qreal metric = static_cast<qreal>(l->fontMetrics().height()) * 3.f;
+        const qreal metric = dropIndicatiorWidth(l);
 		const QSizeF size(metric, metric);
 		int Area = l->property("dockWidgetArea").toInt();
@@ -168,7 +182,11 @@ struct DockOverlayCrossPrivate
 		QColor borderColor = iconColor(CDockOverlayCross::FrameColor);
 		QColor backgroundColor = iconColor(CDockOverlayCross::WindowBackgroundColor);
 #if QT_VERSION >= 0x050600
 		double DevicePixelRatio = _this->window()->devicePixelRatioF();
 #else
        double DevicePixelRatio = _this->window()->devicePixelRatio();
 #endif
 		QSizeF PixmapSize = size * DevicePixelRatio;
 		QPixmap pm(PixmapSize.toSize());
 		pm.fill(QColor(0, 0, 0, 0));
@@ -314,7 +332,11 @@ CDockOverlay::CDockOverlay(QWidget* parent, eMode Mode) :
 {
 	d->Mode = Mode;
 	d->Cross = new CDockOverlayCross(this);
 #ifdef Q_OS_LINUX
 	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
 #else
 	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
 #endif
 	setWindowOpacity(1);
 	setWindowTitle("DockOverlay");
 	setAttribute(Qt::WA_NoSystemBackground);
@@ -364,7 +386,8 @@ DockWidgetArea CDockOverlay::dropAreaUnderCursor() const
 		return Result;
 	}
-	if (DockArea->titleBarGeometry().contains(DockArea->mapFromGlobal(QCursor::pos())))
+	if (DockArea->allowedAreas().testFlag(CenterDockWidgetArea)
 	 && DockArea->titleBarGeometry().contains(DockArea->mapFromGlobal(QCursor::pos())))
 	{
 		return CenterDockWidgetArea;
 	}
@@ -389,7 +412,6 @@ DockWidgetArea CDockOverlay::showOverlay(QWidget* target)
 	}
 	d->TargetWidget = target;
 	d->TargetRect = QRect();
 	d->LastLocation = InvalidDockWidgetArea;
 	// Move it over the target.
@@ -408,8 +430,8 @@ void CDockOverlay::hideOverlay()
 {
 	hide();
 	d->TargetWidget.clear();
 	d->TargetRect = QRect();
 	d->LastLocation = InvalidDockWidgetArea;
 	d->DropAreaRect = QRect();
 }
@@ -421,6 +443,13 @@ void CDockOverlay::enableDropPreview(bool Enable)
 }
 //============================================================================
 bool CDockOverlay::dropPreviewEnabled() const
 {
 	return d->DropPreviewEnabled;
 }
 //============================================================================
 void CDockOverlay::paintEvent(QPaintEvent* event)
 {
@@ -549,7 +578,11 @@ CDockOverlayCross::CDockOverlayCross(CDockOverlay* overlay) :
 	d(new DockOverlayCrossPrivate(this))
 {
 	d->DockOverlay = overlay;
 #ifdef Q_OS_LINUX
 	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
 #else
 	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
 #endif
 	setWindowTitle("DockOverlayCross");
 	setAttribute(Qt::WA_TranslucentBackground);
@@ -577,8 +610,11 @@ void CDockOverlayCross::setupOverlayCross(CDockOverlay::eMode Mode)
 	areaWidgets.insert(BottomDockWidgetArea, d->createDropIndicatorWidget(BottomDockWidgetArea, Mode));
 	areaWidgets.insert(LeftDockWidgetArea, d->createDropIndicatorWidget(LeftDockWidgetArea, Mode));
 	areaWidgets.insert(CenterDockWidgetArea, d->createDropIndicatorWidget(CenterDockWidgetArea, Mode));
 #if QT_VERSION >= 0x050600
 	d->LastDevicePixelRatio = devicePixelRatioF();
-
+#else
    d->LastDevicePixelRatio = devicePixelRatio();
 #endif
 	setAreaWidgets(areaWidgets);
 	d->UpdateRequired = false;
 }
@@ -596,7 +632,11 @@ void CDockOverlayCross::updateOverlayIcons()
 	{
 		d->updateDropIndicatorIcon(Widget);
 	}
 #if QT_VESION >= 0x050600
 	d->LastDevicePixelRatio = devicePixelRatioF();
 #else
    d->LastDevicePixelRatio = devicePixelRatio();
 #endif
 }
--- a/src/DockOverlay.h
+++ b/src/DockOverlay.h
@@ -97,6 +97,11 @@ public:
 	 */
 	void enableDropPreview(bool Enable);
 	/**
 	 * Returns true if drop preview is enabled
 	 */
 	bool dropPreviewEnabled() const;
 	/**
 	 * The drop overlay rectangle for the target area
 	 */
@@ -245,9 +250,6 @@ public:
 protected:
 	virtual void showEvent(QShowEvent* e) override;
 	void setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets);
 private:
 }; // CDockOverlayCross
 } // namespace ads
--- a/src/DockSplitter.cpp
+++ b/src/DockSplitter.cpp
@@ -68,7 +68,7 @@ CDockSplitter::CDockSplitter(Qt::Orientation orientation, QWidget *parent)
 //============================================================================
 CDockSplitter::~CDockSplitter()
 {
-	qDebug() << "~CDockSplitter";
+    ADS_PRINT("~CDockSplitter");
 	delete d;
 }
--- a/src/DockSplitter.h
+++ b/src/DockSplitter.h
@@ -38,7 +38,8 @@ namespace ads
 struct DockSplitterPrivate;
 /**
- * Splitter used internally instead of QSplitter
+ * Splitter used internally instead of QSplitter with some additional
 * fuctionality.
 */
 class ADS_EXPORT CDockSplitter : public QSplitter
 {
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -28,9 +28,11 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <DockWidgetTab.h>
+#include "DockWidgetTab.h"
 #include "DockWidget.h"
 #include <iostream>
 #include <QBoxLayout>
 #include <QAction>
 #include <QSplitter>
@@ -43,6 +45,10 @@
 #include <QToolBar>
 #include <QXmlStreamWriter>
 #include <QGuiApplication>
 #include <QScreen>
 #include <QWindow>
 #include "DockContainerWidget.h"
 #include "DockAreaWidget.h"
 #include "DockManager.h"
@@ -58,14 +64,14 @@ namespace ads
 */
 struct DockWidgetPrivate
 {
-	CDockWidget* _this;
+	CDockWidget* _this = nullptr;
-	QBoxLayout* Layout;
+	QBoxLayout* Layout = nullptr;
 	QWidget* Widget = nullptr;
-	CDockWidgetTab* TabWidget;
+	CDockWidgetTab* TabWidget = nullptr;
-	CDockWidget::DockWidgetFeatures Features = CDockWidget::AllDockWidgetFeatures;
+	CDockWidget::DockWidgetFeatures Features = CDockWidget::DefaultDockWidgetFeatures;
 	CDockManager* DockManager = nullptr;
 	CDockAreaWidget* DockArea = nullptr;
-	QAction* ToggleViewAction;
+	QAction* ToggleViewAction = nullptr;
 	bool Closed = false;
 	QScrollArea* ScrollArea = nullptr;
 	QToolBar* ToolBar = nullptr;
@@ -74,6 +80,7 @@ struct DockWidgetPrivate
 	QSize ToolBarIconSizeDocked = QSize(16, 16);
 	QSize ToolBarIconSizeFloating = QSize(24, 24);
 	bool IsFloatingTopLevel = false;
 	QList<QAction*> TitleBarActions;
 	/**
 	 * Private data constructor
@@ -128,8 +135,8 @@ void DockWidgetPrivate::showDockWidget()
 	}
 	else
 	{
 		DockArea->toggleView(true);
 		DockArea->setCurrentDockWidget(_this);
 		DockArea->toggleView(true);
 		TabWidget->show();
 		QSplitter* Splitter = internal::findParent<QSplitter*>(DockArea);
 		while (Splitter && !Splitter->isVisible())
@@ -214,7 +221,7 @@ CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
 	setObjectName(title);
 	d->TabWidget = new CDockWidgetTab(this);
-	d->ToggleViewAction = new QAction(title);
+    d->ToggleViewAction = new QAction(title, this);
 	d->ToggleViewAction->setCheckable(true);
 	connect(d->ToggleViewAction, SIGNAL(triggered(bool)), this,
 		SLOT(toggleView(bool)));
@@ -224,7 +231,7 @@ CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
 //============================================================================
 CDockWidget::~CDockWidget()
 {
-	qDebug() << "~CDockWidget()";
+    ADS_PRINT("~CDockWidget()");
 	delete d;
 }
@@ -243,21 +250,35 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
 void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
 {
 	QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
-	if (ScrollAreaWidget || ForceNoScrollArea != InsertMode)
+	if (ScrollAreaWidget || ForceNoScrollArea == InsertMode)
 	{
 		d->Layout->addWidget(widget);
 		if (ScrollAreaWidget && ScrollAreaWidget->viewport())
 		{
 			ScrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
 		}
 	}
 	else
 	{
 		d->setupScrollArea();
 		d->ScrollArea->setWidget(widget);
 	}
 	else
 	{
 		d->Layout->addWidget(widget);
 	}
 	d->Widget = widget;
 	d->Widget->setProperty("dockWidgetContent", true);
 }
 //============================================================================
 QWidget* CDockWidget::takeWidget()
 {
 	d->ScrollArea->takeWidget();
 	d->Layout->removeWidget(d->Widget);
 	d->Widget->setParent(nullptr);
    return d->Widget;
 }
 //============================================================================
 QWidget* CDockWidget::widget() const
 {
@@ -275,14 +296,22 @@ CDockWidgetTab* CDockWidget::tabWidget() const
 //============================================================================
 void CDockWidget::setFeatures(DockWidgetFeatures features)
 {
 	if (d->Features == features)
 	{
 		return;
 	}
 	d->Features = features;
 	emit featuresChanged(d->Features);
 	d->TabWidget->onDockWidgetFeaturesChanged();
 }
 //============================================================================
 void CDockWidget::setFeature(DockWidgetFeature flag, bool on)
 {
-	d->Features.setFlag(flag, on);
+	auto Features = features();
    internal::setFlag(Features, flag, on);
    setFeatures(Features);
 }
@@ -494,14 +523,63 @@ void CDockWidget::flagAsUnassigned()
 //============================================================================
 bool CDockWidget::event(QEvent *e)
 {
-	if (e->type() == QEvent::WindowTitleChange)
+	switch (e->type())
 	{
-		emit titleChanged(windowTitle());
+	case QEvent::Hide:
 		emit visibilityChanged(false);
 		break;
 	case QEvent::Show:
 		emit visibilityChanged(geometry().right() >= 0 && geometry().bottom() >= 0);
        break;
 	case QEvent::WindowTitleChange :
 		{
 			const auto title = windowTitle();
 			if (d->TabWidget)
 			{
 				d->TabWidget->setText(title);
 			}
 			if (d->ToggleViewAction)
 			{
 				d->ToggleViewAction->setText(title);
 			}
 			if (d->DockArea)
 			{
 				d->DockArea->markTitleBarMenuOutdated();//update tabs menu
 			}
 			emit titleChanged(title);
 		}
 		break;
 	default:
 		break;
 	}
-	return QFrame::event(e);
+
 	return Super::event(e);
 }
 #ifndef QT_NO_TOOLTIP
 //============================================================================
 void CDockWidget::setTabToolTip(const QString &text)
 {
 	if (d->TabWidget)
 	{
 		d->TabWidget->setToolTip(text);
 	}
 	if (d->ToggleViewAction)
 	{
 		d->ToggleViewAction->setToolTip(text);
 	}
 	if (d->DockArea)
 	{
 		d->DockArea->markTitleBarMenuOutdated();//update tabs menu
 	}
 }
 #endif
 //============================================================================
 void CDockWidget::setIcon(const QIcon& Icon)
 {
@@ -671,6 +749,89 @@ QSize CDockWidget::minimumSizeHint() const
 	return QSize(60, 40);
 }
 //============================================================================
 void CDockWidget::setFloating()
 {
 	if (isClosed())
 	{
 		return;
 	}
 	d->TabWidget->detachDockWidget();
 }
 //============================================================================
 void CDockWidget::deleteDockWidget()
 {
 	dockManager()->removeDockWidget(this);
 	deleteLater();
 	d->Closed = true;
 }
 //============================================================================
 void CDockWidget::closeDockWidget()
 {
 	closeDockWidgetInternal(true);
 }
 //============================================================================
 bool CDockWidget::closeDockWidgetInternal(bool ForceClose)
 {
 	if (!ForceClose)
 	{
 		emit closeRequested();
 	}
 	if (!ForceClose && features().testFlag(CDockWidget::CustomCloseHandling))
 	{
 		return false;
 	}
 	if (features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
    {
 		// If the dock widget is floating, then we check if we also need to
 		// delete the floating widget
 		if (isFloating())
 		{
 			CFloatingDockContainer* FloatingWidget = internal::findParent<
 					CFloatingDockContainer*>(this);
 			if (FloatingWidget->dockWidgets().count() == 1)
 			{
 				FloatingWidget->deleteLater();
 			}
 			else
 			{
 				FloatingWidget->hide();
 			}
 		}
 		deleteDockWidget();
    }
    else
    {
    	toggleView(false);
    }
 	return true;
 }
 //============================================================================
 void CDockWidget::setTitleBarActions(QList<QAction*> actions)
 {
 	d->TitleBarActions = actions;
 }
 //============================================================================
 QList<QAction*> CDockWidget::titleBarActions() const
 {
 	return d->TitleBarActions;
 }
 } // namespace ads
 //---------------------------------------------------------------------------
--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -44,7 +44,8 @@ class CDockWidgetTab;
 class CDockManager;
 class CDockContainerWidget;
 class CDockAreaWidget;
-struct DockContainerWidgetPrivate;
+class DockContainerWidgetPrivate;
 class CFloatingDockContainer;
 /**
 * The QDockWidget class provides a widget that can be docked inside a
@@ -52,374 +53,451 @@ struct DockContainerWidgetPrivate;
 */
 class ADS_EXPORT CDockWidget : public QFrame
 {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	DockWidgetPrivate* d; ///< private data (pimpl)
+    DockWidgetPrivate* d; ///< private data (pimpl)
-	friend struct DockWidgetPrivate;
+    friend struct DockWidgetPrivate;
 private slots:
-	/**
+    /**
-	 * Adjusts the toolbar icon sizes according to the floating state
+     * Adjusts the toolbar icon sizes according to the floating state
-	 */
+     */
-	void setToolbarFloatingStyle(bool topLevel);
+    void setToolbarFloatingStyle(bool topLevel);
 protected:
-	friend class CDockContainerWidget;
+    friend class CDockContainerWidget;
-	friend class CDockAreaWidget;
+    friend class CDockAreaWidget;
-	friend class CFloatingDockContainer;
+    friend class CFloatingDockContainer;
-	friend class CDockManager;
+    friend class CDockManager;
-	friend struct DockManagerPrivate;
+    friend struct DockManagerPrivate;
-	friend struct DockContainerWidgetPrivate;
+    friend class DockContainerWidgetPrivate;
-	friend class CDockAreaTabBar;
+    friend class CDockAreaTabBar;
-	friend class CDockWidgetTab;
+    friend class CDockWidgetTab;
-	friend struct DockWidgetTabPrivate;
+    friend struct DockWidgetTabPrivate;
    friend struct DockAreaTitleBarPrivate;
-	/**
+    /**
-	 * Assigns the dock manager that manages this dock widget
+     * Assigns the dock manager that manages this dock widget
-	 */
+     */
-	void setDockManager(CDockManager* DockManager);
+    void setDockManager(CDockManager* DockManager);
-	/**
+    /**
-	 * If this dock widget is inserted into a dock area, the dock area will
+     * If this dock widget is inserted into a dock area, the dock area will
-	 * be registered on this widget via this function. If a dock widget is
+     * be registered on this widget via this function. If a dock widget is
-	 * removed from a dock area, this function will be called with nullptr
+     * removed from a dock area, this function will be called with nullptr
-	 * value.
+     * value.
-	 */
+     */
-	void setDockArea(CDockAreaWidget* DockArea);
+    void setDockArea(CDockAreaWidget* DockArea);
-	/**
+    /**
-	 * This function changes the toggle view action without emitting any
+     * This function changes the toggle view action without emitting any
-	 * signal
+     * signal
-	 */
+     */
-	void setToggleViewActionChecked(bool Checked);
+    void setToggleViewActionChecked(bool Checked);
-	/**
+    /**
-	 * Saves the state into the given stream
+     * Saves the state into the given stream
-	 */
+     */
-	void saveState(QXmlStreamWriter& Stream) const;
+    void saveState(QXmlStreamWriter& Stream) const;
-	/**
+    /**
-	 * This is a helper function for the dock manager to flag this widget
+     * This is a helper function for the dock manager to flag this widget
-	 * as unassigned.
+     * as unassigned.
-	 * When calling the restore function, it may happen, that the saved state
+     * When calling the restore function, it may happen, that the saved state
-	 * contains less dock widgets then currently available. All widgets whose
+     * contains less dock widgets then currently available. All widgets whose
-	 * data is not contained in the saved state, are flagged as unassigned
+     * data is not contained in the saved state, are flagged as unassigned
-	 * after the restore process. If the user shows an unassigned dock widget,
+     * after the restore process. If the user shows an unassigned dock widget,
-	 * a floating widget will be created to take up the dock widget.
+     * a floating widget will be created to take up the dock widget.
-	 */
+     */
-	void flagAsUnassigned();
+    void flagAsUnassigned();
-	/**
+    /**
-	 * Call this function to emit a topLevelChanged() signal and to update
+     * Call this function to emit a topLevelChanged() signal and to update
-	 * the dock area tool bar visibility
+     * the dock area tool bar visibility
-	 */
+     */
-	static void emitTopLevelEventForWidget(CDockWidget* TopLevelDockWidget, bool Floating);
+    static void emitTopLevelEventForWidget(CDockWidget* TopLevelDockWidget, bool Floating);
-	/**
+    /**
-	 * Use this function to emit a top level changed event.
+     * Use this function to emit a top level changed event.
-	 * Do never use emit topLevelChanged(). Always use this function because
+     * Do never use emit topLevelChanged(). Always use this function because
-	 * it only emits a signal if the floating state has really changed
+     * it only emits a signal if the floating state has really changed
-	 */
+     */
-	void emitTopLevelChanged(bool Floating);
+    void emitTopLevelChanged(bool Floating);
-	/**
+    /**
-	 * Internal function for modifying the closed state when restoring
+     * Internal function for modifying the closed state when restoring
-	 * a saved docking state
+     * a saved docking state
-	 */
+     */
-	void setClosedState(bool Closed);
+    void setClosedState(bool Closed);
-	/**
+    /**
-	 * Internal toggle view function that does not check if the widget
+     * Internal toggle view function that does not check if the widget
-	 * already is in the given state
+     * already is in the given state
-	 */
+     */
-	void toggleViewInternal(bool Open);
+    void toggleViewInternal(bool Open);
    /**
     * Internal close dock widget implementation.
     * The function returns true if the dock widget has been closed or hidden
     */
    bool closeDockWidgetInternal(bool ForceClose = false);
 public:
-	enum DockWidgetFeature
+    using Super = QFrame;
 	{
 		DockWidgetClosable = 0x01,
 		DockWidgetMovable = 0x02,
 		DockWidgetFloatable = 0x04,
 		AllDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable,
 		NoDockWidgetFeatures = 0x00
 	};
 	Q_DECLARE_FLAGS(DockWidgetFeatures, DockWidgetFeature)
-	enum eState
+    enum DockWidgetFeature
-	{
+    {
-		StateHidden,
+        DockWidgetClosable = 0x01,
-		StateDocked,
+        DockWidgetMovable = 0x02,///< this feature is not properly implemented yet and is ignored
-		StateFloating
+        DockWidgetFloatable = 0x04,
-	};
+        DockWidgetDeleteOnClose = 0x08, ///< deletes the dock widget when it is closed
        CustomCloseHandling = 0x10,
        DefaultDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable,
        AllDockWidgetFeatures = DefaultDockWidgetFeatures | DockWidgetDeleteOnClose | CustomCloseHandling,
        NoDockWidgetFeatures = 0x00
    };
    Q_DECLARE_FLAGS(DockWidgetFeatures, DockWidgetFeature)
-	/**
+    enum eState
-	 * Sets the widget for the dock widget to widget.
+    {
-	 * The InsertMode defines how the widget is inserted into the dock widget.
+        StateHidden,
-	 * The content of a dock widget should be resizable do a very small size to
+        StateDocked,
-	 * prevent the dock widget from blocking the resizing. To ensure, that a
+        StateFloating
-	 * dock widget can be resized very well, it is better to insert the content+
+    };
 	 * widget into a scroll area or to provide a widget that is already a scroll
 	 * area or that contains a scroll area.
 	 * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
 	 * detect how to insert the given widget. If the widget is derived from
 	 * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
 	 * directly. If the given widget is not a scroll area, the widget will be
 	 * inserted into a scroll area.
 	 * To force insertion into a scroll area, you can also provide the InsertMode
 	 * ForceScrollArea. To prevent insertion into a scroll area, you can
 	 * provide the InsertMode ForceNoScrollArea
 	 */
 	enum eInsertMode
 	{
 		AutoScrollArea,
 		ForceScrollArea,
 		ForceNoScrollArea
 	};
-	/**
+    /**
-	 * This mode configures the behavior of the toggle view action.
+     * Sets the widget for the dock widget to widget.
-	 * If the mode if ActionModeToggle, then the toggle view action is
+     * The InsertMode defines how the widget is inserted into the dock widget.
-	 * a checkable action to show / hide the dock widget. If the mode
+     * The content of a dock widget should be resizable do a very small size to
-	 * is ActionModeShow, then the action is not checkable an it will
+     * prevent the dock widget from blocking the resizing. To ensure, that a
-	 * always show the dock widget if clicked. If the mode is ActionModeShow,
+     * dock widget can be resized very well, it is better to insert the content+
-	 * the user can only close the DockWidget with the close button.
+     * widget into a scroll area or to provide a widget that is already a scroll
-	 */
+     * area or that contains a scroll area.
-	enum eToggleViewActionMode
+     * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
-	{
+     * detect how to insert the given widget. If the widget is derived from
-		ActionModeToggle,//!< ActionModeToggle
+     * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
-		ActionModeShow   //!< ActionModeShow
+     * directly. If the given widget is not a scroll area, the widget will be
-	};
+     * inserted into a scroll area.
     * To force insertion into a scroll area, you can also provide the InsertMode
     * ForceScrollArea. To prevent insertion into a scroll area, you can
     * provide the InsertMode ForceNoScrollArea
     */
    enum eInsertMode
    {
        AutoScrollArea,
        ForceScrollArea,
        ForceNoScrollArea
    };
    /**
     * This mode configures the behavior of the toggle view action.
     * If the mode if ActionModeToggle, then the toggle view action is
     * a checkable action to show / hide the dock widget. If the mode
     * is ActionModeShow, then the action is not checkable an it will
     * always show the dock widget if clicked. If the mode is ActionModeShow,
     * the user can only close the DockWidget with the close button.
     */
    enum eToggleViewActionMode
    {
        ActionModeToggle,//!< ActionModeToggle
        ActionModeShow   //!< ActionModeShow
    };
-	/**
+    /**
-	 * This constructor creates a dock widget with the given title.
+     * This constructor creates a dock widget with the given title.
-	 * The title is the text that is shown in the window title when the dock
+     * The title is the text that is shown in the window title when the dock
-	 * widget is floating and it is the title that is shown in the titlebar
+     * widget is floating and it is the title that is shown in the titlebar
-	 * or the tab of this dock widget if it is tabified.
+     * or the tab of this dock widget if it is tabified.
-	 * The object name of the dock widget is also set to the title. The
+     * The object name of the dock widget is also set to the title. The
-	 * object name is required by the dock manager to properly save and restore
+     * object name is required by the dock manager to properly save and restore
-	 * the state of the dock widget. That means, the title needs to be unique.
+     * the state of the dock widget. That means, the title needs to be unique.
-	 * If your title is not unique or if you would like to change the title
+     * If your title is not unique or if you would like to change the title
-	 * during runtime, you need to set a unique object name explicitely
+     * during runtime, you need to set a unique object name explicitely
-	 * by calling setObjectName() after construction.
+     * by calling setObjectName() after construction.
-	 * Use the layoutFlags to configure the layout of the dock widget.
+     * Use the layoutFlags to configure the layout of the dock widget.
-	 */
+     */
-	CDockWidget(const QString &title, QWidget* parent = 0);
+    CDockWidget(const QString &title, QWidget* parent = 0);
-	/**
+    /**
-	 * Virtual Destructor
+     * Virtual Destructor
-	 */
+     */
-	virtual ~CDockWidget();
+    virtual ~CDockWidget();
-	/**
+    /**
-	 * We return a fixed minimum size hint for all dock widgets
+     * We return a fixed minimum size hint for all dock widgets
-	 */
+     */
-	virtual QSize minimumSizeHint() const override;
+    virtual QSize minimumSizeHint() const override;
-	/**
+    /**
-	 * Sets the widget for the dock widget to widget.
+     * Sets the widget for the dock widget to widget.
-	 * The InsertMode defines how the widget is inserted into the dock widget.
+     * The InsertMode defines how the widget is inserted into the dock widget.
-	 * The content of a dock widget should be resizable do a very small size to
+     * The content of a dock widget should be resizable do a very small size to
-	 * prevent the dock widget from blocking the resizing. To ensure, that a
+     * prevent the dock widget from blocking the resizing. To ensure, that a
-	 * dock widget can be resized very well, it is better to insert the content+
+     * dock widget can be resized very well, it is better to insert the content+
-	 * widget into a scroll area or to provide a widget that is already a scroll
+     * widget into a scroll area or to provide a widget that is already a scroll
-	 * area or that contains a scroll area.
+     * area or that contains a scroll area.
-	 * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
+     * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
-	 * detect how to insert the given widget. If the widget is derived from
+     * detect how to insert the given widget. If the widget is derived from
-	 * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
+     * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
-	 * directly. If the given widget is not a scroll area, the widget will be
+     * directly. If the given widget is not a scroll area, the widget will be
-	 * inserted into a scroll area.
+     * inserted into a scroll area.
-	 * To force insertion into a scroll area, you can also provide the InsertMode
+     * To force insertion into a scroll area, you can also provide the InsertMode
-	 * ForceScrollArea. To prevent insertion into a scroll area, you can
+     * ForceScrollArea. To prevent insertion into a scroll area, you can
-	 * provide the InsertMode ForceNoScrollArea
+     * provide the InsertMode ForceNoScrollArea
-	 */
+     */
-	void setWidget(QWidget* widget, eInsertMode InsertMode = AutoScrollArea);
+    void setWidget(QWidget* widget, eInsertMode InsertMode = AutoScrollArea);
-	/**
+    /**
-	 * Returns the widget for the dock widget. This function returns zero if
+     * Remove the widget from the dock and give ownership back to the caller
-	 * the widget has not been set.
+     */
-	 */
+    QWidget* takeWidget();
 	QWidget* widget() const;
-	/**
+    /**
-	 * Returns the title bar widget of this dock widget
+     * Returns the widget for the dock widget. This function returns zero if
-	 */
+     * the widget has not been set.
-	CDockWidgetTab* tabWidget() const;
+     */
    QWidget* widget() const;
-	/**
+    /**
-	 * Sets, whether the dock widget is movable, closable, and floatable.
+     * Returns the tab widget of this dock widget that is shown in the dock
-	 */
+     * area title bar
-	void setFeatures(DockWidgetFeatures features);
+     */
    CDockWidgetTab* tabWidget() const;
-	/**
+    /**
-	 * Sets the feature flag for this dock widget if on is true; otherwise
+     * Sets, whether the dock widget is movable, closable, and floatable.
-	 * clears the flag.
+     */
-	 */
+    void setFeatures(DockWidgetFeatures features);
 	void setFeature(DockWidgetFeature flag, bool on);
-	/**
+    /**
-	 * This property holds whether the dock widget is movable, closable, and
+     * Sets the feature flag for this dock widget if on is true; otherwise
-	 * floatable.
+     * clears the flag.
-	 * By default, this property is set to a combination of DockWidgetClosable,
+     */
-	 * DockWidgetMovable and DockWidgetFloatable.
+    void setFeature(DockWidgetFeature flag, bool on);
 	 */
 	DockWidgetFeatures features() const;
-	/**
+    /**
-	 * Returns the dock manager that manages the dock widget or 0 if the widget
+     * This property holds whether the dock widget is movable, closable, and
-	 * has not been assigned to any dock manager yet
+     * floatable.
-	 */
+     * By default, this property is set to a combination of DockWidgetClosable,
-	CDockManager* dockManager() const;
+     * DockWidgetMovable and DockWidgetFloatable.
     */
    DockWidgetFeatures features() const;
-	/**
+    /**
-	 * Returns the dock container widget this dock area widget belongs to or 0
+     * Returns the dock manager that manages the dock widget or 0 if the widget
-	 * if this dock widget has not been docked yet
+     * has not been assigned to any dock manager yet
-	 */
+     */
-	CDockContainerWidget* dockContainer() const;
+    CDockManager* dockManager() const;
-	/**
+    /**
-	 * Returns the dock area widget this dock widget belongs to or 0
+     * Returns the dock container widget this dock area widget belongs to or 0
-	 * if this dock widget has not been docked yet
+     * if this dock widget has not been docked yet
-	 */
+     */
-	CDockAreaWidget* dockAreaWidget() const;
+    CDockContainerWidget* dockContainer() const;
-	/**
+    /**
-	 * This property holds whether the dock widget is floating.
+     * Returns the dock area widget this dock widget belongs to or 0
-	 * A dock widget is only floating, if it is the one and only widget inside
+     * if this dock widget has not been docked yet
-	 * of a floating container. If there are more than one dock widget in a
+     */
-	 * floating container, the all dock widgets are docked and not floating.
+    CDockAreaWidget* dockAreaWidget() const;
 	 */
 	bool isFloating() const;
-	/**
+    /**
-	 * This function returns true, if this dock widget is in a floating.
+     * This property holds whether the dock widget is floating.
-	 * The function returns true, if the dock widget is floating and it also
+     * A dock widget is only floating, if it is the one and only widget inside
-	 * returns true if it is docked inside of a floating container.
+     * of a floating container. If there are more than one dock widget in a
-	 */
+     * floating container, the all dock widgets are docked and not floating.
-	bool isInFloatingContainer() const;
+     */
    bool isFloating() const;
-	/**
+    /**
-	 * Returns true, if this dock widget is closed.
+     * This function returns true, if this dock widget is in a floating.
-	 */
+     * The function returns true, if the dock widget is floating and it also
-	bool isClosed() const;
+     * returns true if it is docked inside of a floating container.
     */
    bool isInFloatingContainer() const;
-	/**
+    /**
-	 * Returns a checkable action that can be used to show or close this dock widget.
+     * Returns true, if this dock widget is closed.
-	 * The action's text is set to the dock widget's window title.
+     */
-	 */
+    bool isClosed() const;
 	QAction* toggleViewAction() const;
-	/**
+    /**
-	 * Configures the behavior of the toggle view action.
+     * Returns a checkable action that can be used to show or close this dock widget.
-	 * \see eToggleViewActionMode for a detailed description
+     * The action's text is set to the dock widget's window title.
-	 */
+     */
-	void setToggleViewActionMode(eToggleViewActionMode Mode);
+    QAction* toggleViewAction() const;
-	/**
+    /**
-	 * Sets the dock widget icon that is shown in tabs and in toggle view
+     * Configures the behavior of the toggle view action.
-	 * actions
+     * \see eToggleViewActionMode for a detailed description
-	 */
+     */
-	void setIcon(const QIcon& Icon);
+    void setToggleViewActionMode(eToggleViewActionMode Mode);
-	/**
+    /**
-	 * Returns the icon that has been assigned to the dock widget
+     * Sets the dock widget icon that is shown in tabs and in toggle view
-	 */
+     * actions
-	QIcon icon() const;
+     */
    void setIcon(const QIcon& Icon);
-	/**
+    /**
-	 * If the WithToolBar layout flag is enabled, then this function returns
+     * Returns the icon that has been assigned to the dock widget
-	 * the dock widget toolbar. If the flag is disabled, the function returns
+     */
-	 * a nullptr.
+    QIcon icon() const;
 	 * This function returns the dock widget top tool bar.
 	 * If no toolbar is assigned, this function returns nullptr. To get a vaild
 	 * toolbar you either need to create a default empty toolbar via
 	 * createDefaultToolBar() function or you need to assign you custom
 	 * toolbar via setToolBar().
 	 */
 	QToolBar* toolBar() const;
-	/**
+    /**
-	 * If you would like to use the default top tool bar, then call this
+     * If the WithToolBar layout flag is enabled, then this function returns
-	 * function to create the default tool bar.
+     * the dock widget toolbar. If the flag is disabled, the function returns
-	 * After this function the toolBar() function will return a valid toolBar()
+     * a nullptr.
-	 * object.
+     * This function returns the dock widget top tool bar.
-	 */
+     * If no toolbar is assigned, this function returns nullptr. To get a vaild
-	QToolBar* createDefaultToolBar();
+     * toolbar you either need to create a default empty toolbar via
     * createDefaultToolBar() function or you need to assign you custom
     * toolbar via setToolBar().
     */
    QToolBar* toolBar() const;
-	/**
+    /**
-	 * Assign a new tool bar that is shown above the content widget.
+     * If you would like to use the default top tool bar, then call this
-	 * The dock widget will become the owner of the tool bar and deletes it
+     * function to create the default tool bar.
-	 * on destruction
+     * After this function the toolBar() function will return a valid toolBar()
-	 */
+     * object.
-	void setToolBar(QToolBar* ToolBar);
+     */
    QToolBar* createDefaultToolBar();
-	/**
+    /**
-	 * This function sets the tool button style for the given dock widget state.
+     * Assign a new tool bar that is shown above the content widget.
-	 * It is possible to switch the tool button style depending on the state.
+     * The dock widget will become the owner of the tool bar and deletes it
-	 * If a dock widget is floating, then here are more space and it is
+     * on destruction
-	 * possible to select a style that requires more space like
+     */
-	 * Qt::ToolButtonTextUnderIcon. For the docked state Qt::ToolButtonIconOnly
+    void setToolBar(QToolBar* ToolBar);
 	 * might be better.
 	 */
 	void setToolBarStyle(Qt::ToolButtonStyle Style, eState State);
-	/**
+    /**
-	 * Returns the tool button style for the given docking state.
+     * This function sets the tool button style for the given dock widget state.
-	 * \see setToolBarStyle()
+     * It is possible to switch the tool button style depending on the state.
-	 */
+     * If a dock widget is floating, then here are more space and it is
-	Qt::ToolButtonStyle toolBarStyle(eState State) const;
+     * possible to select a style that requires more space like
     * Qt::ToolButtonTextUnderIcon. For the docked state Qt::ToolButtonIconOnly
     * might be better.
     */
    void setToolBarStyle(Qt::ToolButtonStyle Style, eState State);
-	/**
+    /**
-	 * This function sets the tool button icon size for the given state.
+     * Returns the tool button style for the given docking state.
-	 * If a dock widget is floating, there is more space an increasing the
+     * \see setToolBarStyle()
-	 * icon size is possible. For docked widgets, small icon sizes, eg. 16 x 16
+     */
-	 * might be better.
+    Qt::ToolButtonStyle toolBarStyle(eState State) const;
 	 */
 	void setToolBarIconSize(const QSize& IconSize, eState State);
-	/**
+    /**
-	 * Returns the icon size for a given docking state.
+     * This function sets the tool button icon size for the given state.
-	 * \see setToolBarIconSize()
+     * If a dock widget is floating, there is more space an increasing the
-	 */
+     * icon size is possible. For docked widgets, small icon sizes, eg. 16 x 16
-	QSize toolBarIconSize(eState State) const;
+     * might be better.
     */
    void setToolBarIconSize(const QSize& IconSize, eState State);
    /**
     * Returns the icon size for a given docking state.
     * \see setToolBarIconSize()
     */
    QSize toolBarIconSize(eState State) const;
    /**
     * Set the actions that will be shown in the dock area title bar
     * if this dock widget is the active tab.
     * You should not add to many actions to the title bar, because this
     * will remove the available space for the tabs. If you have a number
     * of actions, just add an action with a menu to show a popup menu
     * button in the title bar.
     */
    void setTitleBarActions(QList<QAction*> actions);
    /**
     * Returns a list of actions that will be inserted into the dock area title
     * bar if this dock widget becomes the current widget
     */
    virtual QList<QAction*> titleBarActions() const;
 #ifndef QT_NO_TOOLTIP
    /**
     * This is function sets text tooltip for title bar widget
     * and tooltip for toggle view action
     */
    void setTabToolTip(const QString &text);
 #endif
 public: // reimplements QFrame -----------------------------------------------
-	/**
+    /**
-	 * Emits titleChanged signal if title change event occurs
+     * Emits titleChanged signal if title change event occurs
-	 */
+     */
-	virtual bool event(QEvent *e) override;
+    virtual bool event(QEvent *e) override;
 public slots:
-	/**
+    /**
-	 * This property controls whether the dock widget is open or closed.
+     * This property controls whether the dock widget is open or closed.
-	 * The toogleViewAction triggers this slot
+     * The toogleViewAction triggers this slot
-	 */
+     */
-	void toggleView(bool Open = true);
+    void toggleView(bool Open = true);
    /**
     * This function will make a docked widget floating
     */
    void setFloating();
    /**
     * This function will delete the dock widget and its content from the
     * docking system
     */
    void deleteDockWidget();
    /**
     * Closes the dock widget
     */
    void closeDockWidget();
 signals:
-	/**
+    /**
-	 * This signal is emitted if the dock widget is opened or closed
+     * This signal is emitted if the dock widget is opened or closed
-	 */
+     */
-	void viewToggled(bool Open);
+    void viewToggled(bool Open);
-	/**
+    /**
-	 * This signal is emitted if the dock widget is closed
+     * This signal is emitted if the dock widget is closed
-	 */
+     */
-	void closed();
+    void closed();
-	/**
+    /**
-	 * This signal is emitted if the window title of this dock widget
+     * This signal is emitted if the window title of this dock widget
-	 * changed
+     * changed
-	 */
+     */
-	void titleChanged(const QString& Title);
+    void titleChanged(const QString& Title);
-	/**
+    /**
-	 * This signal is emitted when the floating property changes.
+     * This signal is emitted when the floating property changes.
-	 * The topLevel parameter is true if the dock widget is now floating;
+     * The topLevel parameter is true if the dock widget is now floating;
-	 * otherwise it is false.
+     * otherwise it is false.
-	 */
+     */
-	void topLevelChanged(bool topLevel);
+    void topLevelChanged(bool topLevel);
    /**
     * This signal is emitted, if close is requested
     */
    void closeRequested();
    /**
     * This signal is emitted when the dock widget becomes visible (or invisible).
     * This happens when the widget is hidden or shown, as well as when it is
     * docked in a tabbed dock area and its tab becomes selected or unselected.
     */
    void visibilityChanged(bool visible);
    /**
     * This signal is emitted when the features property changes.
     * The features parameter gives the new value of the property.
     */
    void featuresChanged(DockWidgetFeatures features);
 }; // class DockWidget
 }
 // namespace ads
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -28,7 +28,8 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <ElidingLabel.h>
+#include <FloatingDragPreview.h>
 #include "ElidingLabel.h"
 #include "DockWidgetTab.h"
 #include <QBoxLayout>
@@ -48,24 +49,14 @@
 #include "FloatingDockContainer.h"
 #include "DockOverlay.h"
 #include "DockManager.h"
 #include "IconProvider.h"
 #include <iostream>
 namespace ads
 {
 /**
 * The different dragging states
 */
 enum eDragState
 {
 	DraggingInactive,     //!< DraggingInactive
 	DraggingMousePressed, //!< DraggingMousePressed
 	DraggingTab,          //!< DraggingTab
 	DraggingFloatingWidget//!< DraggingFloatingWidget
 };
 using tTabLabel = CElidingLabel;
 using tCloseButton = QPushButton;
 /**
 * Private data class of CDockWidgetTab class (pimpl)
@@ -76,14 +67,15 @@ struct DockWidgetTabPrivate
 	CDockWidget* DockWidget;
 	QLabel* IconLabel = nullptr;
 	tTabLabel* TitleLabel;
-	QPoint DragStartMousePosition;
+	QPoint GlobalDragStartMousePosition;
 	bool IsActiveTab = false;
 	CDockAreaWidget* DockArea = nullptr;
 	eDragState DragState = DraggingInactive;
-	CFloatingDockContainer* FloatingWidget = nullptr;
+	IFloatingWidget* FloatingWidget = nullptr;
 	QIcon Icon;
-	tCloseButton* CloseButton = nullptr;
+	QAbstractButton* CloseButton = nullptr;
 	QSpacerItem* IconTextSpacer;
 	QPoint TabDragStartPosition;
 	/**
 	 * Private data constructor
@@ -103,34 +95,60 @@ struct DockWidgetTabPrivate
 	/**
 	 * Test function for current drag state
 	 */
-	bool isDraggingState(eDragState dragState)
+	bool isDraggingState(eDragState dragState) const
 	{
 		return this->DragState == dragState;
 	}
 	/**
 	 * Returns true if the given global point is inside the title area geometry
 	 * rectangle.
 	 * The position is given as global position.
 	 */
 	bool titleAreaGeometryContains(const QPoint& GlobalPos) const
 	{
 		return DockArea->titleBarGeometry().contains(DockArea->mapFromGlobal(GlobalPos));
 	}
 	/**
 	 * Starts floating of the dock widget that belongs to this title bar
 	 * Returns true, if floating has been started and false if floating
 	 * is not possible for any reason
 	 */
-	bool startFloating();
+	bool startFloating(eDragState DraggingState = DraggingFloatingWidget);
 	/**
 	 * Returns true if the given config flag is set
 	 */
 	bool testConfigFlag(CDockManager::eConfigFlag Flag) const
 	{
-		return DockArea->dockManager()->configFlags().testFlag(Flag);
+		return CDockManager::configFlags().testFlag(Flag);
 	}
 	/**
 	 * Creates the close button as QPushButton or as QToolButton
 	 */
 	QAbstractButton* createCloseButton() const
 	{
 		if (testConfigFlag(CDockManager::TabCloseButtonIsToolButton))
 		{
 			auto Button = new QToolButton();
 			Button->setAutoRaise(true);
 			return Button;
 		}
 		else
 		{
 			return new QPushButton();
 		}
 	}
 	template <typename T>
 	IFloatingWidget* createFloatingWidget(T* Widget, bool OpaqueUndocking)
 	{
 		if (OpaqueUndocking)
 		{
 			return new CFloatingDockContainer(Widget);
 		}
 		else
 		{
 			auto w = new CFloatingDragPreview(Widget);
 			_this->connect(w, &CFloatingDragPreview::draggingCanceled, [=]()
 			{
 				DragState = DraggingInactive;
 			});
 			return w;
 		}
 	}
 };
 // struct DockWidgetTabPrivate
@@ -152,18 +170,15 @@ void DockWidgetTabPrivate::createLayout()
 	TitleLabel->setText(DockWidget->windowTitle());
 	TitleLabel->setObjectName("dockWidgetTabLabel");
 	TitleLabel->setAlignment(Qt::AlignCenter);
 	_this->connect(TitleLabel, SIGNAL(elidedChanged(bool)), SIGNAL(elidedChanged(bool)));
-	CloseButton = new tCloseButton();
+
 	CloseButton = createCloseButton();
 	CloseButton->setObjectName("tabCloseButton");
-	// The standard icons do does not look good on high DPI screens
+	internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, TabCloseIcon);
-	QIcon CloseIcon =  _this->style()->standardIcon(QStyle::SP_TitleBarCloseButton);
+    CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-	QPixmap normalPixmap = _this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton, 0, CloseButton);
+    _this->onDockWidgetFeaturesChanged();
-	QPixmap disabledPixmap = internal::createTransparentPixmap(normalPixmap, 0.25);
+	internal::setToolTip(CloseButton, QObject::tr("Close Tab"));
 	CloseIcon.addPixmap(disabledPixmap, QIcon::Disabled);
 	CloseButton->setIcon(CloseIcon);
 	CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	CloseButton->setVisible(false);
 	CloseButton->setToolTip(QObject::tr("Close Tab"));
 	_this->connect(CloseButton, SIGNAL(clicked()), SIGNAL(closeRequested()));
 	QFontMetrics fm(TitleLabel->font());
@@ -187,22 +202,21 @@ void DockWidgetTabPrivate::createLayout()
 void DockWidgetTabPrivate::moveTab(QMouseEvent* ev)
 {
    ev->accept();
-    int left, top, right, bottom;
+    QPoint Distance = ev->globalPos() - GlobalDragStartMousePosition;
-    _this->getContentsMargins(&left, &top, &right, &bottom);
+    Distance.setY(0);
-    QPoint moveToPos = _this->mapToParent(ev->pos()) - DragStartMousePosition;
+    auto TargetPos = Distance + TabDragStartPosition;
-    moveToPos.setY(0);
+    _this->move(TargetPos);
    _this->move(moveToPos);
    _this->raise();
 }
 //============================================================================
-bool DockWidgetTabPrivate::startFloating()
+bool DockWidgetTabPrivate::startFloating(eDragState DraggingState)
 {
 	auto dockContainer = DockWidget->dockContainer();
-	qDebug() << "isFloating " << dockContainer->isFloating();
+    ADS_PRINT("isFloating " << dockContainer->isFloating());
-	qDebug() << "areaCount " << dockContainer->dockAreaCount();
+    ADS_PRINT("areaCount " << dockContainer->dockAreaCount());
-	qDebug() << "widgetCount " << DockWidget->dockAreaWidget()->dockWidgetsCount();
+    ADS_PRINT("widgetCount " << DockWidget->dockAreaWidget()->dockWidgetsCount());
 	// if this is the last dock widget inside of this floating widget,
 	// then it does not make any sense, to make it floating because
 	// it is already floating
@@ -213,27 +227,38 @@ bool DockWidgetTabPrivate::startFloating()
 		return false;
 	}
-	qDebug() << "startFloating";
+    ADS_PRINT("startFloating");
-	DragState = DraggingFloatingWidget;
+	DragState = DraggingState;
 	auto DragStartMousePosition = _this->mapFromGlobal(GlobalDragStartMousePosition);
 	QSize Size = DockArea->size();
-	CFloatingDockContainer* FloatingWidget = nullptr;
+	IFloatingWidget* FloatingWidget = nullptr;
 	bool OpaqueUndocking = CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking) ||
 		(DraggingFloatingWidget != DraggingState);
 	// If section widget has multiple tabs, we take only one tab
 	// If it has only one single tab, we can move the complete
 	// dock area into floating widget
 	if (DockArea->dockWidgetsCount() > 1)
 	{
-		// If section widget has multiple tabs, we take only one tab
+		FloatingWidget = createFloatingWidget(DockWidget, OpaqueUndocking);
 		FloatingWidget = new CFloatingDockContainer(DockWidget);
 	}
 	else
 	{
-		// If section widget has only one content widget, we can move the complete
+		FloatingWidget = createFloatingWidget(DockArea, OpaqueUndocking);
 		// dock area into floating widget
 		FloatingWidget = new CFloatingDockContainer(DockArea);
 	}
-    FloatingWidget->startFloating(DragStartMousePosition, Size);
+    if (DraggingFloatingWidget == DraggingState)
-    auto Overlay = DockWidget->dockManager()->containerOverlay();
+    {
-	Overlay->setAllowedAreas(OuterDockAreas);
+        FloatingWidget->startFloating(DragStartMousePosition, Size, DraggingFloatingWidget, _this);
-	this->FloatingWidget = FloatingWidget;
+    	auto Overlay = DockWidget->dockManager()->containerOverlay();
-	DockWidget->emitTopLevelChanged(true);
+    	Overlay->setAllowedAreas(OuterDockAreas);
    	this->FloatingWidget = FloatingWidget;
    }
    else
    {
     	FloatingWidget->startFloating(DragStartMousePosition, Size, DraggingInactive, nullptr);
    }
 	return true;
 }
@@ -251,7 +276,7 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
 //============================================================================
 CDockWidgetTab::~CDockWidgetTab()
 {
-	qDebug() << "~CDockWidgetTab()";
+    ADS_PRINT("~CDockWidgetTab()");
 	delete d;
 }
@@ -262,12 +287,12 @@ void CDockWidgetTab::mousePressEvent(QMouseEvent* ev)
 	if (ev->button() == Qt::LeftButton)
 	{
 		ev->accept();
-        d->DragStartMousePosition = ev->pos();
+        d->GlobalDragStartMousePosition = ev->globalPos();
        d->DragState = DraggingMousePressed;
        emit clicked();
 		return;
 	}
-	QFrame::mousePressEvent(ev);
+	Super::mousePressEvent(ev);
 }
@@ -275,15 +300,31 @@ void CDockWidgetTab::mousePressEvent(QMouseEvent* ev)
 //============================================================================
 void CDockWidgetTab::mouseReleaseEvent(QMouseEvent* ev)
 {
-	// End of tab moving, emit signal
+	if (ev->button() == Qt::LeftButton)
 	if (d->isDraggingState(DraggingTab) && d->DockArea)
 	{
-		emit moved(ev->globalPos());
+		auto CurrentDragState = d->DragState;
 		d->GlobalDragStartMousePosition = QPoint();
 		d->DragState = DraggingInactive;
 		switch (CurrentDragState)
 		{
 		case DraggingTab:
 			// End of tab moving, emit signal
 			if (d->DockArea)
 			{
 				emit moved(ev->globalPos());
 			}
 			break;
 		case DraggingFloatingWidget:
 			 d->FloatingWidget->finishDragging();
 			 break;
 		default:; // do nothing
 		}
 	}
-    d->DragStartMousePosition = QPoint();
+	Super::mouseReleaseEvent(ev);
    d->DragState = DraggingInactive;
 	QFrame::mouseReleaseEvent(ev);
 }
@@ -293,7 +334,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
    if (!(ev->buttons() & Qt::LeftButton) || d->isDraggingState(DraggingInactive))
    {
    	d->DragState = DraggingInactive;
-        QFrame::mouseMoveEvent(ev);
+        Super::mouseMoveEvent(ev);
        return;
    }
@@ -301,7 +342,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
    if (d->isDraggingState(DraggingFloatingWidget))
    {
        d->FloatingWidget->moveFloating();
-        QFrame::mouseMoveEvent(ev);
+        Super::mouseMoveEvent(ev);
        return;
    }
@@ -314,7 +355,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
    }
    // Maybe a fixed drag distance is better here ?
-    int DragDistanceY = qAbs(d->DragStartMousePosition.y() - ev->pos().y());
+    int DragDistanceY = qAbs(d->GlobalDragStartMousePosition.y() - ev->globalPos().y());
    if (DragDistanceY >= CDockManager::startDragDistance())
 	{
 		// If this is the last dock area in a dock container with only
@@ -328,20 +369,32 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
 		}
    	// Floating is only allowed for widgets that are movable
-        if (d->DockWidget->features().testFlag(CDockWidget::DockWidgetMovable))
+        if (d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable))
        {
        	// If we undock, we need to restore the initial position of this
        	// tab because it looks strange if it remains on its dragged position
        	if (d->isDraggingState(DraggingTab) && !CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking))
 			{
 				this->move(d->TabDragStartPosition);
 			}
            d->startFloating();
        }
    	return;
 	}
    else if (d->DockArea->openDockWidgetsCount() > 1
-     && (ev->pos() - d->DragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
+     && (ev->globalPos() - d->GlobalDragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
 	{
    	// If we start dragging the tab, we save its inital position to
    	// restore it later
    	if (DraggingTab != d->DragState)
    	{
    		d->TabDragStartPosition = this->pos();
    	}
        d->DragState = DraggingTab;
 		return;
 	}
-   QFrame::mouseMoveEvent(ev);
+   Super::mouseMoveEvent(ev);
 }
@@ -349,16 +402,26 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
 void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev)
 {
 	ev->accept();
-	std::cout << "CDockAreaTabBar::onTabContextMenuRequested" << std::endl;
+	if (d->isDraggingState(DraggingFloatingWidget))
 	{
 		return;
 	}
-	d->DragStartMousePosition = ev->pos();
+	d->GlobalDragStartMousePosition = ev->globalPos();
 	QMenu Menu(this);
-	Menu.addAction(tr("Detach"), this, SLOT(onDetachActionTriggered()));
+
    const bool isFloatable = d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable);
    const bool isNotOnlyTabInContainer =  !d->DockArea->dockContainer()->hasTopLevelDockWidget();
    const bool isDetachable = isFloatable && isNotOnlyTabInContainer;
 	auto Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget()));
    Action->setEnabled(isDetachable);
 	Menu.addSeparator();
-	auto Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested()));
+	Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested()));
 	Action->setEnabled(isClosable());
 	Menu.addAction(tr("Close Others"), this, SIGNAL(closeOtherTabsRequested()));
-	Menu.exec(mapToGlobal(ev->pos()));
+	Menu.exec(ev->globalPos());
 }
@@ -373,8 +436,10 @@ bool CDockWidgetTab::isActiveTab() const
 void CDockWidgetTab::setActiveTab(bool active)
 {
 	bool DockWidgetClosable = d->DockWidget->features().testFlag(CDockWidget::DockWidgetClosable);
-	bool TabHasCloseButton = d->testConfigFlag(CDockManager::ActiveTabHasCloseButton);
+	bool ActiveTabHasCloseButton = d->testConfigFlag(CDockManager::ActiveTabHasCloseButton);
-	d->CloseButton->setVisible(active && DockWidgetClosable && TabHasCloseButton);
+	bool AllTabsHaveCloseButton = d->testConfigFlag(CDockManager::AllTabsHaveCloseButton);
 	bool TabHasCloseButton = (ActiveTabHasCloseButton && active) | AllTabsHaveCloseButton;
 	d->CloseButton->setVisible(DockWidgetClosable && TabHasCloseButton);
 	if (d->IsActiveTab == active)
 	{
 		return;
@@ -386,6 +451,7 @@ void CDockWidgetTab::setActiveTab(bool active)
 	d->TitleLabel->style()->unpolish(d->TitleLabel);
 	d->TitleLabel->style()->polish(d->TitleLabel);
 	update();
 	updateGeometry();
 	emit activeTabChanged();
 }
@@ -426,7 +492,7 @@ void CDockWidgetTab::setIcon(const QIcon& Icon)
 		d->IconLabel = new QLabel();
 		d->IconLabel->setAlignment(Qt::AlignVCenter);
 		d->IconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-		d->IconLabel->setToolTip(d->TitleLabel->toolTip());
+		internal::setToolTip(d->IconLabel, d->TitleLabel->toolTip());
 		Layout->insertWidget(0, d->IconLabel, Qt::AlignVCenter);
 		Layout->insertSpacing(1, qRound(1.5 * Layout->contentsMargins().left() / 2.0));
 	}
@@ -442,7 +508,7 @@ void CDockWidgetTab::setIcon(const QIcon& Icon)
 	d->Icon = Icon;
 	if (d->IconLabel)
 	{
-		d->IconLabel->setPixmap(Icon.pixmap(this->windowHandle(), QSize(16, 16)));
+		d->IconLabel->setPixmap(Icon.pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, this)));
 		d->IconLabel->setVisible(true);
 	}
 }
@@ -468,10 +534,11 @@ void CDockWidgetTab::mouseDoubleClickEvent(QMouseEvent *event)
 	// If this is the last dock area in a dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
-	if (!d->DockArea->dockContainer()->isFloating() || d->DockArea->dockWidgetsCount() > 1)
+	if ((!d->DockArea->dockContainer()->isFloating() || d->DockArea->dockWidgetsCount() > 1)
 		&& d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
-		d->DragStartMousePosition = event->pos();
+		d->GlobalDragStartMousePosition = event->globalPos();
-		d->startFloating();
+		d->startFloating(DraggingInactive);
 	}
 	Super::mouseDoubleClickEvent(event);
@@ -486,6 +553,19 @@ void CDockWidgetTab::setVisible(bool visible)
 }
 //============================================================================
 void CDockWidgetTab::setText(const QString& title)
 {
 	d->TitleLabel->setText(title);
 }
 bool CDockWidgetTab::isTitleElided() const
 {
 	return d->TitleLabel->isElided();
 }
 //============================================================================
 bool CDockWidgetTab::isClosable() const
 {
@@ -494,13 +574,44 @@ bool CDockWidgetTab::isClosable() const
 //===========================================================================
-void CDockWidgetTab::onDetachActionTriggered()
+void CDockWidgetTab::detachDockWidget()
 {
-	d->DragStartMousePosition = mapFromGlobal(QCursor::pos());
+	if (!d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable))
-	d->startFloating();
+	{
 		return;
 	}
 	d->GlobalDragStartMousePosition = QCursor::pos();
 	d->startFloating(DraggingInactive);
 }
 } // namespace ads
 //============================================================================
 bool CDockWidgetTab::event(QEvent *e)
 {
 #ifndef QT_NO_TOOLTIP
 	if (e->type() == QEvent::ToolTipChange)
 	{
 		const auto text = toolTip();
 		d->TitleLabel->setToolTip(text);
 	}
 #endif
 	return Super::event(e);
 }
 //============================================================================
 void CDockWidgetTab::onDockWidgetFeaturesChanged()
 {
 	auto Features = d->DockWidget->features();
 	auto SizePolicy = d->CloseButton->sizePolicy();
 	SizePolicy.setRetainSizeWhenHidden(Features.testFlag(CDockWidget::DockWidgetClosable)
 		&& d->testConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden));
 	d->CloseButton->setSizePolicy(SizePolicy);
 }
 } // namespace ads
 //---------------------------------------------------------------------------
 // EOF DockWidgetTab.cpp
--- a/src/DockWidgetTab.h
+++ b/src/DockWidgetTab.h
@@ -53,9 +53,11 @@ class ADS_EXPORT CDockWidgetTab : public QFrame
 private:
 	DockWidgetTabPrivate* d; ///< private data (pimpl)
 	friend struct DockWidgetTabPrivate;
 	friend class CDockWidget;
 	void onDockWidgetFeaturesChanged();
 private slots:
-	void onDetachActionTriggered();
+	void detachDockWidget();
 protected:
 	virtual void mousePressEvent(QMouseEvent* ev) override;
@@ -126,12 +128,28 @@ public:
 	QString text() const;
 	/**
-	 * This function returns true if the assigned dock widget is closeable
+	 * Sets the tab text
 	 */
 	void setText(const QString& title);
 	/**
 	 * Returns true if text is elided on the tab's title
 	 */
 	bool isTitleElided() const;
 	/**
 	 * This function returns true if the assigned dock widget is closable
 	 */
 	bool isClosable() const;
 	/**
 	* Track event ToolTipChange and set child ToolTip 
 	*/
 	virtual bool event(QEvent *e) override;
 public slots:
-	virtual void setVisible(bool visible);
+	virtual void setVisible(bool visible) override;
 signals:
 	void activeTabChanged();
@@ -139,6 +157,7 @@ signals:
 	void closeRequested();
 	void closeOtherTabsRequested();
 	void moved(const QPoint& GlobalPos);
 	void elidedChanged(bool elided);
 }; // class DockWidgetTab
 }
 // namespace ads
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`include versioneer.py`
							`include PyQtAds/_version.py`