From b2a76f5265dd177f30bb5eda83fb06b39ddf0b5c Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 27 Aug 2010 14:38:41 +0200 Subject: Fix broken bookmark filter. --- tools/assistant/tools/assistant/bookmarkmanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp index 65888fe..eb5a37a 100644 --- a/tools/assistant/tools/assistant/bookmarkmanager.cpp +++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp @@ -158,6 +158,8 @@ BookmarkManager::BookmarkManager() : typeAndSearch(false) , bookmarkMenu(0) , bookmarkModel(new BookmarkModel) + , bookmarkFilterModel(0) + , typeAndSearchModel(0) , bookmarkWidget(new BookmarkWidget) , bookmarkTreeView(new BookmarkTreeView) , bookmarkManagerWidget(0) @@ -316,11 +318,13 @@ void BookmarkManager::setupFinished() bookmarkTreeView->header()->setVisible(false); bookmarkTreeView->header()->setStretchLastSection(true); - bookmarkFilterModel = new BookmarkFilterModel(this); + if (!bookmarkFilterModel) + bookmarkFilterModel = new BookmarkFilterModel(this); bookmarkFilterModel->setSourceModel(bookmarkModel); bookmarkFilterModel->filterBookmarkFolders(); - typeAndSearchModel = new QSortFilterProxyModel(this); + if (!typeAndSearchModel) + typeAndSearchModel = new QSortFilterProxyModel(this); typeAndSearchModel->setDynamicSortFilter(true); typeAndSearchModel->setSourceModel(bookmarkFilterModel); } -- cgit v0.12 From d090088d015974184ba2069972487274b2987f87 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Aug 2010 12:16:30 +0200 Subject: Assistant: Fix race condition on start-up. On first start-up (empty settings), the internal documentation was not found. Reviewed-by: kh1 --- tools/assistant/tools/assistant/mainwindow.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index b27d5a1..a47a501 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -118,6 +118,13 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) HelpEngineWrapper &helpEngineWrapper = HelpEngineWrapper::instance(collectionFile); + if (!initHelpDB()) { + qDebug("Fatal error: Help engine initialization failed. " + "Error message was: %s\nAssistant will now exit.", + qPrintable(HelpEngineWrapper::instance().error())); + std::exit(1); + } + m_centralWidget = new CentralWidget(this); setCentralWidget(m_centralWidget); @@ -157,7 +164,6 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) connect(m_centralWidget, SIGNAL(addBookmark(QString, QString)), bookMarkManager, SLOT(addBookmark(QString, QString))); -#if 0 connect(bookMarkManager, SIGNAL(escapePressed()), this, SLOT(activateCurrentCentralWidgetTab())); connect(bookMarkManager, SIGNAL(setSource(QUrl)), m_centralWidget, @@ -168,7 +174,6 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) QHelpSearchEngine *searchEngine = helpEngineWrapper.searchEngine(); connect(searchEngine, SIGNAL(indexingStarted()), this, SLOT(indexingStarted())); connect(searchEngine, SIGNAL(indexingFinished()), this, SLOT(indexingFinished())); -#endif QString defWindowTitle = tr("Qt Assistant"); setWindowTitle(defWindowTitle); @@ -177,13 +182,6 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) statusBar()->show(); m_centralWidget->connectTabBar(); - if (!initHelpDB()) { - qDebug("Fatal error: Help engine initialization failed. " - "Error message was: %s\nAssistant will now exit.", - qPrintable(HelpEngineWrapper::instance().error())); - std::exit(1); - } - setupFilterToolbar(); setupAddressToolbar(); -- cgit v0.12