Improved documentation for Linux support

2021-01-03 17:27:01 +01:00
200 changed files with 4436 additions and 13038 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,52 +10,19 @@ environment:
    # Appveyor doesn't have Qt 12 yet
    LatestQtVersion: 5.13
  matrix:
+
 # 32 bit builds
-# MSVC 2015 builds
-# Dynamic Library builds
-    # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "false"
-    use_cmake: "false"
-    # LTS version of Qt, dll, 32bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    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\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "true"
-    use_cmake: "false"
-    # LTS version of Qt, static, 32bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    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\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "false"
    use_cmake: "false"
    # LTS version of Qt, dll, 32bit, MinGW, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
@@ -64,14 +31,14 @@ environment:
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MinGW, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "true"
    use_cmake: "false"
    # LTS version of Qt, static, 32bit, MinGW, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
@@ -79,19 +46,54 @@ environment:
    use_cmake: "true"
 # end Static Library builds
 # end MinGW builds
-# end 32 bit builds
-# 64 bit builds
-# MSVC 2015 builds
+# MSVC 2017 builds
 # Dynamic Library builds
-    # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, dll, 32bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    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 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2017 builds
+# end 32 bit builds
+
+# 64 bit builds
+# MSVC 2017 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "false"
    use_cmake: "false"
-    # LTS version of Qt, dll, 64bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, dll, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
@@ -99,38 +101,40 @@ environment:
    use_cmake: "true"
 # end Dynamic Library builds
 # Static Library builds
-    # LTS version of Qt, static, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, static, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "false"
-    # LTS version of Qt, static, 64bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, static, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "true"
 # end Static Library builds
-# end MSVC 2015 builds
+# end MSVC 2017 builds
 # end 64 bit builds

+
 matrix:
  fast_finish: true

 before_build:
 - set originalWD=%CD%
- call "%QT5%\bin\qtenv2.bat"
+- call "%QT%\bin\qtenv2.bat"
 - cd /D %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;=%
+- if %use_mingw%==true set PATH=%PATH%:C:\Program Files\Git\usr\bin;=%

 build_script:
+- echo %PATH%
 - if %use_cmake%==true mkdir build 
 - if %use_cmake%==true cd build
 - if %use_cmake%==true cmake --version
--- a/.github/workflows/linux-builds.yml
+++ b/.github/workflows/linux-builds.yml
@@ -6,7 +6,7 @@ jobs:
  build:
    strategy:
      matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest, ubuntu-18.04, ubuntu-16.04]

    runs-on: ${{ matrix.os }}
    
@@ -16,44 +16,8 @@ jobs:
      run: |
        sudo apt-get update --fix-missing
        sudo apt-get install qt5-default
-        sudo apt-get install qtbase5-private-dev
+        sudo apt-get install libqt5x11extras5-dev
    - name: qmake
      run: qmake
    - name: make
      run: make -j4
-      
-  build_ubuntu_2204:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Cache Qt
-      id: cache-qt-6-4
-      uses: actions/cache@v1  # not v2!
-      with:
-        path: ../Qt/6.4.2
-        key: ${{ runner.os }}-QtCache-Qt6-4
-
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v2
-      with:
-        version: '6.4.2'
-        host: 'linux'
-        target: 'desktop'
-        install-deps: true
-        cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
-        setup-python: true
-        tools: ''
-        tools-only: false
-
-    - name: Install needed xkbcommon symlink
-      run: sudo apt-get install libxkbcommon-dev -y    
-
-    - name: Ubuntu and Qt version
-      run: |
-        cat /etc/issue
-        echo number of processors: $(nproc)
-        qmake -v
-    - name: qmake
-      run: qmake
-    - name: make
-      run: make -j$(nproc)
--- a/.gitignore
+++ b/.gitignore
@@ -383,4 +383,3 @@ FodyWeavers.xsd
 / build
 /Settings.ini
 .vscode/settings.json
-/.settings
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1242828358748104657" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+		</extension>
+	</configuration>
+</project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ matrix:
    os: linux
    dist: trusty
    group: stable
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -18,6 +20,8 @@ matrix:
        packages:
        - qt55base
        - qt55tools
+        - qt55x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
    script:
@@ -35,6 +39,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -44,6 +50,8 @@ matrix:
        packages:
        - qt514base
        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -65,6 +73,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev  
    addons:  
      apt:
        sources:
@@ -74,6 +84,8 @@ matrix:
        packages:
        - qt514base
        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -95,6 +107,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -104,6 +118,8 @@ matrix:
        packages:
        - qt514base
        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -131,6 +147,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -140,6 +158,8 @@ matrix:
        packages:
        - qt514base
        - qt514tools
+        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,20 @@
 cmake_minimum_required(VERSION 3.5)
-
-# By default, the version information is extracted from the git index. However,
-# we can override this behavior by explicitly setting ADS_VERSION and
-# skipping the git checks. This is useful for cases where this project is being
-# used independently of its original git repo (e.g. vendored in another project)
-if(NOT ADS_VERSION)
-    set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
-    include(GetGitRevisionDescription)
-    git_describe(GitTagVersion --tags)
-    string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}")
-    string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}")
-    string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}")
-    set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-else()
-    string(REGEX MATCHALL "[\.]" VERSION_DOT_MATCHES ${ADS_VERSION})
-    list(LENGTH VERSION_DOT_MATCHES VERSION_DOT_COUNT)
-    if(VERSION_DOT_COUNT EQUAL 2)
-        set(VERSION_SHORT ${ADS_VERSION})
-    else()
-        message(FATAL_ERROR "ADS_VERSION must be in major.minor.patch format, e.g. 3.8.1. Got ${ADS_VERSION}")
-    endif()
-endif()
-
-
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+include(GetGitRevisionDescription)
+git_describe(GitTagVersion --tags)
+string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}")
+set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT})
-
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
-
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
    set(ads_PlatformDir "x86")
 else()
    set(ads_PlatformDir "x64")
 endif()
-
 add_subdirectory(src)
-
 if(BUILD_EXAMPLES)
    add_subdirectory(examples)
    add_subdirectory(demo)
--- 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
--- a/ads.pri
+++ b/ads.pri
@@ -1,28 +1,28 @@

-CONFIG(debug, debug|release){
-    win32-g++ {
-    	versionAtLeast(QT_VERSION, 5.15.0) {
-    		LIBS += -lqtadvanceddocking
-    	}
-    	else {
-    		LIBS += -lqtadvanceddockingd
-    	}
+lessThan(QT_MAJOR_VERSION, 6) {
+    CONFIG(debug, debug|release){
+        win32 {
+            LIBS += -lqtadvanceddockingd
+        }
+        else:mac {
+            LIBS += -lqtadvanceddocking_debug
+        }
+        else {
+            LIBS += -lqtadvanceddocking
+        }
    }
-    else:msvc {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
+    else{
        LIBS += -lqtadvanceddocking
    }
 }
-else{
+else {
+    # qt$$qtLibraryTarget(qtadvanceddocking) does not produce an advanceddockingd.dll file on Windows
+    # for Qt6 - I don't know if this is a bug and I have to investigate
    LIBS += -lqtadvanceddocking
 }


 unix:!macx {
    LIBS += -lxcb
+    QT += x11extras
 }
--- a/adsConfig.cmake
+++ b/adsConfig.cmake
@@ -2,4 +2,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
+if(UNIX AND NOT APPLE)
+    find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
+endif()
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -1,10 +1,9 @@
 cmake_minimum_required(VERSION 3.5)
 project(ads_demo VERSION ${VERSION_SHORT}) 

-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
-if(WIN32 AND QT_VERSION_MAJOR LESS 6)
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AxContainer REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+if(WIN32)
+    find_package(Qt5 5.5 COMPONENTS AxContainer REQUIRED)
 endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_demo_SRCS
@@ -13,19 +12,15 @@ set(ads_demo_SRCS
    mainwindow.ui
    StatusDialog.cpp
    StatusDialog.ui
-    ImageViewer.cpp
-    RenderWidget.cpp
 	demo.qrc
 )
 add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})
 target_include_directories(AdvancedDockingSystemDemo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src")
-target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                                       Qt${QT_VERSION_MAJOR}::Gui 
-                                                       Qt${QT_VERSION_MAJOR}::Widgets)
-if(WIN32 AND QT_VERSION_MAJOR LESS 6)
-    target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt${QT_VERSION_MAJOR}::AxContainer)
+target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+if(WIN32)
+    target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::AxContainer)
 endif()
-target_link_libraries(AdvancedDockingSystemDemo PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
+target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking)
 set_target_properties(AdvancedDockingSystemDemo PROPERTIES 
    AUTOMOC ON
    AUTORCC ON
--- a/demo/ImageViewer.cpp
+++ b/demo/ImageViewer.cpp
@@ -1,280 +0,0 @@
-//============================================================================
-/// \file   ImageViewer.cpp
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Implementation of CImageViewer
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include "ImageViewer.h"
-
-#include <math.h>
-
-#include <QLabel>
-#include <QImageReader>
-#include <QImageWriter>
-#include <QMessageBox>
-#include <QApplication>
-#include <QDir>
-#include <QFileDialog>
-#include <QStandardPaths>
-#include <QAction>
-#include <QScrollBar>
-#include <QPixmap>
-#include <QPainter>
-#include <QImage>
-#include <QMouseEvent>
-#include <QWheelEvent>
-
-#include "RenderWidget.h"
-
-/**
- * Private image viewer data
- */
-struct ImageViewerPrivate
-{
-	CImageViewer* _this;
-	CRenderWidget* RenderWidget;///< renders the image to screen
-	bool AutoFit;///< automatically fit image to window size on resize events
-	QSize ImageSize;///< stores the image size to detect image size changes
-	QPoint MouseMoveStartPos;///< for calculation of mouse move vector
-	QLabel* ScalingLabel;///< label displays scaling factor
-	QList<QWidget*> OverlayTools;///< list of tool widget to overlay
-
-	ImageViewerPrivate(CImageViewer* _public) : _this(_public) {}
-};
-
-
-
-//============================================================================
-CImageViewer::CImageViewer(QWidget *parent)
-	: Super(parent),
-	  d(new ImageViewerPrivate(this))
-{
-	d->AutoFit = true;
-	d->RenderWidget = new CRenderWidget(this);
-
-	this->setBackgroundRole(QPalette::Light);
-	this->setAlignment(Qt::AlignCenter);
-	this->setWidget(d->RenderWidget);
-	this->createActions();
-	this->setMouseTracking(false); // only produce mouse move events if mouse button pressed
-}
-
-
-//============================================================================
-CImageViewer::~CImageViewer()
-{
-	delete d;
-}
-
-
-//============================================================================
-bool CImageViewer::loadFile(const QString& fileName)
-{
-    QImageReader reader(fileName);
-    reader.setAutoTransform(true);
-    const QImage newImage = reader.read();
-    if (newImage.isNull())
-    {
-        QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
-                                 tr("Cannot load %1: %2")
-                                 .arg(QDir::toNativeSeparators(fileName), reader.errorString()));
-        return false;
-    }
-
-    setImage(newImage);
-    setWindowFilePath(fileName);
-    return true;
-}
-
-
-//===========================================================================
-void CImageViewer::setImage(const QImage &newImage)
-{
-    d->RenderWidget->showImage(newImage);
-    this->adjustDisplaySize(newImage);
-}
-
-
-//============================================================================
-void CImageViewer::adjustDisplaySize(const QImage& Image)
-{
-	if (d->ImageSize == Image.size())
-	{
-		return;
-	}
-	d->ImageSize = Image.size();
-	if (d->AutoFit)
-	{
-		this->fitToWindow();
-	}
-}
-
-
-//===========================================================================
-static void initializeImageFileDialog(QFileDialog &dialog, QFileDialog::AcceptMode acceptMode)
-{
-    static bool firstDialog = true;
-
-    if (firstDialog) {
-        firstDialog = false;
-        const QStringList picturesLocations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
-        dialog.setDirectory(picturesLocations.isEmpty() ? QDir::currentPath() : picturesLocations.last());
-    }
-
-    QStringList mimeTypeFilters;
-    const QByteArrayList supportedMimeTypes = acceptMode == QFileDialog::AcceptOpen
-        ? QImageReader::supportedMimeTypes() : QImageWriter::supportedMimeTypes();
-    for (const QByteArray &mimeTypeName : supportedMimeTypes)
-        mimeTypeFilters.append(mimeTypeName);
-    mimeTypeFilters.sort();
-    dialog.setMimeTypeFilters(mimeTypeFilters);
-    dialog.selectMimeTypeFilter("image/jpeg");
-    if (acceptMode == QFileDialog::AcceptSave)
-        dialog.setDefaultSuffix("jpg");
-}
-
-
-//===========================================================================
-void CImageViewer::open()
-{
-    QFileDialog dialog(this, tr("Open File"));
-    initializeImageFileDialog(dialog, QFileDialog::AcceptOpen);
-
-    while (dialog.exec() == QDialog::Accepted && !loadFile(dialog.selectedFiles().first())) {}
-}
-
-
-//===========================================================================
-void CImageViewer::createActions()
-{
-	QAction* a;
-    a = new QAction(tr("&Open..."));
-    a->setIcon(QIcon(":/adsdemo/images/perm_media.svg"));
-    connect(a, &QAction::triggered, this, &CImageViewer::open);
-    a->setShortcut(QKeySequence::Open);;
-    this->addAction(a);
-
-	a = new QAction(tr("Fit on Screen"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_out_map.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::fitToWindow);
-	this->addAction(a);
-
-	a = new QAction(tr("Actual Pixels"));
-	a->setIcon(QIcon(":/adsdemo/images/find_in_page.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::normalSize);
-	this->addAction(a);
-
-	a = new QAction(this);
-	a->setSeparator(true);
-	this->addAction(a);
-
-	a = new QAction(tr("Zoom In (25%)"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_in.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::zoomIn);
-	this->addAction(a);
-
-	a = new QAction(tr("Zoom Out (25%)"));
-	a->setIcon(QIcon(":/adsdemo/images/zoom_out.svg"));
-	connect(a, &QAction::triggered, this, &CImageViewer::zoomOut);
-	this->addAction(a);
-
-	this->setContextMenuPolicy(Qt::ActionsContextMenu);
-}
-
-
-//===========================================================================
-void CImageViewer::zoomIn()
-{
-	d->AutoFit = false;
-	d->RenderWidget->zoomIn();
-}
-
-
-//===========================================================================
-void CImageViewer::zoomOut()
-{
-	d->AutoFit = false;
-	d->RenderWidget->zoomOut();
-}
-
-
-//===========================================================================
-void CImageViewer::normalSize()
-{
-	d->AutoFit = false;
-	d->RenderWidget->normalSize();
-}
-
-
-//===========================================================================
-void CImageViewer::fitToWindow()
-{
-	d->AutoFit = true;
-	d->RenderWidget->scaleToSize(this->maximumViewportSize());
-}
-
-
-//============================================================================
-void CImageViewer::resizeEvent(QResizeEvent* ResizeEvent)
-{
-	Super::resizeEvent(ResizeEvent);
-	if (d->AutoFit)
-	{
-		this->fitToWindow();
-	}
-}
-
-
-//============================================================================
-void CImageViewer::mousePressEvent(QMouseEvent* Event)
-{
-	d->RenderWidget->setCursor(Qt::ClosedHandCursor);
-	d->MouseMoveStartPos = Event->pos();
-	Super::mousePressEvent(Event);
-}
-
-
-//============================================================================
-void CImageViewer::mouseReleaseEvent(QMouseEvent* Event)
-{
-	d->RenderWidget->setCursor(Qt::OpenHandCursor);
-	Super::mouseReleaseEvent(Event);
-}
-
-
-//============================================================================
-void CImageViewer::mouseMoveEvent(QMouseEvent* Event)
-{
-	QPoint MoveVector = Event->pos() - d->MouseMoveStartPos;
-	d->MouseMoveStartPos = Event->pos();
-	horizontalScrollBar()->setValue(horizontalScrollBar()->value()
-	    - MoveVector.x());
-	verticalScrollBar()->setValue(verticalScrollBar()->value() - MoveVector.y());
-}
-
-
-//============================================================================
-void CImageViewer::wheelEvent(QWheelEvent* Event)
-{
-	double numDegrees = Event->angleDelta().y() / 8;
-	double numSteps = numDegrees / 15;
-	d->AutoFit = false;
-	double Zoom;
-	if (numSteps < 0)
-	{
-		Zoom = pow(0.9, 0 - numSteps);
-	}
-	else
-	{
-		Zoom = pow(1.10, numSteps);
-	}
-	d->RenderWidget->zoomByValue(Zoom);
-}
-
-#include "moc_ImageViewer.cpp"
-//---------------------------------------------------------------------------
-// EOF ImageViewer.cpp
--- a/demo/ImageViewer.h
+++ b/demo/ImageViewer.h
@@ -1,88 +0,0 @@
-#ifndef ImageViewerH
-#define ImageViewerH
-//============================================================================
-/// \file   ImageViewer.h
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Declaration of CImageViewer
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QScrollArea>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-QT_END_NAMESPACE
-
-
-struct ImageViewerPrivate;
-
-/**
- * Tiny simple image viewer for showing images in demo
- */
-class CImageViewer : public QScrollArea
-{
-	Q_OBJECT
-public:
-	using Super = QScrollArea;
-
-	explicit CImageViewer(QWidget *parent = nullptr);
-    virtual ~CImageViewer();
-
-	bool loadFile(const QString& Filename);
-	void setImage(const QImage &newImage);
-
-public Q_SLOTS:
-	void open();
-    void zoomIn();
-    void zoomOut();
-    void normalSize();
-    void fitToWindow();
-
-protected:
-	/**
-	 * @brief Reimplemented from QScrollArea to adjust image scaling if m_AutoFit is
-	 * true.
-	 */
-	virtual void resizeEvent(QResizeEvent* ResizeEvent);
-
-	/**
-	 * @brief Handle mouse press events.
-	 */
-	virtual void mousePressEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Handles mouse release events.
-	 */
-	virtual void mouseReleaseEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Handle mouse move events.
-	 */
-	virtual void mouseMoveEvent(QMouseEvent* Event);
-
-	/**
-	 * @brief Use mouse wheel to change scaling of the image.
-	 */
-	virtual void wheelEvent(QWheelEvent* Event);
-
-private:
-    /**
-	 * @brief Create the wiget actions.
-	 */
-    void createActions();
-
-	/**
-	 * @brief Adjust size of render widget in case of image size change.
-	 * @param[in] Image The new image that may have a different image size.
-	 */
-	void adjustDisplaySize(const QImage& Image);
-
-    ImageViewerPrivate* d;
-    friend ImageViewerPrivate;
-};
-
-//---------------------------------------------------------------------------
-#endif // ImageViewerH
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -60,21 +60,17 @@
 #include <QToolButton>
 #include <QToolBar>
 #include <QPointer>
-#include <QMap>
-#include <QElapsedTimer>
-#include <QQuickWidget>


-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-#include <QRandomGenerator>
-#endif
-
 #ifdef Q_OS_WIN
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QAxWidget>
 #endif
 #endif

+#include <QMap>
+#include <QElapsedTimer>
+
 #include "DockManager.h"
 #include "DockWidget.h"
 #include "DockAreaWidget.h"
@@ -83,25 +79,9 @@
 #include "FloatingDockContainer.h"
 #include "DockComponentsFactory.h"
 #include "StatusDialog.h"
-#include "DockSplitter.h"
-#include "ImageViewer.h"



-/**
- * Returns a random number from 0 to highest - 1
- */
-int randomNumberBounded(int highest)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
-	return QRandomGenerator::global()->bounded(highest);
-#else
-	qsrand(QTime::currentTime().msec());
-	return qrand() % highest;
-#endif
-}
-
-
 /**
 * 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
@@ -236,11 +216,9 @@ struct MainWindowPrivate
 		QFileSystemModel* m = new QFileSystemModel(w);
 		m->setRootPath(QDir::currentPath());
 		w->setModel(m);
-		w->setRootIndex(m->index(QDir::currentPath()));
 		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Filesystem %1")
 			.arg(FileSystemCount++));
 		DockWidget->setWidget(w);
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/folder_open.svg"));
 		ui.menuView->addAction(DockWidget->toggleViewAction());
 		// We disable focus to test focus highlighting if the dock widget content
 		// does not support focus
@@ -301,7 +279,6 @@ struct MainWindowPrivate

 		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Label %1").arg(LabelCount++));
 		DockWidget->setWidget(l);
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/font_download.svg"));
 		ui.menuView->addAction(DockWidget->toggleViewAction());
 		return DockWidget;
 	}
@@ -339,35 +316,6 @@ struct MainWindowPrivate
 		return DockWidget;
 	}

-	/**
-	 * Creates a simply image viewr
-	 */
-	ads::CDockWidget* createImageViewer()
-	{
-		static int ImageViewerCount = 0;
-		auto w = new CImageViewer();
-		auto ImageIndex = randomNumberBounded(4);
-		auto FileName = ":adsdemo/images/ads_logo.svg";
-
-		// Pick a random image from a number of images
-		switch (ImageIndex)
-		{
-		case 0: FileName = ":adsdemo/images/ads_tile_blue.svg"; break;
-		case 1: FileName = ":adsdemo/images/ads_tile_blue_light.svg"; break;
-		case 2: FileName = ":adsdemo/images/ads_tile_green.svg"; break;
-		case 3: FileName = ":adsdemo/images/ads_tile_orange.svg"; break;
-		}
-
-		auto Result = w->loadFile(FileName);
-		qDebug() << "loadFile result: " << Result;
-		ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Image Viewer %1").arg(ImageViewerCount++));
-		DockWidget->setIcon(svgIcon(":/adsdemo/images/photo.svg"));
-		DockWidget->setWidget(w,ads:: CDockWidget::ForceNoScrollArea);
-		auto ToolBar = DockWidget->createDefaultToolBar();
-		ToolBar->addActions(w->actions());
-		return DockWidget;
-	}
-
 	/**
 	 * Create a table widget
 	 */
@@ -408,17 +356,6 @@ struct MainWindowPrivate
 		return DockWidget;
 	}

-	/**
-	 * Create QQuickWidget for test for OpenGL and QQuick
-	 */
-	ads::CDockWidget *createQQuickWidget()
-	{
-		QQuickWidget *widget = new QQuickWidget();
-		ads::CDockWidget *dockWidget = new ads::CDockWidget("Quick");
-		dockWidget->setWidget(widget);
-		return dockWidget;
-	}
-

 #ifdef Q_OS_WIN
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
@@ -436,6 +373,7 @@ struct MainWindowPrivate
 	}
 #endif
 #endif
+
 };

 //============================================================================
@@ -479,23 +417,6 @@ void MainWindowPrivate::createContent()
 	DockWidget = createCalendarDockWidget();
 	DockWidget->setTabToolTip(QString("Tab ToolTip\nHodie est dies magna"));
 	auto DockArea = DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
-    // Now we create a action to test resizing of DockArea widget
-	auto Action = ui.menuTests->addAction(QString("Resize %1").arg(DockWidget->windowTitle()));
-	QObject::connect(Action, &QAction::triggered, [DockArea]()
-	{
-		// Resizing only works, if the Splitter is visible and has a valid
-		// sizes
-		auto Splitter = ads::internal::findParent<ads::CDockSplitter*>(DockArea);
-		if (!Splitter)
-		{
-			return;
-		}
-		// We change the sizes of the splitter that contains the Calendar 1 widget
-		// to resize the dock widget
-		int Width = Splitter->width();
-		Splitter->setSizes({Width * 2/3, Width * 1/3});
-	});
-	DockWidget->setWindowTitle(QString("My " + DockWidget->windowTitle()));

 	// Now we add a custom button to the dock area title bar that will create
 	// new editor widgets when clicked
@@ -520,42 +441,21 @@ void MainWindowPrivate::createContent()
 	DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
 	auto BottomDockArea = DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
 	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(), RighDockArea);
-	auto LabelDockWidget = createLongTextLabelDockWidget();
-	DockManager->addDockWidget(ads::CenterDockWidgetArea, LabelDockWidget, BottomDockArea);
+	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(), BottomDockArea);

-	// Tests CustomCloseHandling without DeleteOnClose
-	LabelDockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
-	QObject::connect(LabelDockWidget, &ads::CDockWidget::closeRequested, [LabelDockWidget, this]()
-	{
-		int Result = QMessageBox::question(_this, "Custom Close Request",
-			"Do you really want to close this dock widget?");
-		if (QMessageBox::Yes == Result)
-		{
-			LabelDockWidget->closeDockWidget();
-		}
-	});
-
-    Action = ui.menuTests->addAction(QString("Set %1 Floating").arg(DockWidget->windowTitle()));
+    auto Action = ui.menuTests->addAction(QString("Set %1 Floating").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
    Action = ui.menuTests->addAction(QString("Set %1 As Current Tab").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setAsCurrentTab()));
    Action = ui.menuTests->addAction(QString("Raise %1").arg(DockWidget->windowTitle()));
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(raise()));

-    // Test hidden floating dock widget
-    DockWidget = createLongTextLabelDockWidget();
-    DockManager->addDockWidgetFloating(DockWidget);
-    DockWidget->toggleView(false);
-
-    // Test visible floating dock widget
-    DockWidget = createCalendarDockWidget();
-    DockManager->addDockWidgetFloating(DockWidget);
-    DockWidget->setWindowTitle(QString("My " + DockWidget->windowTitle()));
-
-
 #ifdef Q_OS_WIN
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
+    if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking))
+    {
+    	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
+    }
 #endif
 #endif

@@ -564,15 +464,6 @@ void MainWindowPrivate::createContent()
 		_this->connect(DockWidget, SIGNAL(viewToggled(bool)), SLOT(onViewToggled(bool)));
 		_this->connect(DockWidget, SIGNAL(visibilityChanged(bool)), SLOT(onViewVisibilityChanged(bool)));
 	}
-
-	// Create image viewer
-	DockWidget = createImageViewer();
-	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
-
-    // Create quick widget
-	DockWidget = createQQuickWidget();
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, true);
-	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
 }


@@ -611,36 +502,12 @@ void MainWindowPrivate::createActions()
 	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
 	ui.menuTests->addAction(a);

-	a = ui.toolBar->addAction("Create Editor Tab");
-	a->setProperty("Floating", false);
-	a->setToolTip("Creates a editor tab and inserts it as second tab into an area");
-	a->setIcon(svgIcon(":/adsdemo/images/tab.svg"));
-	a->setProperty("Tabbed", true);
-	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
-	ui.menuTests->addAction(a);
-
 	a = ui.toolBar->addAction("Create Floating 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()));
 	ui.menuTests->addAction(a);

-	a = ui.toolBar->addAction("Create Image Viewer");
-	auto ToolButton = qobject_cast<QToolButton*>(ui.toolBar->widgetForAction(a));
-	ToolButton->setPopupMode(QToolButton::InstantPopup);
-	a->setToolTip("Creates floating, docked or pinned image viewer");
-	a->setIcon(svgIcon(":/adsdemo/images/panorama.svg"));
-	ui.menuTests->addAction(a);
-	auto Menu = new QMenu();
-	ToolButton->setMenu(Menu);
-	a = Menu->addAction("Floating Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-	a = Menu->addAction("Docked Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-	a = Menu->addAction("Pinned Image Viewer");
-	_this->connect(a, SIGNAL(triggered()), SLOT(createImageViewer()));
-
-
 	ui.menuTests->addSeparator();
 	a = ui.menuTests->addAction("Show Status Dialog");
 	_this->connect(a, SIGNAL(triggered()), SLOT(showStatusDialog()));
@@ -648,12 +515,6 @@ void MainWindowPrivate::createActions()
 	a = ui.menuTests->addAction("Toggle Label 0 Window Title");
 	_this->connect(a, SIGNAL(triggered()), SLOT(toggleDockWidgetWindowTitle()));
 	ui.menuTests->addSeparator();
-
-	a = ui.toolBar->addAction("Apply VS Style");
-	a->setToolTip("Applies a Visual Studio light style (visual_studio_light.css)." );
-	a->setIcon(svgIcon(":/adsdemo/images/color_lens.svg"));
-	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::applyVsStyle);
-	ui.menuTests->addAction(a);
 }


@@ -713,7 +574,7 @@ CMainWindow::CMainWindow(QWidget *parent) :

    // uncomment the following line if you want to use opaque undocking and
 	// opaque splitter resizing
-    //CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);
+    // CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);

    // uncomment the following line if you want a fixed tab width that does
 	// not change if the visibility of the close button changes
@@ -743,31 +604,25 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// uncomment the following line if you want a central widget in the main dock container (the dock manager) without a titlebar
 	// If you enable this code, you can test it in the demo with the Calendar 0
 	// dock widget.
-	//CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
+	// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);

 	// uncomment the following line to enable focus highlighting of the dock
 	// widget that has the focus
-    CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
-
-	// uncomment if you would like to enable dock widget auto hiding
-    CDockManager::setAutoHideConfigFlags({CDockManager::DefaultAutoHideConfig});
+	CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);

 	// uncomment if you would like to enable an equal distribution of the
 	// available size of a splitter to all contained dock widgets
 	// CDockManager::setConfigFlag(CDockManager::EqualSplitOnInsertion, true);
-	
-	// uncomment if you would like to close tabs with the middle mouse button, web browser style
-	// CDockManager::setConfigFlag(CDockManager::MiddleMouseButtonClosesTab, true);

 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);

 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-	connect(d->PerspectiveComboBox, SIGNAL(activated(QString)),
-		d->DockManager, SLOT(openPerspective(QString)));
+	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
+		d->DockManager, SLOT(openPerspective(const QString&)));
 #else
-    connect(d->PerspectiveComboBox, SIGNAL(textActivated(QString)),
-        d->DockManager, SLOT(openPerspective(QString)));
+    connect(d->PerspectiveComboBox, SIGNAL(textActivated(const QString&)),
+        d->DockManager, SLOT(openPerspective(const QString&)));
 #endif

 	d->createContent();
@@ -839,14 +694,13 @@ void CMainWindow::savePerspective()
 //============================================================================
 void CMainWindow::onViewToggled(bool Open)
 {
-	Q_UNUSED(Open);
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
 	if (!DockWidget)
 	{
 		return;
 	}

-	//qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
+	qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
 }


@@ -870,8 +724,6 @@ void CMainWindow::createEditor()
 	QObject* Sender = sender();
 	QVariant vFloating = Sender->property("Floating");
 	bool Floating = vFloating.isValid() ? vFloating.toBool() : true;
-	QVariant vTabbed = Sender->property("Tabbed");
-	bool Tabbed = vTabbed.isValid() ? vTabbed.toBool() : true;
 	auto DockWidget = d->createEditorWidget();
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetForceCloseWithArea, true);
@@ -883,38 +735,31 @@ void CMainWindow::createEditor()
 		FloatingWidget->move(QPoint(20, 20));
 		d->LastCreatedFloatingEditor = DockWidget;
 		d->LastDockedEditor.clear();
-		return;
    }
-
-
-	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
-	if (EditorArea)
-	{
-		if (Tabbed)
-		{
-			// Test inserting the dock widget tab at a given position instead
-			// of appending it. This function inserts the new dock widget as
-			// first tab
-			d->DockManager->addDockWidgetTabToArea(DockWidget, EditorArea, 0);
-		}
-		else
-		{
-			d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
-			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
-		}
-	}
-	else
-	{
-		if (d->LastCreatedFloatingEditor)
-		{
-			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, d->LastCreatedFloatingEditor->dockAreaWidget());
-		}
-		else
-		{
-			d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
-		}
-	}
-	d->LastDockedEditor = DockWidget;
+    else
+    {
+    	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
+    	if (EditorArea)
+    	{
+    		std::cout << "DockAreaCount before: " << EditorArea->dockContainer()->dockAreaCount() << std::endl;
+    		d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
+    		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+    		std::cout << "DockAreaCount after: " << DockWidget->dockContainer()->dockAreaCount() << std::endl;
+    	}
+    	else
+    	{
+    		if (d->LastCreatedFloatingEditor)
+    		{
+    			std::cout << "LastCreated" << std::endl;
+    			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, d->LastCreatedFloatingEditor->dockAreaWidget());
+    		}
+    		else
+    		{
+    			d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    		}
+    	}
+    	d->LastDockedEditor = DockWidget;
+    }
 }


@@ -932,20 +777,6 @@ void CMainWindow::onEditorCloseRequested()
 }


-//============================================================================
-void CMainWindow::onImageViewerCloseRequested()
-{
-	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
-	int Result = QMessageBox::question(this, "Close Image Viewer", QString("%1 "
-		"contains unsaved changes? Would you like to close it?")
-		.arg(DockWidget->windowTitle()));
-	if (QMessageBox::Yes == Result)
-	{
-		DockWidget->closeDockWidget();
-	}
-}
-
-
 //============================================================================
 void CMainWindow::createTable()
 {
@@ -980,45 +811,3 @@ void CMainWindow::toggleDockWidgetWindowTitle()
 	d->WindowTitleTestDockWidget->setWindowTitle(Title);
 }

-
-//============================================================================
-void CMainWindow::applyVsStyle()
-{
-	QFile StyleSheetFile(":adsdemo/res/visual_studio_light.css");
-	StyleSheetFile.open(QIODevice::ReadOnly);
-	QTextStream StyleSheetStream(&StyleSheetFile);
-	auto Stylesheet = StyleSheetStream.readAll();
-	StyleSheetFile.close();
-	d->DockManager->setStyleSheet(Stylesheet);
-}
-
-
-//============================================================================
-void CMainWindow::createImageViewer()
-{
-	QAction* a = qobject_cast<QAction*>(sender());
-	qDebug() << "createImageViewer " << a->text();
-
-	auto DockWidget = d->createImageViewer();
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
-	DockWidget->setFeature(ads::CDockWidget::DockWidgetForceCloseWithArea, true);
-	DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
-	DockWidget->resize(QSize(640, 480));
-	connect(DockWidget, &ads::CDockWidget::closeRequested, this,
-		&CMainWindow::onImageViewerCloseRequested);
-
-	if (a->text().startsWith("Floating"))
-	{
-		auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
-		FloatingWidget->move(QPoint(20, 20));
-	}
-	else if (a->text().startsWith("Docked"))
-	{
-		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget);
-	}
-	else if (a->text().startsWith("Pinned"))
-	{
-		d->DockManager->addAutoHideDockWidget(ads::SideBarLeft, DockWidget);
-	}
-}
-
--- a/demo/MainWindow.h
+++ b/demo/MainWindow.h
@@ -63,11 +63,8 @@ private slots:
 	void createEditor();
 	void createTable();
 	void onEditorCloseRequested();
-	void onImageViewerCloseRequested();
 	void showStatusDialog();
 	void toggleDockWidgetWindowTitle();
-	void applyVsStyle();
-	void createImageViewer();
 };

 #endif // MAINWINDOW_H
--- a/demo/RenderWidget.cpp
+++ b/demo/RenderWidget.cpp
@@ -1,108 +0,0 @@
-//============================================================================
-/// \file   RenderWidget.cpp
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Implementation of CRenderWidget
-//============================================================================
-
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include "RenderWidget.h"
-
-#include <QPainter>
-#include <math.h>
-
-
-//===========================================================================
-CRenderWidget::CRenderWidget(QWidget* Parent) :
-	QWidget(Parent), m_ScaleFactor(1)
-{
-	this->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-	this->setCursor(Qt::OpenHandCursor);
-}
-
-//===========================================================================
-CRenderWidget::~CRenderWidget()
-{
-
-}
-
-//===========================================================================
-void CRenderWidget::showImage(const QImage& Image)
-{
-	m_Image = QPixmap::fromImage(Image);
-	this->adjustWidgetSize();
-	this->repaint();
-}
-
-//===========================================================================
-void CRenderWidget::paintEvent(QPaintEvent* Event)
-{
-	Q_UNUSED(Event);
-	QPainter Painter(this);
-	Painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
-	Painter.setRenderHint(QPainter::Antialiasing, true);
-	Painter.scale(m_ScaleFactor, m_ScaleFactor);
-	Painter.drawPixmap(QPoint(0, 0), m_Image);
-}
-
-//============================================================================
-void CRenderWidget::zoomIn()
-{
-	scaleImage(1.25);
-}
-
-//============================================================================
-void CRenderWidget::zoomOut()
-{
-	scaleImage(0.8);
-}
-
-//============================================================================
-void CRenderWidget::zoomByValue(double ZoomValue)
-{
-	scaleImage(ZoomValue);
-}
-
-//============================================================================
-void CRenderWidget::normalSize()
-{
-	m_ScaleFactor = 1;
-	this->adjustWidgetSize();
-}
-
-//============================================================================
-void CRenderWidget::scaleImage(double ScaleFactor)
-{
-	m_ScaleFactor *= ScaleFactor;
-	this->adjustWidgetSize();
-}
-
-//============================================================================
-void CRenderWidget::adjustWidgetSize()
-{
-	QSize ScaledImageSize = m_Image.size() * m_ScaleFactor;
-	if (ScaledImageSize != this->size())
-	{
-		this->setFixedSize(ScaledImageSize);
-	}
-}
-
-//============================================================================
-void CRenderWidget::scaleToSize(const QSize& TargetSize)
-{
-	if (m_Image.isNull())
-	{
-		return;
-	}
-	double ScaleFactorH = (double) TargetSize.width() / m_Image.size().width();
-	double ScaleFactorV = (double) TargetSize.height()
-	    / m_Image.size().height();
-	m_ScaleFactor = (ScaleFactorH < ScaleFactorV) ? ScaleFactorH : ScaleFactorV;
-	this->adjustWidgetSize();
-}
-
-//---------------------------------------------------------------------------
-// EOF RenderWidget.cpp
--- a/demo/RenderWidget.h
+++ b/demo/RenderWidget.h
@@ -1,111 +0,0 @@
-#ifndef RenderWidgetH
-#define RenderWidgetH
-//============================================================================
-/// \file   RenderWidget.h
-/// \author Uwe Kindler
-/// \date   04.11.2022
-/// \brief  Declaration of CRenderWidget
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QWidget>
-#include <QPixmap>
-
-//============================================================================
-//                           FORWARD DECLARATIONS
-//============================================================================
-class QImage;
-
-
-/**
- * @brief Widget for fast display of images (i.e. for video capture devices)
- */
-class CRenderWidget : public QWidget
-{
-	Q_OBJECT
-private:
-	QPixmap m_Image;
-	double m_ScaleFactor;
-
-protected:
-	/**
-	 * @brief Reimplemented paint event method showing actual image.
-	 */
-	void paintEvent(QPaintEvent* PaintEvent);
-
-	/**
-	 * @brief Change scale factor
-	 */
-	void scaleImage(double ScaleFactor);
-
-	/**
-	 * @brief Adjust widget size to size of image.
-	 */
-	void adjustWidgetSize();
-
-public:
-	/**
-	 * Constructor
-	 * @param[in] Parent Parent widget.
-	 */
-	CRenderWidget(QWidget* Parent);
-
-	/**
-	 * Destructor
-	 */
-	virtual ~CRenderWidget();
-
-signals:
-	/**
-	 * @brief Signalize change of captured image size.
-	 * @param ImageSize New image size.
-	 */
-	void imageSizeChanged(const QSize& ImageSize);
-
-public slots:
-	/**
-	 * @brief Show new image in render widget.
-	 */
-	void showImage(const QImage& Image);
-
-	/**
-	 * @brief Zoom into the scene.
-	 * This function decreases the scaling factor by setting it to the previous
-	 * value in internal scaling list.
-	 * @brief Steps The number of steps to zoom in. One step is 25%.
-	 */
-	void zoomIn();
-
-	/**
-	 * @brief Zoom out of the scene.
-	 * This function decreases the scaling factor by setting it to the next
-	 * value in internal scaling list.
-	 * @brief Steps The number of steps to zoom out. One step is 25%.
-	 */
-	void zoomOut();
-
-	/**
-	 * @brief Change zoom by zoom value.
-	 * @param[in] ZoomValue This is the zoom value to apply. A value of 1
-	 * means no change a value > 1 increases the image (i.e. 1.25 would increase
-	 * the image by 25%) and a value of < 1 decreases the image size (i.e.
-	 * a value of 0.8 would decrease the image size by 25%).
-	 */
-	void zoomByValue(double ZoomValue);
-
-	/**
-	 * @brief Resets the actual scaling to 1 and display the image with its
-	 *        actual pixel size.
-	 */
-	void normalSize();
-
-	/**
-	 * @brief Scales the wiget and its content image to the given TargetSize
-	 */
-	void scaleToSize(const QSize& TargetSize);
-}; // class CRenderWidget
-
-//---------------------------------------------------------------------------
-#endif // RenderWidgetH
--- a/demo/app.ico
+++ b/demo/app.ico
--- a/demo/app.rc
+++ b/demo/app.rc
@@ -1 +0,0 @@
-IDI_ICON1               ICON    DISCARDABLE     "app.ico"
--- a/demo/demo.pro
+++ b/demo/demo.pro
@@ -2,7 +2,7 @@ ADS_OUT_ROOT = $${OUT_PWD}/..

 TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
-QT += core gui widgets quick quickwidgets
+QT += core gui widgets

 include(../ads.pri)

@@ -15,25 +15,19 @@ lessThan(QT_MAJOR_VERSION, 6) {
 CONFIG += c++14
 CONFIG += debug_and_release
 DEFINES += QT_DEPRECATED_WARNINGS
-RC_FILE += app.rc

 adsBuildStatic {
    DEFINES += ADS_STATIC
 }

-
-HEADERS += \
-	MainWindow.h \
-	StatusDialog.h \
-	ImageViewer.h \
-	RenderWidget.h
-
 SOURCES += \
 	main.cpp \
 	MainWindow.cpp \
-	StatusDialog.cpp \
-	ImageViewer.cpp \
-	RenderWidget.cpp
+	StatusDialog.cpp
+
+HEADERS += \
+	MainWindow.h \
+	StatusDialog.h

 FORMS += \
 	mainwindow.ui \
--- a/demo/demo.py
+++ b/demo/demo.py
@@ -215,17 +215,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        dock_widget = self.create_calendar_dock_widget()
        dock_widget.setTabToolTip("Tab ToolTip\nHodie est dies magna")
        dock_area = self.dock_manager.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, top_dock_area)
-        # Now we create a action to test resizing of DockArea widget
-        action = self.menuTests.addAction("Resize {}".format(dock_widget.windowTitle()))
-        def action_triggered():
-            splitter = QtAds.internal.findParent(QtAds.CDockSplitter, dock_area)
-            if not splitter:
-                return
-            # We change the sizes of the splitter that contains the Calendar 1 widget
-            # to resize the dock widget
-            width = splitter.width()
-            splitter.setSizes([width * 2/3, width * 1/3])
-        action.triggered.connect(action_triggered)

        # Now we add a custom button to the dock area title bar that will create
        # new editor widgets when clicked
@@ -370,7 +359,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        floating = sender.property("Floating")
        dock_widget = self.create_editor_widget()
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetForceCloseWithArea, True)
        dock_widget.closeRequested.connect(self.on_editor_close_requested)
        
        if floating:
--- a/demo/demo.qrc
+++ b/demo/demo.qrc
@@ -17,24 +17,5 @@
        <file>images/create_floating_editor.svg</file>
        <file>images/create_floating_table.svg</file>
        <file>images/docked_editor.svg</file>
-        <file>images/tab.svg</file>
-        <file>res/visual_studio_light.css</file>
-        <file>images/color_lens.svg</file>
-        <file>images/ads_icon.svg</file>
-        <file>images/ads_logo.svg</file>
-        <file>images/find_in_page.svg</file>
-        <file>images/perm_media.svg</file>
-        <file>images/zoom_in.svg</file>
-        <file>images/zoom_out.svg</file>
-        <file>images/zoom_out_map.svg</file>
-        <file>images/ads_tile_blue.svg</file>
-        <file>images/ads_tile_blue_light.svg</file>
-        <file>images/ads_tile_green.svg</file>
-        <file>images/ads_tile_orange.svg</file>
-        <file>images/photo.svg</file>
-        <file>images/crop_original.svg</file>
-        <file>images/panorama.svg</file>
-        <file>images/ads_icon2.svg</file>
-        <file>images/font_download.svg</file>
    </qresource>
 </RCC>
--- a/demo/images/ads_icon.svg
+++ b/demo/images/ads_icon.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <g transform="translate(581.23 1750.5)">
-  <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_icon2.svg
+++ b/demo/images/ads_icon2.svg
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
- <desc>electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
- <g transform="matrix(1.4118 0 0 1.4118 -210.82 -210.82)" stroke-width=".50173">
-  <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956" stroke-width=".70833"/></text>
-  <path d="m405.33 234.66v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m661.33 533.33v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m405.33 533.33v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m149.33 234.66v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_logo.svg
+++ b/demo/images/ads_logo.svg
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6907.3" height="1024" version="1.1" viewBox="0 0 6907.3 1024" xmlns="http://www.w3.org/2000/svg">
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <text x="1178.9221" y="718.37329" fill="#8f918f" font-family="sans-serif" font-size="628px" style="line-height:1.25" xml:space="preserve"><tspan x="1178.9221" y="718.37329" fill="#8f918f" font-family="'Segoe UI'" font-size="628px" font-weight="300">Qt Advanced Docking</tspan></text>
- <g transform="translate(581.23 1750.5)">
-  <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-  <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-  <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-  <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
- </g>
-</svg>
--- a/demo/images/ads_tile_blue.svg
+++ b/demo/images/ads_tile_blue.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#0083c3" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/ads_tile_blue_light.svg
+++ b/demo/images/ads_tile_blue_light.svg
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="1024"
-   height="1024"
-   viewBox="0 0 270.93333 270.93333"
-   version="1.1"
-   id="svg506"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   sodipodi:docname="ads_tile_blue_light.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview508"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="px"
-     showgrid="false"
-     inkscape:zoom="0.77111176"
-     inkscape:cx="450.64804"
-     inkscape:cy="534.2935"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs503" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="path16513"
-       style="mix-blend-mode:normal;fill:#009ddd;fill-opacity:1;fill-rule:nonzero;stroke-width:0.264583"
-       d="M -2.5e-6,-2.5e-6 V 270.93333 H 270.93333 V -2.5e-6 Z" />
-    <g
-       id="g1224"
-       transform="matrix(0.12402399,0,0,0.12402399,71.967002,73.673805)"
-       style="fill:#ffffff;fill-opacity:0.25;stroke-width:2.13332">
-      <path
-         id="path927"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="m 405.32995,234.66 v 256 h 469.3301 v -256 z" />
-      <path
-         id="path16513-9"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="M 661.32995,533.3299 V 789.32994 H 874.66003 V 533.3299 Z" />
-      <path
-         id="path16513-5"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="m 405.32995,533.33 v 256 h 213.33008 v -256 z" />
-      <path
-         id="path24788"
-         style="mix-blend-mode:normal;fill:#ffffff;fill-opacity:0.25;fill-rule:nonzero;stroke-width:4.7887"
-         d="M 149.32995,234.66 V 789.32994 H 362.66003 V 234.66 Z" />
-    </g>
-    <g
-       aria-label="Docking"
-       id="text2150"
-       style="font-size:15.3617px;line-height:1.05;fill:#ffffff;stroke-width:0.264583;fill-opacity:0.25">
-      <path
-         d="m 100.07327,182.94499 q 0,2.78047 -1.520805,4.19375 -1.505447,1.39791 -4.209106,1.39791 H 91.286381 V 177.5684 h 3.379574 q 1.643702,0 2.857276,0.61447 1.228936,0.61446 1.889489,1.81268 0.66055,1.19821 0.66055,2.94944 z m -1.459358,0.0461 q 0,-2.19673 -1.090681,-3.2106 -1.075319,-1.02923 -3.056978,-1.02923 h -1.797319 v 8.60255 h 1.490085 q 4.454893,0 4.454893,-4.36272 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2539" />
-      <path
-         d="m 114.83588,184.40435 q 0,2.04311 -1.0446,3.16451 -1.02923,1.12141 -2.79583,1.12141 -1.09068,0 -1.95094,-0.49158 -0.84489,-0.50693 -1.33646,-1.45936 -0.49158,-0.96778 -0.49158,-2.33498 0,-2.0431 1.01387,-3.14914 1.02924,-1.10605 2.8112,-1.10605 1.10604,0 1.96629,0.50694 0.86026,0.49157 1.33647,1.444 0.49158,0.93706 0.49158,2.30425 z m -6.22149,0 q 0,1.45937 0.56838,2.31962 0.58374,0.84489 1.8434,0.84489 1.2443,0 1.82805,-0.84489 0.58374,-0.86025 0.58374,-2.31962 0,-1.45936 -0.58374,-2.28889 -0.58375,-0.82953 -1.84341,-0.82953 -1.25966,0 -1.82804,0.82953 -0.56838,0.82953 -0.56838,2.28889 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2541" />
-      <path
-         d="m 125.63516,188.69027 q -1.10604,0 -1.95094,-0.44549 -0.84489,-0.44549 -1.33646,-1.38255 -0.47622,-0.93707 -0.47622,-2.39643 0,-1.52081 0.49158,-2.47323 0.50693,-0.95243 1.38255,-1.39792 0.87562,-0.44549 1.98166,-0.44549 0.61447,0 1.19821,0.13826 0.59911,0.12289 0.96779,0.30723 l -0.41477,1.12141 q -0.36868,-0.13826 -0.86025,-0.26115 -0.49158,-0.1229 -0.9217,-0.1229 -2.42715,0 -2.42715,3.11843 0,1.49008 0.58374,2.28889 0.59911,0.78345 1.7666,0.78345 0.66055,0 1.18285,-0.13826 0.5223,-0.13825 0.95242,-0.33795 v 1.19821 q -0.41476,0.21506 -0.9217,0.3226 -0.49157,0.12289 -1.19821,0.12289 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2543" />
-      <path
-         d="m 136.40372,176.86176 v 6.09859 q 0,0.24579 -0.0307,0.6452 -0.0154,0.3994 -0.0307,0.69127 h 0.0614 q 0.0922,-0.12289 0.27651,-0.35332 0.18434,-0.23042 0.36868,-0.46085 0.19971,-0.24578 0.33796,-0.3994 l 2.62685,-2.78047 h 1.58226 l -3.33349,3.51783 3.56391,4.71604 h -1.62834 l -2.85727,-3.84042 -0.93707,0.81417 v 3.02625 h -1.33647 v -11.67489 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2545" />
-      <path
-         d="m 149.32293,177.21508 q 0.30724,0 0.53766,0.21506 0.24579,0.1997 0.24579,0.64519 0,0.44549 -0.24579,0.66056 -0.23042,0.1997 -0.53766,0.1997 -0.33795,0 -0.56838,-0.1997 -0.23042,-0.21507 -0.23042,-0.66056 0,-0.44549 0.23042,-0.64519 0.23043,-0.21506 0.56838,-0.21506 z m 0.66056,3.0877 v 8.23387 h -1.35183 v -8.23387 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2547" />
-      <path
-         d="m 161.91954,180.14916 q 1.47472,0 2.22745,0.722 0.75272,0.722 0.75272,2.30426 v 5.36123 h -1.33647 v -5.26906 q 0,-1.98166 -1.8434,-1.98166 -1.36719,0 -1.88949,0.76808 -0.5223,0.76809 -0.5223,2.21209 v 4.27055 h -1.35183 v -8.23387 h 1.09068 l 0.1997,1.1214 h 0.0768 q 0.39941,-0.64519 1.10604,-0.95242 0.70664,-0.3226 1.49009,-0.3226 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2549" />
-      <path
-         d="m 175.72973,180.14916 q 0.81417,0 1.45936,0.30724 0.66055,0.30723 1.1214,0.93706 h 0.0768 l 0.18434,-1.09068 h 1.07532 v 8.37213 q 0,1.76659 -0.90634,2.65757 -0.89098,0.89098 -2.78047,0.89098 -1.81268,0 -2.96481,-0.5223 v -1.2443 q 1.21358,0.6452 3.04162,0.6452 1.05996,0 1.65906,-0.62983 0.61447,-0.61447 0.61447,-1.68979 v -0.3226 q 0,-0.18434 0.0154,-0.52229 0.0154,-0.35332 0.0307,-0.49158 h -0.0615 q -0.82953,1.2443 -2.55004,1.2443 -1.59762,0 -2.50396,-1.12141 -0.89098,-1.1214 -0.89098,-3.13378 0,-1.9663 0.89098,-3.11843 0.90634,-1.16749 2.4886,-1.16749 z m 0.18434,1.13677 q -1.02924,0 -1.59762,0.82953 -0.56838,0.81417 -0.56838,2.33498 0,1.52081 0.55302,2.33498 0.55302,0.79881 1.6437,0.79881 1.2443,0 1.81268,-0.66056 0.56838,-0.67591 0.56838,-2.166 v -0.32259 q 0,-1.67443 -0.58374,-2.41179 -0.58375,-0.73736 -1.82804,-0.73736 z"
-         style="text-align:center;letter-spacing:5.36125px;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2551" />
-    </g>
-    <g
-       aria-label="Qt Advanced
-"
-       id="text2150-1"
-       style="font-size:15.3617px;line-height:1.05;fill:#ffffff;stroke-width:0.264583;fill-opacity:0.25">
-      <path
-         d="m 100.61097,89.66819 q 0,2.012383 -0.814169,3.441021 -0.798808,1.413276 -2.381063,1.935574 l 2.626852,2.734383 h -1.981661 l -2.119914,-2.473234 q -0.09217,0 -0.199702,0 -0.09217,0.01536 -0.184341,0.01536 -1.705148,0 -2.841914,-0.706638 -1.121404,-0.706639 -1.674426,-1.98166 -0.553021,-1.275021 -0.553021,-2.980169 0,-1.674426 0.553021,-2.934085 0.553022,-1.275021 1.674426,-1.98166 1.136766,-0.706638 2.857276,-0.706638 1.643702,0 2.765106,0.706638 1.121404,0.691277 1.68979,1.966298 0.58374,1.25966 0.58374,2.964808 z m -8.663997,0 q 0,2.07383 0.875617,3.272042 0.875617,1.182851 2.734382,1.182851 1.858766,0 2.719021,-1.182851 0.875617,-1.198212 0.875617,-3.272042 0,-2.073829 -0.860255,-3.241318 -0.860255,-1.182851 -2.719021,-1.182851 -1.874127,0 -2.749744,1.182851 -0.875617,1.167489 -0.875617,3.241318 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2518" />
-      <path
-         d="m 105.60353,94.215253 q 0.30723,0 0.62983,-0.04609 0.32259,-0.04609 0.52229,-0.122893 v 1.029234 q -0.21506,0.107532 -0.61446,0.168978 -0.39941,0.07681 -0.76809,0.07681 -0.64519,0 -1.19821,-0.215064 -0.53766,-0.230425 -0.87562,-0.783447 -0.33796,-0.553021 -0.33796,-1.551531 v -4.792851 h -1.16749 v -0.645191 l 1.18286,-0.53766 0.53766,-1.751234 h 0.7988 v 1.88949 h 2.38107 v 1.044595 h -2.38107 v 4.762127 q 0,0.752724 0.35332,1.121404 0.36868,0.353319 0.93707,0.353319 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2520" />
-      <path
-         d="m 119.45978,95.167679 -1.3211,-3.394936 h -4.34736 l -1.30575,3.394936 h -1.39791 l 4.28591,-11.014339 h 1.2443 l 4.27055,11.014339 z m -1.73587,-4.623872 -1.22893,-3.318127 q -0.0461,-0.122894 -0.15362,-0.445489 -0.10753,-0.322596 -0.21507,-0.660554 -0.0922,-0.353319 -0.15361,-0.537659 -0.1229,0.476213 -0.26115,0.937064 -0.12289,0.445489 -0.21507,0.706638 l -1.24429,3.318127 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2522" />
-      <path
-         d="m 125.12825,95.321296 q -1.53617,0 -2.45787,-1.059957 -0.9217,-1.075319 -0.9217,-3.195234 0,-2.119915 0.9217,-3.195234 0.93706,-1.09068 2.47323,-1.09068 0.95243,0 1.55153,0.353319 0.61447,0.353319 0.99851,0.860255 h 0.0922 q -0.0307,-0.199702 -0.0614,-0.583745 -0.0307,-0.399404 -0.0307,-0.629829 v -3.287404 h 1.35183 v 11.674892 h -1.09068 l -0.1997,-1.106043 h -0.0614 q -0.36868,0.522298 -0.98314,0.890979 -0.61447,0.368681 -1.58226,0.368681 z m 0.21506,-1.121404 q 1.30575,0 1.82805,-0.706638 0.53766,-0.722 0.53766,-2.166 v -0.245787 q 0,-1.53617 -0.50694,-2.35034 -0.50694,-0.829532 -1.87413,-0.829532 -1.09068,0 -1.6437,0.875617 -0.53766,0.860255 -0.53766,2.319616 0,1.474724 0.53766,2.288894 0.55302,0.81417 1.65906,0.81417 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2524" />
-      <path
-         d="m 133.46965,95.167679 -3.11842,-8.233871 h 1.444 l 1.75123,4.854297 q 0.12289,0.337957 0.26115,0.752723 0.13825,0.414766 0.24579,0.798809 0.10753,0.384042 0.15361,0.629829 h 0.0615 q 0.0461,-0.245787 0.16898,-0.629829 0.12289,-0.399405 0.26115,-0.798809 0.13825,-0.414766 0.26115,-0.752723 l 1.75123,-4.854297 h 1.444 l -3.13379,8.233871 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2526" />
-      <path
-         d="m 142.57913,86.795552 q 1.50545,0 2.22745,0.660553 0.722,0.660554 0.722,2.104553 v 5.607021 h -0.98315 l -0.26115,-1.167489 h -0.0615 q -0.53766,0.675914 -1.13676,0.99851 -0.59911,0.322596 -1.62834,0.322596 -1.12141,0 -1.85877,-0.583745 -0.73736,-0.599106 -0.73736,-1.858765 0,-1.228936 0.96778,-1.88949 0.96779,-0.675914 2.98017,-0.737361 l 1.39792,-0.04609 V 89.71427 q 0,-1.029234 -0.44549,-1.428638 -0.44549,-0.399404 -1.25966,-0.399404 -0.64519,0 -1.22894,0.199702 -0.58374,0.184341 -1.09068,0.430128 l -0.41476,-1.013872 q 0.53766,-0.291873 1.27502,-0.491575 0.73736,-0.215064 1.53617,-0.215064 z m 1.61298,4.347361 -1.21358,0.04609 q -1.53617,0.06145 -2.13527,0.491574 -0.58375,0.430128 -0.58375,1.213574 0,0.691277 0.41477,1.013872 0.43013,0.322596 1.09068,0.322596 1.02923,0 1.72051,-0.568383 0.70664,-0.583744 0.70664,-1.781957 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2528" />
-      <path
-         d="m 152.04195,86.780191 q 1.47472,0 2.22745,0.722 0.75272,0.721999 0.75272,2.304255 v 5.361233 h -1.33647 v -5.269063 q 0,-1.98166 -1.8434,-1.98166 -1.36719,0 -1.88949,0.768085 -0.5223,0.768085 -0.5223,2.212085 v 4.270553 h -1.35183 v -8.233871 h 1.09068 l 0.1997,1.121404 h 0.0768 q 0.39941,-0.645192 1.10605,-0.952426 0.70663,-0.322595 1.49008,-0.322595 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2530" />
-      <path
-         d="m 160.87493,95.321296 q -1.10604,0 -1.95093,-0.445489 -0.8449,-0.44549 -1.33647,-1.382553 -0.47622,-0.937064 -0.47622,-2.396426 0,-1.520808 0.49158,-2.473233 0.50694,-0.952426 1.38255,-1.397915 0.87562,-0.445489 1.98166,-0.445489 0.61447,0 1.19821,0.138255 0.59911,0.122894 0.96779,0.307234 l -0.41476,1.121404 q -0.36869,-0.138255 -0.86026,-0.261149 -0.49157,-0.122893 -0.9217,-0.122893 -2.42715,0 -2.42715,3.118425 0,1.490085 0.58374,2.288893 0.59911,0.783447 1.7666,0.783447 0.66055,0 1.18285,-0.138256 0.5223,-0.138255 0.95243,-0.337957 v 1.198213 q -0.41477,0.215063 -0.92171,0.322595 -0.49157,0.122894 -1.19821,0.122894 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2532" />
-      <path
-         d="m 168.12564,86.780191 q 1.0446,0 1.81268,0.460851 0.76809,0.460851 1.16749,1.305744 0.41477,0.829532 0.41477,1.950936 v 0.81417 h -5.63775 q 0.0307,1.397915 0.70664,2.135276 0.69128,0.722 1.92021,0.722 0.78345,0 1.38256,-0.138255 0.61447,-0.153617 1.25966,-0.430128 v 1.182851 q -0.62983,0.276511 -1.2443,0.399405 -0.61447,0.138255 -1.45936,0.138255 -1.18285,0 -2.07383,-0.476213 -0.89098,-0.476213 -1.39792,-1.413276 -0.49157,-0.937064 -0.49157,-2.319617 0,-1.35183 0.44549,-2.319617 0.46085,-0.967787 1.27502,-1.490085 0.82953,-0.522297 1.92021,-0.522297 z m -0.0154,1.106042 q -0.96779,0 -1.53617,0.62983 -0.55302,0.614468 -0.66055,1.72051 h 4.19374 q -0.0154,-1.044595 -0.49157,-1.689787 -0.47622,-0.660553 -1.50545,-0.660553 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2534" />
-      <path
-         d="m 176.52848,95.321296 q -1.53617,0 -2.45787,-1.059957 -0.92171,-1.075319 -0.92171,-3.195234 0,-2.119915 0.92171,-3.195234 0.93706,-1.09068 2.47323,-1.09068 0.95243,0 1.55153,0.353319 0.61447,0.353319 0.99851,0.860255 h 0.0922 q -0.0307,-0.199702 -0.0614,-0.583745 -0.0307,-0.399404 -0.0307,-0.629829 v -3.287404 h 1.35183 v 11.674892 h -1.09068 l -0.1997,-1.106043 h -0.0614 q -0.36868,0.522298 -0.98315,0.890979 -0.61446,0.368681 -1.58225,0.368681 z m 0.21506,-1.121404 q 1.30575,0 1.82804,-0.706638 0.53766,-0.722 0.53766,-2.166 v -0.245787 q 0,-1.53617 -0.50693,-2.35034 -0.50694,-0.829532 -1.87413,-0.829532 -1.09068,0 -1.6437,0.875617 -0.53766,0.860255 -0.53766,2.319616 0,1.474724 0.53766,2.288894 0.55302,0.81417 1.65906,0.81417 z"
-         style="text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:0.25"
-         id="path2536" />
-    </g>
-  </g>
-</svg>
--- a/demo/images/ads_tile_green.svg
+++ b/demo/images/ads_tile_green.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#accb01" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/ads_tile_orange.svg
+++ b/demo/images/ads_tile_orange.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024" height="1024" version="1.1" viewBox="0 0 270.93 270.93" xmlns="http://www.w3.org/2000/svg">
- <path d="m-2.5e-6 -2.5e-6v270.93h270.93v-270.93z" fill="#ff9833" stroke-width=".26458" style="mix-blend-mode:normal"/>
- <g fill="#fff" fill-opacity=".25">
-  <g transform="matrix(.12402 0 0 .12402 71.967 73.674)" stroke-width="4.7887">
-   <path d="m405.33 234.66v256h469.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m661.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m405.33 533.33v256h213.33v-256z" style="mix-blend-mode:normal"/>
-   <path d="m149.33 234.66v554.67h213.33v-554.67z" style="mix-blend-mode:normal"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Docking">
-   <path d="m100.07 182.94q0 2.7805-1.5208 4.1938-1.5054 1.3979-4.2091 1.3979h-3.057v-10.968h3.3796q1.6437 0 2.8573 0.61447 1.2289 0.61446 1.8895 1.8127 0.66055 1.1982 0.66055 2.9494zm-1.4594 0.0461q0-2.1967-1.0907-3.2106-1.0753-1.0292-3.057-1.0292h-1.7973v8.6026h1.4901q4.4549 0 4.4549-4.3627z"/>
-   <path d="m114.84 184.4q0 2.0431-1.0446 3.1645-1.0292 1.1214-2.7958 1.1214-1.0907 0-1.9509-0.49158-0.84489-0.50693-1.3365-1.4594-0.49158-0.96778-0.49158-2.335 0-2.0431 1.0139-3.1491 1.0292-1.106 2.8112-1.106 1.106 0 1.9663 0.50694 0.86026 0.49157 1.3365 1.444 0.49158 0.93706 0.49158 2.3042zm-6.2215 0q0 1.4594 0.56838 2.3196 0.58374 0.84489 1.8434 0.84489 1.2443 0 1.828-0.84489 0.58374-0.86025 0.58374-2.3196 0-1.4594-0.58374-2.2889-0.58375-0.82953-1.8434-0.82953t-1.828 0.82953-0.56838 2.2889z"/>
-   <path d="m125.64 188.69q-1.106 0-1.9509-0.44549-0.84489-0.44549-1.3365-1.3826-0.47622-0.93707-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50693-0.95243 1.3826-1.3979t1.9817-0.44549q0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41477 1.1214q-0.36868-0.13826-0.86025-0.26115-0.49158-0.1229-0.9217-0.1229-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13825 0.95242-0.33795v1.1982q-0.41476 0.21506-0.9217 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m136.4 176.86v6.0986q0 0.24579-0.0307 0.6452-0.0154 0.3994-0.0307 0.69127h0.0614q0.0922-0.12289 0.27651-0.35332 0.18434-0.23042 0.36868-0.46085 0.19971-0.24578 0.33796-0.3994l2.6268-2.7805h1.5823l-3.3335 3.5178 3.5639 4.716h-1.6283l-2.8573-3.8404-0.93707 0.81417v3.0262h-1.3365v-11.675z"/>
-   <path d="m149.32 177.22q0.30724 0 0.53766 0.21506 0.24579 0.1997 0.24579 0.64519t-0.24579 0.66056q-0.23042 0.1997-0.53766 0.1997-0.33795 0-0.56838-0.1997-0.23042-0.21507-0.23042-0.66056t0.23042-0.64519q0.23043-0.21506 0.56838-0.21506zm0.66056 3.0877v8.2339h-1.3518v-8.2339z"/>
-   <path d="m161.92 180.15q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808-0.5223 0.76809-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95242 0.70664-0.3226 1.4901-0.3226z"/>
-   <path d="m175.73 180.15q0.81417 0 1.4594 0.30724 0.66055 0.30723 1.1214 0.93706h0.0768l0.18434-1.0907h1.0753v8.3721q0 1.7666-0.90634 2.6576-0.89098 0.89098-2.7805 0.89098-1.8127 0-2.9648-0.5223v-1.2443q1.2136 0.6452 3.0416 0.6452 1.06 0 1.6591-0.62983 0.61447-0.61447 0.61447-1.6898v-0.3226q0-0.18434 0.0154-0.52229 0.0154-0.35332 0.0307-0.49158h-0.0615q-0.82953 1.2443-2.55 1.2443-1.5976 0-2.504-1.1214-0.89098-1.1214-0.89098-3.1338 0-1.9663 0.89098-3.1184 0.90634-1.1675 2.4886-1.1675zm0.18434 1.1368q-1.0292 0-1.5976 0.82953-0.56838 0.81417-0.56838 2.335t0.55302 2.335q0.55302 0.79881 1.6437 0.79881 1.2443 0 1.8127-0.66056 0.56838-0.67591 0.56838-2.166v-0.32259q0-1.6744-0.58374-2.4118-0.58375-0.73736-1.828-0.73736z"/>
-  </g>
-  <g stroke-width=".26458" aria-label="Qt Advanced ">
-   <path d="m100.61 89.668q0 2.0124-0.81417 3.441-0.79881 1.4133-2.3811 1.9356l2.6269 2.7344h-1.9817l-2.1199-2.4732q-0.09217 0-0.1997 0-0.09217 0.01536-0.18434 0.01536-1.7051 0-2.8419-0.70664-1.1214-0.70664-1.6744-1.9817-0.55302-1.275-0.55302-2.9802 0-1.6744 0.55302-2.9341 0.55302-1.275 1.6744-1.9817 1.1368-0.70664 2.8573-0.70664 1.6437 0 2.7651 0.70664 1.1214 0.69128 1.6898 1.9663 0.58374 1.2597 0.58374 2.9648zm-8.664 0q0 2.0738 0.87562 3.272 0.87562 1.1829 2.7344 1.1829 1.8588 0 2.719-1.1829 0.87562-1.1982 0.87562-3.272 0-2.0738-0.86026-3.2413-0.86026-1.1829-2.719-1.1829-1.8741 0-2.7497 1.1829-0.87562 1.1675-0.87562 3.2413z"/>
-   <path d="m105.6 94.215q0.30723 0 0.62983-0.04609 0.32259-0.04609 0.52229-0.12289v1.0292q-0.21506 0.10753-0.61446 0.16898-0.39941 0.07681-0.76809 0.07681-0.64519 0-1.1982-0.21506-0.53766-0.23042-0.87562-0.78345-0.33796-0.55302-0.33796-1.5515v-4.7929h-1.1675v-0.64519l1.1829-0.53766 0.53766-1.7512h0.7988v1.8895h2.3811v1.0446h-2.3811v4.7621q0 0.75272 0.35332 1.1214 0.36868 0.35332 0.93707 0.35332z"/>
-   <path d="m119.46 95.168-1.3211-3.3949h-4.3474l-1.3058 3.3949h-1.3979l4.2859-11.014h1.2443l4.2706 11.014zm-1.7359-4.6239-1.2289-3.3181q-0.0461-0.12289-0.15362-0.44549-0.10753-0.3226-0.21507-0.66055-0.0922-0.35332-0.15361-0.53766-0.1229 0.47621-0.26115 0.93706-0.12289 0.44549-0.21507 0.70664l-1.2443 3.3181z"/>
-   <path d="m125.13 95.321q-1.5362 0-2.4579-1.06-0.9217-1.0753-0.9217-3.1952t0.9217-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98314 0.89098-0.61447 0.36868-1.5823 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50694-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-   <path d="m133.47 95.168-3.1184-8.2339h1.444l1.7512 4.8543q0.12289 0.33796 0.26115 0.75272 0.13825 0.41477 0.24579 0.79881 0.10753 0.38404 0.15361 0.62983h0.0615q0.0461-0.24579 0.16898-0.62983 0.12289-0.3994 0.26115-0.79881 0.13825-0.41477 0.26115-0.75272l1.7512-4.8543h1.444l-3.1338 8.2339z"/>
-   <path d="m142.58 86.796q1.5054 0 2.2274 0.66055 0.722 0.66055 0.722 2.1046v5.607h-0.98315l-0.26115-1.1675h-0.0615q-0.53766 0.67591-1.1368 0.99851-0.59911 0.3226-1.6283 0.3226-1.1214 0-1.8588-0.58374-0.73736-0.59911-0.73736-1.8588 0-1.2289 0.96778-1.8895 0.96779-0.67591 2.9802-0.73736l1.3979-0.04609v-0.49158q0-1.0292-0.44549-1.4286t-1.2597-0.3994q-0.64519 0-1.2289 0.1997-0.58374 0.18434-1.0907 0.43013l-0.41476-1.0139q0.53766-0.29187 1.275-0.49158 0.73736-0.21506 1.5362-0.21506zm1.613 4.3474-1.2136 0.04609q-1.5362 0.06145-2.1353 0.49157-0.58375 0.43013-0.58375 1.2136 0 0.69128 0.41477 1.0139 0.43013 0.3226 1.0907 0.3226 1.0292 0 1.7205-0.56838 0.70664-0.58374 0.70664-1.782z"/>
-   <path d="m152.04 86.78q1.4747 0 2.2274 0.722 0.75272 0.722 0.75272 2.3043v5.3612h-1.3365v-5.2691q0-1.9817-1.8434-1.9817-1.3672 0-1.8895 0.76808t-0.5223 2.2121v4.2706h-1.3518v-8.2339h1.0907l0.1997 1.1214h0.0768q0.39941-0.64519 1.106-0.95243 0.70663-0.3226 1.4901-0.3226z"/>
-   <path d="m160.87 95.321q-1.106 0-1.9509-0.44549-0.8449-0.44549-1.3365-1.3826-0.47622-0.93706-0.47622-2.3964 0-1.5208 0.49158-2.4732 0.50694-0.95243 1.3826-1.3979 0.87562-0.44549 1.9817-0.44549 0.61447 0 1.1982 0.13826 0.59911 0.12289 0.96779 0.30723l-0.41476 1.1214q-0.36869-0.13826-0.86026-0.26115-0.49157-0.12289-0.9217-0.12289-2.4272 0-2.4272 3.1184 0 1.4901 0.58374 2.2889 0.59911 0.78345 1.7666 0.78345 0.66055 0 1.1828-0.13826 0.5223-0.13826 0.95243-0.33796v1.1982q-0.41477 0.21506-0.92171 0.3226-0.49157 0.12289-1.1982 0.12289z"/>
-   <path d="m168.13 86.78q1.0446 0 1.8127 0.46085 0.76809 0.46085 1.1675 1.3057 0.41477 0.82953 0.41477 1.9509v0.81417h-5.6378q0.0307 1.3979 0.70664 2.1353 0.69128 0.722 1.9202 0.722 0.78345 0 1.3826-0.13826 0.61447-0.15362 1.2597-0.43013v1.1829q-0.62983 0.27651-1.2443 0.3994-0.61447 0.13826-1.4594 0.13826-1.1828 0-2.0738-0.47621t-1.3979-1.4133q-0.49157-0.93706-0.49157-2.3196 0-1.3518 0.44549-2.3196 0.46085-0.96779 1.275-1.4901 0.82953-0.5223 1.9202-0.5223zm-0.0154 1.106q-0.96779 0-1.5362 0.62983-0.55302 0.61447-0.66055 1.7205h4.1937q-0.0154-1.0446-0.49157-1.6898-0.47622-0.66055-1.5054-0.66055z"/>
-   <path d="m176.53 95.321q-1.5362 0-2.4579-1.06-0.92171-1.0753-0.92171-3.1952t0.92171-3.1952q0.93706-1.0907 2.4732-1.0907 0.95243 0 1.5515 0.35332 0.61447 0.35332 0.99851 0.86026h0.0922q-0.0307-0.1997-0.0614-0.58374-0.0307-0.3994-0.0307-0.62983v-3.2874h1.3518v11.675h-1.0907l-0.1997-1.106h-0.0614q-0.36868 0.5223-0.98315 0.89098-0.61446 0.36868-1.5822 0.36868zm0.21506-1.1214q1.3058 0 1.828-0.70664 0.53766-0.722 0.53766-2.166v-0.24579q0-1.5362-0.50693-2.3503-0.50694-0.82953-1.8741-0.82953-1.0907 0-1.6437 0.87562-0.53766 0.86026-0.53766 2.3196 0 1.4747 0.53766 2.2889 0.55302 0.81417 1.6591 0.81417z"/>
-  </g>
- </g>
-</svg>
--- a/demo/images/color_lens.svg
+++ b/demo/images/color_lens.svg
@@ -1,6 +0,0 @@
-<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>color_lens 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,469.33c0,117.76 -95.57,213.34 -213.33,213.34h-75.52c-35.41,0 -64,28.59 -64,64c0,16.21 6.4,31.15 16.21,42.24c10.24,11.52 16.64,26.45 16.64,43.09c0,35.41 -28.59,64 -64,64c-212.05,0 -384,-171.95 -384,-384c0,-212.05 171.95,-384 384,-384c212.05,0 384,152.74 384,341.33zM341.33,448c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM469.33,277.33c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM682.67,277.33c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64zM810.67,448c0,-35.41 -28.59,-64 -64,-64c-35.41,0 -64,28.59 -64,64c0,35.41 28.59,64 64,64c35.41,0 64,-28.59 64,-64z"/>
-	</g>
-</svg>
--- a/demo/images/crop_original.svg
+++ b/demo/images/crop_original.svg
@@ -1,6 +0,0 @@
-<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>crop_original 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,213.33v597.34c0,46.93 -38.4,85.33 -85.33,85.33h-597.34c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h597.34c46.93,0 85.33,38.4 85.33,85.33zM810.67,213.33h-597.34v597.34h597.34zM746.67,725.33h-469.34l117.34,-150.61l83.62,100.69l117.34,-151.04z"/>
-	</g>
-</svg>
--- a/demo/images/find_in_page.svg
+++ b/demo/images/find_in_page.svg
@@ -1,6 +0,0 @@
-<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>find_in_page 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="M689.92,672c22.19,-33.71 35.41,-73.81 35.41,-117.33c0,-117.76 -95.57,-213.34 -213.33,-213.34c-117.76,0 -213.33,95.58 -213.33,213.34c0,117.76 95.57,213.33 213.33,213.33c43.52,0 83.63,-13.22 117.76,-35.41l189.01,189.01c-14.51,10.67 -31.57,17.07 -50.77,17.07h-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.33l256,256v494.51zM512,426.67c70.83,0 128,57.17 128,128c0,70.83 -57.17,128 -128,128c-70.83,0 -128,-57.17 -128,-128c0,-70.83 57.17,-128 128,-128z"/>
-	</g>
-</svg>
--- a/demo/images/font_download.svg
+++ b/demo/images/font_download.svg
@@ -1,6 +0,0 @@
-<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>font_download 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.34zM769.71,789.33l-218.03,-554.66h-79.36l-218.03,554.66h89.18l47.78,-128h240.64l48.64,128zM512,340.48l88.32,235.52h-176.64z"/>
-	</g>
-</svg>
--- a/demo/images/panorama.svg
+++ b/demo/images/panorama.svg
@@ -1,6 +0,0 @@
-<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>panorama 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,853.33h-768c-46.93,0 -85.33,-38.4 -85.33,-85.33v-512c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33v512c0,46.93 -38.4,85.33 -85.33,85.33zM213.33,725.33h597.34l-192,-256l-149.34,192.43l-106.66,-128.43z"/>
-	</g>
-</svg>
--- a/demo/images/perm_media.svg
+++ b/demo/images/perm_media.svg
@@ -1,6 +0,0 @@
-<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>perm_media 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="M1024,256v426.67c0,46.93 -38.4,85.33 -85.33,85.33h-682.67c-46.93,0 -85.33,-38.4 -85.33,-85.33l0.42,-512c0,-46.93 37.98,-85.34 84.91,-85.34h256l85.33,85.34h341.34c46.93,0 85.33,38.4 85.33,85.33zM85.33,853.33h768v85.34h-768c-46.93,0 -85.33,-38.41 -85.33,-85.34l0.43,-384h-0.43v-213.33h85.33zM896,640l-149.33,-192l-106.67,128.43l-149.33,-192.43l-192,256z"/>
-	</g>
-</svg>
--- a/demo/images/photo.svg
+++ b/demo/images/photo.svg
@@ -1,6 +0,0 @@
-<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>photo 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="M810.67,896h-597.34c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h597.34c46.93,0 85.33,38.4 85.33,85.33v597.34c0,46.93 -38.4,85.33 -85.33,85.33zM213.33,768h597.34l-192,-256l-149.34,192.43l-106.66,-128.43z"/>
-	</g>
-</svg>
--- a/demo/images/tab.svg
+++ b/demo/images/tab.svg
@@ -1,6 +0,0 @@
-<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>tab 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,85.33 -85.33,85.33h-768c-46.93,0 -85.33,-38.4 -85.33,-85.33v-597.34c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33zM896,384h-341.33v-170.67h-426.67v597.34h768z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_in.svg
+++ b/demo/images/zoom_in.svg
@@ -1,6 +0,0 @@
-<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>zoom_in 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="M874.24,810.67l-63.57,63.57l-213.34,-212.91v-33.7l-11.52,-11.95c-48.64,41.81 -111.79,66.99 -180.48,66.99c-153.17,0 -277.33,-124.17 -277.33,-277.34c0,-153.17 124.16,-277.33 277.33,-277.33c153.17,0 277.34,124.16 277.34,277.33c0,68.69 -25.18,131.84 -66.99,180.48l11.95,11.52h33.7zM597.33,405.33c0,-106.24 -85.76,-192 -192,-192c-106.24,0 -192,85.76 -192,192c0,106.24 85.76,192 192,192c106.24,0 192,-85.76 192,-192zM512,426.67h-85.33v85.33h-42.67v-85.33h-85.33v-42.67h85.33v-85.33h42.67v85.33h85.33z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_out.svg
+++ b/demo/images/zoom_out.svg
@@ -1,6 +0,0 @@
-<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>zoom_out 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="M874.24,810.67l-63.57,63.57l-213.34,-212.91v-33.7l-11.52,-11.95c-48.64,41.81 -111.79,66.99 -180.48,66.99c-153.17,0 -277.33,-124.17 -277.33,-277.34c0,-153.17 124.16,-277.33 277.33,-277.33c153.17,0 277.34,124.16 277.34,277.33c0,68.69 -25.18,131.84 -66.99,180.48l11.95,11.52h33.7zM597.33,405.33c0,-106.24 -85.76,-192 -192,-192c-106.24,0 -192,85.76 -192,192c0,106.24 85.76,192 192,192c106.24,0 192,-85.76 192,-192zM298.67,384h213.33v42.67h-213.33z"/>
-	</g>
-</svg>
--- a/demo/images/zoom_out_map.svg
+++ b/demo/images/zoom_out_map.svg
@@ -1,6 +0,0 @@
-<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>zoom_out_map 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,896h-256l98.13,-98.13l-123.3,-122.46l60.58,-60.58l122.46,123.3l98.13,-98.13zM896,128v256l-98.13,-98.13l-122.46,123.3l-60.58,-60.58l123.3,-122.46l-98.13,-98.13zM128,896v-256l98.13,98.13l122.46,-123.3l60.58,60.58l-123.3,122.46l98.13,98.13zM128,128h256l-98.13,98.13l123.3,122.46l-60.58,60.58l-122.46,-123.3l-98.13,98.13z"/>
-	</g>
-</svg>
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -45,18 +45,17 @@ int main(int argc, char *argv[])
 	QApplication a(argc, argv);
 	a.setApplicationName("Advanced Docking System Demo");
 	a.setQuitOnLastWindowClosed(true);
-	a.setWindowIcon(QIcon(":/adsdemo/images/ads_icon2.svg"));
-
-	qInstallMessageHandler(myMessageOutput);
-	qDebug() << "Message handler test";
-
-	CMainWindow mw;
-	mw.show();

 	QFile StyleSheetFile(":/adsdemo/app.css");
 	StyleSheetFile.open(QIODevice::ReadOnly);
 	QTextStream StyleSheetStream(&StyleSheetFile);
 	a.setStyleSheet(StyleSheetStream.readAll());
 	StyleSheetFile.close();
+
+	qInstallMessageHandler(myMessageOutput);
+	qDebug() << "Message handler test";
+
+	CMainWindow mw;
+	mw.show();
 	return a.exec();
 }
--- a/demo/res/visual_studio_light.css
+++ b/demo/res/visual_studio_light.css
@@ -1,379 +0,0 @@
-
-/*
- * Visual Studio like light theme
- */
- 
-/*****************************************************************************
- * CDockManager
- *****************************************************************************/
-ads--CDockManager 
-{
-	background: palette(window);
-} 
- 
- 
-
-/*****************************************************************************
- * CDockContainerWidget
- *****************************************************************************/ 
-ads--CDockContainerWidget {
-	background: palette(window);
-	padding: 2px;
-}
-
-
-/*****************************************************************************
- * CDockAreaWidget
- *****************************************************************************/
-ads--CDockAreaWidget {
-	background: palette(window);
-	/*border: 1px solid palette(dark);*/
-}
-
-
-ads--CDockAreaTitleBar {
-	background: transparent;
-	border-bottom: 2px solid rgb(204, 204, 204);
-	padding-bottom: 0px;
-}
-
-
-ads--CTitleBarButton {
-	padding: 0px 0px;
-	background: transparent;
-	border: none;
-}
-
-ads--CTitleBarButton:hover {
-	background: rgba(0, 0, 0, 24);
-}
-
-ads--CTitleBarButton:pressed {
-	background: rgba(0, 0, 0, 48);
-}
-
-QScrollArea#dockWidgetScrollArea {
-	padding: 0px;
-	border: none;
-}
-
-#tabsMenuButton::menu-indicator {
-	image: none;
-}
-
-
-#dockAreaCloseButton {
-	qproperty-icon: url(:/ads/images/close-button.svg),
-		url(:/ads/images/close-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;
-}
-
-#detachGroupButton {
-	qproperty-icon: url(:/ads/images/detach-button.svg),
-		url(:/ads/images/detach-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;	
-}
-
-
-ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
-	border-bottom: 2px solid palette(highlight);
-}
-
-
-/*****************************************************************************
- * CDockWidgetTab
- *****************************************************************************/
-ads--CDockWidgetTab {
-	background: palette(window);
-	border: none;
-	padding: 0 0px;
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetTab[activeTab="true"] {
-	background: rgb(204, 204, 204);
-}
-
-ads--CDockWidgetTab QLabel {
-	color: palette(foreground);
-}
-
-ads--CDockWidgetTab[activeTab="true"] QLabel {
-	color: palette(foreground);
-}
-
-
-#tabCloseButton {
-	margin-top: 2px;
-	background: none;
-	border: none;
-	padding: 0px -2px;
-	qproperty-icon: url(:/ads/images/close-button.svg),
-		url(:/ads/images/close-button-disabled.svg) disabled;
-	qproperty-iconSize: 16px;
-}
-
-#tabCloseButton:hover {
-	/*border: 1px solid rgba(0, 0, 0, 32);*/
-	background: rgba(0, 0, 0, 24);
-}
-
-#tabCloseButton:pressed {
-	background: rgba(0, 0, 0, 48);
-}
-
-
-/* Focus related styling */
-ads--CDockWidgetTab[focused="true"] {
-	background: palette(highlight);
-	border-color: palette(highlight);
-}
-
-ads--CDockWidgetTab[focused="true"] > #tabCloseButton {
-	qproperty-icon: url(:/ads/images/close-button-focused.svg)
-}
-
-ads--CDockWidgetTab[focused="true"]>#tabCloseButton:hover {
-	background: rgba(255, 255, 255, 48);
-}
-
-ads--CDockWidgetTab[focused="true"]>#tabCloseButton:pressed {
-	background: rgba(255, 255, 255, 92);
-}
-
-ads--CDockWidgetTab[focused="true"] QLabel {
-	color: palette(light);
-}
-
-
-/*****************************************************************************
- * CDockWidget
- *****************************************************************************/
-ads--CDockWidget {
-	background: palette(light);
-	border: 1px solid rgb(204, 204, 204);
-	border-top: none;
-}
-
-
-
-/*****************************************************************************
- *
- * Styling of auto hide functionality
- *
- *****************************************************************************/
- 
- 
-/*****************************************************************************
- * CAutoHideTab
- *****************************************************************************/
-ads--CAutoHideTab {
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-	background: none;
-	border: none;
-	padding-left: 2px;
-	padding-right: 0px;
-	text-align: center;
-	min-height: 20px;
-	padding-bottom: 2px;
-}
-
-
-ads--CAutoHideTab:hover
-{
-	color: palette(highlight);
-}
-
-
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="0"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="2"]  {
-	border-top: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="1"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="3"] {
-	border-bottom: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="0"],
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="2"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="0"][activeTab="true"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="2"][activeTab="true"]  {
-	border-top: 6px solid palette(highlight);
-}
-
-
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="1"],
-ads--CAutoHideTab:hover[iconOnly="false"][sideBarLocation="3"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="1"][activeTab="true"],
-ads--CAutoHideTab[iconOnly="false"][sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 6px solid palette(highlight);
-}
-
-
-/**
- * Auto hide tabs with icon only
- */
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="0"] {
-	border-top: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="1"] {
-	border-left: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="2"] {
-	border-right: 6px solid rgba(0, 0, 0, 48);
-}
-
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="3"] {
-	border-bottom: 6px solid rgba(0, 0, 0, 48);
-}
-
-
-/**
- * Auto hide tabs with icon only hover
- */
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="0"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="0"][activeTab="true"] {
-	border-top: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="1"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="1"][activeTab="true"] {
-	border-left: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="2"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="2"][activeTab="true"] {
-	border-right: 6px solid palette(highlight);
-}
-
-ads--CAutoHideTab:hover[iconOnly="true"][sideBarLocation="3"],
-ads--CAutoHideTab[iconOnly="true"][sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 6px solid palette(highlight);
-}
-
-
-
-/*****************************************************************************
- * CAutoHideSideBar
- *****************************************************************************/
-ads--CAutoHideSideBar{
-	background: palette(window);
-	border: none;
-	qproperty-spacing: 12;
-}
-
-#sideTabsContainerWidget {
-	background: transparent;
-}
-
-
-ads--CAutoHideSideBar[sideBarLocation="0"] {
-	border-bottom: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="1"] {
-	border-right: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="2"] {
-	border-left: 1px solid palette(dark);
-}
-
-ads--CAutoHideSideBar[sideBarLocation="3"] {
-	border-top: 1px solid palette(dark);
-}
-
-
-/*****************************************************************************
- * CAutoHideDockContainer
- *****************************************************************************/
-ads--CAutoHideDockContainer {
-	background: palette(window);
-}
-
-
-ads--CAutoHideDockContainer ads--CDockAreaTitleBar {
-	background: palette(highlight);
-	padding: 0px;
-	border: none;
-}
-
-
-/*
- * This is required because the ads--CDockAreaWidget[focused="true"] will 
- * overwrite the ads--CAutoHideDockContainer ads--CDockAreaTitleBar rule
- */
-ads--CAutoHideDockContainer ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
-	background: palette(highlight);
-	padding: 0px;
-	border: none;
-}
-
-
-#autoHideTitleLabel {
-	padding-left: 4px;
-	color: palette(light);
-}
-
-
-/*****************************************************************************
- * CAutoHideDockContainer titlebar buttons
- *****************************************************************************/
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
-	qproperty-iconSize: 16px;
-}
-
-ads--CAutoHideDockContainer #dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned-focused.svg);
-	qproperty-iconSize: 16px;
-}
-
-
-ads--CAutoHideDockContainer #dockAreaCloseButton{
-	qproperty-icon: url(:/ads/images/close-button-focused.svg)
-}
-
-
-ads--CAutoHideDockContainer ads--CTitleBarButton:hover {
-	background: rgba(255, 255, 255, 48);
-}
-
-ads--CAutoHideDockContainer ads--CTitleBarButton:pressed {
-	background: rgba(255, 255, 255, 96);
-}
-
-/*****************************************************************************
- * CAutoHideDockContainer Titlebar and Buttons
- *****************************************************************************/
-
-
-/*****************************************************************************
- * CResizeHandle
- *****************************************************************************/
-ads--CResizeHandle {
-	background: palette(window);
-}
-
-
-ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
-	border-top: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
-	border-left: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
-	border-right: 1px solid palette(dark);
-}
-
-ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
-	border-top: 1px solid palette(dark);
-}
--- a/doc/AutoHide_Animation.gif
+++ b/doc/AutoHide_Animation.gif
--- a/doc/AutoHide_Movie.gif
+++ b/doc/AutoHide_Movie.gif
--- a/doc/AutoHide_PinTo.png
+++ b/doc/AutoHide_PinTo.png
--- a/doc/Feature_ImageViewer.png
+++ b/doc/Feature_ImageViewer.png
--- a/doc/ads_icon.svg
+++ b/doc/ads_icon.svg
@@ -1,77 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   version="1.1"
-   viewBox="0 0 1023.99 1023.99"
-   id="svg26"
-   sodipodi:docname="ads_icon.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   width="1023.99"
-   height="1023.99"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   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:svg="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="defs30" />
+     id="defs1149" />
  <sodipodi:namedview
-     id="namedview28"
     pagecolor="#ffffff"
     bordercolor="#666666"
-     borderopacity="1.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="0.12999302"
-     inkscape:cx="3277.099"
-     inkscape:cy="-257.70614"
     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="svg26"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
+     inkscape:current-layer="svg1145" />
  <desc
-     id="desc2">electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none"
-     x="1251.1022"
-     y="1305.4956"
-     id="text9788"><tspan
-       sodipodi:role="line"
-       id="tspan9786"
-       x="1251.1022"
-       y="1305.4956" /></text>
-  <g
-     id="g94691"
-     transform="translate(581.23034,1750.5233)">
-    <path
-       d="m 191.63966,-726.53328 h -521.75 c -138.69,0 -251.12,-112.43001 -251.12,-251.12 v -521.75002 c 0,-138.69 112.43,-251.12 251.12,-251.12 h 521.75 c 138.69,0 251.12,112.43 251.12,251.12 v 521.75002 c 0,138.68999 -112.43,251.12 -251.12,251.12 z"
-       fill="#707070"
-       id="path4-5"
-       style="mix-blend-mode:normal;fill:#e0e0e0;fill-opacity:1;fill-rule:nonzero" />
-    <path
-       id="path927"
-       style="mix-blend-mode:normal;fill:#009ddd;fill-opacity:1;fill-rule:nonzero"
-       d="m -175.90039,-1515.8633 v 256 h 469.3301 v -256 z" />
-    <path
-       id="path16513"
-       style="mix-blend-mode:normal;fill:#ff9833;fill-opacity:1;fill-rule:nonzero"
-       d="m 80.099609,-1217.1934 v 256.00004 H 293.42969 v -256.00004 z" />
-    <path
-       id="path16513-5"
-       style="mix-blend-mode:normal;fill:#accb01;fill-opacity:1;fill-rule:nonzero"
-       d="m -175.90039,-1217.1933 v 256 H 37.42969 v -256 z" />
-    <path
-       id="path24788"
-       style="mix-blend-mode:normal;fill:#0083c3;fill-opacity:1;fill-rule:nonzero"
-       d="m -431.90039,-1515.8633 v 554.66994 h 213.33008 v -554.66994 z" />
-  </g>
+     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_logo.svg
+++ b/doc/ads_logo.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="1032" height="151.81" version="1.1" viewBox="0 0 1032 151.81" xmlns="http://www.w3.org/2000/svg">
- <desc>electric_iron icon - Licensed under Iconfu Standard License v1.0 (https://www.iconfu.com/iconfu_standard_license) - Incors GmbH</desc>
- <text x="1251.1022" y="1305.4956" fill="#000000" font-family="sans-serif" font-size="40px" style="line-height:1.25" xml:space="preserve"><tspan x="1251.1022" y="1305.4956"/></text>
- <g transform="scale(.14825)" stroke-width="6.7454">
-  <g fill="#8f918f" aria-label="Qt Advanced Docking">
-   <path d="m1416.3 726.04q-93.219 0-148.72-61.942-55.196-61.942-55.196-160.99 0-105.18 56.729-168.35 57.035-63.475 155.47-63.475 88.926 0 143.82 61.022 55.196 60.715 55.196 159.45 0 109.16-56.422 171.72-17.479 19.625-38.944 32.811l106.71 81.26h-51.209l-83.1-66.848q-37.41 15.332-84.327 15.332zm3.0664-427.15q-76.66 0-126.34 55.502-49.369 55.502-49.369 145.35 0 90.766 46.916 144.74 46.916 53.662 125.11 53.662 81.567 0 129.1-53.049 47.53-53.356 47.53-148.41 0-93.219-46.61-145.35-46.303-52.436-126.34-52.436z"/>
-   <path d="m1826.9 714.08q-22.078 10.426-41.397 10.426-69.608 0-69.608-83.407v-210.97h-56.422v-25.758h56.422v-81.567q6.7461-2.4531 14.106-4.9063 7.3594-2.1465 14.106-4.5996v91.073h82.793v25.758h-82.793v207.29q0 32.504 10.119 47.223 10.426 14.412 34.957 14.412 17.479 0 37.717-11.346z"/>
-   <path d="m2353.7 718.37-50.289-136.76h-190.73l-50.289 136.76h-33.424l165.89-439.72h28.824l164.05 439.72zm-134.92-367.97q-3.373-9.1993-5.5195-18.092-2.1465-7.6661-4.5997-15.332h-1.2265q-5.2129 20.238-10.119 32.811l-73.901 203.92h169.57z"/>
-   <path d="m2679 718.37v-57.035h-1.2266q-15.332 29.744-45.383 47.223-30.051 17.479-67.768 17.479-57.955 0-94.752-42.317-36.49-42.317-36.49-116.83 0-76.047 39.864-122.96 40.17-47.223 103.95-47.223 70.528 0 100.58 57.955h1.2266v-201.16h28.211v464.87zm0-191.04q0-43.85-27.904-74.207-27.598-30.664-74.514-30.664-49.369 0-81.567 38.024-32.198 37.717-32.198 103.95 0 65.008 28.824 100.58 29.131 35.264 74.821 35.264 53.662 0 83.1-33.117 29.438-33.424 29.438-81.26z"/>
-   <path d="m2910.8 718.37h-25.758l-121.43-314h31.584l93.526 249.91q6.7462 18.092 9.5059 32.811h1.2266q3.9864-19.318 8.8926-31.584l96.592-251.14h30.664z"/>
-   <path d="m3280 718.37v-62.862h-1.2265q-15.026 32.197-43.85 51.516-28.518 19.012-63.475 19.012-44.77 0-70.834-25.145t-26.065-63.475q0-82.18 108.86-99.352l96.592-14.412q0-101.19-76.047-101.19-51.822 0-100.89 41.703v-34.037q17.479-13.799 47.223-23.611 30.051-9.8126 56.422-9.8126 48.449 0 74.821 30.051 26.678 30.051 26.678 87.393v204.22zm-86.473-156.39q-49.369 7.0528-69.301 22.998-19.932 15.639-19.932 51.209 0 27.904 18.398 45.996 18.705 18.092 51.822 18.092 45.383 0 75.434-33.424 30.051-33.731 30.051-86.78v-30.664z"/>
-   <path d="m3616.1 718.37v-182.76q0-113.15-81.567-113.15-45.383 0-74.514 33.424-29.131 33.117-29.131 82.18v180.31h-28.211v-314h28.211v57.035h1.2266q34.344-64.701 107.32-64.701 50.903 0 77.887 34.037 26.984 33.731 26.984 96.592v191.04z"/>
-   <path d="m3942.1 704.57q-34.957 21.465-83.407 21.465-64.088 0-103.34-43.85-39.25-44.156-39.25-115.3 0-74.821 44.156-122.35 44.156-47.836 113.46-47.836 35.877 0 69.608 14.719v31.891q-33.731-20.852-73.901-20.852-55.196 0-89.54 39.863-34.344 39.557-34.344 102.73 0 61.022 31.278 98.125 31.584 37.104 83.1 37.104 47.223 0 82.18-25.145z"/>
-   <path d="m4024.3 562.6q0 64.701 29.744 101.19 30.051 36.49 82.18 36.49 52.742 0 103.03-38.944v30.051q-48.756 34.651-108.86 34.651-60.715 0-98.126-43.543-37.41-43.543-37.41-122.96 0-68.688 38.944-115.6 39.25-47.223 101.81-47.223 58.569 0 89.846 41.09t31.278 112.23v12.572zm203-25.758q-1.8399-54.276-26.065-84.327-24.225-30.051-66.848-30.051-44.156 0-73.287 29.744-28.824 29.438-35.57 84.633z"/>
-   <path d="m4557.5 718.37v-57.035h-1.2266q-15.332 29.744-45.383 47.223-30.051 17.479-67.768 17.479-57.955 0-94.752-42.317-36.49-42.317-36.49-116.83 0-76.047 39.863-122.96 40.17-47.223 103.95-47.223 70.528 0 100.58 57.955h1.2266v-201.16h28.211v464.87zm0-191.04q0-43.85-27.904-74.207-27.598-30.664-74.514-30.664-49.369 0-81.567 38.024-32.197 37.717-32.197 103.95 0 65.008 28.824 100.58 29.131 35.264 74.821 35.264 53.662 0 83.1-33.117 29.438-33.424 29.438-81.26z"/>
-   <path d="m4864.5 718.37v-439.72h110.08q109.47 0 166.51 54.582 57.035 54.582 57.035 159.15 0 100.58-61.328 163.44-61.022 62.555-168.65 62.555zm30.358-411.82v384.22h68.994q97.819 0 150.25-50.596 52.436-50.903 52.436-146.57 0-187.05-196.56-187.05z"/>
-   <path d="m5407.5 726.04q-68.688 0-108.86-45.076-39.863-45.383-39.863-117.75 0-78.194 41.703-122.35 42.01-44.156 110.39-44.156 67.155 0 106.1 43.85 38.944 43.85 38.944 121.43 0 73.287-39.863 118.67-39.557 45.383-108.55 45.383zm2.1465-303.58q-55.502 0-88.62 37.41-32.811 37.41-32.811 103.95 0 61.635 32.197 99.045 32.197 37.41 88.006 37.41 56.729 0 87.393-36.797t30.664-102.11q0-67.155-30.664-103.03-30.358-35.877-86.166-35.877z"/>
-   <path d="m5837.1 704.57q-34.957 21.465-83.407 21.465-64.088 0-103.34-43.85-39.25-44.156-39.25-115.3 0-74.821 44.156-122.35 44.156-47.836 113.46-47.836 35.877 0 69.608 14.719v31.891q-33.731-20.852-73.901-20.852-55.196 0-89.54 39.863-34.344 39.557-34.344 102.73 0 61.022 31.278 98.125 31.584 37.104 83.1 37.104 47.223 0 82.18-25.145z"/>
-   <path d="m6092.2 718.37-150.25-155.16h-1.2266v155.16h-28.211v-464.87h28.211v299.59h1.2266l142.59-148.72h36.49l-149.03 152.09 160.99 161.91z"/>
-   <path d="m6205.1 325.26q-9.1992 0-16.252-6.7461-7.0528-6.7461-7.0528-17.172 0-10.119 7.0528-16.252 7.3594-6.4395 16.252-6.4395 9.506 0 16.559 6.1328 7.3594 6.1328 7.3594 16.559 0 9.8126-7.0527 16.865-7.0528 7.0528-16.865 7.0528zm-13.799 393.12v-314h28.211v314z"/>
-   <path d="m6533.5 718.37v-182.76q0-113.15-81.567-113.15-45.383 0-74.514 33.424-29.131 33.117-29.131 82.18v180.31h-28.211v-314h28.211v57.035h1.2265q34.344-64.701 107.32-64.701 50.902 0 77.887 34.037 26.984 33.731 26.984 96.592v191.04z"/>
-   <path d="m6907.3 695.07q0 88.62-38.637 129.71-38.637 41.09-120.2 41.09-45.383 0-93.526-23.918v-29.438q49.676 27.598 94.139 27.598 130.02 0 130.02-137.38v-40.783h-1.2266q-37.104 64.088-113.15 64.088-57.955 0-94.752-42.01-36.49-42.01-36.49-117.14t39.557-122.66q39.557-47.53 104.26-47.53 69.301 0 100.58 57.342h1.2266v-49.676h28.211zm-28.211-170.19q0-41.703-28.211-72.061-27.904-30.358-72.981-30.358-51.822 0-83.407 38.944-31.584 38.944-31.584 103.03 0 64.395 28.824 100.27 29.131 35.57 76.66 35.57 50.596 0 80.647-32.811 30.051-32.811 30.051-80.34z"/>
-  </g>
-  <g transform="translate(581.23 1750.5)">
-   <path d="m191.64-726.53h-521.75c-138.69 0-251.12-112.43-251.12-251.12v-521.75c0-138.69 112.43-251.12 251.12-251.12h521.75c138.69 0 251.12 112.43 251.12 251.12v521.75c0 138.69-112.43 251.12-251.12 251.12z" fill="#e0e0e0" style="mix-blend-mode:normal"/>
-   <path d="m-175.9-1515.9v256h469.33v-256z" fill="#009ddd" style="mix-blend-mode:normal"/>
-   <path d="m80.1-1217.2v256h213.33v-256z" fill="#ff9833" style="mix-blend-mode:normal"/>
-   <path d="m-175.9-1217.2v256h213.33v-256z" fill="#accb01" style="mix-blend-mode:normal"/>
-   <path d="m-431.9-1515.9v554.67h213.33v-554.67z" fill="#0083c3" style="mix-blend-mode:normal"/>
-  </g>
- </g>
-</svg>
--- a/doc/ads_logo_ukraine.jpg
+++ b/doc/ads_logo_ukraine.jpg
--- a/doc/ads_qt_marketplace_description.md
+++ b/doc/ads_qt_marketplace_description.md
@@ -12,6 +12,20 @@ styles as much as possible.

 ## Features

+### Overview
+
+- [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
@@ -92,10 +106,3 @@ You can detach dock widgets and also dock areas in the following ways:
 ### 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.
-
-### Python PyQt5 Bindings
-
-![Python Logo](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/python_logo.png)
-
-The Advanced Docking System comes with a complete Python integration based on
-PyQt5 bindings. The package is available via [conda-forge](https://github.com/conda-forge/pyqtads-feedstock).
--- a/doc/ads_qt_marketplace_manifest.json
+++ b/doc/ads_qt_marketplace_manifest.json
@@ -4,21 +4,21 @@
    "extensionType": [
        "library"
    ],
-    "version": "3.8.2",
+    "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.svg",
+    "icon": "https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/ads_icon_512.png",
    "licenses": [
-      { "licenseType": "LGPL-2.1-only",
+      { "licenseType": "LGPLv2.1",
        "licenseUrl": "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" }
    ],
    "created": "2017-03-30",
-    "lastUpdate": "2022-03-02",
+    "lastUpdate": "2020-01-16",
    "platforms": [
-        "Windows 7-11", "Kubuntu 18.04", "Kubuntu 19.10", "Ubuntu 19.10", "Ubuntu 20.04"
+        "Windows 7-10", "Kubuntu 18.04", "Kubuntu 19.10", "Ubuntu 19.10"
    ],
    "qtVersions": [
        "5.5.1 or newer"
--- a/doc/autohide-feature-demo.png
+++ b/doc/autohide-feature-demo.png
--- a/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_false.gif
+++ b/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_false.gif
--- a/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_true.gif
+++ b/doc/cfg_flag_AutoHideCloseButtonCollapsesDock_true.gif
--- a/doc/cfg_flag_AutoHideSideBarsIconOnly_false.png
+++ b/doc/cfg_flag_AutoHideSideBarsIconOnly_false.png
--- a/doc/cfg_flag_AutoHideSideBarsIconOnly_true.png
+++ b/doc/cfg_flag_AutoHideSideBarsIconOnly_true.png
--- a/doc/cfg_flag_DockAreaHasAutoHideButton.png
+++ b/doc/cfg_flag_DockAreaHasAutoHideButton.png
--- a/doc/cfg_flag_MiddleMouseButtonClosesTab.gif
+++ b/doc/cfg_flag_MiddleMouseButtonClosesTab.gif
--- a/doc/showcase_adtf.png
+++ b/doc/showcase_adtf.png
--- a/doc/showcase_d-tect-x.png
+++ b/doc/showcase_d-tect-x.png
--- a/doc/showcase_dream3d_nx.png
+++ b/doc/showcase_dream3d_nx.png
--- a/doc/showcase_labplot.png
+++ b/doc/showcase_labplot.png
--- a/doc/showcase_metgem.png
+++ b/doc/showcase_metgem.png
--- a/doc/showcase_notepad_next.png
+++ b/doc/showcase_notepad_next.png
--- a/doc/showcase_plot_juggler.png
+++ b/doc/showcase_plot_juggler.png
--- a/doc/showcase_pre_workbench.png
+++ b/doc/showcase_pre_workbench.png
--- a/doc/showcase_qmix_elements.png
+++ b/doc/showcase_qmix_elements.png
--- a/doc/showcase_qt_design_studio_video.png
+++ b/doc/showcase_qt_design_studio_video.png
--- a/doc/showcase_ramses_composer.png
+++ b/doc/showcase_ramses_composer.png
--- a/doc/showcase_resinsight.png
+++ b/doc/showcase_resinsight.png
--- a/doc/showcase_robox_ide.png
+++ b/doc/showcase_robox_ide.png
--- a/doc/taiwan_ukraine.jpg
+++ b/doc/taiwan_ukraine.jpg
--- a/doc/ukraine.jpg
+++ b/doc/ukraine.jpg
--- a/doc/user-guide.md
+++ b/doc/user-guide.md
@@ -11,6 +11,7 @@
  - [`TabCloseButtonIsToolButton`](#tabclosebuttonistoolbutton)
  - [`AllTabsHaveCloseButton`](#alltabshaveclosebutton)
  - [`RetainTabSizeWhenCloseButtonHidden`](#retaintabsizewhenclosebuttonhidden)
+  - [`OpaqueUndocking`](#opaqueundocking)
  - [`DragPreviewIsDynamic`](#dragpreviewisdynamic)
  - [`DragPreviewShowsContentPixmap`](#dragpreviewshowscontentpixmap)
  - [`DragPreviewHasWindowFrame`](#dragpreviewhaswindowframe)
@@ -26,32 +27,7 @@
  - [`EqualSplitOnInsertion`](#equalsplitoninsertion)
  - [`FloatingContainerForceNativeTitleBar` (Linux only)](#floatingcontainerforcenativetitlebar-linux-only)
  - [`FloatingContainerForceQWidgetTitleBar` (Linux only)](#floatingcontainerforceqwidgettitlebar-linux-only)
-  - [`MiddleMouseButtonClosesTab`](#middlemousebuttonclosestab)
- [Auto-Hide Configuration Flags](#auto-hide-configuration-flags)
-  - [Auto Hide Dock Widgets](#auto-hide-dock-widgets)
-  - [Pinning Auto-Hide Widgets to a certain border](#pinning-auto-hide-widgets-to-a-certain-border)
-  - [Show / Hide Auto-Hide Widgets via Mouse Over](#show--hide-auto-hide-widgets-via-mouse-over)
-  - [Adding Auto Hide Widgets](#adding-auto-hide-widgets)
-  - [Setting Auto-Hide Flags](#setting-auto-hide-flags)
-  - [`AutoHideFeatureEnabled`](#autohidefeatureenabled)
-  - [`DockAreaHasAutoHideButton`](#dockareahasautohidebutton)
-  - [`AutoHideButtonTogglesArea`](#autohidebuttontogglesarea)
-  - [`AutoHideButtonCheckable`](#autohidebuttoncheckable)
-  - [`AutoHideSideBarsIconOnly`](#autohidesidebarsicononly)
-  - [`AutoHideShowOnMouseOver`](#autohideshowonmouseover)
-  - [`AutoHideCloseButtonCollapsesDock`](#autohideclosebuttoncollapsesdock)
- [DockWidget Feature Flags](#dockwidget-feature-flags)
-  - [`DockWidgetClosable`](#dockwidgetclosable)
-  - [`DockWidgetMovable`](#dockwidgetmovable)
-  - [`DockWidgetFloatable`](#dockwidgetfloatable)
-  - [`DockWidgetDeleteOnClose`](#dockwidgetdeleteonclose)
-  - [`CustomCloseHandling`](#customclosehandling)
-  - [`DockWidgetFocusable`](#dockwidgetfocusable)
-  - [`DockWidgetForceCloseWithArea`](#dockwidgetforceclosewitharea)
-  - [`NoTab`](#notab)
-  - [`DeleteContentOnClose`](#deletecontentonclose)
 - [Central Widget](#central-widget)
- [Empty Dock Area](#empty-dock-area)
 - [Custom Close Handling](#custom-close-handling)
 - [Styling](#styling)
  - [Disabling the Internal Style Sheet](#disabling-the-internal-style-sheet)
@@ -59,15 +35,14 @@
 ## Configuration Flags

 The Advanced Docking System has a number of global configuration options to
-configure the design and the functionality of the docking system. Each
+configure the design and the functionality of the docking system. Eachs
 configuration will be explained in detail in the following sections.

 ### Setting Configuration Flags

-You must set the configuration flags before creating the dock manager
-instance otherwise the manager will not be created correctly and will
-crash upon being created. That means, setting the configurations flags
-is the first thing you must do, if you use the library.
+You should set the configuration flags before you create the dock manager
+instance. That means, setting the configurations flags is the first thing
+you do, if you use the library.

 ```c++
 CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);
@@ -79,9 +54,9 @@ d->DockManager = new CDockManager(this);
 If you set the configurations flags, you can set individual flags using the
 function `CDockManager::setConfigFlag` or you can set all flags using
 the function `CDockManager::setConfigFlags`. Instead of settings all
-flags individually, it is better to pick a predefined set of configuration
+flags individualy, it is better to pick a predefined set of configuration
 flags and then modify individual flags. The following predefined
-configurations are available
+configurations are avilable

 - `DefaultNonOpaqueConfig` - uses non opaque splitter resizing and non opaque docking
 - `DefaultOpaqueConfig` - uses opaque splitter resizing and opaque docking
@@ -170,6 +145,37 @@ constant, that means, if enabled, the tabs need more space.

 ![AllTabsHaveCloseButton false](cfg_flag_RetainTabSizeWhenCloseButtonHidden_true.png)

+### `OpaqueUndocking`
+
+If this flag is set, 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.
+
+![OpaqueUndocking true](opaque_undocking.gif)
+
+If you would like to test opaque undocking, you should set the pedefined config
+flags `CDockManager::DefaultOpaqueConfig`.
+
+```c++
+CDockManager::setConfigFlags(CDockManager::DefaultOpaqueConfig);
+```
+
+If this flag is cleared (default), 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.
+
+![OpaqueUndocking true](non_opaque_undocking.gif)
+
+The drag preview widget can be configured by a number of global dock manager flags:
+
+- `DragPreviewIsDynamic`
+- `DragPreviewShowsContentPixmap`
+- `DragPreviewHasWindowFrame`
+
+Non-opaque undocking is enabled by default. If you would like to enable it
+explicitely, you can do this by setting the predefined configuration flags
+`CDockManager::DefaultNonOpaqueConfig`.
+
+```c++
+CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig);
+```
+
 ### `DragPreviewIsDynamic`

 If non-opaque undocking is enabled, this flag defines the behavior of the drag 
@@ -268,8 +274,7 @@ current dock widget.

 ![FloatingContainerHasWidgetTitle true](cfg_flag_FloatingContainerHasWidgetTitle_true.png)

-otherwise it displays the title set with `CDockManager::setFloatingContainersTitle` or
-application name as window title.
+otherwise it displays application name as window title.

 ![FloatingContainerHasWidgetTitle false](cfg_flag_FloatingContainerHasWidgetTitle_false.png)

@@ -305,7 +310,7 @@ still has a titlebar to drag it out of the main window.

 If this is enabled, the docking system is able to highlight the tab and the
 components of a dock area with a different style (i.e. a different color).
-This option is disabled by default and needs to be enabled explicitly
+This option is disabled by default and needs to be enabled explicitely
 because it adds some overhead. The dock manager needs to react on focus
 changes and dock widget dragging to highlight the right dock widget. You should
 enable it only, if you really need it for your application.
@@ -325,7 +330,7 @@ be set to true and you can use this property to style the focused dock
 widget differently. The picture above uses the following styling:

 ```css
-/* Color the tab with the highlight color */
+/* Color the tab with the nhighlight color */
 ads--CDockWidgetTab[focused="true"]
 {
    background: palette(highlight);
@@ -458,204 +463,6 @@ If you would like to overwrite autodetection, then you can activate this flag
 to force QWidget based title bars. You can overwrite autodetection and this
 flag, if you set the environment variable `ADS_UseNativeTitle` to 0 or 1.

-### `MiddleMouseButtonClosesTab`
-
-If the flag is set, the user can use the mouse middle button to close the tab
-under the mouse. So you do not need to exactly hit the tab close button to
-close tab. Just click with the middle mouse button on a tab like this is
-possible in various web browsers.
-
-![MiddleMouseButtonClosesTab true](cfg_flag_MiddleMouseButtonClosesTab.gif)
-
-## Auto-Hide Configuration Flags
-
-### Auto Hide Dock Widgets
-
-The Advanced Docking System supports "Auto-Hide" functionality for **all**
-dock containers. The "Auto Hide" feature allows to display more information
-using less screen space by hiding or showing windows pinned to one of the 
-four dock container borders.
-
-Enabling this feature adds a button with a pin icon to each dock area.
-
-![DockAreaHasAutoHideButton true](cfg_flag_DockAreaHasAutoHideButton.png)
-
-By clicking this button, the current dock widget (or the complete area - depending on the
-configuration flags) will be pinned to a certain border. The border is choosen
-depending on the location of the dock area. If you click the pin button while
-holding down the **Ctrl** key, the whole dock area will be pinned to a certain
-border.
-
-### Pinning Auto-Hide Widgets to a certain border
-
-If you would like to pin a dock widget or a dock area to a certain border,
-then you can right-click into the dock widget tab or into the dock area title bar
-to show the context menu. Then you can select the location via the **Pin to** menu:
-
-![Pin to](AutoHide_PinTo.png)
-
-### Show / Hide Auto-Hide Widgets via Mouse Over
-
-Normally Auto-Hide widgets are shown by clicking the Auto-Hide tab and hidden by
-clicking the Auto-Hide tab again or by clicking into any other dock widget in
-the same container. If the Auto-Hide config flag `AutoHideShowOnMouseOver` is set,
-the Auto-Hide widget is shown, if the user hovers over the Auto-Hide tab and is
-collapsed if the mouse cursor leaves the Auto-Hide widget. Showing and hiding
-by mouse click still works if this feature is enabled.
-
-### Adding Auto Hide Widgets
-
-Adding an auto hide widget is similar to adding a dock widget, simply call
-`dockManager->addAutoHideDockWidget()`.
-
-```c++
-CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig);
-d->DockManager = new CDockManager(this);
-CDockWidget* TableDockWidget = new CDockWidget("Table 1");
-DockManager->addAutoHideDockWidget(SideBarLeft, TableDockWidget);
-```
-
-See `autohide` example or the demo application to learn how it works.
-
-### Setting Auto-Hide Flags
-
-The Advanced Docking System has a number of global configuration flags to
-configure the Auto-Hide functionality. You should set the Auto-Hide flags before
-creating the dock manager instance. That means, you should set the Auto-Hide
-flags after setting the configuration flags.
-
-```c++
-CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
-CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig);
-CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideShowOnMouseOver, true);
-...
-d->DockManager = new CDockManager(this);
-```
-
-If you set the Auto-Hide flags, you can set individual flags using the
-function `CDockManager::setAutoHideConfigFlag` or you can set all flags using
-the function `CDockManager::setAutoHideConfigFlags`. Instead of settings all
-flags individually, it is better to pick a predefined set of configuration
-flags and then modify individual flags. The following predefined
-configurations are available
-
- `DefaultAutoHideConfig` - default auto hide config
-
-Pick one of those predefined configurations and then modify the following
-configurations flags to adjust the docking system to your needs.
-
-### `AutoHideFeatureEnabled`
-
-Enables / disables the Auto-Hide functionality. Only if this flag is enabled,
-the other Auto-Hide flags will be evaluated.
-
-### `DockAreaHasAutoHideButton`
-
-If this flag is set (default), then each dock area has a pin button in the title 
-bar to toggle Auto-Hide state.
-
-![DockAreaHasAutoHideButton true](cfg_flag_DockAreaHasAutoHideButton.png)
-
-### `AutoHideButtonTogglesArea`
-
-If set, the the pin button in the dock area title bar toggles the complete area.
-If not set (default), then the pin button toggles the current active tab / dock
-widget and pressing the **Ctrl** key while clicking the pin button toggles the
-complete ara.
-
-### `AutoHideButtonCheckable`
-
-Normally the pin button in the dock area title bar is not checkable. If this
-flag is set, then the button is checkable. That means, if button is checked,
-the dock widget is pinned.
-
-### `AutoHideSideBarsIconOnly`
-
-Normally the Auto-Hide tabs show the icon and title of the dock widget:
-
-![AutoHideSideBarsIconOnly false](cfg_flag_AutoHideSideBarsIconOnly_false.png)
-
-You can set this flag, if you would like to have only icons in the Auto-Hide
-tabs instead of icon and dock widget title. If this is set, the Auto-Hide tab
-needs less space. The tooltip of each tab still shows the dock widget title.
-
-![AutoHideSideBarsIconOnly true](cfg_flag_AutoHideSideBarsIconOnly_true.png)
-
-### `AutoHideShowOnMouseOver`
-
-Normally Auto-Hide widgets are shown by clicking the Auto-Hide tab and
-hidden by clicking the Auto-Hide tab again or by clicking into any other
-dock widget in the same container. If this flag is set, the Auto-Hide widget
-is shown, if the user hovers over the Auto-Hide tab or if the users moves the
-mouse outside of the Auto-Hide widget. Showing and hiding my mouse click still
-works if this feature is enabled.
-
-### `AutoHideCloseButtonCollapsesDock`
-
-Some users don't understand the distinction between closing an auto hide dock and
-collapsing an auto hide dock. This may lead to situations where they press the
-close button (losing the side tab widget) instead of simply clicking outside
-the auto hide dock (collapsing the dock). 
-
-![AutoHideCloseButtonCollapsesDock false](cfg_flag_AutoHideCloseButtonCollapsesDock_false.gif)
-
-If `AutoHideCloseButtonCollapsesDock` option is active, the
-close button in an auto hide widget collapses the auto hide widget instead of
-closing it.
-
-![AutoHideCloseButtonCollapsesDock true](cfg_flag_AutoHideCloseButtonCollapsesDock_true.gif)
-
-## DockWidget Feature Flags
-
-### `DockWidgetClosable`
-
-If set, the dock widget will have a close button.
-
-### `DockWidgetMovable`
-
-If a dock widget is movable, then it and can be moved to a new position in the
-current dock container. Disable this flag to prevent moving of a dock widget
-via mouse.
-
-### `DockWidgetFloatable`
-
-If set, a dock widget can be dragged into a floating window.
-
-### `DockWidgetDeleteOnClose`
-
-Deletes the dock widget and its content when it is closed.
-
-### `CustomCloseHandling`
-
-Clicking the close button will not close the dock widget but emits the
-`closeRequested()` signal instead. This allows the application to implement
-a custom close handling.
-
-### `DockWidgetFocusable`
-
-If this is enabled, a dock widget can get focus highlighting.
-
-### `DockWidgetForceCloseWithArea`
-
-A dock widget will be closed when the dock area hosting it is closed. If the
-`DockWidgetDeleteOnClose` feature is enabled for a dock widget, then it will
-be deleted, if the user clicks the close button of this dock widget. If the
-user clicks the close button of the dock area that contains this widget,
-then only the visibility of the dock widget is toggled. If this feature flag
-is set, the closing the dock area also closes the dock widget. That means, if
-the dock widget feature `DockWidgetDeleteOnClose` is set for the dock widgets
-in a dock area, then all dock widgets will be deleted if the dock area is closed.
-
-### `NoTab`
-
-A dock widget tab will never be shown if this flag is set.
-
-### `DeleteContentOnClose`
-
-Deletes only the contained widget on close, keeping the dock widget intact and
-in place. Attempts to rebuild the contents widget on show if there is a widget
-factory set. See [issue #365](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/pull/365) for more details.
-
 ## Central Widget

 The Advanced Docking System has been developed to overcome the limitations of
@@ -693,33 +500,6 @@ See the `centralwidget` example to learn how it works.
 > are already other dock widgets registered. So `setCentralWidget` should be
 > the first function that you call when adding dock widgets.

-## Empty Dock Area
-
-Some applications require a fixed DockArea that is always visible, even if it
-does not contain any DockWidgets. I.e. the DockArea is in this case a kind
-of central widget that is always visible (see this
-[issue](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues/199)).
-
-Since version 3.7.1 the advanced docking system supports this feature. The
-`emptydockarea` example shows how this can be implemented with the library. You
-just need to create a dock widget and set the feature flag `CDockWidget::NoTab`.
-This permanently hides the tab widget of this area and removes it from the tab
-menu. For this special dock widget you should also disable all other features
-(movable, closable and floatable) to prevent closing and moving of this widget.
-If you use the `CDockManager::setCentralWidget` function like in the example
-code below, then you don't need to disable these features because this is done
-in the `setCentralWidget` function.
-
-```c++
-QLabel* label = new QLabel();
-label->setText("This is a DockArea which is always visible, even if it does not contain any DockWidgets.");
-label->setAlignment(Qt::AlignCenter);
-CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
-CentralDockWidget->setWidget(label);
-CentralDockWidget->setFeature(ads::CDockWidget::NoTab, true);// set the flag before adding the widget to dock manager
-auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
-```
-
 ## Custom Close Handling

 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.
@@ -742,4 +522,3 @@ just call the function for settings the stylesheet with an empty string.
 ```c++
 DockManager->setStyleSheet("");
 ```
-
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(QtADSExamples LANGUAGES CXX VERSION ${VERSION_SHORT})
 add_subdirectory(simple)
-add_subdirectory(hideshow)
 add_subdirectory(sidebar)
 add_subdirectory(deleteonclose)
-add_subdirectory(centralwidget)
-add_subdirectory(autohide)
-add_subdirectory(emptydockarea)
-add_subdirectory(dockindock)
+add_subdirectory(centralwidget)
--- a/examples/autohide/CMakeLists.txt
+++ b/examples/autohide/CMakeLists.txt
@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(ads_example_autohide VERSION ${VERSION_SHORT}) 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_executable(AutoHideExample WIN32 
-    main.cpp
-    mainwindow.cpp
-    mainwindow.ui
-)
-target_include_directories(AutoHideExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(AutoHideExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
-target_link_libraries(AutoHideExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                                  Qt${QT_VERSION_MAJOR}::Gui 
-                                                  Qt${QT_VERSION_MAJOR}::Widgets)
-set_target_properties(AutoHideExample PROPERTIES 
-    AUTOMOC ON
-    AUTORCC ON
-    AUTOUIC ON
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS OFF
-    VERSION ${VERSION_SHORT}
-    EXPORT_NAME "Qt Advanced Docking System Auto Hide 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/examples/autohide/autohide.pro
+++ b/examples/autohide/autohide.pro
@@ -1,34 +0,0 @@
-ADS_OUT_ROOT = $${OUT_PWD}/../..
-
-QT       += core gui widgets
-
-TARGET = AutoHideExample
-DESTDIR = $${ADS_OUT_ROOT}/lib
-TEMPLATE = app
-CONFIG += c++14
-CONFIG += debug_and_release
-adsBuildStatic {
-    DEFINES += ADS_STATIC
-}
-
-# The following define makes your compiler emit warnings if you use
-# any Qt feature that has been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-SOURCES += \
-    main.cpp \
-    mainwindow.cpp
-
-HEADERS += \
-    mainwindow.h
-    
-FORMS += \
-    mainwindow.ui
-
-LIBS += -L$${ADS_OUT_ROOT}/lib
-include(../../ads.pri)
-INCLUDEPATH += ../../src
-DEPENDPATH += ../../src
-
--- a/examples/autohide/main.cpp
+++ b/examples/autohide/main.cpp
@@ -1,10 +0,0 @@
-#include <mainwindow.h>
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    CMainWindow w;
-    w.show();
-    return a.exec();
-}
--- a/examples/autohide/main.py
+++ b/examples/autohide/main.py
@@ -1,106 +0,0 @@
-import os
-import sys
-
-from PyQt5 import uic
-from PyQt5.QtCore import Qt, QTimer, QDir, QSignalBlocker
-from PyQt5.QtGui import QCloseEvent, QIcon
-from PyQt5.QtWidgets import (QApplication, QLabel, QCalendarWidget, QFrame, QTreeView,
-                             QTableWidget, QFileSystemModel, QPlainTextEdit, QToolBar,
-                             QWidgetAction, QComboBox, QAction, QSizePolicy, QInputDialog)
-
-from PyQtAds import QtAds
-
-UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
-MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
-    
-class MainWindow(MainWindowUI, MainWindowBase):
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.setupUi(self)
- 
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.OpaqueSplitterResize, True)
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.XmlCompressionEnabled, False)
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FocusHighlighting, True)
-        self.dock_manager = QtAds.CDockManager(self)
-        
-        # Set central widget
-        text_edit = QPlainTextEdit()
-        text_edit.setPlaceholderText("This is the central editor. Enter your text here.")
-        central_dock_widget = QtAds.CDockWidget("CentralWidget")
-        central_dock_widget.setWidget(text_edit)
-        central_dock_area = self.dock_manager.setCentralWidget(central_dock_widget)
-        central_dock_area.setAllowedAreas(QtAds.DockWidgetArea.OuterDockAreas)
-        
-        # create other dock widgets
-        table = QTableWidget()
-        table.setColumnCount(3)
-        table.setRowCount(10)
-        table_dock_widget = QtAds.CDockWidget("Table 1")
-        table_dock_widget.setWidget(table)
-        table_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
-        table_dock_widget.resize(250, 150)
-        table_dock_widget.setMinimumSize(200, 150)
-        table_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.LeftDockWidgetArea, table_dock_widget)
-        self.menuView.addAction(table_dock_widget.toggleViewAction())
-        
-        table = QTableWidget()
-        table.setColumnCount(5)
-        table.setRowCount(1020)
-        table_dock_widget = QtAds.CDockWidget("Table 2")
-        table_dock_widget.setWidget(table)
-        table_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
-        table_dock_widget.resize(250, 150)
-        table_dock_widget.setMinimumSize(200, 150)
-        table_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.BottomDockWidgetArea, table_dock_widget, table_area)
-        self.menuView.addAction(table_dock_widget.toggleViewAction())
-
-        properties_table = QTableWidget()
-        properties_table.setColumnCount(3)
-        properties_table.setRowCount(10)
-        properties_dock_widget = QtAds.CDockWidget("Properties")
-        properties_dock_widget.setWidget(properties_table)
-        properties_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
-        properties_dock_widget.resize(250, 150)
-        properties_dock_widget.setMinimumSize(200, 150)
-        self.dock_manager.addDockWidget(QtAds.DockWidgetArea.RightDockWidgetArea, properties_dock_widget, central_dock_area)
-        self.menuView.addAction(properties_dock_widget.toggleViewAction())
-        
-        self.create_perspective_ui()
-        
-    def create_perspective_ui(self):
-        save_perspective_action = QAction("Create Perspective", self)
-        save_perspective_action.triggered.connect(self.save_perspective)
-        perspective_list_action = QWidgetAction(self)
-        self.perspective_combobox = QComboBox(self)
-        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.AdjustToContents)
-        self.perspective_combobox.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
-        self.perspective_combobox.activated[str].connect(self.dock_manager.openPerspective)
-        perspective_list_action.setDefaultWidget(self.perspective_combobox)
-        self.toolBar.addSeparator()
-        self.toolBar.addAction(perspective_list_action)
-        self.toolBar.addAction(save_perspective_action)
-        
-    def save_perspective(self):
-        perspective_name, ok = QInputDialog.getText(self, "Save Perspective", "Enter Unique name:")
-        if not ok or not perspective_name:
-            return
-        
-        self.dock_manager.addPerspective(perspective_name)
-        blocker = QSignalBlocker(self.perspective_combobox)
-        self.perspective_combobox.clear()
-        self.perspective_combobox.addItems(self.dock_manager.perspectiveNames())
-        self.perspective_combobox.setCurrentText(perspective_name)
-        
-    def closeEvent(self, event: QCloseEvent):
-        self.dock_manager.deleteLater()
-        super().closeEvent(event)
-
-
-if __name__ == '__main__':
-    app = QApplication(sys.argv)
-    
-    w = MainWindow()
-    w.show()
-    app.exec_()
--- a/examples/autohide/mainwindow.cpp
+++ b/examples/autohide/mainwindow.cpp
@@ -1,126 +0,0 @@
-#include "mainwindow.h"
-
-#include "ui_mainwindow.h"
-
-#include <QWidgetAction>
-#include <QFileSystemModel>
-#include <QTableWidget>
-#include <QHBoxLayout>
-#include <QInputDialog>
-#include <QFileDialog>
-#include <QSettings>
-#include <QPlainTextEdit>
-#include <QToolBar>
-
-#include "AutoHideDockContainer.h"
-#include "DockAreaWidget.h"
-#include "DockAreaTitleBar.h"
-
-using namespace ads;
-
-
-CMainWindow::CMainWindow(QWidget *parent)
-    : QMainWindow(parent)
-    , ui(new Ui::CMainWindow)
-{
-    ui->setupUi(this);
-    CDockManager::setConfigFlag(CDockManager::OpaqueSplitterResize, true);
-    CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false);
-    CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
-    CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig);
-    DockManager = new CDockManager(this);
-
-    // Set central widget
-    QPlainTextEdit* w = new QPlainTextEdit();
-	w->setPlaceholderText("This is the central editor. Enter your text here.");
-    CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
-    CentralDockWidget->setWidget(w);
-    auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
-    CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);
-
-    // create other dock widgets
-    QTableWidget* table = new QTableWidget();
-    table->setColumnCount(3);
-    table->setRowCount(10);
-    CDockWidget* TableDockWidget = new CDockWidget("Table 1");
-    TableDockWidget->setWidget(table);
-    TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
-    TableDockWidget->setMinimumSize(200,150);
-    const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::SideBarLeft, TableDockWidget);
-    autoHideContainer->setSize(480);
-    ui->menuView->addAction(TableDockWidget->toggleViewAction());
-
-    table = new QTableWidget();
-    table->setColumnCount(5);
-    table->setRowCount(1020);
-    TableDockWidget = new CDockWidget("Table 2");
-    TableDockWidget->setWidget(table);
-    TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
-    TableDockWidget->resize(250, 150);
-    TableDockWidget->setMinimumSize(200,150);
-    DockManager->addAutoHideDockWidget(SideBarLocation::SideBarLeft, TableDockWidget);
-    ui->menuView->addAction(TableDockWidget->toggleViewAction());
-
-    QTableWidget* propertiesTable = new QTableWidget();
-    propertiesTable->setColumnCount(3);
-    propertiesTable->setRowCount(10);
-    CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
-    PropertiesDockWidget->setWidget(propertiesTable);
-    PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
-    PropertiesDockWidget->resize(250, 150);
-    PropertiesDockWidget->setMinimumSize(200,150);
-    DockManager->addDockWidget(DockWidgetArea::RightDockWidgetArea, PropertiesDockWidget, CentralDockArea);
-    ui->menuView->addAction(PropertiesDockWidget->toggleViewAction());
-
-    createPerspectiveUi();
-}
-
-CMainWindow::~CMainWindow()
-{
-    delete ui;
-}
-
-
-void CMainWindow::createPerspectiveUi()
-{
-	SavePerspectiveAction = new QAction("Create Perspective", this);
-	connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
-	PerspectiveListAction = new QWidgetAction(this);
-	PerspectiveComboBox = new QComboBox(this);
-	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-	connect(PerspectiveComboBox, SIGNAL(currentTextChanged(const QString&)),
-		DockManager, SLOT(openPerspective(const QString&)));
-	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
-	ui->toolBar->addSeparator();
-	ui->toolBar->addAction(PerspectiveListAction);
-	ui->toolBar->addAction(SavePerspectiveAction);
-}
-
-
-void CMainWindow::savePerspective()
-{
-	QString PerspectiveName = QInputDialog::getText(this, "Save Perspective", "Enter unique name:");
-	if (PerspectiveName.isEmpty())
-	{
-		return;
-	}
-
-	DockManager->addPerspective(PerspectiveName);
-	QSignalBlocker Blocker(PerspectiveComboBox);
-	PerspectiveComboBox->clear();
-	PerspectiveComboBox->addItems(DockManager->perspectiveNames());
-	PerspectiveComboBox->setCurrentText(PerspectiveName);
-}
-
-
-//============================================================================
-void CMainWindow::closeEvent(QCloseEvent* event)
-{
-    // Delete dock manager here to delete all floating widgets. This ensures
-    // that all top level windows of the dock manager are properly closed
-    DockManager->deleteLater();
-	QMainWindow::closeEvent(event);
-}
-
-
--- a/examples/autohide/mainwindow.h
+++ b/examples/autohide/mainwindow.h
@@ -1,43 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QMainWindow>
-#include <QComboBox>
-#include <QWidgetAction>
-
-#include "DockManager.h"
-#include "DockAreaWidget.h"
-#include "DockWidget.h"
-
-QT_BEGIN_NAMESPACE
-namespace Ui { class CMainWindow; }
-QT_END_NAMESPACE
-
-class CMainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    CMainWindow(QWidget *parent = nullptr);
-    ~CMainWindow();
-
-protected:
-	virtual void closeEvent(QCloseEvent* event) override;
-
-private:
-	QAction* SavePerspectiveAction = nullptr;
-	QWidgetAction* PerspectiveListAction = nullptr;
-	QComboBox* PerspectiveComboBox = nullptr;
-
-    Ui::CMainWindow *ui;
-
-    ads::CDockManager* DockManager;
-    ads::CDockAreaWidget* StatusDockArea;
-    ads::CDockWidget* TimelineDockWidget;
-
-    void createPerspectiveUi();
-
-private slots:
-	void savePerspective();
-};
-#endif // MAINWINDOW_H
--- a/examples/autohide/mainwindow.ui
+++ b/examples/autohide/mainwindow.ui
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CMainWindow</class>
- <widget class="QMainWindow" name="CMainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1284</width>
-    <height>757</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>1284</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="QToolBar" name="toolBar">
-   <property name="windowTitle">
-    <string>toolBar</string>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/examples/centralwidget/CMakeLists.txt
+++ b/examples/centralwidget/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(ads_example_centralwidget VERSION ${VERSION_SHORT}) 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(CentralWidgetExample WIN32 
    main.cpp
@@ -9,10 +8,8 @@ add_executable(CentralWidgetExample WIN32
    mainwindow.ui
 )
 target_include_directories(CentralWidgetExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(CentralWidgetExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
-target_link_libraries(CentralWidgetExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                                  Qt${QT_VERSION_MAJOR}::Gui 
-                                                  Qt${QT_VERSION_MAJOR}::Widgets)
+target_link_libraries(CentralWidgetExample PRIVATE qtadvanceddocking)
+target_link_libraries(CentralWidgetExample PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
 set_target_properties(CentralWidgetExample PROPERTIES 
    AUTOMOC ON
    AUTORCC ON
--- a/examples/centralwidget/centralWidget.py
+++ b/examples/centralwidget/centralWidget.py
@@ -12,7 +12,19 @@ from PyQtAds import QtAds

 UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
 MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
+
+import demo_rc # pyrcc5 demo\demo.qrc -o examples\centralWidget\demo_rc.py
+
+
+def svg_icon(filename: str):
+    '''Helper function to create an SVG icon'''
+    # This is a workaround, because because in item views SVG icons are not
+    # properly scaled and look blurry or pixelate
+    icon = QIcon(filename)
+    icon.addPixmap(icon.pixmap(92))
+    return icon
    
+
 class MainWindow(MainWindowUI, MainWindowBase):

    def __init__(self, parent=None):
@@ -34,26 +46,27 @@ class MainWindow(MainWindowUI, MainWindowBase):
        central_dock_area.setAllowedAreas(QtAds.DockWidgetArea.OuterDockAreas)
        
        # create other dock widgets
+        file_tree = QTreeView()
+        file_tree.setFrameShape(QFrame.NoFrame)
+        file_model = QFileSystemModel(file_tree)
+        file_model.setRootPath(QDir.currentPath())
+        file_tree.setModel(file_model)
+        data_dock_widget = QtAds.CDockWidget("File system")
+        data_dock_widget.setWidget(file_tree)
+        data_dock_widget.resize(150, 250)
+        data_dock_widget.setMinimumSize(100, 250)
+        file_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.LeftDockWidgetArea, data_dock_widget, central_dock_area)
+        self.menuView.addAction(data_dock_widget.toggleViewAction())
+
        table = QTableWidget()
        table.setColumnCount(3)
        table.setRowCount(10)
-        table_dock_widget = QtAds.CDockWidget("Table 1")
+        table_dock_widget = QtAds.CDockWidget("Table")
        table_dock_widget.setWidget(table)
        table_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
        table_dock_widget.resize(250, 150)
        table_dock_widget.setMinimumSize(200, 150)
-        table_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.LeftDockWidgetArea, table_dock_widget)
-        self.menuView.addAction(table_dock_widget.toggleViewAction())
-        
-        table = QTableWidget()
-        table.setColumnCount(5)
-        table.setRowCount(1020)
-        table_dock_widget = QtAds.CDockWidget("Table 2")
-        table_dock_widget.setWidget(table)
-        table_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
-        table_dock_widget.resize(250, 150)
-        table_dock_widget.setMinimumSize(200, 150)
-        table_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.BottomDockWidgetArea, table_dock_widget, table_area)
+        self.dock_manager.addDockWidget(QtAds.DockWidgetArea.BottomDockWidgetArea, table_dock_widget, file_area)
        self.menuView.addAction(table_dock_widget.toggleViewAction())

        properties_table = QTableWidget()
@@ -63,7 +76,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
        properties_dock_widget.setWidget(properties_table)
        properties_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
        properties_dock_widget.resize(250, 150)
-        properties_dock_widget.setMinimumSize(200, 150)
+        properties_dock_widget.setMinimumSize(200,150)
        self.dock_manager.addDockWidget(QtAds.DockWidgetArea.RightDockWidgetArea, properties_dock_widget, central_dock_area)
        self.menuView.addAction(properties_dock_widget.toggleViewAction())
        
@@ -71,6 +84,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
        
    def create_perspective_ui(self):
        save_perspective_action = QAction("Create Perspective", self)
+        save_perspective_action.setIcon(svg_icon(":/adsdemo/images/picture_in_picture.svg"))
        save_perspective_action.triggered.connect(self.save_perspective)
        perspective_list_action = QWidgetAction(self)
        self.perspective_combobox = QComboBox(self)
@@ -92,11 +106,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        self.perspective_combobox.clear()
        self.perspective_combobox.addItems(self.dock_manager.perspectiveNames())
        self.perspective_combobox.setCurrentText(perspective_name)
-        
-    def closeEvent(self, event: QCloseEvent):
-        self.dock_manager.deleteLater()
-        super().closeEvent(event)
-

 if __name__ == '__main__':
    app = QApplication(sys.argv)
--- a/examples/centralwidget/mainwindow.cpp
+++ b/examples/centralwidget/mainwindow.cpp
@@ -46,26 +46,27 @@ CMainWindow::CMainWindow(QWidget *parent)
    CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);

    // create other dock widgets
+    QTreeView* fileTree = new QTreeView();
+    fileTree->setFrameShape(QFrame::NoFrame);
+    QFileSystemModel* fileModel = new QFileSystemModel(fileTree);
+    fileModel->setRootPath(QDir::currentPath());
+    fileTree->setModel(fileModel);
+    CDockWidget* DataDockWidget = new CDockWidget("File system");
+    DataDockWidget->setWidget(fileTree);
+    DataDockWidget->resize(150, 250);
+    DataDockWidget->setMinimumSize(100, 250);
+    auto* fileArea = DockManager->addDockWidget(DockWidgetArea::LeftDockWidgetArea, DataDockWidget, CentralDockArea);
+    ui->menuView->addAction(DataDockWidget->toggleViewAction());
+
    QTableWidget* table = new QTableWidget();
    table->setColumnCount(3);
    table->setRowCount(10);
-    CDockWidget* TableDockWidget = new CDockWidget("Table 1");
+    CDockWidget* TableDockWidget = new CDockWidget("Table");
    TableDockWidget->setWidget(table);
    TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
    TableDockWidget->resize(250, 150);
    TableDockWidget->setMinimumSize(200,150);
-    auto TableArea = DockManager->addDockWidget(DockWidgetArea::LeftDockWidgetArea, TableDockWidget);
-    ui->menuView->addAction(TableDockWidget->toggleViewAction());
-
-    table = new QTableWidget();
-    table->setColumnCount(5);
-    table->setRowCount(1020);
-    TableDockWidget = new CDockWidget("Table 2");
-    TableDockWidget->setWidget(table);
-    TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
-    TableDockWidget->resize(250, 150);
-    TableDockWidget->setMinimumSize(200,150);
-    DockManager->addDockWidget(DockWidgetArea::BottomDockWidgetArea, TableDockWidget, TableArea);
+    DockManager->addDockWidget(DockWidgetArea::BottomDockWidgetArea, TableDockWidget, fileArea);
    ui->menuView->addAction(TableDockWidget->toggleViewAction());

    QTableWidget* propertiesTable = new QTableWidget();
@@ -96,7 +97,7 @@ void CMainWindow::createPerspectiveUi()
 	PerspectiveComboBox = new QComboBox(this);
 	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-	connect(PerspectiveComboBox, SIGNAL(currentTextChanged(const QString&)),
+	connect(PerspectiveComboBox, SIGNAL(activated(const QString&)),
 		DockManager, SLOT(openPerspective(const QString&)));
 	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
 	ui->toolBar->addSeparator();
--- a/examples/deleteonclose/CMakeLists.txt
+++ b/examples/deleteonclose/CMakeLists.txt
@@ -1,16 +1,13 @@
 cmake_minimum_required(VERSION 3.5)
 project(ads_example_deleteonclose VERSION ${VERSION_SHORT}) 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_executable(DeleteOnCloseTest WIN32 
    main.cpp
 )
 target_include_directories(DeleteOnCloseTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(DeleteOnCloseTest PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
-target_link_libraries(DeleteOnCloseTest PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                               Qt${QT_VERSION_MAJOR}::Gui 
-                                               Qt${QT_VERSION_MAJOR}::Widgets)
+target_link_libraries(DeleteOnCloseTest PRIVATE qtadvanceddocking)
+target_link_libraries(DeleteOnCloseTest PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
 set_target_properties(DeleteOnCloseTest PROPERTIES 
    AUTOMOC ON
    CXX_STANDARD 14
--- a/examples/deleteonclose/deleteonclose.py
+++ b/examples/deleteonclose/deleteonclose.py
--- a/examples/deleteonclose/main.cpp
+++ b/examples/deleteonclose/main.cpp
@@ -41,39 +41,19 @@ int main(int argc, char *argv[])
        now->widget()->setFocus();
    });

-    QAction *action = new QAction("New [DockWidgetDeleteOnClose]", &w);
+    QAction *action = new QAction("New Delete On Close", &w);
    w.menuBar()->addAction(action);

    int i = 0;
    QObject::connect(action, &QAction::triggered, [&]() {
-        auto dw = new ads::CDockWidget(QStringLiteral("test %1 [DockWidgetDeleteOnClose]").arg(i++), &w);
+        auto dw = new ads::CDockWidget(QStringLiteral("test doc %1").arg(i++), &w);
        auto editor = new QTextEdit(QStringLiteral("lorem ipsum..."), dw);
        dw->setWidget(editor);
        dw->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
        auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);
        qDebug() << "doc dock widget created!" << dw << area;
    });
-	
-	auto dw = new ads::CDockWidget(QStringLiteral("test %1 [DeleteContentOnClose]").arg(i++), &w);
-	auto editor = new QTextEdit(QStringLiteral("recreated lorem ipsum......"), dw);
-	dw->setWidget(editor);
-	dw->setFeature(ads::CDockWidget::DeleteContentOnClose, true);
-	dw->setWidgetFactory([](QWidget* dw)
-	{
-		static int timesRecreated = 0;
-		return new QTextEdit(QStringLiteral("recreated lorem ipsum... times %1").arg(++timesRecreated), dw);
-	});
-	auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);
-	qDebug() << "DeleteContentOnClose dock widget created!" << dw << area;
-	
-	action = new QAction("Toggle [DeleteContentOnClose]", &w);
-    w.menuBar()->addAction(action);
-	
-	QObject::connect(action, &QAction::triggered, [dw]() {
-		dw->toggleView(dw->isClosed());
-		qDebug() << QString("dock widget %1! contents widget %2!").arg(dw->isClosed() ? "closed" : "open", dw->widget() ? "created" : "deleted");
-    });
-	
+
    action = new QAction("New", &w);
    w.menuBar()->addAction(action);
    QObject::connect(action, &QAction::triggered, [&]() {
--- a/examples/dockindock/CMakeLists.txt
+++ b/examples/dockindock/CMakeLists.txt
@@ -1,31 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(ads_example_dockindock VERSION ${VERSION_SHORT}) 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_executable(DockInDockExample WIN32 
-    dockindock.cpp
-    dockindockmanager.cpp
-    perspectiveactions.cpp
-    perspectives.cpp
-    main.cpp
-    mainframe.cpp
-)
-target_include_directories(DockInDockExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
-target_link_libraries(DockInDockExample PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
-target_link_libraries(DockInDockExample PUBLIC Qt${QT_VERSION_MAJOR}::Core 
-                                           Qt${QT_VERSION_MAJOR}::Gui 
-                                           Qt${QT_VERSION_MAJOR}::Widgets)
-set_target_properties(DockInDockExample PROPERTIES 
-    AUTOMOC ON
-    AUTORCC ON
-    AUTOUIC ON
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS OFF
-    VERSION ${VERSION_SHORT}
-    EXPORT_NAME "Qt Advanced Docking System Simple 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/examples/dockindock/dockindock.cpp
+++ b/examples/dockindock/dockindock.cpp
@@ -1,300 +0,0 @@
-#include "dockindock.h"
-#include "perspectives.h"
-#include "dockindockmanager.h"
-#include "perspectiveactions.h"
-
-#include <QMenu>
-#include <QDir>
-#include <QVBoxLayout>
-#include <QMainWindow>
-#include <QMessageBox>
-#include <QInputDialog>
-
-#include <set>
-#include <assert.h>
-
-using namespace QtAdsUtl;
-
-DockInDockWidget::DockInDockWidget( QWidget* parent, bool canCreateNewGroups, PerspectivesManager* perspectivesManager ) : 
-    DockInDockWidget( parent, (DockInDockWidget*)NULL, perspectivesManager )
-{
-    m_canCreateNewGroups = canCreateNewGroups;
-    m_topLevelDockWidget = this;
-}
-
-DockInDockWidget::DockInDockWidget( QWidget* parent, DockInDockWidget* topLevelDockWidget, PerspectivesManager* perspectivesManager ) : 
-    baseClass( parent ),
-    m_topLevelDockWidget( topLevelDockWidget ),
-    m_canCreateNewGroups( (topLevelDockWidget) ? topLevelDockWidget->m_canCreateNewGroups : false ),
-    m_perspectivesManager( perspectivesManager )
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins( 0,0,0,0 );
-    layout->addWidget( m_mgr = new DockInDockManager(*this) );
-}
-
-DockInDockWidget::~DockInDockWidget()
-{
-    
-}
-
-ads::CDockAreaWidget* DockInDockWidget::addTabWidget( QWidget* widget, const QString& name, ads::CDockAreaWidget* after )
-{
-    return addTabWidget( widget, name, QIcon(), after );
-}
-
-ads::CDockAreaWidget* DockInDockWidget::addTabWidget( QWidget* widget, const QString& name, QIcon icon, ads::CDockAreaWidget* after )
-{
-    for ( auto existing : getTopLevelDockWidget()->getManager()->allDockWidgets(true,true) )
-    {
-        if ( existing.second->objectName() == name )
-        {
-            QMessageBox::critical( this, "Error", "Name '" + name + "' already in use" );
-            return NULL;
-        }
-    }
-
-    ads::CDockWidget* DockWidget = new ads::CDockWidget(name);
-    DockWidget->setWidget(widget);
-    DockWidget->setIcon( icon );
-
-    // Add the dock widget to the top dock widget area
-    return m_mgr->addDockWidget(ads::CenterDockWidgetArea, DockWidget, after);
-}
-
-bool DockInDockWidget::isTopLevel()
-{
-    return objectName().isEmpty();
-}
-
-QString DockInDockWidget::getGroupNameError( const QString& groupName )
-{
-    if ( groupName.isEmpty() )
-    {
-        return "Group must have a non-empty name";
-    }
-
-    std::vector<DockInDockManager*> dockManagers = m_mgr->allManagers( true, true );
-    for ( auto mgr : dockManagers )
-    {
-        if ( mgr->getGroupName() == groupName )
-            return "Group name '" + groupName + "' already used";
-    }
-
-    return "";
-}
-
-DockInDockWidget* DockInDockWidget::createGroup( const QString& groupName, ads::CDockAreaWidget*& insertPos )
-{
-    return createGroup( groupName, QIcon(), insertPos );
-}
-
-DockInDockWidget* DockInDockWidget::createGroup( const QString& groupName, QIcon icon, ads::CDockAreaWidget*& insertPos )
-{
-    QString error = getGroupNameError( groupName );
-    if ( !error.isEmpty() )
-    {
-        QMessageBox::critical( NULL, "Error", error );
-        return NULL;
-    }
-
-    DockInDockWidget* child = new DockInDockWidget( this, m_topLevelDockWidget, m_perspectivesManager );
-    child->setObjectName( groupName );
-
-    ads::CDockWidget* DockWidget = new ads::CDockWidget(groupName);
-    DockWidget->setWidget(child);
-    DockWidget->setIcon(icon);
-
-    insertPos = m_mgr->addDockWidget(ads::CenterDockWidgetArea, DockWidget, insertPos);
-
-    return child;
-}
-
-void DockInDockWidget::destroyGroup( DockInDockWidget* widgetToRemove )
-{
-    auto topLevelWidget = widgetToRemove->getTopLevelDockWidget();
-
-    if ( topLevelWidget && topLevelWidget != widgetToRemove )
-    {
-        // reaffect all child docks to top-level
-        for ( auto dockwidget : widgetToRemove->getManager()->getWidgetsInGUIOrder() ) // don't use allDockWidgets to preserve sub-groups
-        {
-            MoveDockWidgetAction::move( dockwidget, topLevelWidget->getManager() );
-        }
-        assert( widgetToRemove->getManager()->allDockWidgets( true, true ).empty() );
-
-        // find widget's parent:
-        for ( auto dockwidget : topLevelWidget->getManager()->allDockWidgets( true, true ) )
-        {
-            if ( dockwidget.second->widget() == widgetToRemove )
-            {
-                dockwidget.first->removeDockWidget( dockwidget.second );
-                delete dockwidget.second;
-                //delete widgetToRemove; automatically deleted when dockWidget is deleted
-                widgetToRemove = NULL;
-                break;
-            }
-        }
-
-        assert( widgetToRemove == NULL );
-    }
-    else
-    {
-        assert( false );
-    }
-}
-
-void DockInDockWidget::attachViewMenu( QMenu* menu )
-{
-    connect( menu, SIGNAL(aboutToShow()), this, SLOT(autoFillAttachedViewMenu()) );
-}
-
-void DockInDockWidget::autoFillAttachedViewMenu()
-{
-    QMenu* menu = dynamic_cast<QMenu*>( QObject::sender() );
-
-    if ( menu )
-    {
-        menu->clear();
-        setupViewMenu( menu );
-    }
-    else
-    {
-        assert( false );
-    }
-}
-
-void DockInDockWidget::setupViewMenu( QMenu* menu )
-{
-    std::vector<DockInDockManager*> dockManagers = m_mgr->allManagers( true, true );
-
-    bool hasPerspectivesMenu = false;
-    if ( getTopLevelDockWidget() == this )
-        hasPerspectivesMenu = (m_perspectivesManager != NULL);
-    else
-        assert( false );
-
-    QMenu* organize = menu;
-    if ( hasPerspectivesMenu )
-        organize = menu->addMenu( "Organize" );
-
-    setupMenu( organize, dockManagers );
-
-    if ( hasPerspectivesMenu )
-    {
-        QMenu* perspectives = menu->addMenu( "Perspectives" );
-        fillPerspectivesMenu( perspectives );
-    }
-}
-
-void DockInDockWidget::setupMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo )
-{
-    m_mgr->fillViewMenu( menu, moveTo );
-    menu->addSeparator();
-    auto moveMenu = menu->addMenu( "Move" );
-    m_mgr->fillMoveMenu( moveMenu, moveTo );
-}
-
-void DockInDockWidget::fillPerspectivesMenu( QMenu* menu )
-{
-    menu->addAction( "Create perspective...", this, SLOT(createPerspective()) );
-
-    QStringList perspectiveNames;
-    if ( m_perspectivesManager )
-        perspectiveNames = m_perspectivesManager->perspectiveNames();
-
-    if ( !perspectiveNames.isEmpty() )
-    {
-        QMenu* load = menu->addMenu( "Load perspective" );
-        for (const auto& name : perspectiveNames)
-        {
-            load->addAction(new LoadPerspectiveAction( load, name, *this));
-        }
-        QMenu* remove = menu->addMenu( "Remove perspective" );
-        for (const auto& name : perspectiveNames)
-        {
-            remove->addAction( new RemovePerspectiveAction( remove, name, *this ));
-        }
-    }
-}
-
-void DockInDockWidget::setNewPerspectiveDefaultName( const QString& defaultName )
-{
-    m_newPerspectiveDefaultName = defaultName;
-}
-
-void DockInDockWidget::createPerspective()
-{
-    if ( !m_perspectivesManager )
-        return;
-
-    QString name = m_newPerspectiveDefaultName;
-    if ( !m_newPerspectiveDefaultName.isEmpty() )
-    {
-        int index = 2;
-        while ( m_perspectivesManager->perspectiveNames().contains( name ) )
-        {
-            name = m_newPerspectiveDefaultName + " (" + QString::number(index) + ")";
-            ++index;
-        }
-    }
-
-    while ( true )
-    {
-        bool ok = false;
-        name = QInputDialog::getText( NULL, "Create perspective", "Enter perspective name", QLineEdit::Normal, name, &ok );
-        if ( ok )
-        {
-            if ( name.isEmpty() )
-            {
-                QMessageBox::critical( NULL, "Error", "Perspective name cannot be empty" );
-                continue;
-            }
-            else if ( m_perspectivesManager->perspectiveNames().contains( name ) )
-            {
-                if ( QMessageBox::critical( NULL, "Error", "Perspective '" + name + "' already exists, overwrite it?", QMessageBox::Yes | QMessageBox::No, QMessageBox::No ) == QMessageBox::No )
-                    continue;
-            }
-            
-            m_perspectivesManager->addPerspective( name, *this );
-            break;
-        }
-        else
-        {
-            break;
-        }
-    }
-}
-
-static void dumpStatus( std::ostream& str, ads::CDockWidget* widget, const std::string& tab, std::string suffix )
-{
-    DockInDockManager* asMgr = DockInDockManager::dockInAManager( widget );
-    if ( asMgr )
-    {
-        asMgr->parent().dumpStatus( str, tab );
-    }
-    else
-    {
-        str << tab << widget->objectName().toStdString() << suffix << std::endl;
-    }
-}
-
-void DockInDockWidget::dumpStatus( std::ostream& str, std::string tab )
-{
-    str << tab << "Group: " << getManager()->getGroupName().toStdString() << std::endl;
-    tab += "   ";
-    std::set<ads::CDockWidget*> visibleWidgets;
-    for ( auto widget : getManager()->getWidgetsInGUIOrder() )
-    {
-        visibleWidgets.insert( widget );
-        ::dumpStatus( str, widget, tab, "" );
-    }
-
-    for ( auto closed : getManager()->dockWidgetsMap() )
-    {
-        if ( visibleWidgets.find( closed ) == visibleWidgets.end() )
-        {
-            ::dumpStatus( str, closed, tab, " (closed)" );
-        }
-    }
-}
--- a/examples/dockindock/dockindock.h
+++ b/examples/dockindock/dockindock.h
@@ -1,80 +0,0 @@
-#pragma once
-
-#include <QWidget>
-#include <QMap>
-
-#include <memory>
-#include <ostream>
-
-class QMenu;
-
-namespace ads
-{
-    class CDockAreaWidget;
-}
-
-namespace QtAdsUtl
-{
-
-class DockInDockManager;
-class PerspectivesManager;
-// tab of tab example for https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues/306
-class DockInDockWidget : public QWidget
-{
-    typedef QWidget baseClass;
-
-    Q_OBJECT
-
-public:
-    DockInDockWidget( QWidget* parent, bool canCreateNewGroups, PerspectivesManager* perspectivesManager );
-    ~DockInDockWidget() override; 
-
-    ads::CDockAreaWidget* addTabWidget( QWidget* widget, const QString& name, ads::CDockAreaWidget* after );
-    DockInDockWidget* createGroup( const QString& groupName, ads::CDockAreaWidget*& insertPos );
-
-    ads::CDockAreaWidget* addTabWidget( QWidget* widget, const QString& name, QIcon icon, ads::CDockAreaWidget* after );
-    DockInDockWidget* createGroup( const QString& groupName, QIcon icon, ads::CDockAreaWidget*& insertPos );
-    
-    QString getGroupNameError( const QString& groupName );
-    void destroyGroup( DockInDockWidget* widget );
-
-    /** Manually fill a given view menu */
-    void setupViewMenu( QMenu* menu );
-
-    /** Attach a view menu that will be automatically fill */
-    void attachViewMenu( QMenu* menu );
-
-    bool isTopLevel();
-    void setupMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo );
-
-    inline DockInDockManager* getManager() { return m_mgr; }
-    inline DockInDockWidget* getTopLevelDockWidget() { return m_topLevelDockWidget; }
-
-    inline bool canCreateNewGroups() const { return m_canCreateNewGroups; }
-
-    void dumpStatus( std::ostream& str, std::string tab = "" );
-
-    inline PerspectivesManager* getPerspectivesManager() { return m_perspectivesManager; }
-
-    void setNewPerspectiveDefaultName( const QString& defaultName );
-
-private slots:
-    void autoFillAttachedViewMenu();
-    void createPerspective();
-
-private:
-    DockInDockManager* m_mgr;
-    DockInDockWidget* m_topLevelDockWidget;
-
-    bool m_canCreateNewGroups;
-
-    DockInDockWidget( QWidget* parent, DockInDockWidget* topLevelDockWidget,  PerspectivesManager* perspectivesManager );
-
-    PerspectivesManager* m_perspectivesManager;
-    QString m_newPerspectiveDefaultName;
-
-    void fillPerspectivesMenu( QMenu* menu );
-};
-
-}
-
--- a/examples/dockindock/dockindock.pro
+++ b/examples/dockindock/dockindock.pro
@@ -1,35 +0,0 @@
-ADS_OUT_ROOT = $${OUT_PWD}/../..
-
-QT += core gui widgets
-
-TARGET = DockInDock
-DESTDIR = $${ADS_OUT_ROOT}/lib
-TEMPLATE = app
-CONFIG += c++14
-CONFIG += debug_and_release
-adsBuildStatic {
-    DEFINES += ADS_STATIC
-}
-
-DEFINES += QT_DEPRECATED_WARNINGS
-
-SOURCES += \
-        dockindock.cpp \
-        dockindockmanager.cpp \
-        perspectiveactions.cpp \
-        perspectives.cpp \
-        main.cpp \
-        mainframe.cpp
-
-HEADERS += \
-        dockindock.h \
-        dockindockmanager.h \
-        perspectiveactions.h \
-        perspectives.h \
-        mainframe.h      
-
-LIBS += -L$${ADS_OUT_ROOT}/lib
-include(../../ads.pri)
-INCLUDEPATH += ../../src
-DEPENDPATH += ../../src    
-
--- a/examples/dockindock/dockindock.py
+++ b/examples/dockindock/dockindock.py
@@ -1,203 +0,0 @@
-import sys
-
-from PyQt5.QtWidgets import (QApplication, QWidget, QVBoxLayout, QMessageBox,
-                             QInputDialog, QMenu, QLineEdit)
-from PyQt5.QtGui import QIcon
-from PyQtAds import QtAds
-
-from dockindockmanager import DockInDockManager
-from perspectiveactions import LoadPerspectiveAction, RemovePerspectiveAction
-
-
-class DockInDockWidget(QWidget):
-    def __init__(self, parent, perspectives_manager: 'PerspectivesManager', can_create_new_groups: bool = False, top_level_widget = None):
-        super().__init__(parent)
-        
-        if top_level_widget is not None:
-            self.__can_create_new_groups = top_level_widget.can_create_new_groups
-        else:
-            self.__can_create_new_groups = can_create_new_groups
-        self.__top_level_dock_widget = top_level_widget if top_level_widget else self
-        self.__perspectives_manager = perspectives_manager        
-        self.__new_perspective_default_name: str = ''
-        
-        layout = QVBoxLayout(self)
-        layout.setContentsMargins(0,0,0,0)
-        self.__mgr = DockInDockManager(self)
-        layout.addWidget(self.__mgr)
-        
-    def getManager(self) -> 'DockInDockManager':
-        return self.__mgr
-        
-    def getTopLevelDockWidget(self) -> 'DockInDockWidget':
-        return self.__top_level_dock_widget
-        
-    def canCreateNewGroups(self) -> bool:
-        return self.__can_create_new_groups
-        
-    def getPerspectivesManager(self) -> 'PerspectivesManager':
-        return self.__perspectives_manager
-        
-    def addTabWidget(self, widget: QWidget, name: str, after: QtAds.CDockAreaWidget, icon = QIcon()) -> QtAds.CDockAreaWidget:
-        for existing in self.getTopLevelDockWidget().getManager().allDockWidgets(True, True):
-            if existing[1].objectName() == name:
-                QMessageBox.critical(self, "Error", "Name '" + name + "' already in use")
-                return
-                
-        dock_widget = QtAds.CDockWidget(name)
-        dock_widget.setWidget(widget)
-        dock_widget.setIcon(icon)
-        
-        # Add the dock widget to the top dock widget area
-        return self.__mgr.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, after)
-        
-    def isTopLevel(self) -> bool:
-        return not self.objectName()
-        
-    def getGroupNameError(self, group_name: str) -> str:
-        if not group_name:
-            return "Group must have a non-empty name"
-            
-        dock_managers = self.__mgr.allManagers(True, True)
-        for mgr in dock_managers:
-            if mgr.getGroupName() == group_name:
-                return "Group name '" + group_name + "' already used"
-                
-        return ""
-        
-    def createGroup(self, group_name: str, insert_pos: QtAds.CDockAreaWidget, icon = QIcon()) -> 'DockInDockWidget':
-        error = self.getGroupNameError(group_name)
-        if error:
-            QMessageBox.critical(None, "Error", error)
-            return
-            
-        child = DockInDockWidget(self, self.__top_level_dock_widget, self.__perspectives_manager)
-        child.setObjectName(group_name)
-        
-        dock_widget = QtAds.CDockWidget(group_name)
-        dock_widget.setWidget(child)
-        dock_widget.setIcon(icon)
-        
-        insert_pos = self.__mgr.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, insert_pos)
-
-        return child, insert_pos
-        
-    def destroyGroup(self, widget_to_remove: 'DockInDockWidget') -> None:
-        top_level_widget = widget_to_remove.getTopLevelDockWidget()
-        
-        if top_level_widget and top_level_widget != widget_to_remove:
-            for dock_widget in widget_to_remove.getManager().getWidgetsInGUIOrder(): #don't use allDockWidgets to preserve sub-groups
-                MoveDockWidgetAction.move(dock_widget, top_level_widget.getManager())
-            assert not widget_to_remove.getManager().allDockWidgets(True, True)
-
-            # find widget's parent:
-            for dock_widget in top_level_widget.getManager().allDockWidgets(True, True):
-                if dockwidget[1].widget() == widget_to_remove:
-                    dockwidget[0].removeDockWidget(dockwidget[1])
-                    del dockwidget[1]
-                    # delete widgetToRemove; automatically deleted when dockWidget is deleted
-                    widget_to_remove = None
-                    break
-
-            assert widget_to_remove == None
-        else:
-            assert False
-            
-    def attachViewMenu(self, menu: QMenu) -> None:
-        menu.aboutToShow.connect(self.autoFillAttachedViewMenu)
-        
-    def autoFillAttachedViewMenu(self) -> None:
-        menu = self.sender()
-        
-        if menu:
-            menu.clear()
-            self.setupViewMenu(menu)
-        else:
-            assert False
-            
-    def setupViewMenu(self, menu):
-        dock_managers = self.__mgr.allManagers(True, True)
-        
-        has_perspectives_menu = False
-        if self.getTopLevelDockWidget() == self:
-            has_perspectives_menu = (self.__perspectives_manager != None)
-        else:
-            assert False
-            
-        organize = menu
-        if has_perspectives_menu:
-            organize = menu.addMenu("Organize")
-            
-        self.setupMenu(organize, dock_managers)
-        
-        if has_perspectives_menu:
-            perspectives = menu.addMenu("Perspectives")
-            self.fillPerspectivesMenu(perspectives)
-            
-    def setupMenu(self, menu: QMenu, move_to: 'list[DockInDockManager]') -> None:
-        self.__mgr.fillViewMenu(menu, move_to)
-        menu.addSeparator()
-        move_menu = menu.addMenu("Move")
-        self.__mgr.fillMoveMenu(move_menu, move_to)
-            
-    def fillPerspectivesMenu(self, menu: QMenu):
-        menu.addAction("Create perspective...", self.createPerspective)
-        perspectives_names = []
-        if self.__perspectives_manager:
-            perspectives_names = self.__perspectives_manager.perspectiveNames()
-            
-        if perspectives_names:
-            load = menu.addMenu("Load perspective")
-            for name in perspectives_names:
-                load.addAction(LoadPerspectiveAction(load, name, self))
-            remove = menu.addMenu("Remove perspective")
-            for name in perspectives_names:
-                remove.addAction(RemovePerspectiveAction(remove, name, self))
-                
-    def setNewPerspectiveDefaultName(default_name: str) -> None:
-        self.__new_perspective_default_name = default_name
-        
-    def createPerspective(self) -> None:
-        if not self.__perspectives_manager:
-            return
-            
-        name = self.__new_perspective_default_name
-        if self.__new_perspective_default_name:
-            index = 2
-            while name in self.__perspectives_manager.perspectiveNames():
-                name = f"{self.__new_perspective_default_name}({index})"
-                index += 1
-                
-        while True:
-            name, ok = QInputDialog.getText(None, "Create perspective", "Enter perspective name", QLineEdit.Normal, name)
-            if ok:
-                if not name:
-                    QMessageBox.critical(None, "Error", "Perspective name cannot be empty")
-                    continue
-                elif name in self.__perspectives_manager.perspectiveNames():
-                    if QMessageBox.critical(None, "Error", f"Perspective '{name}' already exists, overwrite it?", QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.No:
-                        continue
-                    
-                self.__perspectives_manager.addPerspective(name, self)
-                break
-            else:
-                break
-                
-    def dumpStatus(self, echo: callable = print, widget: QtAds.CDockWidget = None, tab: str = '', suffix: str = '') -> str:
-        if widget is not None:
-            as_mgr = DockInDockManager.dockInAManager(widget)
-            if as_mgr:
-                as_mgr.parent().dumpStatus(tab=tab)
-            else:
-                echo(tab + widget.objectName() + suffix)
-        else:
-            echo(tab + "Group: " + self.getManager().getGroupName())
-            tab += "   "
-            visible_widgets = set()
-            for widget in self.getManager().getWidgetsInGUIOrder():
-                visible_widgets.add(widget)
-                self.dumpStatus(widget=widget, tab=tab)
-                
-            for closed in self.getManager().dockWidgetsMap().values():
-                if not closed in visible_widgets:
-                    self.dumpStatus(widget=closed, tab=tab, suffix=" (closed)")
--- a/examples/dockindock/dockindockmanager.cpp
+++ b/examples/dockindock/dockindockmanager.cpp
@@ -1,334 +0,0 @@
-#include "dockindockmanager.h"
-#include "dockindock.h"
-
-#include "DockAreaWidget.h"
-
-#include <QMenu>
-#include <QInputDialog>
-#include <QSettings>
-#include <QMessageBox>
-
-#include <assert.h>
-
-using namespace QtAdsUtl;
-
-/////////////////////////////////////
-// DockInDockManager
-/////////////////////////////////////
-DockInDockManager::DockInDockManager( DockInDockWidget& parent ) :
-    baseClass( &parent ),
-    m_parent( parent )
-{
-
-}
-
-DockInDockManager::~DockInDockManager()
-{
-
-}
-
-void DockInDockManager::fillViewMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo )
-{
-    auto widgetsMap = dockWidgetsMap();
-    for ( auto iter = widgetsMap.begin(); iter != widgetsMap.end(); ++iter )
-    {
-        auto widget = iter.value()->widget();
-        auto action = iter.value()->toggleViewAction();
-
-        DockInDockWidget* asMgr = dynamic_cast<DockInDockWidget*>( widget );
-        if ( asMgr )
-        {
-            auto subMenu = menu->addMenu( iter.key() );
-
-            subMenu->addAction( action );
-            subMenu->addSeparator();
-
-            asMgr->setupMenu( subMenu, moveTo );
-        }
-        else
-        {
-            menu->addAction(action);
-        }
-    }
-
-    if ( parent().canCreateNewGroups() )
-    {
-        // see how this works, to create it in the right place, 
-        // and also to have load perspective work when some groups are missing
-        menu->addSeparator();
-        menu->addAction( new QtAdsUtl::CreateChildDockAction( m_parent, menu ) );
-
-        if ( parent().getTopLevelDockWidget()->getManager() != this )
-            menu->addAction( new QtAdsUtl::DestroyGroupAction( &m_parent, menu ) );
-    }
-}
-
-void DockInDockManager::fillMoveMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo )
-{
-    auto widgetsMap = dockWidgetsMap();
-    for ( auto iter = widgetsMap.begin(); iter != widgetsMap.end(); ++iter )
-    {
-        auto subMenu = menu->addMenu( iter.key() );
-
-        for ( auto mgr : moveTo )
-        {
-            // iterate over all possible target managers
-            if ( mgr == this )
-            {
-                // if dock is already in mgr, no reason to move it there
-            }
-            else if ( mgr == dockInAManager( iter.value() ) )
-            {
-                // if target is the group itself, can't move it there, would make no sense
-            }
-            else
-            {
-                subMenu->addAction( new MoveDockWidgetAction( iter.value(), mgr, subMenu ) );
-            }
-        }
-    }
-}
-
-void DockInDockManager::addPerspectiveRec( const QString& name )
-{
-    std::vector<DockInDockManager*> managers = allManagers( true, true );
-
-    for ( auto child : managers )
-        child->addPerspective( name );
-}
-
-void DockInDockManager::openPerspectiveRec( const QString& name )
-{
-    std::vector<DockInDockManager*> managers = allManagers( true, true );
-
-    for ( auto child : managers )
-        child->openPerspective( name );
-}
-
-QString DockInDockManager::getGroupName()
-{
-    return parent().objectName();
-}
-
-#define CHILD_PREFIX QString("Child-")
-QString DockInDockManager::getPersistGroupName()
-{
-    QString group = "Top";
-    if ( !getGroupName().isEmpty() )
-        group = CHILD_PREFIX + getGroupName();
-    return group;
-}
-
-QString DockInDockManager::getGroupNameFromPersistGroupName( QString persistGroupName )
-{
-    if ( persistGroupName.startsWith( CHILD_PREFIX ) )
-    {
-        persistGroupName = persistGroupName.mid( CHILD_PREFIX.size() );
-    }
-    else
-    {
-        assert( false );
-    }
-    return persistGroupName;
-}
-
-void DockInDockManager::loadPerspectivesRec(QSettings& Settings)
-{
-    std::vector<DockInDockManager*> children = allManagers( true, true );
-
-    for ( auto mgr : children )
-    {
-        Settings.beginGroup(mgr->getPersistGroupName());
-        mgr->loadPerspectives( Settings );
-        Settings.endGroup();
-    }
-}
-
-void DockInDockManager::savePerspectivesRec(QSettings& Settings) const
-{
-    std::vector<DockInDockManager*> children = allManagers( true, true );
-
-    for ( auto mgr : children )
-    {
-        Settings.beginGroup(mgr->getPersistGroupName());
-        mgr->savePerspectives( Settings );
-        Settings.endGroup();
-    }
-}
-
-void DockInDockManager::removePerspectivesRec()
-{
-    std::vector<DockInDockManager*> managers = allManagers( true, true );
-
-    for ( auto child : managers )
-        child->removePerspectives( child->perspectiveNames() );
-}
-
-DockInDockManager* DockInDockManager::dockInAManager( ads::CDockWidget* widget )
-{
-    DockInDockWidget* dockWidget = widget ? dynamic_cast<DockInDockWidget*>( widget->widget() ) : NULL;
-    return ( dockWidget ) ? dockWidget->getManager() : NULL;
-}
-
-void DockInDockManager::childManagers( std::vector<DockInDockManager*>& managers, bool rec ) const
-{
-    auto widgets = getWidgetsInGUIOrder();
-    for ( auto widget : widgets )
-    {
-        DockInDockManager* asMgr = dockInAManager( widget );
-        if ( asMgr )
-        {
-            managers.push_back( asMgr );
-            if ( rec )
-                asMgr->childManagers( managers, rec );
-        }
-    }
-}
-
-std::vector<DockInDockManager*> DockInDockManager::allManagers( bool includeThis, bool rec ) const
-{
-    std::vector<DockInDockManager*> managers;
-    if ( includeThis )
-        managers.push_back( const_cast<DockInDockManager*>(this) );
-    childManagers( managers, rec );
-    return managers;
-}
-
-std::vector<std::pair<DockInDockManager*,ads::CDockWidget*>> DockInDockManager::allDockWidgets( bool includeThis, bool rec ) const
-{
-    std::vector<std::pair<DockInDockManager*,ads::CDockWidget*>> widgets;
-    for ( auto mgr : allManagers( includeThis, rec ) )
-    {
-        for ( auto widget : mgr->getWidgetsInGUIOrder() )
-            widgets.push_back( std::make_pair(mgr, widget) );
-    }
-    return widgets;
-}
-
-QMap<QString,QStringList> DockInDockManager::getGroupContents()
-{
-    QMap<QString,QStringList> result;
-    std::vector<DockInDockManager*> managers = allManagers( true, true );
-    for ( auto mgr : managers )
-    {
-        result[mgr->getPersistGroupName()] = mgr->dockWidgetsMap().keys();
-    }
-    return result;
-}
-
-ads::CDockAreaWidget* DockInDockManager::getInsertDefaultPos()
-{
-    ads::CDockAreaWidget* defaultPos = NULL;
-    if ( dockAreaCount() != 0 )
-        defaultPos = dockArea(dockAreaCount()-1);
-    return defaultPos;
-}
-
-std::vector<ads::CDockWidget*> DockInDockManager::getWidgetsInGUIOrder() const
-{
-    std::vector<ads::CDockWidget*> result;
-    result.reserve( dockWidgetsMap().size() );
-    for ( int i = 0; i != dockAreaCount(); ++i )
-    {
-        for ( auto widget : dockArea(i)->dockWidgets() )
-            result.push_back( widget );
-    }
-    return result;
-}
-
-/////////////////////////////////////
-// CreateChildDockAction
-/////////////////////////////////////
-CreateChildDockAction::CreateChildDockAction( DockInDockWidget& dockInDock, QMenu* menu ) :
-    QAction("New group...", menu),
-    m_dockInDock( dockInDock )
-{
-    connect( this, SIGNAL(triggered()), this, SLOT(createGroup()) );
-}
-
-void CreateChildDockAction::createGroup()
-{
-    QString name = "";
-    while ( true )
-    {
-        bool ok = false;
-        name = QInputDialog::getText( NULL, this->text(), "Enter group name", QLineEdit::Normal, name, &ok );
-        if ( ok )
-        {
-            QString error = "";
-            if ( m_dockInDock.getTopLevelDockWidget() )
-                error = m_dockInDock.getTopLevelDockWidget()->getGroupNameError( name );
-            else
-                assert( false );
-
-            if ( error.isEmpty() )
-            {
-                ads::CDockAreaWidget* insertPos = NULL;
-                m_dockInDock.createGroup( name, insertPos );
-                break;
-            }
-            else
-            {
-                QMessageBox::critical( NULL, "Error", error );
-                continue;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-}
-
-/////////////////////////////////////
-// DestroyGroupAction
-/////////////////////////////////////
-DestroyGroupAction::DestroyGroupAction( DockInDockWidget* widget, QMenu* menu ) :
-    QAction("Destroy " + widget->getManager()->getGroupName(), menu),
-    m_widget( widget )
-{
-    connect( this, SIGNAL(triggered()), this, SLOT(destroyGroup()) );
-}
-
-void DestroyGroupAction::destroyGroup()
-{
-    m_widget->getTopLevelDockWidget()->destroyGroup( m_widget );
-}
-
-
-/////////////////////////////////////
-// MoveDockWidgetAction
-/////////////////////////////////////
-MoveDockWidgetAction::MoveDockWidgetAction( ads::CDockWidget* widget, DockInDockManager* moveTo, QMenu* menu ) :
-    QAction(menu),
-    m_widget( widget ),
-    m_moveTo( moveTo )
-{
-    if ( moveTo->parent().isTopLevel() )
-    {
-        setText( "To top" );
-    }
-    else
-    {
-        setText( "To " + moveTo->parent().objectName() );
-    }
-    connect( this, SIGNAL(triggered()), this, SLOT(move()) );
-}
-
-void MoveDockWidgetAction::move()
-{
-    move( m_widget, m_moveTo );
-}
-
-void MoveDockWidgetAction::move( ads::CDockWidget* widget, DockInDockManager* moveTo )
-{
-    if ( widget && moveTo )
-    {
-        widget->dockManager()->removeDockWidget( widget );
-        moveTo->addDockWidget(ads::CenterDockWidgetArea, widget, moveTo->getInsertDefaultPos());
-    }
-    else
-    {
-        assert( false );
-    }
-}
--- a/examples/dockindock/dockindockmanager.h
+++ b/examples/dockindock/dockindockmanager.h
@@ -1,96 +0,0 @@
-#pragma once
-
-#include "DockManager.h"
-
-#include <QAction>
-#include <QMap>
-
-namespace QtAdsUtl
-{
-
-class DockInDockWidget;
-class DockInDockManager : public ads::CDockManager
-{
-    Q_OBJECT
-
-    typedef ads::CDockManager baseClass;
-
-public:
-    DockInDockManager( DockInDockWidget& parent );
-    ~DockInDockManager() override; 
-
-    void fillViewMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo );
-    void fillMoveMenu( QMenu* menu, const std::vector<DockInDockManager*>& moveTo );
-
-    void addPerspectiveRec( const QString& name );
-    void openPerspectiveRec( const QString& name );
-    void removePerspectivesRec();
-    void loadPerspectivesRec(QSettings& Settings);
-    void savePerspectivesRec(QSettings& Settings) const;
-
-    static DockInDockManager* dockInAManager( ads::CDockWidget* widget );
-
-    inline DockInDockWidget& parent() { return m_parent; }
-
-    void childManagers( std::vector<DockInDockManager*>& managers, bool rec ) const;
-    std::vector<DockInDockManager*> allManagers( bool includeThis, bool rec ) const;
-    std::vector<std::pair<DockInDockManager*,ads::CDockWidget*>> allDockWidgets( bool includeThis, bool rec ) const;
-
-    QString getGroupName();
-    QString getPersistGroupName();
-    static QString getGroupNameFromPersistGroupName( QString persistGroupName );
-
-    QMap<QString,QStringList> getGroupContents();
-
-    ads::CDockAreaWidget* getInsertDefaultPos();
-
-    std::vector<ads::CDockWidget*> getWidgetsInGUIOrder() const;
-
-private:
-    DockInDockWidget& m_parent;
-};
-
-class CreateChildDockAction : public QAction
-{
-    Q_OBJECT
-public:
-    CreateChildDockAction( DockInDockWidget& dockInDock, QMenu* menu );
-
-public slots:
-    void createGroup();
-
-private:
-    DockInDockWidget& m_dockInDock;
-};
-
-class DestroyGroupAction : public QAction
-{
-    Q_OBJECT
-public:
-    DestroyGroupAction( DockInDockWidget* widget, QMenu* menu );
-
-public slots:
-    void destroyGroup();
-
-private:
-    DockInDockWidget* m_widget;
-};
-
-class MoveDockWidgetAction : public QAction
-{
-    Q_OBJECT
-public:
-    MoveDockWidgetAction( ads::CDockWidget* widget, DockInDockManager* moveTo, QMenu* menu );
-
-    static void move( ads::CDockWidget* widget, DockInDockManager* moveTo );
-
-public slots:
-    void move();
-
-private:
-    ads::CDockWidget* m_widget;
-    DockInDockManager* m_moveTo;
-};
-
-}
-
--- a/examples/dockindock/dockindockmanager.py
+++ b/examples/dockindock/dockindockmanager.py
@@ -1,214 +0,0 @@
-from PyQt5.QtWidgets import QAction, QMenu, QInputDialog, QLineEdit
-from PyQt5.QtCore import QSettings
-
-from PyQtAds import QtAds
-
-CHILD_PREFIX = "Child-"
-
-class DockInDockManager(QtAds.CDockManager):
-    def __init__(self, parent: 'DockInDockWidget'):
-        super().__init__()
-        self.__parent = parent
-
-    def parent(self) -> 'DockInDockWidget':
-        return self.__parent
-    
-    def fillViewMenu(self, menu: QMenu, move_to: 'dict[DockInDockManager]') -> None:
-        from dockindock import DockInDockWidget # Prevent cyclic import
-        
-        widgets_map = self.dockWidgetsMap()
-        for key, value in widgets_map.items():
-            widget = value.widget()
-            action = value.toggleViewAction()
-            
-            if isinstance(widget, DockInDockWidget):
-                sub_menu = menu.addMenu(key)
-                
-                sub_menu.addAction(action)
-                sub_menu.addSeparator()
-                
-                widget.setupMenu(sub_menu, move_to)
-            else:
-                menu.addAction(action)
-                
-        if self.parent().canCreateNewGroups():
-            # see how this works, to create it in the right place, 
-            # and also to have load perspective work when some groups are missing
-            menu.addSeparator()
-            menu.addAction(CreateChildDockAction(self.__parent, menu))
-
-            if self.parent().getTopLevelDockWidget().getManager() != self:
-                menu.addAction(DestroyGroupAction( self.parent, menu))
-                
-    def fillMoveMenu(self, menu: QMenu, move_to: 'list[DockInDockManager]') -> None:
-        widgets_map = self.dockWidgetsMap()
-        for key, value in widgets_map.items():
-            sub_menu = menu.addMenu(key)
-            
-            for mgr in move_to:
-                # iterate over all possible target managers
-                if mgr == self:
-                    pass # if dock is already in mgr, no reason to move it there
-                elif mgr == DockInDockManager.dockInAManager(value):
-                    pass # if target is the group itself, can't move it there, would make no sense
-                else:
-                    sub_menu.addAction(MoveDockWidgetAction(value, mgr, sub_menu))
-    
-    def addPerspectiveRec(self, name: str) -> None:
-        managers = self.allManagers(True, True)
-        
-        for child in managers:
-            child.addPerspective(name)
-            
-    def openPerspectiveRec(self, name: str) -> None:
-        managers = self.allManagers(True, True)
-        
-        for child in managers:
-            child.openPerspective(name)
-            
-    def getGroupName(self) -> str:
-        return self.parent().objectName()
-        
-    def getPersistGroupName(self) -> str:
-        group = "Top"
-        if self.getGroupName():
-            group = CHILD_PREFIX + self.getGroupName()
-        return group
-        
-    def getGroupNameFromPersistGroupName(self, persist_group_name) -> str:
-        if persist_group_name.startswith(CHILD_PREFIX):
-            persist_group_name = persist_group_name[len(CHILD_PREFIX):]
-        else:
-            assert False
-        return persist_group_name
-        
-    def loadPerspectivesRec(self, settings: QSettings) -> None:
-        children = self.allManagers(True, True)
-        
-        for mgr in children:
-            settings.beginGroup(mgr.getPersistGroupName())
-            mgr.loadPerspectives(settings)
-            settings.endGroup()
-            
-    def savePerspectivesRec(self, settings: QSettings) -> None:
-        children = self.allManagers(True, True)
-        
-        for mgr in children:
-            settings.beginGroup(mgr.getPersistGroupName())
-            mgr.savePerspectives(settings)
-            settings.endGroup()
-            
-    def removePerspectivesRec(self, settings: QSettings) -> None:
-        children = self.allManagers(True, True)
-        
-        for mgr in children:
-            child.removePerspectives(child.perspectiveNames())
-            
-    @staticmethod
-    def dockInAManager(widget) -> 'DockInDockManager':
-        from dockindock import DockInDockWidget # Prevent cyclic import
-        
-        dock_widget =  widget.widget() if widget else None
-        return dock_widget.getManager() if isinstance(dock_widget, DockInDockWidget) else None
-        
-    def childManagers(self, managers: 'list[DockInDockManager]', rec: bool) -> None:
-        widgets = self.getWidgetsInGUIOrder()
-        for widget in widgets:
-            as_mgr = DockInDockManager.dockInAManager(widget)
-            if as_mgr:
-                managers.append(as_mgr)
-                if rec:
-                    as_mgr.childManagers(managers, rec)
-                    
-    def allManagers(self, include_self: bool, rec: bool) -> 'list[DockInDockManager]':
-        managers = []
-        if include_self:
-            managers.append(self)
-        self.childManagers(managers, rec)
-        return managers
-        
-    def allDockWidgets(self, include_self: bool, rec: bool) -> 'list[tuple[DockInDockManager, QtAds.CDockWidget]]':
-        widgets = []
-        for mgr in self.allManagers(include_self, rec):
-            for widget in mgr.getWidgetsInGUIOrder():
-                widgets.append((mgr, widget))
-        return widgets
-        
-    def getGroupContents(self) -> 'dict[str, list[str]]':
-        result = {}
-        managers = self.allManagers(True, True)
-        for mgr in managers:
-            result[mgr.getPersistGroupName()] = mgr.dockWidgetsMap().keys()
-        return result
-        
-    def getInsertDefaultPos(self) -> QtAds.CDockAreaWidget:
-        default_pos = None
-        if self.dockAreaCount() != 0:
-            default_pos = self.dockArea(self.dockAreaCount()-1)
-        return default_pos
-        
-    def getWidgetsInGUIOrder(self) -> 'list[QtAds.CDockWidget]':
-        result = []
-        for i in range(self.dockAreaCount()):
-            for widget in self.dockArea(i).dockWidgets():
-                result.append(widget)
-        return result
-        
-    
-class CreateChildDockAction(QAction):
-    def __init__(self, dock_in_dock: 'DockInDockWidget', menu: QMenu):
-        super().__init__("New group...", menu)
-        self.__dock_in_dock = dock_in_dock
-        self.triggered.connect(self.createGroup)
-        
-    def createGroup(self) -> None:
-        name = ""
-        while True:
-            name, ok = QInputDialog.getText(None, self.text(), "Enter group name", QLineEdit.Normal, name)
-            if ok:
-                error = ""
-                if self.__dock_in_dock.getTopLevelDockWidget():
-                    error = self.__dock_in_dock.getTopLevelDockWidget().getGroupNameError(name)
-                else:
-                    assert False
-                    
-                if not error:
-                    self.__dock_in_dock.createGroup(name, None)
-                    break
-                else:
-                    QMessageBox.critical(None, "Error", error)
-                    continue
-            else:
-                break
-        
-class DestroyGroupAction(QAction):
-    def __init__(self, widget: 'DockInDockWidget', menu: QMenu):
-        super().__init__("Destroy" + widget.getManager().getGroupName(), menu)
-        self.__widget = widget
-        self.triggered.connect(self.destroyGroup)
-        
-    def destroyGroup(self) -> None:
-        self.__widget.getTopLevelDockWidget().destroyGroup(self.__widget)
-        
-        
-class MoveDockWidgetAction(QAction):
-    def __init__(self, widget: 'DockInDockWidget', move_to: DockInDockManager, menu: QMenu):
-        super().__init__(menu)
-        self.__widget = widget
-        self.__move_to = move_to
-        
-        if move_to.parent().isTopLevel():
-            self.setText("To top")
-        else:
-            self.setText(f"To {move_to.parent().objectName()}")
-        self.triggered.connect(self._move)
-        
-    def _move(self) -> None:
-        self.move(self.__widget, self.__move_to)
-        
-    def move(self, widget: QtAds.CDockWidget, move_to: QtAds.CDockManager) -> None:
-        if widget and move_to:
-            widget.dockManager().removeDockWidget(widget)
-            move_to.addDockWidget(QtAds.CenterDockWidgetArea, widget, move_to.getInsertDefaultPos())
-        else:
-            assert False
--- a/Show More
+++ b/Show More