# # # patch "NEWS" # from [650c6f31c4d3d4348cec5b8d5e15bf56a7164d31] # to [1e04804ab9e317a275c1d76b5bbbe22e1126aae7] # # patch "src/view/DatabaseWindow.cpp" # from [8b79e24eafcad06564f61974b3b1049304c9f792] # to [37323d919fecd0fda6c5266a8af16203b88edf04] # # patch "src/view/DatabaseWindow.h" # from [aea7b282e9aa43a7d82f2fd9ead8e094a4f56621] # to [619c1ab06edb685d2db3381db9ea5bb31481c546] # # patch "src/view/WorkspaceWindow.cpp" # from [9ae0a5ea1f3095ecc8824221b1d1523956942144] # to [c43d9bb26897d081b01a429d3329c244143abb38] # ============================================================ --- NEWS 650c6f31c4d3d4348cec5b8d5e15bf56a7164d31 +++ NEWS 1e04804ab9e317a275c1d76b5bbbe22e1126aae7 @@ -1,3 +1,7 @@ +????-??-?? (0.9) + - bugfix: in workspace mode the database variables panel has not been + initialized, thus guitone crashed when "update" was clicked + 2008-05-25 (0.8) - starting from this version (0.8) guitone is distributed under the terms of the GNU General Public License Version 3 ============================================================ --- src/view/DatabaseWindow.cpp 8b79e24eafcad06564f61974b3b1049304c9f792 +++ src/view/DatabaseWindow.cpp 37323d919fecd0fda6c5266a8af16203b88edf04 @@ -55,11 +55,6 @@ void DatabaseWindow::init() if (!dialogManager) { dialogManager = new DatabaseDialogManager(this); - - connect( - this, SIGNAL(databaseSelected(const DatabaseFile &)), - dialogManager, SLOT(init(const DatabaseFile &)) - ); } connect( @@ -84,11 +79,6 @@ void DatabaseWindow::init() databaseVariables = new DatabaseVariables(this); - connect( - this, SIGNAL(databaseSelected(const DatabaseFile &)), - databaseVariables, SLOT(setDatabaseFile(const DatabaseFile &)) - ); - dynamic_cast(menuBar) ->addDockWidgetAction(databaseVariables->toggleViewAction()); @@ -158,6 +148,7 @@ void DatabaseWindow::load(const QString Settings::addItemToList("RecentDatabaseList", path, 5); - emit databaseSelected(databaseFile); + reinterpret_cast(dialogManager)->init(databaseFile); + databaseVariables->setDatabaseFile(databaseFile); } ============================================================ --- src/view/DatabaseWindow.h aea7b282e9aa43a7d82f2fd9ead8e094a4f56621 +++ src/view/DatabaseWindow.h 619c1ab06edb685d2db3381db9ea5bb31481c546 @@ -37,9 +37,6 @@ public: //! throws GuitoneException virtual void load(const QString &); -signals: - void databaseSelected(const DatabaseFile &); - protected: DatabaseFile databaseFile; ============================================================ --- src/view/WorkspaceWindow.cpp 9ae0a5ea1f3095ecc8824221b1d1523956942144 +++ src/view/WorkspaceWindow.cpp c43d9bb26897d081b01a429d3329c244143abb38 @@ -292,6 +292,9 @@ void WorkspaceWindow::load(const QString invWatcher->setWorkspacePath(workspacePath); attrModel->setWorkspacePath(workspacePath); + DatabaseFile dbfile = APP->manager()->getDatabaseFilePath(workspacePath); + databaseVariables->setDatabaseFile(dbfile); + // read the inventory invModel->refresh(); }