From c44d0c87e3f2f2f49bf89c70cbae15f816682549 Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Wed, 19 Aug 2020 13:38:53 +0200 Subject: [PATCH] Fixed broken SimpleExample application --- examples/simple/MainWindow.cpp | 78 +--------------------------------- examples/simple/MainWindow.h | 6 +-- 2 files changed, 3 insertions(+), 81 deletions(-) diff --git a/examples/simple/MainWindow.cpp b/examples/simple/MainWindow.cpp index 6779b3a..46e24b3 100644 --- a/examples/simple/MainWindow.cpp +++ b/examples/simple/MainWindow.cpp @@ -9,7 +9,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { - /*ui->setupUi(this); + ui->setupUi(this); // Create the dock manager. Because the parent parameter is a QMainWindow // the dock manager registers itself as the central widget. @@ -32,67 +32,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->menuView->addAction(DockWidget->toggleViewAction()); // Add the dock widget to the top dock widget area - m_DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);*/ - - ui->setupUi(this); - - // Create the dock manager. Because the parent parameter is a QMainWindow - // the dock manager registers itself as the central widget. - m_DockManager1 = new ads::CDockManager(this); - - // Create example content label - this can be any application specific - // widget - ads::CDockWidget* DockWidget; - { - QLabel* l = new QLabel(); - l->setWordWrap(true); - l->setAlignment(Qt::AlignTop | Qt::AlignLeft); - l->setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. "); - - // Create a dock widget with the title Label 1 and set the created label - // as the dock widget content - DockWidget = new ads::CDockWidget("Label 1"); - DockWidget->setWidget(l); - } - - ads::CDockWidget* DockWidget2; - { - QLabel* l = new QLabel(); - l->setWordWrap(true); - l->setAlignment(Qt::AlignTop | Qt::AlignLeft); - l->setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. "); - - // Create a dock widget with the title Label 1 and set the created label - // as the dock widget content - DockWidget2 = new ads::CDockWidget("Label 2"); - DockWidget2->setWidget(l); - } - - - // Add the toggleViewAction of the dock widget to the menu to give - // the user the possibility to show the dock widget if it has been closed - ui->menuView->addAction(DockWidget->toggleViewAction()); - - // Add the dock widget to the top dock widget area - m_DockManager1->addDockWidget(ads::TopDockWidgetArea, DockWidget); - - - auto funcRemoveFirstManager = [=]() - { - m_DockManager1->removeDockWidget(DockWidget); - - delete m_DockManager1; - m_DockManager1 = nullptr; - }; - QTimer::singleShot(3000, funcRemoveFirstManager); - - auto funcAddSecondManager = [=]() - { - m_DockManager2 = new ads::CDockManager(this); - - m_DockManager2->addDockWidget(ads::TopDockWidgetArea, DockWidget); - }; - QTimer::singleShot(5000, funcAddSecondManager); + m_DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget); } MainWindow::~MainWindow() @@ -100,17 +40,3 @@ MainWindow::~MainWindow() delete ui; } - -void MainWindow::closeEvent(QCloseEvent *event) -{ - QMainWindow::closeEvent(event); - if (m_DockManager1) - { - m_DockManager1->deleteLater(); - } - - if (m_DockManager2) - { - m_DockManager2->deleteLater(); - } -} diff --git a/examples/simple/MainWindow.h b/examples/simple/MainWindow.h index e1c6176..8d90885 100644 --- a/examples/simple/MainWindow.h +++ b/examples/simple/MainWindow.h @@ -18,13 +18,9 @@ public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); -protected: - virtual void closeEvent(QCloseEvent *event) override; - private: Ui::MainWindow *ui; - ads::CDockManager* m_DockManager1; - ads::CDockManager* m_DockManager2; + ads::CDockManager* m_DockManager; }; #endif // MAINWINDOW_H