feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Decouple BookmarksWidget from OpenPageManager.

Browse Source 
Connect via signal to make it possible to build the shared help
code as a static library.

Change-Id: If4e9c8ee43eb32e08167c7642f52214643de6d5c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-03 15:05:03 +02:00
parent 154364bab7
commit b7856be521
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/helpplugin.cpp
View File

@@ -472,6 +472,8 @@ void HelpPlugin::setupUi()
m_bookmarkItem = new Core::SideBarItem(bookmarkWidget, QLatin1String(SB_BOOKMARKS)); m_bookmarkItem = new Core::SideBarItem(bookmarkWidget, QLatin1String(SB_BOOKMARKS));
connect(bookmarkWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget, connect(bookmarkWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget,
SLOT(setSource(QUrl))); SLOT(setSource(QUrl)));
connect(bookmarkWidget, SIGNAL(createPage(QUrl,bool)), &OpenPagesManager::instance(),
SLOT(createPage(QUrl,bool)));
shortcut = new QShortcut(m_splitter); shortcut = new QShortcut(m_splitter);
shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode")); shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode"));

6
src/shared/help/bookmarkmanager.cpp
View File

@@ -32,9 +32,7 @@
#include "bookmarkmanager.h" #include "bookmarkmanager.h"
#include "centralwidget.h"
#include "localhelpmanager.h" #include "localhelpmanager.h"
#include "openpagesmanager.h"
#include <utils/filterlineedit.h> #include <utils/filterlineedit.h>
#include <utils/styledbar.h> #include <utils/styledbar.h>
@@ -406,7 +404,7 @@ void BookmarkWidget::customContextMenuRequested(const QPoint &point)
emit linkActivated(data); emit linkActivated(data);
} }
else if (pickedAction == showItemNewTab) { else if (pickedAction == showItemNewTab) {
OpenPagesManager::instance().createPage(data); emit createPage(QUrl(data), false);
} }
else if (pickedAction == removeItem) { else if (pickedAction == removeItem) {
bookmarkManager->removeBookmarkItem(treeView, bookmarkManager->removeBookmarkItem(treeView,
@@ -569,7 +567,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
|| (me->button() == Qt::MidButton)) { || (me->button() == Qt::MidButton)) {
QString data = index.data(Qt::UserRole + 10).toString(); QString data = index.data(Qt::UserRole + 10).toString();
if (!data.isEmpty() && data != QLatin1String("Folder")) if (!data.isEmpty() && data != QLatin1String("Folder"))
OpenPagesManager::instance().createPage(data); emit createPage(QUrl(data), false);
} }
} }
} }

1
src/shared/help/bookmarkmanager.h
View File

@@ -119,6 +119,7 @@ public:
signals: signals:
void addBookmark(); void addBookmark();
void linkActivated(const QUrl &url); void linkActivated(const QUrl &url);
void createPage(const QUrl &url, bool fromSearch);
private slots: private slots:
void removeClicked(); void removeClicked();