add options to set wine binary

Author: noisecode3

src/Model.cpp

@@ -157,6 +157,11 @@ void Model::run(RunnerOptions options) {
             m_runner.addEnvironmentVariable(env);
         }
 
+        // Wine binary path
+        if (!options.winePath.isEmpty()|| (options.command ==  WINE )) {
+            m_runner.setWinePath(options.winePath);
+        }
+
         // Executable to run
         const quint64 type = getType(options.id);
         m_runner.addArguments(QStringList() << ExecutableNames().data[type]);

src/Runner.cpp

@@ -33,6 +33,7 @@ const quint64 Runner::getStatus() {
 void Runner::clear() {
     m_arguments.clear();
     m_env.clear();
+    m_winePath.clear();
     m_env.insert(QProcessEnvironment::systemEnvironment());
     m_cwd.clear();
     m_command = 0;
@@ -73,6 +74,10 @@ QString Runner::getCommandString(const quint64 cmd) {
     return result;
 }
 
+void Runner::setWinePath(const QString& path) {
+    m_winePath = path;
+}
+
 void Runner::run() {
     if (m_isRunning) {
         qWarning() << "[Runner] Already running!";
@@ -85,7 +90,11 @@ void Runner::run() {
 
     process.setWorkingDirectory(m_cwd);
     process.setProcessEnvironment(m_env);
-    process.setProgram(getCommandString(m_command));
+    if (m_winePath.isEmpty() == true) {
+        process.setProgram(getCommandString(m_command));
+    } else {
+        process.setProgram(m_winePath);
+    }
     process.setArguments(m_arguments);
     process.setProcessChannelMode(QProcess::MergedChannels);
 

src/Runner.hpp

@@ -25,6 +25,7 @@ class Runner : public QObject {
     void run();
     const quint64 getStatus();
     void clear();
+    void setWinePath(const QString& path);
     void setProgram(const quint64 command);
     void setCurrentWorkingDirectory(const QString& dir);
     void addEnvironmentVariable(const QPair<QString, QString> env);
@@ -35,6 +36,7 @@ class Runner : public QObject {
     QProcessEnvironment m_env;
     QStringList m_arguments;
     QString m_cwd;
+    QString m_winePath;
     quint64 m_command;
     quint64 m_status;
     bool m_isRunning;

src/globalTypes.hpp

@@ -36,6 +36,7 @@ struct RunnerOptions {
     quint64 id = 0;
     quint64 steamID = 0;
     quint64 command = 0;
+    QString winePath;
     QList<QPair<QString, QString>> envList;
     QStringList arguments;
     bool setup = false;

src/pictures/Lara.png

@@ -589,6 +589,13 @@ void UiLevels::runClicked() {
                     QString("level%1/RunnerType").arg(id)).toInt();
             QString input = g_settings.value(
                     QString("level%1/EnvironmentVariables").arg(id)).toString();
+
+            QString winePath;
+            if (type == 1) {
+                winePath = g_settings.value(
+                    QString("level%1/RunnerWinePath").arg(id)).toString();
+            }
+
             qDebug() << "Type was: " << type;
             RunnerOptions options;
 
@@ -603,6 +610,7 @@ void UiLevels::runClicked() {
             } else if (type == 1) {
                 options.id = id;
                 options.command = WINE;
+                options.winePath = winePath;
                 options.setup =
                     this->select->stackedWidgetBar->
                         navigateWidgetBar->checkBoxSetup->isChecked();

src/view/Levels.cpp

@@ -158,15 +158,17 @@ void UiSetup::globalResetClicked() {
 }
 
 void UiSetup::levelSaveClicked(qint64 id) {
-        g_settings.setValue(QString("level%1/EnvironmentVariables")
-                .arg(id), this->settings->
-                    frameLevelSetup->frameLevelSetupSettings->widgetEnvironmentVariables->
-                            lineEditEnvironmentVariables->text());
-
-        g_settings.setValue(QString("level%1/RunnerType")
-                                .arg(id), this->settings->frameLevelSetup->
-                            frameLevelSetupSettings->widgetRunnerType->
-                            comboBoxRunnerType->currentIndex());
+        g_settings.setValue(QString("level%1/EnvironmentVariables").arg(id),
+            this->settings->frameLevelSetup->frameLevelSetupSettings->
+            widgetEnvironmentVariables->lineEditEnvironmentVariables->text());
+
+        g_settings.setValue(QString("level%1/RunnerType").arg(id),
+            this->settings->frameLevelSetup->frameLevelSetupSettings->
+            widgetRunnerType->comboBoxRunnerType->currentIndex());
+
+        g_settings.setValue(QString("level%1/RunnerWinePath").arg(id),
+            this->settings->frameLevelSetup->frameLevelSetupSettings->
+            widgetRunnerType->lineEditWinePath->text());
 }
 
 void UiSetup::levelResetClicked(qint64 id) {
@@ -181,6 +183,12 @@ void UiSetup::levelResetClicked(qint64 id) {
             g_settings.value(
                 QString("level%1/RunnerType")
                     .arg(id)).toInt());
+
+    this->settings->frameLevelSetup->frameLevelSetupSettings->
+        widgetRunnerType->lineEditWinePath->setText(
+            g_settings.value(
+                QString("level%1/RunnerWinePath")
+                    .arg(id)).toString());
 }
 
 void UiSetup::setState(qint64 id) {
@@ -195,6 +203,9 @@ void UiSetup::setState(qint64 id) {
         levelSettings->widgetRunnerType->comboBoxRunnerType->setCurrentIndex(
                 g_settings.value(QString("level%1/RunnerType")
                     .arg(id)).toInt());
+        levelSettings->widgetRunnerType->lineEditWinePath->setText(
+                g_settings.value(QString("level%1/RunnerWinePath")
+                    .arg(id)).toString());
         LevelControl* levelControl = this->settings->frameLevelSetup->levelControl;
         levelControl->commandLinkButtonLSSave->setEnabled(true);
         levelControl->commandLinkButtonLSReset->setEnabled(true);
@@ -599,6 +610,8 @@ WidgetRunnerType::WidgetRunnerType(QWidget* parent)
     labelRunnerType(new QLabel(
         tr("Runner Type"), this)),
     comboBoxRunnerType(new QComboBox(this)),
+    labelWinePath(new QLabel(tr("Wine Path"), this)),
+    lineEditWinePath(new QLineEdit(this)),
     layout(new QHBoxLayout(this))
 {
     layout->setContentsMargins(6, 6, 6, 6);
@@ -621,6 +634,25 @@ WidgetRunnerType::WidgetRunnerType(QWidget* parent)
         );
 
     layout->addWidget(comboBoxRunnerType);
+    labelWinePath->hide();
+    layout->addWidget(labelWinePath);
+    lineEditWinePath->hide();
+    layout->addWidget(lineEditWinePath);
+
+    connect(comboBoxRunnerType,
+            &QComboBox::currentTextChanged,
+            this,
+            [this](const QString &runner) {
+        if (runner == "Wine") {
+            labelWinePath->show();
+            lineEditWinePath->show();
+        } else {
+            labelWinePath->hide();
+            lineEditWinePath->hide();
+        }
+    });
+
+
 }
 
 WidgetLevelID::WidgetLevelID(QWidget* parent)

src/view/Setup.cpp

@@ -192,12 +192,16 @@ class WidgetRunnerType : public QWidget
      * (ui->tabs->setup->stackedWidget->settings->
      * 		frameLevelSetup->frameLevelSetupSettings)
      * LevelControl
+     * ├── labelRunnerType
      * ├── comboBoxRunnerType
-     * └── labelRunnerType
+     * ├── labelWinePath
+     * └── lineEditWinePath
      */
     explicit WidgetRunnerType(QWidget* parent);
-    QComboBox *comboBoxRunnerType{nullptr};
     QLabel *labelRunnerType{nullptr};
+    QComboBox *comboBoxRunnerType{nullptr};
+    QLabel *labelWinePath{nullptr};
+    QLineEdit *lineEditWinePath{nullptr};
 private:
     QHBoxLayout *layout{nullptr};
 };