Extended Script Editor settings

Author: serhmarch

modbus

@@ -146,6 +146,7 @@ void setModbusAddress(QComboBox *cmb, QSpinBox *sp, Address adr, AddressNotation
 
 void fillModbusAddressUi(QComboBox *cmb, QSpinBox *sp, Address adr, AddressNotation notation)
 {
+    cmb->setMinimumWidth(70);
     cmb->clear();
     cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_0x, notation));
     cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_1x, notation));

src/core/core/core_global.cpp

@@ -106,6 +106,13 @@ QColor mbCoreDialogs::getColor(const QColor &initial, QWidget *parent, const QSt
     return QColorDialog::getColor(initial, parent, title, options);
 }
 
+bool mbCoreDialogs::getFont(QFont &font, QWidget *parent, const QString &title, QFontDialog::FontDialogOptions options)
+{
+    bool ok;
+    font = QFontDialog::getFont(&ok, font, parent, title, options);
+    return ok;
+}
+
 bool mbCoreDialogs::editSystemSettings(const QString &title)
 {
     return m_settings->editSettings(title);

src/core/gui/dialogs/core_dialogs.cpp

@@ -26,6 +26,7 @@
 #include <QInputDialog>
 #include <QFileDialog>
 #include <QColorDialog>
+#include <QFontDialog>
 
 #include <project/core_project.h>
 
@@ -82,6 +83,8 @@ class MB_EXPORT mbCoreDialogs
                             const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = QFileDialog::Options());
     QColor getColor(const QColor &initial = Qt::white, QWidget *parent = nullptr, const QString &title = QString(),
                     QColorDialog::ColorDialogOptions options = QColorDialog::ColorDialogOptions());
+    bool getFont(QFont &font, QWidget *parent = nullptr, const QString &title = QString(),
+                    QFontDialog::FontDialogOptions options = QFontDialog::FontDialogOptions());
     bool editSystemSettings(const QString& title = QString());
     void showProjectInfo(mbCoreProject *project);
 

src/core/gui/dialogs/core_dialogs.h

@@ -16,7 +16,8 @@
 
 mbCoreDialogSettings::Strings::Strings() :
     title(QStringLiteral("Settings")),
-    cachePrefix(QStringLiteral("Ui.Dialogs.SystemSettings."))
+    cachePrefix(QStringLiteral("Ui.Dialogs.SystemSettings.")),
+    wSplitterState(cachePrefix+QStringLiteral("splitterState"))
 {
 }
 
@@ -43,7 +44,7 @@ mbCoreDialogSettings::mbCoreDialogSettings(QWidget *parent) :
     m_splitter->addWidget(m_stackedWidget);
     m_splitter->setStretchFactor(1, 1);
 
-    m_splitter->setSizes({50, 1});
+    m_splitter->setSizes({100, 1});
     m_splitter->setChildrenCollapsible(false);
 
     connect(m_listWidget, &QListWidget::currentRowChanged, m_stackedWidget, &QStackedWidget::setCurrentIndex);
@@ -71,6 +72,29 @@ mbCoreDialogSettings::mbCoreDialogSettings(QWidget *parent) :
 
 }
 
+MBSETTINGS mbCoreDialogSettings::cachedSettings() const
+{
+    MBSETTINGS m = mbCoreDialogBase::cachedSettings();
+
+    const Strings &s = Strings::instance();
+
+    m[s.wSplitterState] = m_splitter->saveState();
+
+    return m;
+}
+
+void mbCoreDialogSettings::setCachedSettings(const MBSETTINGS &m)
+{
+    mbCoreDialogBase::setCachedSettings(m);
+
+    const Strings &s = Strings::instance();
+
+    MBSETTINGS::const_iterator it;
+    MBSETTINGS::const_iterator end = m.end();
+
+    it = m.find(s.wSplitterState); if (it != end) m_splitter->restoreState(it.value().toByteArray());
+}
+
 bool mbCoreDialogSettings::editSettings(const QString &title)
 {
     MBSETTINGS m = mbCore::globalCore()->cachedSettings();

src/core/gui/dialogs/settings/core_dialogsettings.cpp

@@ -19,13 +19,18 @@ class MB_EXPORT mbCoreDialogSettings : public mbCoreDialogBase
     {
         const QString title;
         const QString cachePrefix;
+        const QString wSplitterState;
         Strings();
         static const Strings &instance();
     };
 
 public:
     mbCoreDialogSettings(QWidget *parent = nullptr);
 
+public:
+    MBSETTINGS cachedSettings() const override;
+    void setCachedSettings(const MBSETTINGS &settings) override;
+
 public:
     bool editSettings(const QString& title = QString());
 

src/core/gui/dialogs/settings/core_dialogsettings.h

@@ -19,7 +19,7 @@ bool mbServerDelegateSettingsScriptEditorColors::editorEvent(QEvent *event, QAbs
     {
         mbServerUi *ui = mbServer::global()->ui();
         QColor color1 = model->data(index, Qt::BackgroundRole).value<QColor>();
-        QColor color2 = mbServer::global()->ui()->dialogs()->getColor(color1, ui, "Color");
+        QColor color2 = ui->dialogs()->getColor(color1, ui, "Color");
         if (color2.isValid())
             model->setData(index, QVariant::fromValue(color2), Qt::BackgroundRole);
     }

src/server/gui/dialogs/settings/server_delegatesettingsscripteditorcolors.cpp

@@ -37,6 +37,7 @@ void mbServerDialogSettings::fillForm(const MBSETTINGS &m)
     m_script->setScriptEnable            (m.value(ssrv.settings_scriptEnable         ).toBool      ());
     m_script->setScriptUseOptimization   (m.value(ssrv.settings_scriptUseOptimization).toBool      ());
     m_script->setScriptGenerateComment   (m.value(sscr.settings_scriptGenerateComment).toBool      ());
+    m_script->setScriptEditorFont        (m.value(sscr.settings_font                 ).toString    ());
     m_script->scriptSetEditorColorFormars(m.value(sscr.settings_colorFormats         ).toString    ());
     m_script->scriptSetManualExecutables (m.value(ssrv.settings_scriptManual         ).toStringList());
     m_script->scriptSetDefaultExecutable (m.value(ssrv.settings_scriptDefault        ).toString    ());
@@ -50,6 +51,7 @@ void mbServerDialogSettings::fillData(MBSETTINGS &m)
     m[ssrv.settings_scriptEnable         ] = m_script->scriptEnable            ();
     m[ssrv.settings_scriptUseOptimization] = m_script->scriptUseOptimization   ();
     m[sscr.settings_scriptGenerateComment] = m_script->scriptGenerateComment   ();
+    m[sscr.settings_font                 ] = m_script->scriptEditorFont        ();
     m[sscr.settings_colorFormats         ] = m_script->scriptEditorColorFormars();
     m[ssrv.settings_scriptManual         ] = m_script->scriptManualExecutables ();
     m[ssrv.settings_scriptDefault        ] = m_script->scriptDefaultExecutable ();

src/server/gui/dialogs/settings/server_dialogsettings.cpp

@@ -3,6 +3,7 @@
 
 #include <server.h>
 #include <gui/server_ui.h>
+#include <gui/dialogs/server_dialogs.h>
 
 #include "../server_dialogs.h"
 
@@ -11,6 +12,7 @@
 
 #include "server_modelsettingsscriptinterpreters.h"
 
+#include <gui/script/editor/server_scripteditor.h>
 #include <gui/script/editor/server_scripthighlighter.h>
 
 mbServerWidgetSettingsScript::mbServerWidgetSettingsScript(QWidget *parent) :
@@ -23,6 +25,8 @@ mbServerWidgetSettingsScript::mbServerWidgetSettingsScript(QWidget *parent) :
     setScriptEnable(server->scriptEnable());
     setScriptEnable(server->scriptUseOptimization());
 
+    setScriptEditorFont(mbServerScriptEditor::Defaults::instance().settings.font);
+
     m_modelEditorColors = new mbServerModelSettingsScriptEditorColors(this);
     connect(ui->btnDefaultEditorColors, &QToolButton::clicked,
             m_modelEditorColors, &mbServerModelSettingsScriptEditorColors::setDefaultEditorColors);
@@ -33,6 +37,7 @@ mbServerWidgetSettingsScript::mbServerWidgetSettingsScript(QWidget *parent) :
     m_modelInterpreters->setAutoDetected(mbServer::global()->scriptAutoDetectedExecutables());
     ui->viewInterpreters->setModel(m_modelInterpreters);
 
+    connect(ui->btnFont         , &QPushButton::clicked, this, &mbServerWidgetSettingsScript::slotFont         );
     connect(ui->btnPyAdd        , &QPushButton::clicked, this, &mbServerWidgetSettingsScript::slotPyAdd        );
     connect(ui->btnPySet        , &QPushButton::clicked, this, &mbServerWidgetSettingsScript::slotPySet        );
     connect(ui->btnPyRemove     , &QPushButton::clicked, this, &mbServerWidgetSettingsScript::slotPyRemove     );
@@ -79,6 +84,19 @@ void mbServerWidgetSettingsScript::setScriptGenerateComment(bool gen)
     ui->chbGenerateComment->setChecked(gen);
 }
 
+QString mbServerWidgetSettingsScript::scriptEditorFont() const
+{
+    QFont f = getScriptEditorFont();
+    return f.toString();
+}
+
+void mbServerWidgetSettingsScript::setScriptEditorFont(const QString &font)
+{
+    QFont f;
+    f.fromString(font);
+    setScriptEditorFont(f);
+}
+
 QString mbServerWidgetSettingsScript::scriptEditorColorFormars() const
 {
     return mbServerScriptHighlighter::toString(m_modelEditorColors->colorFormats());
@@ -110,6 +128,29 @@ void mbServerWidgetSettingsScript::scriptSetDefaultExecutable(const QString &exe
     m_modelInterpreters->scriptSetDefaultExecutable(exec);
 }
 
+QFont mbServerWidgetSettingsScript::getScriptEditorFont() const
+{
+    QFont f = ui->cmbFontFamily->currentFont();
+    f.setPointSize(ui->spFontSize->value());
+    return f;
+}
+
+void mbServerWidgetSettingsScript::setScriptEditorFont(const QFont &f)
+{
+    ui->cmbFontFamily->setCurrentFont(f);
+    ui->spFontSize->setValue(f.pointSize());
+}
+
+void mbServerWidgetSettingsScript::slotFont()
+{
+    mbServerUi *ui = mbServer::global()->ui();
+    QFont f = getScriptEditorFont();
+    if (ui->dialogs()->getFont(f, ui, "Font"))
+    {
+        setScriptEditorFont(f);
+    }
+}
+
 void mbServerWidgetSettingsScript::slotPyAdd()
 {
     QString s = ui->lnExecPath->text();

src/server/gui/dialogs/settings/server_widgetsettingsscript.cpp

@@ -30,6 +30,9 @@ class mbServerWidgetSettingsScript : public QWidget
     bool scriptGenerateComment() const;
     void setScriptGenerateComment(bool gen);
 
+    QString scriptEditorFont() const;
+    void setScriptEditorFont(const QString &font);
+
     QString scriptEditorColorFormars() const;
     void scriptSetEditorColorFormars(const QString &formats);
 
@@ -39,7 +42,12 @@ class mbServerWidgetSettingsScript : public QWidget
     QString scriptDefaultExecutable() const;
     void scriptSetDefaultExecutable(const QString &exec);
 
+private:
+    QFont getScriptEditorFont() const;
+    void setScriptEditorFont(const QFont &f);
+
 private Q_SLOTS:
+    void slotFont         ();
     void slotPyAdd        ();
     void slotPySet        ();
     void slotPyRemove     ();