From 07e16729023e8ab0a42b76946a72bbc84694a00e Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 4 Jan 2015 14:20:01 -0600 Subject: [PATCH] Allowing using 'Locate' option in install wizard on all platforms --- installwizard_setup.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/installwizard_setup.cpp b/installwizard_setup.cpp index 186abfe..d0456e1 100644 --- a/installwizard_setup.cpp +++ b/installwizard_setup.cpp @@ -43,12 +43,6 @@ InstallWizard_Setup::InstallWizard_Setup(QWidget *parent, Settings *settings) : { ui->setupUi(this); -#ifndef Q_OS_WIN32 - ui->rbLocate->setEnabled(false); - ui->rbInstall->setChecked(true); - ui->stackPages->setCurrentIndex(Page_Install); -#endif - // Populate drives list. QFileInfoList drives = QDir::drives(); int selectIndex = -1; @@ -169,7 +163,6 @@ bool InstallWizard_Setup::validatePage() iw->setQuakePath(ui->txtInstallSteamDest->text()); } -#ifdef Q_OS_WIN32 else if (ui->stackPages->currentIndex() == Page_Locate) { if (ui->txtLocatePath->text().isEmpty()) @@ -205,7 +198,6 @@ bool InstallWizard_Setup::validatePage() iw->setIsQuake3PatchRequired(hash != "48911719d91be25adb957f2d325db4a0"); iw->setQuakePath(ui->txtLocatePath->text()); } -#endif return true; } @@ -220,12 +212,10 @@ bool InstallWizard_Setup::isComplete() const { return !ui->txtInstallSteamSource->text().isEmpty() && !ui->txtInstallSteamDest->text().isEmpty(); } -#ifdef Q_OS_WIN32 else if (ui->stackPages->currentIndex() == Page_Locate) { return !ui->txtLocatePath->text().isEmpty(); } -#endif return true; } @@ -236,7 +226,6 @@ int InstallWizard_Setup::nextId() const { return InstallWizard::Page_Eula; } -#ifdef Q_OS_WIN32 else if (ui->stackPages->currentIndex() == Page_Locate) { if (((InstallWizard *)wizard())->getIsQuake3PatchRequired()) @@ -248,7 +237,6 @@ int InstallWizard_Setup::nextId() const return InstallWizard::Page_Finished; } } -#endif // Shouldn't happen. Q_ASSERT(false);