From f24af9b9aea23cac811e11014b38e435b7c1a818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 10 Sep 2010 11:50:38 +0200
Subject: The RSS widget and the bookmark widget are now more consistent (they
 have the same look and behavior)

---
 src/urlbar/bookmarkwidget.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/urlbar/bookmarkwidget.cpp')

diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index ca04cd4f..59df85a1 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -64,10 +64,7 @@ BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
     // Title
     QVBoxLayout *vLayout = new QVBoxLayout(this);
     QLabel *bookmarkInfo = new QLabel(this);
-    bookmarkInfo->setText(i18n("Edit this Bookmark"));
-    QFont font;
-    font.setPointSize(font.pointSize() + 2);
-    bookmarkInfo->setFont(font);
+    bookmarkInfo->setText(i18n("<h4>Edit this Bookmark</h4>"));
     bookmarkInfo->setAlignment(Qt::AlignCenter);
     vLayout->addWidget(bookmarkInfo);
 
@@ -113,7 +110,9 @@ BookmarkWidget::~BookmarkWidget()
 
 void BookmarkWidget::showAt(const QPoint &pos)
 {
-    QPoint p(pos.x()-350, pos.y()+12);
+    adjustSize();
+
+    QPoint p(pos.x()-width(), pos.y()+10);
     move(p);
     show();
 }
@@ -126,12 +125,6 @@ void BookmarkWidget::accept()
         m_bookmark->setFullText(m_name->text());
         Application::bookmarkProvider()->bookmarkManager()->emitChanged();
     }
-    reject();
-}
-
-
-void BookmarkWidget::reject()
-{
     close();
 }
 
@@ -139,5 +132,5 @@ void BookmarkWidget::reject()
 void BookmarkWidget::removeBookmark()
 {
     Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(*m_bookmark);
-    reject();
+    close();
 }
-- 
cgit v1.2.1