refs #512, changed dock widget to use settings

* allow to load from settings / save to settings
* removed outdated members / functions
* aligned naming of some functioss

src/blackgui/settings/settingsdockwidget.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "settingsdockwidget.h"
+#include "blackmisc/stringutils.h"
 #include <QStringList>
 
 using namespace BlackMisc;
@@ -19,36 +20,46 @@ namespace BlackGui
         CSettingsDockWidget::CSettingsDockWidget()
         { }
 
-        void CSettingsDockWidget::setFloatingFramelessMargins(const QMargins &margins)
+        void CSettingsDockWidget::setMarginsWhenFramelessFloating(const QMargins &margins)
         {
             this->m_floatingFramelessMargins = marginsToString(margins);
         }
 
-        QMargins CSettingsDockWidget::getFloatingFramelessMargins() const
+        QMargins CSettingsDockWidget::getMarginsWhenFramelessFloating() const
         {
             return stringToMargins(this->m_floatingFramelessMargins);
         }
 
-        void CSettingsDockWidget::setFloatingMargins(const QMargins &margins)
+        void CSettingsDockWidget::setMarginsWhenFloating(const QMargins &margins)
         {
             this->m_floatingMargins = marginsToString(margins);
         }
 
-        QMargins CSettingsDockWidget::getFloatingMargins() const
+        QMargins CSettingsDockWidget::getMarginsWhenFloating() const
         {
             return stringToMargins(this->m_floatingMargins);
         }
 
-        void CSettingsDockWidget::setDockedMargins(const QMargins &margins)
+        void CSettingsDockWidget::setMarginsWhenDocked(const QMargins &margins)
         {
             this->m_dockedMargins = marginsToString(margins);
         }
 
-        QMargins CSettingsDockWidget::getDockedMargins() const
+        QMargins CSettingsDockWidget::getMarginsWhenDocked() const
         {
             return stringToMargins(this->m_dockedMargins);
         }
 
+        QByteArray CSettingsDockWidget::getGeometry() const
+        {
+            return byteArrayFromHexString(this->m_geometry);
+        }
+
+        void CSettingsDockWidget::setGeometry(const QByteArray &ba)
+        {
+            this->m_geometry = bytesToHexString(ba);
+        }
+
         QString CSettingsDockWidget::convertToQString(bool i18n) const
         {
             return convertToQString(", ", i18n);
@@ -65,6 +76,9 @@ namespace BlackGui
             s.append(separator);
             s.append("docked: ");
             s.append(this->m_dockedMargins);
+            s.append(separator);
+            s.append("docked: ");
+
             return s;
         }
 
@@ -80,6 +94,10 @@ namespace BlackGui
                 return CVariant::fromValue(this->m_floatingFramelessMargins);
             case IndexDockedMargins:
                 return CVariant::fromValue(this->m_dockedMargins);
+            case IndexFrameless:
+                return CVariant::fromValue(this->m_floating);
+            case IndexFloating:
+                return CVariant::fromValue(this->m_floating);
             default:
                 return CValueObject::propertyByIndex(index);
             }
@@ -101,6 +119,12 @@ namespace BlackGui
             case IndexDockedMargins:
                 this->m_dockedMargins = variant.toQString();
                 break;
+            case IndexFloating:
+                this->m_floating = variant.toBool();
+                break;
+            case IndexFrameless:
+                this->m_frameless = variant.toBool();
+                break;
             default:
                 CValueObject::setPropertyByIndex(index, variant);
                 break;
@@ -129,5 +153,17 @@ namespace BlackGui
             Q_UNUSED(ok);
             return QMargins(l, t, r, b);
         }
+
+        CSettingsDockWidget CSettingsDockWidgets::getByNameOrInitToDefault(const QString &name)
+        {
+            if (this->contains(name)) { return this->value(name); }
+            CSettingsDockWidget s;
+
+            // default values can be set here, this could be enhanced if needed
+            // e.g. by platform dependent defaults
+            s.setMarginsWhenFloating(QMargins(0, 3, 15, 35)); // found by trial and error on windows
+            this->insert(name, s);
+            return s;
+        }
     } // ns
 } // ns

src/blackgui/settings/settingsdockwidget.h

@@ -36,7 +36,9 @@ namespace BlackGui
             {
                 IndexFloatingMargins = BlackMisc::CPropertyIndex::GlobalIndexCSettingsDockWidget,
                 IndexFloatingFramelessMargins,
-                IndexDockedMargins
+                IndexDockedMargins,
+                IndexFrameless,
+                IndexFloating
             };
 
             //! Default constructor
@@ -46,22 +48,40 @@ namespace BlackGui
             ~CSettingsDockWidget() {}
 
             //! Set margins for given dock widget
-            void setFloatingFramelessMargins(const QMargins &margins);
+            void setMarginsWhenFramelessFloating(const QMargins &margins);
 
             //! Margins for given dock widget
-            QMargins getFloatingFramelessMargins() const;
+            QMargins getMarginsWhenFramelessFloating() const;
 
             //! Set margins for given dock widget
-            void setFloatingMargins(const QMargins &margins);
+            void setMarginsWhenFloating(const QMargins &margins);
 
             //! Margins for given dock widget
-            QMargins getFloatingMargins() const;
+            QMargins getMarginsWhenFloating() const;
 
             //! Set margins for given dock widget
-            void setDockedMargins(const QMargins &margins);
+            void setMarginsWhenDocked(const QMargins &margins);
 
             //! Margins for given dock widget
-            QMargins getDockedMargins() const;
+            QMargins getMarginsWhenDocked() const;
+
+            //! Floating?
+            bool isFloating() const { return m_floating; }
+
+            //! Frameless?
+            bool isFramless() const { return m_frameless; }
+
+            //! Floating
+            void setFloating(bool floating) { m_floating = floating; }
+
+            //! Frameless
+            void setFrameless(bool frameless) { m_frameless = frameless; }
+
+            //! Geometry
+            QByteArray getGeometry() const;
+
+            //! Set geometry
+            void setGeometry(const QByteArray &ba);
 
             //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
@@ -78,7 +98,10 @@ namespace BlackGui
         private:
             QString m_floatingMargins {"0:0:0:0"};          //!< margins: when floating
             QString m_floatingFramelessMargins {"0:0:0:0"}; //!< margins, when floating and frameless
-            QString m_dockedMargins {"0:0:0:0"};            //!< margins, when floating and frameless
+            QString m_dockedMargins {"0:0:0:0"};            //!< margins, when docked
+            QString m_geometry;                             //!< geometry as HEX values
+            bool m_floating = false;                        //!< floating
+            bool m_frameless = false;                       //!< frameless
 
             //! Convert to string
             static QString marginsToString(const QMargins &margins);
@@ -90,7 +113,10 @@ namespace BlackGui
                 CSettingsDockWidget,
                 BLACK_METAMEMBER(floatingMargins),
                 BLACK_METAMEMBER(floatingFramelessMargins),
-                BLACK_METAMEMBER(dockedMargins)
+                BLACK_METAMEMBER(dockedMargins),
+                BLACK_METAMEMBER(floating),
+                BLACK_METAMEMBER(frameless),
+                BLACK_METAMEMBER(geometry)
             );
         };
 
@@ -109,6 +135,8 @@ namespace BlackGui
             //! Default constructor.
             CSettingsDockWidgets() {}
 
+            //! Get setting or init by estimated default values
+            CSettingsDockWidget getByNameOrInitToDefault(const QString &name);
         };
 
         //! Trait for settings for dock widget