- started on a refactoring moving functionality out of the MainWindow class

- started on support for game-plugins

1 files changed, 8 insertions, 10 deletions

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index fe548a9a..3cc749d6 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -53,9 +53,7 @@ ExecutablesList EditExecutablesDialog::getExecutablesList() const
 
 void EditExecutablesDialog::refreshExecutablesWidget()
 {
-  QListWidget *executablesWidget = findChild<QListWidget*>("executablesListBox");
-
-  executablesWidget->clear();
+  ui->executablesListBox->clear();
   std::vector<Executable>::const_iterator current, end;
   m_ExecutablesList.getExecutables(current, end);
 
@@ -65,7 +63,7 @@ void EditExecutablesDialog::refreshExecutablesWidget()
     temp.setValue(*current);
     newItem->setData(Qt::UserRole, temp);
     newItem->setTextColor(current->m_Custom ? QColor(Qt::black) : QColor(Qt::darkGray));
-    executablesWidget->addItem(newItem);
+    ui->executablesListBox->addItem(newItem);
   }
 
   ui->addButton->setEnabled(false);
@@ -96,7 +94,8 @@ void EditExecutablesDialog::saveExecutable()
 {
   m_ExecutablesList.addExecutable(ui->titleEdit->text(), QDir::fromNativeSeparators(ui->binaryEdit->text()),
         ui->argumentsEdit->text(), QDir::fromNativeSeparators(ui->workingDirEdit->text()),
-        (ui->closeCheckBox->checkState() == Qt::Checked) ? DEFAULT_CLOSE : DEFAULT_STAY,
+        (ui->closeCheckBox->checkState() == Qt::Checked) ? ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE
+                                                         : ExecutableInfo::CloseMOStyle::DEFAULT_STAY,
         ui->overwriteAppIDBox->isChecked() ? ui->appIDOverwriteEdit->text() : "",
         true, false);
 }
@@ -212,14 +211,14 @@ bool EditExecutablesDialog::executableChanged()
         || selectedExecutable.m_SteamAppID != ui->appIDOverwriteEdit->text()
         || selectedExecutable.m_WorkingDirectory != QDir::fromNativeSeparators(ui->workingDirEdit->text())
         || selectedExecutable.m_BinaryInfo.absoluteFilePath() != QDir::fromNativeSeparators(ui->binaryEdit->text())
-        || (selectedExecutable.m_CloseMO == DEFAULT_CLOSE) != ui->closeCheckBox->isChecked();
+        || (selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE) != ui->closeCheckBox->isChecked();
   } else {
     return false;
   }
 }
 
 
-void EditExecutablesDialog::on_executablesListBox_currentItemChanged(QListWidgetItem *current, QListWidgetItem*)
+void EditExecutablesDialog::on_executablesListBox_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
 {
   if (current == NULL) {
     resetInput();
@@ -249,8 +248,8 @@ void EditExecutablesDialog::on_executablesListBox_currentItemChanged(QListWidget
   ui->binaryEdit->setText(QDir::toNativeSeparators(selectedExecutable.m_BinaryInfo.absoluteFilePath()));
   ui->argumentsEdit->setText(selectedExecutable.m_Arguments);
   ui->workingDirEdit->setText(QDir::toNativeSeparators(selectedExecutable.m_WorkingDirectory));
-  ui->closeCheckBox->setChecked(selectedExecutable.m_CloseMO == DEFAULT_CLOSE);
-  if (selectedExecutable.m_CloseMO == NEVER_CLOSE) {
+  ui->closeCheckBox->setChecked(selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::DEFAULT_CLOSE);
+  if (selectedExecutable.m_CloseMO == ExecutableInfo::CloseMOStyle::NEVER_CLOSE) {
     ui->closeCheckBox->setEnabled(false);
     ui->closeCheckBox->setToolTip(tr("MO must be kept running or this application will not work correctly."));
   } else {
@@ -286,4 +285,3 @@ void EditExecutablesDialog::on_closeButton_clicked()
   }
   this->accept();
 }
-