1.Restore widgets upon restart 2.Load only plugins if requested by user or required dependency

Author: joern274

plugins/gui/include/gui/content_anchor/content_anchor.h

@@ -25,9 +25,25 @@
 
 #pragma once
 
+#include <QList>
+#include <QObject>
+#include <QMetaEnum>
+
 namespace hal
 {
+    class ContentFrame;
     class ContentWidget;
+    class DockBar;
+
+    namespace ContentLayout
+    {
+        Q_NAMESPACE
+        enum Position {Center, Left, Right, Bottom};
+        Q_ENUM_NS(Position)
+
+        QString positionToString(Position pos);
+        Position positionFromString(const QString& s);
+    }
 
     /**
      * @ingroup docking
@@ -36,6 +52,11 @@ namespace hal
      */
     class ContentAnchor
     {
+
+    protected:
+        DockBar* mDockBar;
+        ContentLayout::Position mAnchorPosition;
+
     public:
         /**
          * Adds a given ContentWidget to the anchor.
@@ -56,8 +77,9 @@ namespace hal
          * Detaches a given widget from the anchor.
          *
          * @param widget - The widget to detach.
+         * @returns the enclosing frame of the detached widget
          */
-        virtual void detach(ContentWidget* widget) = 0;
+        virtual ContentFrame* detach(ContentWidget* widget) = 0;
 
         /**
          * Reattaches a given widget to the anchor.
@@ -81,17 +103,18 @@ namespace hal
         virtual void close(ContentWidget* widget) = 0;
 
         /**
-         * Destructor that has to be overriden.
+         * Destructor
          */
-        virtual inline ~ContentAnchor() = 0;
+        virtual ~ContentAnchor() {;}
 
         /**
          * Returns the number of widgets / buttons as of mDockBar->count()
          */
-        virtual int count() const = 0;
-    };
+        virtual int count() const;
 
-    ContentAnchor::~ContentAnchor()
-    {
-    }
+        /**
+         * Save state of widgets using anchor tag
+         */
+        void saveState() const;
+    };
 }

plugins/gui/include/gui/content_layout_area/content_layout_area.h

@@ -26,6 +26,7 @@
 #pragma once
 
 #include "gui/content_widget/content_widget.h"
+#include "gui/content_anchor/content_anchor.h"
 
 #include <QWidget>
 
@@ -40,14 +41,6 @@ namespace hal
     class SplitterAnchor;
     class TabWidget;
 
-    enum class content_anchor
-    {
-        center = 0,
-        left   = 1,
-        right  = 2,
-        bottom = 3
-    };
-
     /**
      * @ingroup gui
      * @brief Manages the layout of all ContentWidget%s
@@ -97,7 +90,7 @@ namespace hal
          * @param anchor - The anchor the content widget should be moved to (i.e. the direction of the docker bar it
          *                 is moved to)
          */
-        void addContent(ContentWidget* widget, int index, content_anchor anchor);
+        void addContent(ContentWidget* widget, int index, ContentLayout::Position anchor);
 
         /**
          * Not yet implemented.
@@ -148,6 +141,16 @@ namespace hal
          */
         void handleDragEnd();
 
+        /**
+         * Save state of widgets (location, visibility, docking state) and splitter to guisettings
+         */
+        void saveState() const;
+
+        /**
+         * Restore splitter setting from guisettings
+         */
+        void restoreSplitter();
+
     private:
         QVBoxLayout* mTopLevelLayout;
         QHBoxLayout* mSecondLevelLayout;

plugins/gui/include/gui/content_manager/content_manager.h

@@ -32,6 +32,7 @@
 
 #include "gui/gui_utils/special_log_content_manager.h"
 #include "gui/content_widget/content_widget.h"
+#include "gui/content_anchor/content_anchor.h"
 #include "hal_config.h"
 
 namespace hal
@@ -62,6 +63,13 @@ namespace hal
         virtual ExternalContentWidget* contentFactory() const = 0;
     };
 
+    struct ContentWidgetPlacement {
+        ContentWidget* widget;
+        int index;
+        ContentLayout::Position anchorPos;
+        bool visible;
+    };
+
     class ExternalContent : public QList<ContentFactory*>
     {
         static ExternalContent* inst;
@@ -174,11 +182,8 @@ namespace hal
 
     private:
         MainWindow* mMainWindow;
-        int mExternalIndex;
         QString mWindowTitle;
 
-        QList<ContentWidget*> mContent;
-
         PythonConsoleWidget* mPythonConsoleWidget;
         PythonEditor* mPythonWidget;
         GraphTabWidget* mGraphTabWidget;

plugins/gui/include/gui/content_widget/content_widget.h

@@ -36,6 +36,7 @@ class QVBoxLayout;
 namespace hal
 {
     class ContentAnchor;
+    class ContentFrame;
     class Toolbar;
 
     /**
@@ -89,14 +90,14 @@ namespace hal
          *
          * @return The name.
          */
-        QString name();
+        QString name() const;
 
         /**
          * Get the loaded and processed icon that can be set in the stylesheet.
          *
          * @return The icon.
          */
-        QIcon icon();
+        QIcon icon() const;
 
         /**
          * Sets the anchor of the content widget. This function is used by the docking system.
@@ -232,6 +233,17 @@ namespace hal
          */
         virtual void restoreFromProject() {;}
 
+        /**
+         * Detached frame if widget is detached, nullptr otherwise
+         */
+        ContentFrame* detachedFrame() const;
+
+        /**
+         * Set pointer to frame when detached, to nullptr when reattached
+         * @param df - pointer to frame
+         */
+        void setDetachedFrame(ContentFrame* df);
+
     private:
         void closeEvent(QCloseEvent* event);
 
@@ -247,5 +259,6 @@ namespace hal
         QAction* mSearchAction;
         QShortcut* mSearchShortcut;
         QKeySequence mSearchKeysequence;
+        ContentFrame* mDetachedFrame;
     };
 }

plugins/gui/include/gui/docking_system/dock_bar.h

@@ -250,6 +250,13 @@ namespace hal
          */
         void clear();
 
+        /**
+         * Returns the 'hidden' property for index button
+         * @param index - The index for the content widget.
+         * @return true if the button is hidden (the widget detached)
+         */
+        bool isHidden(int index) const;
+
     Q_SIGNALS:
 
         /**

plugins/gui/include/gui/docking_system/splitter_anchor.h

@@ -53,11 +53,11 @@ namespace hal
         /**
          *The splitter anchor's constructor.
          *
-         * @param DockBar - The splitter ancor's dockbar.
-         * @param Splitter - The actual splitter to represent the dockbar's area.
+         * @param dockBar - The splitter ancor's dockbar.
+         * @param splitter - The actual splitter to represent the dockbar's area.
          * @param parent - The parent of the splitter anchor.
          */
-        SplitterAnchor(DockBar* DockBar, Splitter* Splitter, QObject* parent = nullptr);
+        SplitterAnchor(ContentLayout::Position apos, DockBar* dockBar, Splitter* splitter, QObject* parent = nullptr);
 
         /**
          * Adds a contentwidget at the given position to the splitter area and tells the dockbar to
@@ -82,8 +82,9 @@ namespace hal
          * frame is created and the widget is displayed on the same level as hal as a seperate window.
          *
          * @param widget - The widget to be detached.
+         * @returns the enclosing frame of the detached widget
          */
-        virtual void detach(ContentWidget* widget) override;
+        virtual ContentFrame* detach(ContentWidget* widget) override;
 
         /**
          * Reattaches the given widget back to the splitter area and dockbar (shows them again) when
@@ -108,13 +109,6 @@ namespace hal
          */
         virtual void close(ContentWidget* widget) override;
 
-        /**
-         * Get the number of widgets currently associated with the dockbar.
-         *
-         * @return The number of widgets.
-         */
-        int count() const override;
-
         /**
          * Removes all buttons from the dockbar and therefore the widgets from the area. The corresponding
          * widgets are not destroyed but hidden.
@@ -129,8 +123,6 @@ namespace hal
         void contentChanged();
 
     private:
-        DockBar* mDockBar;
         Splitter* mSplitter;
-        QList<ContentFrame*> mDetachedFrames;
     };
 }

plugins/gui/include/gui/docking_system/tab_widget.h

@@ -83,8 +83,9 @@ namespace hal
          * Detaches the content widget and its corresponding dockbutton (hides it) from the dockbar
          * and displays the content widget in its own window.
          * @param widget
+         * @returns the enclosing frame of the detached widget
          */
-        virtual void detach(ContentWidget* widget);
+        virtual ContentFrame* detach(ContentWidget* widget);
 
         /**
          * Reattches the given content widget and corresponding dockbutton (shows it) to the dockbar.
@@ -116,12 +117,6 @@ namespace hal
          */
         void handleNoCurrentWidget(int index);
 
-        /**
-         * Returns the number of widgets / buttons as of mDockBar->count()
-         * @return - The number of widgets / buttons
-         */
-        int count() const override;
-
         /**
          * Removes all buttons from the dockbar and therefore the widgets from the area. The corresponding
          * widgets are not destroyed but hidden.
@@ -150,12 +145,10 @@ namespace hal
     private:
         QVBoxLayout* mVerticalLayout;
         QHBoxLayout* mHorizontalLayout;
-        DockBar* mDockBar;
         Toolbar* mLeftToolbar;
         Toolbar* mRightToolbar;
         ContentWidget* mCurrentWidget;
         QAction* mActionDetach;
-        QList<ContentFrame*> mDetachedFrames;
         QList<QShortcut*> mActiveShortcuts;
     };
 }

plugins/gui/include/gui/main_window/main_window.h

@@ -288,7 +288,7 @@ namespace hal
          * @param index - The position index within the anchor, the widget should be put in
          * @param anchor - The anchor, the widget should be assigned to
          */
-        void addContent(ContentWidget* widget, int index, content_anchor anchor);
+        void addContent(ContentWidget* widget, int index, ContentLayout::Position anchor);
 
         /**
          * Remove a content widget from the layout area.
@@ -427,6 +427,11 @@ namespace hal
 
         void reloadStylsheet(int istyle);
 
+        /**
+         * Getter for content layout area, needed to restore gui settings by content manager
+         */
+        ContentLayoutArea* layoutArea() const;
+
     private Q_SLOTS:
         /**
          * Private slot to handle event log setting

plugins/gui/include/gui/settings/settings_manager.h

@@ -29,12 +29,17 @@
 #include <QList>
 #include <QSettings>
 #include "gui/settings/settings_items/settings_item.h"
+#include "gui/content_anchor/content_anchor.h"
 #include "gui/logger/logger_settings.h"
 #include <QPoint>
 #include <QSize>
+#include <QSplitter>
 
 namespace hal
 {
+    class ContentWidget;
+    struct ContentWidgetPlacement;
+
     /**
      * @ingroup settings
      * @brief Manages and persists the settings on the lowest level.
@@ -91,6 +96,28 @@ namespace hal
          */
         void mainWindowSaveGeometry(const QPoint& pos, const QSize& size);
 
+        /**
+         * Write widgets location and geometry to the user settings file.
+         * @param anchor - One of L(eft), R(ight), B(ottom), T(ab)
+         * @param widgets - List of widgets in that anchor
+         */
+        void widgetsSaveGeometry(ContentLayout::Position anchorPos, QList<const ContentWidget*>& widgets);
+
+        /**
+         * Returns placement object for widget if info found in setting file.
+         * The index -1 indicates that the info was not found.
+         *
+         * @param cw - Pointer to ContentWidget
+         * @return Placement structure
+         */
+        ContentWidgetPlacement widgetPlacement(ContentWidget* cw) const;
+
+        /**
+         * Detach widget and place at screen position if info is given in setting file.
+         * @param cw - Pointer to ContentWidget
+         */
+        void widgetDetach(ContentWidget* cw) const;
+
         /**
          * Get the value in the user settings file for a given key.
          *
@@ -107,6 +134,19 @@ namespace hal
          */
         QVariant defaultValue(const QString& tag) const;
 
+        /**
+         * Save state of splitter in setting file
+         * @param tag - tag to save parameter
+         * @param splitter - save settings for this splitter
+         */
+        void saveSplitterState(const QString& tag, const QSplitter* splitter);
+
+        /**
+         * Restore state of splitter from setting file
+         * @param tag - tag for which the splitter gets restored
+         * @param splitter - the splitter to be restored
+         */
+        void restoreSplitterState(const QString& tag, QSplitter *splitter) const;
 
         LoggerSettings loggerSettings() const;