v0.3.3 Release

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.3.2.{build}
+version: 0.3.3.{build}
 image: Visual Studio 2019
 
 init:

doc/release.md → doc/Create Release.md

@@ -10,7 +10,7 @@ Example bat script to build release
 
 ```
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-set PATH=C:\Qt\5.15.0\msvc2019_64\bin\;C:\Qt\Tools\QtCreator\bin\;%PATH%
+set PATH=C:\Qt\5.15.1\msvc2019_64\bin\;C:\Qt\Tools\QtCreator\bin\;%PATH%
 mkdir build
 cd build
 qmake ..\src\NotepadNext.pro
@@ -23,4 +23,7 @@ mkdir installer_build
 cd installer_build
 qmake ..\installer\installer.pro
 jom
+cd ..
+copy build\NotepadNext*.zip .
+copy installer_build\NotepadNext*.exe .
 ```

installer/config/config.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Notepad Next</Name>
-    <Version>0.3.2</Version>
-    <Title>Notepad Next v0.3.2</Title>
+    <Version>0.3.3</Version>
+    <Title>Notepad Next v0.3.3</Title>
     <Publisher>Notepad Next</Publisher>
     <StartMenuDir>Notepad Next</StartMenuDir>
 

installer/packages/app/meta/package.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <Package>
     <DisplayName>Notepad Next</DisplayName>
-    <Description>Notepad Next v0.3.2</Description>
-    <Version>0.3.2</Version>
+    <Description>Notepad Next v0.3.3</Description>
+    <Version>0.3.3</Version>
     <ForcedInstallation>true</ForcedInstallation>
-    <ReleaseDate>2020-08-29</ReleaseDate>
+    <ReleaseDate>2020-09-08</ReleaseDate>
     <!-- <RequiresAdminRights>true</RequiresAdminRights> -->
     <Script>installscript.qs</Script>
     <UserInterfaces>

src/NotepadNext/DockedEditor.cpp

@@ -122,12 +122,24 @@ void DockedEditor::dockWidgetCloseRequested()
 
 ads::CDockAreaWidget * DockedEditor::currentDockArea()
 {
-    foreach (ads::CDockWidget* dockWidget, m_DockManager->dockWidgetsMap()) {
+    QMap<QString, ads::CDockWidget*> dockwidgets = m_DockManager->dockWidgetsMap();
+
+    if (dockwidgets.size() == 0) {
+        return Q_NULLPTR;
+    }
+    else if (dockwidgets.size() == 1) {
+        // If no dockwidget has had the focus set yet, just return the only one
+        return dockwidgets.first()->dockAreaWidget();
+    }
+
+    // Search the list for the one that has had the focus set
+    foreach (ads::CDockWidget* dockWidget, dockwidgets) {
         if (dockWidget->property("focused").toBool()) {
             return dockWidget->dockAreaWidget();
         }
     }
 
+    // There was no area that had the focus
     return Q_NULLPTR;
 }
 

src/NotepadNext/dialogs/MainWindow.cpp

@@ -144,7 +144,9 @@ MainWindow::MainWindow(NotepadNextApplication *app, QWidget *parent) :
             recentFilesListManager->addFile(buffer->fileInfo.canonicalFilePath());
         }
     });
-    connect(app->getBufferManager(), &BufferManager::bufferCreated, [=](ScintillaBuffer *buffer) {
+
+    connect(dockedEditor, &DockedEditor::editorCreated, [=](ScintillaNext *editor) {
+        ScintillaBuffer *buffer = editor->scintillaBuffer();
         if (buffer->isFile()) {
             recentFilesListManager->removeFile(buffer->fileInfo.canonicalFilePath());
         }

src/Version.pri

@@ -15,5 +15,5 @@
 # along with Notepad Next.  If not, see <https://www.gnu.org/licenses/>.
 
 
-!defined(APP_VERSION, var):APP_VERSION = "0.3.2"
+!defined(APP_VERSION, var):APP_VERSION = "0.3.3"
 APP_COPYRIGHT = "Copyright 2019-2020 Justin Dailey"

src/ads/.github/workflows/linux-builds.yml

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

src/ads/.gitignore

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

src/ads/.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,7 +73,9 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    addons:
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev  
+    addons:  
       apt:
         sources:
         - ubuntu-toolchain-r-test
@@ -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

src/ads/PyQtAds/_version.py

@@ -23,9 +23,9 @@ def get_keywords():
     # 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$"
+    git_refnames = " (tag: 3.6.2)"
+    git_full = "5fad43377b318daee42666e116d6d851d7d05f75"
+    git_date = "2020-09-25 14:40:28 +0200"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 

src/ads/README.md

@@ -1,6 +1,6 @@
 # Advanced Docking System for Qt
 
-[![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
+[![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
 [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)
 
@@ -15,6 +15,20 @@ integrated development environments (IDEs) such as Visual Studio.
 
 ## New and Noteworthy
 
+The [release 3.6.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.6.0)
+adds some nice new features:
+
+- support for [central widget](doc/user-guide.md#central-widget) concept
+
+![Central Widget](doc/central_widget.gif)
+
+- support for [native floating widgets](doc/user-guide.md#floatingcontainerforcenativetitlebar-linux-only) on Linux
+
+![FloatingContainerForceNativeTitleBar true](doc/cfg_flag_FloatingContainerForceNativeTitleBar_true.png)
+
+Both features are contributions from ADS users. Read the [documentation](doc/user-guide.md)
+to learn more about both new features.
+
 The [release 3.5.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.0)
 adds the new [focus highlighting](doc/user-guide.md#focushighlighting) feature.
 This optional feature enables highlighting of the focused dock widget like you
@@ -58,6 +72,8 @@ know it from Visual Studio.
   - [Qt Design Studio](#qt-design-studio)
   - [QmixElements](#qmixelements)
   - [ezEditor](#ezeditor)
+  - [D-Tect X](#d-tect-x)
+  - [HiveWE](#hivewe)
 
 ### Docking everywhere - no central widget
 
@@ -151,7 +167,7 @@ by the following people:
 - [Hugo Slepicka](https://github.com/hhslepicka)
 - [K Lauer](https://github.com/klauer)
 
-Latest working version: [3.5.1](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.1)
+Latest working version: [3.5.2](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.2)
 
 ## Tested Compatible Environments
 
@@ -311,28 +327,48 @@ If this project help you reduce time to develop or if you just like it, you can
 From version 4.12 on, Qt Creator uses the Advanced Docking Framework for its
 Qt Quick Designer. This improves the usability when using multiple screens.
 
-![Qt Creator](doc/qtcreator.png)
+![Qt Creator](doc/showcase_qtcreator.png)
 
 ### [Qt Design Studio](https://www.qt.io/ui-design-tools)
 
 Taken from the [Qt Blog](https://www.qt.io/blog/qt-design-studio-1.5-beta-released):
 
 > The most obvious change in [Qt Design Studio 1.5](https://www.qt.io/blog/qt-design-studio-1.5-beta-released) is the integration of dock widgets using the Qt Advanced Docking System. This allows the user to fully customize the workspace and also to undock any view into its own top level window. This especially improves the usability when using multiple screens.
 
-![Qt Design Studio](doc/qt_design_studio.png)
+![Qt Design Studio](doc/showcase_qt_design_studio.png)
 
 ### [QmixElements](https://www.cetoni.com/products/qmixelements/)
 
 The QmixElements software from [CETONI](https://www.cetoni.com) is a comprehensive, 
 plugin-based and modular laboratory automation software for controlling CETONI devices using a joint graphical user interface. The software features a powerful script system to automate processes. This [blog post](https://www.cetoni.com/blog/qmixelements-advanced-docking-system/) gives a nice overview about the use of the Qt
 Advanced Docking System in the QmixElements sofware.
 
-![QmixElements](doc/qmix_elements.png)
+![QmixElements](doc/showcase_qmix_elements.png)
 
 ### [ezEditor](https://github.com/ezEngine/ezEngine)
 
 The ezEditor is a full blown graphical editor used for editing scenes and
 importing and authoring assets for the [ezEngine](https://github.com/ezEngine/ezEngine) -
 an open source C++ game engine in active development.
 
-![ezEditor](doc/ezEngine_editor.png)
+![ezEditor](doc/showcase_ezEngine_editor.png)
+
+### [D-Tect X](https://www.duerr-ndt.com/products/ndt-software/d-tect-xray-inspection-software.html)
+
+D-Tect X is a X-ray inspection software for industrial radiography. It is a state-of-the-art 64-bit application which supports GPU (Graphics Processing Unit) acceleration and takes full advantage of computers with multiple CPU cores. A large set of tools assist the user in image analysis and evaluation. Thanks to the Qt Advanced Docking System the flexible and intuitive user interface can be completely customized to  each user’s preference.
+
+[learn more...](https://www.duerr-ndt.com/products/ndt-software/d-tect-xray-inspection-software.html)
+
+![D-TectX](doc/showcase_d-tect-x.jpg)
+
+### [HiveWE](https://github.com/stijnherfst/HiveWE)
+
+HiveWE is a Warcraft III world editor. It focusses on speed and ease of use,
+especially for large maps where the regular World Editor is often too slow and clunky.
+It has a JASS editor with syntax hightlighting, tabs, code completion and more.
+The JASS editor uses the Qt Advanced Docking System for the management and layout
+of the open editor windows.
+
+[learn more...](https://github.com/stijnherfst/HiveWE)
+
+![HiveWE](doc/showcase_hivewe.png)

src/ads/adsConfig.cmake

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

src/ads/demo/MainWindow.cpp

@@ -109,7 +109,7 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
 static QIcon svgIcon(const QString& File)
 {
 	// This is a workaround, because in item views SVG icons are not
-	// properly scaled an look blurry or pixelate
+	// properly scaled and look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
 	return SvgIcon;
@@ -166,6 +166,7 @@ struct MainWindowPrivate
 	QComboBox* PerspectiveComboBox = nullptr;
 	ads::CDockManager* DockManager = nullptr;
 	ads::CDockWidget* WindowTitleTestDockWidget = nullptr;
+	ads::CDockWidget* LastDockedEditor = nullptr;
 
 	MainWindowPrivate(CMainWindow* _public) : _this(_public) {}
 
@@ -399,6 +400,9 @@ void MainWindowPrivate::createContent()
 	// Test custom factory - we inject a help button into the title bar
 	ads::CDockComponentsFactory::setFactory(new CCustomComponentsFactory());
 	auto TopDockArea = DockManager->addDockWidget(ads::TopDockWidgetArea, FileSystemWidget);
+	// Uncomment the next line if you would like to test the
+	// HideSingleWidgetTitleBar functionality
+	// TopDockArea->setDockAreaFlag(ads::CDockAreaWidget::HideSingleWidgetTitleBar, true);
 	ads::CDockComponentsFactory::resetDefaultFactory();
 
 	// We create a calendar widget and clear all flags to prevent the dock area
@@ -631,6 +635,9 @@ CMainWindow::~CMainWindow()
 void CMainWindow::closeEvent(QCloseEvent* event)
 {
 	d->saveState();
+    // Delete dock manager here to delete all floating widgets. This ensures
+    // that all top level windows of the dock manager are properly closed
+    d->DockManager->deleteLater();
 	QMainWindow::closeEvent(event);
 }
 
@@ -714,7 +721,17 @@ void CMainWindow::createEditor()
     }
     else
     {
-    	d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
+    	if (EditorArea)
+    	{
+    		d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
+    		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+    	}
+    	else
+    	{
+    		d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    	}
+    	d->LastDockedEditor = DockWidget;
     }
 }
 

src/ads/demo/demo.py

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