Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Different methods to process operations types

Browse source
This commit is contained in:
kervala 2016-06-14 19:53:44 +02:00
parent e7dd9a1ed6
commit 785ce84637
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -146,7 +146,7 @@ int main(int argc, char *argv[])
if (!dialog.exec()) return 1; if (!dialog.exec()) return 1;
step = config.getNextStep(); step = config.getInstallNextStep();
} }
else if (step == ShowInstallWizard) else if (step == ShowInstallWizard)
{ {
@ -154,7 +154,7 @@ int main(int argc, char *argv[])
if (!dialog.exec()) return 1; if (!dialog.exec()) return 1;
step = config.getNextStep(); step = config.getInstallNextStep();
} }
if (step != Done) if (step != Done)
@ -164,7 +164,7 @@ int main(int argc, char *argv[])
if (!dialog.exec()) return 1; if (!dialog.exec()) return 1;
step = config.getNextStep(); step = config.getInstallNextStep();
} }
CMainWindow mainWindow; CMainWindow mainWindow;

11
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -91,17 +91,14 @@ void COperationDialog::processNextStep()
switch (m_operation) switch (m_operation)
{ {
case OperationMigrate: case OperationMigrate:
processMigrateNextStep(); case OperationInstall:
processInstallNextStep();
break; break;
case OperationUpdateProfiles: case OperationUpdateProfiles:
processUpdateProfilesNextStep(); processUpdateProfilesNextStep();
break; break;
case OperationInstall:
processInstallNextStep();
break;
case OperationUninstall: case OperationUninstall:
processUninstallNextStep(); processUninstallNextStep();
break; break;
@ -111,7 +108,7 @@ void COperationDialog::processNextStep()
} }
} }
void COperationDialog::processMigrateNextStep() void COperationDialog::processInstallNextStep()
{ {
CConfigFile *config = CConfigFile::getInstance(); CConfigFile *config = CConfigFile::getInstance();
@ -122,7 +119,7 @@ void COperationDialog::processMigrateNextStep()
const CProfile &configuration = config->getProfile(); const CProfile &configuration = config->getProfile();
// long operations are done in a thread // long operations are done in a thread
CConfigFile::InstallationStep step = config->getNextStep(); OperationStep step = config->getInstallNextStep();
switch(step) switch(step)
{ {

2
code/ryzom/tools/client/ryzom_installer/src/operationdialog.h
View file

@ -83,8 +83,6 @@ protected:
void closeEvent(QCloseEvent *e); void closeEvent(QCloseEvent *e);
void processNextStep(); void processNextStep();
void processMigrateNextStep();
void processUpdateProfilesNextStep();
void processInstallNextStep(); void processInstallNextStep();
void processUninstallNextStep(); void processUninstallNextStep();
void processUpdateProfilesNextStep(); void processUpdateProfilesNextStep();