diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt index 817432e..5bb3aae 100644 --- a/demo/CMakeLists.txt +++ b/demo/CMakeLists.txt @@ -24,6 +24,7 @@ set(ads_demo_SRCS main.cpp MainWindow.cpp mainwindow.ui + demo.qrc ) add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS}) if(BUILD_STATIC) diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index 2acdffb..25f52af 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -115,6 +116,18 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget) + QString(" (%1)").arg(featuresString(DockWidget))); } +/** + * Helper function to create an SVG icon + */ +static QIcon svgIcon(const QString& File) +{ + // This is a workaround, because because in item views SVG icons are not + // properly scaled an look blurry or pixelate + QIcon SvgIcon(File); + SvgIcon.addPixmap(SvgIcon.pixmap(92)); + return SvgIcon; +} + //============================================================================ static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu) @@ -124,6 +137,7 @@ static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu) ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++)); DockWidget->setWidget(w); DockWidget->setToggleViewActionMode(ads::CDockWidget::ActionModeShow); + DockWidget->setIcon(svgIcon(":/adsdemo/images/date_range.svg")); ViewMenu->addAction(DockWidget->toggleViewAction()); return DockWidget; } @@ -199,7 +213,6 @@ void MainWindowPrivate::createContent() // Test container docking QMenu* ViewMenu = ui.menuView; auto DockWidget = createCalendarDockWidget(ViewMenu); - DockWidget->setIcon(_this->style()->standardIcon(QStyle::SP_DialogOpenButton)); DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, false); DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget); DockManager->addDockWidget(ads::LeftDockWidgetArea, createLongTextLabelDockWidget(ViewMenu)); @@ -229,17 +242,9 @@ void MainWindowPrivate::createContent() DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea); DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea); - // Test creation of floating dock widgets - DockWidget = createFileSystemTreeDockWidget(ViewMenu); - auto FloatingWidget = DockManager->addDockWidgetFloating(DockWidget); - FloatingWidget->move(QPoint(20, 20)); - FloatingWidget = DockManager->addDockWidgetFloating(createLongTextLabelDockWidget(ViewMenu)); - FloatingWidget->move(QPoint(100, 100)); - auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle())); DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating())); - for (auto DockWidget : DockManager->dockWidgetsMap()) { _this->connect(DockWidget, SIGNAL(viewToggled(bool)), SLOT(onViewToggled(bool))); @@ -251,11 +256,13 @@ void MainWindowPrivate::createContent() void MainWindowPrivate::createActions() { ui.toolBar->addAction(ui.actionSaveState); - ui.actionSaveState->setIcon(_this->style()->standardIcon(QStyle::SP_DialogSaveButton)); + ui.toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); + ui.actionSaveState->setIcon(svgIcon(":/adsdemo/images/save.svg")); ui.toolBar->addAction(ui.actionRestoreState); - ui.actionRestoreState->setIcon(_this->style()->standardIcon(QStyle::SP_DialogOpenButton)); + ui.actionRestoreState->setIcon(svgIcon(":/adsdemo/images/restore.svg")); - SavePerspectiveAction = new QAction("Save Perspective", _this); + SavePerspectiveAction = new QAction("Create Perspective", _this); + SavePerspectiveAction->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg")); _this->connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective())); PerspectiveListAction = new QWidgetAction(_this); PerspectiveComboBox = new QComboBox(_this); @@ -265,6 +272,11 @@ void MainWindowPrivate::createActions() ui.toolBar->addSeparator(); ui.toolBar->addAction(PerspectiveListAction); ui.toolBar->addAction(SavePerspectiveAction); + + QAction* a = ui.toolBar->addAction("Create Editor"); + a->setToolTip("Creates floating dynamic dockable editor windows that are deleted on close"); + a->setIcon(svgIcon(":/adsdemo/images/note_add.svg")); + _this->connect(a, SIGNAL(triggered()), SLOT(createEditor())); } @@ -410,3 +422,23 @@ void CMainWindow::onViewToggled(bool Open) qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")"; } + +//============================================================================ +void CMainWindow::createEditor() +{ + static int EditorCount = 0; + QPlainTextEdit* w = new QPlainTextEdit(); + w->setPlaceholderText("This is an editor. If you close the editor, it will be " + "deleted. Enter your text here."); + w->setStyleSheet("border: none"); + ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Editor %1").arg(EditorCount++)); + DockWidget->setWidget(w); + DockWidget->setToggleViewActionMode(ads::CDockWidget::ActionModeShow); + DockWidget->setIcon(svgIcon(":/adsdemo/images/edit.svg")); + DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true); + d->ui.menuView->addAction(DockWidget->toggleViewAction()); + + auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget); + FloatingWidget->move(QPoint(20, 20)); +} + diff --git a/demo/MainWindow.h b/demo/MainWindow.h index 887b899..0161588 100644 --- a/demo/MainWindow.h +++ b/demo/MainWindow.h @@ -59,6 +59,7 @@ private slots: void on_actionRestoreState_triggered(bool); void savePerspective(); void onViewToggled(bool Open); + void createEditor(); }; #endif // MAINWINDOW_H diff --git a/demo/demo.pro b/demo/demo.pro index 998876d..e1ece66 100644 --- a/demo/demo.pro +++ b/demo/demo.pro @@ -20,6 +20,8 @@ HEADERS += \ FORMS += \ mainwindow.ui + +RESOURCES += demo.qrc LIBS += -L$${ADS_OUT_ROOT}/lib diff --git a/demo/demo.qrc b/demo/demo.qrc new file mode 100644 index 0000000..ae3dbbb --- /dev/null +++ b/demo/demo.qrc @@ -0,0 +1,12 @@ + + + images/folder.svg + images/folder_open.svg + images/note_add.svg + images/picture_in_picture.svg + images/restore.svg + images/save.svg + images/date_range.svg + images/edit.svg + + diff --git a/demo/images/date_range.svg b/demo/images/date_range.svg new file mode 100644 index 0000000..47087e0 --- /dev/null +++ b/demo/images/date_range.svg @@ -0,0 +1,6 @@ + + date_range icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/edit.svg b/demo/images/edit.svg new file mode 100644 index 0000000..064047b --- /dev/null +++ b/demo/images/edit.svg @@ -0,0 +1,6 @@ + + create icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/folder.svg b/demo/images/folder.svg new file mode 100644 index 0000000..8d5eb69 --- /dev/null +++ b/demo/images/folder.svg @@ -0,0 +1,6 @@ + + folder icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/folder_open.svg b/demo/images/folder_open.svg new file mode 100644 index 0000000..9201f64 --- /dev/null +++ b/demo/images/folder_open.svg @@ -0,0 +1,6 @@ + + folder_open icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/material_icons_license.txt b/demo/images/material_icons_license.txt new file mode 100644 index 0000000..f464cdd --- /dev/null +++ b/demo/images/material_icons_license.txt @@ -0,0 +1,211 @@ + The Google Material icons and modifications can be used free of charge for + commerical and non-commerical projects according to the Apache License 2.0. + + An attribution to https://material.io/icons/ and/or https://iconfu.com on + your website or in your app's "about" screen would be wonderful. + + Please do not re-sell the icons. + + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/demo/images/note_add.svg b/demo/images/note_add.svg new file mode 100644 index 0000000..385cd39 --- /dev/null +++ b/demo/images/note_add.svg @@ -0,0 +1,6 @@ + + note_add icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/picture_in_picture.svg b/demo/images/picture_in_picture.svg new file mode 100644 index 0000000..73e7239 --- /dev/null +++ b/demo/images/picture_in_picture.svg @@ -0,0 +1,6 @@ + + picture_in_picture icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/restore.svg b/demo/images/restore.svg new file mode 100644 index 0000000..5089983 --- /dev/null +++ b/demo/images/restore.svg @@ -0,0 +1,6 @@ + + restore icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/demo/images/save.svg b/demo/images/save.svg new file mode 100644 index 0000000..351b8ed --- /dev/null +++ b/demo/images/save.svg @@ -0,0 +1,6 @@ + + save icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.) + + + + \ No newline at end of file diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp index 8723299..fbc8bbb 100644 --- a/src/DockAreaWidget.cpp +++ b/src/DockAreaWidget.cpp @@ -491,7 +491,15 @@ void CDockAreaWidget::hideAreaWithNoVisibleContent() void CDockAreaWidget::onTabCloseRequested(int Index) { ADS_PRINT("CDockAreaWidget::onTabCloseRequested " << Index); - dockWidget(Index)->toggleView(false); + auto* DockWidget = dockWidget(Index); + if (DockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose)) + { + DockWidget->deleteDockWidget(); + } + else + { + DockWidget->toggleView(false); + } } diff --git a/src/DockManager.cpp b/src/DockManager.cpp index b555a31..b475ff1 100644 --- a/src/DockManager.cpp +++ b/src/DockManager.cpp @@ -650,8 +650,10 @@ CDockWidget* CDockManager::findDockWidget(const QString& ObjectName) const //============================================================================ void CDockManager::removeDockWidget(CDockWidget* Dockwidget) { + emit dockWidgetAboutToBeRemoved(Dockwidget); d->DockWidgetsMap.remove(Dockwidget->objectName()); CDockContainerWidget::removeDockWidget(Dockwidget); + emit dockWidgetRemoved(Dockwidget); } //============================================================================ diff --git a/src/DockManager.h b/src/DockManager.h index f50aaf8..064e8a7 100644 --- a/src/DockManager.h +++ b/src/DockManager.h @@ -440,6 +440,20 @@ signals: * tooltips for the DockArea buttons. */ void dockAreaCreated(CDockAreaWidget* DockArea); + + /** + * This signal is emitted just before the given dock widget is removed + * from the + */ + void dockWidgetAboutToBeRemoved(CDockWidget* DockWidget); + + /** + * This signal is emitted if a dock widget has been removed with the remove + * removeDockWidget() function. + * If this signal is emitted, the dock widget has been removed from the + * docking system but it is not deleted yet. + */ + void dockWidgetRemoved(CDockWidget* DockWidget); }; // class DockManager } // namespace ads //----------------------------------------------------------------------------- diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp index dcc7ee0..ff2cc58 100644 --- a/src/DockWidget.cpp +++ b/src/DockWidget.cpp @@ -737,6 +737,14 @@ void CDockWidget::setFloating() } +//============================================================================ +void CDockWidget::deleteDockWidget() +{ + dockManager()->removeDockWidget(this); + deleteLater(); +} + + } // namespace ads //--------------------------------------------------------------------------- diff --git a/src/DockWidget.h b/src/DockWidget.h index c9422c0..cb1ce55 100644 --- a/src/DockWidget.h +++ b/src/DockWidget.h @@ -143,6 +143,7 @@ public: DockWidgetClosable = 0x01, DockWidgetMovable = 0x02,///< this feature is not properly implemented yet and is ignored DockWidgetFloatable = 0x04, + DockWidgetDeleteOnClose = 0x08, ///< deletes the dock widget when it is closed AllDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable, NoDockWidgetFeatures = 0x00 }; @@ -419,6 +420,12 @@ public slots: */ void setFloating(); + /** + * This function will delete the dock widget and its content from the + * docking system + */ + void deleteDockWidget(); + signals: /** * This signal is emitted if the dock widget is opened or closed diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp index e8a1e76..659fe8d 100644 --- a/src/DockWidgetTab.cpp +++ b/src/DockWidgetTab.cpp @@ -346,7 +346,6 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev) { // Moving the tab is always allowed because it does not mean moving the // dock widget around - qDebug() << "DraggingTab"; d->moveTab(ev); } diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp index b042768..2a38123 100644 --- a/src/FloatingDockContainer.cpp +++ b/src/FloatingDockContainer.cpp @@ -353,6 +353,13 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event) if (isClosable()) { + auto TopLevelDockWidget = topLevelDockWidget(); + if (TopLevelDockWidget && TopLevelDockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose)) + { + TopLevelDockWidget->deleteDockWidget(); + this->deleteLater(); + } + // In Qt version after 5.9.2 there seems to be a bug that causes the // QWidget::event() function to not receive any NonClientArea mouse // events anymore after a close/show cycle. The bug is reported here: