From 14d06fe84ca7b4676d855d1bde803603952815ec Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 3 Jan 2018 17:52:32 +0100 Subject: [PATCH] fix typo and improve whitespaces --- src/Mod/PartDesign/Gui/WorkflowManager.cpp | 10 ++++++---- src/Mod/PartDesign/Gui/WorkflowManager.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.cpp b/src/Mod/PartDesign/Gui/WorkflowManager.cpp index 974b6244b7..79b005c0ad 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.cpp +++ b/src/Mod/PartDesign/Gui/WorkflowManager.cpp @@ -127,7 +127,7 @@ Workflow WorkflowManager::getWorkflowForDocument( App::Document *doc) { } } -Workflow WorkflowManager::determinWorkflow( App::Document *doc) { +Workflow WorkflowManager::determineWorkflow(App::Document *doc) { Workflow rv = getWorkflowForDocument (doc); if (rv != Workflow::Undetermined) { @@ -138,14 +138,15 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) { // Guess the workflow again rv = guessWorkflow (doc); if (rv != Workflow::Modern) { - QMessageBox msgBox; + QMessageBox msgBox(Gui::getMainWindow()); if ( rv == Workflow::Legacy ) { // legacy messages msgBox.setText( QObject::tr( "The document \"%1\" you are editing was designed with an old version of " "PartDesign workbench." ).arg( QString::fromStdString ( doc->getName()) ) ); msgBox.setInformativeText ( QObject::tr( "Do you want to migrate in order to use modern PartDesign features?" ) ); - } else { // The document is already in the middle of migration + } + else { // The document is already in the middle of migration msgBox.setText( QObject::tr( "The document \"%1\" seems to be either in the middle of" " the migration process from legacy PartDesign or have a slightly broken structure." ).arg( QString::fromStdString ( doc->getName()) ) ); @@ -162,6 +163,7 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) { QPushButton * yesBtn = msgBox.addButton ( QMessageBox::Yes ); QPushButton * manuallyBtn = msgBox.addButton ( QObject::tr ( "Migrate manually" ), QMessageBox::YesRole ); + // If it is already a document in the middle of the migration the user shouldn't refuse to migrate if ( rv != Workflow::Undetermined ) { msgBox.addButton ( QMessageBox::No ); @@ -187,7 +189,7 @@ Workflow WorkflowManager::determinWorkflow( App::Document *doc) { return rv; } -void WorkflowManager::forceWorkflow( const App::Document *doc, Workflow wf) { +void WorkflowManager::forceWorkflow(const App::Document *doc, Workflow wf) { dwMap[ doc ] = wf; } diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.h b/src/Mod/PartDesign/Gui/WorkflowManager.h index baf5bfd415..291cbca06d 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.h +++ b/src/Mod/PartDesign/Gui/WorkflowManager.h @@ -65,7 +65,7 @@ public: * If the user agrees the file will be migrated and the workflow will be set as modern. * If the user refuses to migrate use the old workflow. */ - Workflow determinWorkflow(App::Document *doc); + Workflow determineWorkflow(App::Document *doc); /** * Force the desired workflow in document @@ -112,7 +112,7 @@ inline bool assureLegacyWorkflow (App::Document *doc) { /// Assures that workflow of the given document is determined and returns true if it is Workflow::Modern inline bool assureModernWorkflow (App::Document *doc) { - return WorkflowManager::instance()->determinWorkflow( doc ) == Workflow::Modern ; + return WorkflowManager::instance()->determineWorkflow( doc ) == Workflow::Modern ; } /// Returns true if the workflow of the given document is Workflow::Legacy