# # # patch "src/view/DatabaseWindow.cpp" # from [e9da975bc114dd040d49bcffcca3632aabe9ecd3] # to [67a1901f933b8510844ca45b92c25955396f0091] # # patch "src/view/DatabaseWindow.h" # from [f15b316923055a158361b049bf82e4f9a6580ffb] # to [1b4b76c38099becf797509ae2471004b770d23c7] # # patch "src/view/MainWindow.h" # from [78c7c12c18b07825e2ef8955d6689ef69d02d67f] # to [127ffbdb4f2cb9acdff89e965dc62bd8ac6496c8] # # patch "src/view/WorkspaceWindow.cpp" # from [9453c2f9657078017bfa06650a50c5f2c980a9f1] # to [aec9b6e8177d8931b6795c359bc4a4060fbce65f] # # patch "src/view/WorkspaceWindow.h" # from [9f25aaa1b7dabd9f27b282231971212351c12b28] # to [9162df49506291a252d81490767df79e7050b859] # ============================================================ --- src/view/DatabaseWindow.cpp e9da975bc114dd040d49bcffcca3632aabe9ecd3 +++ src/view/DatabaseWindow.cpp 67a1901f933b8510844ca45b92c25955396f0091 @@ -69,25 +69,10 @@ void DatabaseWindow::init() setLayout(layout); } -bool DatabaseWindow::load(const QString & path) +void DatabaseWindow::load(const QString & path) { - try - { - APP->manager()->getThreadForDatabase(path); - } - catch (GuitoneException e) - { - QMessageBox::critical( - this, - tr("Failed to load database"), - tr("The database could not be loaded:\n%1").arg(e), - QMessageBox::Ok - ); + APP->manager()->getThreadForDatabase(path); - Settings::removeItemFromList("RecentDatabaseList", path); - return false; - } - databaseFile = path; // initialize the dialog manager @@ -99,9 +84,5 @@ bool DatabaseWindow::load(const QString setWindowTitle( tr("%1 - database mode - guitone").arg(fi.fileName()) ); - - Settings::addItemToList("RecentDatabaseList", path, 5); - - return true; } ============================================================ --- src/view/DatabaseWindow.h f15b316923055a158361b049bf82e4f9a6580ffb +++ src/view/DatabaseWindow.h 1b4b76c38099becf797509ae2471004b770d23c7 @@ -35,7 +35,8 @@ public: ~DatabaseWindow(); virtual void init(); - virtual bool load(const QString &); + //! throws GuitoneException + virtual void load(const QString &); protected: DatabaseFile databaseFile; ============================================================ --- src/view/MainWindow.h 78c7c12c18b07825e2ef8955d6689ef69d02d67f +++ src/view/MainWindow.h 127ffbdb4f2cb9acdff89e965dc62bd8ac6496c8 @@ -32,7 +32,7 @@ public: MainWindow(); ~MainWindow(); virtual void init(); - virtual bool load(const QString &) = 0; + virtual void load(const QString &) = 0; signals: void windowClosed(MainWindow *); ============================================================ --- src/view/WorkspaceWindow.cpp 9453c2f9657078017bfa06650a50c5f2c980a9f1 +++ src/view/WorkspaceWindow.cpp aec9b6e8177d8931b6795c359bc4a4060fbce65f @@ -193,27 +193,11 @@ void WorkspaceWindow::init() attrView->setModel(attrModel); } -bool WorkspaceWindow::load(const QString & path) +void WorkspaceWindow::load(const QString & path) { - try - { - workspacePath = MonotoneManager::normalizeWorkspacePath(path); - APP->manager()->getThreadForWorkspace(workspacePath); - } - catch (GuitoneException e) - { - QMessageBox::critical( - this, - tr("Failed to load workspace"), - tr("The workspace could not be loaded:\n%1").arg(e), - QMessageBox::Ok - ); + workspacePath = MonotoneManager::normalizeWorkspacePath(path); + APP->manager()->getThreadForWorkspace(workspacePath); - // remove the workspace if it was recorded as recent workspace - Settings::removeItemFromList("RecentWorkspaceList", workspacePath); - return false; - } - // read the inventory invModel->readInventory(); @@ -224,10 +208,6 @@ bool WorkspaceWindow::load(const QString tr("%1 - workspace mode - guitone"). arg(MonotoneUtil::getBranchNameShort(workspacePath)) ); - - Settings::addItemToList("RecentWorkspaceList", workspacePath, 5); - - return true; } void WorkspaceWindow::openFile(const QString & filePath) ============================================================ --- src/view/WorkspaceWindow.h 9f25aaa1b7dabd9f27b282231971212351c12b28 +++ src/view/WorkspaceWindow.h 9162df49506291a252d81490767df79e7050b859 @@ -39,7 +39,8 @@ public: ~WorkspaceWindow(); virtual void init(); - virtual bool load(const QString &); + //! throws GuitoneException + virtual void load(const QString &); protected: WorkspacePath workspacePath;