@@ -919,14 +919,22 @@ BookmarkToolButton::BookmarkToolButton(QUrl url, QWidget *parent) : QToolButton(parent) , m_url(url) { - connect(this, SIGNAL(clicked()), this, SLOT(openBookmark())); } void BookmarkToolButton::mouseReleaseEvent(QMouseEvent *event) { QToolButton::mouseReleaseEvent(event); - if (event->button() == Qt::MidButton) - emit openBookmark(url(), TabWidget::NewTab, text()); + if (hitButton(event->pos())) { + if (event->button() == Qt::MidButton) + emit openBookmark(url(), TabWidget::NewTab, text()); + if (event->button() == Qt::LeftButton) { + TabWidget::Tab openLocation = + (event->modifiers() & Qt::ControlModifier) + ? TabWidget::NewTab + : TabWidget::CurrentTab; + emit openBookmark(url(), openLocation, text()); + } + } } QUrl BookmarkToolButton::url() const @@ -934,11 +942,6 @@ QUrl BookmarkToolButton::url() const return m_url; } -void BookmarkToolButton::openBookmark() -{ - emit openBookmark(url(), TabWidget::CurrentTab, text()); -} - BookmarksToolBar::BookmarksToolBar(BookmarksModel *model, QWidget *parent) : QToolBar(tr("Bookmark"), parent) , m_bookmarksModel(model) src/bookmarks.cpp @@ -329,9 +329,6 @@ public: protected: void mouseReleaseEvent(QMouseEvent *event); -private slots: - void openBookmark(); - private: QUrl m_url; src/bookmarks.h b5c520901956effe9c425d55da49c3d77d87378f Benjamin C Meyer ben@meyerhome.net http://github.com/Arora/arora/commit/c0fb8a98c3cd3f85c243d2de78c93e11addb44f5 c0fb8a98c3cd3f85c243d2de78c93e11addb44f5 2008-08-01T12:11:45-07:00 2008-08-01T10:37:03-07:00 When you ctrl-click on a bookmark item in the bookmark toolbar open it in a new tab Issue: 82 27d1ff202868216ff35645ea92a849bca2e3a000 Benjamin C Meyer ben@meyerhome.net