diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index ab6007b9e..31c12f872 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -199,7 +199,9 @@ void COperationDialog::processMigrateNextStep() void COperationDialog::processUpdateProfilesNextStep() { - // TODO: implement + // TODO: check all servers are downloaded + // TODO: delete profiles directories that are not used anymore + // TODO: create shortcuts } void COperationDialog::processInstallNextStep() diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp index 4b3745f1b..7dc4d29ff 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.cpp @@ -76,6 +76,7 @@ CUninstallWizardDialog::CUninstallWizardDialog(QWidget *parent):QDialog(parent), } + // installer m_installerIndex = model->rowCount(); item = new QStandardItem(tr("Ryzom Installer")); @@ -85,6 +86,7 @@ CUninstallWizardDialog::CUninstallWizardDialog(QWidget *parent):QDialog(parent), componentsTreeView->setModel(model); componentsTreeView->resizeColumnToContents(0); + // resize layout depending on content and constraints adjustSize(); // click signals @@ -105,6 +107,7 @@ void CUninstallWizardDialog::showEvent(QShowEvent *event) { QDialog::showEvent(event); + // update size of all components sizes in a thread to not block interface QtConcurrent::run(this, &CUninstallWizardDialog::updateSizes); } @@ -199,6 +202,7 @@ void CUninstallWizardDialog::onUpdateSize(int row, const QString &text) QStandardItemModel *model = qobject_cast(componentsTreeView->model()); if (model == NULL) return; + // set size for a component QStandardItem *item = new QStandardItem(text); model->setItem(row, 1, item); } @@ -253,11 +257,11 @@ void CUninstallWizardDialog::updateButtons() int checkedCount = 0; - // Uninstall button should be enabled only if at least one component is selected for (int i = 0; i < model->rowCount(); ++i) { if (model->item(i)->checkState() == Qt::Checked) ++checkedCount; } + // Uninstall button should be enabled only if at least one component is checked uninstallButton->setEnabled(checkedCount > 0); } diff --git a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h b/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h index 286ba4085..28c387831 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/uninstallwizarddialog.h @@ -21,7 +21,8 @@ #include "operation.h" /** - * Wizard displayed at first launch, that asks user to choose source and destination directories. + * Wizard displayed when uninstalling components from Add/Remove Program under Windows + * or when user clicks on Uninstall in main menu. * * \author Cedric 'Kervala' OCHS * \date 2016