Warning fixes and copyright update.

[evaf] / src / plugins / SdiWindow / sdiwindow.h

diff --git a/src/plugins/SdiWindow/sdiwindow.h b/src/plugins/SdiWindow/sdiwindow.h
index a73f2eec3d85a9b52dc09ed063c87664e3f5fedf..08bfcd90e5be8b09cf0afcf2979dd988a3cbb7ef 100644 (file)
--- a/src/plugins/SdiWindow/sdiwindow.h
+++ b/src/plugins/SdiWindow/sdiwindow.h
@@ -3,7 +3,7 @@
  * @brief SdiWindow module's implementation
  * @author Enar Vaikene
  *
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2019 Enar Vaikene
  *
  * This file is part of the eVaf C++ cross-platform application development framework.
  *
@@ -23,12 +23,15 @@
 #include "isdiwindow.h"
 
 #include <Plugins/iPlugin>
+#include <Gui/Panel>
 
 #include <QObject>
 #include <QString>
 #include <QWidget>
 #include <QList>
-#include <QWeakPointer>
+#include <QVector>
+#include <QHash>
+#include <QScopedPointer>
 
 class QVBoxLayout;
 
@@ -46,7 +49,7 @@ class MainWindow : public QWidget, public iSdiWindow
 
 public:
 
-    MainWindow(QWidget * parent = 0, Qt::WindowFlags flags = 0);
+    MainWindow(QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
 
     virtual ~MainWindow();
 
@@ -56,9 +59,18 @@ public:
 
     virtual bool isReady() { return mReady; }
 
-    virtual void addWidget(QWidget * widget);
+    virtual void addPanel(QString const & name, Gui::Panel * panel);
 
-    virtual void addLayout(QLayout * layout);
+    virtual Gui::Panel * panel(QString const & name) const;
+
+    virtual bool showPanel(QString const & name);
+
+    virtual void changeEvent(QEvent * e);
+
+    virtual void closeEvent(QCloseEvent * e);
+
+
+protected: // Methods
 
 
 private: // Methods
@@ -75,11 +87,36 @@ private: // Members
     /// Ready flag
     bool mReady;
 
-    /// The layout of the window
+    /// The layout of the main window
     QVBoxLayout * mLayout;
 
-    /// Widgets and layouts added to the main window
-    QList<QWeakPointer<QObject> > mItemsAdded;
+    /// Name of the main panel that becomes part of this window
+    QString mMainPanelName;
+
+    /// List of GUI::Panel objects added to the manager
+    QList<Gui::Panel *> mPanels;
+
+    /// List of minimized GUI::Panel objects
+    QVector<Gui::Panel *> mMinimizedPanels;
+
+    /// Hash with panel names
+    QHash<QString, Gui::Panel *> mPanelNames;
+
+    /// Current main panel added to this window
+    Gui::Panel * mMainPanel;
+
+
+private: // Methods
+
+    /// Gets the main panel name from module attributes
+    QString getMainPanelName(QString const & args) const;
+
+
+private slots:
+
+    /// Panel destroyed signal. We need to remove the panel from all the
+    /// lists.
+    void panelDestroyed(QObject * obj = nullptr);
 
 };
 
@@ -89,6 +126,7 @@ private: // Members
 class SdiWindowPlugin : public Plugins::iPlugin
 {
     Q_OBJECT
+    Q_INTERFACES(eVaf::Plugins::iPlugin)
 
 public:
 
@@ -100,13 +138,13 @@ public:
 
     virtual void done();
 
-    virtual bool isReady() const { return mWindow != 0 && mWindow->isReady(); }
+    virtual bool isReady() const { return mWindow != nullptr && mWindow->isReady(); }
 
 
 private:
 
     /// iSdiWindow interface implementation
-    MainWindow * mWindow;
+    QScopedPointer<MainWindow> mWindow;
 };
 
 } // namespace eVaf::SdiWindow::Internal