Merge remote-tracking branch 'origin/dev'

Author: sanny32

omodsim/cmdlineparser.cpp

@@ -0,0 +1,16 @@
+#include "cmdlineparser.h"
+
+///
+/// \brief CmdLineParser::CmdLineParser
+///
+CmdLineParser::CmdLineParser()
+{
+    QCommandLineOption helpOption(QStringList() << _help, tr("Displays this help."));
+    addOption(helpOption);
+
+    QCommandLineOption versionOption(QStringList() << _version, tr("Displays version information."));
+    addOption(versionOption);
+
+    QCommandLineOption configOption(QStringList() << _config, tr("Setup test config file."), tr("file path"));
+    addOption(configOption);
+}

omodsim/cmdlineparser.h

@@ -0,0 +1,17 @@
+#ifndef CMDLINEPARSER_H
+#define CMDLINEPARSER_H
+
+#include <QCommandLineParser>
+
+class CmdLineParser : public QCommandLineParser
+{
+public:
+    explicit CmdLineParser();
+
+public:
+    static constexpr const char* _help =    "help";
+    static constexpr const char* _version = "version";
+    static constexpr const char* _config =  "config";
+};
+
+#endif // CMDLINEPARSER_H

omodsim/dialogs/dialogabout.ui

@@ -138,7 +138,7 @@
        <item>
         <widget class="QLabel" name="labelCopyright">
          <property name="text">
-          <string>© Alexandr Ananev, 2024</string>
+          <string notr="true">© Alexandr Ananev, 2024</string>
          </property>
         </widget>
        </item>

omodsim/formmodsim.h

@@ -246,8 +246,9 @@ inline QDataStream& operator <<(QDataStream& out, FormModSim* frm)
 
     const auto wnd = frm->parentWidget();
     out << wnd->isMaximized();
-    out << ((wnd->isMinimized() || wnd->isMaximized()) ?
-              wnd->sizeHint() : wnd->size());
+
+    const auto windowSize = (wnd->isMinimized() || wnd->isMaximized()) ? wnd->sizeHint() : wnd->size();
+    out << windowSize;
 
     out << frm->displayMode();
     out << frm->dataDisplayMode();
@@ -350,6 +351,7 @@ inline QDataStream& operator >>(QDataStream& in, FormModSim* frm)
     wnd->resize(windowSize);
     wnd->setWindowState(Qt::WindowActive);
     if(isMaximized) wnd->setWindowState(Qt::WindowMaximized);
+    else wnd->resize(windowSize);
 
     frm->setDisplayMode(displayMode);
     frm->setDataDisplayMode(dataDisplayMode);

omodsim/main.cpp

@@ -1,6 +1,34 @@
 #include <QApplication>
 #include <QFontDatabase>
 #include "mainwindow.h"
+#include "cmdlineparser.h"
+
+///
+/// \brief showVersion
+///
+static inline void showVersion()
+{
+    const auto version = QString("%1\n").arg(APP_VERSION);
+    fputs(qPrintable(version), stdout);
+}
+
+///
+/// \brief showHelp
+/// \param helpText
+///
+static inline void showHelp(const QString& helpText)
+{
+    fputs(qPrintable(helpText), stdout);
+}
+
+///
+/// \brief showErrorMessage
+/// \param message
+///
+static void showErrorMessage(const QString &message)
+{
+    fputs(qPrintable(message), stderr);
+}
 
 ///
 /// \brief main
@@ -15,7 +43,36 @@ int main(int argc, char *argv[])
     a.setApplicationVersion(APP_VERSION);
     QFontDatabase::addApplicationFont(":/fonts/firacode.ttf");
 
+    CmdLineParser parser;
+    if(!parser.parse(a.arguments()))
+    {
+        showErrorMessage(parser.errorText() + QLatin1Char('\n'));
+        return EXIT_FAILURE;
+    }
+
+    if(parser.isSet(CmdLineParser::_version))
+    {
+        showVersion();
+        return EXIT_SUCCESS;
+    }
+
+    if(parser.isSet(CmdLineParser::_help))
+    {
+        showHelp(parser.helpText());
+        return EXIT_SUCCESS;
+    }
+
+    QString cfg;
+    if(parser.isSet(CmdLineParser::_config))
+    {
+        cfg = parser.value(CmdLineParser::_config);
+    }
+
     MainWindow w;
+    if(!cfg.isEmpty())
+    {
+        w.loadConfig(cfg);
+    }
     w.show();
 
     return a.exec();

omodsim/mainwindow.h

@@ -23,6 +23,9 @@ class MainWindow : public QMainWindow
 
     void setLanguage(const QString& lang);
 
+    void loadConfig(const QString& filename);
+    void saveConfig(const QString& filename);
+
 signals:
     void undo();
     void redo();
@@ -148,9 +151,6 @@ private slots:
     FormModSim* loadMdiChild(const QString& filename);
     void saveMdiChild(FormModSim* frm);
 
-    void loadConfig(const QString& filename);
-    void saveConfig(const QString& filename);
-
     void loadSettings();
     void saveSettings();
 

omodsim/omodsim.pro

@@ -4,7 +4,7 @@ CONFIG += c++17
 CONFIG -= debug_and_release
 CONFIG -= debug_and_release_target
 
-VERSION = 1.5.0
+VERSION = 1.5.1
 
 QMAKE_TARGET_PRODUCT = "Open ModSim"
 QMAKE_TARGET_DESCRIPTION = "An Open Source Modbus Slave (Server) Utility"
@@ -25,6 +25,7 @@ INCLUDEPATH += controls \
                modbusmessages \
 
 SOURCES += \
+    cmdlineparser.cpp \
     controls/booleancombobox.cpp \
     controls/bytelisttextedit.cpp \
     controls/clickablelabel.cpp \
@@ -86,6 +87,7 @@ SOURCES += \
 
 HEADERS += \
     byteorderutils.h \
+    cmdlineparser.h \
     connectiondetails.h \
     controls/booleancombobox.h \
     controls/bytelisttextedit.h \

omodsim/translations/omodsim_ru.qm

@@ -14,6 +14,29 @@
         <translation>Вкл</translation>
     </message>
 </context>
+<context>
+    <name>CmdLineParser</name>
+    <message>
+        <location filename="../cmdlineparser.cpp" line="8"/>
+        <source>Displays this help.</source>
+        <translation>Пказать эту справку.</translation>
+    </message>
+    <message>
+        <location filename="../cmdlineparser.cpp" line="11"/>
+        <source>Displays version information.</source>
+        <translation>Пказать информацию о версии.</translation>
+    </message>
+    <message>
+        <location filename="../cmdlineparser.cpp" line="14"/>
+        <source>Setup test config file.</source>
+        <translation>Задать файл конфига.</translation>
+    </message>
+    <message>
+        <location filename="../cmdlineparser.cpp" line="14"/>
+        <source>file path</source>
+        <translation>файл</translation>
+    </message>
+</context>
 <context>
     <name>ConsoleOutput</name>
     <message>
@@ -49,11 +72,6 @@
         <source>An Open Source Modbus Slave (Server) Utility</source>
         <translation>Утилита Modbus Slave (сервер) с открытым исходным кодом</translation>
     </message>
-    <message>
-        <location filename="../dialogs/dialogabout.ui" line="141"/>
-        <source>© Alexandr Ananev, 2023</source>
-        <translation></translation>
-    </message>
     <message>
         <location filename="../dialogs/dialogabout.ui" line="177"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;a href=&quot;&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Lecense: The MIT License&lt;span&gt;&lt;/a&gt;&lt;/body&gt;&lt;/html&gt;</source>