From fafdb146004401355db5245cc1f7c241c00cf991 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 7 Jun 2019 19:26:54 -0400
Subject: fixed EditExecutablesDialog being opened without a parent removed
 Executable's constructor with values, replaced with default ctor + setters,
 all these strings were much too error-prone added Executable ctor overload to
 convert from ExecutableInfo plugin executables now override most of the
 custom changes renamed browseButton to browseBinaryButton to avoid confusion
 with the other browseDirButton fixed both browse dialogs not handling cancel
 EditExecutablesDialog's list used to change the text color for custom
 executables, replaced with italics

---
 src/editexecutablesdialog.cpp | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'src/editexecutablesdialog.cpp')

diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp
index 83756ac8..a3b2808a 100644
--- a/src/editexecutablesdialog.cpp
+++ b/src/editexecutablesdialog.cpp
@@ -81,7 +81,14 @@ void EditExecutablesDialog::refreshExecutablesWidget()
 
   for(const auto& exe : m_ExecutablesList) {
     QListWidgetItem *newItem = new QListWidgetItem(exe.title());
-    newItem->setTextColor(exe.isCustom() ? QColor(Qt::black) : QColor(Qt::darkGray));
+
+    if (!exe.isCustom()) {
+      auto f = newItem->font();
+      f.setItalic(true);
+
+      newItem->setFont(f);
+    }
+
     ui->executablesListBox->addItem(newItem);
   }
 
@@ -142,13 +149,13 @@ void EditExecutablesDialog::saveExecutable()
   if (ui->useAppIconCheckBox->isChecked())
     flags |= Executable::UseApplicationIcon;
 
-  m_ExecutablesList.setExecutable({
-    ui->titleEdit->text(),
-    QDir::fromNativeSeparators(ui->binaryEdit->text()),
-    ui->argumentsEdit->text(),
-    QDir::fromNativeSeparators(ui->workingDirEdit->text()),
-    ui->overwriteAppIDBox->isChecked() ? ui->appIDOverwriteEdit->text() : "",
-    flags});
+  m_ExecutablesList.setExecutable(Executable()
+    .title(ui->titleEdit->text())
+    .binaryInfo(QDir::fromNativeSeparators(ui->binaryEdit->text()))
+    .arguments(ui->argumentsEdit->text())
+    .steamAppID(ui->overwriteAppIDBox->isChecked() ? ui->appIDOverwriteEdit->text() : "")
+    .workingDirectory(QDir::fromNativeSeparators(ui->workingDirEdit->text()))
+    .flags(flags));
 
   if (ui->newFilesModCheckBox->isChecked()) {
     m_Profile->storeSetting("custom_overwrites", ui->titleEdit->text(),
@@ -198,12 +205,17 @@ void EditExecutablesDialog::on_addButton_clicked()
   refreshExecutablesWidget();
 }
 
-void EditExecutablesDialog::on_browseButton_clicked()
+void EditExecutablesDialog::on_browseBinaryButton_clicked()
 {
   QString binaryName = FileDialogMemory::getOpenFileName(
       "editExecutableBinary", this, tr("Select a binary"), QString(),
       tr("Executable (%1)").arg("*.exe *.bat *.jar"));
 
+  if (binaryName.isNull()) {
+    // canceled
+    return;
+  }
+
   if (binaryName.endsWith(".jar", Qt::CaseInsensitive)) {
     QString binaryPath;
     { // try to find java automatically
@@ -250,6 +262,11 @@ void EditExecutablesDialog::on_browseDirButton_clicked()
   QString dirName = FileDialogMemory::getExistingDirectory("editExecutableDirectory", this,
                                                            tr("Select a directory"));
 
+  if (dirName.isNull()) {
+    // canceled
+    return;
+  }
+
   ui->workingDirEdit->setText(dirName);
 }
 
-- 
cgit v1.3.1