Merge commit 'refs/merge-requests/203' of git://gitorious.org/rekonq/mainline into m203_2

4 files changed, 70 insertions, 114 deletions

diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index cb711723..409f1468 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -35,124 +35,105 @@
 
 // KDE Includes
 #include <KLocalizedString>
+#include <KIcon>
 #include <KLineEdit>
-#include <KMessageBox>
 
 // Qt Includes
-#include <QtGui/QFormLayout>
 #include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 
 
-
 BookmarkWidget::BookmarkWidget(const KBookmark &bookmark, QWidget *parent)
-        : QFrame(parent, Qt::Popup)
-        , m_bookmark(bookmark)
+        : QMenu(parent)
+        , m_bookmark(new KBookmark(bookmark))
 {
     setAttribute(Qt::WA_DeleteOnClose);
     setFixedWidth(350);
-    setFrameStyle(QFrame::Panel);
 
     QFormLayout *layout = new QFormLayout(this);
-    setLayout(layout);
-
-    QHBoxLayout *hLayout = new QHBoxLayout();
 
+    // Bookmark icon
+    QHBoxLayout *hLayout = new QHBoxLayout(this);
     QLabel *bookmarkIcon = new QLabel(this);
     bookmarkIcon->setPixmap(KIcon("bookmarks").pixmap(32, 32));
-    hLayout->addWidget(bookmarkIcon);
     hLayout->setSpacing(10);
+    hLayout->addWidget(bookmarkIcon);
 
-    QVBoxLayout *vLayout = new QVBoxLayout();
-
+    // 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->setAlignment(Qt::AlignCenter);
     vLayout->addWidget(bookmarkInfo);
 
+    // Remove button
     QPushButton *removeButton = new QPushButton(this);
     removeButton->setText(i18n("Remove this Bookmark"));
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeBookmark()));
-
     vLayout->addWidget(removeButton);
+
     hLayout->addLayout(vLayout);
     layout->addItem(hLayout);
 
-
+    // Bookmark name
     QLabel *nameLabel = new QLabel(this);
     nameLabel->setText(i18n("Name:"));
-
     m_name = new KLineEdit(this);
-    if (m_bookmark.isNull())
+    if (m_bookmark->isNull())
     {
         m_name->setEnabled(false);
     }
     else
     {
-        m_name->setText(m_bookmark.text());
+        m_name->setText(m_bookmark->text());
         m_name->setFocus();
     }
-
     layout->addRow(nameLabel, m_name);
 
-    QLabel *urlLabel = new QLabel(this);
-    urlLabel->setText("URL:");
-
-    KLineEdit *url = new KLineEdit(this);
-    url->setText(m_bookmark.url().url());
-    url->setEnabled(false);
-
-    layout->addRow(urlLabel, url);
-
+    // Ok & Cancel buttons
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
-    buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("Done"));
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
     layout->addWidget(buttonBox);
+
+    setLayout(layout);
 }
 
 
 BookmarkWidget::~BookmarkWidget()
 {
-    delete m_name;
+    delete m_bookmark;
 }
 
 
-void BookmarkWidget::accept()
+void BookmarkWidget::showAt(const QPoint &pos)
 {
-    if (!m_bookmark.isNull() && m_name->text() != m_bookmark.fullText())
-    {
-        m_bookmark.setFullText(m_name->text());
-        Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-    }
-    reject();
-}
-
+    adjustSize();
 
-void BookmarkWidget::reject()
-{
-    close();
-    deleteLater();
+    QPoint p(pos.x()-width(), pos.y()+10);
+    move(p);
+    show();
 }
 
 
-void BookmarkWidget::showAt(const QPoint &pos)
+void BookmarkWidget::accept()
 {
-    QPoint p;
-    p.setX(pos.x() - 350);
-    p.setY(pos.y() + 12);
-    move(p);
-    show();
+    if (!m_bookmark->isNull() && m_name->text() != m_bookmark->fullText())
+    {
+        m_bookmark->setFullText(m_name->text());
+        Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+    }
+    close();
 }
 
 
 void BookmarkWidget::removeBookmark()
 {
-    Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(m_bookmark);
-    reject();
+    Application::bookmarkProvider()->bookmarkOwner()->deleteBookmark(*m_bookmark);
+    close();
 }
diff --git a/src/urlbar/bookmarkwidget.h b/src/urlbar/bookmarkwidget.h
index c3c15e18..e07dac24 100644
--- a/src/urlbar/bookmarkwidget.h
+++ b/src/urlbar/bookmarkwidget.h
@@ -27,37 +27,31 @@
 #ifndef BOOKMARKWIDGET_H
 #define BOOKMARKWIDGET_H
 
-// Rekonq Includes
-#include "rekonq_defines.h"
-
-// KDE Includes
-#include <KUrl>
-#include <KBookmark>
-#include <KLineEdit>
-
 // Qt Includes
-#include <QtGui/QFrame>
+#include <QtGui/QMenu>
 
+// Forward Declarations
+class KBookmark;
+class KLineEdit;
 
-class BookmarkWidget : public QFrame
+
+class BookmarkWidget : public QMenu
 {
     Q_OBJECT
 
 public:
     explicit BookmarkWidget(const KBookmark &bookmark, QWidget *parent = 0);
-    ~BookmarkWidget();
+    virtual ~BookmarkWidget();
 
     void showAt(const QPoint &pos);
 
 private slots:
     void accept();
-    void reject();
     void removeBookmark();
 
 private:
-    KBookmark m_bookmark;
+    KBookmark *m_bookmark;
     KLineEdit *m_name;
-
 };
 
 #endif // BOOKMARKWIDGET_H
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 25587502..b29ed0e8 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -30,42 +30,40 @@
 
 // Local includes
 #include "application.h"
+#include "iconmanager.h"
 #include "mainwindow.h"
 #include "webtab.h"
-#include "webview.h"
-#include "iconmanager.h"
 
 // KDE Includes
+#include <KComboBox>
 #include <KLocalizedString>
-#include <KIcon>
-#include <KProcess>
 #include <KMessageBox>
+#include <KProcess>
+#include <KUrl>
 
 // Qt Includes
-#include <QtGui/QFormLayout>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
+
 #include <QtGui/QDialogButtonBox>
+#include <QtGui/QFormLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusConnectionInterface>
-
-
 
 RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
-        : QFrame(parent, Qt::Popup)
+        : QMenu(parent)
         , m_map(map)
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    
-    setMinimumWidth(200);
-    setFrameStyle(Panel);
+    setMinimumWidth(250);
 
     QFormLayout *layout = new QFormLayout(this);
-    setLayout(layout);
 
+    // Title
     QLabel *title = new QLabel(this);
     title->setText(i18n("<h4>Subscribe to RSS Feeds</h4>"));
+    title->setAlignment(Qt::AlignCenter);
     layout->addRow(title);
 
     // Agregators
@@ -74,7 +72,7 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
 
     m_agregators = new KComboBox(this);
     m_agregators->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    
+
     m_agregators->addItem(KIcon("akregator"), QString("Akregator"));
     m_agregators->addItem(Application::iconManager()->iconForUrl(KUrl("http://google.com/reader")), i18n("Google Reader"));
 
@@ -91,37 +89,34 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent)
     {
         m_feeds->addItem(title);
     }
-    
+
     layout->addRow(feed, m_feeds);
 
     // Buttons
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel, Qt::Horizontal, this);
-    
+
     QPushButton *addFeed = new QPushButton(KIcon("list-add"), i18n("Add Feed"), buttonBox);
     buttonBox->addButton(addFeed, QDialogButtonBox::AcceptRole);
-    
+
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
 
     layout->addRow(buttonBox);
+
+    setLayout(layout);
 }
 
 
 RSSWidget::~RSSWidget()
 {
-    delete m_agregators;
-    delete m_feeds;
 }
 
 
 void RSSWidget::showAt(const QPoint &pos)
 {
     adjustSize();
-    
-    QPoint p;
-    p.setX(pos.x() - width());
-    p.setY(pos.y() + 10);
-    
+
+    QPoint p(pos.x()-width(), pos.y()+10);
     move(p);
     show();
 }
@@ -136,14 +131,7 @@ void RSSWidget::accept()
     else
         addWithGoogleReader(url);
 
-    reject();
-}
-
-
-void RSSWidget::reject()
-{
     close();
-    this->deleteLater();
 }
 
 
@@ -179,6 +167,5 @@ void RSSWidget::addWithAkregator(const QString &url)
             KMessageBox::error(0, QString(i18n("There was an error. Please verify Akregator is installed on your system.")
                                           + "<br /><br /> <a href=\"" + url + "\">" + url + "</a>"));
         }
-
     }
 }
diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h
index 0272805e..33c34e76 100644
--- a/src/urlbar/rsswidget.h
+++ b/src/urlbar/rsswidget.h
@@ -27,20 +27,15 @@
 #ifndef RSSWIDGET_H
 #define RSSWIDGET_H
 
-// Rekonq Includes
-#include "rekonq_defines.h"
-
-// KDE Includes
-#include <KComboBox>
-#include <KUrl>
-
 // Qt Includes
-#include <QtCore/QMap>
+#include <QtGui/QMenu>
 
-#include <QtGui/QFrame>
+// Forward Declarations
+class KComboBox;
+class KUrl;
 
 
-class RSSWidget : public QFrame
+class RSSWidget : public QMenu
 {
     Q_OBJECT
 
@@ -48,13 +43,12 @@ public:
     // QMap< feedUrl, feedTitle>
     RSSWidget(const QMap<KUrl, QString> &map, QWidget *parent = 0);
     ~RSSWidget();
-    
+
     void showAt(const QPoint &pos);
 
 private slots:
     void accept();
-    void reject();
-    
+
 private:
     void addWithAkregator(const QString &url);
     void addWithGoogleReader(const QString &url);