SCRATCH pass initial parameters to the JavaSettingsWidget from outside

api/logic/minecraft/gameoptions/GameOptions.cpp

@@ -4,7 +4,7 @@
 #include <QSaveFile>
 
 namespace {
-bool load(const QString& path, RawGameOptions & contents)
+bool load(const QString& path, std::vector<GameOptionItem> &contents, int & version)
 {
     contents.clear();
     QFile file(path);
@@ -13,6 +13,7 @@ bool load(const QString& path, RawGameOptions & contents)
         qWarning() << "Failed to read options file.";
         return false;
     }
+    version = 0;
     while(!file.atEnd())
     {
         auto line = file.readLine();
@@ -30,32 +31,32 @@ bool load(const QString& path, RawGameOptions & contents)
         qDebug() << "!!" << key << "!!";
         if(key == "version")
         {
-            contents.version = value.toInt();
+            version = value.toInt();
             continue;
         }
-        contents.mapping[key] = value;
+        contents.emplace_back(GameOptionItem{key, value});
     }
-    qDebug() << "Loaded" << path << "with version:" << contents.version;
+    qDebug() << "Loaded" << path << "with version:" << version;
     return true;
 }
-bool save(const QString& path, RawGameOptions& contents)
+bool save(const QString& path, std::vector<GameOptionItem> &mapping, int version)
 {
     QSaveFile out(path);
     if(!out.open(QIODevice::WriteOnly))
     {
         return false;
     }
-    if(contents.version != 0)
+    if(version != 0)
     {
-        QString versionLine = QString("version:%1\n").arg(contents.version);
+        QString versionLine = QString("version:%1\n").arg(version);
         out.write(versionLine.toUtf8());
     }
-    auto iter = contents.mapping.begin();
-    while (iter != contents.mapping.end())
+    auto iter = mapping.begin();
+    while (iter != mapping.end())
     {
-        out.write(iter->first.toUtf8());
+        out.write(iter->key.toUtf8());
         out.write(":");
-        out.write(iter->second.toUtf8());
+        out.write(iter->value.toUtf8());
         out.write("\n");
         iter++;
     }
@@ -94,7 +95,7 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
     int row = index.row();
     int column = index.column();
 
-    if (row < 0 || row >= rowCount())
+    if (row < 0 || row >= int(contents.size()))
         return QVariant();
 
     switch (role)
@@ -102,11 +103,11 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
     case Qt::DisplayRole:
         if(column == 0)
         {
-            return cookedOptions.items[row].id;
+            return contents[row].key;
         }
         else
         {
-            return cookedOptions.items[row].default_value;
+            return contents[row].value;
         }
     default:
         return QVariant();
@@ -116,7 +117,7 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
 
 int GameOptions::rowCount(const QModelIndex&) const
 {
-    return cookedOptions.items.size();
+    return contents.size();
 }
 
 int GameOptions::columnCount(const QModelIndex&) const
@@ -132,12 +133,12 @@ bool GameOptions::isLoaded() const
 bool GameOptions::reload()
 {
     beginResetModel();
-    loaded = load(path, rawOptions);
+    loaded = load(path, contents, version);
     endResetModel();
     return loaded;
 }
 
 bool GameOptions::save()
 {
-    return ::save(path, rawOptions);
+    return ::save(path, contents, version);
 }

api/logic/minecraft/gameoptions/GameOptions.h

@@ -4,46 +4,12 @@
 #include <QString>
 #include <QAbstractListModel>
 
-struct RawGameOptions
-{
-    void clear()
-    {
-        version = 0;
-        mapping.clear();
-    }
-    std::map<QString, QString> mapping;
-    int version = 0;
-};
-
 struct GameOptionItem
 {
-    QString id;
-    enum ValueType
-    {
-        INT,
-        FLOAT,
-        BOOL,
-        FOV_MADNESS,
-        FPS_MADNESS
-    } value_type;
-    enum VisualType
-    {
-
-    } visual_type;
-    QVariant null_value;
-    QVariant default_value;
-    QVariant min_value;
-    QVariant max_value;
     QString key;
+    QString value;
 };
 
-struct CookedGameOptions
-{
-    std::vector<GameOptionItem> items;
-};
-
-
-
 class GameOptions : public QAbstractListModel
 {
     Q_OBJECT
@@ -61,8 +27,7 @@ public:
     bool save();
 
 private:
-    RawGameOptions rawOptions;
-    CookedGameOptions cookedOptions;
+    std::vector<GameOptionItem> contents;
     bool loaded = false;
     QString path;
     int version = 0;

application/setupwizard/JavaWizardPage.cpp

@@ -45,7 +45,13 @@ void JavaWizardPage::refresh()
 
 void JavaWizardPage::initializePage()
 {
-    m_java_widget->initialize();
+    auto s = MMC->settings();
+    m_java_widget->initialize(
+        s->get("JavaPath").toString(),
+        s->get("MinMemAlloc").toInt(),
+        s->get("MaxMemAlloc").toInt(),
+        s->get("PermGen").toInt()
+    );
 }
 
 bool JavaWizardPage::wantsRefreshButton()

application/widgets/JavaSettingsWidget.cpp

@@ -113,15 +113,15 @@ void JavaSettingsWidget::setupUi()
     retranslate();
 }
 
-void JavaSettingsWidget::initialize()
+void JavaSettingsWidget::initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen)
 {
     m_versionWidget->initialize(MMC->javalist().get());
     m_versionWidget->setResizeOn(2);
-    auto s = MMC->settings();
     // Memory
-    observedMinMemory = s->get("MinMemAlloc").toInt();
-    observedMaxMemory = s->get("MaxMemAlloc").toInt();
-    observedPermGenMemory = s->get("PermGen").toInt();
+    observedMinMemory = minHeap;
+    observedMaxMemory = maxHeap;
+    observedPermGenMemory = permGen;
+    m_javaPathTextBox->setText(currentJavaPath);
     m_minMemSpinBox->setValue(observedMinMemory);
     m_maxMemSpinBox->setValue(observedMaxMemory);
     m_permGenSpinBox->setValue(observedPermGenMemory);

application/widgets/JavaSettingsWidget.h

@@ -46,7 +46,7 @@ public:
     };
 
     void refresh();
-    void initialize();
+    void initialize(const QString& currentJavaPath, int minHeap, int maxHeap, int permGen);
     ValidationStatus validate();
     void retranslate();