Add cached settings to Core.Ui.Dialogs.Project

Author: serhmarch

src/core/gui/dialogs/core_dialogdataviewitem.cpp

@@ -157,7 +157,7 @@ MBSETTINGS mbCoreDialogDataViewItem::cachedSettings() const
     MBSETTINGS m;
     const Strings &s = Strings::instance();
     const mbCoreDataViewItem::Strings &sItem = mbCoreDataViewItem::Strings::instance();
-    const QString &prefix = Strings().settings_prefix;
+    const QString &prefix = s.settings_prefix;
 
     mb::Address adr;
     adr.type = mb::toModbusMemoryType(m_ui.cmbAdrType->currentText());

src/core/gui/dialogs/core_dialogproject.cpp

@@ -26,7 +26,8 @@
 #include <project/core_project.h>
 
 mbCoreDialogProject::Strings::Strings() :
-    title(QStringLiteral("Project"))
+    title(QStringLiteral("Project")),
+    settings_prefix(QStringLiteral("Ui.Dialogs.Project."))
 {
 }
 
@@ -52,6 +53,29 @@ mbCoreDialogProject::~mbCoreDialogProject()
     delete ui;
 }
 
+MBSETTINGS mbCoreDialogProject::cachedSettings() const
+{
+    MBSETTINGS m;
+    const mbCoreProject::Strings &s = mbCoreProject::Strings::instance();
+    const QString &prefix = Strings::instance().settings_prefix;
+    m[prefix+s.name   ] = ui->lnName    ->text();
+    m[prefix+s.author ] = ui->lnAuthor  ->text();
+    m[prefix+s.comment] = ui->txtComment->toPlainText();
+    return m;
+}
+
+void mbCoreDialogProject::setCachedSettings(const MBSETTINGS &m)
+{
+    const mbCoreProject::Strings &s = mbCoreProject::Strings::instance();
+    const QString &prefix = Strings::instance().settings_prefix;
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = m.end();
+
+    it = m.find(prefix+s.name   ); if (it != end) ui->lnName    ->setText     (it.value().toString());
+    it = m.find(prefix+s.author ); if (it != end) ui->lnAuthor  ->setText     (it.value().toString());
+    it = m.find(prefix+s.comment); if (it != end) ui->txtComment->setPlainText(it.value().toString());
+}
+
 MBSETTINGS mbCoreDialogProject::getSettings(const MBSETTINGS &settings, const QString &title)
 {
     MBSETTINGS r;

src/core/gui/dialogs/core_dialogproject.h

@@ -37,6 +37,7 @@ class MB_EXPORT mbCoreDialogProject : public mbCoreDialogSettings
     struct MB_EXPORT Strings
     {
         const QString title;
+        const QString settings_prefix;
         Strings();
         static const Strings &instance();
     };
@@ -45,6 +46,10 @@ class MB_EXPORT mbCoreDialogProject : public mbCoreDialogSettings
     mbCoreDialogProject(QWidget *parent = nullptr);
     ~mbCoreDialogProject();
 
+public:
+    MBSETTINGS cachedSettings() const override;
+    void setCachedSettings(const MBSETTINGS &settings) override;
+
 public:
     MBSETTINGS getSettings(const MBSETTINGS &settings, const QString &title = QString()) override;
 

src/core/gui/dialogs/core_dialogs.cpp

@@ -145,6 +145,7 @@ MBSETTINGS mbCoreDialogs::cachedSettings() const
     mb::unite(r, m_device->cachedSettings());
     mb::unite(r, m_dataView->cachedSettings());
     mb::unite(r, m_dataViewItem->cachedSettings());
+    mb::unite(r, m_project->cachedSettings());
 
     r[s.settings_lastDir] = m_lastDir;
     return r;
@@ -161,6 +162,7 @@ void mbCoreDialogs::setCachedSettings(const MBSETTINGS &settings)
     m_device->setCachedSettings(settings);
     m_dataView->setCachedSettings(settings);
     m_dataViewItem->setCachedSettings(settings);
+    m_project->setCachedSettings(settings);
 
     it = settings.find(s.settings_lastDir);
     if (it != end)

src/core/gui/dialogs/core_dialogsettings.h

@@ -34,7 +34,7 @@ class MB_EXPORT mbCoreDialogSettings : public QDialog
 
 public:
     virtual MBSETTINGS cachedSettings() const { return MBSETTINGS(); }
-    virtual void setCachedSettings(const MBSETTINGS &settings) {}
+    virtual void setCachedSettings(const MBSETTINGS &) {}
 
 public:
     virtual MBSETTINGS getSettings(const MBSETTINGS &settings = MBSETTINGS(), const QString &title = QString()) = 0;

src/server/gui/dialogs/server_dialogport.cpp

@@ -29,18 +29,6 @@
 #include <server.h>
 #include <project/server_port.h>
 
-mbServerDialogPort::Strings::Strings() :
-    title(QStringLiteral("Port"))
-{
-}
-
-const mbServerDialogPort::Strings &mbServerDialogPort::Strings::instance()
-{
-    static const Strings s;
-    return s;
-}
-
-
 mbServerDialogPort::mbServerDialogPort(QWidget *parent) :
     mbCoreDialogPort(parent),
     ui(new Ui::mbServerDialogPort)