fixed #27

Author: sanny32

omodsim/dialogs/dialogscriptsettings.cpp

@@ -16,6 +16,7 @@ DialogScriptSettings::DialogScriptSettings(ScriptSettings& ss, QWidget *parent)
     ui->lineEditInterval->setValue(ss.Interval);
     ui->comboBoxRunMode->setCurrentRunMode(ss.Mode);
     ui->checkBoxAutoComplete->setChecked(ss.UseAutoComplete);
+    ui->checkBoxRunOnStartup->setChecked(ss.RunOnStartup);
 }
 
 ///
@@ -34,6 +35,7 @@ void DialogScriptSettings::accept()
     _scriptSettings.Mode = ui->comboBoxRunMode->currentRunMode();
     _scriptSettings.Interval = ui->lineEditInterval->value<int>();
     _scriptSettings.UseAutoComplete = ui->checkBoxAutoComplete->isChecked();
+    _scriptSettings.RunOnStartup = ui->checkBoxRunOnStartup->isChecked();
 
     QFixedSizeDialog::accept();
 }

omodsim/dialogs/dialogscriptsettings.ui

@@ -6,16 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>189</width>
-    <height>126</height>
+    <width>261</width>
+    <height>156</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Script Settings</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="labelAlignment">
-    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="labelRunMode">
@@ -75,19 +75,26 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
      <property name="centerButtons">
       <bool>true</bool>
      </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QCheckBox" name="checkBoxRunOnStartup">
+     <property name="text">
+      <string>Run script on startup</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

omodsim/formmodsim.h

@@ -244,6 +244,10 @@ inline QSettings& operator >>(QSettings& in, FormModSim* frm)
     frm->setCodepage(in.value("Codepage").toString());
     frm->setScriptSettings(scriptSettings);
 
+    if(scriptSettings.RunOnStartup) {
+        frm->runScript();
+    }
+
     return in;
 }
 

omodsim/main.cpp

@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     MainWindow w;
     if(!cfg.isEmpty())
     {
-        w.loadConfig(cfg);
+        w.loadConfig(cfg, true);
     }
     w.show();
 

omodsim/mainwindow.cpp

@@ -195,8 +195,17 @@ void MainWindow::on_awake()
     ui->actionBinary->setEnabled(frm != nullptr);
     ui->actionUInt16->setEnabled(frm != nullptr);
     ui->actionInt16->setEnabled(frm != nullptr);
+    ui->actionInt32->setEnabled(frm != nullptr);
+    ui->actionSwappedInt32->setEnabled(frm != nullptr);
+    ui->actionUInt32->setEnabled(frm != nullptr);
+    ui->actionSwappedUInt32->setEnabled(frm != nullptr);
+    ui->actionInt64->setEnabled(frm != nullptr);
+    ui->actionSwappedInt64->setEnabled(frm != nullptr);
+    ui->actionUInt64->setEnabled(frm != nullptr);
+    ui->actionSwappedUInt64->setEnabled(frm != nullptr);
     ui->actionHex->setEnabled(frm != nullptr);
     ui->actionAnsi->setEnabled(frm != nullptr);
+    ui->actionHex->setEnabled(frm != nullptr);
     ui->actionFloatingPt->setEnabled(frm != nullptr);
     ui->actionSwappedFP->setEnabled(frm != nullptr);
     ui->actionDblFloat->setEnabled(frm != nullptr);
@@ -1280,7 +1289,7 @@ FormModSim* MainWindow::firstMdiChild() const
 /// \brief MainWindow::loadConfig
 /// \param filename
 ///
-void MainWindow::loadConfig(const QString& filename)
+void MainWindow::loadConfig(const QString& filename, bool startup)
 {
     QFile file(filename);
     if(!file.open(QFile::ReadOnly))
@@ -1327,6 +1336,15 @@ void MainWindow::loadConfig(const QString& filename)
         if(!filename.isEmpty())
             openFile(filename);
     }
+
+    if(startup) {
+        for(auto&& wnd : ui->mdiArea->subWindowList()) {
+            const auto frm = qobject_cast<FormModSim*>(wnd->widget());
+            if(frm->scriptSettings().RunOnStartup) {
+                frm->runScript();
+            }
+        }
+    }
 }
 
 ///

omodsim/mainwindow.h

@@ -24,7 +24,7 @@ class MainWindow : public QMainWindow
 
     void setLanguage(const QString& lang);
 
-    void loadConfig(const QString& filename);
+    void loadConfig(const QString& filename, bool startup = false);
     void saveConfig(const QString& filename);
 
 signals:

omodsim/scriptsettings.h

@@ -12,6 +12,7 @@ struct ScriptSettings
     RunMode Mode = RunMode::Periodically;
     uint Interval = 1000;
     bool UseAutoComplete = true;
+    bool RunOnStartup = false;
 
     void normalize()
     {
@@ -32,6 +33,7 @@ inline QSettings& operator <<(QSettings& out, const ScriptSettings& ss)
     out.setValue("ScriptSettings/RunMode",          (int)ss.Mode);
     out.setValue("ScriptSettings/Interval",         ss.Interval);
     out.setValue("ScriptSettings/UseAutoComplete",  ss.UseAutoComplete);
+    out.setValue("ScriptSettings/RunOnStartup",     ss.RunOnStartup);
 
     return out;
 }
@@ -47,6 +49,7 @@ inline QSettings& operator >>(QSettings& in, ScriptSettings& ss)
     ss.Mode = (RunMode)in.value("ScriptSettings/RunMode").toInt();
     ss.Interval = in.value("ScriptSettings/Interval", 1000).toUInt();
     ss.UseAutoComplete = in.value("ScriptSettings/UseAutoComplete", true).toBool();
+    ss.RunOnStartup = in.value("ScriptSettings/RunOnStartup", false).toBool();
 
     ss.normalize();
     return in;
@@ -63,6 +66,7 @@ inline QDataStream& operator <<(QDataStream& out, const ScriptSettings& ss)
     out << ss.Mode;
     out << ss.Interval;
     out << ss.UseAutoComplete;
+    out << ss.RunOnStartup;
 
     return out;
 }
@@ -79,6 +83,10 @@ inline QDataStream& operator >>(QDataStream& in, ScriptSettings& ss)
     in >> ss.Interval;
     in >> ss.UseAutoComplete;
 
+    if(!in.atEnd()) {
+        in >> ss.RunOnStartup;
+    }
+
     return in;
 }