diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-10 01:36:28 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-10 01:36:28 +0200 |
| commit | cf19aef2c47b4c851f20bbf7a3500dee178c78e3 (patch) | |
| tree | 52eb068f1e5439984d691e259dcf95399a409bad /src/urlbar | |
| parent | rekonq 0.5.87 (diff) | |
| parent | Only show the bookmark widget if the page is already bookmarked. (diff) | |
| download | rekonq-cf19aef2c47b4c851f20bbf7a3500dee178c78e3.tar.xz | |
Merge commit 'refs/merge-requests/2294' of git://gitorious.org/rekonq/mainline into m2294
Diffstat (limited to 'src/urlbar')
| -rw-r--r-- | src/urlbar/urlbar.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 7206b5e1..c8aa43ff 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -112,7 +112,7 @@ UrlBar::UrlBar(QWidget *parent) connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished())); connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons())); connect(_tab->view(), SIGNAL(iconChanged()), this, SLOT(refreshFavicon())); - + // bookmark icon connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(const QString &, const QString &)), this, SLOT(onBookmarksChanged())); @@ -264,7 +264,7 @@ void UrlBar::keyPressEvent(QKeyEvent *event) host += append; url.setHost(host); } - + // now, load it! activated(url); } @@ -360,9 +360,11 @@ void UrlBar::showBookmarkInfo(const QPoint &pos) { bookmark = Application::bookmarkProvider()->bookmarkOwner()->bookmarkCurrentPage(); } - - BookmarkWidget *widget = new BookmarkWidget(bookmark, window()); - widget->showAt(pos); + else + { + BookmarkWidget *widget = new BookmarkWidget(bookmark, window()); + widget->showAt(pos); + } } |