From e614eaf2408fcef2bdb40348fecddf2d4f081051 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 12 Jun 2016 15:40:38 +0200 Subject: [PATCH] Changed: Rename all WizardDialog to Dialog (not really a wizard) --HG-- branch : develop --- ...tallwizarddialog.cpp => installdialog.cpp} | 18 ++++++------- ...{installwizarddialog.h => installdialog.h} | 12 ++++----- .../tools/client/ryzom_installer/src/main.cpp | 12 ++++----- .../client/ryzom_installer/src/mainwindow.cpp | 5 ++-- ...ratewizarddialog.cpp => migratedialog.cpp} | 14 +++++----- ...{migratewizarddialog.h => migratedialog.h} | 12 ++++----- .../ryzom_installer/src/profilesdialog.h | 2 +- .../ryzom_installer/src/settingsdialog.h | 2 +- ...llwizarddialog.cpp => uninstalldialog.cpp} | 26 +++++++++---------- ...nstallwizarddialog.h => uninstalldialog.h} | 12 ++++----- .../ui/{installwizard.ui => installdialog.ui} | 8 +++--- .../ui/{migratewizard.ui => migratedialog.ui} | 4 +-- .../ui/{profiles.ui => profilesdialog.ui} | 0 .../ui/{settings.ui => settingsdialog.ui} | 6 ++--- ...{uninstallwizard.ui => uninstalldialog.ui} | 4 +-- 15 files changed, 69 insertions(+), 68 deletions(-) rename code/ryzom/tools/client/ryzom_installer/src/{installwizarddialog.cpp => installdialog.cpp} (91%) rename code/ryzom/tools/client/ryzom_installer/src/{installwizarddialog.h => installdialog.h} (85%) rename code/ryzom/tools/client/ryzom_installer/src/{migratewizarddialog.cpp => migratedialog.cpp} (91%) rename code/ryzom/tools/client/ryzom_installer/src/{migratewizarddialog.h => migratedialog.h} (84%) rename code/ryzom/tools/client/ryzom_installer/src/{uninstallwizarddialog.cpp => uninstalldialog.cpp} (88%) rename code/ryzom/tools/client/ryzom_installer/src/{uninstallwizarddialog.h => uninstalldialog.h} (86%) rename code/ryzom/tools/client/ryzom_installer/ui/{installwizard.ui => installdialog.ui} (94%) rename code/ryzom/tools/client/ryzom_installer/ui/{migratewizard.ui => migratedialog.ui} (94%) rename code/ryzom/tools/client/ryzom_installer/ui/{profiles.ui => profilesdialog.ui} (100%) rename code/ryzom/tools/client/ryzom_installer/ui/{settings.ui => settingsdialog.ui} (89%) rename code/ryzom/tools/client/ryzom_installer/ui/{uninstallwizard.ui => uninstalldialog.ui} (94%) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp similarity index 91% rename from code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.cpp rename to code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index aeeff44f8..ff5bfc6c7 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdpch.h" -#include "installwizarddialog.h" +#include "installdialog.h" #include "configfile.h" #include "utils.h" @@ -26,7 +26,7 @@ #define new DEBUG_NEW #endif -CInstallWizardDialog::CInstallWizardDialog():QDialog() +CInstallDialog::CInstallDialog():QDialog() { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -82,18 +82,18 @@ CInstallWizardDialog::CInstallWizardDialog():QDialog() connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int))); } -CInstallWizardDialog::~CInstallWizardDialog() +CInstallDialog::~CInstallDialog() { } -void CInstallWizardDialog::onShowAdvancedParameters(int state) +void CInstallDialog::onShowAdvancedParameters(int state) { advancedFrame->setVisible(state != Qt::Unchecked); adjustSize(); } -void CInstallWizardDialog::onAnotherLocationBrowseButtonClicked() +void CInstallDialog::onAnotherLocationBrowseButtonClicked() { QString directory; @@ -116,7 +116,7 @@ void CInstallWizardDialog::onAnotherLocationBrowseButtonClicked() updateAnotherLocationText(); } -void CInstallWizardDialog::onDestinationBrowseButtonClicked() +void CInstallDialog::onDestinationBrowseButtonClicked() { QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); @@ -127,17 +127,17 @@ void CInstallWizardDialog::onDestinationBrowseButtonClicked() updateDestinationText(); } -void CInstallWizardDialog::updateAnotherLocationText() +void CInstallDialog::updateAnotherLocationText() { anotherLocationRadioButton->setText(tr("Another location: %1").arg(m_anotherDirectory.isEmpty() ? tr("Undefined"):m_anotherDirectory)); } -void CInstallWizardDialog::updateDestinationText() +void CInstallDialog::updateDestinationText() { destinationLabel->setText(m_dstDirectory); } -void CInstallWizardDialog::accept() +void CInstallDialog::accept() { // check free disk space qint64 freeSpace = NLMISC::CSystemInfo::availableHDSpace(m_dstDirectory.toUtf8().constData()); diff --git a/code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.h b/code/ryzom/tools/client/ryzom_installer/src/installdialog.h similarity index 85% rename from code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.h rename to code/ryzom/tools/client/ryzom_installer/src/installdialog.h index 317a24125..3497364d2 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installwizarddialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.h @@ -14,10 +14,10 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifndef INSTALLWIZARDDIALOG_H -#define INSTALLWIZARDDIALOG_H +#ifndef INSTALLDIALOG_H +#define INSTALLDIALOG_H -#include "ui_installwizard.h" +#include "ui_installdialog.h" /** * Wizard displayed at first launch, that asks user to choose source and destination directories. @@ -25,13 +25,13 @@ * \author Cedric 'Kervala' OCHS * \date 2016 */ -class CInstallWizardDialog : public QDialog, public Ui::InstallWizardDialog +class CInstallDialog : public QDialog, public Ui::InstallDialog { Q_OBJECT public: - CInstallWizardDialog(); - virtual ~CInstallWizardDialog(); + CInstallDialog(); + virtual ~CInstallDialog(); private slots: void onShowAdvancedParameters(int state); diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 53bdd623d..e66115485 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -17,9 +17,9 @@ #include "stdpch.h" #include "mainwindow.h" #include "configfile.h" -#include "migratewizarddialog.h" -#include "installwizarddialog.h" -#include "uninstallwizarddialog.h" +#include "migratedialog.h" +#include "installdialog.h" +#include "uninstalldialog.h" #include "operationdialog.h" #ifdef HAVE_CONFIG_H @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) // show uninstall wizard dialog if not in silent mode if (!parser.isSet(silentOption)) { - CUninstallWizardDialog dialog; + CUninstallDialog dialog; dialog.setSelectedComponents(components); @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) if (step == CConfigFile::ShowMigrateWizard) { - CMigrateWizardDialog dialog; + CMigrateDialog dialog; if (!dialog.exec()) return 1; @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) } else if (step == CConfigFile::ShowInstallWizard) { - CInstallWizardDialog dialog; + CInstallDialog dialog; if (!dialog.exec()) return 1; diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp index 28ae504cb..bcb7cad68 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp @@ -18,7 +18,8 @@ #include "mainwindow.h" #include "downloader.h" #include "profilesdialog.h" -#include "uninstallwizarddialog.h" +#include "settingsdialog.h" +#include "uninstalldialog.h" #include "operationdialog.h" #include "configfile.h" #include "config.h" @@ -173,7 +174,7 @@ void CMainWindow::onUninstall() } { - CUninstallWizardDialog dialog(this); + CUninstallDialog dialog(this); dialog.setSelectedComponents(components); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp similarity index 91% rename from code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.cpp rename to code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index e3f521aaa..50fa92412 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdpch.h" -#include "migratewizarddialog.h" +#include "migratedialog.h" #include "configfile.h" #include "utils.h" @@ -26,7 +26,7 @@ #define new DEBUG_NEW #endif -CMigrateWizardDialog::CMigrateWizardDialog():QDialog() +CMigrateDialog::CMigrateDialog():QDialog() { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -79,18 +79,18 @@ CMigrateWizardDialog::CMigrateWizardDialog():QDialog() connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int))); } -CMigrateWizardDialog::~CMigrateWizardDialog() +CMigrateDialog::~CMigrateDialog() { } -void CMigrateWizardDialog::onShowAdvancedParameters(int state) +void CMigrateDialog::onShowAdvancedParameters(int state) { advancedFrame->setVisible(state != Qt::Unchecked); adjustSize(); } -void CMigrateWizardDialog::onDestinationBrowseButtonClicked() +void CMigrateDialog::onDestinationBrowseButtonClicked() { QString directory = QFileDialog::getExistingDirectory(this, tr("Please choose directory where to install Ryzom")); @@ -101,12 +101,12 @@ void CMigrateWizardDialog::onDestinationBrowseButtonClicked() updateDestinationText(); } -void CMigrateWizardDialog::updateDestinationText() +void CMigrateDialog::updateDestinationText() { destinationLabel->setText(m_dstDirectory); } -void CMigrateWizardDialog::accept() +void CMigrateDialog::accept() { // check free disk space qint64 freeSpace = NLMISC::CSystemInfo::availableHDSpace(m_dstDirectory.toUtf8().constData()); diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.h b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h similarity index 84% rename from code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.h rename to code/ryzom/tools/client/ryzom_installer/src/migratedialog.h index cbc7cdd91..4e058ba99 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratewizarddialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.h @@ -14,10 +14,10 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifndef MIGRATEWIZARDDIALOG_H -#define MIGRATEWIZARDDIALOG_H +#ifndef MIGRATEDIALOG_H +#define MIGRATEDIALOG_H -#include "ui_migratewizard.h" +#include "ui_migratedialog.h" /** * Wizard displayed at first launch, that asks user to choose source and destination directories. @@ -25,13 +25,13 @@ * \author Cedric 'Kervala' OCHS * \date 2016 */ -class CMigrateWizardDialog : public QDialog, public Ui::MigrateWizardDialog +class CMigrateDialog : public QDialog, public Ui::MigrateDialog { Q_OBJECT public: - CMigrateWizardDialog(); - virtual ~CMigrateWizardDialog(); + CMigrateDialog(); + virtual ~CMigrateDialog(); private slots: void onShowAdvancedParameters(int state); diff --git a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h index 5a8c6516d..268525fd6 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/profilesdialog.h @@ -17,7 +17,7 @@ #ifndef PROFILESDIALOG_H #define PROFILESDIALOG_H -#include "ui_profiles.h" +#include "ui_profilesdialog.h" class CProfilesModel; class CServersModel; diff --git a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h index f8e3144f7..1e20532f6 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/settingsdialog.h @@ -17,7 +17,7 @@ #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H -#include "ui_settings.h" +#include "ui_settingsdialog.h" /** * Settings dialog diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp similarity index 88% rename from code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp rename to code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp index b418e8c85..aee6290f1 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdpch.h" -#include "uninstallwizarddialog.h" +#include "uninstalldialog.h" #include "configfile.h" #include "utils.h" @@ -26,7 +26,7 @@ #define new DEBUG_NEW #endif -CUninstallWizardDialog::CUninstallWizardDialog(QWidget *parent):QDialog(parent), m_installerIndex(-1) +CUninstallDialog::CUninstallDialog(QWidget *parent):QDialog(parent), m_installerIndex(-1) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -102,19 +102,19 @@ CUninstallWizardDialog::CUninstallWizardDialog(QWidget *parent):QDialog(parent), connect(this, SIGNAL(updateLayout()), SLOT(onUpdateLayout())); } -CUninstallWizardDialog::~CUninstallWizardDialog() +CUninstallDialog::~CUninstallDialog() { } -void CUninstallWizardDialog::showEvent(QShowEvent *event) +void CUninstallDialog::showEvent(QShowEvent *event) { QDialog::showEvent(event); // update size of all components sizes in a thread to not block interface - QtConcurrent::run(this, &CUninstallWizardDialog::updateSizes); + QtConcurrent::run(this, &CUninstallDialog::updateSizes); } -void CUninstallWizardDialog::setSelectedComponents(const SUninstallComponents &components) +void CUninstallDialog::setSelectedComponents(const SUninstallComponents &components) { QStandardItemModel *model = qobject_cast(componentsTreeView->model()); if (model == NULL) return; @@ -150,7 +150,7 @@ void CUninstallWizardDialog::setSelectedComponents(const SUninstallComponents &c if (item) item->setCheckState(components.installer ? Qt::Checked : Qt::Unchecked); } -SUninstallComponents CUninstallWizardDialog::getSelectedCompenents() const +SUninstallComponents CUninstallDialog::getSelectedCompenents() const { SUninstallComponents res; @@ -190,17 +190,17 @@ SUninstallComponents CUninstallWizardDialog::getSelectedCompenents() const return res; } -void CUninstallWizardDialog::accept() +void CUninstallDialog::accept() { QDialog::accept(); } -void CUninstallWizardDialog::onItemChanged(QStandardItem * /* item */) +void CUninstallDialog::onItemChanged(QStandardItem * /* item */) { updateButtons(); } -void CUninstallWizardDialog::onUpdateSize(int row, const QString &text) +void CUninstallDialog::onUpdateSize(int row, const QString &text) { QStandardItemModel *model = qobject_cast(componentsTreeView->model()); if (model == NULL) return; @@ -210,14 +210,14 @@ void CUninstallWizardDialog::onUpdateSize(int row, const QString &text) model->setItem(row, 1, item); } -void CUninstallWizardDialog::onUpdateLayout() +void CUninstallDialog::onUpdateLayout() { componentsTreeView->resizeColumnToContents(1); updateButtons(); } -void CUninstallWizardDialog::updateSizes() +void CUninstallDialog::updateSizes() { CConfigFile *config = CConfigFile::getInstance(); @@ -252,7 +252,7 @@ void CUninstallWizardDialog::updateSizes() emit updateLayout(); } -void CUninstallWizardDialog::updateButtons() +void CUninstallDialog::updateButtons() { QStandardItemModel *model = qobject_cast(componentsTreeView->model()); if (model == NULL) return; diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h b/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h similarity index 86% rename from code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h rename to code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h index 28c387831..d9bea4449 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/uninstalldialog.h @@ -14,10 +14,10 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifndef UNINSTALLWIZARDDIALOG_H -#define UNINSTALLWIZARDDIALOG_H +#ifndef UNINSTALLDIALOG_H +#define UNINSTALLDIALOG_H -#include "ui_uninstallwizard.h" +#include "ui_uninstalldialog.h" #include "operation.h" /** @@ -27,13 +27,13 @@ * \author Cedric 'Kervala' OCHS * \date 2016 */ -class CUninstallWizardDialog : public QDialog, public Ui::UninstallWizardDialog +class CUninstallDialog : public QDialog, public Ui::UninstallDialog { Q_OBJECT public: - CUninstallWizardDialog(QWidget *parent = NULL); - virtual ~CUninstallWizardDialog(); + CUninstallDialog(QWidget *parent = NULL); + virtual ~CUninstallDialog(); void setSelectedComponents(const SUninstallComponents &components); SUninstallComponents getSelectedCompenents() const; diff --git a/code/ryzom/tools/client/ryzom_installer/ui/installwizard.ui b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui similarity index 94% rename from code/ryzom/tools/client/ryzom_installer/ui/installwizard.ui rename to code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui index 07b0c7520..b8f03b356 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/installwizard.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/installdialog.ui @@ -1,7 +1,7 @@ - InstallWizardDialog - + InstallDialog + Qt::ApplicationModal @@ -219,7 +219,7 @@ Just follow the different steps and make your choice between the different propo buttonBox accepted() - InstallWizardDialog + InstallDialog accept() @@ -235,7 +235,7 @@ Just follow the different steps and make your choice between the different propo buttonBox rejected() - InstallWizardDialog + InstallDialog reject() diff --git a/code/ryzom/tools/client/ryzom_installer/ui/migratewizard.ui b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui similarity index 94% rename from code/ryzom/tools/client/ryzom_installer/ui/migratewizard.ui rename to code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui index 376d90c40..e63c8eeb3 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/migratewizard.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/migratedialog.ui @@ -1,7 +1,7 @@ - MigrateWizardDialog - + MigrateDialog + Qt::ApplicationModal diff --git a/code/ryzom/tools/client/ryzom_installer/ui/profiles.ui b/code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui similarity index 100% rename from code/ryzom/tools/client/ryzom_installer/ui/profiles.ui rename to code/ryzom/tools/client/ryzom_installer/ui/profilesdialog.ui diff --git a/code/ryzom/tools/client/ryzom_installer/ui/settings.ui b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui similarity index 89% rename from code/ryzom/tools/client/ryzom_installer/ui/settings.ui rename to code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui index 1ab8f32af..4887ced56 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/settings.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/settingsdialog.ui @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ - + Browse... @@ -55,7 +55,7 @@ - + Use 64 bits client diff --git a/code/ryzom/tools/client/ryzom_installer/ui/uninstallwizard.ui b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui similarity index 94% rename from code/ryzom/tools/client/ryzom_installer/ui/uninstallwizard.ui rename to code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui index 2222da8eb..3a9570262 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/uninstallwizard.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/uninstalldialog.ui @@ -1,7 +1,7 @@ - UninstallWizardDialog - + UninstallDialog + Qt::ApplicationModal