From c328e203e0d84177a0028d8ba5b0af4b82c16eeb Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Feb 2010 00:29:13 +0100
Subject: QPointers --> QWeakPointers

---
 src/application.cpp             | 53 +++++++++++++++++++++++++----------------
 src/application.h               | 12 +++++-----
 src/history/historymanager.cpp  |  3 +--
 src/mainwindow.cpp              | 19 ++++++++-------
 src/sessionmanager.cpp          |  4 ++--
 src/settings/settingsdialog.cpp |  1 -
 src/tabbar.cpp                  | 29 ++++++++++------------
 src/tabbar.h                    |  4 ++--
 8 files changed, 66 insertions(+), 59 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 05004f30..cfd4d060 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -64,10 +64,10 @@
 #include <QtCore/QTimer>
 
 
-QPointer<HistoryManager> Application::s_historyManager;
-QPointer<BookmarkProvider> Application::s_bookmarkProvider;
-QPointer<SessionManager> Application::s_sessionManager;
-QPointer<AdBlockManager> Application::s_adblockManager;
+QWeakPointer<HistoryManager> Application::s_historyManager;
+QWeakPointer<BookmarkProvider> Application::s_bookmarkProvider;
+QWeakPointer<SessionManager> Application::s_sessionManager;
+QWeakPointer<AdBlockManager> Application::s_adblockManager;
 
 
 Application::Application()
@@ -80,12 +80,23 @@ Application::Application()
 
 Application::~Application()
 {
-    qDeleteAll(m_mainWindows);
+    foreach( QWeakPointer<MainWindow> window, m_mainWindows)
+    {
+        delete window.data();
+        window.clear();
+    }
 
-    delete s_bookmarkProvider;
-    delete s_historyManager;
-    delete s_sessionManager;
-    delete s_adblockManager;
+    delete s_bookmarkProvider.data();
+    s_bookmarkProvider.clear();
+    
+    delete s_historyManager.data();
+    s_historyManager.clear();
+    
+    delete s_sessionManager.data();
+    s_sessionManager.clear();
+    
+    delete s_adblockManager.data();
+    s_adblockManager.clear();
 }
 
 
@@ -145,7 +156,7 @@ int Application::newInstance()
         // is there a window open on the current desktop ? use it!
         for (int i = 0; i < m_mainWindows.size(); ++i)
         {
-            MainWindow *m = m_mainWindows.at(i);
+            MainWindow *m = m_mainWindows.at(i).data();
             KWindowInfo w = KWindowInfo(m->winId(), NET::WMDesktop);
             if(w.isOnCurrentDesktop())
             {
@@ -210,7 +221,7 @@ MainWindow *Application::mainWindow()
     
     if(!active)
     {
-        return m_mainWindows.at(0);
+        return m_mainWindows.at(0).data();
     }
     return active;
 }
@@ -218,38 +229,38 @@ MainWindow *Application::mainWindow()
 
 HistoryManager *Application::historyManager()
 {
-    if (!s_historyManager)
+    if ( s_historyManager.isNull() )
     {
         s_historyManager = new HistoryManager();
-        QWebHistoryInterface::setDefaultInterface(s_historyManager);
+        QWebHistoryInterface::setDefaultInterface( s_historyManager.data() );
     }
-    return s_historyManager;
+    return s_historyManager.data();
 }
 
 
 BookmarkProvider *Application::bookmarkProvider()
 {
-    if (!s_bookmarkProvider)
+    if ( s_bookmarkProvider.isNull() )
     {
         s_bookmarkProvider = new BookmarkProvider(instance());
     }
-    return s_bookmarkProvider;
+    return s_bookmarkProvider.data();
 }
 
 
 SessionManager *Application::sessionManager()
 {
-    if(!s_sessionManager)
+    if( s_sessionManager.isNull() )
     {
         s_sessionManager = new SessionManager(instance());
     }
-    return s_sessionManager;
+    return s_sessionManager.data();
 }
 
 
 KIcon Application::icon(const KUrl &url)
 {
-    if(!Application::instance()->mainWindowList().isEmpty()) // avoid infinite loop at startup
+    if( !Application::instance()->mainWindowList().isEmpty() ) // avoid infinite loop at startup
     {
 
         if(url == KUrl("about:closedTabs"))
@@ -355,11 +366,11 @@ MainWindowList Application::mainWindowList()
 
 AdBlockManager *Application::adblockManager()
 {
-    if(!s_adblockManager)
+    if( s_adblockManager.isNull() )
     {
         s_adblockManager = new AdBlockManager(instance());
     }
-    return s_adblockManager;
+    return s_adblockManager.data();
 }
 
 
diff --git a/src/application.h b/src/application.h
index 4b951ded..0c3bd3f5 100644
--- a/src/application.h
+++ b/src/application.h
@@ -38,7 +38,7 @@
 #include <ThreadWeaver/Job>
 
 // Qt Includes
-#include <QPointer>
+#include <QWeakPointer>
 #include <QList>
 
 // Forward Declarations
@@ -52,7 +52,7 @@ class AdBlockManager;
 class WebView;
 
 
-typedef QList< QPointer<MainWindow> > MainWindowList;
+typedef QList< QWeakPointer<MainWindow> > MainWindowList;
 
 
 namespace Rekonq
@@ -139,10 +139,10 @@ private slots:
     void loadResolvedUrl(ThreadWeaver::Job *);
     
 private:
-    static QPointer<HistoryManager> s_historyManager;
-    static QPointer<BookmarkProvider> s_bookmarkProvider;
-    static QPointer<SessionManager> s_sessionManager;
-    static QPointer<AdBlockManager> s_adblockManager;
+    static QWeakPointer<HistoryManager> s_historyManager;
+    static QWeakPointer<BookmarkProvider> s_bookmarkProvider;
+    static QWeakPointer<SessionManager> s_sessionManager;
+    static QWeakPointer<AdBlockManager> s_adblockManager;
     
     MainWindowList m_mainWindows;
 };
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 29bdb45b..db19a6b4 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -69,10 +69,9 @@ HistoryManager::HistoryManager(QObject *parent)
     , m_historyModel(0)
     , m_historyFilterModel(0)
     , m_historyTreeModel(0)
-    , m_completion(0)
+    , m_completion(new KCompletion)
 {
     // take care of the completion object
-    m_completion = new KCompletion;
     m_completion->setOrder( KCompletion::Weighted );
     
     m_expiredTimer.setSingleShot(true);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index df600c05..ffc9f508 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -76,7 +76,7 @@
 #include <QtCore/QRect>
 #include <QtCore/QSize>
 #include <QtCore/QList>
-#include <QtCore/QPointer>
+#include <QtCore/QWeakPointer>
 
 #include <QtGui/QWidget>
 #include <QtGui/QVBoxLayout>
@@ -599,13 +599,14 @@ void MainWindow::preferences()
         return;
 
     // we didn't find an instance of this dialog, so lets create it
-    QPointer<SettingsDialog> s = new SettingsDialog(this);
+    QWeakPointer<SettingsDialog> s = new SettingsDialog(this);
 
     // keep us informed when the user changes settings
-    connect(s, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateBrowser()));
+    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateBrowser()));
 
-    s->exec();
-    delete s;
+    s.data()->exec();
+    delete s.data();
+    s.clear();
 }
 
 
@@ -1041,16 +1042,16 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
 
 void MainWindow::clearPrivateData()
 {
-    QPointer<KDialog> dialog = new KDialog(this, Qt::Sheet);
-    dialog->setButtons(KDialog::Ok | KDialog::Cancel);
+    QWeakPointer<KDialog> dialog = new KDialog(this, Qt::Sheet);
+    dialog.data()->setButtons(KDialog::Ok | KDialog::Cancel);
 
     Ui::ClearDataWidget clearWidget;
     QWidget widget;
     clearWidget.setupUi(&widget);
 
-    dialog->setMainWidget(&widget);
+    dialog.data()->setMainWidget(&widget);
 
-    if (dialog->exec() == KDialog::Accepted)
+    if (dialog.data()->exec() == KDialog::Accepted)
     {
         if(clearWidget.clearHistory->isChecked())
         {
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index f4e7cd3e..f512e943 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -71,10 +71,10 @@ void SessionManager::saveSession()
     }
     QTextStream out(&sessionFile);
     MainWindowList wl = Application::instance()->mainWindowList();
-    Q_FOREACH(QPointer<MainWindow> w, wl)
+    Q_FOREACH(QWeakPointer<MainWindow> w, wl)
     {
         out << "window\n";
-        MainView *mv = w->mainView();
+        MainView *mv = w.data()->mainView();
         for (int i = 0 ; i < mv->count() ; i++)
         {
             out << mv->webTab(i)->url().toEncoded() << "\n";
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index e37481aa..6fab5dcf 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -53,7 +53,6 @@
 #include <KCModuleProxy>
 
 // Qt Includes
-#include <QtCore/QPointer>
 #include <QtGui/QWidget>
 
 
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 460a2464..5e1feb56 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -161,24 +161,21 @@ void TabBar::showTabPreview(int tab)
     int h = w*((0.0 + currentView->height())/currentView->width());
 
     //delete previous tab preview
-    if (m_previewPopup)
-    {
-        delete m_previewPopup;
-    }
-
+    m_previewPopup.clear();
+    
     m_previewPopup = new KPassivePopup(this);
-    m_previewPopup->setFrameShape(QFrame::StyledPanel);
-    m_previewPopup->setFrameShadow(QFrame::Plain);
-    m_previewPopup->setFixedSize(w, h);
+    m_previewPopup.data()->setFrameShape(QFrame::StyledPanel);
+    m_previewPopup.data()->setFrameShadow(QFrame::Plain);
+    m_previewPopup.data()->setFixedSize(w, h);
     QLabel *l = new QLabel();
     view->page()->setViewportSize(currentView->page()->viewportSize());
     l->setPixmap(WebSnap::renderPreview(*(view->page()), w, h));
-    m_previewPopup->setView(l);
-    m_previewPopup->layout()->setAlignment(Qt::AlignTop);
-    m_previewPopup->layout()->setMargin(0);
+    m_previewPopup.data()->setView(l);
+    m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
+    m_previewPopup.data()->layout()->setMargin(0);
 
     QPoint pos( tabRect(tab).x() , tabRect(tab).y() + tabRect(tab).height() );
-    m_previewPopup->show(mapToGlobal(pos));
+    m_previewPopup.data()->show(mapToGlobal(pos));
 }
 
 
@@ -208,9 +205,9 @@ void TabBar::mouseMoveEvent(QMouseEvent *event)
         //if current tab or not found then hide previous tab preview
         if (tab==currentIndex() || tab==-1)
         {
-            if ( m_previewPopup)
+            if ( !m_previewPopup.isNull() )
             {
-                m_previewPopup->hide();
+                m_previewPopup.data()->hide();
             }
             m_currentTabPreview = -1;
         }
@@ -225,9 +222,9 @@ void TabBar::leaveEvent(QEvent *event)
     if (ReKonfig::alwaysShowTabPreviews())
     {
         //if leave tabwidget then hide previous tab preview
-        if ( m_previewPopup)
+        if ( !m_previewPopup.isNull() )
         {
-            m_previewPopup->hide();
+            m_previewPopup.data()->hide();
         }
         m_currentTabPreview = -1;
     }
diff --git a/src/tabbar.h b/src/tabbar.h
index f0476cbd..b57106dc 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -35,7 +35,7 @@
 #include "rekonqprivate_export.h"
 
 // Qt Includes
-#include <QPointer>
+#include <QWeakPointer>
 
 // KDE Includes
 #include <KTabBar>
@@ -99,7 +99,7 @@ private:
      */
     int m_actualIndex;
 
-    QPointer<KPassivePopup> m_previewPopup;
+    QWeakPointer<KPassivePopup> m_previewPopup;
     int m_currentTabPreview;
 };
 
-- 
cgit v1.2.1


From 2c11a95da6772a63d85905d4712a1a2d016a9e1e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 6 Feb 2010 01:49:54 +0100
Subject: FIx focus on browsing (FIRST STEP) and on findbar hiding

---
 src/application.cpp |  2 +-
 src/findbar.cpp     | 15 +++++++++------
 src/findbar.h       |  2 +-
 src/mainview.cpp    |  6 +++---
 src/mainwindow.cpp  |  1 +
 src/webtab.cpp      |  3 +++
 6 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index cfd4d060..14fd5ce0 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -382,8 +382,8 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job)
     
     if (view)
     {
-        view->setFocus();
         view->load(url);    
+        view->setFocus();
         
         // we are sure of the url now, let's add it to history
         // anyway we store here just http sites because local and ftp ones are
diff --git a/src/findbar.cpp b/src/findbar.cpp
index bd1a5137..9efb9c6a 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -143,12 +143,6 @@ void FindBar::show()
 
 void FindBar::keyPressEvent(QKeyEvent* event)
 {
-    if (event->key() == Qt::Key_Escape)
-    {
-        hide();
-        m_hideTimer->stop();
-        return;
-    }
     if (event->key() == Qt::Key_Return && !m_lineEdit->text().isEmpty())
     {
         emit searchString(m_lineEdit->text());
@@ -158,6 +152,7 @@ void FindBar::keyPressEvent(QKeyEvent* event)
     QWidget::keyPressEvent(event);
 }
 
+
 void FindBar::notifyMatch(bool match)
 {
     QPalette p = m_lineEdit->palette();
@@ -180,3 +175,11 @@ void FindBar::notifyMatch(bool match)
     m_lineEdit->setPalette(p);
     m_hideTimer->start(60000);
 }
+
+
+
+void FindBar::hide()
+{
+    m_hideTimer->stop();
+    QWidget::hide();
+}
diff --git a/src/findbar.h b/src/findbar.h
index fa369f66..5a41c0bc 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -56,6 +56,7 @@ public:
 public slots:
     void clear();
     void show();
+    void hide();
     void notifyMatch(bool match);
 
 protected Q_SLOTS:
@@ -68,7 +69,6 @@ private:
     KLineEdit *m_lineEdit;
     QCheckBox *m_matchCase;
     QTimer *m_hideTimer;
-
 };
 
 #endif
diff --git a/src/mainview.cpp b/src/mainview.cpp
index b26e7466..bc9d0bda 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -308,7 +308,7 @@ void MainView::currentChanged(int index)
         emit browserTabLoading(false);
 
     // set focus to the current webview
-    tab->setFocus();
+    tab->view()->setFocus();
 }
 
 
@@ -507,8 +507,8 @@ void MainView::closeTab(int index)
         }
 
         removeTab(index);
-        updateTabBar();         // UI operation: do it ASAP!!
-        tab->deleteLater();  // webView is scheduled for deletion.
+        updateTabBar();        // UI operation: do it ASAP!!
+        tab->deleteLater();    // webView is scheduled for deletion.
         
         emit tabsChanged();
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ffc9f508..9df24692 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -925,6 +925,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
     if (event->key() == Qt::Key_Escape)
     {
         m_findBar->hide();
+        currentTab()->setFocus();   // give focus to web pages
         return;
     }
 
diff --git a/src/webtab.cpp b/src/webtab.cpp
index b1f2cdfc..b3eb71f0 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -64,6 +64,9 @@ WebTab::WebTab(QWidget* parent)
     , m_view( new WebView(this) )
     , m_progress(0)
 {
+    // fix focus handling
+    setFocusProxy( m_view );
+    
     QVBoxLayout* l = new QVBoxLayout(this);
     l->setMargin(0);
     l->setSpacing(0);
-- 
cgit v1.2.1


From 8343d45f3dfd631a3f5ac4213918f285930eb446 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 17 Dec 2009 18:22:23 +0100
Subject: Re-implemented previews in homepage without using plugins. Not
 finished yet : Little things that change: -nice buttons appearing on hover
 -transitions on hover TODO: -when a preview is empty or when loading, it is
 very ugly -for now there's no way to choose the page you want to preview
 -port "closed Tabs" to this new architecture -totally remove PreviewImage
 classes -eventually, specific contextmenu for previews

---
 src/data/home.html            |  76 +++++++++++++++++----
 src/rekonqpage/newtabpage.cpp | 155 ++++++++++++++++++++++++++++++++++--------
 src/rekonqpage/newtabpage.h   |  19 ++++--
 src/webpage.cpp               |  10 +++
 src/webpage.h                 |   3 +
 src/websnap.cpp               |  52 +++++++++++++-
 src/websnap.h                 |  14 +++-
 7 files changed, 277 insertions(+), 52 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 9d8f390f..8db3d894 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -54,6 +54,10 @@ margin-top: 0.5em;
 a{
 color: #3F7AB7;
 text-decoration: none;
+-webkit-transition-property: color;
+-webkit-transition-duration: 0.5s;
+-webkit-transition-timing-function: ease;
+
 }
 a:hover{
 color: black;
@@ -118,18 +122,61 @@ margin-top: -5%;
 /* Thumbnail class */
 
 .thumbnail {
-text-align: center;
 display: inline-block;
-width:25%;
-margin-top: 7%;
-min-width:250px;
-min-height:192px;
+width:25%; margin-top: 7%;
+min-width:250px; min-height:192px;
+}
+
+.preview {
+display: block;
+width: 200px;
+height: 150px;
+padding: 14px 16px;
+background: url(%2/bg.png) no-repeat;
+-webkit-background-size: 100% 100%; 
+-webkit-background-clip: padding;
+}
+.thumbnail:hover .preview , .thumbnail:hover .button img {
+opacity: 0.8;
+}
+
+.button img, .preview {
+-webkit-transition-property: opacity;
+-webkit-transition-duration: 0.8s;
+-webkit-transition-timing-function: ease-in-out;
+}
+
+.button img {
+display: inline-block;
+width: 16px;
+height: 16px;
+opacity: 0;
 }
 
-.thumbnail object{
+.remove {
+    float: right;
+}
+.modify {
+    float: left;
+}
+
+.title {
+display: block;
+width: 200px;
+height: 15px;
+padding: 0 14px;
 text-align: center;
-width:228px;
-height:192px;
+}
+
+.thumbnail a {
+text-align:center;
+}
+.thumbnail a:hover {
+color:#3F7AB7;
+}
+
+.thumbnail span {
+
 }
 
 /* -------------------------------------------------------- */
@@ -162,11 +209,14 @@ margin-bottom: 0.5em;
         </a>
     </div>
     <div class="thumbnail">
-        <object type="application/image-preview" data="">
-            <param name="title" />
-            <param name="index" />
-            <param name="isFavorite" />
-        </object>
+        <a>
+            <img class="preview"></img>
+            <div class="title">
+                <a class="button modify"><img /></a>
+                <span><a></a></span>
+                <a class="button remove"><img /></a>
+            </div>
+        </a>
     </div>
     <h3></h3>
     <a></a>
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 66f74b86..4299c8bb 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -46,6 +46,7 @@
 
 // Qt Includes
 #include <QFile>
+#include <websnap.h>
 
 
 NewTabPage::NewTabPage(QWebFrame *frame)
@@ -72,6 +73,16 @@ NewTabPage::~NewTabPage()
 
 void NewTabPage::generate(const KUrl &url)
 {    
+    if(KUrl("about:preview").isParentOf(url))
+    {
+        if(url.directory() == QString("preview/remove"))
+        {
+            removePreview(url.fileName().toInt());
+            return;
+        }
+    }
+    
+    
     QWebPage *page = m_root.webFrame()->page();
     page->mainFrame()->setHtml(m_html);
 
@@ -80,26 +91,26 @@ void NewTabPage::generate(const KUrl &url)
     browsingMenu(url);
     
     QString title;
-    if(url == KUrl("about:closedTabs"))
+    if(url == KUrl("about:home") || url == KUrl("about:favorites"))
+    {
+        favoritesPage();
+        title = i18n("Favorites");
+    }
+    else if(url == KUrl("about:closedTabs"))
     {
         closedTabsPage();
         title = i18n("Closed Tabs");
     }
-    if(url == KUrl("about:history"))
+    else if(url == KUrl("about:history"))
     {
         historyPage();
         title = i18n("History");
     }
-    if(url == KUrl("about:bookmarks"))
+    else if(url == KUrl("about:bookmarks"))
     {
         bookmarksPage();
         title = i18n("Bookmarks");
     }
-    if(url == KUrl("about:home") || url == KUrl("about:favorites"))
-    {
-        favoritesPage();
-        title = i18n("Favorites");
-    }
     
     m_root.document().findFirst("title").setPlainText(title);
 }
@@ -114,34 +125,111 @@ void NewTabPage::favoritesPage()
     
     for(int i=0; i<8; ++i)
     {
-        QWebElement speed = markup(".thumbnail");
-        speed.findFirst("object").setAttribute("data" , urls.at(i));
-        speed.findFirst("param[name=title]").setAttribute("value", names.at(i));
-        speed.findFirst("param[name=index]").setAttribute("value", QString::number(i));
-        speed.findFirst("param[name=isFavorite]").setAttribute("value", "true");
+        QWebElement speed;
+        
+        if(urls.at(i).isEmpty())
+            speed = emptyPreview();
+        else if(!QFile::exists(WebSnap::fileForUrl(urls.at(i)).toLocalFile()))
+            speed = loadingPreview(i, urls.at(i));
+        else
+            speed = validPreview(i, urls.at(i), names.at(i));
+        
+        speed.setAttribute("id", "preview" + QVariant(i).toString());
         m_root.appendInside(speed);
     }
 }
 
 
-// FIXME : port to new PreviewImage API to use...
-/*QString NewTabPage::lastVisitedPage()
+QWebElement NewTabPage::emptyPreview()
 {
-    QString last;
-    QList<HistoryItem> history =  Application::historyManager()->history();
-    for (int i = 0; i < 8 && i < history.size(); ++i) 
-    {
-        HistoryItem it = history.at(i);
-        last += "<div class=\"thumbnail\">";
-        last += "<object type=\"application/image-preview\" data=\"" + it.url +  "\" >";
-        last += "</object>";
-        last += "<br />";
-        last += "<a href=\"" + it.url + "\">" + it.title + "</a></div>";
-    }
+    QWebElement prev = markup(".thumbnail");
+    
+    prev.findFirst("img").setAttribute("src" , QString("file:///") +
+                    KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
+    prev.findFirst("span").appendInside(i18n("Set a Preview..."));
+    
+    return prev;
+}
+
+
+QWebElement NewTabPage::loadingPreview(int index, KUrl url)
+{
+    QWebElement prev = markup(".thumbnail");
+    
+    prev.findFirst("img").setAttribute("src" , 
+    QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
+    prev.findFirst("span").appendInside(i18n("Loading Preview..."));
+    WebSnap *snap = new WebSnap(url);
+    snap->SetData(QVariant(index));
+    connect(snap, SIGNAL(finished()), SLOT(snapFinished()));
+    
+    return prev;
+}
+
+QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
+{
+    QWebElement prev = markup(".thumbnail");
+    KUrl previewPath = WebSnap::fileForUrl(url);
+    QString iString = QVariant(index).toString();
+    
+    prev.findFirst(".preview").setAttribute("src" , previewPath.toMimeDataString());
+    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
+    prev.findFirst("span > a").setAttribute("href", url.toMimeDataString());
+    prev.findFirst("span").appendInside(checkTitle(title));
+    
+    prev.findFirst(".modify img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
+    prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString ));
+    
+    prev.findFirst(".remove img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+    prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString ));
+    
+    return prev;
+}
 
-    return last;
 
-}*/
+void NewTabPage::snapFinished()
+{
+    WebSnap *snap = qobject_cast<WebSnap*>(sender());
+    QWebElement thumb = m_root.findFirst("#preview" + snap->data().toString());
+    thumb.findFirst("img").setAttribute("src", WebSnap::fileForUrl(snap->snapUrl()).toMimeDataString());
+    thumb.findFirst("p").setPlainText(snap->snapTitle());
+    
+    // Save the new config
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
+    
+    // stripTrailingSlash to be sure to get the same string for same address
+    urls.replace(snap->data().toInt(), snap->snapUrl().toString(QUrl::StripTrailingSlash));
+    names.replace(snap->data().toInt() , snap->snapTitle());
+    
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
+    ReKonfig::self()->writeConfig();
+}
+
+
+void NewTabPage::removePreview(int index)
+{
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    
+    
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
+    
+    urls.replace(index, QString(""));
+    names.replace(index, QString(""));
+    
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
+    // sync file data
+    ReKonfig::self()->writeConfig();
+    
+    prev.replace(emptyPreview());
+}
 
 
 void NewTabPage::browsingMenu(const KUrl &currentUrl)
@@ -278,3 +366,14 @@ void NewTabPage::closedTabsPage()
         m_root.appendInside(closed);
     }
 }
+
+
+QString NewTabPage::checkTitle(QString title)
+{
+    if(title.length() > 23)
+    {
+        title.truncate(20);
+        title += "...";
+    }
+    return title;
+}
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 003aa84e..84880a10 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -28,9 +28,6 @@
 #define REKONQ_NEW_TAB_PAGE
 
 
-// rekonq Includes
-#include <webpage.h>
-
 // KDE Includes
 #include <KUrl>
 
@@ -41,11 +38,12 @@
 
 // Forward Includes
 class KBookmark;
+class WebPage;
 
 
-class NewTabPage
+class NewTabPage : public QObject
 {
-    
+Q_OBJECT
 public:
     NewTabPage(QWebFrame *frame);
     ~NewTabPage();
@@ -56,12 +54,19 @@ public:
      *  new tab page
      */
     void generate(const KUrl &url = KUrl("about:home"));
+    
+protected slots:
+    void snapFinished();
+    void removePreview(int index);
      
 protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
 
     void favoritesPage();
-    //QString lastVisitedPage();
+    QWebElement emptyPreview();
+    QWebElement loadingPreview(int index, KUrl url);
+    QWebElement validPreview(int index, KUrl url, QString title);
+    
     void historyPage();
     void bookmarksPage();
     void closedTabsPage();
@@ -77,6 +82,8 @@ private:
     {
        return m_root.document().findFirst("#models > " + selector).clone();
     }
+    
+    QString checkTitle(QString title);
 
     QString m_html;
     
diff --git a/src/webpage.cpp b/src/webpage.cpp
index b2bedffc..59df13e7 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -72,6 +72,7 @@
 
 WebPage::WebPage(QObject *parent)
         : KWebPage(parent, KWalletIntegration)
+        , m_newTabPage(0)
 {
     setForwardUnsupportedContent(true);
 
@@ -114,10 +115,19 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
         if(risp == KMessageBox::Cancel)
             return false;
     }
+    
+    if (request.url().scheme() == QLatin1String("about"))
+    {
+        if(m_newTabPage == 0)
+            m_newTabPage = new NewTabPage(frame);
+        m_newTabPage->generate(request.url());
+        return false;
+    }
 
     if (frame && m_protHandler.preHandling( request, frame ))
     {
         return false;
+
     }
 
     m_requestedUrl = request.url();
diff --git a/src/webpage.h b/src/webpage.h
index 9169ad60..5671b5d9 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -32,8 +32,10 @@
 #define WEBPAGE_H
 
 
+
 // Local Includes
 #include "protocolhandler.h"
+#include "newtabpage.h"
 
 // KDE Includes
 #include <KWebPage>
@@ -76,6 +78,7 @@ private:
 
     QUrl m_requestedUrl;
     ProtocolHandler m_protHandler;
+    NewTabPage *m_newTabPage;
 };
 
 #endif
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 7dcbb836..e5db7c4e 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -115,16 +115,62 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
 }
 
 
+KUrl WebSnap::fileForUrl(KUrl url)
+{
+    QString filePath = 
+            KStandardDirs::locateLocal("cache", QString("thumbs/") + WebSnap::guessNameFromUrl(url) + ".png", true);
+    return KUrl(filePath);
+}
+
+
+void WebSnap::SetData(QVariant data)
+{
+    m_data = data;
+}
+
+QVariant& WebSnap::data()
+{
+    return m_data;
+}
+
+
+
+QString WebSnap::guessNameFromUrl(QUrl url)
+{
+    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
+    
+    // TODO learn Regular Expressions :)
+    // and implement something better here..
+    name.remove('/');
+    name.remove('&');
+    name.remove('.');
+    name.remove('-');
+    name.remove('_');
+    name.remove('?');
+    name.remove('=');
+    name.remove('+');
+    
+    return name;
+}
+
+
 void WebSnap::saveResult(bool ok)
 {
     // crude error-checking
     if (!ok) 
     {
         kDebug() << "Error loading site..";
-        return;
+        m_snapTitle = "Error...";
+        m_image = QPixmap();
     }
-
-    m_image = renderPreview(m_page, WIDTH, HEIGHT);
+    else
+    {
+        m_image = renderPreview(m_page, WIDTH, HEIGHT);
+    }
+    
+    m_image.save(fileForUrl(m_url).toLocalFile());
+    kDebug() << "finished";
+    
     emit finished();
 }
 
diff --git a/src/websnap.h b/src/websnap.h
index 6c5b4af9..04fded57 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -51,18 +51,26 @@ public:
     WebSnap(const QUrl &url);
     ~WebSnap();
     
-    QPixmap previewImage();
+    QPixmap previewImage(); // TODO : remove
+    
     static QPixmap renderPreview(const QWebPage &page, int w, int h);
     
+    static KUrl fileForUrl(KUrl url);
+    
+    static QString guessNameFromUrl(QUrl url);
+    
     QString snapTitle();
     QUrl snapUrl();
+    
+    void SetData(QVariant data);
+    QVariant& data();
 
 signals:
     void finished();
 
 private slots:
     void load();
-    void saveResult(bool ok);
+    void saveResult(bool ok = true);
 
 private:
     QWebPage m_page;
@@ -70,6 +78,8 @@ private:
 
     QUrl m_url;
     QString m_snapTitle;
+    
+    QVariant m_data;
 };
 
 #endif // WEB_SNAP_H
-- 
cgit v1.2.1


From f1f7e2011c3f245cd1987b0f09b72c2f7dea283f Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 18 Dec 2009 15:58:48 +0100
Subject: Various changes: - improve appearance of empty/loading previews -
 port closedTabs to new system - remove PreviewImage files TODO : dialog to
 choose preview

---
 src/CMakeLists.txt            |   1 -
 src/data/home.html            |  22 +--
 src/previewimage.cpp          | 430 ------------------------------------------
 src/previewimage.h            | 101 ----------
 src/rekonqpage/newtabpage.cpp |  84 ++++++---
 src/rekonqpage/newtabpage.h   |   9 +-
 src/webpluginfactory.cpp      |  28 +--
 7 files changed, 79 insertions(+), 596 deletions(-)
 delete mode 100644 src/previewimage.cpp
 delete mode 100644 src/previewimage.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b0a3fbd8..2295e9e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,6 @@ SET( rekonq_KDEINIT_SRCS
     findbar.cpp
     mainview.cpp
     mainwindow.cpp 
-    previewimage.cpp
     sessionmanager.cpp
     tabbar.cpp
     webpage.cpp
diff --git a/src/data/home.html b/src/data/home.html
index 8db3d894..103c559d 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -127,10 +127,12 @@ width:25%; margin-top: 7%;
 min-width:250px; min-height:192px;
 }
 
+.preview img {
+}
 .preview {
-display: block;
-width: 200px;
-height: 150px;
+display: table-cell;
+vertical-align: middle;
+width: 200px; height: 150px;
 padding: 14px 16px;
 background: url(%2/bg.png) no-repeat;
 -webkit-background-size: 100% 100%; 
@@ -154,10 +156,10 @@ opacity: 0;
 }
 
 .remove {
-    float: right;
+float: right;
 }
 .modify {
-    float: left;
+float: left;
 }
 
 .title {
@@ -171,14 +173,10 @@ text-align: center;
 .thumbnail a {
 text-align:center;
 }
-.thumbnail a:hover {
+.thumbnail a:hover, span {
 color:#3F7AB7;
 }
 
-.thumbnail span {
-
-}
-
 /* -------------------------------------------------------- */
 /* Bookmarks page*/
 
@@ -210,7 +208,9 @@ margin-bottom: 0.5em;
     </div>
     <div class="thumbnail">
         <a>
-            <img class="preview"></img>
+            <div class ="preview">
+                <img />
+            </div>
             <div class="title">
                 <a class="button modify"><img /></a>
                 <span><a></a></span>
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
deleted file mode 100644
index 9c8bb194..00000000
--- a/src/previewimage.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "previewimage.h"
-#include "previewimage.moc"
-
-// Local Includes
-#include "historymanager.h"
-#include "rekonq.h"
-#include "mainwindow.h"
-#include "mainview.h"
-
-// KDE Includes
-#include <KUrl>
-#include <KStandardDirs>
-#include <KDebug>
-#include <KMenu>
-#include <KAction>
-#include <KLocale>
-
-// Qt Includes
-#include <QFile>
-#include <QMovie>
-#include <QMouseEvent>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPainter>
-
-
-PreviewImage::PreviewImage(const QUrl &url, const QString &title, int index, bool isFavorite)
-    : QWidget()
-    , ws(0)
-    , loadingSnapshot(false)
-    , m_url(url)
-    , m_title(title)
-    , m_isFavorite(isFavorite)
-    , m_index(index)
-    , m_button(0)
-    , m_imageLabel(new QLabel)
-    , m_textLabel(new QLabel)
-    , m_backgroundLabel(new QLabel)
-    , m_previewLabel(new QLabel)
-{
-
-    int borderTop = 14;
-    int borderRight = 16;
-    int borderBottom = 14;
-    int borderLeft = 16;
-
-    int previewWidth = 200;
-    int previewHeight = 150;
-
-    int urlHeight = 18;
-
-    m_size = QSize(borderLeft+previewWidth+borderRight, borderTop+previewHeight+borderBottom+urlHeight);
-
-    setFixedSize(m_size);
-    m_previewLabel->setFixedSize(m_size);
-
-    m_backgroundLabel->setPixmap(renderBackground(previewWidth,previewHeight, borderTop, borderBottom, borderLeft, borderRight));
-
-    m_previewLabel->setAlignment(Qt::AlignCenter);
-    m_backgroundLabel->setAlignment(Qt::AlignCenter);
-    m_imageLabel->setAlignment(Qt::AlignCenter);
-    m_textLabel->setAlignment(Qt::AlignCenter);
-
-    m_previewLabel->setLayout(new QVBoxLayout);
-    m_previewLabel->layout()->setMargin(0);
-    m_previewLabel->layout()->addWidget(m_backgroundLabel);
-    m_previewLabel->layout()->addWidget(m_textLabel);
-    m_previewLabel->setCursor(Qt::PointingHandCursor);
-
-    m_backgroundLabel->setLayout(new QVBoxLayout);
-    m_backgroundLabel->layout()->addWidget(m_imageLabel);
-
-    setLayout(new QHBoxLayout);
-    layout()->setMargin(0);
-    layout()->setAlignment(Qt::AlignCenter);
-    layout()->addWidget(m_previewLabel);
-
-    connect(this, SIGNAL(loadUrl(const KUrl &, const Rekonq::OpenType &)), 
-            Application::instance(), SLOT(loadUrl(const KUrl &, const Rekonq::OpenType &)));
-    
-    loadUrlPreview(url);
-}
-
-
-PreviewImage::~PreviewImage()
-{
-    delete ws;
-    delete m_textLabel;
-    delete m_imageLabel;
-    delete m_backgroundLabel;
-    delete m_previewLabel;
-}
-
-
-QPixmap PreviewImage::renderBackground(int w, int h, int t, int b, int l, int r)
-{
-    QImage backImage(KStandardDirs::locate("appdata", "pics/bg.png"));
-    QImage resultImage(QSize(w + l + r, h + t + b), QImage::Format_ARGB32_Premultiplied);
-
-    if (!backImage.isNull())
-    {
-        int sw = backImage.width() - l - r;
-        int sh = backImage.height() - t - b;
-        QPainter pt(&resultImage);
-        pt.setCompositionMode(QPainter::CompositionMode_Source);
-        pt.fillRect(resultImage.rect(), Qt::transparent);
-        pt.drawImage(QRect(0, 0, l, t), backImage, QRect(0, 0, l, t));
-        pt.drawImage(QRect(l, 0, w, t), backImage, QRect(l, 0, sw, t));
-        pt.drawImage(QRect(l + w, 0, r, t), backImage, QRect(l + sw, 0, r, t));
-        pt.drawImage(QRect(0, t, l, h), backImage, QRect(0, t, l, sh));
-        pt.drawImage(QRect(l, t, w, h), backImage, QRect(l, t, sw, sh));
-        pt.drawImage(QRect(l + w, t, r, h), backImage, QRect(l + sw, t, r, sh));
-        pt.drawImage(QRect(0, t + h, l , b), backImage, QRect(0, t + sh, l , b));
-        pt.drawImage(QRect(l, t + h, w, b), backImage, QRect(l, t + sh, sw, b));
-        pt.drawImage(QRect(l + w, t + h, w, b), backImage, QRect(l + sw, t + sh, sw, b));
-        pt.end();
-    }
-
-    return QPixmap::fromImage(resultImage);
-}
-
-
-void PreviewImage::loadUrlPreview(const QUrl& url)
-{
-    m_url = url;
-
-    if(url.isEmpty())
-    {
-        showEmptyPreview();
-        return;
-    }
-
-    m_previewLabel->setFixedSize(m_size); //unhide
-
-    m_savePath = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(m_url) + ".png", true);
-
-    if(QFile::exists(m_savePath))
-    {
-        m_pixmap.load(m_savePath);
-        m_imageLabel->setPixmap(m_pixmap);
-        checkTitle();
-        m_textLabel->setText(m_title);
-    }
-    else
-    {
-        loadingSnapshot = true;
-        ws = new WebSnap( url );
-        connect(ws, SIGNAL(finished()), this, SLOT(snapFinished()));
-
-        QString path = KStandardDirs::locate("appdata", "pics/busywidget.gif");
-
-        // load an animation waiting for site preview
-        QMovie *movie = new QMovie(path, QByteArray(), this);
-        movie->setSpeed(50);
-        m_imageLabel->setMovie(movie);
-        movie->start();
-        m_textLabel->setText( i18n("Loading preview...") );
-        setCursor(Qt::BusyCursor);
-    }
-}
-
-
-void PreviewImage::snapFinished()
-{
-    loadingSnapshot = false;
-    QMovie *m = m_imageLabel->movie();
-    delete m;
-    m_imageLabel->setMovie(0);
-
-    m_pixmap = ws->previewImage();
-    m_imageLabel->setPixmap(m_pixmap);
-    checkTitle();
-    m_textLabel->setText(m_title);
-
-    setCursor(Qt::PointingHandCursor);
-
-    m_pixmap.save(m_savePath);
-
-    if(m_index > -1)
-    {
-        // Update title
-        QStringList names = ReKonfig::previewNames();
-        // update url (for added thumbs)
-        QStringList urls = ReKonfig::previewUrls();
-
-        // stripTrailingSlash to be sure to get the same string for same address
-        urls.replace(m_index, ws->snapUrl().toString(QUrl::StripTrailingSlash));
-        names.replace(m_index, ws->snapTitle());
-
-        ReKonfig::setPreviewNames(names);
-        ReKonfig::setPreviewUrls(urls);
-
-        ReKonfig::self()->writeConfig();
-    }
-}
-
-
-void PreviewImage::showEmptyPreview()
-{
-    if(!m_isFavorite)
-        return;
-
-    m_imageLabel->clear();
-    m_textLabel->clear();
-
-    m_previewLabel->setFixedSize(0,0); //hide
-
-
-    m_button = new QToolButton();
-    m_button->setDefaultAction(historyMenu());
-    m_button->setPopupMode(QToolButton::InstantPopup);
-    m_button->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    m_button->setText(i18n("Add Preview"));
-    m_button->setAutoRaise(true);
-    m_button->setIconSize(QSize(48, 48));
-    layout()->addWidget(m_button);
-}
-
-
-void PreviewImage::mouseDoubleClickEvent(QMouseEvent *event)
-{
-    kDebug() << "no double click over here, thanks :D";
-    Q_UNUSED(event);
-}
-
-
-void PreviewImage::mouseMoveEvent(QMouseEvent *event)
-{
-    kDebug() << "moving mouse over preview image";
-    Q_UNUSED(event)
-}
-
-
-void PreviewImage::mousePressEvent(QMouseEvent *event)
-{
-    if(event->button() == Qt::LeftButton)
-    {
-        emit loadUrl(m_url, Rekonq::CurrentTab);
-        return;
-    }
-    else if(event->button() == Qt::MidButton)
-    {
-        emit loadUrl(m_url, Rekonq::SettingOpenTab);
-        return;
-    }
-
-    QWidget::mousePressEvent(event);
-}
-
-
-void PreviewImage::mouseReleaseEvent(QMouseEvent *event)
-{
-    kDebug() << "NO000... don't leave your finger from the button!!";
-    Q_UNUSED(event)
-}
-
-
-void PreviewImage::contextMenuEvent(QContextMenuEvent* event)
-{
-    if(!m_isFavorite)
-        return;
-
-    if(loadingSnapshot)
-       return;
-
-    KMenu menu(this);
-    KAction *a;
-
-    if(!m_url.isEmpty())
-    {
-        a = new KAction(KIcon("edit-delete"), i18n("Remove Thumbnail"), this);
-        connect(a, SIGNAL(triggered(bool)), this, SLOT(removeMe()));
-        menu.addAction(a);
-
-        a = new KAction(KIcon("view-refresh"), i18n("Refresh Thumbnail"), &menu);
-        connect(a, SIGNAL(triggered(bool)), this, SLOT(refreshPreview()));
-        menu.addAction(a);
-    }
-    menu.addAction(historyMenu());
-
-    menu.exec(mapToGlobal(event->pos()));
-}
-
-
-KActionMenu* PreviewImage::historyMenu()
-{
-    KActionMenu *histMenu = new KActionMenu(KIcon("insert-image"), i18n("Set Page to Preview"), this);
-    QList<HistoryItem> history =  Application::historyManager()->history();
-
-    if(history.isEmpty())
-    {
-        KAction *a = new KAction(i18n("History is Empty"), this);
-        a->setEnabled(false);
-        histMenu->addAction(a);
-        return histMenu;
-    }
-
-    int maxItems = 15;
-    for (int i = 0; i < maxItems && i < history.size() ; ++i) 
-    {
-        HistoryItem it = history.at(i);
-        KAction *a = new KAction(Application::icon(it.url), it.title, this);
-        QStringList urlData;
-        urlData << it.url << it.title;
-        a->setData(urlData);
-        connect(a, SIGNAL(triggered(bool)), this, SLOT(setUrlFromAction()));
-        histMenu->addAction(a);
-    }
-
-    return histMenu;
-}
-
-
-void PreviewImage::removeMe()
-{
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-
-    int index = urls.indexOf(QRegExp(m_url.toString(QUrl::StripTrailingSlash), Qt::CaseSensitive, QRegExp::FixedString));
-
-    urls.replace(index, QString(""));
-    names.replace(index, QString(""));
-
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-
-    // sync file data
-    ReKonfig::self()->writeConfig();
-
-    showEmptyPreview();
-
-    m_url = "";
-}
-
-
-void PreviewImage::setUrlFromAction()
-{
-    KAction *a = qobject_cast<KAction*>(sender());
-    QStringList urlData = a->data().toStringList();
-
-    m_url = KUrl(urlData.at(0));
-    m_title = urlData.at(1);
-    checkTitle();
-
-    if(m_button)
-    {
-        m_imageLabel->layout()->deleteLater();
-        m_button->menu()->deleteLater();
-        m_button->deleteLater();
-    }
-    loadUrlPreview(m_url);
-
-    // Update title
-    QStringList names = ReKonfig::previewNames();
-    // update url (for added thumbs)
-    QStringList urls = ReKonfig::previewUrls();
-
-    // stripTrailingSlash to be sure to get the same string for same address
-    urls.replace(m_index, m_url.toString(QUrl::StripTrailingSlash));
-    names.replace(m_index, m_title);
-
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-
-    ReKonfig::self()->writeConfig();
-}
-
-
-void PreviewImage::refreshPreview()
-{
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(m_url) + ".png", true);
-    QFile::remove(path);
-    loadUrlPreview(m_url);
-}
-
-
-QString PreviewImage::guessNameFromUrl(QUrl url)
-{
-    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
-
-    // TODO learn Regular Expressions :)
-    // and implement something better here..
-    name.remove('/');
-    name.remove('&');
-    name.remove('.');
-    name.remove('-');
-    name.remove('_');
-    name.remove('?');
-    name.remove('=');
-    name.remove('+');
-
-    return name;
-}
-
-
-void PreviewImage::checkTitle()
-{
-    if(m_title.length() > 23)
-    {
-        m_title.truncate(20);
-        m_title += "...";
-    }
-}
diff --git a/src/previewimage.h b/src/previewimage.h
deleted file mode 100644
index 4dd8df3b..00000000
--- a/src/previewimage.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef PREVIEW_IMAGE_H
-#define PREVIEW_IMAGE_H
-
-// Local Includes
-#include "websnap.h"
-#include "application.h"
-
-// KDE Includes
-#include <KActionMenu>
-
-// Qt Includes
-#include <QLabel>
-#include <QFrame>
-#include <QImage>
-#include <QUrl>
-#include <QToolButton>
-#include <QSize>
-
-
-class PreviewImage : public QWidget
-{
-    Q_OBJECT
-
-public:
-    PreviewImage(const QUrl &url, const QString &title, int index, bool isFavorite);
-    ~PreviewImage();
-
-    QString guessNameFromUrl(QUrl url);
-
-public slots:
-    void snapFinished();
-    void removeMe();
-    void setUrlFromAction();
-    void refreshPreview();
-
-signals:
-    void loadUrl(const KUrl &, const Rekonq::OpenType &);
-    
-protected:
-    void contextMenuEvent(QContextMenuEvent *event);
-    void mouseDoubleClickEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-
-    void loadUrlPreview(const QUrl &url);
-    KActionMenu *historyMenu();
-    void showEmptyPreview();
-
-private:
-    void checkTitle();
-    QPixmap renderBackground(int w, int h, int t, int b, int l, int r);
-
-    QPixmap m_pixmap;
-    WebSnap *ws;
-
-    QString m_savePath;    
-    bool loadingSnapshot;
-
-    QUrl m_url;    
-    QString m_title;
-    bool m_isFavorite;
-    int m_index;
-
-    QToolButton *m_button;
-
-    QLabel *m_imageLabel;
-    QLabel *m_textLabel;
-    QLabel *m_backgroundLabel;
-    QLabel *m_previewLabel;
-    
-    QSize m_size;
-};
-
-#endif // PREVIEW_IMAGE_H
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 4299c8bb..a587502c 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -80,6 +80,10 @@ void NewTabPage::generate(const KUrl &url)
             removePreview(url.fileName().toInt());
             return;
         }
+        if(url.directory() == QString("preview/modify"))
+        {
+            return;
+        }
     }
     
     
@@ -125,28 +129,31 @@ void NewTabPage::favoritesPage()
     
     for(int i=0; i<8; ++i)
     {
-        QWebElement speed;
+        KUrl url = urls.at(i);
+        QWebElement prev;
         
-        if(urls.at(i).isEmpty())
-            speed = emptyPreview();
-        else if(!QFile::exists(WebSnap::fileForUrl(urls.at(i)).toLocalFile()))
-            speed = loadingPreview(i, urls.at(i));
+        if(url.isEmpty())
+            prev = emptyPreview(i);
+        else if(!QFile::exists(WebSnap::fileForUrl(url).toLocalFile()))
+            prev = loadingPreview(i, url);
         else
-            speed = validPreview(i, urls.at(i), names.at(i));
+            prev = validPreview(i, url, names.at(i));
         
-        speed.setAttribute("id", "preview" + QVariant(i).toString());
-        m_root.appendInside(speed);
+        prev.setAttribute("id", "preview" + QVariant(i).toString());
+        m_root.appendInside(prev);
     }
 }
 
 
-QWebElement NewTabPage::emptyPreview()
+QWebElement NewTabPage::emptyPreview(int index)
 {
     QWebElement prev = markup(".thumbnail");
     
-    prev.findFirst("img").setAttribute("src" , QString("file:///") +
+    prev.findFirst(".preview img").setAttribute("src" , QString("file:///") +
                     KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
     prev.findFirst("span").appendInside(i18n("Set a Preview..."));
+    prev.findFirst("a").setAttribute("href", QString("about:/preview/modify/" + QVariant(index).toString()));
+    hideControls(prev);
     
     return prev;
 }
@@ -156,9 +163,11 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
 {
     QWebElement prev = markup(".thumbnail");
     
-    prev.findFirst("img").setAttribute("src" , 
-    QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
+    prev.findFirst(".preview img").setAttribute("src" , 
+                QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
     prev.findFirst("span").appendInside(i18n("Loading Preview..."));
+    showControls(prev);
+    
     WebSnap *snap = new WebSnap(url);
     snap->SetData(QVariant(index));
     connect(snap, SIGNAL(finished()), SLOT(snapFinished()));
@@ -172,29 +181,43 @@ QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
     KUrl previewPath = WebSnap::fileForUrl(url);
     QString iString = QVariant(index).toString();
     
-    prev.findFirst(".preview").setAttribute("src" , previewPath.toMimeDataString());
+    prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString());
     prev.findFirst("a").setAttribute("href", url.toMimeDataString());
-    prev.findFirst("span > a").setAttribute("href", url.toMimeDataString());
+    prev.findFirst("span a").setAttribute("href", url.toMimeDataString());
     prev.findFirst("span").appendInside(checkTitle(title));
     
     prev.findFirst(".modify img").setAttribute("src", QString("file:///") +
-    KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
+                KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
     prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString ));
     
     prev.findFirst(".remove img").setAttribute("src", QString("file:///") +
-    KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+                KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
     prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString ));
     
+    showControls(prev);
+    
+    
     return prev;
 }
 
 
+void NewTabPage::hideControls(QWebElement e)
+{
+    e.findFirst(".remove").setStyleProperty("visibility", "hidden");
+    e.findFirst(".modify").setStyleProperty("visibility", "hidden");
+}
+void NewTabPage::showControls(QWebElement e)
+{
+    e.findFirst(".remove").setStyleProperty("visibility", "visible");
+    e.findFirst(".modify").setStyleProperty("visibility", "visible");
+}
+
+
 void NewTabPage::snapFinished()
 {
     WebSnap *snap = qobject_cast<WebSnap*>(sender());
-    QWebElement thumb = m_root.findFirst("#preview" + snap->data().toString());
-    thumb.findFirst("img").setAttribute("src", WebSnap::fileForUrl(snap->snapUrl()).toMimeDataString());
-    thumb.findFirst("p").setPlainText(snap->snapTitle());
+    QWebElement prev = m_root.findFirst("#preview" + snap->data().toString());
+    prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle()));
     
     // Save the new config
     QStringList names = ReKonfig::previewNames();
@@ -228,7 +251,7 @@ void NewTabPage::removePreview(int index)
     // sync file data
     ReKonfig::self()->writeConfig();
     
-    prev.replace(emptyPreview());
+    prev.replace(emptyPreview(index));
 }
 
 
@@ -357,13 +380,22 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent)
 void NewTabPage::closedTabsPage()
 {
     QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
-
-    foreach(const HistoryItem &item, links)
+    
+    for(int i=0; i < links.count(); ++i)
     {
-        QWebElement closed = markup(".thumbnail");
-        closed.findFirst("object").setAttribute("data" , item.url);
-        closed.findFirst("param[name=title]").setAttribute("value", item.title);
-        m_root.appendInside(closed);
+        HistoryItem item = links.at(i);
+        QWebElement prev;
+        
+        if(item.url.isEmpty())
+            continue;
+        else if(!QFile::exists(WebSnap::fileForUrl(item.url).toLocalFile()))
+            prev = loadingPreview(i, item.url);
+        else
+            prev = validPreview(i, item.url, item.title);
+        
+        prev.setAttribute("id", "preview" + QVariant(i).toString());
+        hideControls(prev);
+        m_root.appendInside(prev);
     }
 }
 
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 84880a10..9ac743ea 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -63,10 +63,17 @@ protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
 
     void favoritesPage();
-    QWebElement emptyPreview();
+    QWebElement emptyPreview(int index);
     QWebElement loadingPreview(int index, KUrl url);
     QWebElement validPreview(int index, KUrl url, QString title);
     
+    /** This function takes a QwebElement with the .thumbnail structure.
+        It hides the "remove" and "modify" buttons->
+    */
+    void hideControls(QWebElement e);
+    void showControls(QWebElement e);
+    
+    
     void historyPage();
     void bookmarksPage();
     void closedTabsPage();
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index aec4e18d..ac18fece 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -32,7 +32,6 @@
 #include "rekonq.h"
 #include "application.h"
 #include "mainwindow.h"
-#include "previewimage.h"
 #include "clicktoflash.h"
 
 // KDE Includes
@@ -65,27 +64,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
                                   const QStringList &argumentValues) const
 {
     kDebug() << "loading mimeType: " << mimeType;
-    
-    if(mimeType == QString("application/image-preview") )
-    {
-        QString title;
-        int number = -1;
-        bool isFavorite = false;
-
-        int i;
-        i = argumentNames.indexOf( QString("title") );
-        if(i > -1)
-            title = argumentValues.at(i);
-        i = argumentNames.indexOf( QString("isFavorite") );
-        if(i > -1)
-            isFavorite = true;
-        i = argumentNames.indexOf( QString("index") );
-        if(i > -1)
-            number = argumentValues.at(i).toInt();
-    
-        return new PreviewImage(url, title, number, isFavorite);
-    }
-    
+        
     if(ReKonfig::pluginsEnabled() == 0) // plugins are enabled
     {
         kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones...";
@@ -112,10 +91,7 @@ QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
 {
     QList<KWebPluginFactory::Plugin> plugins = KWebPluginFactory::plugins();
     
-    QWebPluginFactory::Plugin p;
-    p.name = "application/image-preview";
-    p.description = "plugin for embedding Web snapped images";
-    plugins.append(p);
+    KWebPluginFactory::Plugin p;
     
     p.name = "application/x-shockwave-flash";
     p.description = "Plugin for flash animations";
-- 
cgit v1.2.1


From 18b87086d1a0e472662f3883962b60dbe57e215f Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sat, 26 Dec 2009 13:00:53 +0100
Subject: First expermimental implementation of a new way of choosing a preview

---
 src/CMakeLists.txt                |   1 +
 src/rekonqpage/newtabpage.cpp     |  57 +++++++++++----
 src/rekonqpage/newtabpage.h       |   2 +
 src/rekonqpage/previewchooser.cpp | 143 ++++++++++++++++++++++++++++++++++++++
 src/rekonqpage/previewchooser.h   |  70 +++++++++++++++++++
 src/websnap.cpp                   |   2 +-
 6 files changed, 262 insertions(+), 13 deletions(-)
 create mode 100644 src/rekonqpage/previewchooser.cpp
 create mode 100644 src/rekonqpage/previewchooser.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2295e9e0..2ad18a02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ SET( rekonq_KDEINIT_SRCS
     history/historypanel.cpp
     #----------------------------------------
     rekonqpage/newtabpage.cpp
+    rekonqpage/previewchooser.cpp
     #----------------------------------------
     settings/settingsdialog.cpp
     #----------------------------------------
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index a587502c..c91af2dc 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -36,6 +36,7 @@
 #include "application.h"
 #include "mainwindow.h"
 #include "mainview.h"
+#include "previewchooser.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -43,6 +44,7 @@
 #include <KDebug>
 #include <KConfig>
 #include <KConfigGroup>
+#include <KDialog>
 
 // Qt Includes
 #include <QFile>
@@ -82,6 +84,9 @@ void NewTabPage::generate(const KUrl &url)
         }
         if(url.directory() == QString("preview/modify"))
         {
+            PreviewChooser *pc = new PreviewChooser(url.fileName().toInt());
+            connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl)));
+            pc->show();
             return;
         }
     }
@@ -139,7 +144,8 @@ void NewTabPage::favoritesPage()
         else
             prev = validPreview(i, url, names.at(i));
         
-        prev.setAttribute("id", "preview" + QVariant(i).toString());
+        setupPreview(prev, i);
+        
         m_root.appendInside(prev);
     }
 }
@@ -152,7 +158,9 @@ QWebElement NewTabPage::emptyPreview(int index)
     prev.findFirst(".preview img").setAttribute("src" , QString("file:///") +
                     KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
     prev.findFirst("span").appendInside(i18n("Set a Preview..."));
-    prev.findFirst("a").setAttribute("href", QString("about:/preview/modify/" + QVariant(index).toString()));
+    prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
+    
+    setupPreview(prev, index);
     hideControls(prev);
     
     return prev;
@@ -166,6 +174,8 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     prev.findFirst(".preview img").setAttribute("src" , 
                 QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
     prev.findFirst("span").appendInside(i18n("Loading Preview..."));
+    
+    setupPreview(prev, index);
     showControls(prev);
     
     WebSnap *snap = new WebSnap(url);
@@ -184,19 +194,11 @@ QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
     prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString());
     prev.findFirst("a").setAttribute("href", url.toMimeDataString());
     prev.findFirst("span a").setAttribute("href", url.toMimeDataString());
-    prev.findFirst("span").appendInside(checkTitle(title));
-    
-    prev.findFirst(".modify img").setAttribute("src", QString("file:///") +
-                KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
-    prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString ));
-    
-    prev.findFirst(".remove img").setAttribute("src", QString("file:///") +
-                KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
-    prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString ));
+    prev.findFirst("span").setPlainText(checkTitle(title));
     
+    setupPreview(prev, index);
     showControls(prev);
     
-    
     return prev;
 }
 
@@ -212,6 +214,19 @@ void NewTabPage::showControls(QWebElement e)
     e.findFirst(".modify").setStyleProperty("visibility", "visible");
 }
 
+void NewTabPage::setupPreview(QWebElement e, int index)
+{
+    e.findFirst(".remove img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+    e.findFirst(".modify img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
+    
+    e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
+    e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString()));
+    
+    e.setAttribute("id", "preview" + QVariant(index).toString());
+}
+
 
 void NewTabPage::snapFinished()
 {
@@ -255,6 +270,24 @@ void NewTabPage::removePreview(int index)
 }
 
 
+void NewTabPage::setPreview(int index, KUrl url)
+{
+    if(url.isEmpty())
+        return;
+    
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    
+    QStringList urls = ReKonfig::previewUrls();
+    urls.replace(index, url.toMimeDataString());
+    ReKonfig::setPreviewUrls(urls);
+    ReKonfig::self()->writeConfig();
+
+    prev.replace(loadingPreview(index, url));
+
+    
+}
+
+
 void NewTabPage::browsingMenu(const KUrl &currentUrl)
 {
     QList<QWebElement> navItems;
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 9ac743ea..973028b3 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -58,6 +58,7 @@ public:
 protected slots:
     void snapFinished();
     void removePreview(int index);
+    void setPreview(int index, KUrl url);
      
 protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
@@ -72,6 +73,7 @@ protected:  // these are the function to build the new tab page
     */
     void hideControls(QWebElement e);
     void showControls(QWebElement e);
+    void setupPreview(QWebElement e, int index);
     
     
     void historyPage();
diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp
new file mode 100644
index 00000000..a7c86d12
--- /dev/null
+++ b/src/rekonqpage/previewchooser.cpp
@@ -0,0 +1,143 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "previewchooser.h"
+
+// Local Includes
+#include "rekonq.h"
+#include <bookmarkstreemodel.h>
+#include <bookmarksproxy.h>
+#include <mainview.h>
+
+// Qt Includes
+#include <QLabel>
+#include <QVBoxLayout>
+
+// KDE Includes
+#include <KLineEdit>
+#include <KLocalizedString>
+
+
+PreviewChooser::PreviewChooser(int previewIndex)
+        : KDialog(0)
+        , m_treeView(new QTreeView)
+        , m_model(new QStandardItemModel)
+        , m_previewIndex(previewIndex)
+{
+    setMinimumSize(350, 100);
+    setWindowTitle(i18n("Set Page to preview"));
+    setModal(true);
+    
+    setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok);
+    setDefaultButton(KDialog::Ok);
+    connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode)));
+    
+    m_treeView->setUniformRowHeights(true);
+    m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_treeView->setTextElideMode(Qt::ElideRight);
+    m_treeView->setHeaderHidden(true);
+    m_treeView->setIndentation(0);
+    
+    QWidget *mainWidget = new QWidget(this);
+
+    // add url bar
+    QHBoxLayout *urlLayout = new QHBoxLayout;
+    urlLayout->setContentsMargins(5, 0, 0, 0);
+    QLabel *searchLabel = new QLabel(i18n("adress:"));
+    urlLayout->addWidget(searchLabel);
+    m_line = new KLineEdit;
+    connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged()));
+    urlLayout->addWidget(m_line);
+
+    // setup view
+    QVBoxLayout *vBoxLayout = new QVBoxLayout;
+    vBoxLayout->setContentsMargins(0, 0, 0, 0);
+    vBoxLayout->addLayout(urlLayout);
+    vBoxLayout->addWidget(m_treeView);
+    mainWidget->setLayout(vBoxLayout);
+    setMainWidget(mainWidget);
+    
+    refreshModel();
+    connect(Application::instance()->mainWindow()->mainView(), SIGNAL(tabsChanged()), SLOT(refreshModel()));
+    
+    m_treeView->setModel(m_model);
+    
+    connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex)));
+}
+
+
+PreviewChooser::~PreviewChooser()
+{
+    delete m_model;
+}
+
+
+
+void PreviewChooser::refreshModel()
+{
+    m_model->clear();
+    MainView *mv = Application::instance()->mainWindow()->mainView();
+    for(int i=0; i < mv->count(); ++i)
+    {
+        WebView *view = qobject_cast<WebView *>(mv->webView(i));
+        
+        if(view->url().scheme() == "about:")
+            continue;
+        
+        QStandardItem *it = new QStandardItem(view->icon(), view->title());
+        it->setData(QVariant(view->url()), Qt::ToolTipRole);
+        m_model->insertRow(i, it);
+    }
+}
+
+void PreviewChooser::setUrl(QModelIndex i)
+{
+    if(!i.data().canConvert(QVariant::String))
+        return;
+    
+    m_line->setText(i.data(Qt::ToolTipRole).toString());
+}
+
+
+void PreviewChooser::buttonClicked(KDialog::ButtonCode code)
+{
+    if(code == KDialog::Apply || code == KDialog::Ok)
+    {
+        emit urlChoosed(m_previewIndex, KUrl(m_line->text()));
+        enableButtonApply(false);
+    }
+    
+    if(code == KDialog::Cancel || code == KDialog::Ok)
+    {
+        close();
+        deleteLater();
+    }
+}
+
+
+void PreviewChooser::urlChanged()
+{
+    enableButtonApply(true);
+}
+
diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h
new file mode 100644
index 00000000..79766fdc
--- /dev/null
+++ b/src/rekonqpage/previewchooser.h
@@ -0,0 +1,70 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef PREVIEWCHOOSER_H
+#define PREVIEWCHOOSER_H
+
+
+// Local Includes
+#include "application.h"
+
+// KDE Includes
+#include <KLineEdit>
+#include <KDialog>
+
+// Qt Includes
+#include <QWidget>
+#include <QTreeView>
+#include <QStandardItemModel>
+
+// Forward Declarations
+class KUrl;
+
+
+class PreviewChooser : public KDialog
+{
+Q_OBJECT
+
+public:
+    explicit PreviewChooser(int previewIndex);
+    virtual ~PreviewChooser();
+
+signals:
+    void urlChoosed(int, const KUrl &);
+    
+public slots:
+    void refreshModel();
+    void setUrl(QModelIndex i);
+    void buttonClicked(KDialog::ButtonCode code);
+    void urlChanged();
+
+private:
+    QTreeView *m_treeView;
+    QStandardItemModel *m_model;
+    
+    KLineEdit *m_line;
+    
+    int m_previewIndex;
+};
+
+#endif // PREVIEWCHOOSER_H
diff --git a/src/websnap.cpp b/src/websnap.cpp
index e5db7c4e..0d72ef3a 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -167,7 +167,7 @@ void WebSnap::saveResult(bool ok)
     {
         m_image = renderPreview(m_page, WIDTH, HEIGHT);
     }
-    
+    QFile::remove(fileForUrl(m_url).toLocalFile());
     m_image.save(fileForUrl(m_url).toLocalFile());
     kDebug() << "finished";
     
-- 
cgit v1.2.1


From e5d1f43e3c58bef6da3ea5a725a57872ddb74f27 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 28 Dec 2009 14:26:20 +0100
Subject: Fix compilation after rebasing

---
 src/rekonqpage/previewchooser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp
index a7c86d12..fde36563 100644
--- a/src/rekonqpage/previewchooser.cpp
+++ b/src/rekonqpage/previewchooser.cpp
@@ -29,6 +29,7 @@
 #include <bookmarkstreemodel.h>
 #include <bookmarksproxy.h>
 #include <mainview.h>
+#include <webtab.h>
 
 // Qt Includes
 #include <QLabel>
@@ -100,7 +101,7 @@ void PreviewChooser::refreshModel()
     MainView *mv = Application::instance()->mainWindow()->mainView();
     for(int i=0; i < mv->count(); ++i)
     {
-        WebView *view = qobject_cast<WebView *>(mv->webView(i));
+        WebView *view = qobject_cast<WebView *>(mv->webTab(i)->view());
         
         if(view->url().scheme() == "about:")
             continue;
-- 
cgit v1.2.1


From e3215b1316fa0459d4238bf5cb3c60b0bff90f73 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 31 Dec 2009 10:53:51 +0100
Subject: little changes

---
 src/rekonqpage/newtabpage.cpp     |  4 +++-
 src/rekonqpage/previewchooser.cpp | 17 +++++++++++++----
 src/rekonqpage/previewchooser.h   |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index c91af2dc..c8b2e916 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -84,7 +84,9 @@ void NewTabPage::generate(const KUrl &url)
         }
         if(url.directory() == QString("preview/modify"))
         {
-            PreviewChooser *pc = new PreviewChooser(url.fileName().toInt());
+            int index = url.fileName().toInt();
+            QString url = m_root.findFirst("#preview" + QVariant(index).toString() + " > a").attribute("href");
+            PreviewChooser *pc = new PreviewChooser(index, url);
             connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl)));
             pc->show();
             return;
diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp
index fde36563..eeea9f99 100644
--- a/src/rekonqpage/previewchooser.cpp
+++ b/src/rekonqpage/previewchooser.cpp
@@ -40,7 +40,7 @@
 #include <KLocalizedString>
 
 
-PreviewChooser::PreviewChooser(int previewIndex)
+PreviewChooser::PreviewChooser(int previewIndex, QString url)
         : KDialog(0)
         , m_treeView(new QTreeView)
         , m_model(new QStandardItemModel)
@@ -70,6 +70,15 @@ PreviewChooser::PreviewChooser(int previewIndex)
     m_line = new KLineEdit;
     connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged()));
     urlLayout->addWidget(m_line);
+    
+    if(url.isEmpty() || url.startsWith("about:"))
+       m_line->setText(QString("http://"));
+    else
+    {
+        m_line->setText(url);
+        m_line->setSelection(8, m_line->text().size());
+    }
+    
 
     // setup view
     QVBoxLayout *vBoxLayout = new QVBoxLayout;
@@ -103,10 +112,10 @@ void PreviewChooser::refreshModel()
     {
         WebView *view = qobject_cast<WebView *>(mv->webTab(i)->view());
         
-        if(view->url().scheme() == "about:")
+        if(view->url().scheme() == "about")
             continue;
         
-        QStandardItem *it = new QStandardItem(view->icon(), view->title());
+        QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title());
         it->setData(QVariant(view->url()), Qt::ToolTipRole);
         m_model->insertRow(i, it);
     }
@@ -123,7 +132,7 @@ void PreviewChooser::setUrl(QModelIndex i)
 
 void PreviewChooser::buttonClicked(KDialog::ButtonCode code)
 {
-    if(code == KDialog::Apply || code == KDialog::Ok)
+    if(code == KDialog::Apply || (code == KDialog::Ok && isButtonEnabled(KDialog::Apply)))
     {
         emit urlChoosed(m_previewIndex, KUrl(m_line->text()));
         enableButtonApply(false);
diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h
index 79766fdc..3eae71db 100644
--- a/src/rekonqpage/previewchooser.h
+++ b/src/rekonqpage/previewchooser.h
@@ -46,7 +46,7 @@ class PreviewChooser : public KDialog
 Q_OBJECT
 
 public:
-    explicit PreviewChooser(int previewIndex);
+    explicit PreviewChooser(int previewIndex, QString url);
     virtual ~PreviewChooser();
 
 signals:
-- 
cgit v1.2.1


From 8b26d07972db5a2953e64f61bf86e2e31959a32f Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 31 Dec 2009 11:07:24 +0100
Subject: fix bug : closed Tabs replaced favorites when loaded

---
 src/rekonqpage/newtabpage.cpp | 9 ++++++++-
 src/rekonqpage/newtabpage.h   | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index c8b2e916..78928bca 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -53,6 +53,7 @@
 
 NewTabPage::NewTabPage(QWebFrame *frame)
     : m_root(frame->documentElement())
+    , m_url(KUrl())
 {
     QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
     
@@ -73,7 +74,7 @@ NewTabPage::~NewTabPage()
 }
 
 
-void NewTabPage::generate(const KUrl &url)
+void NewTabPage::generate(KUrl url)
 {    
     if(KUrl("about:preview").isParentOf(url))
     {
@@ -106,6 +107,7 @@ void NewTabPage::generate(const KUrl &url)
     {
         favoritesPage();
         title = i18n("Favorites");
+        url = KUrl("about:favorites");
     }
     else if(url == KUrl("about:closedTabs"))
     {
@@ -123,6 +125,8 @@ void NewTabPage::generate(const KUrl &url)
         title = i18n("Bookmarks");
     }
     
+    m_url = url;
+    
     m_root.document().findFirst("title").setPlainText(title);
 }
 
@@ -236,6 +240,9 @@ void NewTabPage::snapFinished()
     QWebElement prev = m_root.findFirst("#preview" + snap->data().toString());
     prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle()));
     
+    if(m_url != KUrl("about:favorites"))
+        return;
+    
     // Save the new config
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 973028b3..cdc3cb31 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -53,7 +53,7 @@ public:
      *  about: url and loads the corresponding part of the 
      *  new tab page
      */
-    void generate(const KUrl &url = KUrl("about:home"));
+    void generate(KUrl url = KUrl("about:home"));
     
 protected slots:
     void snapFinished();
@@ -97,6 +97,8 @@ private:
     QString m_html;
     
     QWebElement m_root;
+    
+    KUrl m_url;
 };
 
 #endif // REKONQ_NEW_TAB_PAGE
-- 
cgit v1.2.1


From 0c98fe6a475ec8003590db31eb6c9ab471a4b388 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 4 Jan 2010 18:22:50 +0100
Subject: tmp commit

---
 src/rekonqpage/previewchooser.cpp | 40 +++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp
index eeea9f99..79bdb068 100644
--- a/src/rekonqpage/previewchooser.cpp
+++ b/src/rekonqpage/previewchooser.cpp
@@ -51,7 +51,7 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url)
     setModal(true);
     
     setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok);
-    setDefaultButton(KDialog::Ok);
+    //setDefaultButton(KDialog::Ok);
     connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode)));
     
     m_treeView->setUniformRowHeights(true);
@@ -68,18 +68,7 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url)
     QLabel *searchLabel = new QLabel(i18n("adress:"));
     urlLayout->addWidget(searchLabel);
     m_line = new KLineEdit;
-    connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged()));
-    urlLayout->addWidget(m_line);
     
-    if(url.isEmpty() || url.startsWith("about:"))
-       m_line->setText(QString("http://"));
-    else
-    {
-        m_line->setText(url);
-        m_line->setSelection(8, m_line->text().size());
-    }
-    
-
     // setup view
     QVBoxLayout *vBoxLayout = new QVBoxLayout;
     vBoxLayout->setContentsMargins(0, 0, 0, 0);
@@ -94,6 +83,21 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url)
     m_treeView->setModel(m_model);
     
     connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex)));
+    
+    connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged()));
+    urlLayout->addWidget(m_line);
+    
+    if(url.isEmpty() || url.startsWith("about:"))
+        m_line->setText(QString("http://"));
+    else
+    {
+        m_line->setText(url);
+        m_line->setSelection(8, m_line->text().size());
+    }
+    
+    enableButtonApply(false);
+    setFocusProxy(mainWidget);
+    mainWidget->setFocusProxy(m_line);
 }
 
 
@@ -112,12 +116,12 @@ void PreviewChooser::refreshModel()
     {
         WebView *view = qobject_cast<WebView *>(mv->webTab(i)->view());
         
-        if(view->url().scheme() == "about")
-            continue;
-        
-        QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title());
-        it->setData(QVariant(view->url()), Qt::ToolTipRole);
-        m_model->insertRow(i, it);
+        if(view->url().scheme() != "about")
+        {
+            QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title());
+            it->setData(QVariant(view->url()), Qt::ToolTipRole);
+            m_model->appendRow(it);
+        }
     }
 }
 
-- 
cgit v1.2.1


From 544094302a51b919b1eea86b313ec10d47533a08 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 15 Jan 2010 17:20:51 +0100
Subject: A new approach for choosing previews : a bar appears, then you browse
 to the page you want to preview, and then you click a button

---
 src/CMakeLists.txt                    |   2 +-
 src/mainwindow.cpp                    |   5 ++
 src/mainwindow.h                      |   8 +-
 src/protocolhandler.cpp               |  33 +------
 src/rekonqpage/newtabpage.cpp         |  36 +++++---
 src/rekonqpage/newtabpage.h           |  11 ++-
 src/rekonqpage/previewchooser.cpp     | 157 ----------------------------------
 src/rekonqpage/previewchooser.h       |  70 ---------------
 src/rekonqpage/previewselectorbar.cpp | 138 ++++++++++++++++++++++++++++++
 src/rekonqpage/previewselectorbar.h   |  60 +++++++++++++
 src/webpage.cpp                       |  16 ++--
 src/webpage.h                         |   2 +
 src/websnap.cpp                       |  11 ++-
 src/websnap.h                         |   7 +-
 14 files changed, 268 insertions(+), 288 deletions(-)
 delete mode 100644 src/rekonqpage/previewchooser.cpp
 delete mode 100644 src/rekonqpage/previewchooser.h
 create mode 100644 src/rekonqpage/previewselectorbar.cpp
 create mode 100644 src/rekonqpage/previewselectorbar.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2ad18a02..00cfbf77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ SET( rekonq_KDEINIT_SRCS
     history/historypanel.cpp
     #----------------------------------------
     rekonqpage/newtabpage.cpp
-    rekonqpage/previewchooser.cpp
+    rekonqpage/previewselectorbar.cpp
     #----------------------------------------
     settings/settingsdialog.cpp
     #----------------------------------------
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ffc9f508..e11f6d19 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -98,6 +98,7 @@ MainWindow::MainWindow()
     : KMainWindow()
     , m_view( new MainView(this) )
     , m_findBar( new FindBar(this) )
+    , m_previewSelectorBar( new PreviewSelectorBar(this) )
     , m_historyPanel(0)
     , m_bookmarksPanel(0)
     , m_webInspectorPanel(0)
@@ -122,6 +123,7 @@ MainWindow::MainWindow()
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_view);
+    layout->addWidget(m_previewSelectorBar);
     layout->addWidget(m_findBar);
     centralWidget->setLayout(layout);
 
@@ -617,6 +619,9 @@ void MainWindow::updateActions()
 
     QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward));
     historyForwardAction->setEnabled(currentTab()->view()->history()->canGoForward());
+    
+    if(m_previewSelectorBar->isVisible())
+        m_previewSelectorBar->setPage(currentTab()->page());
 }
 
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7083591d..3a828afe 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,4 +1,5 @@
-/* ============================================================
+
+class PreviewSelectorBar;/* ============================================================
 *
 * This file is a part of the rekonq project
 *
@@ -32,6 +33,7 @@
 
 // Local Includes
 #include "application.h"
+#include "previewselectorbar.h"
 
 // KDE Includes
 #include <KMainWindow>
@@ -152,7 +154,9 @@ private slots:
 private:
     MainView *m_view;
     FindBar *m_findBar;
-    
+
+    PreviewSelectorBar *m_previewSelectorBar;
+
     HistoryPanel *m_historyPanel;
     BookmarksPanel *m_bookmarksPanel;
     WebInspectorPanel *m_webInspectorPanel;
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index c90afd19..a9339cfa 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -108,36 +108,9 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     // "about" handling
     if ( _url.protocol() == QLatin1String("about") )
     {
-        if( _url == KUrl("about:home") )
-        {
-            switch(ReKonfig::newTabStartPage())
-            {
-            case 0: // favorites
-                _url = KUrl("about:favorites");
-                break;
-            case 1: // closed tabs
-                _url = KUrl("about:closedTabs");
-                break;
-            case 2: // history
-                _url = KUrl("about:history");
-                break;
-            case 3: // bookmarks
-                _url = KUrl("about:bookmarks");
-                break;
-            default: // unuseful
-                break;
-            }
-        }
-        if( _url == KUrl("about:closedTabs")
-            || _url == KUrl("about:history")
-            || _url == KUrl("about:bookmarks")
-            || _url == KUrl("about:favorites")
-            )
-        {
-            NewTabPage p(frame);
-            p.generate(_url);
-            return true;
-        }
+        NewTabPage p(frame);
+        p.generate(_url);
+        return true;
     }
     
     return false;
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 78928bca..b075c186 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -36,7 +36,8 @@
 #include "application.h"
 #include "mainwindow.h"
 #include "mainview.h"
-#include "previewchooser.h"
+#include "websnap.h"
+#include "previewselectorbar.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -48,7 +49,6 @@
 
 // Qt Includes
 #include <QFile>
-#include <websnap.h>
 
 
 NewTabPage::NewTabPage(QWebFrame *frame)
@@ -86,10 +86,8 @@ void NewTabPage::generate(KUrl url)
         if(url.directory() == QString("preview/modify"))
         {
             int index = url.fileName().toInt();
-            QString url = m_root.findFirst("#preview" + QVariant(index).toString() + " > a").attribute("href");
-            PreviewChooser *pc = new PreviewChooser(index, url);
-            connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl)));
-            pc->show();
+            Application::instance()->mainWindow()->findChild<PreviewSelectorBar *>()
+                        ->enable(index, qobject_cast< WebPage* >(m_root.webFrame()->page()));
             return;
         }
     }
@@ -260,9 +258,6 @@ void NewTabPage::snapFinished()
 
 void NewTabPage::removePreview(int index)
 {
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    
-    
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
@@ -272,9 +267,9 @@ void NewTabPage::removePreview(int index)
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
     
-    // sync file data
     ReKonfig::self()->writeConfig();
     
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
     prev.replace(emptyPreview(index));
 }
 
@@ -285,18 +280,33 @@ void NewTabPage::setPreview(int index, KUrl url)
         return;
     
     QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    prev.replace(loadingPreview(index, url));
+    
+}
+
+
+void NewTabPage::setPreview(int index, WebPage* page)
+{
+    KUrl url = page->mainFrame()->url();
     
+    WebSnap::savePreview(WebSnap::renderPreview(*page), url);
+    
+    QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
+    
     urls.replace(index, url.toMimeDataString());
+    names.replace(index, page->mainFrame()->title());
+    
+    ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
+    
     ReKonfig::self()->writeConfig();
-
-    prev.replace(loadingPreview(index, url));
-
     
+    setPreview(index, url);
 }
 
 
+
 void NewTabPage::browsingMenu(const KUrl &currentUrl)
 {
     QList<QWebElement> navItems;
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index cdc3cb31..742d9209 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -55,10 +55,19 @@ public:
      */
     void generate(KUrl url = KUrl("about:home"));
     
-protected slots:
+public slots:
     void snapFinished();
     void removePreview(int index);
+    
+    /**
+        Used for recently closed tabs
+    */
     void setPreview(int index, KUrl url);
+    
+    /**
+        Used for favorites
+    */
+    void setPreview(int index, WebPage *page);
      
 protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp
deleted file mode 100644
index 79bdb068..00000000
--- a/src/rekonqpage/previewchooser.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "previewchooser.h"
-
-// Local Includes
-#include "rekonq.h"
-#include <bookmarkstreemodel.h>
-#include <bookmarksproxy.h>
-#include <mainview.h>
-#include <webtab.h>
-
-// Qt Includes
-#include <QLabel>
-#include <QVBoxLayout>
-
-// KDE Includes
-#include <KLineEdit>
-#include <KLocalizedString>
-
-
-PreviewChooser::PreviewChooser(int previewIndex, QString url)
-        : KDialog(0)
-        , m_treeView(new QTreeView)
-        , m_model(new QStandardItemModel)
-        , m_previewIndex(previewIndex)
-{
-    setMinimumSize(350, 100);
-    setWindowTitle(i18n("Set Page to preview"));
-    setModal(true);
-    
-    setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok);
-    //setDefaultButton(KDialog::Ok);
-    connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode)));
-    
-    m_treeView->setUniformRowHeights(true);
-    m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    m_treeView->setTextElideMode(Qt::ElideRight);
-    m_treeView->setHeaderHidden(true);
-    m_treeView->setIndentation(0);
-    
-    QWidget *mainWidget = new QWidget(this);
-
-    // add url bar
-    QHBoxLayout *urlLayout = new QHBoxLayout;
-    urlLayout->setContentsMargins(5, 0, 0, 0);
-    QLabel *searchLabel = new QLabel(i18n("adress:"));
-    urlLayout->addWidget(searchLabel);
-    m_line = new KLineEdit;
-    
-    // setup view
-    QVBoxLayout *vBoxLayout = new QVBoxLayout;
-    vBoxLayout->setContentsMargins(0, 0, 0, 0);
-    vBoxLayout->addLayout(urlLayout);
-    vBoxLayout->addWidget(m_treeView);
-    mainWidget->setLayout(vBoxLayout);
-    setMainWidget(mainWidget);
-    
-    refreshModel();
-    connect(Application::instance()->mainWindow()->mainView(), SIGNAL(tabsChanged()), SLOT(refreshModel()));
-    
-    m_treeView->setModel(m_model);
-    
-    connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex)));
-    
-    connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged()));
-    urlLayout->addWidget(m_line);
-    
-    if(url.isEmpty() || url.startsWith("about:"))
-        m_line->setText(QString("http://"));
-    else
-    {
-        m_line->setText(url);
-        m_line->setSelection(8, m_line->text().size());
-    }
-    
-    enableButtonApply(false);
-    setFocusProxy(mainWidget);
-    mainWidget->setFocusProxy(m_line);
-}
-
-
-PreviewChooser::~PreviewChooser()
-{
-    delete m_model;
-}
-
-
-
-void PreviewChooser::refreshModel()
-{
-    m_model->clear();
-    MainView *mv = Application::instance()->mainWindow()->mainView();
-    for(int i=0; i < mv->count(); ++i)
-    {
-        WebView *view = qobject_cast<WebView *>(mv->webTab(i)->view());
-        
-        if(view->url().scheme() != "about")
-        {
-            QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title());
-            it->setData(QVariant(view->url()), Qt::ToolTipRole);
-            m_model->appendRow(it);
-        }
-    }
-}
-
-void PreviewChooser::setUrl(QModelIndex i)
-{
-    if(!i.data().canConvert(QVariant::String))
-        return;
-    
-    m_line->setText(i.data(Qt::ToolTipRole).toString());
-}
-
-
-void PreviewChooser::buttonClicked(KDialog::ButtonCode code)
-{
-    if(code == KDialog::Apply || (code == KDialog::Ok && isButtonEnabled(KDialog::Apply)))
-    {
-        emit urlChoosed(m_previewIndex, KUrl(m_line->text()));
-        enableButtonApply(false);
-    }
-    
-    if(code == KDialog::Cancel || code == KDialog::Ok)
-    {
-        close();
-        deleteLater();
-    }
-}
-
-
-void PreviewChooser::urlChanged()
-{
-    enableButtonApply(true);
-}
-
diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h
deleted file mode 100644
index 3eae71db..00000000
--- a/src/rekonqpage/previewchooser.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef PREVIEWCHOOSER_H
-#define PREVIEWCHOOSER_H
-
-
-// Local Includes
-#include "application.h"
-
-// KDE Includes
-#include <KLineEdit>
-#include <KDialog>
-
-// Qt Includes
-#include <QWidget>
-#include <QTreeView>
-#include <QStandardItemModel>
-
-// Forward Declarations
-class KUrl;
-
-
-class PreviewChooser : public KDialog
-{
-Q_OBJECT
-
-public:
-    explicit PreviewChooser(int previewIndex, QString url);
-    virtual ~PreviewChooser();
-
-signals:
-    void urlChoosed(int, const KUrl &);
-    
-public slots:
-    void refreshModel();
-    void setUrl(QModelIndex i);
-    void buttonClicked(KDialog::ButtonCode code);
-    void urlChanged();
-
-private:
-    QTreeView *m_treeView;
-    QStandardItemModel *m_model;
-    
-    KLineEdit *m_line;
-    
-    int m_previewIndex;
-};
-
-#endif // PREVIEWCHOOSER_H
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
new file mode 100644
index 00000000..04e7f0ac
--- /dev/null
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -0,0 +1,138 @@
+/*
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+// Auto Includes
+#include "previewselectorbar.h"
+
+// KDE Includes
+#include <KIcon>
+#include <KLocalizedString>
+
+// Qt Includes
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QString>
+
+
+PreviewSelectorBar::PreviewSelectorBar(QWidget* parent)
+        : QWidget(parent)
+        , m_button(0)
+        , m_label(0)
+        , m_page(0)
+{
+    hide();
+}
+
+
+void PreviewSelectorBar::setup()
+{
+    if(m_button != 0)
+        return;
+    
+    m_label = new QLabel(i18n("Please go to the page you want to preview"), this);
+    m_label->setWordWrap(true);
+    
+    QToolButton *closeButton = new QToolButton(this);
+    closeButton->setAutoRaise(true);
+    closeButton->setIcon(KIcon("dialog-close"));
+    connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide()));
+    
+    m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this);
+    connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked()));
+    
+    // layout
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->addWidget(closeButton);
+    layout->addStretch();
+    layout->addWidget(m_label);
+    layout->addWidget(m_button);
+    
+    setLayout(layout);
+}
+
+
+void PreviewSelectorBar::setPage(WebPage* page)
+{
+    m_page = page;
+    verifyUrl();
+}
+
+
+void PreviewSelectorBar::verifyUrl()
+{
+    if(m_page->mainFrame()->url().scheme() != "about")
+    {
+        m_button->setEnabled(true);
+        m_button->setToolTip("");
+    }
+    else
+    {
+        m_button->setEnabled(false);
+        m_button->setToolTip(i18n("You can't set this page as preview"));
+    }
+}
+
+
+void PreviewSelectorBar::enable(int previewIndex, WebPage* page)
+{
+    if(m_page != 0)
+        disconnect(m_page, 0, this, 0);
+
+    
+    setup();
+    m_previewIndex = previewIndex;
+    m_page = page;
+    
+    verifyUrl();
+    
+    show();
+    
+    connect(page, SIGNAL(loadStarted()), SLOT(loadProgress()));
+    connect(page, SIGNAL(loadProgress(int)), SLOT(loadProgress()));
+    connect(page, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
+    connect(page->mainFrame(), SIGNAL(urlChanged(QUrl)), SLOT(verifyUrl()));
+}
+
+
+void PreviewSelectorBar::loadProgress()
+{
+    m_button->setEnabled(false);
+    m_button->setToolTip(i18n("Page is loading..."));
+}
+
+
+
+void PreviewSelectorBar::loadFinished()
+{
+    m_button->setEnabled(true);
+    m_button->setToolTip("");
+    
+    verifyUrl();
+}
+
+
+void PreviewSelectorBar::clicked()
+{
+    m_page->newTabPage()->setPreview(m_previewIndex, m_page);
+    m_page->mainFrame()->load(KUrl("about:favorites"));
+    hide();
+}
+
+
diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h
new file mode 100644
index 00000000..aa011fe4
--- /dev/null
+++ b/src/rekonqpage/previewselectorbar.h
@@ -0,0 +1,60 @@
+/*
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PREVIEWSELECTORBAR_H
+#define PREVIEWSELECTORBAR_H
+
+// Local Includes
+#include "webpage.h"
+
+// Qt Includes
+#include <QWidget>
+#include <QPushButton>
+#include <QLabel>
+
+class PreviewSelectorBar : public QWidget
+{
+    Q_OBJECT
+    
+    public:
+        PreviewSelectorBar(QWidget *parent = 0);
+        
+        void setPage(WebPage *page);
+        
+    public slots:
+        void enable(int previewIndex, WebPage *page);
+        void clicked();
+        
+        void loadProgress();
+        void loadFinished();
+        
+        void verifyUrl();
+        
+    private:
+        void setup();
+        
+        QPushButton *m_button;
+        QLabel *m_label;
+        
+        int m_previewIndex;
+        WebPage *m_page;
+    
+};
+
+#endif // PREVIEWSELECTORBAR_H
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 59df13e7..340e9805 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -72,7 +72,7 @@
 
 WebPage::WebPage(QObject *parent)
         : KWebPage(parent, KWalletIntegration)
-        , m_newTabPage(0)
+        , m_newTabPage(new NewTabPage(mainFrame() ))
 {
     setForwardUnsupportedContent(true);
 
@@ -104,6 +104,12 @@ WebPage::~WebPage()
 }
 
 
+NewTabPage* WebPage::newTabPage()
+{
+    return m_newTabPage;
+}
+
+
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
     // advise users on resubmitting data
@@ -115,14 +121,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
         if(risp == KMessageBox::Cancel)
             return false;
     }
-    
-    if (request.url().scheme() == QLatin1String("about"))
-    {
-        if(m_newTabPage == 0)
-            m_newTabPage = new NewTabPage(frame);
-        m_newTabPage->generate(request.url());
-        return false;
-    }
 
     if (frame && m_protHandler.preHandling( request, frame ))
     {
diff --git a/src/webpage.h b/src/webpage.h
index 5671b5d9..da91ea5c 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -55,6 +55,8 @@ class WebPage : public KWebPage
 public:
     explicit WebPage(QObject *parent = 0);
     ~WebPage();
+    
+    NewTabPage *newTabPage();
 
 public slots:
     void manageNetworkErrors(QNetworkReply *reply);
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 0d72ef3a..ff4746ca 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -42,10 +42,6 @@
 #include <QFile>
 
 
-#define WIDTH  200
-#define HEIGHT 150
-
-
 WebSnap::WebSnap(const QUrl &url)
     : QObject()
 {
@@ -115,6 +111,13 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
 }
 
 
+void WebSnap::savePreview(QPixmap pm, KUrl url)
+{
+    QFile::remove(fileForUrl(url).toLocalFile());
+    pm.save(fileForUrl(url).toLocalFile());
+}
+
+
 KUrl WebSnap::fileForUrl(KUrl url)
 {
     QString filePath = 
diff --git a/src/websnap.h b/src/websnap.h
index 04fded57..b8ada30f 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -37,6 +37,9 @@
 #include <QImage>
 #include <QWebPage>
 
+#define WIDTH  200
+#define HEIGHT 150
+
 
 /**
  * This class renders a site producing an image based
@@ -53,12 +56,14 @@ public:
     
     QPixmap previewImage(); // TODO : remove
     
-    static QPixmap renderPreview(const QWebPage &page, int w, int h);
+    static QPixmap renderPreview(const QWebPage &page, int w = WIDTH, int h = HEIGHT);
     
     static KUrl fileForUrl(KUrl url);
     
     static QString guessNameFromUrl(QUrl url);
     
+    static void savePreview(QPixmap pm, KUrl url);
+    
     QString snapTitle();
     QUrl snapUrl();
     
-- 
cgit v1.2.1


From 50d6ee1e340c35261b0445c1a2c793fb07da4854 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sun, 17 Jan 2010 19:06:27 +0100
Subject: bugfixing...

---
 src/rekonqpage/newtabpage.cpp         | 56 ++++-------------------------------
 src/rekonqpage/newtabpage.h           | 14 ++-------
 src/rekonqpage/previewselectorbar.cpp | 22 +++++++++++++-
 src/websnap.cpp                       |  4 ++-
 4 files changed, 31 insertions(+), 65 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index b075c186..f2609c19 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -26,6 +26,7 @@
 
 // Self Includes
 #include "newtabpage.h"
+#include "newtabpage.moc"
 
 // Auto Includes
 #include "rekonq.h"
@@ -183,8 +184,9 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     showControls(prev);
     
     WebSnap *snap = new WebSnap(url);
+    bool test = connect(snap, SIGNAL(finished()), this, SLOT(snapFinished()));
+    kDebug() << test;
     snap->SetData(QVariant(index));
-    connect(snap, SIGNAL(finished()), SLOT(snapFinished()));
     
     return prev;
 }
@@ -233,26 +235,11 @@ void NewTabPage::setupPreview(QWebElement e, int index)
 
 
 void NewTabPage::snapFinished()
-{
+{    
+    kDebug() << "called";
     WebSnap *snap = qobject_cast<WebSnap*>(sender());
     QWebElement prev = m_root.findFirst("#preview" + snap->data().toString());
     prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle()));
-    
-    if(m_url != KUrl("about:favorites"))
-        return;
-    
-    // Save the new config
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    // stripTrailingSlash to be sure to get the same string for same address
-    urls.replace(snap->data().toInt(), snap->snapUrl().toString(QUrl::StripTrailingSlash));
-    names.replace(snap->data().toInt() , snap->snapTitle());
-    
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-    
-    ReKonfig::self()->writeConfig();
 }
 
 
@@ -274,39 +261,6 @@ void NewTabPage::removePreview(int index)
 }
 
 
-void NewTabPage::setPreview(int index, KUrl url)
-{
-    if(url.isEmpty())
-        return;
-    
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    prev.replace(loadingPreview(index, url));
-    
-}
-
-
-void NewTabPage::setPreview(int index, WebPage* page)
-{
-    KUrl url = page->mainFrame()->url();
-    
-    WebSnap::savePreview(WebSnap::renderPreview(*page), url);
-    
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    urls.replace(index, url.toMimeDataString());
-    names.replace(index, page->mainFrame()->title());
-    
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-    
-    ReKonfig::self()->writeConfig();
-    
-    setPreview(index, url);
-}
-
-
-
 void NewTabPage::browsingMenu(const KUrl &currentUrl)
 {
     QList<QWebElement> navItems;
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 742d9209..1057c7cc 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -32,8 +32,8 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QObject>
+#include <QString>
 #include <QWebElement>
 
 // Forward Includes
@@ -58,16 +58,6 @@ public:
 public slots:
     void snapFinished();
     void removePreview(int index);
-    
-    /**
-        Used for recently closed tabs
-    */
-    void setPreview(int index, KUrl url);
-    
-    /**
-        Used for favorites
-    */
-    void setPreview(int index, WebPage *page);
      
 protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index 04e7f0ac..bbdce9d4 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -21,6 +21,10 @@
 // Auto Includes
 #include "previewselectorbar.h"
 
+// Local Include
+#include "rekonq.h"
+#include "websnap.h"
+
 // KDE Includes
 #include <KIcon>
 #include <KLocalizedString>
@@ -130,8 +134,24 @@ void PreviewSelectorBar::loadFinished()
 
 void PreviewSelectorBar::clicked()
 {
-    m_page->newTabPage()->setPreview(m_previewIndex, m_page);
+    KUrl url = m_page->mainFrame()->url();
+    
+    WebSnap::savePreview(WebSnap::renderPreview(*m_page), url);
+    
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
+    
+    urls.replace(m_previewIndex, url.toMimeDataString());
+    names.replace(m_previewIndex, m_page->mainFrame()->title());
+    
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
+    ReKonfig::self()->writeConfig();
+    
+    
     m_page->mainFrame()->load(KUrl("about:favorites"));
+    
     hide();
 }
 
diff --git a/src/websnap.cpp b/src/websnap.cpp
index ff4746ca..fde7bd94 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -108,6 +108,8 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
 
     return QPixmap::fromImage(pageImage);
+    
+    kDebug() << w << h;
 }
 
 
@@ -172,8 +174,8 @@ void WebSnap::saveResult(bool ok)
     }
     QFile::remove(fileForUrl(m_url).toLocalFile());
     m_image.save(fileForUrl(m_url).toLocalFile());
-    kDebug() << "finished";
     
+    kDebug() << "finished";
     emit finished();
 }
 
-- 
cgit v1.2.1


From d7b37b950bb9ac396914d937df44891e02a64811 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 29 Jan 2010 19:55:08 +0100
Subject: bugfix : previews were sometimes saved using the good size

---
 src/rekonqpage/previewselectorbar.cpp |  2 +-
 src/websnap.cpp                       | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index bbdce9d4..00950526 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -135,7 +135,7 @@ void PreviewSelectorBar::loadFinished()
 void PreviewSelectorBar::clicked()
 {
     KUrl url = m_page->mainFrame()->url();
-    
+
     WebSnap::savePreview(WebSnap::renderPreview(*m_page), url);
     
     QStringList names = ReKonfig::previewNames();
diff --git a/src/websnap.cpp b/src/websnap.cpp
index fde7bd94..983da716 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -80,17 +80,10 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
 
     // find the best size
     QSize size;
-    if (page.viewportSize().width() && page.viewportSize().height())
-    {
-        size = page.viewportSize();
-    }
-    else
-    {
-        int width = page.mainFrame()->contentsSize().width();
-        if (width < 640) width = 640;
-        size = QSize(width,width*((0.0+h)/w));
-        page.setViewportSize(size);
-    }
+    int width = page.mainFrame()->contentsSize().width();
+    if (width < 640) width = 640;
+    size = QSize(width,width*((0.0+h)/w));
+    page.setViewportSize(size);
     
     // create the page image
     QImage pageImage = QImage(size, QImage::Format_ARGB32_Premultiplied);
@@ -108,13 +101,12 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
 
     return QPixmap::fromImage(pageImage);
-    
-    kDebug() << w << h;
 }
 
 
 void WebSnap::savePreview(QPixmap pm, KUrl url)
 {
+    kDebug() << "saving preview";
     QFile::remove(fileForUrl(url).toLocalFile());
     pm.save(fileForUrl(url).toLocalFile());
 }
-- 
cgit v1.2.1


From 40a13302af46792cb139d59d7f66e12b46644392 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sun, 31 Jan 2010 11:28:31 +0100
Subject: Last bugs : layout fixes and empty urlbar when going back to homepage

---
 src/rekonqpage/previewselectorbar.cpp | 4 +++-
 src/urlbar/urlbar.cpp                 | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index 00950526..e7800f09 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -59,15 +59,17 @@ void PreviewSelectorBar::setup()
     connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide()));
     
     m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this);
+    m_button->setMaximumWidth(250);
     connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked()));
     
     // layout
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(closeButton);
-    layout->addStretch();
     layout->addWidget(m_label);
     layout->addWidget(m_button);
     
+    layout->setContentsMargins(2, 0, 2, 0);
+    
     setLayout(layout);
 }
 
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index adeba6ae..4d9765a2 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -148,7 +148,6 @@ void UrlBar::setUrl(const QUrl& url)
         m_currentUrl = KUrl(url);
         updateUrl();
     }
-
 }
 
 
-- 
cgit v1.2.1


From dd2b45b7592bdefd14665c13cec2b7db6728d800 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sun, 31 Jan 2010 15:53:29 +0100
Subject: Add tooltips to buttons

---
 src/rekonqpage/newtabpage.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index f2609c19..8a1ca89f 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -224,8 +224,10 @@ void NewTabPage::setupPreview(QWebElement e, int index)
 {
     e.findFirst(".remove img").setAttribute("src", QString("file:///") +
     KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+    e.findFirst(".remove").setAttribute("title", "Remove favorite");
     e.findFirst(".modify img").setAttribute("src", QString("file:///") +
     KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
+    e.findFirst(".modify").setAttribute("title", "Set new favorite");
     
     e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
     e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString()));
-- 
cgit v1.2.1


From b9b292845f2953396fc088c551b31f79eddd3caa Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sun, 31 Jan 2010 15:57:24 +0100
Subject: Changed strings following pano's recommandations

---
 src/rekonqpage/previewselectorbar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index e7800f09..5f3956d7 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -50,7 +50,7 @@ void PreviewSelectorBar::setup()
     if(m_button != 0)
         return;
     
-    m_label = new QLabel(i18n("Please go to the page you want to preview"), this);
+    m_label = new QLabel(i18n("Please open up the webpage you want to add as favorite"), this);
     m_label->setWordWrap(true);
     
     QToolButton *closeButton = new QToolButton(this);
@@ -58,7 +58,7 @@ void PreviewSelectorBar::setup()
     closeButton->setIcon(KIcon("dialog-close"));
     connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide()));
     
-    m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this);
+    m_button = new QPushButton(KIcon("insert-image"), i18n("Set to This Page"), this);
     m_button->setMaximumWidth(250);
     connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked()));
     
@@ -91,7 +91,7 @@ void PreviewSelectorBar::verifyUrl()
     else
     {
         m_button->setEnabled(false);
-        m_button->setToolTip(i18n("You can't set this page as preview"));
+        m_button->setToolTip(i18n("You can not add this webpage as favorite"));
     }
 }
 
-- 
cgit v1.2.1


From 1c1f1edd697aca0bf96d8d61c40e45166b5f1d02 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 3 Feb 2010 14:51:38 +0100
Subject: Remove m_newtabPage. That was not used anywhere !

---
 src/webpage.cpp | 7 -------
 src/webpage.h   | 3 ---
 2 files changed, 10 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 340e9805..f2ea412d 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -72,7 +72,6 @@
 
 WebPage::WebPage(QObject *parent)
         : KWebPage(parent, KWalletIntegration)
-        , m_newTabPage(new NewTabPage(mainFrame() ))
 {
     setForwardUnsupportedContent(true);
 
@@ -104,12 +103,6 @@ WebPage::~WebPage()
 }
 
 
-NewTabPage* WebPage::newTabPage()
-{
-    return m_newTabPage;
-}
-
-
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
     // advise users on resubmitting data
diff --git a/src/webpage.h b/src/webpage.h
index da91ea5c..c8ecc89a 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -55,8 +55,6 @@ class WebPage : public KWebPage
 public:
     explicit WebPage(QObject *parent = 0);
     ~WebPage();
-    
-    NewTabPage *newTabPage();
 
 public slots:
     void manageNetworkErrors(QNetworkReply *reply);
@@ -80,7 +78,6 @@ private:
 
     QUrl m_requestedUrl;
     ProtocolHandler m_protHandler;
-    NewTabPage *m_newTabPage;
 };
 
 #endif
-- 
cgit v1.2.1


From 697d05328acd76de7a73145056ef22c8083f3ca4 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 4 Feb 2010 17:29:13 +0100
Subject: Do not try to load homepage if url is not valid

---
 src/rekonqpage/newtabpage.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 8a1ca89f..49f4e837 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -93,6 +93,14 @@ void NewTabPage::generate(KUrl url)
         }
     }
     
+    if(    url != KUrl("about:home")
+        && url != KUrl("about:favorites")
+        && url != KUrl("about:closedTabs")
+        && url != KUrl("about:history")
+        && url != KUrl("about:bookmarks")
+        )
+        return;
+    
     
     QWebPage *page = m_root.webFrame()->page();
     page->mainFrame()->setHtml(m_html);
-- 
cgit v1.2.1


From 6f3b61c0462b08d3c2a34ac1923470a3690233ee Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sat, 6 Feb 2010 11:19:18 +0100
Subject: Fix loading previews : when load finished, result wasn't shown

---
 src/data/home.html            |  4 ++--
 src/rekonqpage/newtabpage.cpp | 47 +++++++++++++++++++++++++++++++------------
 src/rekonqpage/newtabpage.h   |  2 +-
 src/websnap.cpp               | 27 +++++++++++--------------
 src/websnap.h                 | 11 +++-------
 5 files changed, 52 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 103c559d..51b9ceec 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -66,7 +66,7 @@ color: black;
 /* ------------------------------------------------------- */
 /* page sections */
 
-#container {
+#rekonq-newtabpage {
 width: 100%;
 }
 
@@ -191,7 +191,7 @@ margin-bottom: 0.5em;
 
 <body>
 
-<div id="container">
+<div id="rekonq-newtabpage">
     <div id="navigation">
     </div>
     
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 49f4e837..19f1686f 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -76,7 +76,7 @@ NewTabPage::~NewTabPage()
 
 
 void NewTabPage::generate(KUrl url)
-{    
+{
     if(KUrl("about:preview").isParentOf(url))
     {
         if(url.directory() == QString("preview/remove"))
@@ -140,10 +140,10 @@ void NewTabPage::generate(KUrl url)
 
 void NewTabPage::favoritesPage()
 {
+    m_root.addClass("favorites");
+    
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
-
-    m_root.addClass("favorites");
     
     for(int i=0; i<8; ++i)
     {
@@ -187,14 +187,12 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     prev.findFirst(".preview img").setAttribute("src" , 
                 QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
     prev.findFirst("span").appendInside(i18n("Loading Preview..."));
+    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
     
     setupPreview(prev, index);
     showControls(prev);
     
-    WebSnap *snap = new WebSnap(url);
-    bool test = connect(snap, SIGNAL(finished()), this, SLOT(snapFinished()));
-    kDebug() << test;
-    snap->SetData(QVariant(index));
+    new WebSnap(url, m_root.webFrame()->page(), index);
     
     return prev;
 }
@@ -244,12 +242,29 @@ void NewTabPage::setupPreview(QWebElement e, int index)
 }
 
 
-void NewTabPage::snapFinished()
-{    
-    kDebug() << "called";
-    WebSnap *snap = qobject_cast<WebSnap*>(sender());
-    QWebElement prev = m_root.findFirst("#preview" + snap->data().toString());
-    prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle()));
+void NewTabPage::snapFinished(int index, KUrl url, QString title)
+{
+    // do not try to modify the page if it isn't the newTabPage
+    if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
+        return;
+    
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    QWebElement newPrev = validPreview(index, url, title);
+    
+    if(m_root.findAll(".closedTabs").count() != 0)
+        hideControls(newPrev);
+    
+    prev.replace(newPrev);
+    
+    // update title
+    if(m_root.findAll(".favorites").count() != 0)
+    {
+        QStringList names = ReKonfig::previewNames();
+        names.replace(index, title);
+        ReKonfig::setPreviewNames(names);
+        
+        ReKonfig::self()->writeConfig();
+    }
 }
 
 
@@ -319,6 +334,8 @@ void NewTabPage::browsingMenu(const KUrl &currentUrl)
 
 void NewTabPage::historyPage()
 {
+    m_root.addClass("history");
+    
     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
     
     int i = 0;
@@ -349,6 +366,8 @@ void NewTabPage::historyPage()
 
 void NewTabPage::bookmarksPage()
 {
+    m_root.addClass("bookmarks");
+    
     KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
     if (bookGroup.isNull())
     {
@@ -395,6 +414,8 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent)
 
 void NewTabPage::closedTabsPage()
 {
+    m_root.addClass("closedTabs");
+    
     QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
     
     for(int i=0; i < links.count(); ++i)
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 1057c7cc..9d41946e 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -56,7 +56,7 @@ public:
     void generate(KUrl url = KUrl("about:home"));
     
 public slots:
-    void snapFinished();
+    void snapFinished(int index, KUrl url, QString title);
     void removePreview(int index);
      
 protected:  // these are the function to build the new tab page
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 983da716..11b70e9e 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -29,6 +29,9 @@
 #include "websnap.h"
 #include "websnap.moc"
 
+// Local Includes
+#include "newtabpage.h"
+
 // KDE Includes
 #include <KDebug>
 #include <KStandardDirs>
@@ -42,10 +45,12 @@
 #include <QFile>
 
 
-WebSnap::WebSnap(const QUrl &url)
+WebSnap::WebSnap(const QUrl& url, QWebPage* originatingPage, int previewIndex)
     : QObject()
 {
     m_url = url;
+    m_originatingPage = originatingPage;
+    m_previewIndex = previewIndex;
 
     // this to not register websnap history
     m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
@@ -120,18 +125,6 @@ KUrl WebSnap::fileForUrl(KUrl url)
 }
 
 
-void WebSnap::SetData(QVariant data)
-{
-    m_data = data;
-}
-
-QVariant& WebSnap::data()
-{
-    return m_data;
-}
-
-
-
 QString WebSnap::guessNameFromUrl(QUrl url)
 {
     QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
@@ -163,12 +156,16 @@ void WebSnap::saveResult(bool ok)
     else
     {
         m_image = renderPreview(m_page, WIDTH, HEIGHT);
+        m_snapTitle = m_page.mainFrame()->title();
     }
     QFile::remove(fileForUrl(m_url).toLocalFile());
     m_image.save(fileForUrl(m_url).toLocalFile());
     
-    kDebug() << "finished";
-    emit finished();
+    //m_originatingPage->mainFrame()->load(KUrl("about:preview/replace/" + QVariant(m_previewIndex).toString()));
+    NewTabPage p(m_originatingPage->mainFrame());
+    p.snapFinished(m_previewIndex, m_url, m_snapTitle);
+    
+    deleteLater();
 }
 
 
diff --git a/src/websnap.h b/src/websnap.h
index b8ada30f..e15c2dcf 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -51,7 +51,7 @@ class WebSnap : public QObject
     Q_OBJECT
 
 public:
-    WebSnap(const QUrl &url);
+    WebSnap(const QUrl &url, QWebPage *originatingPage, int previewIndex);
     ~WebSnap();
     
     QPixmap previewImage(); // TODO : remove
@@ -66,12 +66,6 @@ public:
     
     QString snapTitle();
     QUrl snapUrl();
-    
-    void SetData(QVariant data);
-    QVariant& data();
-
-signals:
-    void finished();
 
 private slots:
     void load();
@@ -84,7 +78,8 @@ private:
     QUrl m_url;
     QString m_snapTitle;
     
-    QVariant m_data;
+    QWebPage *m_originatingPage;
+    int m_previewIndex;
 };
 
 #endif // WEB_SNAP_H
-- 
cgit v1.2.1


From 79ce24b2d2d50c5dd594c25200122d07bb0e232c Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Tue, 2 Feb 2010 18:42:19 +0100
Subject: Replace zoom setting submenu by a widget with a slider

---
 src/mainview.cpp   |  4 +++
 src/mainwindow.cpp | 91 +++++++++++++++++++++++++++++++++++++-----------------
 src/mainwindow.h   | 14 ++++++---
 3 files changed, 77 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index b26e7466..02823d3b 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -306,6 +306,10 @@ void MainView::currentChanged(int index)
         emit browserTabLoading(true);
     else
         emit browserTabLoading(false);
+    
+    // update zoom slider
+    if(!Application::instance()->mainWindowList().isEmpty())
+        Application::instance()->mainWindow()->setZoomSliderFactor(tab->view()->zoomFactor());
 
     // set focus to the current webview
     tab->setFocus();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ffc9f508..30e5a061 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -298,20 +298,20 @@ void MainWindow::setupActions()
 
 
     // ============================= Zoom Actions ===================================
-    a = new KAction(KIcon("zoom-in"), i18n("&Enlarge Font"), this);
+    a = new KAction(KIcon("zoom-in"), i18n("&Zoom In"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Plus));
-    actionCollection()->addAction(QLatin1String("bigger_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextBigger()));
-
-    a = new KAction(KIcon("zoom-original"),  i18n("&Normal Font"), this);
+    actionCollection()->addAction(QLatin1String("zoom_in"), a);
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(zoomIn()));
+    
+    a = new KAction(KIcon("zoom-original"),  i18n("&Normal Zoom"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_0));
-    actionCollection()->addAction(QLatin1String("normal_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextNormal()));
+    actionCollection()->addAction(QLatin1String("zoom_normal"), a);
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(zoomNormal()));
 
-    a = new KAction(KIcon("zoom-out"),  i18n("&Shrink Font"), this);
+    a = new KAction(KIcon("zoom-out"),  i18n("&Zoom Out"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Minus));
-    actionCollection()->addAction(QLatin1String("smaller_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextSmaller()));
+    actionCollection()->addAction(QLatin1String("zoom_out"), a);
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(zoomOut()));
 
     // =============================== Tools Actions =================================
     a = new KAction(i18n("Page S&ource"), this);
@@ -409,12 +409,43 @@ void MainWindow::setupTools()
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
-
-    KActionMenu *fontMenu = new KActionMenu(KIcon("page-zoom"), i18n("Zoom"), this);
-    fontMenu->addAction(actionByName(QLatin1String("smaller_font")));
-    fontMenu->addAction(actionByName(QLatin1String("normal_font")));
-    fontMenu->addAction(actionByName(QLatin1String("bigger_font")));
-    toolsMenu->addAction(fontMenu);
+    
+    
+    
+    // setup zoom widget
+    QWidget *zoomWidget = new QWidget(this);
+    
+    QToolButton *zoomOut = new QToolButton(zoomWidget);
+    zoomOut->setDefaultAction(actionByName(QLatin1String("zoom_out")));
+    zoomOut->setAutoRaise(true);
+    
+    m_zoomSlider = new QSlider(Qt::Horizontal, zoomWidget);
+    m_zoomSlider->setTracking(true);
+    m_zoomSlider->setRange(1, 19);      // divide by 10 to obtain a qreal for zoomFactor()
+    m_zoomSlider->setValue(10);
+    m_zoomSlider->setPageStep(3);
+    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomFactor(int)));
+    
+    QToolButton *zoomIn = new QToolButton(zoomWidget);
+    zoomIn->setDefaultAction(actionByName(QLatin1String("zoom_in")));
+    zoomIn->setAutoRaise(true);
+    
+    QToolButton *zoomNormal = new QToolButton(zoomWidget);
+    zoomNormal->setDefaultAction(actionByName(QLatin1String("zoom_normal")));
+    zoomNormal->setAutoRaise(true);
+    
+    QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(zoomWidget);
+    zoomWidgetLayout->setSpacing(0);
+    zoomWidgetLayout->setMargin(0);
+    zoomWidgetLayout->addWidget(zoomOut);
+    zoomWidgetLayout->addWidget(m_zoomSlider);
+    zoomWidgetLayout->addWidget(zoomIn);
+    zoomWidgetLayout->addWidget(zoomNormal);
+    
+    QWidgetAction *zoomAction = new QWidgetAction(this);
+    zoomAction->setDefaultWidget(zoomWidget);
+    toolsMenu->addAction(zoomAction);
+    
 
     toolsMenu->addSeparator();
 
@@ -759,27 +790,31 @@ void MainWindow::findPrevious()
 }
 
 
-void MainWindow::viewTextBigger()
+void MainWindow::zoomIn()
 {
-    if (!currentTab())
-        return;
-    currentTab()->view()->setTextSizeMultiplier(currentTab()->view()->textSizeMultiplier() + 0.1);
+    m_zoomSlider->setValue(m_zoomSlider->value() + 1);
 }
 
-
-void MainWindow::viewTextNormal()
+void MainWindow::zoomNormal()
 {
-    if (!currentTab())
-        return;
-    currentTab()->view()->setTextSizeMultiplier(1.0);
+    m_zoomSlider->setValue(10);
 }
 
+void MainWindow::zoomOut()
+{
+    m_zoomSlider->setValue(m_zoomSlider->value() - 1);
+}
 
-void MainWindow::viewTextSmaller()
+void MainWindow::setZoomFactor(int factor)
 {
-    if (!currentTab())
+    if(!currentTab())
         return;
-    currentTab()->view()->setTextSizeMultiplier(currentTab()->view()->textSizeMultiplier() - 0.1);
+    currentTab()->view()->setZoomFactor(QVariant(factor).toReal() / 10);
+}
+
+void MainWindow::setZoomSliderFactor(qreal factor)
+{
+    m_zoomSlider->setValue(factor*10);
 }
 
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7083591d..35632c64 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -41,6 +41,7 @@
 
 // Forward Declarations
 class QWebFrame;
+class QSlider;
 
 class KAction;
 class KPassivePopup;
@@ -72,7 +73,9 @@ public:
     virtual QSize sizeHint() const;
     virtual KActionCollection *actionCollection () const;
     void setWidgetsVisible(bool makeFullScreen);
-   
+
+    void setZoomSliderFactor(qreal factor);
+
 private:
     void setupActions();
     void setupTools();
@@ -125,9 +128,10 @@ private slots:
     void findPrevious();
 
     // Zoom slots
-    void viewTextBigger();
-    void viewTextNormal();
-    void viewTextSmaller();
+    void zoomIn();
+    void zoomNormal();
+    void zoomOut();
+    void setZoomFactor(int factor);
 
     // File Menu slots
     void openLocation();
@@ -163,6 +167,8 @@ private:
     KToolBar *m_mainBar;
     KToolBar *m_bmBar;
 
+    QSlider *m_zoomSlider;
+
     QString m_lastSearch;
 
     KPassivePopup *m_popup;
-- 
cgit v1.2.1


From 595760ddc38f35c8307eac5eb797975b6482461b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 8 Feb 2010 10:35:54 +0100
Subject: Fix tab preview. WeakPointer misconcept

---
 src/tabbar.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 5e1feb56..58216991 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -161,6 +161,7 @@ void TabBar::showTabPreview(int tab)
     int h = w*((0.0 + currentView->height())/currentView->width());
 
     //delete previous tab preview
+    delete m_previewPopup.data();
     m_previewPopup.clear();
     
     m_previewPopup = new KPassivePopup(this);
-- 
cgit v1.2.1


From 73721c2a057fc5b346d127dbab826859e796e454 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 9 Feb 2010 10:44:04 +0100
Subject: FIX Delete ASAP the threaded job fix focus navigation while opening
 new tabs back/fore ground..

---
 src/application.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 14fd5ce0..6989eee7 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -380,10 +380,12 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job)
     KUrl url = threadedJob->url();
     WebView *view = threadedJob->view();
     
+    // Bye and thanks :)
+    delete threadedJob;
+    
     if (view)
     {
         view->load(url);    
-        view->setFocus();
         
         // we are sure of the url now, let's add it to history
         // anyway we store here just http sites because local and ftp ones are
@@ -391,7 +393,4 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job)
         if( url.protocol() == QLatin1String("http") || url.protocol() == QLatin1String("https") )
             historyManager()->addHistoryEntry( url.prettyUrl() );
     }
-    
-    // Bye and thanks :)
-    delete threadedJob;
 }
-- 
cgit v1.2.1


From 57bc503662183f0d2b89ddc419548e0938c17e8f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 9 Feb 2010 11:15:10 +0100
Subject: Fix NewTabPage API && comments

---
 src/rekonqpage/newtabpage.cpp |  4 ++++
 src/rekonqpage/newtabpage.h   | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 19f1686f..95b15ed9 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -197,6 +197,7 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     return prev;
 }
 
+
 QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
 {
     QWebElement prev = markup(".thumbnail");
@@ -220,12 +221,15 @@ void NewTabPage::hideControls(QWebElement e)
     e.findFirst(".remove").setStyleProperty("visibility", "hidden");
     e.findFirst(".modify").setStyleProperty("visibility", "hidden");
 }
+
+
 void NewTabPage::showControls(QWebElement e)
 {
     e.findFirst(".remove").setStyleProperty("visibility", "visible");
     e.findFirst(".modify").setStyleProperty("visibility", "visible");
 }
 
+
 void NewTabPage::setupPreview(QWebElement e, int index)
 {
     e.findFirst(".remove img").setAttribute("src", QString("file:///") +
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 9d41946e..38d82684 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -44,18 +44,17 @@ class WebPage;
 class NewTabPage : public QObject
 {
 Q_OBJECT
+
 public:
     NewTabPage(QWebFrame *frame);
     ~NewTabPage();
 
     /**
-     *  This is the unique NewTabPage public method. It takes an
-     *  about: url and loads the corresponding part of the 
-     *  new tab page
+     * This method takes an about: url and loads 
+     * the corresponding part of the new tab page
      */
     void generate(KUrl url = KUrl("about:home"));
     
-public slots:
     void snapFinished(int index, KUrl url, QString title);
     void removePreview(int index);
      
@@ -63,6 +62,10 @@ protected:  // these are the function to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
 
     void favoritesPage();
+    void historyPage();
+    void bookmarksPage();
+    void closedTabsPage();
+
     QWebElement emptyPreview(int index);
     QWebElement loadingPreview(int index, KUrl url);
     QWebElement validPreview(int index, KUrl url, QString title);
@@ -73,12 +76,7 @@ protected:  // these are the function to build the new tab page
     void hideControls(QWebElement e);
     void showControls(QWebElement e);
     void setupPreview(QWebElement e, int index);
-    
-    
-    void historyPage();
-    void bookmarksPage();
-    void closedTabsPage();
-
+     
 private:
     void createBookItem(const KBookmark &bookmark, QWebElement parent);
     
-- 
cgit v1.2.1


From 7628a51f8afe0518c05ab41348560852ed313a34 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 9 Feb 2010 11:56:16 +0100
Subject: Free MainWindow from PreviewSelectorBar WARNING: it doesn't compile

---
 src/mainwindow.cpp | 5 -----
 src/mainwindow.h   | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9e6bfb03..e4890b72 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -98,7 +98,6 @@ MainWindow::MainWindow()
     : KMainWindow()
     , m_view( new MainView(this) )
     , m_findBar( new FindBar(this) )
-    , m_previewSelectorBar( new PreviewSelectorBar(this) )
     , m_historyPanel(0)
     , m_bookmarksPanel(0)
     , m_webInspectorPanel(0)
@@ -123,7 +122,6 @@ MainWindow::MainWindow()
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_view);
-    layout->addWidget(m_previewSelectorBar);
     layout->addWidget(m_findBar);
     centralWidget->setLayout(layout);
 
@@ -650,9 +648,6 @@ void MainWindow::updateActions()
 
     QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward));
     historyForwardAction->setEnabled(currentTab()->view()->history()->canGoForward());
-    
-    if(m_previewSelectorBar->isVisible())
-        m_previewSelectorBar->setPage(currentTab()->page());
 }
 
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f7746893..7a51cc10 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,5 +1,5 @@
 
-class PreviewSelectorBar;/* ============================================================
+/* ============================================================
 *
 * This file is a part of the rekonq project
 *
@@ -159,8 +159,6 @@ private:
     MainView *m_view;
     FindBar *m_findBar;
 
-    PreviewSelectorBar *m_previewSelectorBar;
-
     HistoryPanel *m_historyPanel;
     BookmarksPanel *m_bookmarksPanel;
     WebInspectorPanel *m_webInspectorPanel;
-- 
cgit v1.2.1


From e8e00372f5e1a881b1ce83a3623208dae7833f4c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 9 Feb 2010 12:32:58 +0100
Subject: HUGE CHANGE on Preview Page Choosing

The idea here is to free rekonq from unuseful weight while browsing
and better maintain code.
- Moved PreviewSelectorBar to be one of the WebTab bar
- (this way position moved to up rather then down)
- creation on use && deletion on close (SAVE MEMORY)
- free others page for browsing
- fix copyright
- CLEAN API (is private/public a misconception?) && comments
---
 src/rekonqpage/newtabpage.cpp         |   4 +-
 src/rekonqpage/previewselectorbar.cpp | 140 ++++++++++++++++------------------
 src/rekonqpage/previewselectorbar.h   |  85 +++++++++++----------
 src/webinspectorpanel.cpp             |   6 +-
 src/webinspectorpanel.h               |   2 +-
 src/webtab.cpp                        |  14 ++++
 src/webtab.h                          |   5 +-
 7 files changed, 134 insertions(+), 122 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 95b15ed9..7a373f62 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -39,6 +39,7 @@
 #include "mainview.h"
 #include "websnap.h"
 #include "previewselectorbar.h"
+#include "webtab.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -87,8 +88,7 @@ void NewTabPage::generate(KUrl url)
         if(url.directory() == QString("preview/modify"))
         {
             int index = url.fileName().toInt();
-            Application::instance()->mainWindow()->findChild<PreviewSelectorBar *>()
-                        ->enable(index, qobject_cast< WebPage* >(m_root.webFrame()->page()));
+            Application::instance()->mainWindow()->currentTab()->createPreviewSelectorBar(index);
             return;
         }
     }
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index 5f3956d7..564d286c 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -1,29 +1,40 @@
-/*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
 
 
 // Auto Includes
 #include "previewselectorbar.h"
+#include "previewselectorbar.moc"
 
 // Local Include
 #include "rekonq.h"
 #include "websnap.h"
+#include "application.h"
+#include "mainwindow.h"
+#include "webtab.h"
 
 // KDE Includes
 #include <KIcon>
@@ -35,32 +46,23 @@
 #include <QString>
 
 
-PreviewSelectorBar::PreviewSelectorBar(QWidget* parent)
+PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent)
         : QWidget(parent)
         , m_button(0)
         , m_label(0)
-        , m_page(0)
+        , m_previewIndex(index)
 {
-    hide();
-}
-
-
-void PreviewSelectorBar::setup()
-{
-    if(m_button != 0)
-        return;
-    
     m_label = new QLabel(i18n("Please open up the webpage you want to add as favorite"), this);
     m_label->setWordWrap(true);
     
     QToolButton *closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
     closeButton->setIcon(KIcon("dialog-close"));
-    connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide()));
+    connect(closeButton, SIGNAL(clicked(bool)), this, SLOT(destroy()));
     
     m_button = new QPushButton(KIcon("insert-image"), i18n("Set to This Page"), this);
     m_button->setMaximumWidth(250);
-    connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked()));
+    connect(m_button, SIGNAL(clicked(bool)), this, SLOT(clicked()));
     
     // layout
     QHBoxLayout *layout = new QHBoxLayout(this);
@@ -74,16 +76,15 @@ void PreviewSelectorBar::setup()
 }
 
 
-void PreviewSelectorBar::setPage(WebPage* page)
+PreviewSelectorBar::~PreviewSelectorBar()
 {
-    m_page = page;
-    verifyUrl();
 }
 
 
 void PreviewSelectorBar::verifyUrl()
 {
-    if(m_page->mainFrame()->url().scheme() != "about")
+    
+    if(Application::instance()->mainWindow()->currentTab()->page()->mainFrame()->url().scheme() != "about")
     {
         m_button->setEnabled(true);
         m_button->setToolTip("");
@@ -96,27 +97,6 @@ void PreviewSelectorBar::verifyUrl()
 }
 
 
-void PreviewSelectorBar::enable(int previewIndex, WebPage* page)
-{
-    if(m_page != 0)
-        disconnect(m_page, 0, this, 0);
-
-    
-    setup();
-    m_previewIndex = previewIndex;
-    m_page = page;
-    
-    verifyUrl();
-    
-    show();
-    
-    connect(page, SIGNAL(loadStarted()), SLOT(loadProgress()));
-    connect(page, SIGNAL(loadProgress(int)), SLOT(loadProgress()));
-    connect(page, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
-    connect(page->mainFrame(), SIGNAL(urlChanged(QUrl)), SLOT(verifyUrl()));
-}
-
-
 void PreviewSelectorBar::loadProgress()
 {
     m_button->setEnabled(false);
@@ -124,7 +104,6 @@ void PreviewSelectorBar::loadProgress()
 }
 
 
-
 void PreviewSelectorBar::loadFinished()
 {
     m_button->setEnabled(true);
@@ -136,25 +115,38 @@ void PreviewSelectorBar::loadFinished()
 
 void PreviewSelectorBar::clicked()
 {
-    KUrl url = m_page->mainFrame()->url();
-
-    WebSnap::savePreview(WebSnap::renderPreview(*m_page), url);
-    
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    urls.replace(m_previewIndex, url.toMimeDataString());
-    names.replace(m_previewIndex, m_page->mainFrame()->title());
-    
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
+    WebPage *page = Application::instance()->mainWindow()->currentTab()->page();
     
-    ReKonfig::self()->writeConfig();
-    
-    
-    m_page->mainFrame()->load(KUrl("about:favorites"));
+    if(page)
+    {
+        KUrl url = page->mainFrame()->url();
+
+        WebSnap::savePreview(WebSnap::renderPreview(*page), url);
+        
+        QStringList names = ReKonfig::previewNames();
+        QStringList urls = ReKonfig::previewUrls();
+        
+        urls.replace(m_previewIndex, url.toMimeDataString());
+        names.replace(m_previewIndex, page->mainFrame()->title());
+        
+        ReKonfig::setPreviewNames(names);
+        ReKonfig::setPreviewUrls(urls);
+        
+        ReKonfig::self()->writeConfig();
+        
+        
+        page->mainFrame()->load(KUrl("about:favorites"));
+    }
     
-    hide();
+    destroy();
 }
 
 
+void PreviewSelectorBar::destroy()
+{
+    if (parentWidget() && parentWidget()->layout())
+    {
+        parentWidget()->layout()->removeWidget(this);
+    }
+    this->deleteLater();
+}
diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h
index aa011fe4..4f7fc21b 100644
--- a/src/rekonqpage/previewselectorbar.h
+++ b/src/rekonqpage/previewselectorbar.h
@@ -1,21 +1,29 @@
-/*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
 
 #ifndef PREVIEWSELECTORBAR_H
 #define PREVIEWSELECTORBAR_H
@@ -28,33 +36,30 @@
 #include <QPushButton>
 #include <QLabel>
 
+
 class PreviewSelectorBar : public QWidget
 {
-    Q_OBJECT
+Q_OBJECT
+
+public:
+    PreviewSelectorBar(int index, QWidget *parent);
+    ~PreviewSelectorBar();
+    
+private slots:
+    void clicked();
+    
+    void loadProgress();
+    void loadFinished();
+    
+    void verifyUrl();
+    
+    void destroy();
     
-    public:
-        PreviewSelectorBar(QWidget *parent = 0);
-        
-        void setPage(WebPage *page);
-        
-    public slots:
-        void enable(int previewIndex, WebPage *page);
-        void clicked();
-        
-        void loadProgress();
-        void loadFinished();
-        
-        void verifyUrl();
-        
-    private:
-        void setup();
-        
-        QPushButton *m_button;
-        QLabel *m_label;
-        
-        int m_previewIndex;
-        WebPage *m_page;
+private:    
+    QPushButton *m_button;
+    QLabel *m_label;
     
+    int m_previewIndex;   
 };
 
 #endif // PREVIEWSELECTORBAR_H
diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp
index a038d280..4f86f5e4 100644
--- a/src/webinspectorpanel.cpp
+++ b/src/webinspectorpanel.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Matthieu Gicquel<matgic78@gmail.com>
+* Copyright (C) 2009 by Matthieu Gicquel<matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -10,9 +10,9 @@
 * published by the Free Software Foundation; either version 2 of
 * the License or (at your option) version 3 or any later version
 * accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
+* by the membership of KDE e.V.), which shall act as a proxy 
 * defined in Section 14 of version 3 of the license.
-*
+* 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index 8f65b48a..2d6dd8eb 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Matthieu Gicquel<matgic78@gmail.com>
+* Copyright (C) 2009 by Matthieu Gicquel<matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webtab.cpp b/src/webtab.cpp
index b3eb71f0..fb925d6e 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -39,6 +39,7 @@
 #include "webpage.h"
 #include "bookmarksmanager.h"
 #include "walletbar.h"
+#include "previewselectorbar.h"
 
 // KDE Includes
 #include <KService>
@@ -165,3 +166,16 @@ void WebTab::createWalletBar(const QString &key, const QUrl &url)
     connect(walletBar, SIGNAL(saveFormDataRejected(const QString &)),
             wallet, SLOT(rejectSaveFormDataRequest(const QString &)));
 }
+
+
+void WebTab::createPreviewSelectorBar(int index)
+{
+    QWidget *messageBar = layout()->itemAt(0)->widget();
+    PreviewSelectorBar *bar = new PreviewSelectorBar(index, messageBar);
+    messageBar->layout()->addWidget(bar);
+    
+    connect(page(), SIGNAL(loadStarted()), bar, SLOT(loadProgress()));
+    connect(page(), SIGNAL(loadProgress(int)), bar, SLOT(loadProgress()));
+    connect(page(), SIGNAL(loadFinished(bool)), bar, SLOT(loadFinished()));
+    connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), bar, SLOT(verifyUrl()));
+}
diff --git a/src/webtab.h b/src/webtab.h
index ecf8e5b3..7ab5114e 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -51,14 +51,15 @@ public:
     KUrl url() const;
     QString lastStatusBarText() const;
     int progress();
-
+    void createPreviewSelectorBar(int index);
+    
 private slots:
     void setStatusBarText(const QString &string);
     void updateProgress(int progress);
     void loadFinished(bool);
 
     void createWalletBar(const QString &, const QUrl &);
-    
+
 private:
     WebView *const m_view;
     int m_progress;
-- 
cgit v1.2.1


From 65af58d17b5de8369aa74533f5fee31add9d2a31 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 09:56:22 +0100
Subject: margin-top in favorites from 7% to 4%. This to let previews fit in my
 screen (1280x800, quite common..)

---
 src/data/home.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 51b9ceec..f9106642 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -123,7 +123,7 @@ margin-top: -5%;
 
 .thumbnail {
 display: inline-block;
-width:25%; margin-top: 7%;
+width:25%; margin-top: 4%;
 min-width:250px; min-height:192px;
 }
 
@@ -224,6 +224,5 @@ margin-bottom: 0.5em;
     <p class="bookfolder"></h3>
 </div>
 
-
 </body>
 </html>
-- 
cgit v1.2.1


From e6bc31b0263c97cef99769c722b958ba788d0aa5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 10:01:36 +0100
Subject: Fix popup position

---
 src/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e4890b72..55a08916 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1058,7 +1058,7 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
         //TODO: detect QStyle size
         scrollbarSize = 17;
     }
-    QPoint webViewOrigin = m_view->currentWebTab()->mapToGlobal(QPoint(0,0));
+    QPoint webViewOrigin = m_view->currentWebTab()->view()->mapToGlobal(QPoint(0,0));
     int bottomLeftY=webViewOrigin.y() + m_view->currentWebTab()->page()->viewportSize().height() - labelSize.height() - scrollbarSize;
 
     // setting popup in bottom-left position
-- 
cgit v1.2.1


From 067b99a053b6f8b1ccab507be8e828b2f72a1e43 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 10:57:57 +0100
Subject: Fix copyright for 0.4 beta release

---
 src/adblock/adblockmanager.cpp        |  2 +-
 src/adblock/adblockmanager.h          |  2 +-
 src/adblock/adblocknetworkreply.cpp   |  2 +-
 src/adblock/adblocknetworkreply.h     |  2 +-
 src/adblock/adblockrule.cpp           |  2 +-
 src/adblock/adblockrule.h             |  2 +-
 src/application.cpp                   |  6 +++---
 src/application.h                     |  4 ++--
 src/bookmarks/bookmarksmanager.cpp    |  4 ++--
 src/bookmarks/bookmarksmanager.h      |  4 ++--
 src/bookmarks/bookmarkspanel.cpp      |  2 +-
 src/bookmarks/bookmarkspanel.h        |  1 +
 src/bookmarks/bookmarksproxy.cpp      |  1 +
 src/bookmarks/bookmarksproxy.h        |  1 +
 src/bookmarks/bookmarkstreemodel.cpp  |  1 +
 src/bookmarks/bookmarkstreemodel.h    |  1 +
 src/clicktoflash.cpp                  |  2 +-
 src/clicktoflash.h                    |  2 +-
 src/findbar.cpp                       |  4 ++--
 src/findbar.h                         |  4 ++--
 src/history/autosaver.cpp             |  2 +-
 src/history/autosaver.h               |  2 +-
 src/history/historymanager.cpp        |  2 +-
 src/history/historymanager.h          |  2 +-
 src/history/historymodels.cpp         |  2 +-
 src/history/historymodels.h           |  2 +-
 src/history/historypanel.cpp          |  2 +-
 src/history/historypanel.h            |  2 +-
 src/main.cpp                          | 14 +++++++-------
 src/mainview.cpp                      |  5 +++--
 src/mainview.h                        |  5 +++--
 src/mainwindow.cpp                    |  5 +++--
 src/mainwindow.h                      |  5 +++--
 src/networkaccessmanager.cpp          |  3 ++-
 src/networkaccessmanager.h            |  3 ++-
 src/protocolhandler.cpp               |  2 +-
 src/protocolhandler.h                 |  2 +-
 src/rekonqpage/newtabpage.cpp         |  3 ++-
 src/rekonqpage/newtabpage.h           |  3 ++-
 src/rekonqpage/previewselectorbar.cpp |  2 +-
 src/rekonqpage/previewselectorbar.h   |  2 +-
 src/sessionmanager.cpp                |  4 ++--
 src/sessionmanager.h                  |  4 ++--
 src/settings/settingsdialog.cpp       |  5 ++---
 src/settings/settingsdialog.h         |  5 ++---
 src/tabbar.cpp                        |  4 ++--
 src/tabbar.h                          |  4 ++--
 src/urlbar/lineedit.cpp               |  4 ++--
 src/urlbar/lineedit.h                 |  4 ++--
 src/urlbar/urlbar.cpp                 |  4 ++--
 src/urlbar/urlbar.h                   |  4 ++--
 src/webinspectorpanel.cpp             |  2 +-
 src/webinspectorpanel.h               |  2 +-
 src/webpage.cpp                       |  3 ++-
 src/webpage.h                         |  3 ++-
 src/webpluginfactory.cpp              |  3 ++-
 src/webpluginfactory.h                |  3 ++-
 src/websnap.cpp                       |  3 ++-
 src/websnap.h                         |  3 ++-
 src/webtab.cpp                        |  4 ++--
 src/webtab.h                          |  4 ++--
 src/webview.cpp                       |  4 ++--
 src/webview.h                         |  4 ++--
 63 files changed, 108 insertions(+), 91 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index c2a42f0b..bcb5b556 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index f01aaca0..754c81c2 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp
index 1ccca96d..804524b3 100644
--- a/src/adblock/adblocknetworkreply.cpp
+++ b/src/adblock/adblocknetworkreply.cpp
@@ -28,7 +28,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+ * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h
index b5bb8300..36dd7fdb 100644
--- a/src/adblock/adblocknetworkreply.h
+++ b/src/adblock/adblocknetworkreply.h
@@ -28,7 +28,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+ * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index 9f86ffee..25ca3678 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -30,7 +30,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+ * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 35715051..1cb97dc4 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -29,7 +29,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+ * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/application.cpp b/src/application.cpp
index 6989eee7..f3db4c7b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -102,7 +102,7 @@ Application::~Application()
 
 int Application::newInstance()
 {
-    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
+    KCmdLineArgs::setCwd( QDir::currentPath().toUtf8() );
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     
     // we share one process for several mainwindows,
diff --git a/src/application.h b/src/application.h
index 0c3bd3f5..f20f537b 100644
--- a/src/application.h
+++ b/src/application.h
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 6442192a..3aab08ae 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index febac234..200bfb4b 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 9164dbb6..48ca6537 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
-*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 6c0e153f..64d68f70 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarksproxy.cpp b/src/bookmarks/bookmarksproxy.cpp
index e94fbeff..7fa34b3f 100644
--- a/src/bookmarks/bookmarksproxy.cpp
+++ b/src/bookmarks/bookmarksproxy.cpp
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h
index 99483331..fcd49673 100644
--- a/src/bookmarks/bookmarksproxy.h
+++ b/src/bookmarks/bookmarksproxy.h
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 140fa9c8..f80fdc74 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 9753999c..9b65d923 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index b6e1df34..509202fb 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -28,7 +28,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Matthieu Gicquel <matgic78@gmail.com>
+ * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 01bba257..d519e047 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -28,7 +28,7 @@
  *
  * This file is a part of the rekonq project
  *
- * Copyright (C) 2009 by Matthieu Gicquel <matgic78@gmail.com>
+ * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
  *
  *
  * This program is free software; you can redistribute it and/or
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 9efb9c6a..1cb16e3f 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/findbar.h b/src/findbar.h
index 5a41c0bc..d56b8d25 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index 236922b5..41f19098 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index 80583f9c..4a307a16 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -3,7 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index db19a6b4..e75adbdc 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index ff3b4381..0df1467f 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index cf8d1aed..709d0523 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 08f3f63e..a8cd7a8c 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 08dc3800..8c8eae75 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>*
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index e07e2190..67284c0e 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>*
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/main.cpp b/src/main.cpp
index 030b8476..0b12fba1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -56,15 +56,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
     // --------------- about authors -----------------------------
     about.addAuthor(ki18n("Andrea Diamantini"),
-                    ki18n("Project Lead, Developer"),
+                    ki18n("Project Lead, Developer, Maintainer"),
                     "adjam7@gmail.com",
                     "http://www.adjam.org");
 
-    about.addAuthor(ki18n("Domrachev Alexandr"),
-                    ki18n("Developer"),
-                    "alexandr.domrachev@gmail.com",
-                    "");
-
     about.addAuthor(ki18n("Panagiotis Papadopoulos"),
                     ki18n("Quite everything but code"),
                     "pano_90@gmx.net",
@@ -91,6 +86,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
                     "");
                     
     // --------------- about credits -----------------------------                    
+    about.addCredit(ki18n("Domrachev Alexandr"),
+                    ki18n("Developer"),
+                    "alexandr.domrachev@gmail.com",
+                    "");
+
     about.addCredit(ki18n("Henry de Valence"),
                     ki18n("Promised help on multitask rekonq"),
                     "hdevalence@gmail.com",
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 57185fd2..8034563b 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -2,9 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/mainview.h b/src/mainview.h
index 908389b1..ace9d941 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -2,9 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 55a08916..8ce6afe0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2,9 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7a51cc10..c104ad4d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -3,9 +3,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index eadbfab3..e6dd6d85 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -3,7 +3,8 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>*
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 5c34ebd7..171a5337 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -3,7 +3,8 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>*
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index a9339cfa..995c1448 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index 6ae47b74..140faa7d 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 7a373f62..3fd9fcc6 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -2,7 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index 38d82684..d659362f 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -2,7 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index 564d286c..d7676e3c 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2010 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h
index 4f7fc21b..fa71bdfa 100644
--- a/src/rekonqpage/previewselectorbar.h
+++ b/src/rekonqpage/previewselectorbar.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2010 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
 *
 *
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index f512e943..72e1cc77 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Yoram Bar-Haim <<yoram.b at zend dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/sessionmanager.h b/src/sessionmanager.h
index f1b7a71f..baa6ac22 100644
--- a/src/sessionmanager.h
+++ b/src/sessionmanager.h
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Yoram Bar-Haim <<yoram.b at zend dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 6fab5dcf..2c04fac0 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -2,9 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index 360fe246..da1415c4 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -2,9 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 58216991..f77d4694 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -3,9 +3,9 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/tabbar.h b/src/tabbar.h
index b57106dc..9d1fd7a9 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -3,9 +3,9 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index f3c93e8e..db36bd0c 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 67ded052..0fca21d4 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 4d9765a2..1b6ebca8 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 8d267b2c..6d24e599 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webinspectorpanel.cpp b/src/webinspectorpanel.cpp
index 4f86f5e4..6f8e48a0 100644
--- a/src/webinspectorpanel.cpp
+++ b/src/webinspectorpanel.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index 2d6dd8eb..dac54648 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Matthieu Gicquel<matgic78 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel<matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webpage.cpp b/src/webpage.cpp
index f2ea412d..a6e103bd 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -6,7 +6,8 @@
 * Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
 * Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
 * Copyright (C) 2008 Michael Howell <mhowell123@gmail.com>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webpage.h b/src/webpage.h
index c8ecc89a..2a1cf826 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -6,7 +6,8 @@
 * Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
 * Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
 * Copyright (C) 2008 Michael Howell <mhowell123@gmail.com>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index ac18fece..6265aeb3 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -2,7 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index c1e4c28f..384f0653 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -2,7 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 11b70e9e..6310c868 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -3,7 +3,8 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 Nokia Corporation <qt-info@nokia.com>
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/websnap.h b/src/websnap.h
index e15c2dcf..30441e02 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -3,7 +3,8 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2009 Nokia Corporation <qt-info@nokia.com>
-* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webtab.cpp b/src/webtab.cpp
index fb925d6e..9dea9a72 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webtab.h b/src/webtab.h
index 7ab5114e..d54ae5f8 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webview.cpp b/src/webview.cpp
index 232a2633..e1ba2a46 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/webview.h b/src/webview.h
index 263b2ec4..1598b19c 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -2,8 +2,8 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
-- 
cgit v1.2.1


From e9c6614a7986367e29721ace8341c830f5d5a78d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 12:33:09 +0100
Subject: fix tab preview position

---
 src/tabbar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index f77d4694..2fa4cf8e 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -158,7 +158,7 @@ void TabBar::showTabPreview(int tab)
         return;
     
     int w = tabSizeHint(tab).width();
-    int h = w*((0.0 + currentView->height())/currentView->width());
+    int h = w * ( (0.0 + currentView->height()) / currentView->width() );
 
     //delete previous tab preview
     delete m_previewPopup.data();
@@ -175,7 +175,7 @@ void TabBar::showTabPreview(int tab)
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
     m_previewPopup.data()->layout()->setMargin(0);
 
-    QPoint pos( tabRect(tab).x() , tabRect(tab).y() + tabRect(tab).height() );
+    QPoint pos( tabRect(tab).x() , tabRect(tab).y() + tabRect(tab).height() - 3);
     m_previewPopup.data()->show(mapToGlobal(pos));
 }
 
-- 
cgit v1.2.1


From 315700ae94d0307b0bceb0e78329620e61a4ba0e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 10 Feb 2010 12:47:57 +0100
Subject: DISCLAIMER: I'm sorry for this This commit reverts the ability to
 change main toolbar settings (change icon/text). In the context rekonq is
 developed (KMainWindow + simple toolbars) this is quite impossible. We'll see
 in the next version a proper fix for this (back to XMLGUI? QML??)

This commit fixes also the problem with the disappearing toolbar backing
from a fullscreen close

BUG:222826
---
 src/mainwindow.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ce6afe0..b0007ed4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -103,7 +103,7 @@ MainWindow::MainWindow()
     , m_bookmarksPanel(0)
     , m_webInspectorPanel(0)
     , m_historyBackMenu(0)
-    , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, false, false) )
+    , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, false) )
     , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, false) )
     , m_popup( new KPassivePopup(this) )
     , m_hidePopup( new QTimer(this) )
@@ -184,12 +184,19 @@ void MainWindow::setupToolbars()
     m_mainBar->addAction( actionByName("bookmarksActionMenu") );
     m_mainBar->addAction( actionByName("rekonq_tools") );
 
+    m_mainBar->setContextMenuPolicy(Qt::PreventContextMenu);
+    
+    m_mainBar->show();  // this just to fix reopening rekonq after fullscreen close
+    
     // =========== Bookmarks ToolBar ================================
     m_bmBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_bmBar->setAcceptDrops(true);
     m_bmBar->setContextMenuPolicy(Qt::CustomContextMenu);
     m_bmBar->setIconDimensions(16);
     Application::bookmarkProvider()->setupBookmarkBar(m_bmBar);
+
+    KToolBar::setToolBarsEditable(false);
+    KToolBar::setToolBarsLocked(true);
 }
 
 
-- 
cgit v1.2.1


From 95e0972db84722d462e7e63f7250a88f285df2e3 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 10 Feb 2010 16:38:48 +0100
Subject: Improve newtabpage css: -previews are centered -favorites fit in
 1280*800 -removed unuseful lines

---
 src/data/home.html            | 162 +++++++++++++++---------------------------
 src/rekonqpage/newtabpage.cpp |   6 +-
 2 files changed, 62 insertions(+), 106 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index f9106642..22d0a007 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -6,142 +6,111 @@
 
 <style type="text/css">
 
-/* ------------------------------------------------------- */
-/* generic styles */
-
-html, body, div, h1, h2, h3, h4, a, p{
-margin:0;
-padding:0;
-border:0;
+/* -------------------------------------------------------- */
+/* css reset */
+* {
+border: 0; padding: 0; margin: 0;
 }
 
-body{
+/* -------------------------------------------------------- */
+/* generic styles */
+
+body {
 background: url(%2/tile.gif) repeat-x #fff;
-font-family: sans-serif;
-font-size: 0.8em;
-text-align: center;
+font-family: sans-serif; font-size: 0.8em;
 }
 
-h1{
-font: normal bold 2em sans-serif;
-text-align:right;
-color: #3F7AB7;
-margin-right:3%;
-margin-top: 0.5%;
-float:right;
+#rekonq-newtabpage {
+width: 100%;
+text-align: center; /* center #navigation */
 }
 
-h2{
-font: normal bold 1.2em sans-serif;
-color: #3F7AB7;
-margin-top: 2em;
+#content {
+text-align: left;
+margin: 0 1% 2% 1%;
 }
 
-h3{
+h3 {
 border-bottom-width: 1px;
 -webkit-border-image: url(%2/category.png) 1 1 1 1  stretch stretch;
-padding: 0.2em;
-margin-top: 0.5em;
-margin-bottom: 0.5em;
-font: normal bold 1em sans-serif;
+padding: 0.2em; margin: 0.5em 0;
+font: normal bold 1em;
 }
 
-h4{
-font-size: 1em;
-margin-top: 0.5em;
-}
-
-a{
+a {
 color: #3F7AB7;
 text-decoration: none;
 -webkit-transition-property: color;
 -webkit-transition-duration: 0.5s;
 -webkit-transition-timing-function: ease;
-
 }
-a:hover{
+a:hover {
 color: black;
 }
 
-/* ------------------------------------------------------- */
-/* page sections */
-
-#rekonq-newtabpage {
-width: 100%;
-}
+/* -------------------------------------------------------- */
+/* Navigation bar */
 
 #navigation {
 display: inline-block;
-margin-top: 2%;
-margin-bottom: 2%;
-text-align: center;
+margin: 2%;
 border-width: 5px;
 -webkit-border-image: url(%2/bg2.png) 12 12 12 12  stretch stretch;
 }
 
-#content {
-text-align: left;
-margin: 2%;
-}
-
-/* -------------------------------------------------------- */
-/* div navigations styles */
-
-.link{
+.link {
 display: inline-block;
 }
-
-.link img{
-vertical-align: middle;
-margin-right: 5px;
+.link img {
+vertical-align: middle; margin-right: 5px;
 }
-
-.link a{
-color: black;
-text-decoration:none;
-font: normal 1em sans-serif;
+.link a {
+color: black; 
 }
 
 .current{
 border-width: 6px;
 -webkit-border-image: url(%2/button.png) 6 stretch stretch;
 }
-
-#navigation .link:not(.current){
-margin-right: 10px;
-margin-left: 10px;
+.link:not(.current){
+margin: 0 10px;
 }
 
+/* -------------------------------------------------------- */
+/* Previews */
 
-.favorites{
+#content.favorites, #content.closedTabs {
 text-align: center;
-margin-top: -5%;
 }
 
-/* -------------------------------------------------------- */
-/* Thumbnail class */
-
 .thumbnail {
 display: inline-block;
-width:25%; margin-top: 4%;
-min-width:250px; min-height:192px;
+width: 25%; min-width: 240px;
+height: 170px;
+margin: 3% 0 3% 0;
 }
 
-.preview img {
+.thumb-inner {
+width: 232px; /* 200 + 16*2 */
+margin: auto;
 }
+
 .preview {
-display: table-cell;
-vertical-align: middle;
+display: table-cell; vertical-align: middle;
 width: 200px; height: 150px;
 padding: 14px 16px;
 background: url(%2/bg.png) no-repeat;
 -webkit-background-size: 100% 100%; 
--webkit-background-clip: padding;
 }
-.thumbnail:hover .preview , .thumbnail:hover .button img {
-opacity: 0.8;
+
+.title {
+padding: 0 12px;
 }
 
+.thumbnail:hover .preview , 
+.thumbnail:hover .button img {
+opacity: 0.8;
+}
 .button img, .preview {
 -webkit-transition-property: opacity;
 -webkit-transition-duration: 0.8s;
@@ -154,7 +123,6 @@ width: 16px;
 height: 16px;
 opacity: 0;
 }
-
 .remove {
 float: right;
 }
@@ -162,23 +130,12 @@ float: right;
 float: left;
 }
 
-.title {
-display: block;
-width: 200px;
-height: 15px;
-padding: 0 14px;
-text-align: center;
-}
-
-.thumbnail a {
-text-align:center;
-}
 .thumbnail a:hover, span {
 color:#3F7AB7;
 }
 
 /* -------------------------------------------------------- */
-/* Bookmarks page*/
+/* Bookmarks page */
 
 .bookfolder{
 margin-left: 2em;
@@ -192,11 +149,8 @@ margin-bottom: 0.5em;
 <body>
 
 <div id="rekonq-newtabpage">
-    <div id="navigation">
-    </div>
-    
+    <div id="navigation"></div>
     <div id="content">
-    
     </div>
 </div>
 
@@ -207,21 +161,23 @@ margin-bottom: 0.5em;
         </a>
     </div>
     <div class="thumbnail">
-        <a>
-            <div class ="preview">
-                <img />
-            </div>
+        <div class ="thumb-inner">
+            <a>
+                <div class ="preview">
+                    <img />
+                </div>
+            </a>
             <div class="title">
                 <a class="button modify"><img /></a>
                 <span><a></a></span>
                 <a class="button remove"><img /></a>
             </div>
-        </a>
+        </div>
     </div>
     <h3></h3>
     <a></a>
-    </br>
-    <p class="bookfolder"></h3>
+    <br />
+    <p class="bookfolder"></p>
 </div>
 
 </body>
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 3fd9fcc6..ca8ed35e 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -171,7 +171,7 @@ QWebElement NewTabPage::emptyPreview(int index)
     
     prev.findFirst(".preview img").setAttribute("src" , QString("file:///") +
                     KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
-    prev.findFirst("span").appendInside(i18n("Set a Preview..."));
+    prev.findFirst("span a").setPlainText(i18n("Set a Preview..."));
     prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
     
     setupPreview(prev, index);
@@ -187,7 +187,7 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     
     prev.findFirst(".preview img").setAttribute("src" , 
                 QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
-    prev.findFirst("span").appendInside(i18n("Loading Preview..."));
+    prev.findFirst("span a").setPlainText(i18n("Loading Preview..."));
     prev.findFirst("a").setAttribute("href", url.toMimeDataString());
     
     setupPreview(prev, index);
@@ -208,7 +208,7 @@ QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
     prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString());
     prev.findFirst("a").setAttribute("href", url.toMimeDataString());
     prev.findFirst("span a").setAttribute("href", url.toMimeDataString());
-    prev.findFirst("span").setPlainText(checkTitle(title));
+    prev.findFirst("span a").setPlainText(checkTitle(title));
     
     setupPreview(prev, index);
     showControls(prev);
-- 
cgit v1.2.1


From cb231f2dbc35ccffdc036927560d7c5bf4d5cf84 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 10 Feb 2010 17:25:13 +0100
Subject: workaround too big bottom border

---
 src/data/home.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 22d0a007..50564d55 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -98,7 +98,7 @@ margin: auto;
 .preview {
 display: table-cell; vertical-align: middle;
 width: 200px; height: 150px;
-padding: 14px 16px;
+padding: 14px 16px 12px;
 background: url(%2/bg.png) no-repeat;
 -webkit-background-size: 100% 100%; 
 }
-- 
cgit v1.2.1


From cfbc489f80e0e3091b52f382992c5669241023bd Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 13 Feb 2010 00:41:26 +0100
Subject: Fix date

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 0b12fba1..0be5a7ee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,7 +49,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
                      REKONQ_VERSION,
                      ki18n(description),
                      KAboutData::License_GPL_V3,
-                     ki18n("(C) 2008-2009 Andrea Diamantini"),
+                     ki18n("(C) 2008-2010 Andrea Diamantini"),
                      KLocalizedString(),
                      "http://rekonq.sourceforge.net"
                     );
-- 
cgit v1.2.1


From 847aa1fea2bb6b700ccce130d2fa07723e1327f2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 13 Feb 2010 00:51:00 +0100
Subject: Good news, bad news. I reenabled the ability of changing (main)
 toolbar style, but.. I noticed in other kde apps (eg: kaddressbook) that
 settings are forgotten also there. Is it a ktoolbar bug? I cannot say for
 sure. Anyway I reenabled rekonq bits, but it doesn't work... :(

---
 src/mainwindow.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b0007ed4..96b4569c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -103,8 +103,8 @@ MainWindow::MainWindow()
     , m_bookmarksPanel(0)
     , m_webInspectorPanel(0)
     , m_historyBackMenu(0)
-    , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, false) )
-    , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, false) )
+    , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, true) )
+    , m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, true) )
     , m_popup( new KPassivePopup(this) )
     , m_hidePopup( new QTimer(this) )
     , m_ac( new KActionCollection(this) )
@@ -183,8 +183,6 @@ void MainWindow::setupToolbars()
 
     m_mainBar->addAction( actionByName("bookmarksActionMenu") );
     m_mainBar->addAction( actionByName("rekonq_tools") );
-
-    m_mainBar->setContextMenuPolicy(Qt::PreventContextMenu);
     
     m_mainBar->show();  // this just to fix reopening rekonq after fullscreen close
     
-- 
cgit v1.2.1


From 9aa7ab98bc6200b7bbc266ed98087a322055c24e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 13 Feb 2010 01:14:58 +0100
Subject: Honor settings when Opening new link after the current focused page

BUG:226520
---
 src/webpage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index a6e103bd..9805a3d5 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -139,7 +139,7 @@ WebPage *WebPage::createWindow(QWebPage::WebWindowType type)
     WebTab *w = 0;
     if(ReKonfig::openTabNoWindow())
     {
-        w = Application::instance()->mainWindow()->mainView()->newWebTab(!ReKonfig::openTabsBack());
+        w = Application::instance()->mainWindow()->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
     }
     else
     {
-- 
cgit v1.2.1


From e5360e6ae9b0601279761983637c8649f8503f0c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 13 Feb 2010 01:37:29 +0100
Subject: Fixing download code && (hopefully) issues

---
 src/webpage.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 9805a3d5..a0a4fe21 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -162,7 +162,9 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         
         if( offer.isNull() ) // no service can handle this. We can just download it..
         {
-            isLocal ? KMessageBox::sorry(view(), i18n("No service can handle this :(") ) : downloadRequest(reply->request());
+            isLocal 
+                ? KMessageBox::sorry(view(), i18n("No service can handle this :(") ) 
+                : downloadRequest( reply->request() );
             return;
         }
 
@@ -173,7 +175,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
             switch ( dlg.askEmbedOrSave() )
             {
                 case KParts::BrowserOpenOrSaveQuestion::Save:
-                    downloadRequested(reply->request());
+                    downloadRequest( reply->request() );
                     return;
                 case KParts::BrowserOpenOrSaveQuestion::Cancel:
                     return;
@@ -320,8 +322,11 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
             QDBusInterface kget("org.kde.kget", "/KGet", "org.kde.kget.main");
             kget.call("addTransfer", srcUrl.prettyUrl(), destUrl.prettyUrl(), true);
         }
+        
+        return;
     }
-    else KWebPage::downloadRequest(request);
+    
+    KWebPage::downloadRequest(request);
 }
 
 
-- 
cgit v1.2.1


From 3e1ac6fb3f9865bf5bb0c156e985c1a4577b20e0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Feb 2010 11:23:37 +0100
Subject: Krazy issues (1st branch)

---
 src/adblock/adblockmanager.cpp       |  6 +--
 src/adblock/adblocknetworkreply.cpp  |  2 +-
 src/bookmarks/bookmarksproxy.h       |  8 ++--
 src/bookmarks/bookmarkstreemodel.cpp |  2 +-
 src/clicktoflash.cpp                 | 75 ++++++++++++-----------------------
 src/clicktoflash.h                   | 77 ++++++++++++------------------------
 src/filterurljob.cpp                 |  3 --
 src/mainwindow.cpp                   |  4 +-
 src/settings/settings_webkit.ui      |  2 +-
 src/settings/settingsdialog.cpp      |  2 +-
 src/walletbar.h                      |  6 +--
 src/webpage.cpp                      |  2 +-
 12 files changed, 68 insertions(+), 121 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index bcb5b556..06f0d164 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -83,10 +83,10 @@ void AdBlockManager::loadSettings()
 
             if (name.startsWith(QLatin1String("Filter")))
             {
-                if(!url.startsWith("!"))
+                if(!url.startsWith('!'))
                 {           
                     // white rules
-                    if(url.startsWith("@@"))
+                    if( url.startsWith( QLatin1String("@@") ) )
                     {
                         AdBlockRule rule( url.mid(2) );
                         _whiteList << rule;
@@ -94,7 +94,7 @@ void AdBlockManager::loadSettings()
                     }
                     
                     // hide (CSS) rules
-                    if(url.startsWith("##"))
+                    if( url.startsWith( QLatin1String("##") ) )
                     {
                         _hideList << url.mid(2);
                         continue;
diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp
index 804524b3..3b73b8a0 100644
--- a/src/adblock/adblocknetworkreply.cpp
+++ b/src/adblock/adblocknetworkreply.cpp
@@ -68,7 +68,7 @@ AdBlockNetworkReply::AdBlockNetworkReply(const QNetworkRequest &request, const Q
     setOperation(QNetworkAccessManager::GetOperation);
     setRequest(request);
     setUrl(request.url());
-    setError(QNetworkReply::ContentAccessDenied, i18n("Blocked by AdBlockRule: %1").arg(urlString));
+    setError(QNetworkReply::ContentAccessDenied, i18n("Blocked by AdBlockRule: %1", urlString) );
     QTimer::singleShot(0, this, SLOT(delayedFinished()));
 }
 
diff --git a/src/bookmarks/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h
index fcd49673..a1444218 100644
--- a/src/bookmarks/bookmarksproxy.h
+++ b/src/bookmarks/bookmarksproxy.h
@@ -37,13 +37,13 @@ class BookmarksProxy : public QSortFilterProxyModel
     Q_DISABLE_COPY(BookmarksProxy)
 
 public:
-	BookmarksProxy( QObject *parent = 0 );
+    BookmarksProxy( QObject *parent = 0 );
 
 protected:
-	virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
+    virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
 
-	// returns true if any child(or childs-child...) matches filter
-	bool recursiveMatch( const QModelIndex &index ) const;
+    // returns true if any child(or children-child...) matches filter
+    bool recursiveMatch( const QModelIndex &index ) const;
 };
 
 #endif // BOOKMARKSPROXY_H
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index f80fdc74..95e5ad41 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -268,7 +268,7 @@ void BookmarksTreeModel::bookmarksChanged( const QString &groupAddress )
     QModelIndex nodeIndex;
 
     QStringList indexChain( groupAddress.split( '/', QString::SkipEmptyParts) );
-    foreach( QString sIndex, indexChain ) 
+    foreach( const QString &sIndex, indexChain ) 
     {
         bool ok;
         int i = sIndex.toInt( &ok );
diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 509202fb..64dff19d 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -1,53 +1,28 @@
-/*
- * Copyright (c) 2009, Benjamin C. Meyer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ============================================================
- *
- * This file is a part of the rekonq project
- *
- * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy 
- * defined in Section 14 of version 3 of the license.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * ============================================================ */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (c) 2009, Benjamin C. Meyer
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
 
 
 // Self Includes
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index d519e047..8565f80f 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -1,53 +1,28 @@
-/*
- * Copyright (c) 2009, Benjamin C. Meyer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ============================================================
- *
- * This file is a part of the rekonq project
- *
- * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy 
- * defined in Section 14 of version 3 of the license.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * ============================================================ */
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (c) 2009, Benjamin C. Meyer
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
 
 
 #ifndef CLICKTOFLASH_H
@@ -63,7 +38,7 @@ class ClickToFlash : public QWidget
 {
     Q_OBJECT
 public:
-    ClickToFlash(QUrl pluginUrl, QWidget *parent = 0);
+    explicit ClickToFlash(QUrl pluginUrl, QWidget *parent = 0);
 
 signals:
     void signalLoadClickToFlash(bool);
diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp
index 00bdee36..e74f8ec8 100644
--- a/src/filterurljob.cpp
+++ b/src/filterurljob.cpp
@@ -31,9 +31,6 @@
 #include <KUriFilter>
 #include <KUriFilterData>
 
-// Qt Includes
-#include <QUrl>
-
 
 FilterUrlJob::FilterUrlJob(WebView *view, const QString &urlString, QObject *parent)
     : Job(parent)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 96b4569c..f1999d4f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -664,7 +664,7 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle("rekonq (" + i18n("Private Browsing")  + ")");
+            setWindowTitle("rekonq (" + i18n("Private Browsing")  + ')');
         }
         else
         {
@@ -675,7 +675,7 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle(title + " - rekonq (" + i18n("Private Browsing")  + ")");
+            setWindowTitle(title + " - rekonq (" + i18n("Private Browsing")  + ')');
         }
         else
         {
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 5074522b..75776d95 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -148,7 +148,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QComboBox" name="kcfg_pluginsEnabled">
+       <widget class="KComboBox" name="kcfg_pluginsEnabled">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
           <horstretch>0</horstretch>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 2c04fac0..a3bf7359 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -138,7 +138,7 @@ Private::Private(SettingsDialog *parent)
     pageItem->setIcon(KIcon(ebrowsingInfo.icon()));
 
     // WARNING remember wheh changing here that the smaller netbooks
-    // have a 1024x576 resolution. So DONT bother that limits!!
+    // have a 1024x576 resolution. So DON'T bother that limits!!
     parent->setMinimumSize(700,525);    
 }
 
diff --git a/src/walletbar.h b/src/walletbar.h
index d2e39373..77257f69 100644
--- a/src/walletbar.h
+++ b/src/walletbar.h
@@ -24,8 +24,8 @@
 * ============================================================ */
 
 
-#ifndef WALLET_WIDGET_H
-#define WALLET_WIDGET_H
+#ifndef WALLET_BAR_H
+#define WALLET_BAR_H
 
 
 // Qt Includes
@@ -65,4 +65,4 @@ private:
     QLabel *m_label;
 };
 
-#endif // WALLET_WIDGET_H
+#endif // WALLET_BAR_H
diff --git a/src/webpage.cpp b/src/webpage.cpp
index a0a4fe21..0f66ae93 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -283,7 +283,7 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
 {
     if (ReKonfig::kgetDownload())
     {
-        //*Copy of kwebpage code (Shouldn't be done in kwepage ?)
+        //*Copy of kwebpage code (Shouldn't be done in kwebpage ?)
 
         KUrl destUrl;
         KUrl srcUrl (request.url());
-- 
cgit v1.2.1


From 3064ebbde6453b900572806eaf8d78c207293100 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Feb 2010 11:49:31 +0100
Subject: this fix urlbar behaviour, removing focus from there and enabling
 loading animation. Temporary fix??

---
 src/urlbar/urlbar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 1b6ebca8..290ac034 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -37,6 +37,7 @@
 #include "mainwindow.h"
 #include "webview.h"
 #include "historymanager.h"
+#include "webtab.h"
 
 // KDE Includes
 #include <KDebug>
@@ -204,6 +205,9 @@ void UrlBar::activated(const QString& urlString)
     if (urlString.isEmpty())
         return;
 
+    // this fix urlbar behaviour, removing focus from there and enabling
+    // loading animation. Temporary fix??
+    Application::instance()->mainWindow()->currentTab()->setFocus();
     setUrl(urlString);
     emit activated(m_currentUrl);
 }
-- 
cgit v1.2.1


From 06eeee98a92cc01b0b193c94c3d7c357a58f9332 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Feb 2010 12:23:53 +0100
Subject: Some stupid changes && kDebug sentences added to better debug
 download system

---
 src/webpage.cpp | 7 +++++--
 src/webpage.h   | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 0f66ae93..ea05c15a 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -116,7 +116,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
             return false;
     }
 
-    if (frame && m_protHandler.preHandling( request, frame ))
+    if ( frame && m_protHandler.preHandling(request, frame) )
     {
         return false;
 
@@ -162,6 +162,8 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         
         if( offer.isNull() ) // no service can handle this. We can just download it..
         {
+            kDebug() << "no service can handle this. We can just download it..";
+            
             isLocal 
                 ? KMessageBox::sorry(view(), i18n("No service can handle this :(") ) 
                 : downloadRequest( reply->request() );
@@ -175,6 +177,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
             switch ( dlg.askEmbedOrSave() )
             {
                 case KParts::BrowserOpenOrSaveQuestion::Save:
+                    kDebug() << "service handling: download!";
                     downloadRequest( reply->request() );
                     return;
                 case KParts::BrowserOpenOrSaveQuestion::Cancel:
@@ -204,7 +207,7 @@ void WebPage::loadFinished(bool)
 }
 
 
-void WebPage::manageNetworkErrors(QNetworkReply* reply)
+void WebPage::manageNetworkErrors(QNetworkReply *reply)
 {
     if( reply->error() == QNetworkReply::NoError )
         return;
diff --git a/src/webpage.h b/src/webpage.h
index 2a1cf826..c9c5bb8c 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -33,7 +33,6 @@
 #define WEBPAGE_H
 
 
-
 // Local Includes
 #include "protocolhandler.h"
 #include "newtabpage.h"
-- 
cgit v1.2.1


From 7569713d68dd59d406e56e64bcda1f4b5f915be1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Feb 2010 12:27:10 +0100
Subject: Opening rekonq page on new window startup when rekonq has just been
 started :)

---
 src/application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index f3db4c7b..2e1c70a8 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -131,7 +131,7 @@ int Application::newInstance()
         }
         else    // rekonq has just been started. Just open a new window
         {
-            newMainWindow();
+            loadUrl( KUrl("about:home") , Rekonq::NewWindow );
         }
     }
     
-- 
cgit v1.2.1


From f364b998624e403a33dd1b79983f80b2d058da26 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 16 Feb 2010 02:12:45 +0100
Subject: Fixes focus && let Protocol handler to just load on demand the
 KDirLister class (and delete on finish)

---
 src/mainview.cpp        |  4 ++--
 src/protocolhandler.cpp | 22 ++++++++++++++++------
 src/urlbar/urlbar.cpp   | 14 +++++++-------
 src/webpage.cpp         |  1 -
 4 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 8034563b..cf79ad9e 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -501,7 +501,7 @@ void MainView::closeTab(int index)
         }
         hasFocus = tab->hasFocus();
 
-        //store close tab except homepage
+        // store close tab except homepage
         if (!tab->url().prettyUrl().startsWith( QLatin1String("about:") ) && !tab->url().isEmpty())
         {
             QString title = tab->view()->title();
@@ -513,7 +513,7 @@ void MainView::closeTab(int index)
 
         removeTab(index);
         updateTabBar();        // UI operation: do it ASAP!!
-        tab->deleteLater();    // webView is scheduled for deletion.
+        tab->deleteLater();    // tab is scheduled for deletion.
         
         emit tabsChanged();
 
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 995c1448..af2e9904 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -36,6 +36,7 @@
 #include "mainwindow.h"
 #include "mainview.h"
 #include "urlbar.h"
+#include "webtab.h"
 #include "historymanager.h"
 
 // KDE Includes
@@ -63,10 +64,9 @@
 
 ProtocolHandler::ProtocolHandler(QObject *parent)
     : QObject(parent)
-    , _lister(new KDirLister)
+    , _lister(0)
     , _frame(0)
 {
-    connect( _lister, SIGNAL(newItems(const KFileItemList &)), this, SLOT(showResults(const KFileItemList &)));
 }
 
 
@@ -154,8 +154,10 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
         QFileInfo fileInfo( _url.path() );
         if(fileInfo.isDir())
         {
+            _lister = new KDirLister;
+            connect( _lister, SIGNAL(newItems(const KFileItemList &)), this, SLOT(showResults(const KFileItemList &)));
             _lister->openUrl(_url);
-            Application::instance()->mainWindow()->mainView()->urlBar()->setUrl(_url);
+            
             return true;
         }
     }
@@ -166,6 +168,10 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
 
 QString ProtocolHandler::dirHandling(const KFileItemList &list)
 {
+    if (!_lister)
+    {
+        return QString("rekonq error, sorry :(");
+    }
 
     KFileItem mainItem = _lister->rootItem();
     KUrl rootUrl = mainItem.url();
@@ -254,14 +260,14 @@ void ProtocolHandler::showResults(const KFileItemList &list)
         return;
     }
     
-    if ( list.isEmpty() )
-        return;
-    
     QString html = dirHandling(list);
     _frame->setHtml(html);
 
+    Application::instance()->mainWindow()->currentTab()->setFocus();
     Application::instance()->mainWindow()->mainView()->urlBar()->setUrl(_url);
     Application::historyManager()->addHistoryEntry( _url.prettyUrl() );
+
+    delete _lister;
 }
 
 
@@ -277,7 +283,11 @@ void ProtocolHandler::slotMostLocalUrlResult(KJob *job)
         KIO::StatJob *statJob = static_cast<KIO::StatJob*>(job);
         KIO::UDSEntry entry = statJob->statResult();
         if( entry.isDir() )
+        {
+            _lister = new KDirLister;
+            connect( _lister, SIGNAL(newItems(const KFileItemList &)), this, SLOT(showResults(const KFileItemList &)));
             _lister->openUrl(_url);
+        }
         else
             emit downloadUrl(_url);
     }
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 290ac034..8cb17b17 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -161,13 +161,13 @@ void UrlBar::setProgress(int progress)
 
 void UrlBar::updateUrl()
 {
-    // Don't change my typed url...
-    // FIXME this is not a proper solution (also if it works...)
-    if(hasFocus())
-    {
-        kDebug() << "Don't change my typed url...";
-        return;
-    }
+//     // Don't change my typed url...
+//     // FIXME this is not a proper solution (also if it works...)
+//     if(hasFocus())
+//     {
+//         kDebug() << "Don't change my typed url...";
+//         return;
+//     }
 
     KIcon icon;
     if(m_currentUrl.isEmpty()) 
diff --git a/src/webpage.cpp b/src/webpage.cpp
index ea05c15a..ce2d5e40 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -119,7 +119,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
     if ( frame && m_protHandler.preHandling(request, frame) )
     {
         return false;
-
     }
 
     m_requestedUrl = request.url();
-- 
cgit v1.2.1


From d92f82b200c2c9098cab32c2d9437ee2cfefa720 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 16 Feb 2010 09:43:56 +0100
Subject: Removed unuseful check (also if sometimes the bookmark toolbar let
 rekonq misteriously crash...)

---
 src/bookmarks/bookmarksmanager.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 3aab08ae..cfe26a55 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -219,16 +219,13 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
     if (toolBarGroup.isNull())
         return;
 
-    if(m_bookmarkToolBar)
-    {
-        m_bookmarkToolBar->clear(); // FIXME CRASH
+    m_bookmarkToolBar->clear(); // FIXME CRASH
 
-        KBookmark bookmark = toolBarGroup.first();
-        while (!bookmark.isNull())
-        {
-            m_bookmarkToolBar->addAction(fillBookmarkBar(bookmark));
-            bookmark = toolBarGroup.next(bookmark);
-        }
+    KBookmark bookmark = toolBarGroup.first();
+    while (!bookmark.isNull())
+    {
+        m_bookmarkToolBar->addAction(fillBookmarkBar(bookmark));
+        bookmark = toolBarGroup.next(bookmark);
     }
 }
 
-- 
cgit v1.2.1


From 239b7e5542c8f501dafd6e45872b0c4a0aa97d49 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 16 Feb 2010 10:02:44 +0100
Subject: QKeySequenceList --> KShortcut

---
 src/mainwindow.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f1999d4f..8e8ecdb4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -267,23 +267,26 @@ void MainWindow::setupActions()
     KStandardAction::quit(this , SLOT(close()), actionCollection());
 
     a = KStandardAction::find(m_findBar, SLOT(show()), actionCollection());
-    QList<QKeySequence> shortcutFindList;
-    shortcutFindList << KStandardShortcut::find() << QKeySequence( Qt::Key_Slash );
-    a->setShortcuts( shortcutFindList );
+    KShortcut findShortcut = KStandardShortcut::find();
+    findShortcut.setAlternate( Qt::Key_Slash );
+    a->setShortcut( findShortcut );
 
     KStandardAction::findNext(this, SLOT(findNext()) , actionCollection());
     KStandardAction::findPrev(this, SLOT(findPrevious()) , actionCollection());
    
     a = KStandardAction::fullScreen(this, SLOT(viewFullScreen(bool)), this, actionCollection());
-    QList<QKeySequence> shortcutFullScreenList;
-    shortcutFullScreenList << KStandardShortcut::fullScreen() << QKeySequence( Qt::Key_F11 );
-    a->setShortcuts( shortcutFullScreenList );
+    KShortcut fullScreenShortcut = KStandardShortcut::fullScreen();
+    fullScreenShortcut.setAlternate( Qt::Key_F11 );
+    a->setShortcut( fullScreenShortcut );
 
     KStandardAction::home(this, SLOT(homePage()), actionCollection());
     KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
 
     a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
     a->setText(i18n("Reload"));
+    KShortcut reloadShortcut = KStandardShortcut::reload();
+    reloadShortcut.setAlternate( Qt::CTRL + Qt::Key_R );
+    a->setShortcut( reloadShortcut );
 
     a = new KAction(KIcon("process-stop"), i18n("&Stop"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Period));
-- 
cgit v1.2.1


From d862870fb98bd5c523c33ac7d3f0ff15c8391c6e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 16 Feb 2010 10:09:22 +0100
Subject: Again, QKeySequence --> KShortcut

---
 src/mainwindow.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8e8ecdb4..48d89f49 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -418,9 +418,7 @@ void MainWindow::setupTools()
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::SaveAs)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Print)));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::Find)));
-    
-    
-    
+        
     // setup zoom widget
     QWidget *zoomWidget = new QWidget(this);
     
@@ -455,7 +453,6 @@ void MainWindow::setupTools()
     zoomAction->setDefaultWidget(zoomWidget);
     toolsMenu->addAction(zoomAction);
     
-
     toolsMenu->addSeparator();
 
     toolsMenu->addAction(actionByName(QLatin1String("private_browsing")));
@@ -472,7 +469,7 @@ void MainWindow::setupTools()
 
     toolsMenu->addAction(actionByName(QLatin1String("bm_bar")));
     toolsMenu->addAction(actionByName(QLatin1String("show_history_panel")));
-	toolsMenu->addAction(actionByName(QLatin1String("show_bookmarks_panel")));
+    toolsMenu->addAction(actionByName(QLatin1String("show_bookmarks_panel")));
     toolsMenu->addAction(actionByName(KStandardAction::name(KStandardAction::FullScreen)));
 
     toolsMenu->addSeparator();
@@ -500,7 +497,7 @@ void MainWindow::setupPanels()
 
     // setup history panel action
     a = (KAction *) m_historyPanel->toggleViewAction();
-    a->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_H) );
+    a->setShortcut( KShortcut(Qt::CTRL + Qt::Key_H) );
     a->setIcon(KIcon("view-history"));
     actionCollection()->addAction(QLatin1String("show_history_panel"), a);
 
@@ -514,7 +511,7 @@ void MainWindow::setupPanels()
 
     // setup bookmarks panel action
     a = (KAction *) m_bookmarksPanel->toggleViewAction();
-    a->setShortcut( QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B) );
+    a->setShortcut( KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B) );
     a->setIcon(KIcon("bookmarks-organize"));
     actionCollection()->addAction(QLatin1String("show_bookmarks_panel"), a);
 
-- 
cgit v1.2.1


From a2ad510b44017f9b6290eb3d22cacdb1e1732128 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 17 Feb 2010 10:24:46 +0100
Subject: Please, don't crash on CTRL+W signals :)

BUG:227323
---
 src/mainwindow.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 48d89f49..5237a20d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1052,27 +1052,33 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
     m_popup->layout()->setMargin(margin);
 
     // useful values
-    
+    WebTab *tab = m_view->currentWebTab();
+
+    // fix crash on window close
+    if(!tab)
+        return;
+
     // fix crash on window close
-    if(!m_view->currentWebTab()->page()->currentFrame())
+    if(!tab->page())
         return;
     
-    bool scrollbarIsVisible = m_view->currentWebTab()->page()->currentFrame()->scrollBarMaximum(Qt::Horizontal);
+    bool scrollbarIsVisible = tab->page()->currentFrame()->scrollBarMaximum(Qt::Horizontal);
     int scrollbarSize = 0;
     if (scrollbarIsVisible)
     {
         //TODO: detect QStyle size
         scrollbarSize = 17;
     }
-    QPoint webViewOrigin = m_view->currentWebTab()->view()->mapToGlobal(QPoint(0,0));
-    int bottomLeftY=webViewOrigin.y() + m_view->currentWebTab()->page()->viewportSize().height() - labelSize.height() - scrollbarSize;
+    
+    QPoint webViewOrigin = tab->view()->mapToGlobal(QPoint(0,0));
+    int bottomLeftY = webViewOrigin.y() + tab->page()->viewportSize().height() - labelSize.height() - scrollbarSize;
 
     // setting popup in bottom-left position
     int x = geometry().x();
     int y = bottomLeftY;
 
-    QPoint mousePos = m_view->currentWebTab()->mapToGlobal(m_view->currentWebTab()->view()->mousePos());
-    if(QRect(webViewOrigin.x(),bottomLeftY,labelSize.width(),labelSize.height()).contains(mousePos))
+    QPoint mousePos = tab->mapToGlobal( tab->view()->mousePos() );
+    if( QRect( webViewOrigin.x() , bottomLeftY , labelSize.width() , labelSize.height() ).contains(mousePos) )
     {
         // setting popup above the mouse
         y = bottomLeftY - labelSize.height();
-- 
cgit v1.2.1


From 4dcd02b5317896be0adbe479a4594dac4f048286 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 18 Feb 2010 02:10:51 +0100
Subject: Working around about: protocol.. - honor rekonq settings on
 about:home page - loads about:blank :) pages

---
 src/protocolhandler.cpp       | 29 ++++++++++++++++++++++++++++-
 src/rekonqpage/newtabpage.cpp | 12 +-----------
 src/urlbar/urlbar.cpp         |  5 +++--
 3 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index af2e9904..a80f0a46 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -108,6 +108,33 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     // "about" handling
     if ( _url.protocol() == QLatin1String("about") )
     {
+        if( _url == KUrl("about:blank") )
+        {
+            frame->setHtml( QString() );
+            return true;
+        }
+        
+        if( _url == KUrl("about:home") )
+        {
+            switch(ReKonfig::newTabStartPage())
+            {
+            case 0: // favorites
+                _url = KUrl("about:favorites");
+                break;
+            case 1: // closed tabs
+                _url = KUrl("about:closedTabs");
+                break;
+            case 2: // history
+                _url = KUrl("about:history");
+                break;
+            case 3: // bookmarks
+                _url = KUrl("about:bookmarks");
+                break;
+            default: // unuseful
+                break;
+            }
+        }
+        
         NewTabPage p(frame);
         p.generate(_url);
         return true;
@@ -149,7 +176,7 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
     }
     
     // "file" handling. This is quite trivial :)
-    if(_url.protocol() == QLatin1String("file") )
+    if( _url.protocol() == QLatin1String("file") )
     {
         QFileInfo fileInfo( _url.path() );
         if(fileInfo.isDir())
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index ca8ed35e..f7ebcdbf 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -94,15 +94,6 @@ void NewTabPage::generate(KUrl url)
         }
     }
     
-    if(    url != KUrl("about:home")
-        && url != KUrl("about:favorites")
-        && url != KUrl("about:closedTabs")
-        && url != KUrl("about:history")
-        && url != KUrl("about:bookmarks")
-        )
-        return;
-    
-    
     QWebPage *page = m_root.webFrame()->page();
     page->mainFrame()->setHtml(m_html);
 
@@ -111,7 +102,7 @@ void NewTabPage::generate(KUrl url)
     browsingMenu(url);
     
     QString title;
-    if(url == KUrl("about:home") || url == KUrl("about:favorites"))
+    if(url == KUrl("about:favorites"))
     {
         favoritesPage();
         title = i18n("Favorites");
@@ -134,7 +125,6 @@ void NewTabPage::generate(KUrl url)
     }
     
     m_url = url;
-    
     m_root.document().findFirst("title").setPlainText(title);
 }
 
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 8cb17b17..3ddadf6b 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -208,8 +208,9 @@ void UrlBar::activated(const QString& urlString)
     // this fix urlbar behaviour, removing focus from there and enabling
     // loading animation. Temporary fix??
     Application::instance()->mainWindow()->currentTab()->setFocus();
-    setUrl(urlString);
-    emit activated(m_currentUrl);
+
+    setUrl( KUrl(urlString) );
+    emit activated( KUrl(urlString) );
 }
 
 
-- 
cgit v1.2.1


From 498fa3d925a00144e2c2f64340c8d6480689ae15 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 18 Feb 2010 02:41:19 +0100
Subject: improve rekonq first execution && fix (finally :D ) configuration of
 toolbar

---
 src/mainwindow.cpp | 19 +++++++++++++------
 src/rekonq.kcfg    |  3 +++
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5237a20d..e965aa19 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -168,8 +168,6 @@ MainWindow::~MainWindow()
 void MainWindow::setupToolbars()
 {
     // ============ Main ToolBar  ================================
-    m_mainBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
-
     m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Back)) );
     m_mainBar->addAction( actionByName(KStandardAction::name(KStandardAction::Forward)) );
     m_mainBar->addSeparator();
@@ -187,14 +185,23 @@ void MainWindow::setupToolbars()
     m_mainBar->show();  // this just to fix reopening rekonq after fullscreen close
     
     // =========== Bookmarks ToolBar ================================
-    m_bmBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     m_bmBar->setAcceptDrops(true);
     m_bmBar->setContextMenuPolicy(Qt::CustomContextMenu);
-    m_bmBar->setIconDimensions(16);
     Application::bookmarkProvider()->setupBookmarkBar(m_bmBar);
 
-    KToolBar::setToolBarsEditable(false);
-    KToolBar::setToolBarsLocked(true);
+    if(ReKonfig::firstExecution())
+    {
+        m_mainBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+        
+        m_bmBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        m_bmBar->setIconDimensions(16);
+        m_bmBar->hide();
+        
+        KToolBar::setToolBarsEditable(false);
+        KToolBar::setToolBarsLocked(true);
+        
+        ReKonfig::setFirstExecution(false);
+    }
 }
 
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index a24508fc..f008d608 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -23,6 +23,9 @@
 
 <!-- General Settings -->
   <group name="General">
+    <entry name="FirstExecution" type="Bool">
+        <default>true</default>
+    </entry>
     <entry name="startupBehaviour" type="Int">
         <default>1</default>
     </entry>
-- 
cgit v1.2.1


From 0b8fccd40887dc0b37a7d4b8c44992a9fedb4502 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 18 Feb 2010 03:03:21 +0100
Subject: don't change stop/reload icon on not focused loading pages.

BUG: 227277
---
 src/mainview.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index cf79ad9e..0db31c1a 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -538,11 +538,10 @@ void MainView::webViewLoadStarted()
         }
     }
 
-    emit browserTabLoading(true);
-
     if (index != currentIndex())
         return;
 
+    emit browserTabLoading(true);
     emit showStatusBarMessage(i18n("Loading..."));
 }
 
-- 
cgit v1.2.1


From 871fa5c3a2f0f85f7338171c3d7660167150c69d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 18 Feb 2010 03:26:42 +0100
Subject: half fixed (but half is not enough...) the favicon querelle..

---
 src/application.cpp | 28 +++++++++++++++-------------
 src/mainview.cpp    |  2 +-
 src/mainwindow.cpp  |  2 +-
 src/webview.cpp     |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 2e1c70a8..a5b4e759 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -260,22 +260,24 @@ SessionManager *Application::sessionManager()
 
 KIcon Application::icon(const KUrl &url)
 {
-    if( !Application::instance()->mainWindowList().isEmpty() ) // avoid infinite loop at startup
-    {
+    // avoid infinite loop at startup
+    if( Application::instance()->mainWindowList().isEmpty() )
+        return KIcon("text-html");
 
-        if(url == KUrl("about:closedTabs"))
-            return KIcon("tab-close");
-        if(url == KUrl("about:history"))
-            return KIcon("view-history");
-        if(url == KUrl("about:bookmarks"))
-            return KIcon("bookmarks");
-        if(url == KUrl("about:favorites"))
-            return KIcon("emblem-favorite");
-    }
-    
+    // first things first..
     if(url.isEmpty())
         return KIcon("text-html");
-    
+
+    // rekonq icons..
+    if(url == KUrl("about:closedTabs"))
+        return KIcon("tab-close");
+    if(url == KUrl("about:history"))
+        return KIcon("view-history");
+    if(url == KUrl("about:bookmarks"))
+        return KIcon("bookmarks");
+    if(url == KUrl("about:favorites"))
+        return KIcon("emblem-favorite");
+
     KIcon icon = KIcon(QWebSettings::iconForUrl(url));
     if (icon.isNull())
     {
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 0db31c1a..940e1273 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -583,7 +583,7 @@ void MainView::webViewIconChanged()
     int index = indexOf( view->parentWidget() );
     if (-1 != index)
     {
-        QIcon icon = Application::icon(view->url());
+        KIcon icon = Application::icon(view->url());
         QLabel *label = animatedLoading(index, false);
         QMovie *movie = label->movie();
         delete movie;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e965aa19..a4df5756 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1165,7 +1165,7 @@ void MainWindow::aboutToShowBackMenu()
         QWebHistoryItem item = historyList.at(i);
         KAction *action = new KAction(this);
         action->setData(i + offset);
-        QIcon icon = Application::icon( item.url() );
+        KIcon icon = Application::icon( item.url() );
         action->setIcon( icon );
         action->setText( item.title() );
         m_historyBackMenu->addAction(action);
diff --git a/src/webview.cpp b/src/webview.cpp
index e1ba2a46..36f62bfa 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -164,7 +164,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
                     const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + keywordDelimiter;
                     data.setData(searchProviderPrefix + "some keyword");
                     a = new KAction(service->name(), this);
-                    a->setIcon(Application::icon(KUrl(data.uri())));
+                    a->setIcon( Application::icon( data.uri() ) );
                     a->setData(searchProviderPrefix);
                     connect(a, SIGNAL(triggered(bool)), this, SLOT(search()));
                     searchMenu->addAction(a);
-- 
cgit v1.2.1


From 4391ac07ae2b5adfce04ee96c47d7eb49f1f4281 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 18 Feb 2010 15:20:03 +0100
Subject: Fix settings webkit UI (broken on the krazy fix from QComboBox to
 KComboBox)

---
 src/settings/settings_webkit.ui | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 75776d95..e424fd9c 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -149,12 +149,6 @@
       </item>
       <item>
        <widget class="KComboBox" name="kcfg_pluginsEnabled">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
         <item>
          <property name="text">
           <string>Autoload Plugins</string>
@@ -219,6 +213,11 @@
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
-- 
cgit v1.2.1


From 8f65c4ad86e65f30935cec1c459d59fcd23fda18 Mon Sep 17 00:00:00 2001
From: pano <pano@linux-xtvb.(none)>
Date: Thu, 18 Feb 2010 20:10:26 +0100
Subject: =?UTF-8?q?Change=20window=20titles=20strings=20a=20bit=20They=20n?=
 =?UTF-8?q?ow=20use=20a=20"real=20hyphen"=20(=E2=80=93)=20instead=20of=20t?=
 =?UTF-8?q?he=20plain=20minus=20character=20(-),=20like=20it=20is=20used?=
 =?UTF-8?q?=20in=20the=20rest=20of=20KDE.=20I=20also=20made=20the=20window?=
 =?UTF-8?q?=20titles=20translatable,=20since=20Left-to-Right=20languages?=
 =?UTF-8?q?=20might=20need=20this?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mainwindow.cpp              | 6 +++---
 src/settings/settingsdialog.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a4df5756..563871bf 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -671,7 +671,7 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle("rekonq (" + i18n("Private Browsing")  + ')');
+            setWindowTitle(i18nc("Window title when private browsing is activated", "rekonq (Private Browsing)"));
         }
         else
         {
@@ -682,11 +682,11 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle(title + " - rekonq (" + i18n("Private Browsing")  + ')');
+            setWindowTitle(i18nc("window title, %1 = Title of the active website", "%1 – rekonq (Private Browsing)", title) );
         }
         else
         {
-            setWindowTitle(title + " - rekonq");
+            setWindowTitle(i18nc("window title, %1 = title of the active website", "%1 – rekonq"));
         }
     }
 }
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index a3bf7359..0b9d8e85 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -151,7 +151,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         , d(new Private(this))
 {
     showButtonSeparator(false);
-    setWindowTitle(i18n("Configure - rekonq"));
+    setWindowTitle(i18nic("Window title of the settings dialog", "Configure – rekonq"));
     setModal(true);
 
     readConfig();
-- 
cgit v1.2.1


From eaeb2fd551b212eff656b65169ce98ca20485370 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 02:20:18 +0100
Subject: Set rekonq page (and fix focus) on new window creation.

BUG: 226851
---
 src/application.cpp | 7 +++++++
 src/application.h   | 4 ++--
 src/mainwindow.cpp  | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index a5b4e759..e5b76745 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -396,3 +396,10 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job)
             historyManager()->addHistoryEntry( url.prettyUrl() );
     }
 }
+
+
+void Application::newWindow()
+{
+    loadUrl( KUrl("about:home"), Rekonq::NewWindow );
+    mainWindow()->mainView()->urlBar()->setFocus();
+}
diff --git a/src/application.h b/src/application.h
index f20f537b..30ec4839 100644
--- a/src/application.h
+++ b/src/application.h
@@ -100,6 +100,7 @@ public:
     static Application *instance();
 
     MainWindow *mainWindow();
+    MainWindow *newMainWindow();
     MainWindowList mainWindowList();
     
     static KIcon icon(const KUrl &url);
@@ -117,8 +118,6 @@ public slots:
      */
     void saveConfiguration() const;
 
-    MainWindow *newMainWindow();
-
     void loadUrl( const KUrl& url,
                   const Rekonq::OpenType& type = Rekonq::CurrentTab
                 );
@@ -127,6 +126,7 @@ public slots:
                   const Rekonq::OpenType& type = Rekonq::CurrentTab
                 );    
 
+    void newWindow();
     void removeMainWindow(MainWindow *window);
 
 private slots:
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a4df5756..4c24440c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -265,7 +265,7 @@ void MainWindow::setupActions()
     a = new KAction(KIcon("window-new"), i18n("&New Window"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_N));
     actionCollection()->addAction(QLatin1String("new_window"), a);
-    connect(a, SIGNAL(triggered(bool)), Application::instance(), SLOT(newMainWindow()));
+    connect(a, SIGNAL(triggered(bool)), Application::instance(), SLOT(newWindow()));
 
     // Standard Actions
     KStandardAction::open(this, SLOT(fileOpen()), actionCollection());
-- 
cgit v1.2.1


From 3d67f611a66096f19e1a6521f257ea748effb27f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 02:36:27 +0100
Subject: Pano, please compile your code && your changes before asking for a
 merge request..

---
 src/settings/settingsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 0b9d8e85..e7a9d1e8 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -151,7 +151,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         , d(new Private(this))
 {
     showButtonSeparator(false);
-    setWindowTitle(i18nic("Window title of the settings dialog", "Configure – rekonq"));
+    setWindowTitle(i18nc("Window title of the settings dialog", "Configure – rekonq"));
     setModal(true);
 
     readConfig();
-- 
cgit v1.2.1


From 149b8787a830005551fbe68d4bddb45f872ebcc2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 02:49:04 +0100
Subject: .. and check that the changes you do are right. (How can you
 translate page titles? You wanna translate every title in every web page of
 the World?...)

---
 src/mainwindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 63c2c29d..e3beb60a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -682,11 +682,11 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle(i18nc("window title, %1 = Title of the active website", "%1 – rekonq (Private Browsing)", title) );
+            setWindowTitle(title + " - rekonq (" + i18n("Private Browsing")  + ')');
         }
         else
         {
-            setWindowTitle(i18nc("window title, %1 = title of the active website", "%1 – rekonq"));
+            setWindowTitle(title + " - rekonq");
         }
     }
 }
-- 
cgit v1.2.1


From a013b8f0a260ebedbd74f76bd43b0384ca5e2bc4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 12:10:25 +0100
Subject: Save memory. One WebPage pointer less for each WebView :)

---
 src/webview.cpp | 19 +++++++++++++------
 src/webview.h   |  3 +--
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index 36f62bfa..e39ff32e 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -62,16 +62,16 @@
 
 WebView::WebView(QWidget* parent)
     : KWebView(parent, false)
-    , m_page( new WebPage(this) )
-    , m_mousePos(QPoint(0,0))
+    , m_mousePos( QPoint(0,0) )
 {
-    setPage(m_page);
+    WebPage *page = new WebPage(this);
+    setPage(page);
 
     // download system
     connect(this, SIGNAL(linkShiftClicked(const KUrl &)), 
-            m_page, SLOT(downloadUrl(const KUrl &)));
-    connect(m_page, SIGNAL(downloadRequested(const QNetworkRequest &)), 
-            m_page, SLOT(downloadRequest(const QNetworkRequest &)));
+            page, SLOT(downloadUrl(const KUrl &)));
+    connect(page, SIGNAL(downloadRequested(const QNetworkRequest &)), 
+            page, SLOT(downloadRequest(const QNetworkRequest &)));
             
     // middle click || ctrl + click signal
     connect(this, SIGNAL(linkMiddleOrCtrlClicked(const KUrl &)), 
@@ -89,6 +89,13 @@ WebView::~WebView()
 }
 
 
+WebPage *WebView::page()
+{
+    WebPage *page = qobject_cast<WebPage *>( KWebView::page() );
+    return page;
+}
+
+
 void WebView::contextMenuEvent(QContextMenuEvent *event)
 {
     QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos());
diff --git a/src/webview.h b/src/webview.h
index 1598b19c..6d75c549 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -46,7 +46,7 @@ public:
     explicit WebView(QWidget *parent);
     ~WebView();
 
-    WebPage *page() { return m_page; }
+    WebPage *page();
     QPoint mousePos();
 
 protected:
@@ -71,7 +71,6 @@ signals:
     void loadUrl(const KUrl &, const Rekonq::OpenType &);
     
 private:
-    WebPage *const m_page;
     QPoint m_mousePos;
 };
 
-- 
cgit v1.2.1


From b0ef8fdaa1f36f144980f9df30707deb7a076403 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 12:27:01 +0100
Subject: Save memory. One tabBar pointer less for each mainwindow

---
 src/mainview.cpp | 63 ++++++++++++++++++++++++++++----------------------------
 src/mainview.h   |  6 +++---
 2 files changed, 35 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 940e1273..98d8b0a6 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -63,15 +63,15 @@
 
 
 MainView::MainView(MainWindow *parent)
-        : KTabWidget(parent)
-        , m_urlBar(new UrlBar(this))
-        , m_tabBar(new TabBar(this))
-        , m_addTabButton(new QToolButton(this))
-        , m_currentTabIndex(0)
-        , m_parentWindow(parent)
+    : KTabWidget(parent)
+    , m_urlBar(new UrlBar(this))
+    , m_addTabButton(new QToolButton(this))
+    , m_currentTabIndex(0)
+    , m_parentWindow(parent)
 {
     // setting tabbar
-    setTabBar(m_tabBar);
+    TabBar *tabBar = new TabBar(this);
+    setTabBar(tabBar);
 
     // set mouse tracking for tab previews
     setMouseTracking(true);
@@ -80,17 +80,17 @@ MainView::MainView(MainWindow *parent)
     m_loadingGitPath = KStandardDirs::locate("appdata" , "pics/loading.mng");
 
     // connecting tabbar signals
-    connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
-    connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), this, SLOT(closeTab(int)));
-    connect(m_tabBar, SIGNAL(newTabRequest()), this, SLOT(newTab()));
+    connect(tabBar, SIGNAL(closeTab(int)),          this,   SLOT(closeTab(int)) );
+    connect(tabBar, SIGNAL(mouseMiddleClick(int)),  this,   SLOT(closeTab(int)) );
+    connect(tabBar, SIGNAL(newTabRequest()),        this,   SLOT(newTab())      );
     
-    connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(cloneTab(int)));
-    connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(closeOtherTabs(int)));
-    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
-    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
-    connect(m_tabBar, SIGNAL(detachTab(int)), this, SLOT(detachTab(int)));
+    connect(tabBar, SIGNAL(cloneTab(int)),          this,   SLOT(cloneTab(int)) );
+    connect(tabBar, SIGNAL(closeOtherTabs(int)),    this,   SLOT(closeOtherTabs(int))   );
+    connect(tabBar, SIGNAL(reloadTab(int)),         this,   SLOT(reloadTab(int))    );
+    connect(tabBar, SIGNAL(reloadAllTabs()),        this,   SLOT(reloadAllTabs())   );
+    connect(tabBar, SIGNAL(detachTab(int)),         this,   SLOT(detachTab(int))    );
     
-    connect(m_tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
+    connect(tabBar, SIGNAL(tabCloseRequested(int)), this,   SLOT(closeTab(int)) );
     
     // current page index changing
     connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
@@ -123,7 +123,7 @@ void MainView::updateTabButtonPosition()
     static bool ButtonInCorner = false;
 
     int tabWidgetWidth = frameSize().width();
-    int tabBarWidth = m_tabBar->tabSizeHint(0).width()*m_tabBar->count();
+    int tabBarWidth = tabBar()->tabSizeHint(0).width() * tabBar()->count();
 
     if (tabBarWidth + m_addTabButton->width() > tabWidgetWidth)
     {
@@ -143,7 +143,7 @@ void MainView::updateTabButtonPosition()
 
         // detecting X position
         int newPosX = tabBarWidth;      
-        int tabWidthHint = m_tabBar->tabSizeHint(0).width();
+        int tabWidthHint = tabBar()->tabSizeHint(0).width();
         if (tabWidthHint < sizeHint().width()/4)
             newPosX = tabWidgetWidth - m_addTabButton->width();
 
@@ -164,7 +164,8 @@ QToolButton *MainView::addTabButton() const
 
 TabBar *MainView::tabBar() const
 {
-    return m_tabBar; 
+    TabBar *tabBar = qobject_cast<TabBar *>( KTabWidget::tabBar() );
+    return tabBar; 
 }
 
 
@@ -182,13 +183,13 @@ WebTab *MainView::currentWebTab() const
 
 void MainView::updateTabBar()
 {
-    if (ReKonfig::alwaysShowTabBar())
+    if( ReKonfig::alwaysShowTabBar() )
     {
         if (!isTabBarHidden())
         {
-            if (m_tabBar->isHidden())
+            if (tabBar()->isHidden())
             {
-                m_tabBar->show();
+                tabBar()->show();
                 m_addTabButton->show();
             }
             updateTabButtonPosition();
@@ -196,16 +197,16 @@ void MainView::updateTabBar()
         return;
     }
 
-    if (m_tabBar->count() == 1)
+    if( tabBar()->count() == 1 )
     {
-        m_tabBar->hide();
+        tabBar()->hide();
         m_addTabButton->hide();
     }
-    else if (!isTabBarHidden())
+    else if( !isTabBarHidden() )
     {
-        if (m_tabBar->isHidden())
+        if ( tabBar()->isHidden() )
         {
-            m_tabBar->show();
+            tabBar()->show();
             m_addTabButton->show();
         }
         updateTabButtonPosition();
@@ -622,7 +623,7 @@ void MainView::webViewUrlChanged(const QUrl &url)
     int index = indexOf( view->parentWidget() );
     if (-1 != index)
     {
-        m_tabBar->setTabData(index, url);
+        tabBar()->setTabData(index, url);
     }
     emit tabsChanged();
 }
@@ -651,7 +652,7 @@ QLabel *MainView::animatedLoading(int index, bool addMovie)
     if (index == -1)
         return 0;
 
-    QLabel *label = qobject_cast<QLabel*>(m_tabBar->tabButton(index, QTabBar::LeftSide));
+    QLabel *label = qobject_cast<QLabel* >(tabBar()->tabButton(index, QTabBar::LeftSide));
     if (!label)
     {
         label = new QLabel(this);
@@ -663,8 +664,8 @@ QLabel *MainView::animatedLoading(int index, bool addMovie)
         label->setMovie(movie);
         movie->start();
     }
-    m_tabBar->setTabButton(index, QTabBar::LeftSide, 0);
-    m_tabBar->setTabButton(index, QTabBar::LeftSide, label);
+    tabBar()->setTabButton(index, QTabBar::LeftSide, 0);
+    tabBar()->setTabButton(index, QTabBar::LeftSide, label);
     return label;
 }
 
diff --git a/src/mainview.h b/src/mainview.h
index ace9d941..061ad1aa 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -69,8 +69,6 @@ public:
     MainView(MainWindow *parent);
     ~MainView();
 
-public:
-
     UrlBar *urlBar() const;
     WebTab *webTab(int index) const;
 
@@ -168,8 +166,10 @@ private:
      */
     QLabel *animatedLoading(int index, bool addMovie);
 
+
+// --------------------------------------------------------------------------
+
     UrlBar *m_urlBar;
-    TabBar *m_tabBar;
 
     QString m_loadingGitPath;
 
-- 
cgit v1.2.1


From 060909220bad6842828f2583213dc96c285b5fd9 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Feb 2010 12:37:46 +0100
Subject: change setHtml( string ) to setHtml( string, url ) to let webviews
 return an url on webview->url() calls

---
 src/protocolhandler.cpp       | 4 ++--
 src/rekonqpage/newtabpage.cpp | 2 +-
 src/webpage.h                 | 1 +
 src/webtab.cpp                | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index a80f0a46..1a533a6e 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -110,7 +110,7 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     {
         if( _url == KUrl("about:blank") )
         {
-            frame->setHtml( QString() );
+            frame->setHtml( QString() , _url );
             return true;
         }
         
@@ -288,7 +288,7 @@ void ProtocolHandler::showResults(const KFileItemList &list)
     }
     
     QString html = dirHandling(list);
-    _frame->setHtml(html);
+    _frame->setHtml( html, _url );
 
     Application::instance()->mainWindow()->currentTab()->setFocus();
     Application::instance()->mainWindow()->mainView()->urlBar()->setUrl(_url);
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index f7ebcdbf..cc8aa1fb 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -95,7 +95,7 @@ void NewTabPage::generate(KUrl url)
     }
     
     QWebPage *page = m_root.webFrame()->page();
-    page->mainFrame()->setHtml(m_html);
+    page->mainFrame()->setHtml(m_html,m_url);
 
     m_root = page->mainFrame()->documentElement().findFirst("#content");
     
diff --git a/src/webpage.h b/src/webpage.h
index c9c5bb8c..bbaa0f63 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -60,6 +60,7 @@ public slots:
     void manageNetworkErrors(QNetworkReply *reply);
     virtual void downloadRequest(const QNetworkRequest &request);
     void downloadAllContentsWithKGet();
+
 protected:
     WebPage *createWindow(WebWindowType type);
     
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 9dea9a72..4172103b 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -60,7 +60,7 @@
 #include <QVBoxLayout>
 
 
-WebTab::WebTab(QWidget* parent)
+WebTab::WebTab(QWidget *parent)
     : QWidget(parent)
     , m_view( new WebView(this) )
     , m_progress(0)
@@ -68,15 +68,15 @@ WebTab::WebTab(QWidget* parent)
     // fix focus handling
     setFocusProxy( m_view );
     
-    QVBoxLayout* l = new QVBoxLayout(this);
+    QVBoxLayout *l = new QVBoxLayout(this);
     l->setMargin(0);
     l->setSpacing(0);
 
-    QWidget* messageBar = new QWidget(this);
+    QWidget *messageBar = new QWidget(this);
     l->addWidget(messageBar);
     messageBar->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum);
 
-    QVBoxLayout* l2 = new QVBoxLayout(messageBar);
+    QVBoxLayout *l2 = new QVBoxLayout(messageBar);
     l2->setMargin(0);
     l2->setSpacing(0);
 
-- 
cgit v1.2.1


From 983f2f1af4afeaa0539ffe533626233becf28a75 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 19 Feb 2010 15:10:40 +0100
Subject: Workaround the bug of qtwebkit in the function findText(). An empty
 string doesn't clear the selection.

---
 src/findbar.cpp    |  6 ++++++
 src/mainwindow.cpp | 32 ++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 1cb16e3f..d8ae08cc 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -64,6 +64,7 @@ FindBar::FindBar(KMainWindow *mainwindow)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
+    connect(hideButton, SIGNAL(clicked()), this, SLOT(findNext()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
@@ -138,6 +139,11 @@ void FindBar::show()
 
     QWidget::show();
     m_hideTimer->start(60000);
+    
+    // emit a new find signal with the current text
+    QString temp = m_lineEdit->text();
+    m_lineEdit->setText("");
+    m_lineEdit->setText(m_lineEdit->text());
 }
 
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e3beb60a..f9f211ca 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -773,33 +773,57 @@ void MainWindow::find(const QString & search)
     if (!currentTab())
         return;
     m_lastSearch = search;
+    
+    if(m_lastSearch.isEmpty())
+    {
+      currentTab()->view()->page()->focusNextPrevChild(true);
+      return;
+    }
     findNext();
 }
 
 
 void MainWindow::findNext()
 {
-    if (!currentTab() && m_lastSearch.isEmpty())
+    if (!currentTab())
         return;
 
+    if(m_lastSearch.isEmpty() || m_findBar->isHidden())
+    {
+      currentTab()->view()->page()->focusNextPrevChild(true);
+      return;
+    }
+    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
 
-    m_findBar->notifyMatch(currentTab()->view()->findText(m_lastSearch, options));
+    bool found = currentTab()->view()->findText(m_lastSearch, options);
+    m_findBar->notifyMatch(found);
+    if(!found)
+	currentTab()->view()->page()->focusNextPrevChild(true);
 }
 
 
 void MainWindow::findPrevious()
 {
-    if (!currentTab() && m_lastSearch.isEmpty())
+    if (!currentTab())
         return;
 
+    if(m_lastSearch.isEmpty() || m_findBar->isHidden())
+    {
+      currentTab()->view()->page()->focusNextPrevChild(true);
+      return;
+    }
+    
     QWebPage::FindFlags options = QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
 
-    m_findBar->notifyMatch(currentTab()->view()->findText(m_lastSearch, options));
+    bool found = currentTab()->view()->findText(m_lastSearch, options);
+    m_findBar->notifyMatch(found);
+    if(!found)
+	currentTab()->view()->page()->focusNextPrevChild(true);
 }
 
 
-- 
cgit v1.2.1


From e88fc26105ce8ba41ac988ff428596baefd443d7 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 19 Feb 2010 15:27:58 +0100
Subject: The text is now instantly checked when the checkbox match case is
 toggled Fix the selected text when the findBar is closed and open

---
 src/findbar.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index d8ae08cc..2b464978 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -64,7 +64,7 @@ FindBar::FindBar(KMainWindow *mainwindow)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(hideButton, SIGNAL(clicked()), this, SLOT(findNext()));
+    connect(hideButton, SIGNAL(clicked()), mainwindow, SLOT(findNext()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
@@ -92,6 +92,7 @@ FindBar::FindBar(KMainWindow *mainwindow)
     // Case sensitivity. Deliberately set so this is off by default.
     m_matchCase->setCheckState(Qt::Unchecked);
     m_matchCase->setTristate(false);
+    connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(findNext()));
     layout->addWidget(m_matchCase);
 
     // stretching widget on the left
@@ -143,7 +144,7 @@ void FindBar::show()
     // emit a new find signal with the current text
     QString temp = m_lineEdit->text();
     m_lineEdit->setText("");
-    m_lineEdit->setText(m_lineEdit->text());
+    m_lineEdit->setText(temp);
 }
 
 
-- 
cgit v1.2.1


From cbf12dbaa27add9bfdfda728d7c952429262ca99 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 19 Feb 2010 15:42:22 +0100
Subject: Fix a small regression : the color of the lineEdit of the findBar is
 not correctly updated when it's empty

---
 src/mainwindow.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f9f211ca..22cf8c6c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -774,11 +774,6 @@ void MainWindow::find(const QString & search)
         return;
     m_lastSearch = search;
     
-    if(m_lastSearch.isEmpty())
-    {
-      currentTab()->view()->page()->focusNextPrevChild(true);
-      return;
-    }
     findNext();
 }
 
@@ -788,7 +783,7 @@ void MainWindow::findNext()
     if (!currentTab())
         return;
 
-    if(m_lastSearch.isEmpty() || m_findBar->isHidden())
+    if(m_findBar->isHidden())
     {
       currentTab()->view()->page()->focusNextPrevChild(true);
       return;
@@ -810,7 +805,7 @@ void MainWindow::findPrevious()
     if (!currentTab())
         return;
 
-    if(m_lastSearch.isEmpty() || m_findBar->isHidden())
+    if(m_findBar->isHidden())
     {
       currentTab()->view()->page()->focusNextPrevChild(true);
       return;
-- 
cgit v1.2.1


From 0debb4dc3c946ac73c8e622f7c73565da7597767 Mon Sep 17 00:00:00 2001
From: pano <pano@linux-xtvb.(none)>
Date: Fri, 19 Feb 2010 18:34:01 +0100
Subject: window title fixes

---
 src/mainwindow.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e3beb60a..f9143a18 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -671,7 +671,7 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle(i18nc("Window title when private browsing is activated", "rekonq (Private Browsing)"));
+            setWindowTitle(i18nc("Window title when private browsing is activated", "rekonq (Private Browsing)")); 
         }
         else
         {
@@ -682,11 +682,11 @@ void MainWindow::updateWindowTitle(const QString &title)
     {
         if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
         {
-            setWindowTitle(title + " - rekonq (" + i18n("Private Browsing")  + ')');
+            setWindowTitle(i18nc("window title, %1 = title of the active website", "%1 – rekonq (Private Browsing)", title) ); 
         }
         else
         {
-            setWindowTitle(title + " - rekonq");
+            setWindowTitle(i18nc("window title, %1 = title of the active website", "%1 – rekonq", title));
         }
     }
 }
-- 
cgit v1.2.1


From 8f9db7ef7ce4116c3ea7a34a49d5db04602b4c06 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 19 Feb 2010 22:27:05 +0100
Subject: Get rid of the selection of the next found expression when the
 checkbox matchCase is toggled

---
 src/findbar.cpp    |  2 +-
 src/mainwindow.cpp | 17 ++++++++++++++++-
 src/mainwindow.h   |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 2b464978..6b92f130 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -92,7 +92,7 @@ FindBar::FindBar(KMainWindow *mainwindow)
     // Case sensitivity. Deliberately set so this is off by default.
     m_matchCase->setCheckState(Qt::Unchecked);
     m_matchCase->setTristate(false);
-    connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(findNext()));
+    connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(matchCaseUpdate()));
     layout->addWidget(m_matchCase);
 
     // stretching widget on the left
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 22cf8c6c..d61b56f9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -777,7 +777,22 @@ void MainWindow::find(const QString & search)
     findNext();
 }
 
-
+void MainWindow::matchCaseUpdate()
+{
+    if (!currentTab())
+        return;
+    
+    QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
+    
+    if (m_findBar->matchCase())
+        options |= QWebPage::FindCaseSensitively;
+    
+    currentTab()->view()->findText(m_lastSearch, QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument);
+    bool found = currentTab()->view()->findText(m_lastSearch, options);
+    m_findBar->notifyMatch(found);
+    if(!found)
+	currentTab()->view()->page()->focusNextPrevChild(true);
+}
 void MainWindow::findNext()
 {
     if (!currentTab())
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c104ad4d..db75b1bd 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -127,6 +127,7 @@ private slots:
 
     // Find Action slots
     void find(const QString &);
+    void matchCaseUpdate();
     void findNext();
     void findPrevious();
 
-- 
cgit v1.2.1


From cdb535abac3fed5893117acefaaac392f4209ad1 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 20 Feb 2010 12:52:20 +0100
Subject: The newTab button must be initialized after the tabBar. (Fix the
 regression introduced by b0ef8fdaa1f36f144980f9df30707deb7a076403)

---
 src/mainview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 98d8b0a6..cfce0fb0 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -65,12 +65,12 @@
 MainView::MainView(MainWindow *parent)
     : KTabWidget(parent)
     , m_urlBar(new UrlBar(this))
-    , m_addTabButton(new QToolButton(this))
     , m_currentTabIndex(0)
     , m_parentWindow(parent)
 {
     // setting tabbar
     TabBar *tabBar = new TabBar(this);
+    m_addTabButton = new QToolButton(this);
     setTabBar(tabBar);
 
     // set mouse tracking for tab previews
-- 
cgit v1.2.1


From 2700aa28cf109ff83f9b3619d5475f98a7b4b62b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 20 Feb 2010 15:04:24 +0100
Subject: Restored addTabButton ctor initialization

---
 src/mainview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index cfce0fb0..bad6999b 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -65,6 +65,7 @@
 MainView::MainView(MainWindow *parent)
     : KTabWidget(parent)
     , m_urlBar(new UrlBar(this))
+    , m_addTabButton(0)
     , m_currentTabIndex(0)
     , m_parentWindow(parent)
 {
-- 
cgit v1.2.1


From 2f21d0ed14647ee361538f7adcf7c8013d47c872 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 21 Feb 2010 00:46:45 +0100
Subject: A stupid regression caused by me. When I'll decide to implement some
 unit tests for this, we'll no more see things like this :)

---
 src/protocolhandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 1a533a6e..ffeea562 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -108,10 +108,10 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     // "about" handling
     if ( _url.protocol() == QLatin1String("about") )
     {
+        // let webkit manage the about:blank url...
         if( _url == KUrl("about:blank") )
         {
-            frame->setHtml( QString() , _url );
-            return true;
+            return false;
         }
         
         if( _url == KUrl("about:home") )
-- 
cgit v1.2.1


From f02d3a7ecd4e53af215bcec14ef1480cba9840ed Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 21 Feb 2010 12:24:19 +0100
Subject: handle relative urls (needs test with particular encoding)

---
 src/webpage.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index ce2d5e40..872766ff 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -335,17 +335,21 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
 void WebPage::downloadAllContentsWithKGet()
 {
     QList<QString> contentList;
+    KUrl baseUrl(m_requestedUrl);
+    KUrl relativeUrl;
 
     QWebElementCollection images = mainFrame()->documentElement().findAll("img");
     foreach(QWebElement img, images)
     {
-        contentList.append(img.attribute("src"));
+      relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(),KUrl::TolerantMode); 
+      contentList.append(QString(baseUrl.resolved(relativeUrl).toEncoded()));
     }
     
     QWebElementCollection links = mainFrame()->documentElement().findAll("a");
     foreach(QWebElement link, links)
     {
-        contentList.append(link.attribute("href"));
+	relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(),KUrl::TolerantMode); 
+	contentList.append(QString(baseUrl.resolved(relativeUrl).toEncoded()));
     }
     
     if(!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kget"))
-- 
cgit v1.2.1


From 28c51f343c210d012b2b5932d78e5f92601d7328 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 21 Feb 2010 12:49:40 +0100
Subject: add an url with japanese chars for test kget download

---
 src/tests/link_test.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/tests/link_test.html b/src/tests/link_test.html
index 7dd1470d..5ca3cd41 100644
--- a/src/tests/link_test.html
+++ b/src/tests/link_test.html
@@ -135,6 +135,13 @@
 <td><a href="http://ads.cnn.com/" target="_blank">link</a></td>
 </tr>
 
+
+<tr>
+<td>http://ja.wikipedia.org/wiki/特別:最近の更新</td>
+<td>KGet import links with particular encoding</td>
+<td><a href="http://ja.wikipedia.org/wiki/特別:最近の更新">link</a></td>
+</tr>
+
 <tr>
 <td></td>
 <td></td>
-- 
cgit v1.2.1


From 49a6031c6bd03fee2c4130fa05e5ae52d9f826e3 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 21 Feb 2010 13:10:36 +0100
Subject: remove duplicate links

---
 src/webpage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 872766ff..252a9e93 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -334,22 +334,22 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
 
 void WebPage::downloadAllContentsWithKGet()
 {
-    QList<QString> contentList;
+    QSet<QString> contents;
     KUrl baseUrl(m_requestedUrl);
     KUrl relativeUrl;
 
     QWebElementCollection images = mainFrame()->documentElement().findAll("img");
     foreach(QWebElement img, images)
     {
-      relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(),KUrl::TolerantMode); 
-      contentList.append(QString(baseUrl.resolved(relativeUrl).toEncoded()));
+	relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(),KUrl::TolerantMode); 
+	contents << baseUrl.resolved(relativeUrl).toString();
     }
     
     QWebElementCollection links = mainFrame()->documentElement().findAll("a");
     foreach(QWebElement link, links)
     {
 	relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(),KUrl::TolerantMode); 
-	contentList.append(QString(baseUrl.resolved(relativeUrl).toEncoded()));
+	contents << baseUrl.resolved(relativeUrl).toString();
     }
     
     if(!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kget"))
@@ -357,5 +357,5 @@ void WebPage::downloadAllContentsWithKGet()
         KToolInvocation::kdeinitExecWait("kget");
     }
     QDBusInterface kget("org.kde.kget", "/KGet", "org.kde.kget.main");
-    kget.call("importLinks", QVariant(contentList));
+    kget.call("importLinks", QVariant(contents.toList()));
 }
-- 
cgit v1.2.1


From 9cdff6078e0e94349c684bd3b862fdea60d3f159 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 21 Feb 2010 22:07:49 +0100
Subject: Clean and optimize the findBar code. Use the searchString signal. Fix
 the selection of the lineEdit text when the findBar is reopen.

---
 src/findbar.cpp    | 36 +++++++-----------------------------
 src/findbar.h      |  8 +-------
 src/mainwindow.cpp | 19 ++++---------------
 3 files changed, 12 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 6b92f130..43b23035 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -43,7 +43,6 @@
 #include <QtGui/QToolButton>
 #include <QtGui/QLabel>
 #include <QtGui/QColor>
-#include <QtGui/QKeyEvent>
 #include <QtCore/QString>
 #include <QtCore/QTimer>
 
@@ -64,7 +63,6 @@ FindBar::FindBar(KMainWindow *mainwindow)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(hideButton, SIGNAL(clicked()), mainwindow, SLOT(findNext()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
@@ -122,41 +120,21 @@ bool FindBar::matchCase() const
 }
 
 
-void FindBar::clear()
-{
-    m_lineEdit->setText(QString());
-}
-
-
 void FindBar::show()
 {
-    // set focus to findbar if user select showFindBar shortcut
-    m_lineEdit->setFocus();
-    m_lineEdit->selectAll();
-
     // show findbar if not visible
     if (isVisible())
         return;
-
+    
     QWidget::show();
     m_hideTimer->start(60000);
     
     // emit a new find signal with the current text
-    QString temp = m_lineEdit->text();
-    m_lineEdit->setText("");
-    m_lineEdit->setText(temp);
-}
-
-
-void FindBar::keyPressEvent(QKeyEvent* event)
-{
-    if (event->key() == Qt::Key_Return && !m_lineEdit->text().isEmpty())
-    {
-        emit searchString(m_lineEdit->text());
-        return;
-    }
-
-    QWidget::keyPressEvent(event);
+    emit(searchString(m_lineEdit->text()));
+    
+    // set focus to findbar if user select showFindBar shortcut
+    m_lineEdit->setFocus();
+    m_lineEdit->selectAll();
 }
 
 
@@ -184,9 +162,9 @@ void FindBar::notifyMatch(bool match)
 }
 
 
-
 void FindBar::hide()
 {
     m_hideTimer->stop();
     QWidget::hide();
+    emit(searchString(m_lineEdit->text()));
 }
diff --git a/src/findbar.h b/src/findbar.h
index d56b8d25..8f220c92 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -35,11 +35,9 @@
 // Qt Includes
 #include <QtGui/QWidget>
 #include <QtGui/QCheckBox>
-#include <QtGui/QKeyEvent>
 
 // Forward Declarations
 class KMainWindow;
-class QKeyEvent;
 class QString;
 
 
@@ -52,15 +50,11 @@ public:
     ~FindBar();
     KLineEdit *lineEdit() const;
     bool matchCase() const;
+    void notifyMatch(bool match);
 
 public slots:
-    void clear();
     void show();
     void hide();
-    void notifyMatch(bool match);
-
-protected Q_SLOTS:
-    void keyPressEvent(QKeyEvent* event);
 
 signals:
     void searchString(const QString &);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ef74adab..39dd9a40 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -777,22 +777,17 @@ void MainWindow::find(const QString & search)
     findNext();
 }
 
+
 void MainWindow::matchCaseUpdate()
 {
     if (!currentTab())
         return;
     
-    QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
-    
-    if (m_findBar->matchCase())
-        options |= QWebPage::FindCaseSensitively;
-    
     currentTab()->view()->findText(m_lastSearch, QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument);
-    bool found = currentTab()->view()->findText(m_lastSearch, options);
-    m_findBar->notifyMatch(found);
-    if(!found)
-	currentTab()->view()->page()->focusNextPrevChild(true);
+    findNext();
 }
+
+
 void MainWindow::findNext()
 {
     if (!currentTab())
@@ -819,12 +814,6 @@ void MainWindow::findPrevious()
 {
     if (!currentTab())
         return;
-
-    if(m_findBar->isHidden())
-    {
-      currentTab()->view()->page()->focusNextPrevChild(true);
-      return;
-    }
     
     QWebPage::FindFlags options = QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
-- 
cgit v1.2.1


From ab28170bd85aeb12384eef2cd4da1c2b04361259 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 22 Feb 2010 02:06:06 +0100
Subject: Fixes 217521 bug and let us save also some memory (1 QUrl variable
 for each webpage). It needs testing, obvious, but it seems working well..

BUG:217521
---
 src/webpage.cpp | 14 ++++++++------
 src/webpage.h   |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index ce2d5e40..9abc1a0b 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -72,7 +72,7 @@
 
 
 WebPage::WebPage(QObject *parent)
-        : KWebPage(parent, KWalletIntegration)
+    : KWebPage(parent, KWalletIntegration)
 {
     setForwardUnsupportedContent(true);
 
@@ -87,9 +87,10 @@ WebPage::WebPage(QObject *parent)
     // Web Plugin Factory
     setPluginFactory(new WebPluginFactory(this));
     
-
-    connect(networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
+    // managing errors
+    connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
     
+    // handling load & content
     connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(handleUnsupportedContent(QNetworkReply *)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 
@@ -121,8 +122,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
         return false;
     }
 
-    m_requestedUrl = request.url();
-
     return KWebPage::acceptNavigationRequest(frame, request, type);
 }
 
@@ -218,7 +217,10 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
     if( reply->error() == QNetworkReply::ContentAccessDenied )
         return;
     
-    if( reply->url() != m_requestedUrl ) // prevent favicon loading
+    // don't bother on elements loading errors: we'll manage just 
+    // main url page ones
+    WebView *v = qobject_cast<WebView *>(view());
+    if( reply->url() != v->url() )
         return;
     
     if( reply->error() == QNetworkReply::ContentNotFoundError )
diff --git a/src/webpage.h b/src/webpage.h
index bbaa0f63..f76fd334 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -77,7 +77,6 @@ private slots:
 private:
     QString errorPage(QNetworkReply *);
 
-    QUrl m_requestedUrl;
     ProtocolHandler m_protHandler;
 };
 
-- 
cgit v1.2.1


From ab75e99f29bcc76d1c476001eab4d877a564a39b Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Mon, 22 Feb 2010 10:45:51 +0100
Subject: select element in webinspector when toggle "Inspect Element"

---
 src/webview.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index e39ff32e..80d44d10 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -425,6 +425,7 @@ void WebView::inspect()
     QAction *a = Application::instance()->mainWindow()->actionByName("web_inspector");
     if(a && !a->isChecked())
         a->trigger();
+    pageAction(QWebPage::InspectElement)->trigger();
 }
 
 
-- 
cgit v1.2.1


From bdcf5e1f3d9f8fa855bbc83aa23fd3f4877fbab2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 11:35:31 +0100
Subject: Moved away the m_requestedUrl call, using currentFrame()->url().
 (When you want to download something from a page, you should just have loaded
 it..)

---
 src/webpage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 3143f296..b5318874 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -337,7 +337,7 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
 void WebPage::downloadAllContentsWithKGet()
 {
     QSet<QString> contents;
-    KUrl baseUrl(m_requestedUrl);
+    KUrl baseUrl( currentFrame()->url() );
     KUrl relativeUrl;
 
     QWebElementCollection images = mainFrame()->documentElement().findAll("img");
-- 
cgit v1.2.1


From 10d01088d7189de8def4dab1e73a043607859b58 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 15:55:23 +0100
Subject: Again, saving one WebView pointer for each tab

---
 src/webtab.cpp | 34 +++++++++++++++++-----------------
 src/webtab.h   |  7 ++++---
 2 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index 4172103b..10898d46 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -62,12 +62,8 @@
 
 WebTab::WebTab(QWidget *parent)
     : QWidget(parent)
-    , m_view( new WebView(this) )
     , m_progress(0)
 {
-    // fix focus handling
-    setFocusProxy( m_view );
-    
     QVBoxLayout *l = new QVBoxLayout(this);
     l->setMargin(0);
     l->setSpacing(0);
@@ -80,10 +76,14 @@ WebTab::WebTab(QWidget *parent)
     l2->setMargin(0);
     l2->setSpacing(0);
 
-    l->addWidget(m_view);
-    m_view->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
-   
-    KWebWallet *wallet = page()->wallet();
+    WebView *view = new WebView(this);
+    l->addWidget(view);
+    view->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    // fix focus handling
+    setFocusProxy( view );
+
+    KWebWallet *wallet = view->page()->wallet();
    
     if(wallet)
     {
@@ -91,34 +91,34 @@ WebTab::WebTab(QWidget *parent)
                 this, SLOT(createWalletBar(const QString &, const QUrl &)));
     }
 
-    connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
+    connect(view->page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
 
-    connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
-    connect(m_view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
+    connect(view, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
+    connect(view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 }
 
 
 WebTab::~WebTab()
 {
-    delete m_view;
 }
 
 
 WebView *WebTab::view()
 {
-    return m_view;
+    WebView *view = qobject_cast<WebView *>( layout()->itemAt(1)->widget() );
+    return view;
 }
 
 
 WebPage *WebTab::page()
 {
-    return m_view->page();  // FIXME
+    return view()->page();
 }
 
 
-KUrl WebTab::url() const 
-{ 
-    return KUrl(m_view->url()); 
+KUrl WebTab::url() 
+{
+    return KUrl( view()->url() ); 
 }
 
 
diff --git a/src/webtab.h b/src/webtab.h
index d54ae5f8..8f434ee7 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -31,7 +31,9 @@
 
 // KDE Includes
 #include <KUrl>
-#include <KWebView>
+
+// Qt Includes
+#include <QWidget>
 
 // Forward Declarations
 class WebPage;
@@ -48,7 +50,7 @@ public:
 
     WebView *view();
     WebPage *page();
-    KUrl url() const;
+    KUrl url();
     QString lastStatusBarText() const;
     int progress();
     void createPreviewSelectorBar(int index);
@@ -61,7 +63,6 @@ private slots:
     void createWalletBar(const QString &, const QUrl &);
 
 private:
-    WebView *const m_view;
     int m_progress;
     QString m_statusBarText;
 };
-- 
cgit v1.2.1


From 6a81a6ae29c86e603a122f863cd3d5d9624c3f75 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 15:55:49 +0100
Subject: reorganizing a bit .kcfg file..

---
 src/rekonq.kcfg | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index f008d608..77d66628 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -11,6 +11,19 @@
 
 <kcfgfile name="rekonqrc" />
 
+<!-- Miscellaneuos (not config UI) settins -->
+<group name="misc">
+    <entry name="FirstExecution" type="Bool">
+        <default>true</default>
+    </entry>
+    <entry name="showHistoryPanel" type="Bool">
+        <default>false</default>
+    </entry>
+    <entry name="showBookmarksPanel" type="Bool">
+        <default>false</default>
+    </entry>
+</group>
+
 <!-- New Tab Page Settings -->
   <group name="NewTabPage">
     <entry name="previewNames" type="StringList">
@@ -23,9 +36,6 @@
 
 <!-- General Settings -->
   <group name="General">
-    <entry name="FirstExecution" type="Bool">
-        <default>true</default>
-    </entry>
     <entry name="startupBehaviour" type="Int">
         <default>1</default>
     </entry>
@@ -38,12 +48,6 @@
     <entry name="homePage" type="String">
         <default>http://www.kde.org/</default>
     </entry>
-    <entry name="showHistoryPanel" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="showBookmarksPanel" type="Bool">
-        <default>false</default>
-    </entry>
     <entry name="kgetDownload" type="Bool">
         <default>false</default>
     </entry>
@@ -96,12 +100,6 @@
         <entry name="expireHistory" type="Int">
             <default>1</default>
         </entry>
-        <entry name="acceptCookies" type="Int">
-            <default>2</default>
-        </entry>
-        <entry name="keepCookiesUntil" type="Int">
-            <default>0</default>
-        </entry>
     </group>
 
 <!-- WebKit Settings -->
-- 
cgit v1.2.1


From ad14cf95df6e432f747ff1d144621523f837e2b1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 16:11:08 +0100
Subject: Again and again.. :) Saving one QString for each tab..

---
 src/mainview.cpp |  8 +++++---
 src/webtab.cpp   | 12 ------------
 src/webtab.h     |  4 +---
 3 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index bad6999b..e2f9094f 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -294,15 +294,17 @@ void MainView::currentChanged(int index)
     connect(tab->view(), SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
     connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
     
-    connect(tab->view()->page(), SIGNAL(statusBarMessage(const QString&)), 
+    connect(tab->page(), SIGNAL(statusBarMessage(const QString&)), 
             this, SIGNAL(showStatusBarMessage(const QString&)));
-    connect(tab->view()->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), 
+    connect(tab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), 
             this, SIGNAL(linkHovered(const QString&)));
 
     emit setCurrentTitle(tab->view()->title());
     urlBar()->setUrl(tab->view()->url());
     urlBar()->setProgress(tab->progress());
-    emit showStatusBarMessage(tab->lastStatusBarText());
+
+    // clean up "status bar"
+    emit showStatusBarMessage( QString() );
 
     // notify UI to eventually switch stop/reload button
     if(urlBar()->isLoading())
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 10898d46..645c9606 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -128,18 +128,6 @@ int WebTab::progress()
 }
 
 
-QString WebTab::lastStatusBarText() const
-{ 
-    return m_statusBarText; 
-}
-
-
-void WebTab::setStatusBarText(const QString &string) 
-{ 
-    m_statusBarText = string; 
-}
-
-
 void WebTab::updateProgress(int p)
 {
     m_progress = p;
diff --git a/src/webtab.h b/src/webtab.h
index 8f434ee7..7fd63b18 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -51,12 +51,11 @@ public:
     WebView *view();
     WebPage *page();
     KUrl url();
-    QString lastStatusBarText() const;
+
     int progress();
     void createPreviewSelectorBar(int index);
     
 private slots:
-    void setStatusBarText(const QString &string);
     void updateProgress(int progress);
     void loadFinished(bool);
 
@@ -64,7 +63,6 @@ private slots:
 
 private:
     int m_progress;
-    QString m_statusBarText;
 };
 
 #endif
-- 
cgit v1.2.1


From c90f0af043e3691d194f04e416e4d7b8a115437b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 16:30:17 +0100
Subject: Remember "Never for this site" urls Also if I think this is NOT a
 proper solution..

BUG:227651
---
 src/rekonq.kcfg   | 3 +++
 src/walletbar.cpp | 9 ++++++++-
 src/webtab.cpp    | 8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 77d66628..0675720c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -22,6 +22,9 @@
     <entry name="showBookmarksPanel" type="Bool">
         <default>false</default>
     </entry>
+    <entry name="walletBlackList" type="StringList">
+        <default></default>
+    </entry>
 </group>
 
 <!-- New Tab Page Settings -->
diff --git a/src/walletbar.cpp b/src/walletbar.cpp
index c5d705e0..5b911585 100644
--- a/src/walletbar.cpp
+++ b/src/walletbar.cpp
@@ -28,6 +28,9 @@
 #include "walletbar.h"
 #include "walletbar.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
 // KDE Includes
 #include <klocalizedstring.h>
 #include <KIcon>
@@ -85,7 +88,11 @@ void WalletBar::rememberData()
 
 void WalletBar::neverRememberData()
 {
-    // TODO: store site url (to remember never bother about)
+    // add url to the blacklist
+    QStringList list = ReKonfig::walletBlackList(); 
+    list << m_url.toString();
+    ReKonfig::setWalletBlackList( list );
+    
     notNowRememberData();
 }
 
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 645c9606..b4759995 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -141,7 +141,13 @@ void WebTab::loadFinished(bool)
 
 
 void WebTab::createWalletBar(const QString &key, const QUrl &url)
-{    
+{
+    // check if the url is in the wallet blacklist
+    QString urlString = url.toString();
+    QStringList blackList = ReKonfig::walletBlackList();
+    if( blackList.contains( urlString ) )
+        return;
+    
     KWebWallet *wallet = page()->wallet();
     QWidget *messageBar = layout()->itemAt(0)->widget();
 
-- 
cgit v1.2.1


From 9f29a5eb7223ea2edd7a9f3ee39dd9285820affb Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Feb 2010 19:04:05 +0100
Subject: Simpler is better :) removed doubled check

---
 src/mainview.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index e2f9094f..9693bb69 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -186,15 +186,12 @@ void MainView::updateTabBar()
 {
     if( ReKonfig::alwaysShowTabBar() )
     {
-        if (!isTabBarHidden())
+        if (tabBar()->isHidden())
         {
-            if (tabBar()->isHidden())
-            {
-                tabBar()->show();
-                m_addTabButton->show();
-            }
-            updateTabButtonPosition();
+            tabBar()->show();
+            m_addTabButton->show();
         }
+        updateTabButtonPosition();
         return;
     }
 
@@ -203,7 +200,7 @@ void MainView::updateTabBar()
         tabBar()->hide();
         m_addTabButton->hide();
     }
-    else if( !isTabBarHidden() )
+    else
     {
         if ( tabBar()->isHidden() )
         {
-- 
cgit v1.2.1


From 5f59b5f0c7724662f180f82123dc5c269f41a530 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 25 Feb 2010 12:47:30 +0100
Subject: Fix cookies handling. Change WebPage ctor && setting winId for each
 page in the cookiejar

---
 src/webpage.cpp | 6 +++++-
 src/webpage.h   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index b5318874..98a66fe0 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -71,7 +71,7 @@
 #include <QtGui/QKeyEvent>
 
 
-WebPage::WebPage(QObject *parent)
+WebPage::WebPage(QWidget *parent)
     : KWebPage(parent, KWalletIntegration)
 {
     setForwardUnsupportedContent(true);
@@ -82,6 +82,10 @@ WebPage::WebPage(QObject *parent)
     // disable QtWebKit cache to just use KIO one..
     manager->setCache(0);
     
+    // set cookieJar window ID..
+    if (parent && parent->window())
+        manager->setCookieJarWindowId(parent->window()->winId());
+
     setNetworkAccessManager(manager);
     
     // Web Plugin Factory
diff --git a/src/webpage.h b/src/webpage.h
index f76fd334..c9b78927 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -53,7 +53,7 @@ class WebPage : public KWebPage
     Q_OBJECT
 
 public:
-    explicit WebPage(QObject *parent = 0);
+    explicit WebPage(QWidget *parent = 0);
     ~WebPage();
 
 public slots:
-- 
cgit v1.2.1


From 55260346ded1213932026afb21db55362aa466c1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 25 Feb 2010 18:44:31 +0100
Subject: On the road of fixing BUG 227947

a clear (network) error management.
---
 src/webpage.cpp | 90 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 98a66fe0..9371d7bf 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -74,13 +74,13 @@
 WebPage::WebPage(QWidget *parent)
     : KWebPage(parent, KWalletIntegration)
 {
+    // ----- handling unsupported content...
     setForwardUnsupportedContent(true);
+    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(handleUnsupportedContent(QNetworkReply *)));
 
-    // rekonq Network Manager
+    // ----- rekonq Network Manager
     NetworkAccessManager *manager = new NetworkAccessManager(this);
-    
-    // disable QtWebKit cache to just use KIO one..
-    manager->setCache(0);
+    manager->setCache(0);   // disable QtWebKit cache to just use KIO one..
     
     // set cookieJar window ID..
     if (parent && parent->window())
@@ -88,14 +88,11 @@ WebPage::WebPage(QWidget *parent)
 
     setNetworkAccessManager(manager);
     
-    // Web Plugin Factory
+    // ----- Web Plugin Factory
     setPluginFactory(new WebPluginFactory(this));
     
-    // managing errors
+    // ----- last stuffs
     connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
-    
-    // handling load & content
-    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(handleUnsupportedContent(QNetworkReply *)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 
     // protocol handler signals
@@ -211,45 +208,50 @@ void WebPage::loadFinished(bool)
 
 void WebPage::manageNetworkErrors(QNetworkReply *reply)
 {
-    if( reply->error() == QNetworkReply::NoError )
-        return;
-
-    if(m_protHandler.postHandling( reply->request(), mainFrame() ))
-        return;
-
-    // don't bother on adblocked urls
-    if( reply->error() == QNetworkReply::ContentAccessDenied )
-        return;
+    WebView *v = 0;
     
-    // don't bother on elements loading errors: we'll manage just 
-    // main url page ones
-    WebView *v = qobject_cast<WebView *>(view());
-    if( reply->url() != v->url() )
-        return;
+    // NOTE 
+    // These are not all networkreply errors, 
+    // but just that supported directly by KIO
     
-    if( reply->error() == QNetworkReply::ContentNotFoundError )
+    switch( reply->error() )
     {
-        QList<QWebFrame*> frames;
-        frames.append(mainFrame());
-        while (!frames.isEmpty())
-        {
-            QWebFrame *firstFrame = frames.takeFirst();
+        
+    case QNetworkReply::NoError:                            // no error. Simple :)
+        break;
+
+    case QNetworkReply::UnknownNetworkError:                 // unknown network-related error detected
+
+        if( m_protHandler.postHandling(reply->request(), mainFrame()) )
+            break;
+
+    case QNetworkReply::ContentAccessDenied:                 // access to remote content denied (similar to HTTP error 401)
+        kDebug() << "We (hopefully) are managing this through the adblock :)";
+        break;
+        
+    case QNetworkReply::ConnectionRefusedError:              // remote server refused connection
+    case QNetworkReply::HostNotFoundError:                   // invalid hostname
+    case QNetworkReply::TimeoutError:                        // connection time out
+    case QNetworkReply::OperationCanceledError:              // operation canceled via abort() or close() calls
+    case QNetworkReply::ProxyNotFoundError:                  // invalid proxy hostname
+    case QNetworkReply::ContentOperationNotPermittedError:   // operation requested on remote content not permitted
+    case QNetworkReply::ContentNotFoundError:                // remote content not found on server (similar to HTTP error 404)
+    case QNetworkReply::ProtocolUnknownError:                // Unknown protocol
+    case QNetworkReply::ProtocolInvalidOperationError:       // requested operation is invalid for this protocol
+
+        // don't bother on elements loading errors: 
+        // we'll manage just main url page ones
+        v = qobject_cast<WebView *>(view());
+        if( reply->url() != v->url() )
+            break;
+        
+        mainFrame()->setHtml( errorPage(reply), reply->url() );
+        break;
+
+    default:
+        kDebug() << "Nothing to do here..";
+        break;
 
-            if (firstFrame->url() == reply->url())
-            {
-                firstFrame->setHtml(errorPage(reply), reply->url());
-                return;
-            }
-            QList<QWebFrame *> children = firstFrame->childFrames();
-            Q_FOREACH(QWebFrame *frame, children)
-            {
-                frames.append(frame);
-            }
-        }
-    }
-    else
-    {
-        mainFrame()->setHtml(errorPage(reply), reply->url());
     }
 }
 
-- 
cgit v1.2.1


From bdcbe016568d7466551661cdbaecedfb43dcbb59 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 25 Feb 2010 19:23:09 +0100
Subject: to be really sure about.. Q_ASSERT it!

---
 src/webpage.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 9371d7bf..f1591cee 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -69,6 +69,7 @@
 #include <QtGui/QMouseEvent>
 #include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
+#include <QWebFrame>
 
 
 WebPage::WebPage(QWidget *parent)
@@ -208,6 +209,8 @@ void WebPage::loadFinished(bool)
 
 void WebPage::manageNetworkErrors(QNetworkReply *reply)
 {
+    Q_ASSERT(reply);
+
     WebView *v = 0;
     
     // NOTE 
-- 
cgit v1.2.1


From 87c94e7241ad516bde363ace7087ea819608f07a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 26 Feb 2010 00:45:08 +0100
Subject: This simple commit is inspired from mr #97 It actually hides the
 addTab button when moving the bars letting it reappear on the release event..
 :)

---
 src/tabbar.cpp | 16 ++++++++++++++++
 src/tabbar.h   |  1 +
 2 files changed, 17 insertions(+)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 2fa4cf8e..ff996cb5 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -182,6 +182,13 @@ void TabBar::showTabPreview(int tab)
 
 void TabBar::mouseMoveEvent(QMouseEvent *event)
 {
+    if (event->buttons() & Qt::LeftButton)
+    {
+        // hide addNewTabButton when moving tabs
+        MainView *view = qobject_cast<MainView *>(parent());
+        QTimer::singleShot(200, view->addTabButton(), SLOT(hide()));
+    }
+        
     if (ReKonfig::alwaysShowTabPreviews())
     {
         //Find the tab under the mouse
@@ -276,3 +283,12 @@ void TabBar::emptyAreaContextMenu(const QPoint &pos)
 
     menu.exec(pos);
 }
+
+
+void TabBar::mouseReleaseEvent(QMouseEvent *event)
+{
+    MainView *mv = qobject_cast<MainView *>(parent());
+    QTimer::singleShot(200, mv->addTabButton(), SLOT(show()));
+    
+    KTabBar::mouseReleaseEvent(event);
+}
diff --git a/src/tabbar.h b/src/tabbar.h
index 9d1fd7a9..5d297e4c 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -80,6 +80,7 @@ protected:
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual void leaveEvent(QEvent *event);
     virtual void mousePressEvent(QMouseEvent *event);
+    virtual void mouseReleaseEvent(QMouseEvent *event);
     
 private slots:
     void cloneTab();
-- 
cgit v1.2.1


From 33962a25efb91befee681a9762330480f04db383 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 26 Feb 2010 01:15:07 +0100
Subject: Revert "Simpler is better :)" bacause it sometimes works worst :(

This reverts commit 9f29a5eb7223ea2edd7a9f3ee39dd9285820affb.
---
 src/mainview.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 9693bb69..e2f9094f 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -186,12 +186,15 @@ void MainView::updateTabBar()
 {
     if( ReKonfig::alwaysShowTabBar() )
     {
-        if (tabBar()->isHidden())
+        if (!isTabBarHidden())
         {
-            tabBar()->show();
-            m_addTabButton->show();
+            if (tabBar()->isHidden())
+            {
+                tabBar()->show();
+                m_addTabButton->show();
+            }
+            updateTabButtonPosition();
         }
-        updateTabButtonPosition();
         return;
     }
 
@@ -200,7 +203,7 @@ void MainView::updateTabBar()
         tabBar()->hide();
         m_addTabButton->hide();
     }
-    else
+    else if( !isTabBarHidden() )
     {
         if ( tabBar()->isHidden() )
         {
-- 
cgit v1.2.1


From 723a8850299e2732a4ace01f12a50f6b7e78561c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 26 Feb 2010 11:20:16 +0100
Subject: Fixing scripts and tests to start reloading them..

---
 src/tests/CMakeLists.txt  | 16 ++++++++--------
 src/tests/tabbar_test.cpp | 36 ++++++++++++++----------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 5df23e24..18de9299 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -20,13 +20,13 @@ target_link_libraries( tabbar_test
 
 ##### ------------- mainview test
 
-kde4_add_unit_test( mainview_test mainview_test.cpp )
- 
-target_link_libraries( mainview_test
-    kdeinit_rekonq
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${QT_QTTEST_LIBRARY}
-)
+# kde4_add_unit_test( mainview_test mainview_test.cpp )
+#  
+# target_link_libraries( mainview_test
+#     kdeinit_rekonq
+#     ${KDE4_KDECORE_LIBS}
+#     ${KDE4_KDEUI_LIBS}
+#     ${QT_QTTEST_LIBRARY}
+# )
 
 ############################################################
diff --git a/src/tests/tabbar_test.cpp b/src/tests/tabbar_test.cpp
index 08f295d1..7162e6a4 100644
--- a/src/tests/tabbar_test.cpp
+++ b/src/tests/tabbar_test.cpp
@@ -50,32 +50,23 @@ private slots:
 class SubTabBar : public TabBar
 {
 public:
-    void call_cloneTab(int index)
-        { return SubTabBar::cloneTab(index); }
-
-    void call_closeOtherTabs(int index)
-        { return SubTabBar::closeOtherTabs(index); }
-
-    void call_closeTab(int index)
-        { return SubTabBar::closeTab(index); }
+    
+    SubTabBar(QWidget *parent) : TabBar(parent) {};
 
+    QSize call_tabSizeHint(int index) const
+        { return SubTabBar::tabSizeHint(index); }
+        
     void call_mouseMoveEvent(QMouseEvent* event)
         { return SubTabBar::mouseMoveEvent(event); }
-
+        
+    void call_leaveEvent(QEvent* event)
+        { return SubTabBar::leaveEvent(event); }
+        
     void call_mousePressEvent(QMouseEvent* event)
         { return SubTabBar::mousePressEvent(event); }
-
-    void call_reloadAllTabs()
-        { return SubTabBar::reloadAllTabs(); }
-
-    void call_reloadTab(int index)
-        { return SubTabBar::reloadTab(index); }
-
-    QSize call_tabSizeHint(int index) const
-        { return SubTabBar::tabSizeHint(index); }
-
-    void call_showTabPreview(int tab)
-        { return SubTabBar::showTabPreview(tab); }
+        
+    void call_mouseReleaseEvent(QMouseEvent* event)
+        { return SubTabBar::mouseReleaseEvent(event); }        
 };
 
 
@@ -113,7 +104,8 @@ void TabBarTest::tabbar_data()
 
 void TabBarTest::tabbar()
 {
-    SubTabBar widget;
+    QWidget *w = new QWidget;
+    SubTabBar widget(w);
 }
 
 // -------------------------------------------
-- 
cgit v1.2.1


From 8dda858403d283f1850c0298aac0fb5212a27952 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 26 Feb 2010 11:37:11 +0100
Subject: tests support for every Qt derived rekonq class

---
 src/adblock/adblockmanager.h        |  3 ++-
 src/adblock/adblocknetworkreply.h   |  5 ++++-
 src/adblock/adblockrule.h           |  1 +
 src/application.h                   |  4 +++-
 src/bookmarks/bookmarksmanager.h    |  3 ++-
 src/bookmarks/bookmarkspanel.h      |  6 +++++-
 src/bookmarks/bookmarksproxy.h      |  7 ++++++-
 src/bookmarks/bookmarkstreemodel.h  | 11 ++++++++---
 src/clicktoflash.h                  | 11 +++++++++--
 src/filterurljob.h                  |  3 ++-
 src/findbar.h                       |  5 ++++-
 src/history/autosaver.h             |  5 ++++-
 src/history/historymanager.h        |  5 ++++-
 src/history/historymodels.h         |  5 +++--
 src/history/historypanel.h          |  5 ++++-
 src/mainwindow.h                    |  3 ++-
 src/networkaccessmanager.h          |  5 ++++-
 src/protocolhandler.h               |  6 +++++-
 src/rekonqpage/newtabpage.h         |  5 ++++-
 src/rekonqpage/previewselectorbar.h |  3 ++-
 src/sessionmanager.h                |  5 ++++-
 src/settings/settingsdialog.h       |  5 ++++-
 src/urlbar/lineedit.h               |  5 ++++-
 src/urlbar/urlbar.h                 |  3 ++-
 src/walletbar.h                     |  5 ++++-
 src/webinspectorpanel.h             |  5 ++++-
 src/webpage.h                       |  3 ++-
 src/webpluginfactory.h              |  5 ++++-
 src/websnap.h                       |  5 ++++-
 src/webtab.h                        |  5 ++++-
 src/webview.h                       |  5 ++++-
 31 files changed, 118 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 754c81c2..d1bbe7ba 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -105,6 +105,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "adblockrule.h"
 
 // Qt Includes
@@ -120,7 +121,7 @@ class WebPage;
 typedef QList<AdBlockRule> AdBlockRuleList;
 
 
-class AdBlockManager : public QObject
+class REKONQ_TESTS_EXPORT AdBlockManager : public QObject
 {
 Q_OBJECT
     
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h
index 36dd7fdb..bbc3471e 100644
--- a/src/adblock/adblocknetworkreply.h
+++ b/src/adblock/adblocknetworkreply.h
@@ -54,6 +54,9 @@
 #define ADBLOCK_NETWORK_REPLY_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QNetworkReply>
 #include <QString>
@@ -62,7 +65,7 @@
 class AdBlockRule;
 
 
-class AdBlockNetworkReply : public QNetworkReply
+class REKONQ_TESTS_EXPORT AdBlockNetworkReply : public QNetworkReply
 {
     Q_OBJECT
 
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 1cb97dc4..8f79d16e 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -54,6 +54,7 @@
 #ifndef ADBLOCKRULE_H
 #define ADBLOCKRULE_H
 
+
 // Qt Includes
 #include <QRegExp>
 #include <QString>
diff --git a/src/application.h b/src/application.h
index 30ec4839..4340b004 100644
--- a/src/application.h
+++ b/src/application.h
@@ -29,6 +29,8 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
+// Local Includes
+#include "rekonqprivate_export.h"
 
 // KDE Includes
 #include <KUniqueApplication>
@@ -89,7 +91,7 @@ namespace Rekonq
 /**
   *
   */
-class Application : public KUniqueApplication
+class REKONQ_TESTS_EXPORT Application : public KUniqueApplication
 {
     Q_OBJECT
 
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 200bfb4b..d4afb997 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -31,6 +31,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "application.h"
 
 // Qt Includes
@@ -55,7 +56,7 @@ class KBookmarkManager;
  * bookmarks as actions
  *
  */
-class BookmarkOwner : public QObject , public KBookmarkOwner
+class REKONQ_TESTS_EXPORT BookmarkOwner : public QObject , public KBookmarkOwner
 {
     Q_OBJECT
 
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 64d68f70..f5376d98 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -28,6 +28,10 @@
 #ifndef BOOKMARKSPANEL_H
 #define BOOKMARKSPANEL_H
 
+
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QDockWidget>
 
@@ -36,7 +40,7 @@ class KUrl;
 class QModelIndex;
 
 
-class BookmarksPanel : public QDockWidget
+class REKONQ_TESTS_EXPORT BookmarksPanel : public QDockWidget
 {
     Q_OBJECT
 
diff --git a/src/bookmarks/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h
index a1444218..2bf1d63a 100644
--- a/src/bookmarks/bookmarksproxy.h
+++ b/src/bookmarks/bookmarksproxy.h
@@ -28,10 +28,15 @@
 #ifndef BOOKMARKSPROXY_H
 #define BOOKMARKSPROXY_H
 
+
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QSortFilterProxyModel>
 
-class BookmarksProxy : public QSortFilterProxyModel
+
+class REKONQ_TESTS_EXPORT BookmarksProxy : public QSortFilterProxyModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(BookmarksProxy)
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 9b65d923..dfad52ba 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -28,13 +28,18 @@
 #ifndef BOOKMARKSTREEMODEL_H
 #define BOOKMARKSTREEMODEL_H
 
-// Qt Includes
-#include <QAbstractItemModel>
+
+// Local Includes
+#include "rekonqprivate_export.h"
 
 // KDE includes
 #include <KBookmark>
 
-class BookmarksTreeModel : public QAbstractItemModel
+// Qt Includes
+#include <QAbstractItemModel>
+
+
+class REKONQ_TESTS_EXPORT BookmarksTreeModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(BookmarksTreeModel)
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 8565f80f..2284ec7e 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -28,15 +28,22 @@
 #ifndef CLICKTOFLASH_H
 #define CLICKTOFLASH_H
 
+
+// Local Includes
+#include "rekonqprivate_export.h"
+
+// Qt Includes
 #include <QWidget>
 #include <QUrl>
 
-
+// Forward Declarations
 class WebPluginFactory;
 
-class ClickToFlash : public QWidget
+
+class REKONQ_TESTS_EXPORT ClickToFlash : public QWidget
 {
     Q_OBJECT
+    
 public:
     explicit ClickToFlash(QUrl pluginUrl, QWidget *parent = 0);
 
diff --git a/src/filterurljob.h b/src/filterurljob.h
index 3a9511ea..9be058e3 100644
--- a/src/filterurljob.h
+++ b/src/filterurljob.h
@@ -28,6 +28,7 @@
 #define FILTER_URL_JOB_H
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "webview.h"
 
 // KDE Includes
@@ -41,7 +42,7 @@
 using namespace ThreadWeaver;
 
 
-class FilterUrlJob : public Job
+class REKONQ_TESTS_EXPORT FilterUrlJob : public Job
 {
 public:
     FilterUrlJob(WebView *view, const QString &urlString, QObject *parent = 0);
diff --git a/src/findbar.h b/src/findbar.h
index 8f220c92..c192b498 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -29,6 +29,9 @@
 #define FINDBAR_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KLineEdit>
 
@@ -41,7 +44,7 @@ class KMainWindow;
 class QString;
 
 
-class FindBar : public QWidget
+class REKONQ_TESTS_EXPORT FindBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/history/autosaver.h b/src/history/autosaver.h
index 4a307a16..c4c9045b 100644
--- a/src/history/autosaver.h
+++ b/src/history/autosaver.h
@@ -29,6 +29,9 @@
 #define AUTOSAVER_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QtCore/QObject>
 #include <QtCore/QBasicTimer>
@@ -43,7 +46,7 @@
  *
  */
 
-class AutoSaver : public QObject
+class REKONQ_TESTS_EXPORT AutoSaver : public QObject
 {
     Q_OBJECT
 
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index 0df1467f..e744ca4b 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -30,6 +30,9 @@
 #define HISTORY_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KUrl>
 
@@ -92,7 +95,7 @@ class KCompletion;
  * It manages rekonq history
  *
  */
-class HistoryManager : public QWebHistoryInterface
+class REKONQ_TESTS_EXPORT HistoryManager : public QWebHistoryInterface
 {
     Q_OBJECT
     Q_PROPERTY(int historyLimit READ historyLimit WRITE setHistoryLimit)
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index a8cd7a8c..c2b1ede1 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -31,6 +31,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "historymanager.h"
 
 // KDE Includes
@@ -45,7 +46,7 @@
 #include <QWebHistoryInterface>
 
 
-class HistoryModel : public QAbstractTableModel
+class REKONQ_TESTS_EXPORT HistoryModel : public QAbstractTableModel
 {
     Q_OBJECT
 
@@ -85,7 +86,7 @@ private:
  *
  */
 
-class HistoryFilterModel : public QAbstractProxyModel
+class REKONQ_TESTS_EXPORT HistoryFilterModel : public QAbstractProxyModel
 {
     Q_OBJECT
 
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 67284c0e..6e6a9162 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -29,6 +29,9 @@
 #define HISTORYPANEL_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QDockWidget>
 
@@ -38,7 +41,7 @@ class QWidget;
 class QModelIndex;
 
 
-class HistoryPanel : public QDockWidget
+class REKONQ_TESTS_EXPORT HistoryPanel : public QDockWidget
 {
 Q_OBJECT
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index db75b1bd..66c796cc 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -33,6 +33,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "application.h"
 #include "previewselectorbar.h"
 
@@ -62,7 +63,7 @@ class MainView;
  * It handles the menus, toolbars, and status bars.
  *
  */
-class MainWindow : public KMainWindow
+class REKONQ_TESTS_EXPORT MainWindow : public KMainWindow
 {
     Q_OBJECT
 
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 171a5337..5e55c1e6 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -29,6 +29,9 @@
 #define NETWORKACCESSMANAGER_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <kio/accessmanager.h>
 
@@ -36,7 +39,7 @@
 using namespace KIO::Integration;
 
 
-class NetworkAccessManager : public AccessManager
+class REKONQ_TESTS_EXPORT NetworkAccessManager : public AccessManager
 {
     Q_OBJECT
 
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index 140faa7d..2a567015 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -27,6 +27,10 @@
 #ifndef PROTOCOL_HANDLER_H
 #define PROTOCOL_HANDLER_H
 
+
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KDirLister>
 
@@ -41,7 +45,7 @@ class KUrl;
 class KJob;
 
 
-class ProtocolHandler : public QObject
+class REKONQ_TESTS_EXPORT ProtocolHandler : public QObject
 {
 Q_OBJECT
 
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index d659362f..d4c57299 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -29,6 +29,9 @@
 #define REKONQ_NEW_TAB_PAGE
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KUrl>
 
@@ -42,7 +45,7 @@ class KBookmark;
 class WebPage;
 
 
-class NewTabPage : public QObject
+class REKONQ_TESTS_EXPORT NewTabPage : public QObject
 {
 Q_OBJECT
 
diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h
index fa71bdfa..bb9f26c4 100644
--- a/src/rekonqpage/previewselectorbar.h
+++ b/src/rekonqpage/previewselectorbar.h
@@ -29,6 +29,7 @@
 #define PREVIEWSELECTORBAR_H
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "webpage.h"
 
 // Qt Includes
@@ -37,7 +38,7 @@
 #include <QLabel>
 
 
-class PreviewSelectorBar : public QWidget
+class REKONQ_TESTS_EXPORT PreviewSelectorBar : public QWidget
 {
 Q_OBJECT
 
diff --git a/src/sessionmanager.h b/src/sessionmanager.h
index baa6ac22..613b050f 100644
--- a/src/sessionmanager.h
+++ b/src/sessionmanager.h
@@ -30,6 +30,9 @@
 #define SESSION_MANAGER_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -38,7 +41,7 @@
 /**
   * Session Management
   */
-class SessionManager : public QObject
+class REKONQ_TESTS_EXPORT SessionManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h
index da1415c4..54494a00 100644
--- a/src/settings/settingsdialog.h
+++ b/src/settings/settingsdialog.h
@@ -29,6 +29,9 @@
 #define SETTINGS_DIALOG_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KConfigDialog>
 
@@ -37,7 +40,7 @@ class QWidget;
 class Private;
 
 
-class SettingsDialog : public KConfigDialog
+class REKONQ_TESTS_EXPORT SettingsDialog : public KConfigDialog
 {
     Q_OBJECT
 
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 0fca21d4..1ac3af2e 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -30,6 +30,9 @@
 #define LINEEDIT_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KLineEdit>
 
@@ -39,7 +42,7 @@ class QFocusEvent;
 class QKeyEvent;
 
 
-class LineEdit : public KLineEdit
+class REKONQ_TESTS_EXPORT LineEdit : public KLineEdit
 {
     Q_OBJECT
 
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 6d24e599..39911bb2 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -32,6 +32,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "lineedit.h"
 
 // KDE Includes
@@ -47,7 +48,7 @@ class QWidget;
 class KCompletion;
 
 
-class UrlBar : public KHistoryComboBox
+class REKONQ_TESTS_EXPORT UrlBar : public KHistoryComboBox
 {
     Q_OBJECT
 
diff --git a/src/walletbar.h b/src/walletbar.h
index 77257f69..efb28a8f 100644
--- a/src/walletbar.h
+++ b/src/walletbar.h
@@ -28,6 +28,9 @@
 #define WALLET_BAR_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Qt Includes
 #include <QWidget>
 #include <QString>
@@ -35,7 +38,7 @@
 #include <QLabel>
 
 
-class WalletBar : public QWidget
+class REKONQ_TESTS_EXPORT WalletBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/webinspectorpanel.h b/src/webinspectorpanel.h
index dac54648..bb196b5c 100644
--- a/src/webinspectorpanel.h
+++ b/src/webinspectorpanel.h
@@ -28,6 +28,9 @@
 #define WEBINSPECTOR_PANEL_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Local Includes
 #include "mainwindow.h"
 
@@ -38,7 +41,7 @@
     Docked web inspector
     behaviour : hide/show by tab, not globally
 */
-class WebInspectorPanel : public QDockWidget
+class REKONQ_TESTS_EXPORT WebInspectorPanel : public QDockWidget
 {
     Q_OBJECT
 public:
diff --git a/src/webpage.h b/src/webpage.h
index c9b78927..76927725 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -34,6 +34,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "protocolhandler.h"
 #include "newtabpage.h"
 
@@ -48,7 +49,7 @@ class QWebFrame;
 class QNetworkReply;
 
 
-class WebPage : public KWebPage
+class REKONQ_TESTS_EXPORT WebPage : public KWebPage
 {
     Q_OBJECT
 
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 384f0653..74bca043 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -29,6 +29,9 @@
 #define WEB_PLUGIN_FACTORY_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KWebPluginFactory>
 
@@ -37,7 +40,7 @@
 #include <QtGui/QWidget>
 
 
-class WebPluginFactory : public KWebPluginFactory
+class REKONQ_TESTS_EXPORT WebPluginFactory : public KWebPluginFactory
 {
 Q_OBJECT
 
diff --git a/src/websnap.h b/src/websnap.h
index 30441e02..54f63503 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -29,6 +29,9 @@
 #ifndef WEB_SNAP_H
 #define WEB_SNAP_H
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KUrl>
 
@@ -47,7 +50,7 @@
  * on that.
  * Heavily based on Graphics-Dojo WebSnap example (thanks!)
  */
-class WebSnap : public QObject
+class REKONQ_TESTS_EXPORT WebSnap : public QObject
 {
     Q_OBJECT
 
diff --git a/src/webtab.h b/src/webtab.h
index 7fd63b18..9837cd63 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -29,6 +29,9 @@
 #define WEBTAB_H
 
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // KDE Includes
 #include <KUrl>
 
@@ -40,7 +43,7 @@ class WebPage;
 class WebView;
 
 
-class WebTab : public QWidget
+class REKONQ_TESTS_EXPORT WebTab : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/webview.h b/src/webview.h
index 6d75c549..b0700e8f 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -28,6 +28,9 @@
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
+// Local Includes
+#include "rekonqprivate_export.h"
+
 // Local Includes
 #include "application.h"
 
@@ -38,7 +41,7 @@
 class WebPage;
 
 
-class WebView : public KWebView
+class REKONQ_TESTS_EXPORT WebView : public KWebView
 {
     Q_OBJECT
 
-- 
cgit v1.2.1


From 0f1dfeac60cdf35e44838b1323d98db8383738c7 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 27 Feb 2010 15:29:58 +0100
Subject: New (embrional) unit tests: mainview, tabbar, webtab, webpage

---
 src/tabbar.cpp              |   4 +-
 src/tests/CMakeLists.txt    |  49 ++++++++++++++----
 src/tests/mainview_test.cpp |  47 ++++++++---------
 src/tests/tabbar_test.cpp   | 107 ++++++++++++++++++++------------------
 src/tests/webpage_test.cpp  | 123 ++++++++++++++++++++++++++++++++++++++++++++
 src/tests/webtab_test.cpp   |  67 ++++++++++++++++++++++++
 6 files changed, 313 insertions(+), 84 deletions(-)
 create mode 100644 src/tests/webpage_test.cpp
 create mode 100644 src/tests/webtab_test.cpp

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index ff996cb5..49ed230b 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -93,13 +93,13 @@ QSize TabBar::tabSizeHint(int index) const
     int minWidth =  view->sizeHint().width()/MIN_WIDTH_DIVISOR;
 
     int w;
-    if (baseWidth*count()<tabBarWidth)
+    if (baseWidth*count() < tabBarWidth)
     {
         w = baseWidth;
     }
     else 
     {
-        if (count() > 0 && tabBarWidth/count()>minWidth)
+        if (count() > 0 && tabBarWidth/count() > minWidth)
         {
             w = tabBarWidth/count();
         }
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 18de9299..ccb25551 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -2,7 +2,14 @@
 
 SET( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
-INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_BINARY_DIR}/..
+INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_BINARY_DIR}
+                        ${CMAKE_CURRENT_SOURCE_DIR}/..
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../adblock
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../bookmarks
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../history
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../rekonqpage
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../settings
+                        ${CMAKE_CURRENT_SOURCE_DIR}/../urlbar
                         ${KDE4_INCLUDES}
                         ${QT4_INCLUDES}
 )
@@ -20,13 +27,37 @@ target_link_libraries( tabbar_test
 
 ##### ------------- mainview test
 
-# kde4_add_unit_test( mainview_test mainview_test.cpp )
-#  
-# target_link_libraries( mainview_test
-#     kdeinit_rekonq
-#     ${KDE4_KDECORE_LIBS}
-#     ${KDE4_KDEUI_LIBS}
-#     ${QT_QTTEST_LIBRARY}
-# )
+kde4_add_unit_test( mainview_test mainview_test.cpp )
+ 
+target_link_libraries( mainview_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- webpage test
+
+kde4_add_unit_test( webpage_test webpage_test.cpp )
+
+target_link_libraries( webpage_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- webtab test
+
+kde4_add_unit_test( webtab_test webtab_test.cpp )
+
+target_link_libraries( webtab_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
 
 ############################################################
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index f56d73ab..1dfffcbe 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -31,8 +31,21 @@
 #include <QtCore>
 #include <QtGui>
 
-#include "../mainview.h"
-#include "../webview.h"
+#include "mainview.h"
+#include "webview.h"
+
+
+// Subclass that exposes the protected functions.
+class SubMainView : public MainView
+{
+public:
+    SubMainView(MainWindow *parent) : MainView(parent) {};
+    
+    void call_resizeEvent(QResizeEvent *event)
+        { return SubMainView::resizeEvent(event); }
+};
+
+// -----------------------------------------------------------
 
 
 class MainViewTest : public QObject
@@ -42,8 +55,6 @@ class MainViewTest : public QObject
 public slots:
     void initTestCase();
     void cleanupTestCase();
-    void init();
-    void cleanup();
 
 private slots:
     void tabwidget_data();
@@ -75,38 +86,30 @@ private slots:
     
     void currentChanged_data();
     void currentChanged();
+
+private:
+    MainWindow *mainWindow;
+    SubMainView *mainView;
 };
 
 
-// Subclass that exposes the protected functions.
-class SubMainView : public MainView
-{
-public:
-    void call_resizeEvent(QResizeEvent *event)
-        { return SubMainView::resizeEvent(event); }
-};
+// -------------------------------------------------------------------------------
 
 
 // This will be called before the first test function is executed.
 // It is only called once.
 void MainViewTest::initTestCase()
 {
+    mainWindow = new MainWindow;
+    mainView = new SubMainView(mainWindow);
 }
 
 // This will be called after the last test function is executed.
 // It is only called once.
 void MainViewTest::cleanupTestCase()
 {
-}
-
-// This will be called before each test function is executed.
-void MainViewTest::init()
-{
-}
-
-// This will be called after every test function.
-void MainViewTest::cleanup()
-{
+    delete mainView;
+    delete mainWindow;
 }
 
 // -------------------------------------------
@@ -117,7 +120,6 @@ void MainViewTest::tabwidget_data()
 
 void MainViewTest::tabwidget()
 {
-    SubMainView widget;
 //     widget.currentWebView();
 //     QCOMPARE(widget.currentIndex(), 0);
 //     widget.newTab();
@@ -140,7 +142,6 @@ void MainViewTest::closeTab()
 {
     QFETCH(int, index);
 
-    SubMainView widget;
 /*
     QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
     QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
diff --git a/src/tests/tabbar_test.cpp b/src/tests/tabbar_test.cpp
index 7162e6a4..560f2c9b 100644
--- a/src/tests/tabbar_test.cpp
+++ b/src/tests/tabbar_test.cpp
@@ -24,29 +24,14 @@
 #include <QtCore>
 #include <QtGui>
 
-#include "../tabbar.h"
+#include "mainwindow.h"
+#include "mainview.h"
+#include "tabbar.h"
 
 
-class TabBarTest : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void tabbar_data();
-    void tabbar();
-
-    void tabSizeHint_data();
-    void tabSizeHint();
-};
-
-
-// Subclass that exposes the protected functions.
+/**
+ * Subclass that exposes the protected functions.
+ */
 class SubTabBar : public TabBar
 {
 public:
@@ -70,62 +55,84 @@ public:
 };
 
 
-// This will be called before the first test function is executed.
-// It is only called once.
-void TabBarTest::initTestCase()
-{
-}
+// ------------------------------------------------------------------
 
 
-// This will be called after the last test function is executed.
-// It is only called once.
-void TabBarTest::cleanupTestCase()
+class TabBarTest : public QObject
 {
-}
+    Q_OBJECT
 
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+    void tabSizeHint_data();
+    void tabSizeHint();
+    
+    void mousePress_data();
+    void mousePress();
+    
+private:
+    SubTabBar *_bar;
+};
+
+
+// -------------------------------------------
 
-// This will be called before each test function is executed.
-void TabBarTest::init()
+void TabBarTest::initTestCase()
 {
+    MainWindow *w = new MainWindow;
+    MainView *mv = new MainView(w);
+    _bar = new SubTabBar(mv);
 }
 
-
-// This will be called after every test function.
-void TabBarTest::cleanup()
+void TabBarTest::cleanupTestCase()
 {
+    delete _bar;
 }
 
 // -------------------------------------------
 
-void TabBarTest::tabbar_data()
+void TabBarTest::tabSizeHint_data()
 {
+    QTest::addColumn<int>("index");
+
+    QTest::newRow("1th") << 0;
+    QTest::newRow("2nd") << 1;
+    QTest::newRow("3rd") << 2;
+    QTest::newRow("4th") << 3;
+    QTest::newRow("5th") << 4;
+    QTest::newRow("6th") << 5;
+    QTest::newRow("7th") << 6;
+    QTest::newRow("8th") << 7;
+    QTest::newRow("9th") << 8;
+    QTest::newRow("10th") << 9;
 }
 
 
-void TabBarTest::tabbar()
+void TabBarTest::tabSizeHint()
 {
-    QWidget *w = new QWidget;
-    SubTabBar widget(w);
+    QFETCH(int, index);
+
+    QVERIFY(_bar->call_tabSizeHint(index).width() > 0);
 }
 
-// -------------------------------------------
 
-void TabBarTest::tabSizeHint_data()
+void TabBarTest::mousePress_data()
 {
-//     QTest::addColumn<int>("index");
-//     QTest::newRow("0") << 0;
 }
 
 
-// protected QSize tabSizeHint(int index) const
-void TabBarTest::tabSizeHint()
+void TabBarTest::mousePress()
 {
-    // Need fixes as our function uses MainView methods to determine size
-//     QFETCH(int, index);
-//     SubTabBar bar;
-//     QVERIFY(bar.call_tabSizeHint(index).width() <= 250);
+//     QTest::mousePress(_bar, Qt::MidButton);
+// //     QCOMPARE();  ?
+// 
+//     QTest::mousePress(_bar, Qt::LeftButton);
+// //     QCOMPARE();  ?
 }
-    
+
 // -------------------------------------------
 
 QTEST_KDEMAIN(TabBarTest, GUI)
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
new file mode 100644
index 00000000..7afb5502
--- /dev/null
+++ b/src/tests/webpage_test.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "webpage.h"
+#include "webview.h"
+#include "webtab.h"
+
+
+class WebPageTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebPageTest();
+    virtual ~WebPageTest();
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+    void manageNetworkErrors();
+    void downloadRequest();
+    void downloadAllContentsWithKGet();
+
+    void createWindow();
+    void acceptNavigationRequest();
+    
+    void handleUnsupportedContent();
+    
+    void loadFinished();
+
+private:
+    WebTab *tab;
+    WebPage *page;
+    WebView *view;
+};
+
+
+// -------------------------------------------
+
+
+WebPageTest::WebPageTest()
+{}
+
+
+WebPageTest::~WebPageTest()
+{}
+
+
+void WebPageTest::initTestCase()
+{
+    tab = new WebTab;
+    view = new WebView(tab);
+    page = view->page();
+}
+
+
+void WebPageTest::cleanupTestCase()
+{
+    delete tab;
+}
+    
+    
+// -------------------------------------------
+
+
+void WebPageTest::manageNetworkErrors()
+{
+}
+
+void WebPageTest::downloadRequest()
+{
+}
+
+void WebPageTest::downloadAllContentsWithKGet()
+{
+}
+
+void WebPageTest::createWindow()
+{
+}
+
+void WebPageTest::acceptNavigationRequest()
+{
+}
+
+void WebPageTest::handleUnsupportedContent()
+{
+}
+
+void WebPageTest::loadFinished()
+{
+}
+
+// -------------------------------------------
+
+QTEST_MAIN(WebPageTest)
+#include "webpage_test.moc"
diff --git a/src/tests/webtab_test.cpp b/src/tests/webtab_test.cpp
new file mode 100644
index 00000000..ae5647f3
--- /dev/null
+++ b/src/tests/webtab_test.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "webpage.h"
+#include "webview.h"
+#include "webtab.h"
+
+
+class WebTabTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+private:
+    WebTab *tab;
+};
+
+
+// -------------------------------------------
+
+
+void WebTabTest::initTestCase()
+{
+    tab = new WebTab;
+}
+
+
+void WebTabTest::cleanupTestCase()
+{
+    delete tab;
+}
+    
+    
+// -------------------------------------------
+
+
+// -------------------------------------------
+
+QTEST_MAIN(WebTabTest)
+#include "webtab_test.moc"
-- 
cgit v1.2.1


From d897ce42be8375ffab89615ab3953b8bd3ab3bbc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 12:22:25 +0100
Subject: All the other (blank) tests..

---
 src/tests/CMakeLists.txt                | 97 ++++++++++++++++++++++++++++++++-
 src/tests/findbar_test.cpp              | 64 ++++++++++++++++++++++
 src/tests/mainview_test.cpp             |  8 +--
 src/tests/mainwindow_test.cpp           | 62 +++++++++++++++++++++
 src/tests/networkaccessmanager_test.cpp | 65 ++++++++++++++++++++++
 src/tests/protocolhandler_test.cpp      | 65 ++++++++++++++++++++++
 src/tests/sessionmanager_test.cpp       | 66 ++++++++++++++++++++++
 src/tests/walletbar_test.cpp            | 66 ++++++++++++++++++++++
 src/tests/webpage_test.cpp              |  8 +--
 src/tests/websnap_test.cpp              | 67 +++++++++++++++++++++++
 src/tests/webtab_test.cpp               |  4 +-
 src/tests/webview_test.cpp              | 65 ++++++++++++++++++++++
 12 files changed, 624 insertions(+), 13 deletions(-)
 create mode 100644 src/tests/findbar_test.cpp
 create mode 100644 src/tests/mainwindow_test.cpp
 create mode 100644 src/tests/networkaccessmanager_test.cpp
 create mode 100644 src/tests/protocolhandler_test.cpp
 create mode 100644 src/tests/sessionmanager_test.cpp
 create mode 100644 src/tests/walletbar_test.cpp
 create mode 100644 src/tests/websnap_test.cpp
 create mode 100644 src/tests/webview_test.cpp

(limited to 'src')

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index ccb25551..cdeea5ee 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -14,11 +14,22 @@ INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_BINARY_DIR}
                         ${QT4_INCLUDES}
 )
 
-##### ------------- tabbar test
+##### ------------- findbar test
 
-kde4_add_unit_test( tabbar_test tabbar_test.cpp )
+kde4_add_unit_test( findbar_test findbar_test.cpp )
 
-target_link_libraries( tabbar_test
+target_link_libraries( findbar_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- mainwindow test
+
+kde4_add_unit_test( mainwindow_test mainwindow_test.cpp )
+ 
+target_link_libraries( mainwindow_test
     kdeinit_rekonq
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
@@ -36,6 +47,62 @@ target_link_libraries( mainview_test
     ${QT_QTTEST_LIBRARY}
 )
 
+##### ------------- networkaccessmanager test
+
+kde4_add_unit_test( networkaccessmanager_test networkaccessmanager_test.cpp )
+ 
+target_link_libraries( networkaccessmanager_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- protocolhandler test
+
+kde4_add_unit_test( protocolhandler_test protocolhandler_test.cpp )
+ 
+target_link_libraries( protocolhandler_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- sessionmanager test
+
+kde4_add_unit_test( sessionmanager_test sessionmanager_test.cpp )
+ 
+target_link_libraries( sessionmanager_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- tabbar test
+
+kde4_add_unit_test( tabbar_test tabbar_test.cpp )
+
+target_link_libraries( tabbar_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
+##### ------------- walletbar test
+
+kde4_add_unit_test( walletbar_test walletbar_test.cpp )
+
+target_link_libraries( walletbar_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
 ##### ------------- webpage test
 
 kde4_add_unit_test( webpage_test webpage_test.cpp )
@@ -48,6 +115,18 @@ target_link_libraries( webpage_test
     ${QT_QTTEST_LIBRARY}
 )
 
+##### ------------- websnap test
+
+kde4_add_unit_test( websnap_test websnap_test.cpp )
+
+target_link_libraries( websnap_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
 ##### ------------- webtab test
 
 kde4_add_unit_test( webtab_test webtab_test.cpp )
@@ -60,4 +139,16 @@ target_link_libraries( webtab_test
     ${QT_QTTEST_LIBRARY}
 )
 
+##### ------------- webview test
+
+kde4_add_unit_test( webview_test webview_test.cpp )
+
+target_link_libraries( webview_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
 ############################################################
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
new file mode 100644
index 00000000..0e332b6a
--- /dev/null
+++ b/src/tests/findbar_test.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "findbar.h"
+
+
+
+class FindBarTest : public QObject
+{
+    Q_OBJECT
+   
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+
+private:
+    FindBar *bar;
+};
+
+
+// -------------------------------------------
+
+
+void FindBarTest::initTestCase()
+{
+}
+
+
+void FindBarTest::cleanupTestCase()
+{
+}
+    
+
+// -------------------------------------------
+
+QTEST_MAIN(FindBarTest)
+#include "findbar_test.moc"
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 1dfffcbe..41ded862 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -100,16 +100,16 @@ private:
 // It is only called once.
 void MainViewTest::initTestCase()
 {
-    mainWindow = new MainWindow;
-    mainView = new SubMainView(mainWindow);
+//     mainWindow = new MainWindow;
+//     mainView = new SubMainView(mainWindow);
 }
 
 // This will be called after the last test function is executed.
 // It is only called once.
 void MainViewTest::cleanupTestCase()
 {
-    delete mainView;
-    delete mainWindow;
+//     delete mainView;
+//     delete mainWindow;
 }
 
 // -------------------------------------------
diff --git a/src/tests/mainwindow_test.cpp b/src/tests/mainwindow_test.cpp
new file mode 100644
index 00000000..f5342dfa
--- /dev/null
+++ b/src/tests/mainwindow_test.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "mainwindow.h"
+
+
+class MainWindowTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+
+private:
+    MainWindow *window;
+};
+
+
+// -------------------------------------------
+
+
+void MainWindowTest::initTestCase()
+{
+}
+
+
+void MainWindowTest::cleanupTestCase()
+{
+}
+
+// -------------------------------------------
+
+QTEST_MAIN(MainWindowTest)
+#include "mainwindow_test.moc"
diff --git a/src/tests/networkaccessmanager_test.cpp b/src/tests/networkaccessmanager_test.cpp
new file mode 100644
index 00000000..41c9fb56
--- /dev/null
+++ b/src/tests/networkaccessmanager_test.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "networkaccessmanager.h"
+
+
+class NetworkAccessManagerTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    NetworkAccessManager *manager;
+};
+
+
+// -------------------------------------------
+
+void NetworkAccessManagerTest::initTestCase()
+{
+}
+
+
+void NetworkAccessManagerTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+
+// -------------------------------------------
+
+QTEST_MAIN(NetworkAccessManagerTest)
+#include "networkaccessmanager_test.moc"
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
new file mode 100644
index 00000000..13e4212c
--- /dev/null
+++ b/src/tests/protocolhandler_test.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "protocolhandler.h"
+
+
+class ProtocolhandlerTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+
+private:
+    ProtocolHandler *handler;
+};
+
+
+// -------------------------------------------
+
+void ProtocolhandlerTest::initTestCase()
+{
+}
+
+
+void ProtocolhandlerTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+// -------------------------------------------
+
+QTEST_MAIN(ProtocolhandlerTest)
+#include "protocolhandler_test.moc"
diff --git a/src/tests/sessionmanager_test.cpp b/src/tests/sessionmanager_test.cpp
new file mode 100644
index 00000000..6cbd1bef
--- /dev/null
+++ b/src/tests/sessionmanager_test.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "sessionmanager.h"
+
+
+class SessionManagerTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    SessionManager *sessman;
+};
+
+
+// -------------------------------------------
+
+
+void SessionManagerTest::initTestCase()
+{
+}
+
+
+void SessionManagerTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+
+// -------------------------------------------
+
+QTEST_MAIN(SessionManagerTest)
+#include "sessionmanager_test.moc"
diff --git a/src/tests/walletbar_test.cpp b/src/tests/walletbar_test.cpp
new file mode 100644
index 00000000..a3b87710
--- /dev/null
+++ b/src/tests/walletbar_test.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "walletbar.h"
+
+
+class WalletBarTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    WalletBar *bar;
+};
+
+
+// -------------------------------------------
+
+
+void WalletBarTest::initTestCase()
+{
+}
+
+
+void WalletBarTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+
+// -------------------------------------------
+
+QTEST_MAIN(WalletBarTest)
+#include "walletbar_test.moc"
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
index 7afb5502..5d563160 100644
--- a/src/tests/webpage_test.cpp
+++ b/src/tests/webpage_test.cpp
@@ -74,15 +74,15 @@ WebPageTest::~WebPageTest()
 
 void WebPageTest::initTestCase()
 {
-    tab = new WebTab;
-    view = new WebView(tab);
-    page = view->page();
+//     tab = new WebTab;
+//     view = new WebView(tab);
+//     page = view->page();
 }
 
 
 void WebPageTest::cleanupTestCase()
 {
-    delete tab;
+//     delete tab;
 }
     
     
diff --git a/src/tests/websnap_test.cpp b/src/tests/websnap_test.cpp
new file mode 100644
index 00000000..9c648370
--- /dev/null
+++ b/src/tests/websnap_test.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "websnap.h"
+
+
+class WebSnapTest : public QObject
+{
+    Q_OBJECT
+
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    WebSnap *snap;
+};
+
+
+// -------------------------------------------
+
+
+void WebSnapTest::initTestCase()
+{
+}
+
+
+void WebSnapTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+
+// -------------------------------------------
+
+QTEST_MAIN(WebSnapTest)
+#include "websnap_test.moc"
diff --git a/src/tests/webtab_test.cpp b/src/tests/webtab_test.cpp
index ae5647f3..42d5388b 100644
--- a/src/tests/webtab_test.cpp
+++ b/src/tests/webtab_test.cpp
@@ -48,13 +48,13 @@ private:
 
 void WebTabTest::initTestCase()
 {
-    tab = new WebTab;
+//     tab = new WebTab;
 }
 
 
 void WebTabTest::cleanupTestCase()
 {
-    delete tab;
+//     delete tab;
 }
     
     
diff --git a/src/tests/webview_test.cpp b/src/tests/webview_test.cpp
new file mode 100644
index 00000000..82334a30
--- /dev/null
+++ b/src/tests/webview_test.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtTest>
+#include <QtCore>
+#include <QtWebKit>
+
+#include "webview.h"
+
+
+class WebViewTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    WebView *view;
+};
+
+
+// -------------------------------------------
+
+
+void WebViewTest::initTestCase()
+{
+}
+
+
+void WebViewTest::cleanupTestCase()
+{
+}
+    
+    
+// -------------------------------------------
+
+
+// -------------------------------------------
+
+QTEST_MAIN(WebViewTest)
+#include "webview_test.moc"
-- 
cgit v1.2.1


From 24a64d92d7444829edb77ba50ac618b6b0067b9d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 12:36:32 +0100
Subject: Changing Findbar parent

---
 src/findbar.cpp            | 19 ++++++++++++-------
 src/findbar.h              |  3 +--
 src/tests/findbar_test.cpp | 15 +++++++++++++--
 3 files changed, 26 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 43b23035..bb693ab0 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -29,12 +29,14 @@
 #include "findbar.h"
 #include "findbar.moc"
 
+// Local Includes
+#include "mainwindow.h"
+
 // KDE Includes
 #include <KLineEdit>
 #include <KIcon>
 #include <KPushButton>
 #include <klocalizedstring.h>
-#include <KMainWindow>
 #include <KApplication>
 
 // Qt Includes
@@ -47,8 +49,8 @@
 #include <QtCore/QTimer>
 
 
-FindBar::FindBar(KMainWindow *mainwindow)
-        : QWidget(mainwindow)
+FindBar::FindBar(QWidget *parent)
+        : QWidget(parent)
         , m_lineEdit(new KLineEdit(this))
         , m_matchCase(new QCheckBox(i18n("&Match case"), this))
         , m_hideTimer(new QTimer(this))
@@ -73,24 +75,27 @@ FindBar::FindBar(KMainWindow *mainwindow)
     QLabel *label = new QLabel(i18n("Find:"));
     layout->addWidget(label);
 
+    // mainwindow pointer
+    MainWindow *window = qobject_cast<MainWindow *>(parent);
+    
     // lineEdit, focusProxy
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
-    connect(m_lineEdit, SIGNAL(textChanged(const QString &)), mainwindow, SLOT(find(const QString &)));
+    connect(m_lineEdit, SIGNAL(textChanged(const QString &)), window, SLOT(find(const QString &)));
     layout->addWidget(m_lineEdit);
 
     // buttons
     KPushButton *findNext = new KPushButton(KIcon("go-down"), i18n("&Next"), this);
     KPushButton *findPrev = new KPushButton(KIcon("go-up"), i18n("&Previous"), this);
-    connect(findNext, SIGNAL(clicked()), mainwindow, SLOT(findNext()));
-    connect(findPrev, SIGNAL(clicked()), mainwindow, SLOT(findPrevious()));
+    connect(findNext, SIGNAL(clicked()), window, SLOT(findNext()));
+    connect(findPrev, SIGNAL(clicked()), window, SLOT(findPrevious()));
     layout->addWidget(findNext);
     layout->addWidget(findPrev);
 
     // Case sensitivity. Deliberately set so this is off by default.
     m_matchCase->setCheckState(Qt::Unchecked);
     m_matchCase->setTristate(false);
-    connect(m_matchCase, SIGNAL(toggled(bool)), mainwindow, SLOT(matchCaseUpdate()));
+    connect(m_matchCase, SIGNAL(toggled(bool)), window, SLOT(matchCaseUpdate()));
     layout->addWidget(m_matchCase);
 
     // stretching widget on the left
diff --git a/src/findbar.h b/src/findbar.h
index c192b498..7a4efc59 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -40,7 +40,6 @@
 #include <QtGui/QCheckBox>
 
 // Forward Declarations
-class KMainWindow;
 class QString;
 
 
@@ -49,7 +48,7 @@ class REKONQ_TESTS_EXPORT FindBar : public QWidget
     Q_OBJECT
 
 public:
-    FindBar(KMainWindow *mainwindow);
+    FindBar(QWidget *parent);
     ~FindBar();
     KLineEdit *lineEdit() const;
     bool matchCase() const;
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
index 0e332b6a..3fb0e244 100644
--- a/src/tests/findbar_test.cpp
+++ b/src/tests/findbar_test.cpp
@@ -26,7 +26,7 @@
 #include <QtWebKit>
 
 #include "findbar.h"
-
+#include "mainwindow.h"
 
 
 class FindBarTest : public QObject
@@ -38,7 +38,8 @@ public slots:
     void cleanupTestCase();
     
 private slots:
-
+    void matchCase();
+    void notifyMatch();
 
 private:
     FindBar *bar;
@@ -50,13 +51,23 @@ private:
 
 void FindBarTest::initTestCase()
 {
+    MainWindow *w = new MainWindow;
+    bar = new FindBar(w);
 }
 
 
 void FindBarTest::cleanupTestCase()
 {
+    delete bar;
 }
     
+void FindBarTest::matchCase()
+{
+}
+
+void FindBarTest::notifyMatch()
+{
+}
 
 // -------------------------------------------
 
-- 
cgit v1.2.1


From e5e4ffa0e844c4f1cbe40eeaa309c4711c1073e6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 17:05:37 +0100
Subject: 10 (of 12) tests working and ready to be "expanded"..

---
 src/tests/CMakeLists.txt                |  1 +
 src/tests/findbar_test.cpp              | 10 +++++-----
 src/tests/mainview_test.cpp             | 26 ++++++--------------------
 src/tests/mainwindow_test.cpp           |  9 ++++++---
 src/tests/networkaccessmanager_test.cpp |  8 +++++---
 src/tests/protocolhandler_test.cpp      |  9 ++++++---
 src/tests/sessionmanager_test.cpp       |  9 ++++++---
 src/tests/walletbar_test.cpp            |  9 ++++++---
 src/tests/webpage_test.cpp              | 13 +++++++------
 src/tests/websnap_test.cpp              |  7 +++++--
 src/tests/webtab_test.cpp               |  9 +++++----
 src/tests/webview_test.cpp              | 10 +++++++---
 12 files changed, 65 insertions(+), 55 deletions(-)

(limited to 'src')

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index cdeea5ee..0230a5ce 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries( findbar_test
     kdeinit_rekonq
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
+    ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
 )
 
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
index 3fb0e244..6b81255f 100644
--- a/src/tests/findbar_test.cpp
+++ b/src/tests/findbar_test.cpp
@@ -21,9 +21,8 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
-#include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest/QtTest>
 
 #include "findbar.h"
 #include "mainwindow.h"
@@ -43,6 +42,7 @@ private slots:
 
 private:
     FindBar *bar;
+    MainWindow *w;
 };
 
 
@@ -51,7 +51,7 @@ private:
 
 void FindBarTest::initTestCase()
 {
-    MainWindow *w = new MainWindow;
+    w = new MainWindow;
     bar = new FindBar(w);
 }
 
@@ -71,5 +71,5 @@ void FindBarTest::notifyMatch()
 
 // -------------------------------------------
 
-QTEST_MAIN(FindBarTest)
+QTEST_KDEMAIN(FindBarTest, GUI)
 #include "findbar_test.moc"
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 41ded862..30d4e7dd 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -27,27 +27,14 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
 #include <QtGui>
+#include <QtTest>
 
 #include "mainview.h"
 #include "webview.h"
 
 
-// Subclass that exposes the protected functions.
-class SubMainView : public MainView
-{
-public:
-    SubMainView(MainWindow *parent) : MainView(parent) {};
-    
-    void call_resizeEvent(QResizeEvent *event)
-        { return SubMainView::resizeEvent(event); }
-};
-
-// -----------------------------------------------------------
-
-
 class MainViewTest : public QObject
 {
     Q_OBJECT
@@ -88,8 +75,8 @@ private slots:
     void currentChanged();
 
 private:
-    MainWindow *mainWindow;
-    SubMainView *mainView;
+    MainWindow *window;
+    MainView *view;
 };
 
 
@@ -100,16 +87,15 @@ private:
 // It is only called once.
 void MainViewTest::initTestCase()
 {
-//     mainWindow = new MainWindow;
-//     mainView = new SubMainView(mainWindow);
+    window = new MainWindow;
+    view = window->mainView();
 }
 
 // This will be called after the last test function is executed.
 // It is only called once.
 void MainViewTest::cleanupTestCase()
 {
-//     delete mainView;
-//     delete mainWindow;
+    delete window;
 }
 
 // -------------------------------------------
diff --git a/src/tests/mainwindow_test.cpp b/src/tests/mainwindow_test.cpp
index f5342dfa..90ae26bd 100644
--- a/src/tests/mainwindow_test.cpp
+++ b/src/tests/mainwindow_test.cpp
@@ -21,11 +21,12 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest>
 
 #include "mainwindow.h"
+#include "application.h"
 
 
 class MainWindowTest : public QObject
@@ -49,14 +50,16 @@ private:
 
 void MainWindowTest::initTestCase()
 {
+    window = new MainWindow;
 }
 
 
 void MainWindowTest::cleanupTestCase()
 {
+    delete window;
 }
 
 // -------------------------------------------
 
-QTEST_MAIN(MainWindowTest)
+QTEST_KDEMAIN(MainWindowTest,GUI)
 #include "mainwindow_test.moc"
diff --git a/src/tests/networkaccessmanager_test.cpp b/src/tests/networkaccessmanager_test.cpp
index 41c9fb56..68ffc108 100644
--- a/src/tests/networkaccessmanager_test.cpp
+++ b/src/tests/networkaccessmanager_test.cpp
@@ -21,9 +21,9 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest>
 
 #include "networkaccessmanager.h"
 
@@ -47,11 +47,13 @@ private:
 
 void NetworkAccessManagerTest::initTestCase()
 {
+    manager = new NetworkAccessManager;
 }
 
 
 void NetworkAccessManagerTest::cleanupTestCase()
 {
+    delete manager;
 }
     
     
@@ -61,5 +63,5 @@ void NetworkAccessManagerTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(NetworkAccessManagerTest)
+QTEST_KDEMAIN(NetworkAccessManagerTest,GUI)
 #include "networkaccessmanager_test.moc"
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
index 13e4212c..d738baea 100644
--- a/src/tests/protocolhandler_test.cpp
+++ b/src/tests/protocolhandler_test.cpp
@@ -21,9 +21,10 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest>
+
 
 #include "protocolhandler.h"
 
@@ -48,11 +49,13 @@ private:
 
 void ProtocolhandlerTest::initTestCase()
 {
+    handler = new ProtocolHandler;
 }
 
 
 void ProtocolhandlerTest::cleanupTestCase()
 {
+    delete handler;
 }
     
     
@@ -61,5 +64,5 @@ void ProtocolhandlerTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(ProtocolhandlerTest)
+QTEST_KDEMAIN(ProtocolhandlerTest,GUI)
 #include "protocolhandler_test.moc"
diff --git a/src/tests/sessionmanager_test.cpp b/src/tests/sessionmanager_test.cpp
index 6cbd1bef..e3e1b329 100644
--- a/src/tests/sessionmanager_test.cpp
+++ b/src/tests/sessionmanager_test.cpp
@@ -21,9 +21,10 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest>
+
 
 #include "sessionmanager.h"
 
@@ -48,11 +49,13 @@ private:
 
 void SessionManagerTest::initTestCase()
 {
+    sessman = new SessionManager;
 }
 
 
 void SessionManagerTest::cleanupTestCase()
 {
+    delete sessman;
 }
     
     
@@ -62,5 +65,5 @@ void SessionManagerTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(SessionManagerTest)
+QTEST_KDEMAIN(SessionManagerTest,GUI)
 #include "sessionmanager_test.moc"
diff --git a/src/tests/walletbar_test.cpp b/src/tests/walletbar_test.cpp
index a3b87710..ec9c3559 100644
--- a/src/tests/walletbar_test.cpp
+++ b/src/tests/walletbar_test.cpp
@@ -21,9 +21,9 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
-#include <QtWebKit>
+#include <QtGui>
+#include <QtTest>
 
 #include "walletbar.h"
 
@@ -48,11 +48,14 @@ private:
 
 void WalletBarTest::initTestCase()
 {
+    QWidget *w = new QWidget;
+    bar = new WalletBar(w);
 }
 
 
 void WalletBarTest::cleanupTestCase()
 {
+    delete bar;
 }
     
     
@@ -62,5 +65,5 @@ void WalletBarTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(WalletBarTest)
+QTEST_KDEMAIN(WalletBarTest,GUI)
 #include "walletbar_test.moc"
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
index 5d563160..3527f1ed 100644
--- a/src/tests/webpage_test.cpp
+++ b/src/tests/webpage_test.cpp
@@ -21,8 +21,9 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
+#include <QtGui>
+#include <QtTest>
 #include <QtWebKit>
 
 #include "webpage.h"
@@ -74,15 +75,15 @@ WebPageTest::~WebPageTest()
 
 void WebPageTest::initTestCase()
 {
-//     tab = new WebTab;
-//     view = new WebView(tab);
-//     page = view->page();
+    tab = new WebTab;
+    view = tab->view();
+    page = tab->page();
 }
 
 
 void WebPageTest::cleanupTestCase()
 {
-//     delete tab;
+    delete tab;
 }
     
     
@@ -119,5 +120,5 @@ void WebPageTest::loadFinished()
 
 // -------------------------------------------
 
-QTEST_MAIN(WebPageTest)
+QTEST_KDEMAIN(WebPageTest,GUI)
 #include "webpage_test.moc"
diff --git a/src/tests/websnap_test.cpp b/src/tests/websnap_test.cpp
index 9c648370..e77e365b 100644
--- a/src/tests/websnap_test.cpp
+++ b/src/tests/websnap_test.cpp
@@ -21,8 +21,9 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
+#include <QtGui>
+#include <QtTest>
 #include <QtWebKit>
 
 #include "websnap.h"
@@ -49,11 +50,13 @@ private:
 
 void WebSnapTest::initTestCase()
 {
+//     snap = new WebSnap;
 }
 
 
 void WebSnapTest::cleanupTestCase()
 {
+    delete snap;
 }
     
     
@@ -63,5 +66,5 @@ void WebSnapTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(WebSnapTest)
+QTEST_KDEMAIN(WebSnapTest,GUI)
 #include "websnap_test.moc"
diff --git a/src/tests/webtab_test.cpp b/src/tests/webtab_test.cpp
index 42d5388b..2c6edf35 100644
--- a/src/tests/webtab_test.cpp
+++ b/src/tests/webtab_test.cpp
@@ -21,8 +21,9 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
+#include <QtGui>
+#include <QtTest>
 #include <QtWebKit>
 
 #include "webpage.h"
@@ -48,13 +49,13 @@ private:
 
 void WebTabTest::initTestCase()
 {
-//     tab = new WebTab;
+    tab = new WebTab;
 }
 
 
 void WebTabTest::cleanupTestCase()
 {
-//     delete tab;
+    delete tab;
 }
     
     
@@ -63,5 +64,5 @@ void WebTabTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(WebTabTest)
+QTEST_KDEMAIN(WebTabTest,GUI)
 #include "webtab_test.moc"
diff --git a/src/tests/webview_test.cpp b/src/tests/webview_test.cpp
index 82334a30..92431d96 100644
--- a/src/tests/webview_test.cpp
+++ b/src/tests/webview_test.cpp
@@ -21,12 +21,13 @@
 
 #include <qtest_kde.h>
 
-#include <QtTest>
 #include <QtCore>
+#include <QtGui>
+#include <QtTest>
 #include <QtWebKit>
 
 #include "webview.h"
-
+#include "webtab.h"
 
 class WebViewTest : public QObject
 {
@@ -40,6 +41,7 @@ private slots:
 
 private:
     WebView *view;
+    WebTab *tab;
 };
 
 
@@ -48,6 +50,8 @@ private:
 
 void WebViewTest::initTestCase()
 {
+    tab = new WebTab;
+    view = tab->view();
 }
 
 
@@ -61,5 +65,5 @@ void WebViewTest::cleanupTestCase()
 
 // -------------------------------------------
 
-QTEST_MAIN(WebViewTest)
+QTEST_KDEMAIN(WebViewTest,GUI)
 #include "webview_test.moc"
-- 
cgit v1.2.1


From fbf6f37706a66bff0b61e0b854e3c4e123387db6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 17:07:05 +0100
Subject: Ok, commenting out (for now) problems with 2 failing tests..

---
 src/tests/mainview_test.cpp   | 7 ++++---
 src/tests/mainwindow_test.cpp | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 30d4e7dd..80fecaa2 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -31,6 +31,7 @@
 #include <QtGui>
 #include <QtTest>
 
+#include "mainwindow.h"
 #include "mainview.h"
 #include "webview.h"
 
@@ -87,15 +88,15 @@ private:
 // It is only called once.
 void MainViewTest::initTestCase()
 {
-    window = new MainWindow;
-    view = window->mainView();
+//     window = new MainWindow;
+//     view = window->mainView();
 }
 
 // This will be called after the last test function is executed.
 // It is only called once.
 void MainViewTest::cleanupTestCase()
 {
-    delete window;
+//     delete window;
 }
 
 // -------------------------------------------
diff --git a/src/tests/mainwindow_test.cpp b/src/tests/mainwindow_test.cpp
index 90ae26bd..a37e9f16 100644
--- a/src/tests/mainwindow_test.cpp
+++ b/src/tests/mainwindow_test.cpp
@@ -50,13 +50,13 @@ private:
 
 void MainWindowTest::initTestCase()
 {
-    window = new MainWindow;
+//     window = new MainWindow;
 }
 
 
 void MainWindowTest::cleanupTestCase()
 {
-    delete window;
+//     delete window;
 }
 
 // -------------------------------------------
-- 
cgit v1.2.1


From d61a0d580b3f2835ab0292aecac8ebbdce8bec41 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 17:12:09 +0100
Subject: Ok, we have 12 empty tests working... :)

---
 src/tests/mainview_test.cpp   | 4 ++--
 src/tests/mainwindow_test.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 80fecaa2..94e7fc30 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -88,8 +88,8 @@ private:
 // It is only called once.
 void MainViewTest::initTestCase()
 {
-//     window = new MainWindow;
-//     view = window->mainView();
+    window = new MainWindow;
+    view = window->mainView();
 }
 
 // This will be called after the last test function is executed.
diff --git a/src/tests/mainwindow_test.cpp b/src/tests/mainwindow_test.cpp
index a37e9f16..d3ab6bef 100644
--- a/src/tests/mainwindow_test.cpp
+++ b/src/tests/mainwindow_test.cpp
@@ -50,7 +50,7 @@ private:
 
 void MainWindowTest::initTestCase()
 {
-//     window = new MainWindow;
+    window = new MainWindow;
 }
 
 
-- 
cgit v1.2.1


From edea0f2fc34738de52a58f00c676e814f7a8c2fd Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Feb 2010 23:58:31 +0100
Subject: First works on new Unit Tests..

---
 src/tests/CMakeLists.txt           |   1 +
 src/tests/findbar_test.cpp         |   1 +
 src/tests/mainview_test.cpp        | 183 ++++++++++++++++++-------------------
 src/tests/protocolhandler_test.cpp |  52 ++++++++++-
 src/tests/webpage_test.cpp         |  12 ---
 src/tests/websnap_test.cpp         |   1 -
 src/tests/webview_test.cpp         |   2 +
 7 files changed, 141 insertions(+), 111 deletions(-)

(limited to 'src')

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0230a5ce..e05a056b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -67,6 +67,7 @@ target_link_libraries( protocolhandler_test
     kdeinit_rekonq
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
     ${QT_QTTEST_LIBRARY}
 )
 
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
index 6b81255f..a79f44a2 100644
--- a/src/tests/findbar_test.cpp
+++ b/src/tests/findbar_test.cpp
@@ -63,6 +63,7 @@ void FindBarTest::cleanupTestCase()
     
 void FindBarTest::matchCase()
 {
+    
 }
 
 void FindBarTest::notifyMatch()
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 94e7fc30..596ac4e1 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -96,7 +96,7 @@ void MainViewTest::initTestCase()
 // It is only called once.
 void MainViewTest::cleanupTestCase()
 {
-//     delete window;
+//     delete window;   // FIXME: this let the test fail. Why??
 }
 
 // -------------------------------------------
@@ -107,13 +107,16 @@ void MainViewTest::tabwidget_data()
 
 void MainViewTest::tabwidget()
 {
-//     widget.currentWebView();
-//     QCOMPARE(widget.currentIndex(), 0);
-//     widget.newTab();
-//     widget.nextTab();
-//     QCOMPARE(widget.currentIndex(), 1);
-//     widget.previousTab();
-//     QCOMPARE(widget.currentIndex(), 0);
+    QCOMPARE(view->currentIndex(), -1);
+    
+//     view->newTab();    
+//     QCOMPARE(view->currentIndex(), 1); 
+//     view->newTab();
+//     view->nextTab();
+//     QCOMPARE(view->currentIndex(), 0);
+// 
+//     view->previousTab();
+//     QCOMPARE(view->currentIndex(), 0);
 }
 
 // -------------------------------------------
@@ -124,32 +127,30 @@ void MainViewTest::closeTab_data()
     QTest::newRow("null") << 0;
 }
 
-// public void closeTab(int index = -1)
+
 void MainViewTest::closeTab()
 {
-    QFETCH(int, index);
-
-/*
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
-
-    widget.newTab();
-    widget.slotCloseTab(index);
-    widget.newTab();
-    widget.slotCloseTab(index);
-    widget.newTab();
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy3.count(), 2);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 0);*/
+//     QFETCH(int, index);
+// 
+//     QSignalSpy spy1(view, SIGNAL(linkHovered(const QString &)));
+//     QSignalSpy spy2(view, SIGNAL(setCurrentTitle(const QString &)));
+//     QSignalSpy spy3(view, SIGNAL(tabsChanged()));
+//     QSignalSpy spy4(view, SIGNAL(lastTabClosed()));
+// 
+//     view->newTab();
+//     view->closeTab(index);
+//     view->newTab();
+//     view->closeTab(index);
+//     view->newTab();
+// 
+//     QCOMPARE(spy1.count(), 0);
+//     QCOMPARE(spy2.count(), 2);
+//     QCOMPARE(spy3.count(), 0);
+//     QCOMPARE(spy4.count(), 0);
 }
 
 // -------------------------------------------
 
-Q_DECLARE_METATYPE(WebView*)
 void MainViewTest::currentWebView_data()
 {
     /*
@@ -158,7 +159,6 @@ void MainViewTest::currentWebView_data()
     */
 }
 
-// public WebView *currentWebView() const
 void MainViewTest::currentWebView()
 {
     /*
@@ -166,12 +166,12 @@ void MainViewTest::currentWebView()
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     QCOMPARE(widget.currentWebView(), currentWebView);
 
@@ -193,31 +193,24 @@ void MainViewTest::newTab_data()
     QTest::newRow("null") << 0;
 }
 
-// public void newTab()
+
 void MainViewTest::newTab()
 {
-    /*
-    QFETCH(int, foo);
-
-    SubMainView widget;
-
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
-
-    widget.newTab();
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy2.count(), 0);
-    QCOMPARE(spy3.count(), 0);
-    QCOMPARE(spy4.count(), 0);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 0);
-    */
-    QSKIP("Test is not implemented.", SkipAll);
+//     QFETCH(int, foo);
+// 
+//     QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+//     QSignalSpy spy1(view, SIGNAL(setCurrentTitle(const QString &)));
+//     QSignalSpy spy2(view, SIGNAL(showStatusBarMessage(const QString &)));
+//     QSignalSpy spy3(view, SIGNAL(tabsChanged()));
+//     QSignalSpy spy4(view, SIGNAL(lastTabClosed()));
+// 
+//     view->newTab();
+// 
+//     QCOMPARE(spy0.count(), 0);
+//     QCOMPARE(spy1.count(), 0);
+//     QCOMPARE(spy2.count(), 0);
+//     QCOMPARE(spy3.count(), 0);
+//     QCOMPARE(spy4.count(), 0);
 }
 
 // -------------------------------------------
@@ -236,12 +229,12 @@ void MainViewTest::nextTab()
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     widget.nextTab();
 
@@ -272,12 +265,12 @@ void MainViewTest::previousTab()
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     widget.previousTab();
 
@@ -302,12 +295,12 @@ void MainViewTest::recentlyClosedTabs()
     /*
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     QCOMPARE(spy0.count(), 0);
     QCOMPARE(spy2.count(), 0);
@@ -335,12 +328,12 @@ void MainViewTest::setCurrentTitle(const QString &)
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     widget.call_setCurrentTitle(url);
 
@@ -370,12 +363,12 @@ void MainViewTest::showStatusBarMessage(const QString &)
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     widget.call_showStatusBarMessage(message);
 
@@ -391,14 +384,12 @@ void MainViewTest::showStatusBarMessage(const QString &)
 
 // -------------------------------------------
 
-// void slotCurrentChanged(int index);
 void MainViewTest::currentChanged_data()
 {
     QTest::addColumn<int>("foo");
     QTest::newRow("null") << 0;
 }
 
-// private slotCurrentChanged
 void MainViewTest::currentChanged()
 {
     /*
@@ -406,12 +397,12 @@ void MainViewTest::currentChanged()
 
     SubMainView widget;
 
-    QSignalSpy spy0(&widget, SIGNAL(linkHovered(const QString &)));
-    QSignalSpy spy2(&widget, SIGNAL(loadProgress(int)));
-    QSignalSpy spy3(&widget, SIGNAL(setCurrentTitle(const QString &)));
-    QSignalSpy spy4(&widget, SIGNAL(showStatusBarMessage(const QString &)));
-    QSignalSpy spy5(&widget, SIGNAL(tabsChanged()));
-    QSignalSpy spy6(&widget, SIGNAL(lastTabClosed()));
+    QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+    QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
+    QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
+    QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+    QSignalSpy spy5(view, SIGNAL(tabsChanged()));
+    QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
 
     widget.call_tabsChanged();
 
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
index d738baea..71d8d9ec 100644
--- a/src/tests/protocolhandler_test.cpp
+++ b/src/tests/protocolhandler_test.cpp
@@ -24,7 +24,7 @@
 #include <QtCore>
 #include <QtGui>
 #include <QtTest>
-
+#include <QtWebKit>
 
 #include "protocolhandler.h"
 
@@ -38,8 +38,12 @@ public slots:
     void cleanupTestCase();
     
 private slots:
+    void preHandling_data();
+    void preHandling();
 
-
+    void postHandling_data();
+    void postHandling();
+    
 private:
     ProtocolHandler *handler;
 };
@@ -62,6 +66,50 @@ void ProtocolhandlerTest::cleanupTestCase()
 // -------------------------------------------
 
 
+void ProtocolhandlerTest::preHandling_data()
+{
+    QTest::addColumn<QString>("urlString");
+    
+    QTest::newRow("mailto")     << "mailto:me@here.com";
+    QTest::newRow("relative")   << "google.it";
+    QTest::newRow("javascript") << "javascript:alertbox('hello')";
+    QTest::newRow("aboutblank") << "about:blank";
+    QTest::newRow("abouthome")  << "about:home";
+    QTest::newRow("ftp")        << "ftp://ftp.kde.org";
+    QTest::newRow("file")       << "file:///home";
+}
+
+
+void ProtocolhandlerTest::preHandling()
+{
+//     QFETCH( QString, urlString );
+//     
+//     QWebView *view = new QWebView;
+//     QWebFrame *frame = view->page()->mainFrame();
+//     
+//     QNetworkRequest *request = new QNetworkRequest( QUrl(urlString) );
+//     handler->preHandling( request, frame );
+}
+
+
+void ProtocolhandlerTest::postHandling_data()
+{
+    QTest::addColumn<QString>("urlString");
+    
+    QTest::newRow("mailto")     << "mailto:me@here.com";
+    QTest::newRow("relative")   << "google.it";
+    QTest::newRow("javascript") << "javascript:alertbox('hello')";
+    QTest::newRow("aboutblank") << "about:blank";
+    QTest::newRow("abouthome")  << "about:home";
+    QTest::newRow("ftp")        << "ftp://ftp.kde.org";
+    QTest::newRow("file")       << "file:///home";
+}
+
+
+void ProtocolhandlerTest::postHandling()
+{
+}
+    
 // -------------------------------------------
 
 QTEST_KDEMAIN(ProtocolhandlerTest,GUI)
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
index 3527f1ed..3051b8bf 100644
--- a/src/tests/webpage_test.cpp
+++ b/src/tests/webpage_test.cpp
@@ -34,10 +34,6 @@
 class WebPageTest : public QObject
 {
     Q_OBJECT
-
-public:
-    WebPageTest();
-    virtual ~WebPageTest();
     
 public slots:
     void initTestCase();
@@ -65,14 +61,6 @@ private:
 // -------------------------------------------
 
 
-WebPageTest::WebPageTest()
-{}
-
-
-WebPageTest::~WebPageTest()
-{}
-
-
 void WebPageTest::initTestCase()
 {
     tab = new WebTab;
diff --git a/src/tests/websnap_test.cpp b/src/tests/websnap_test.cpp
index e77e365b..53fc1d4f 100644
--- a/src/tests/websnap_test.cpp
+++ b/src/tests/websnap_test.cpp
@@ -50,7 +50,6 @@ private:
 
 void WebSnapTest::initTestCase()
 {
-//     snap = new WebSnap;
 }
 
 
diff --git a/src/tests/webview_test.cpp b/src/tests/webview_test.cpp
index 92431d96..11d1a46c 100644
--- a/src/tests/webview_test.cpp
+++ b/src/tests/webview_test.cpp
@@ -29,6 +29,7 @@
 #include "webview.h"
 #include "webtab.h"
 
+
 class WebViewTest : public QObject
 {
     Q_OBJECT
@@ -57,6 +58,7 @@ void WebViewTest::initTestCase()
 
 void WebViewTest::cleanupTestCase()
 {
+    delete tab;
 }
     
     
-- 
cgit v1.2.1


From 858acb145fdcd6ea7a28739e55d4666b3e33f24b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 1 Mar 2010 23:05:01 +0100
Subject: Added shortlink to GreenBytes HTTP tests

---
 src/tests/HTTP_tests.html | 601 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 601 insertions(+)
 create mode 100644 src/tests/HTTP_tests.html

(limited to 'src')

diff --git a/src/tests/HTTP_tests.html b/src/tests/HTTP_tests.html
new file mode 100644
index 00000000..7a5ac00d
--- /dev/null
+++ b/src/tests/HTTP_tests.html
@@ -0,0 +1,601 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Test Cases for HTTP Content-Disposition header and RFC 2231/2047 Encoding</title>
+
+<style type="text/css">
+a.plain {
+  color: black;
+  text-decoration: none;
+}
+body {
+  color: black;
+  font-family: verdana, helvetica, arial, sans-serif;
+  font-size: 10pt;
+  margin-left: 2em;
+}
+h1 {
+  font-size: 18pt;
+}
+h2 {
+  font-size: 14pt;
+}
+h3 {
+  font-size: 12pt;
+}
+h4 {
+  font-size: 10pt;
+}
+pre {
+  border-style: dotted;
+  border-width: 1px;
+  background-color: #f0f0f0;
+}
+pre.invalid {
+  border-style: dotted;
+  border-width: 1px;
+  background-color: #ff8080;
+}
+table {
+  font-size: 9pt;
+}
+table.aside {
+  float: right;
+  margin: 4px;
+  border-style: dotted;
+  border-width: 1px;
+  background-color: #f0f0f0;
+}
+q {
+  font-style: italic;
+}
+th {
+  text-align: right;
+  vertical-align: top;
+}
+h2, h3, h4 {
+  clear: both;
+}
+.fail {
+  background-color: #ffd0d0;
+}
+.warn {
+  background-color: #ffff80;
+}
+.pass {
+  background-color: #d0ffd0;
+}
+.unsupported {
+  background-color: #e0e0e0;
+}
+
+</style>
+
+</head>
+
+<body>
+
+<h1>Test Cases for HTTP Content-Disposition header and RFC 2231/2047 Encoding</h1>
+
+
+<h2>Test Cases</h2><div id="c-d-inline"><h3><a href="#c-d-inline" class="plain">Content-Disposition: Disposition-Type Inline</a></h3>
+      <p>
+        Various tests relating to the "inline" disposition type, see 
+        <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.1">Section 2.1 of RFC 2183</a>.
+      </p>
+    <div id="inlonly"><h4><a href="#inlonly" class="plain">inlonly</a>
+              [<a href="http://greenbytes.de/tech/tc2231/inlonly.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>inline</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>'inline' only</p><p><em>This should be equivalent to not including the header at all.</em></p></div><div id="inlwithasciifilename"><h4><a href="#inlwithasciifilename" class="plain">inlwithasciifilename</a>
+              [<a href="http://greenbytes.de/tech/tc2231/inlwithasciifilename.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>inline; filename="<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass
+                          (uses the filename in subsequent 'save' operation)
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Konq</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Chrome</td><td>pass
+                          (filename information not used)
+                        </td></tr></tbody></table><p>
+        'inline', specifying a filename of <code>foo.html</code>
+      </p><p><em>
+        Some UAs use this filename in a subsequent "save" operation.
+      </em></p></div><div id="inlwithasciifilenamepdf"><h4><a href="#inlwithasciifilenamepdf" class="plain">inlwithasciifilenamepdf</a>
+              [<a href="http://greenbytes.de/tech/tc2231/inlwithasciifilenamepdf.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>inline; filename="<b>foo.pdf</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Konq</td><td>pass
+                          (filename information not used)
+                        </td></tr><tr class="pass"><td>Chrome</td><td>pass
+                          (filename information not used)
+                        </td></tr></tbody></table><p>
+        'inline', specifying a filename of <code>foo.pdf</code>
+      </p><p><em>
+        Some UAs use this filename in a subsequent "save" operation.
+        This variation of the test checks whether whatever handles PDF display
+        receives the filename information, and acts upon it
+        (this was tested with the latest Acrobat Reader plugin).
+      </em></p></div></div><div id="c-d-attachment"><h3><a href="#c-d-attachment" class="plain">Content-Disposition: Disposition-Type Attachment</a></h3>
+      <p>
+        Various tests relating to the "attchment" disposition type, see 
+        <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.2">Section 2.2 of RFC 2183</a>.
+      </p>
+    <div id="attonly"><h4><a href="#attonly" class="plain">attonly</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attonly.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>'attachment' only</p><p><em>UA should offer to download the resource.</em></p></div><div id="attonlyucase"><h4><a href="#attonlyucase" class="plain">attonlyucase</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attonlyucase.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>ATTACHMENT</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="fail"><td>Konq</td><td>fail</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>'ATTACHMENT' only</p><p><em>UA should offer to download the resource.</em></p></div><div id="attwithasciifilename"><h4><a href="#attwithasciifilename" class="plain">attwithasciifilename</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifilename.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attwithasciifnescapedchar"><h4><a href="#attwithasciifnescapedchar" class="plain">attwithasciifnescapedchar</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifnescapedchar.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>f\oo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (apparently does not treat the backslash as escape character, replaces it with '_')
+                        </td></tr><tr class="fail"><td>MSIE8</td><td>fail
+                          (apparently does not treat the backslash as escape character, replaces it with '_')
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="fail"><td>Saf4</td><td>fail
+                          (apparently does not treat the backslash as escape character, replaces it with '-')
+                        </td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (saves "oo.html" (what's going on here?))
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>f\oo.html</code> (the first 'o' being escaped)
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attwithfilenameandextparam"><h4><a href="#attwithfilenameandextparam" class="plain">attwithfilenameandextparam</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfilenameandextparam.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; foo="bar"; filename="<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>
+        and an extension parameter "foo" which should be ignored
+        (see <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.8">Section 2.8 of RFC 2183</a>.).
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attwithasciifilenameucase"><h4><a href="#attwithasciifilenameucase" class="plain">attwithasciifilenameucase</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifilenameucase.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; FILENAME="<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="fail"><td>Konq</td><td>fail
+                          (filename parameter is ignored)
+                        </td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attwithasciifilenamenq"><h4><a href="#attwithasciifilenamenq" class="plain">attwithasciifilenamenq</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifilenamenq.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename=<b>foo.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="warn"><td>FF3</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>MSIE8</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Saf4</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Konq</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Chrome</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>, but missing
+        the quotes.
+      </p><p><em>This is invalid according to <a href="http://greenbytes.de/tech/webdav/rfc2616.html#rfc.section.19.5.1">Section 19.5.1 of RFC2616</a>, so UAs should
+      ignore it.</em></p></div><div id="attwithisofnplain"><h4><a href="#attwithisofnplain" class="plain">attwithisofnplain</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithisofnplain.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo-ä.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using plain ISO-8859-1
+      </p><p><em>UA should offer to download the resource as "foo-ä.html".</em></p></div><div id="attwithutf8fnplain"><h4><a href="#attwithutf8fnplain" class="plain">attwithutf8fnplain</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithutf8fnplain.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo-ä.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (decodes as UTF-8)
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (decodes as UTF-8)
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>,
+        which happens to be <code>foo-ä.html</code> using UTF-8 encoding.
+      </p><p><em>UA should offer to download the resource as "foo-ä.html".
+      Displaying "foo-ä.html" instead indicates that the UA tried to be smart by detecting
+      something that happens to look like UTF-8.</em></p></div><div id="attwithfnrawpctenca"><h4><a href="#attwithfnrawpctenca" class="plain">attwithfnrawpctenca</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfnrawpctenca.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo-%41.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="fail"><td>MSIE8</td><td>fail
+                          (displays "foo-A.html")
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (displays "foo-A.html" (see <a href="http://code.google.com/p/chromium/issues/detail?id=118">Chrome Issue 118</a>))
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-%41.html</code>
+      </p><p><em>UA should offer to download the resource as "foo-%41.html".
+      Displaying "foo-A.html" instead would indicate that the UA has attempted
+      to percent-decode the parameter.
+      </em></p></div><div id="attwithfnrawpctenclong"><h4><a href="#attwithfnrawpctenclong" class="plain">attwithfnrawpctenclong</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfnrawpctenclong.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo-%c3%a4-%e2%82%ac.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="fail"><td>MSIE8</td><td>fail
+                          (displays "foo-ä-€.html")
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (displays "foo-ä-€.html" (see <a href="http://code.google.com/p/chromium/issues/detail?id=118">Chrome Issue 118</a>))
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-%c3%a4-%e2%82%ac.html</code>, using raw percent encoded UTF-8
+        to represent <code>foo-ä-€.html</code>
+      </p><p><em>UA should offer to download the resource as "foo-%c3%a4-%e2%82%ac.html".
+      Displaying "foo-ä-€.html" instead would indicate that the UA has attempted
+      to percent-decode the parameter (using UTF-8). Displaying something else
+      would indicate that the UA tried to percent-decode, but used a different encoding.
+      </em></p></div><div id="attwithasciifilenamews1"><h4><a href="#attwithasciifilenamews1" class="plain">attwithasciifilenamews1</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifilenamews1.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename ="<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>, with one
+        blank space <em>before</em> the equals character.
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attwithasciifilenamews2"><h4><a href="#attwithasciifilenamews2" class="plain">attwithasciifilenamews2</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithasciifilenamews2.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename= "<b>foo.html</b>"</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="pass"><td>MSIE8</td><td>pass</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="pass"><td>Saf4</td><td>pass</td></tr><tr class="pass"><td>Konq</td><td>pass</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>, with one
+        blank space <em>after</em> the equals character.
+      </p><p><em>UA should offer to download the resource as "foo.html".</em></p></div><div id="attfnbrokentoken"><h4><a href="#attfnbrokentoken" class="plain">attfnbrokentoken</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfnbrokentoken.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename=<b>foo[1](2).html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="warn"><td>FF3</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>MSIE8</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Saf4</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Konq</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr><tr class="warn"><td>Chrome</td><td>warn
+                          (accepts the unquoted value)
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo[1](2).html</code>, but missing
+        the quotes. Also, "[", "]", "(" and ")" are not allowed in the HTTP <a href="http://greenbytes.de/tech/webdav/draft-ietf-httpbis-p1-messaging-latest.html#rfc.section.1.2.2">token</a>
+        production.
+      </p><p><em>This is invalid according to <a href="http://greenbytes.de/tech/webdav/rfc2616.html#rfc.section.19.5.1">Section 19.5.1 of RFC2616</a>,
+      so UAs should ignore it.</em></p></div></div><div id="c-d-parms"><h3><a href="#c-d-parms" class="plain">Content-Disposition: Additional Parameters</a></h3>
+      <p>
+        Various tests relating to the additional parameters defined in 
+        <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2">Section 2 of RFC 2183</a>.
+      </p>
+    <div id="attcdate"><h4><a href="#attcdate" class="plain">attcdate</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attcdate.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; <b>creation-date="Wed, 12 Feb 1997 16:29:51 -0500"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="unsupported"><td>FF3</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Op10</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Konq</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr></tbody></table><p>'attachment', plus creation-date (see <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.4">Section 2.4 of RFC 2183</a>)</p><p><em>UA should offer to download the resource. When doing so,
+      the creation date should be set to 12 Feb 1997.</em></p></div><div id="attmdate"><h4><a href="#attmdate" class="plain">attmdate</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attmdate.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; <b>modification-date="Wed, 12 Feb 1997 16:29:51 -0500"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="unsupported"><td>FF3</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Op10</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Konq</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported
+                          (seems to ignore the parameter)
+                        </td></tr></tbody></table><p>'attachment', plus modification-date (see <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.5">Section 2.5 of RFC 2183</a>)</p><p><em>UA should offer to download the resource. When doing so,
+      the modification date should be set to 12 Feb 1997.</em></p></div></div><div id="c-d-extension"><h3><a href="#c-d-extension" class="plain">Content-Disposition: Disposition-Type Extension</a></h3>
+      <p>
+        A test checking behavior for disposition type extensions,
+        which should be treated as "attachment", see 
+        <a href="http://greenbytes.de/tech/webdav/rfc2183.html#rfc.section.2.8">Section 2.8 of RFC 2183</a>.
+      </p>
+    <div id="dispext"><h4><a href="#dispext" class="plain">dispext</a>
+              [<a href="http://greenbytes.de/tech/tc2231/dispext.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>foobar</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="fail (does not treat it as 'attachment')"><td>MSIE8</td><td>fail (does not treat it as 'attachment')</td></tr><tr class="fail (does not treat it as 'attachment')"><td>Op10</td><td>fail (does not treat it as 'attachment')</td></tr><tr class="fail (does not treat it as 'attachment')"><td>Saf4</td><td>fail (does not treat it as 'attachment')</td></tr><tr class="fail (does not treat it as 'attachment')"><td>Konq</td><td>fail (does not treat it as 'attachment')</td></tr><tr class="pass"><td>Chrome</td><td>pass</td></tr></tbody></table><p>'foobar' only</p><p><em>This should be equivalent to using "attachment".</em></p></div></div><div id="encoding-2231-char"><h3><a href="#encoding-2231-char" class="plain">RFC2231 Encoding: Character Sets</a></h3>
+      <p>
+        Various tests using the parameter value encoding defined
+        in <a href="http://greenbytes.de/tech/webdav/rfc2231.html#rfc.section.4">Section 4 of RFC 2231</a>.
+      </p>
+    <div id="attwithisofn2231iso"><h4><a href="#attwithisofn2231iso" class="plain">attwithisofn2231iso</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithisofn2231iso.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*=<b>iso-8859-1''foo-%E4.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded ISO-8859-1
+      </p><p><em>UA should offer to download the resource as "foo-ä.html".
+      </em></p></div><div id="attwithfn2231utf8"><h4><a href="#attwithfn2231utf8" class="plain">attwithfn2231utf8</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231utf8.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*=<b>UTF-8''foo-%c3%a4-%e2%82%ac.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä-€.html</code>, using RFC2231 encoded UTF-8
+      </p><p><em>UA should offer to download the resource as "foo-ä-€.html".
+      </em></p></div><div id="attwithfn2231noc"><h4><a href="#attwithfn2231noc" class="plain">attwithfn2231noc</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231noc.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*=<b>''foo-%c3%a4-%e2%82%ac.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="warn"><td>FF3</td><td>warn
+                          (decodes as UTF-8)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (decodes as 8bit encoding (ISO-8859-1?))
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        Behavior is undefined in RFC 2231, the charset part is missing, although UTF-8 was used.
+      </p></div><div id="attwithfn2231utf8comp"><h4><a href="#attwithfn2231utf8comp" class="plain">attwithfn2231utf8comp</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231utf8comp.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*=<b>UTF-8''foo-a%cc%88.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (displays "foo-ä.html")
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, but
+        choosing the decomposed form (lowercase a plus COMBINING DIAERESIS) --
+        on a Windows target system, this should be translated to the preferred
+        Unicode normal form (composed).
+      </p><p><em>UA should offer to download the resource as "foo-ä.html".
+      </em></p></div><div id="attwithfn2231utf8-bad"><h4><a href="#attwithfn2231utf8-bad" class="plain">attwithfn2231utf8-bad</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231utf8-bad.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename*=<b>iso-8859-1''foo-%c3%a4-%e2%82%ac.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (falls back to UTF-8)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (displays the raw octet sequence as if it was ISO-8859-1 (which is internally 
+      treated as windows-1252, which <em>does</em> allow %82))
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä-€.html</code>, using RFC2231 encoded UTF-8, but declaring ISO-8859-1
+      </p><p><em>
+        The octet %82 does not represent a valid ISO-8859-1 code point, so
+        the UA should really ignore the parameter.
+      </em></p></div><div id="attwithfn2231ws1"><h4><a href="#attwithfn2231ws1" class="plain">attwithfn2231ws1</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231ws1.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename<b> *=</b>UTF-8''foo-%c3%a4.html</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (displays garbage)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, with whitespace before "*="
+      </p><p><em>
+        The parameter is invalid, thus should be ignored.
+      </em></p></div><div id="attwithfn2231ws2"><h4><a href="#attwithfn2231ws2" class="plain">attwithfn2231ws2</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231ws2.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename<b>*= </b>UTF-8''foo-%c3%a4.html</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, with whitespace after "*="
+      </p><p><em>
+        UA should offer to download the resource as "foo-ä.html".
+      </em></p></div><div id="attwithfn2231ws3"><h4><a href="#attwithfn2231ws3" class="plain">attwithfn2231ws3</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231ws3.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename<b>* =</b>UTF-8''foo-%c3%a4.html</pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, with whitespace inside "* ="
+      </p><p><em>
+        UA should offer to download the resource as "foo-ä.html".
+      </em></p></div><div id="attwithfn2231quot"><h4><a href="#attwithfn2231quot" class="plain">attwithfn2231quot</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231quot.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename*=<b>"</b>UTF-8''foo-%c3%a4.html<b>"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (tries to be helpful by removing the quotes)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, with double quotes
+        around the parameter value.
+      </p><p><em>
+        The parameter is invalid, thus should be ignored.
+      </em></p></div><div id="attwithfn2231encmissing"><h4><a href="#attwithfn2231encmissing" class="plain">attwithfn2231encmissing</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attwithfn2231encmissing.asis">TEST</a>]
+            </h4><pre class="invalid"><b>Content-Disposition: </b>attachment; filename*=<b>''foo-%c3%a4.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (sniffs the encoding as UTF-8)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="fail"><td>Op10</td><td>fail
+                          (assumes a default of ISO-8859-1)
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using RFC2231 encoded UTF-8, but
+        leaving out the charset field.
+      </p><p><em>
+        The parameter is invalid, thus should be ignored.
+      </em></p></div></div><div id="encoding-2231-cont"><h3><a href="#encoding-2231-cont" class="plain">RFC2231 Encoding: Continuations</a></h3>
+      <p>
+        Various tests using the parameter value continuation efined
+        in <a href="http://greenbytes.de/tech/webdav/rfc2231.html#rfc.section.3">Section 3 of RFC 2231</a>.
+      </p>
+    <div id="attfncont"><h4><a href="#attfncont" class="plain">attfncont</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfncont.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*0=<b>"foo."</b>; filename*1=<b>"html"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo.html</code>, using RFC2231-style parameter continuations.
+      </p><p><em>
+        UA should offer to download the resource as "foo.html".
+      </em></p></div><div id="attfncontenc"><h4><a href="#attfncontenc" class="plain">attfncontenc</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfncontenc.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*0*=<b>UTF-8''foo-%c3%a4</b>; filename*1=<b>".html"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ä.html</code>, using both RFC2231-style parameter continuations
+        and UTF-8 encoding.
+      </p><p><em>
+        UA should offer to download the resource as "foo-ä.html".
+      </em></p></div><div id="attfncontlz"><h4><a href="#attfncontlz" class="plain">attfncontlz</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfncontlz.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*0=<b>"foo"</b>; filename*01=<b>"bar"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="warn"><td>FF3</td><td>warn
+                          (accepts leading zeros)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="warn"><td>Op10</td><td>warn
+                          (accepts leading zeros)
+                        </td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo</code> (the parameter filename*01 should be ignored because of the leading zero)
+      </p><p><em>
+        UA should offer to download the resource as "foo".
+      </em></p></div><div id="attfncontnc"><h4><a href="#attfncontnc" class="plain">attfncontnc</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfncontnc.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*0=<b>"foo"</b>; filename*2=<b>"bar"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="warn"><td>FF3</td><td>warn
+                          (accepts gaps)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo</code> (the parameter filename*2 because there's no filename*1 parameter)
+      </p><p><em>
+        UA should offer to download the resource as "foo".
+      </em></p></div><div id="attfnconts1"><h4><a href="#attfnconts1" class="plain">attfnconts1</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfnconts1.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*1=<b>"foo."</b>; filename*2=<b>"html"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass</td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment' (the filename* parameters should be ignored because filename*0 is missing)
+      </p><p><em>
+        UA should offer to download, not getting the filename from the header.
+      </em></p></div><div id="attfncontord"><h4><a href="#attfncontord" class="plain">attfncontord</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfncontord.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*1=<b>"bar"</b>; filename*0=<b>"foo"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (parameters are expected to be ordered)
+                        </td></tr><tr class="unsupported"><td>MSIE8</td><td>unsupported</td></tr><tr class="pass"><td>Op10</td><td>pass</td></tr><tr class="unsupported"><td>Saf4</td><td>unsupported</td></tr><tr class="unsupported"><td>Konq</td><td>unsupported</td></tr><tr class="unsupported"><td>Chrome</td><td>unsupported</td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foobar</code>
+      </p><p><em>
+        UA should offer to download the resource as "foobar".
+      </em></p></div></div><div id="encoding-2231-fb"><h3><a href="#encoding-2231-fb" class="plain">RFC2231 Encoding: Fallback Behaviour</a></h3>
+      <p>
+        This tests how the UA behaves when the same parameter name appear
+        both in traditional and RFC 2231 extended format.
+      </p>
+    <div id="attfnboth"><h4><a href="#attfnboth" class="plain">attfnboth</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfnboth.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename="<b>foo-ae.html</b>"; filename*=<b>UTF-8''foo-%c3%a4.html</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>Konq</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>Chrome</td><td>pass
+                          (picks the traditionally encoded value -- the first of both)
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ae.html</code> in
+        the traditional format, and <code>foo-ä.html</code> in RFC2231 format.
+      </p><p><em>
+        The behaviour of this undefined. Thus UAs should one of the two values.
+      </em></p></div><div id="attfnboth2"><h4><a href="#attfnboth2" class="plain">attfnboth2</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attfnboth2.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename*=<b>UTF-8''foo-%c3%a4.html</b>; filename=<b>"foo-ae.html"</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="pass"><td>FF3</td><td>pass
+                          (picks the RFC2231 encoded value -- the first of both)
+                        </td></tr><tr class="fail"><td>MSIE8</td><td>fail
+                          (ignores the parameter (this indicates a parsing bug))
+                        </td></tr><tr class="pass"><td>Op10</td><td>pass
+                          (picks the RFC2231 encoded value -- the first of both)
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (picks the traditionally encoded value -- the one it understands)
+                        </td></tr><tr class="pass"><td>Konq</td><td>pass
+                          (picks the traditionally encoded value -- the one it understands)
+                        </td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (ignores the parameter (this indicates a parsing bug))
+                        </td></tr></tbody></table><p>
+        'attachment', specifying a filename of <code>foo-ae.html</code> in
+        the traditional format, and <code>foo-ä.html</code> in RFC2231 format.
+      </p><p><em>
+        The behaviour of this undefined. Thus UAs should one of the two values.
+      </em></p></div></div><div id="encoding-2047"><h3><a href="#encoding-2047" class="plain">RFC2047 Encoding</a></h3>
+      <p>
+        These tests RFC 2047 style encoding. 
+      </p>
+      <p>
+        Note that according to <a href="http://greenbytes.de/tech/webdav/rfc2047.html#rfc.section.5">Section 5 of RFC 2047</a>,
+        this encoding does not apply here: <q cite="http://greenbytes.de/tech/webdav/rfc2047.html#rfc.section.5">An 'encoded-word' MUST NOT appear within a 'quoted-string'.</q>, and
+        <q cite="http://greenbytes.de/tech/webdav/rfc2047.html#rfc.section.5">An 'encoded-word' MUST NOT be used in parameter of a MIME
+        Content-Type or Content-Disposition field, or in any structured
+        field body except within a 'comment' or 'phrase'.</q>
+      </p>
+      <p>
+        Therefore, these tests are only be present in order to check
+        whether the UA by mistake tries to implement RFC2047.
+      </p>
+    <div id="attrfc2047token"><h4><a href="#attrfc2047token" class="plain">attrfc2047token</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attrfc2047token.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename=<b>=?ISO-8859-1?Q?foo-=E4.html?=</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass
+                          (takes the whole value as filename, but does not decode it (replacing question marks by underscores))
+                        </td></tr><tr class="fail"><td>Op10</td><td>fail
+                          (displays garbage ("=.htm"))
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (takes the whole value as filename, but does not decode it (replacing question marks by underscores))
+                        </td></tr><tr class="fail"><td>Konq</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr></tbody></table><p>
+        Uses RFC 2047 style encoded word. "=" is invalid inside the <code>token</code>
+        production, so this is invalid.
+      </p></div><div id="attrfc2047quoted"><h4><a href="#attrfc2047quoted" class="plain">attrfc2047quoted</a>
+              [<a href="http://greenbytes.de/tech/tc2231/attrfc2047quoted.asis">TEST</a>]
+            </h4><pre><b>Content-Disposition: </b>attachment; filename=<b>"=?ISO-8859-1?Q?foo-=E4.html?="</b></pre><table class="aside"><thead><tr><th colspan="2">
+                      Test Results
+                    </th></tr></thead><tbody><tr class="fail"><td>FF3</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr><tr class="pass"><td>MSIE8</td><td>pass
+                          (takes the whole value as filename, but does not decode it)
+                        </td></tr><tr class="fail"><td>Op10</td><td>fail
+                          (displays garbage ("=.htm"))
+                        </td></tr><tr class="pass"><td>Saf4</td><td>pass
+                          (takes the whole value as filename, but does not decode it)
+                        </td></tr><tr class="fail"><td>Konq</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr><tr class="fail"><td>Chrome</td><td>fail
+                          (decodes it anyway to "foo-ä.html")
+                        </td></tr></tbody></table><p>
+        Uses RFC 2047 style encoded word, using the <code>quoted-string</code> production.
+      </p></div></div>
+</body></html>
\ No newline at end of file
-- 
cgit v1.2.1


From f959cfb603baea26f6e7c7d9414d0d06ee4acd0a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 2 Mar 2010 01:20:04 +0100
Subject: This will fix rekonq behaviour on opening external links. It's a bit
 "less functional" than before, but it always works :)

---
 src/application.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index e5b76745..270cd87f 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -53,7 +53,6 @@
 #include <KToolInvocation>
 #include <KUriFilter>
 #include <KMessageBox>
-#include <KWindowInfo>
 #include <KUrl>
 #include <ThreadWeaver/Weaver>
 
@@ -153,21 +152,17 @@ int Application::newInstance()
     // are there args? load them..
     if (args->count() > 0)
     {
-        // is there a window open on the current desktop ? use it!
-        for (int i = 0; i < m_mainWindows.size(); ++i)
+        // are there any windows there? use it
+        int index = m_mainWindows.size();
+        if(index > 0)
         {
-            MainWindow *m = m_mainWindows.at(i).data();
-            KWindowInfo w = KWindowInfo(m->winId(), NET::WMDesktop);
-            if(w.isOnCurrentDesktop())
-            {
-                m->activateWindow();
-                m->raise();
+            MainWindow *m = m_mainWindows.at(index - 1).data();
+            m->activateWindow();
                 
-                for (int i = 0; i < args->count(); ++i)
-                    loadUrl(args->arg(i), Rekonq::NewCurrentTab);
+            for (int i = 0; i < args->count(); ++i)
+                loadUrl(args->arg(i), Rekonq::NewCurrentTab);
                 
-                return 2;
-            }
+            return 2;
         }
         
         // No windows in the current desktop? No windows at all?
-- 
cgit v1.2.1


From 51bc713428c8c23f9b3f614c756a1bc3e239c586 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 2 Mar 2010 01:22:13 +0100
Subject: Reenabled urlbar hack BUG:228606

---
 src/urlbar/urlbar.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 3ddadf6b..718d9f67 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -161,13 +161,13 @@ void UrlBar::setProgress(int progress)
 
 void UrlBar::updateUrl()
 {
-//     // Don't change my typed url...
-//     // FIXME this is not a proper solution (also if it works...)
-//     if(hasFocus())
-//     {
-//         kDebug() << "Don't change my typed url...";
-//         return;
-//     }
+    // Don't change my typed url...
+    // FIXME this is not a proper solution (also if it works...)
+    if(hasFocus())
+    {
+        kDebug() << "Don't change my typed url...";
+        return;
+    }
 
     KIcon icon;
     if(m_currentUrl.isEmpty()) 
-- 
cgit v1.2.1


From f24d3182f08480502cbf7bcfd1a0775e57722197 Mon Sep 17 00:00:00 2001
From: Darjus Loktevic <darjus@linux-6j1x.site>
Date: Tue, 2 Mar 2010 21:27:03 -0800
Subject: * Added continue search by <Enter> key (similar to Firefox, enter the
   search term and press <Enter> for next result). * Removed
 focusNextPrevChild if the search fails as it does not seem to   make sense.
 It's the same as you would press <Tab> to focus the next   item on the page.
 Why "Search" should do that? Some context: found   that when searching some
 websites, when the match is not found, the   page would suddenly scroll to
 some location and focus a link or search   edit. Hope this makes sense.

---
 src/findbar.cpp    | 1 +
 src/mainwindow.cpp | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index bb693ab0..03fe2180 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -82,6 +82,7 @@ FindBar::FindBar(QWidget *parent)
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
     connect(m_lineEdit, SIGNAL(textChanged(const QString &)), window, SLOT(find(const QString &)));
+    connect(m_lineEdit, SIGNAL(returnPressed()), mainwindow, SLOT(findNext()));
     layout->addWidget(m_lineEdit);
 
     // buttons
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 39dd9a40..a09c25e8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -794,10 +794,7 @@ void MainWindow::findNext()
         return;
 
     if(m_findBar->isHidden())
-    {
-      currentTab()->view()->page()->focusNextPrevChild(true);
-      return;
-    }
+        return;
     
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
@@ -805,8 +802,6 @@ void MainWindow::findNext()
 
     bool found = currentTab()->view()->findText(m_lastSearch, options);
     m_findBar->notifyMatch(found);
-    if(!found)
-	currentTab()->view()->page()->focusNextPrevChild(true);
 }
 
 
@@ -821,8 +816,6 @@ void MainWindow::findPrevious()
 
     bool found = currentTab()->view()->findText(m_lastSearch, options);
     m_findBar->notifyMatch(found);
-    if(!found)
-	currentTab()->view()->page()->focusNextPrevChild(true);
 }
 
 
-- 
cgit v1.2.1


From a9c75882d7ba333baf54befcd64fe0bd51e6b220 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 3 Mar 2010 10:04:15 +0100
Subject: Removing call to non-extant slot..

---
 src/webtab.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index b4759995..b4e59d84 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -91,8 +91,6 @@ WebTab::WebTab(QWidget *parent)
                 this, SLOT(createWalletBar(const QString &, const QUrl &)));
     }
 
-    connect(view->page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
-
     connect(view, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
     connect(view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 }
-- 
cgit v1.2.1


From 1255296a1bdf0a2f4e3baa1992bb80d224f33941 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 3 Mar 2010 11:46:07 +0100
Subject: Fix the scroll problem with the workaround of findText() (spotted by
 Darjus Loktevic)

---
 src/mainwindow.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 39dd9a40..5df226df 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -795,8 +795,10 @@ void MainWindow::findNext()
 
     if(m_findBar->isHidden())
     {
-      currentTab()->view()->page()->focusNextPrevChild(true);
-      return;
+        QPoint test = currentTab()->view()->page()->currentFrame()->scrollPosition();
+        currentTab()->view()->page()->focusNextPrevChild(true);
+        currentTab()->view()->page()->currentFrame()->setScrollPosition(test);
+        return;
     }
     
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
@@ -806,7 +808,11 @@ void MainWindow::findNext()
     bool found = currentTab()->view()->findText(m_lastSearch, options);
     m_findBar->notifyMatch(found);
     if(!found)
-	currentTab()->view()->page()->focusNextPrevChild(true);
+    {
+        QPoint test = currentTab()->view()->page()->currentFrame()->scrollPosition();
+        currentTab()->view()->page()->focusNextPrevChild(true);
+        currentTab()->view()->page()->currentFrame()->setScrollPosition(test);
+    }
 }
 
 
@@ -821,8 +827,6 @@ void MainWindow::findPrevious()
 
     bool found = currentTab()->view()->findText(m_lastSearch, options);
     m_findBar->notifyMatch(found);
-    if(!found)
-	currentTab()->view()->page()->focusNextPrevChild(true);
 }
 
 
-- 
cgit v1.2.1


From 92baa8b9ff6171e391fdbc0f70b4ece24be4843f Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 3 Mar 2010 12:04:54 +0100
Subject: Fix the move of the page whith case sensitive

---
 src/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5df226df..7c30198f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -783,7 +783,7 @@ void MainWindow::matchCaseUpdate()
     if (!currentTab())
         return;
     
-    currentTab()->view()->findText(m_lastSearch, QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument);
+    currentTab()->view()->findText(m_lastSearch, QWebPage::FindBackward);
     findNext();
 }
 
-- 
cgit v1.2.1


From 479afef6b760849df654226861e264ddd735632d Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 3 Mar 2010 12:41:43 +0100
Subject: variable names ...

---
 src/mainwindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7c30198f..a6f1428f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -795,9 +795,9 @@ void MainWindow::findNext()
 
     if(m_findBar->isHidden())
     {
-        QPoint test = currentTab()->view()->page()->currentFrame()->scrollPosition();
+        QPoint previous_position = currentTab()->view()->page()->currentFrame()->scrollPosition();
         currentTab()->view()->page()->focusNextPrevChild(true);
-        currentTab()->view()->page()->currentFrame()->setScrollPosition(test);
+        currentTab()->view()->page()->currentFrame()->setScrollPosition(previous_position);
         return;
     }
     
@@ -809,9 +809,9 @@ void MainWindow::findNext()
     m_findBar->notifyMatch(found);
     if(!found)
     {
-        QPoint test = currentTab()->view()->page()->currentFrame()->scrollPosition();
+        QPoint previous_position = currentTab()->view()->page()->currentFrame()->scrollPosition();
         currentTab()->view()->page()->focusNextPrevChild(true);
-        currentTab()->view()->page()->currentFrame()->setScrollPosition(test);
+        currentTab()->view()->page()->currentFrame()->setScrollPosition(previous_position);
     }
 }
 
-- 
cgit v1.2.1


From b6d1cf90688c74c98b12e86618fc142e1d432379 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 3 Mar 2010 14:15:34 +0100
Subject: Fix compile :/

---
 src/findbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 03fe2180..4c780aca 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -82,7 +82,7 @@ FindBar::FindBar(QWidget *parent)
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
     connect(m_lineEdit, SIGNAL(textChanged(const QString &)), window, SLOT(find(const QString &)));
-    connect(m_lineEdit, SIGNAL(returnPressed()), mainwindow, SLOT(findNext()));
+    connect(m_lineEdit, SIGNAL(returnPressed()), window, SLOT(findNext()));
     layout->addWidget(m_lineEdit);
 
     // buttons
-- 
cgit v1.2.1


From e26472693aac7fe5ef277889fd0136dd66159e94 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 4 Mar 2010 13:59:25 +0100
Subject: WebPluginFactory. Cleaning code..

---
 src/webpluginfactory.cpp | 60 +++++++++++++++++++++++-------------------------
 src/webpluginfactory.h   |  5 +---
 2 files changed, 30 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 6265aeb3..c8060969 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -41,8 +41,8 @@
 
 WebPluginFactory::WebPluginFactory(QObject *parent)
     : KWebPluginFactory(parent)
+    , _loadClickToFlash(false)
 {
-    loadClickToFlash = false;
     connect(this, SIGNAL(signalLoadClickToFlash(bool)), SLOT(setLoadClickToFlash(bool)));
 }
 
@@ -55,7 +55,7 @@ WebPluginFactory::~WebPluginFactory()
 
 void WebPluginFactory::setLoadClickToFlash(bool load)
 {
-    loadClickToFlash = load;
+    _loadClickToFlash = load;
 }
 
 
@@ -65,39 +65,37 @@ QObject *WebPluginFactory::create(const QString &mimeType,
                                   const QStringList &argumentValues) const
 {
     kDebug() << "loading mimeType: " << mimeType;
-        
-    if(ReKonfig::pluginsEnabled() == 0) // plugins are enabled
+    
+    switch( ReKonfig::pluginsEnabled() )
     {
+    case 0:
         kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones...";
+        return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
+        
+    case 1:
+        if( mimeType != QString("application/x-shockwave-flash") )
+            break;
+        
+        if( _loadClickToFlash )
+        {
+            emit signalLoadClickToFlash(false);
+            return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
+        }
+        else
+        {
+            ClickToFlash* ctf = new ClickToFlash(url);
+            connect(ctf, SIGNAL(signalLoadClickToFlash(bool)), this, SLOT(setLoadClickToFlash(bool)));
+            return ctf;
+        }
+        break;
+        
+    case 2:
         return 0;
+        
+    default:
+        kDebug() << "oh oh.. this should NEVER happen..";
+        break;
     }
     
-    if(mimeType == QString("application/x-shockwave-flash") 
-        && !loadClickToFlash)
-    {
-        ClickToFlash* ctf = new ClickToFlash(url);
-        connect(ctf, SIGNAL(signalLoadClickToFlash(bool)), this, SLOT(setLoadClickToFlash(bool)));
-        return ctf;
-    }
-    
-    // this let QtWebKit using builtin plugins 
-    // to load in example flash contents and so on..
-    kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones...";
-    emit signalLoadClickToFlash(false);
     return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
 }
-
-
-QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
-{
-    QList<KWebPluginFactory::Plugin> plugins = KWebPluginFactory::plugins();
-    
-    KWebPluginFactory::Plugin p;
-    
-    p.name = "application/x-shockwave-flash";
-    p.description = "Plugin for flash animations";
-    plugins.append(p);
-    
-    
-    return plugins;
-}
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 74bca043..9e5028b2 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -53,10 +53,7 @@ public:
                             const QStringList &argumentNames,
                             const QStringList &argumentValues) const;
 
-    virtual QList<Plugin> plugins() const;
-    
 signals:
-
     void signalLoadClickToFlash(bool) const;
     
 public slots:
@@ -67,7 +64,7 @@ private:
         When true, force loading of next flash animation (don't show clicktoflash)
         We use signals/slots to set this property because QWebPluginFactory::create is const
     */
-    bool loadClickToFlash;
+    bool _loadClickToFlash;
 };
 
 #endif // WEB_PLUGIN_FACTORY_H
-- 
cgit v1.2.1


From 3d9eeaedd2124cd4548c3f718986f41d0172fe9a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 4 Mar 2010 14:01:40 +0100
Subject: delete clicktoflash object just when detection doesn't fail. This
 will save rekonq from crashes :)

---
 src/clicktoflash.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 64dff19d..24f8740e 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -114,14 +114,13 @@ void ClickToFlash::load()
                 QWebElement substitute = element.clone();
                 emit signalLoadClickToFlash(true);
                 element.replace(substitute);
+                deleteLater();
                 return;
             }
         }
 
         frames += frame->childFrames();
     }
-    
-    deleteLater();
 }
 
 
-- 
cgit v1.2.1


From c9813c11a0c8a928d8fac4eb63efd29eec50047d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 4 Mar 2010 15:37:18 +0100
Subject: Fix Click to Flash. In my tests it doesn't crash anymore and works
 ever well :) (Please, don't wake up me if this is just aa dream..)

---
 src/clicktoflash.cpp     | 54 ++++++++++++++++++++++++++++++------------------
 src/clicktoflash.h       |  3 +++
 src/webpluginfactory.cpp |  2 +-
 3 files changed, 38 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 24f8740e..3c284b3f 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -31,6 +31,7 @@
 
 // KDE Includes
 #include <KLocalizedString>
+#include <KDebug>
 
 // Qt Includes
 #include <QWebFrame>
@@ -89,28 +90,11 @@ void ClickToFlash::load()
         elements.append(docElement.findAll(selector.arg(QLatin1String("object"))));
         elements.append(docElement.findAll(selector.arg(QLatin1String("embed"))));
         
-        bool isRightElement = false;
         foreach (QWebElement element, elements) 
         {
-            // TODO : find a proper solution to compare a QWebElement with a plugin
-            // With this "manual" test, it's probably not working everywhere
-            if(QUrl(element.attribute("data")) == m_url
-                || QUrl(element.attribute("src")) == m_url)
-                isRightElement = true;
-            else
-            {
-                QWebElementCollection collec = element.findAll("param");
-                int i = 0;
-                while(i < collec.count() && isRightElement == false)
-                {
-                    if(QUrl(collec.at(i).attribute("value")) == m_url)
-                    isRightElement = true;
-                    i++;
-                }
-            }
-            
-            if(isRightElement)
+            if( checkElement(element) )
             {
+                kDebug() << "RETURNED TRUE ...........................";
                 QWebElement substitute = element.clone();
                 emit signalLoadClickToFlash(true);
                 element.replace(substitute);
@@ -118,9 +102,39 @@ void ClickToFlash::load()
                 return;
             }
         }
-
         frames += frame->childFrames();
     }
 }
 
 
+bool ClickToFlash::checkElement(QWebElement el)
+{
+    kDebug() << "src: " << QUrl(el.attribute("src"));
+    kDebug() << "url: " << m_url;
+
+    QString checkString;
+    QString urlString;
+    
+    checkString = QUrl(el.attribute("src")).toString( QUrl::RemoveQuery );
+    urlString = m_url.toString( QUrl::RemoveQuery );
+    
+    if( urlString.contains( checkString ) )
+        return true;
+     
+    QWebElementCollection collec = el.findAll("*");
+    int i = 0;
+    while( i < collec.count() )
+    {
+        QWebElement el = collec.at(i);
+
+        checkString = QUrl(el.attribute("src")).toString( QUrl::RemoveQuery );
+        urlString = m_url.toString( QUrl::RemoveQuery );
+
+        if( urlString.contains( checkString ) )
+            return true;
+        
+        i++;
+    }
+
+    return false;
+}
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 2284ec7e..7d6c4e05 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -35,6 +35,7 @@
 // Qt Includes
 #include <QWidget>
 #include <QUrl>
+#include <QWebElement>
 
 // Forward Declarations
 class WebPluginFactory;
@@ -54,6 +55,8 @@ private slots:
     void load();
     
 private:
+    bool checkElement(QWebElement el);
+    
     /**
     used to find the right QWebElement between the ones of the different plugins
     */
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index c8060969..9e4b8ba3 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -79,7 +79,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
         if( _loadClickToFlash )
         {
             emit signalLoadClickToFlash(false);
-            return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
+            return 0; //KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
         }
         else
         {
-- 
cgit v1.2.1


From 09ba3b9c585ad397c3168d1fb44f7f4dc75f0447 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 00:52:07 +0100
Subject: Fix choice between history & bookmarks in the new tab first page. No
 more reloading pages on accepting configuration

---
 src/mainwindow.cpp      | 9 +--------
 src/mainwindow.h        | 1 -
 src/protocolhandler.cpp | 8 ++++----
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a02910fd..eebebc09 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -603,13 +603,6 @@ void MainWindow::updateConfiguration()
 }
 
 
-void MainWindow::updateBrowser()
-{
-    updateConfiguration();
-    mainView()->reloadAllTabs();
-}
-
-
 void MainWindow::openLocation()
 {
     m_view->urlBar()->selectAll();
@@ -646,7 +639,7 @@ void MainWindow::preferences()
     QWeakPointer<SettingsDialog> s = new SettingsDialog(this);
 
     // keep us informed when the user changes settings
-    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateBrowser()));
+    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
 
     s.data()->exec();
     delete s.data();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 66c796cc..57b88dfd 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -87,7 +87,6 @@ private:
     void setupPanels();
     
 public slots:
-    void updateBrowser();
     void homePage();
 
     /**
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index ffeea562..70d69107 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -124,12 +124,12 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
             case 1: // closed tabs
                 _url = KUrl("about:closedTabs");
                 break;
-            case 2: // history
-                _url = KUrl("about:history");
-                break;
-            case 3: // bookmarks
+            case 2: // bookmarks
                 _url = KUrl("about:bookmarks");
                 break;
+            case 3: // history
+                _url = KUrl("about:history");
+                break;
             default: // unuseful
                 break;
             }
-- 
cgit v1.2.1


From fba2312780dd712fff036c3926320d1ceba2adbc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 01:04:28 +0100
Subject: Fixing recover on crash hackish fix :(

---
 src/application.cpp | 11 ++++++++++-
 src/rekonq.kcfg     |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 270cd87f..499c7a37 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -79,6 +79,11 @@ Application::Application()
 
 Application::~Application()
 {
+    // ok, we are closing well.
+    // Don't recover on next load..
+    ReKonfig::setRecoverOnCrash(false);
+    saveConfiguration();
+    
     foreach( QWeakPointer<MainWindow> window, m_mainWindows)
     {
         delete window.data();
@@ -143,7 +148,7 @@ int Application::newInstance()
     // is your app session restored? restore session...
     // this mechanism also falls back to load usual plain rekonq
     // if something goes wrong...
-    if (isSessionRestored() && sessionManager()->restoreSession())
+    if (ReKonfig::recoverOnCrash() && sessionManager()->restoreSession())
     {
         kDebug() << "session restored";
         return 1;
@@ -198,6 +203,10 @@ void Application::postLaunch()
     // bookmarks loading
     connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)),
             Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
+
+    // crash recovering
+    ReKonfig::setRecoverOnCrash(true);
+    saveConfiguration();
 }
 
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 0675720c..f68dc7e8 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -25,6 +25,9 @@
     <entry name="walletBlackList" type="StringList">
         <default></default>
     </entry>
+    <entry name="recoverOnCrash" type="bool">
+        <default>false</default>
+    </entry>
 </group>
 
 <!-- New Tab Page Settings -->
-- 
cgit v1.2.1


From 984526692fa8d8b77f4cc026a2f527a974e403c0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 01:21:58 +0100
Subject: Cleaning websnaps code..

---
 src/rekonqpage/newtabpage.cpp |  2 +-
 src/websnap.cpp               | 26 +++++++++-----------------
 src/websnap.h                 |  4 ++--
 3 files changed, 12 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index cc8aa1fb..3cd79326 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -183,7 +183,7 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
     setupPreview(prev, index);
     showControls(prev);
     
-    new WebSnap(url, m_root.webFrame()->page(), index);
+    new WebSnap(url, m_root.webFrame(), index);
     
     return prev;
 }
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 6310c868..2916418b 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -46,13 +46,12 @@
 #include <QFile>
 
 
-WebSnap::WebSnap(const QUrl& url, QWebPage* originatingPage, int previewIndex)
+WebSnap::WebSnap(const QUrl& url, QWebFrame *frame, int index)
     : QObject()
+    , m_url(url)
+    , m_frame(frame)
+    , m_previewIndex(index)
 {
-    m_url = url;
-    m_originatingPage = originatingPage;
-    m_previewIndex = previewIndex;
-
     // this to not register websnap history
     m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
     
@@ -76,14 +75,12 @@ void WebSnap::load()
 }
 
 
-QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
+QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
 {
     // prepare page
-    page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); // Why it doesn't work with one setScrollBarPolicy?
-    page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff); // bug in qtwebkit ?
-    page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+    page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
     page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
-
+    
     // find the best size
     QSize size;
     int width = page.mainFrame()->contentsSize().width();
@@ -102,8 +99,6 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h)
 
     // restore page settings
     page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
-    page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
-    page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
 
     return QPixmap::fromImage(pageImage);
@@ -120,8 +115,7 @@ void WebSnap::savePreview(QPixmap pm, KUrl url)
 
 KUrl WebSnap::fileForUrl(KUrl url)
 {
-    QString filePath = 
-            KStandardDirs::locateLocal("cache", QString("thumbs/") + WebSnap::guessNameFromUrl(url) + ".png", true);
+    QString filePath = KStandardDirs::locateLocal("cache", QString("thumbs/") + WebSnap::guessNameFromUrl(url) + ".png", true);
     return KUrl(filePath);
 }
 
@@ -162,15 +156,13 @@ void WebSnap::saveResult(bool ok)
     QFile::remove(fileForUrl(m_url).toLocalFile());
     m_image.save(fileForUrl(m_url).toLocalFile());
     
-    //m_originatingPage->mainFrame()->load(KUrl("about:preview/replace/" + QVariant(m_previewIndex).toString()));
-    NewTabPage p(m_originatingPage->mainFrame());
+    NewTabPage p( m_frame );
     p.snapFinished(m_previewIndex, m_url, m_snapTitle);
     
     deleteLater();
 }
 
 
-
 QString WebSnap::snapTitle()
 {
     return m_page.mainFrame()->title();
diff --git a/src/websnap.h b/src/websnap.h
index 54f63503..49b60769 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -55,7 +55,7 @@ class REKONQ_TESTS_EXPORT WebSnap : public QObject
     Q_OBJECT
 
 public:
-    WebSnap(const QUrl &url, QWebPage *originatingPage, int previewIndex);
+    WebSnap(const QUrl &url, QWebFrame *frame, int index);
     ~WebSnap();
     
     QPixmap previewImage(); // TODO : remove
@@ -82,7 +82,7 @@ private:
     QUrl m_url;
     QString m_snapTitle;
     
-    QWebPage *m_originatingPage;
+    QWebFrame *m_frame;
     int m_previewIndex;
 };
 
-- 
cgit v1.2.1


From 01bf832717d4910183f7e55715065044361a4108 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 01:34:06 +0100
Subject: Bug about page viewportsize seems fixed here, creating a copy of the
 page fro the tab preview. Some days of testing needed..

---
 src/tabbar.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 49ed230b..43432ec4 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -168,9 +168,12 @@ void TabBar::showTabPreview(int tab)
     m_previewPopup.data()->setFrameShape(QFrame::StyledPanel);
     m_previewPopup.data()->setFrameShadow(QFrame::Plain);
     m_previewPopup.data()->setFixedSize(w, h);
+    
     QLabel *l = new QLabel();
-    view->page()->setViewportSize(currentView->page()->viewportSize());
-    l->setPixmap(WebSnap::renderPreview(*(view->page()), w, h));
+    QWebPage copyPage(view->page());
+    copyPage.setViewportSize(currentView->page()->viewportSize());
+    l->setPixmap(WebSnap::renderPreview(copyPage, w, h));
+    
     m_previewPopup.data()->setView(l);
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
     m_previewPopup.data()->layout()->setMargin(0);
-- 
cgit v1.2.1


From b43e6d9f1784cb95977a2cfd0a21f7caeed8d6d9 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 02:17:51 +0100
Subject: Stupid me, committed wrong change. Sorry :)

---
 src/application.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 499c7a37..31f0ab2e 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -143,17 +143,17 @@ int Application::newInstance()
     {
         QTimer::singleShot(0, this, SLOT(postLaunch()));
         first = false;
+        
+        // is your app session restored? restore session...
+        // this mechanism also falls back to load usual plain rekonq
+        // if something goes wrong...
+        if (ReKonfig::recoverOnCrash() && sessionManager()->restoreSession())
+        {
+            kDebug() << "session restored";
+            return 1;
+        }
     }
 
-    // is your app session restored? restore session...
-    // this mechanism also falls back to load usual plain rekonq
-    // if something goes wrong...
-    if (ReKonfig::recoverOnCrash() && sessionManager()->restoreSession())
-    {
-        kDebug() << "session restored";
-        return 1;
-    }
-    
     // are there args? load them..
     if (args->count() > 0)
     {
-- 
cgit v1.2.1


From 384b3f1d066443b67b9d3d6389846a44e976876f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 12:41:28 +0100
Subject: Ok, things seem working well now. Anyway, it needs some days of
 testing..

---
 src/tabbar.cpp  | 12 +++++-------
 src/websnap.cpp |  9 +++++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 43432ec4..25351ac0 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -150,15 +150,15 @@ void TabBar::showTabPreview(int tab)
 {
     MainView *mv = qobject_cast<MainView *>(parent());
     
-    WebTab *view = mv->webTab(tab);
-    WebTab *currentView = mv->webTab(currentIndex());
+    WebTab *indexedTab = mv->webTab(tab);
+    WebTab *currentTab = mv->webTab(currentIndex());
 
     // check if view && currentView exist before using them :)
-    if(!currentView || !view)
+    if(!currentTab || !indexedTab)
         return;
     
     int w = tabSizeHint(tab).width();
-    int h = w * ( (0.0 + currentView->height()) / currentView->width() );
+    int h = w * ( (0.0 + currentTab->height()) / currentTab->width() );
 
     //delete previous tab preview
     delete m_previewPopup.data();
@@ -170,9 +170,7 @@ void TabBar::showTabPreview(int tab)
     m_previewPopup.data()->setFixedSize(w, h);
     
     QLabel *l = new QLabel();
-    QWebPage copyPage(view->page());
-    copyPage.setViewportSize(currentView->page()->viewportSize());
-    l->setPixmap(WebSnap::renderPreview(copyPage, w, h));
+    l->setPixmap( WebSnap::renderPreview( *indexedTab->page() , w, h) );
     
     m_previewPopup.data()->setView(l);
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 2916418b..ceb24b4f 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -75,11 +75,14 @@ void WebSnap::load()
 }
 
 
+// NOTE please, be careful modifying this. 
+// You are playing with fire..
 QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
 {
     // prepare page
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
     page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+    QSize oldSize = page.viewportSize();
     
     // find the best size
     QSize size;
@@ -90,7 +93,8 @@ QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
     
     // create the page image
     QImage pageImage = QImage(size, QImage::Format_ARGB32_Premultiplied);
-    pageImage.fill(Qt::transparent); 
+    pageImage.fill(Qt::transparent);
+    
     // render it
     QPainter p(&pageImage);
     page.mainFrame()->render(&p);
@@ -100,7 +104,8 @@ QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
     // restore page settings
     page.mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
-
+    page.setViewportSize(oldSize);
+    
     return QPixmap::fromImage(pageImage);
 }
 
-- 
cgit v1.2.1


From 215274abfcbe43e5d64ae8104481dc46cd618952 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 6 Mar 2010 00:20:52 +0100
Subject: Just another crash recovery fix. Now rekonq tries just 1 time to
 recover from crash. In Italy we say "Perseverare e' diabolico"...

---
 src/application.cpp    |  7 ++++---
 src/rekonq.kcfg        |  4 ++--
 src/sessionmanager.cpp | 11 ++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 31f0ab2e..efa7bc22 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -81,7 +81,7 @@ Application::~Application()
 {
     // ok, we are closing well.
     // Don't recover on next load..
-    ReKonfig::setRecoverOnCrash(false);
+    ReKonfig::setRecoverOnCrash(0);
     saveConfiguration();
     
     foreach( QWeakPointer<MainWindow> window, m_mainWindows)
@@ -147,7 +147,7 @@ int Application::newInstance()
         // is your app session restored? restore session...
         // this mechanism also falls back to load usual plain rekonq
         // if something goes wrong...
-        if (ReKonfig::recoverOnCrash() && sessionManager()->restoreSession())
+        if (ReKonfig::recoverOnCrash() == 1 && sessionManager()->restoreSession())
         {
             kDebug() << "session restored";
             return 1;
@@ -205,7 +205,8 @@ void Application::postLaunch()
             Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
 
     // crash recovering
-    ReKonfig::setRecoverOnCrash(true);
+    int n = ReKonfig::recoverOnCrash();
+    ReKonfig::setRecoverOnCrash(++n);
     saveConfiguration();
 }
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index f68dc7e8..bbf20ac1 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -25,8 +25,8 @@
     <entry name="walletBlackList" type="StringList">
         <default></default>
     </entry>
-    <entry name="recoverOnCrash" type="bool">
-        <default>false</default>
+    <entry name="recoverOnCrash" type="Int">
+        <default>0</default>
     </entry>
 </group>
 
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index 72e1cc77..9e1f7baf 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -66,7 +66,7 @@ void SessionManager::saveSession()
     QFile sessionFile(m_sessionFilePath);
     if (!sessionFile.open(QFile::WriteOnly | QFile::Truncate))
     {
-        kWarning() << "Unable to open session file" << sessionFile.fileName();
+        kDebug() << "Unable to open session file" << sessionFile.fileName();
         return;
     }
     QTextStream out(&sessionFile);
@@ -93,7 +93,7 @@ bool SessionManager::restoreSession()
         return false;
     if (!sessionFile.open(QFile::ReadOnly))
     {
-        kWarning() << "Unable to open session file" << sessionFile.fileName();
+        kDebug() << "Unable to open session file" << sessionFile.fileName();
         return false;
     }
 
@@ -104,16 +104,17 @@ bool SessionManager::restoreSession()
         line = in.readLine();
         if(line == QString("window"))
         {
-            Application::instance()->newMainWindow();
             line = in.readLine();
-            Application::instance()->loadUrl(line);
+            kDebug() << "New Window line: " << line;
+            Application::instance()->loadUrl(line, Rekonq::NewWindow);
         }
         else
         {
+            kDebug() << "New Current Tab line: " << line;
             Application::instance()->loadUrl(line, Rekonq::NewCurrentTab);
         }
     }
-    while(!line.isNull());
+    while(!line.isEmpty());
     
     return true;
 }
-- 
cgit v1.2.1


From 6aeb9406dd77ad066d7904a6f453aff019bb5838 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 6 Mar 2010 00:26:02 +0100
Subject: kWarning --> kDebug

---
 src/history/autosaver.cpp      |  4 ++--
 src/history/historymanager.cpp |  8 ++++----
 src/mainwindow.cpp             |  2 +-
 src/rekonqpage/newtabpage.cpp  | 15 +++++++++------
 4 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/history/autosaver.cpp b/src/history/autosaver.cpp
index 41f19098..1bfd5c9e 100644
--- a/src/history/autosaver.cpp
+++ b/src/history/autosaver.cpp
@@ -52,7 +52,7 @@ AutoSaver::~AutoSaver()
 {
     if (m_timer.isActive())
     {
-        kWarning() << "AutoSaver: still active when destroyed, changes not saved.";
+        kDebug() << "AutoSaver: still active when destroyed, changes not saved.";
     }
 }
 
@@ -94,7 +94,7 @@ void AutoSaver::saveIfNeccessary()
     m_firstChange = QTime();
     if (!QMetaObject::invokeMethod(parent(), "save", Qt::DirectConnection))
     {
-        kWarning() << "AutoSaver: error invoking slot save() on parent";
+        kDebug() << "AutoSaver: error invoking slot save() on parent";
     }
 }
 
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index e75adbdc..362fe340 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -316,7 +316,7 @@ void HistoryManager::load()
         return;
     if (!historyFile.open(QFile::ReadOnly))
     {
-        kWarning() << "Unable to open history file" << historyFile.fileName();
+        kDebug() << "Unable to open history file" << historyFile.fileName();
         return;
     }
 
@@ -416,7 +416,7 @@ void HistoryManager::save()
 
     if (!open)
     {
-        kWarning() << "Unable to open history file for saving"
+        kDebug() << "Unable to open history file for saving"
         << (saveAll ? tempFile.fileName() : historyFile.fileName());
         return;
     }
@@ -436,11 +436,11 @@ void HistoryManager::save()
     {
         if (historyFile.exists() && !historyFile.remove())
         {
-            kWarning() << "History: error removing old history." << historyFile.errorString();
+            kDebug() << "History: error removing old history." << historyFile.errorString();
         }
         if (!tempFile.rename(historyFile.fileName()))
         {
-            kWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
+            kDebug() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
         }
     }
     m_lastSavedUrl = m_history.value(0).url;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index eebebc09..60784af0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1031,7 +1031,7 @@ QAction *MainWindow::actionByName(const QString name)
         return ret;
 
     /* else */
-    kWarning() << "Action named: " << name << " not found, returning empty action.";
+    kDebug() << "Action named: " << name << " not found, returning empty action.";
 
     return new QAction(this);  // return empty object instead of NULL pointer
 }
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 3cd79326..845dcf51 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -59,16 +59,19 @@ NewTabPage::NewTabPage(QWebFrame *frame)
     , m_url(KUrl())
 {
     QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
+    QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");    
     
     QFile file(htmlFilePath);
     bool isOpened = file.open(QIODevice::ReadOnly);
     if (!isOpened)
-        kWarning() << "Couldn't open the home.html file";
-    
-    QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");
-    
-    m_html = file.readAll();
-    m_html.replace(QString("%2"), imagesPath);
+    {
+        kDebug() << "Couldn't open the home.html file";
+    }
+    else
+    {
+        m_html = file.readAll();
+        m_html.replace(QString("%2"), imagesPath);
+    }
 }
 
 
-- 
cgit v1.2.1


From e846f0e8cc58036a6fc6455f8a40f621c636cbc5 Mon Sep 17 00:00:00 2001
From: pano <pano@linux-xtvb.(none)>
Date: Sat, 6 Mar 2010 16:37:47 +0100
Subject: Replace "Yes/No" dialog code copied and pasted from Konqueror
 (konqmainwindow.cpp) and adapted to rekonq code by me

---
 src/mainview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index e2f9094f..fc4ddc6c 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -495,12 +495,12 @@ void MainView::closeTab(int index)
     {
         if (tab->view()->isModified())
         {
-            int risp = KMessageBox::questionYesNo(this,
+            int risp = KMessageBox::warningContinueCancel(this,
                         i18n("This tab contains changes that have not been submitted.\n"
                              "Closing the tab will discard these changes.\n"
                              "Do you really want to close this tab?\n"),
-                        i18n("Closing Modified Tab"));
-            if (risp == KMessageBox::No)
+                        i18n("Closing Modified Tab"), KGuiItem(i18n("&Discard Changes"),"view-refresh"), KStandardGuiItem::cancel());
+            if (risp != KMessageBox::Continue)
                 return;
         }
         hasFocus = tab->hasFocus();
-- 
cgit v1.2.1


From 87fabef6340c83c7c8746f37aa70b9d7a54b7d5e Mon Sep 17 00:00:00 2001
From: pano <pano@linux-xtvb.(none)>
Date: Sat, 6 Mar 2010 16:46:55 +0100
Subject: Further changes to my last commit

Change string and icon of the button
---
 src/mainview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index fc4ddc6c..f2152364 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -499,7 +499,7 @@ void MainView::closeTab(int index)
                         i18n("This tab contains changes that have not been submitted.\n"
                              "Closing the tab will discard these changes.\n"
                              "Do you really want to close this tab?\n"),
-                        i18n("Closing Modified Tab"), KGuiItem(i18n("&Discard Changes"),"view-refresh"), KStandardGuiItem::cancel());
+                        i18n("Closing Modified Tab"), KGuiItem(i18n("Close &Tab"),"tab-close"), KStandardGuiItem::cancel());
             if (risp != KMessageBox::Continue)
                 return;
         }
-- 
cgit v1.2.1


From ab05c308dbe8a78445a785ed3873f38eec981120 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 11 Mar 2010 00:37:06 +0100
Subject: clean NewInstance slot and fix crashRecovery. Two days of testing
 before stable release. :)

---
 src/application.cpp | 72 ++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index efa7bc22..96254e07 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -108,14 +108,22 @@ int Application::newInstance()
 {
     KCmdLineArgs::setCwd( QDir::currentPath().toUtf8() );
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-    
-    // we share one process for several mainwindows,
-    // so initialize only once
-    static bool first = true;
+
+    bool isFirstLoad = m_mainWindows.isEmpty();
+
+    // is your app session restored? restore session...
+    // this mechanism also falls back to load usual plain rekonq
+    // if something goes wrong...
+    if (isFirstLoad && ReKonfig::recoverOnCrash() == 1 && sessionManager()->restoreSession())
+    {
+        QTimer::singleShot(0, this, SLOT(postLaunch()));
+        kDebug() << "session restored";
+        return 1;
+    }
     
     if(args->count() == 0)
     {
-        if(first)   // we are starting rekonq, for the first time with no args: use startup behaviour
+        if(isFirstLoad)   // we are starting rekonq, for the first time with no args: use startup behaviour
         {
             switch(ReKonfig::startupBehaviour())
             {
@@ -138,47 +146,31 @@ int Application::newInstance()
             loadUrl( KUrl("about:home") , Rekonq::NewWindow );
         }
     }
-    
-    if (first)
+    else
     {
-        QTimer::singleShot(0, this, SLOT(postLaunch()));
-        first = false;
-        
-        // is your app session restored? restore session...
-        // this mechanism also falls back to load usual plain rekonq
-        // if something goes wrong...
-        if (ReKonfig::recoverOnCrash() == 1 && sessionManager()->restoreSession())
+        if(isFirstLoad)
         {
-            kDebug() << "session restored";
-            return 1;
+            // No windows in the current desktop? No windows at all?
+            // Create a new one and load there sites...
+            loadUrl(args->arg(0), Rekonq::CurrentTab);
+            for (int i = 1; i < args->count(); ++i)
+                loadUrl(args->arg(i), Rekonq::SettingOpenTab);
         }
-    }
-
-    // are there args? load them..
-    if (args->count() > 0)
-    {
-        // are there any windows there? use it
-        int index = m_mainWindows.size();
-        if(index > 0)
+        else
         {
-            MainWindow *m = m_mainWindows.at(index - 1).data();
-            m->activateWindow();
-                
-            for (int i = 0; i < args->count(); ++i)
-                loadUrl(args->arg(i), Rekonq::NewCurrentTab);
-                
-            return 2;
+            // are there any windows there? use it
+            int index = m_mainWindows.size();
+            if(index > 0)
+            {
+                MainWindow *m = m_mainWindows.at(index - 1).data();
+                m->activateWindow();
+                for (int i = 0; i < args->count(); ++i)
+                    loadUrl(args->arg(i), Rekonq::NewCurrentTab);
+            }
         }
-        
-        // No windows in the current desktop? No windows at all?
-        // Create a new one and load there sites...
-        loadUrl(args->arg(0), Rekonq::CurrentTab);
-        for (int i = 1; i < args->count(); ++i)
-            loadUrl(args->arg(i), Rekonq::SettingOpenTab);
-
-        return 3;
     }
-    
+
+    QTimer::singleShot(0, this, SLOT(postLaunch()));
     return 0;
 }
 
-- 
cgit v1.2.1


From 25c5df38ada4523c7c76de55bf736656cf2bb5dc Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Thu, 11 Mar 2010 12:40:15 +0100
Subject: Close the tab preview when the close button is clicked

---
 src/tabbar.cpp | 14 ++++++++++++++
 src/tabbar.h   |  1 +
 2 files changed, 15 insertions(+)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 25351ac0..80782116 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -293,3 +293,17 @@ void TabBar::mouseReleaseEvent(QMouseEvent *event)
     
     KTabBar::mouseReleaseEvent(event);
 }
+
+
+void TabBar::tabRemoved(int index)
+{
+    Q_UNUSED(index)
+    if (ReKonfig::alwaysShowTabPreviews())
+    {
+        if ( !m_previewPopup.isNull() )
+        {
+            m_previewPopup.data()->hide();
+        }
+        m_currentTabPreview = -1;
+    }
+}
diff --git a/src/tabbar.h b/src/tabbar.h
index 5d297e4c..97c320fc 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -81,6 +81,7 @@ protected:
     virtual void leaveEvent(QEvent *event);
     virtual void mousePressEvent(QMouseEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
+    virtual void tabRemoved(int);
     
 private slots:
     void cloneTab();
-- 
cgit v1.2.1


From 6faa12680a0d7d2f13c2862628325ab65521004b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 13 Mar 2010 23:24:45 +0100
Subject: Implemented automatic adblock update. This (squashed) commit adds
 this new feature in rekonq, letting people to simply "forgot" adblock and let
 rekonq do everything for it

I added:
- a new (rekonq) adblock widget
- an asyncronous method to update rules from the net every TOT days
- a better AdBlockManager management.

What it is actually missing is the adp protocol support to add new
subscriptions to adblock. This will come the next week.
For now this part seems stable and needs just testing :)
---
 src/CMakeLists.txt               |   2 +
 src/adblock/adblockmanager.cpp   | 198 ++++++++++++++++++++++++++++++---------
 src/adblock/adblockmanager.h     |  18 +++-
 src/adblock/adblockrule.cpp      |   6 ++
 src/adblock/adblockrule.h        |   4 +-
 src/rekonq.kcfg                  |  24 +++++
 src/settings/adblockwidget.cpp   | 158 +++++++++++++++++++++++++++++++
 src/settings/adblockwidget.h     |  56 +++++++++++
 src/settings/settings_adblock.ui | 167 +++++++++++++++++++++++++++++++++
 src/settings/settingsdialog.cpp  |  22 +++--
 src/webpage.cpp                  |   8 +-
 11 files changed, 605 insertions(+), 58 deletions(-)
 create mode 100644 src/settings/adblockwidget.cpp
 create mode 100644 src/settings/adblockwidget.h
 create mode 100644 src/settings/settings_adblock.ui

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 00cfbf77..f05bbbdb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ SET( rekonq_KDEINIT_SRCS
     rekonqpage/previewselectorbar.cpp
     #----------------------------------------
     settings/settingsdialog.cpp
+    settings/adblockwidget.cpp
     #----------------------------------------
     bookmarks/bookmarksmanager.cpp
     bookmarks/bookmarkspanel.cpp
@@ -54,6 +55,7 @@ KDE4_ADD_UI_FILES( rekonq_KDEINIT_SRCS
     settings/settings_tabs.ui
     settings/settings_fonts.ui
     settings/settings_webkit.ui
+    settings/settings_adblock.ui
     cleardata.ui
  )
 
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 06f0d164..d2c2b013 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -28,6 +28,9 @@
 #include "adblockmanager.h"
 #include "adblockmanager.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
 // Local Includes
 #include "adblocknetworkreply.h"
 #include "webpage.h"
@@ -36,6 +39,7 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KDebug>
+#include <KIO/TransferJob>
 
 // Qt Includes
 #include <QUrl>
@@ -46,8 +50,8 @@ AdBlockManager::AdBlockManager(QObject *parent)
     : QObject(parent)
     , _isAdblockEnabled(false)
     , _isHideAdsEnabled(false)
+    , _index(0)
 {
-    loadSettings();
 }
 
 
@@ -58,52 +62,78 @@ AdBlockManager::~AdBlockManager()
 
 void AdBlockManager::loadSettings()
 {
-    KSharedConfig::Ptr config = KSharedConfig::openConfig("khtmlrc", KConfig::NoGlobals);
-    KConfigGroup cg( config, "Filter Settings" );
+    _index = 0;
+    _buffer.clear();
+    
+    _whiteList.clear();
+    _blackList.clear();
+    _hideList.clear();
+    
+    _isAdblockEnabled = ReKonfig::adBlockEnabled();
+    kDebug() << "ADBLOCK ENABLED = " << _isAdblockEnabled;
+    
+    // no need to load filters if adblock is not enabled :)
+    if(!_isAdblockEnabled)
+        return;
+    
+    // just to be sure..
+    _isHideAdsEnabled = ReKonfig::hideAdsEnabled();
+    
+    // local settings
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup rulesGroup( config, "rules" );
+    QStringList rules;
+    rules = rulesGroup.readEntry( "local-rules" , QStringList() );
+    loadRules( rules );
 
-    if ( cg.exists() )
+    // ----------------------------------------------------------
+        
+    QDateTime today = QDateTime::currentDateTime();
+    QDateTime lastUpdate = ReKonfig::lastUpdate();  //  the day of the implementation.. :)
+    int days = ReKonfig::updateInterval();
+    
+    if( today > lastUpdate.addDays( days ) )
     {
-        _isAdblockEnabled = cg.readEntry("Enabled", false);
-        _isHideAdsEnabled = cg.readEntry("Shrink", false);
+        ReKonfig::setLastUpdate( today );
+        
+        updateNextSubscription();
+        return;
+    }
 
-        // no need to load filters if adblock is not enabled :)
-        if(!_isAdblockEnabled)
-            return;
+    // else
+    QStringList names = ReKonfig::subscriptionNames();
+    foreach(const QString &name, names)
+    {
+        rules = rulesGroup.readEntry( name + "-rules" , QStringList() );
+        loadRules(rules);
+    }
+}
 
-        _whiteList.clear();
-        _blackList.clear();
-        _hideList.clear();
-        
-        QMap<QString,QString> entryMap = cg.entryMap();
-        QMap<QString,QString>::ConstIterator it;
-        for( it = entryMap.constBegin(); it != entryMap.constEnd(); ++it )
-        {
-            QString name = it.key();
-            QString url = it.value();
 
-            if (name.startsWith(QLatin1String("Filter")))
+void AdBlockManager::loadRules(const QStringList &rules)
+{
+    foreach(const QString &stringRule, rules)
+    {
+        // ! rules are comments
+        if( !stringRule.startsWith('!') && !stringRule.startsWith('[') && !stringRule.isEmpty() )
+        {           
+            // white rules
+            if( stringRule.startsWith( QLatin1String("@@") ) )
             {
-                if(!url.startsWith('!'))
-                {           
-                    // white rules
-                    if( url.startsWith( QLatin1String("@@") ) )
-                    {
-                        AdBlockRule rule( url.mid(2) );
-                        _whiteList << rule;
-                        continue;
-                    }
-                    
-                    // hide (CSS) rules
-                    if( url.startsWith( QLatin1String("##") ) )
-                    {
-                        _hideList << url.mid(2);
-                        continue;
-                    }
-
-                    AdBlockRule rule( url );
-                    _blackList << rule;
-                }
+                AdBlockRule rule( stringRule.mid(2) );
+                _whiteList << rule;
+                continue;
             }
+            
+            // hide (CSS) rules
+            if( stringRule.startsWith( QLatin1String("##") ) )
+            {
+                _hideList << stringRule.mid(2);
+                continue;
+            }
+
+            AdBlockRule rule( stringRule );
+            _blackList << rule;
         }
     }
 }
@@ -125,7 +155,9 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request)
     {
         if(filter.match(urlString))
         {
-            kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched: ***********" << urlString;
+            kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched: ***********";
+            kDebug() << "Filter exp: " << filter.pattern();
+            kDebug() << "UrlString:  " << urlString;
             return 0;        
         }
     }
@@ -135,7 +167,9 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request)
     {
         if(filter.match(urlString))
         {
-            kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********" << urlString;
+            kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********";
+            kDebug() << "Filter exp: " << filter.pattern();
+            kDebug() << "UrlString:  " << urlString;
             AdBlockNetworkReply *reply = new AdBlockNetworkReply(request, urlString, this);
             return reply;        
         }
@@ -164,8 +198,88 @@ void AdBlockManager::applyHidingRules(WebPage *page)
 
         foreach (QWebElement element, elements) 
         {
+            kDebug() << "Hide element: " << element.localName();
             element.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
             element.removeFromDocument();
         }
     }
 }
+
+
+void AdBlockManager::updateNextSubscription()
+{
+    kDebug() << "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO";
+
+    QStringList subUrlStrings = ReKonfig::subscriptionUrls();
+    
+    if( _index < subUrlStrings.size() )
+    {
+        QString urlString = subUrlStrings.at(_index);
+        kDebug() << "DOWNLOADING FROM " << urlString;
+        KUrl subUrl = KUrl( urlString );
+        
+        KIO::TransferJob* job = KIO::get( subUrl , KIO::Reload , KIO::HideProgressInfo );                                              
+        connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), this, SLOT(subscriptionData(KIO::Job*, const QByteArray&)));                                                         
+        connect(job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)));
+        
+        return;
+    }
+
+    _index = 0;
+    _buffer.clear();
+}
+
+
+void AdBlockManager::slotResult(KJob *job)
+{
+    kDebug() << "SLOTRESULT";
+    if(job->error())
+        return;
+
+    QList<QByteArray> list = _buffer.split('\n');
+    QStringList ruleList;
+    foreach(const QByteArray &ba, list)
+    {
+        kDebug() << ba;
+        ruleList << QString(ba);
+    }
+    loadRules(ruleList);
+    saveRules(ruleList);
+    
+    _index++;
+    
+    // last..
+    updateNextSubscription();
+}
+
+
+void AdBlockManager::subscriptionData(KIO::Job* job, const QByteArray& data)
+{
+    kDebug() << "subscriptionData";
+    Q_UNUSED(job)
+    
+    if (data.isEmpty())
+        return;
+                                                                                          
+    int oldSize = _buffer.size();
+    _buffer.resize( _buffer.size() + data.size() );
+    memcpy( _buffer.data() + oldSize, data.data(), data.size() );  
+}
+
+
+void AdBlockManager::saveRules(const QStringList &rules)
+{
+    QStringList cleanedRules;
+    foreach(const QString &r, rules)
+    {
+        if( !r.startsWith('!') && !r.startsWith('[') && !r.isEmpty() )
+            cleanedRules << r;
+    }
+    
+    QStringList names = ReKonfig::subscriptionNames();
+    QString name = names.at(_index) + "-rules";
+    
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup cg( config , "rules" );
+    cg.writeEntry( name, cleanedRules );
+}
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index d1bbe7ba..aac78e3b 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -112,6 +112,8 @@
 #include <QObject>
 #include <QNetworkReply>
 #include <QStringList>
+#include <QByteArray>
+#include <KIO/Job>
 
 // Forward Includes
 class QNetworkRequest;
@@ -129,9 +131,20 @@ public:
     AdBlockManager(QObject *parent = 0);
     ~AdBlockManager();
 
-    void loadSettings();
     QNetworkReply *block(const QNetworkRequest &request);
     void applyHidingRules(WebPage *page);
+
+public slots:
+    void loadSettings();
+
+private:
+    void updateNextSubscription();
+    void saveRules(const QStringList &);
+    void loadRules(const QStringList &);
+    
+private slots:
+    void slotResult(KJob *);
+    void subscriptionData(KIO::Job*, const QByteArray&);
     
 private:
     bool _isAdblockEnabled;
@@ -140,6 +153,9 @@ private:
     AdBlockRuleList _blackList;
     AdBlockRuleList _whiteList;
     QStringList _hideList;
+
+    int _index;
+    QByteArray _buffer;
 };
 
 #endif
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
index 25ca3678..c0c3fd5b 100644
--- a/src/adblock/adblockrule.cpp
+++ b/src/adblock/adblockrule.cpp
@@ -181,3 +181,9 @@ QString AdBlockRule::convertPatternToRegExp(const QString &wildcardPattern)
     // Finally, return...
     return pattern;
 }
+
+
+QString AdBlockRule::pattern() const
+{
+    return m_regExp.pattern();
+}
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
index 8f79d16e..ee4825d1 100644
--- a/src/adblock/adblockrule.h
+++ b/src/adblock/adblockrule.h
@@ -69,7 +69,9 @@ public:
     AdBlockRule(const QString &filter);
 
     bool match(const QString &encodedUrl) const;
-
+    
+    QString pattern() const;
+    
 private:    
     QString convertPatternToRegExp(const QString &wildcardPattern);
     
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index bbf20ac1..42ace3d3 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -7,6 +7,7 @@
 
 <!-- Includes -->
 <include>QtWebKit</include>
+<include>QDateTime</include>
 <include>KUrl</include>
 
 <kcfgfile name="rekonqrc" />
@@ -151,4 +152,27 @@
         </entry>
     </group>
 
+
+<!-- AdBlock Settings -->
+    <group name="AdBlock">
+        <entry name="adBlockEnabled" type="Bool">
+            <default>true</default>
+        </entry>
+        <entry name="hideAdsEnabled" type="Bool">
+            <default>true</default>
+        </entry>
+        <entry name="subscriptionNames" type="StringList">
+            <default>easylist</default>
+        </entry>
+        <entry name="subscriptionUrls" type="StringList">
+            <default>https://easylist-downloads.adblockplus.org/easylist.txt</default>
+        </entry>
+        <entry name="lastUpdate" type="DateTime">
+            <default>QDateTime(QDate(2009,03,13))</default>
+        </entry>
+        <entry name="updateInterval" type="Int">
+            <default>7</default>
+        </entry>
+    </group>
+
 </kcfg>
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
new file mode 100644
index 00000000..45e5fd5c
--- /dev/null
+++ b/src/settings/adblockwidget.cpp
@@ -0,0 +1,158 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#include "adblockwidget.h"
+#include "adblockwidget.moc"
+
+#include "rekonq.h"
+
+#include <KSharedConfig>
+#include <KIcon>
+#include <KDebug>
+
+#include <QString>
+#include <QWhatsThis>
+#include <QListWidgetItem>
+
+
+AdBlockWidget::AdBlockWidget(QWidget *parent)
+    : QWidget(parent)
+{
+    setupUi(this);
+    
+    hintLabel->setText( i18n("<qt>Filter expression (e.g. <tt>http://www.example.com/ad/*</tt>, <a href=\"filterhelp\">more information</a>):") );
+    connect( hintLabel, SIGNAL(linkActivated(const QString &)), this, SLOT(slotInfoLinkActivated(const QString &)) );
+ 
+    listWidget->setSortingEnabled(true);
+    listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+    
+    searchLine->setListWidget(listWidget);
+    
+    insertButton->setIcon( KIcon("list-add") );
+    connect( insertButton, SIGNAL( clicked() ), this, SLOT( insertRule() ) );
+        
+    removeButton->setIcon( KIcon("list-remove") );
+    connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeRule() ) );
+    
+    load();
+}
+
+
+void AdBlockWidget::slotInfoLinkActivated(const QString &url)
+{
+    Q_UNUSED(url)
+    
+    QString hintHelpString = i18n("<qt><p>Enter an expression to filter. Filters can be defined as either:"
+                                  "<ul><li>a shell-style wildcard, e.g. <tt>http://www.example.com/ads*</tt>, the wildcards <tt>*?[]</tt> may be used</li>"
+                                  "<li>a full regular expression by surrounding the string with '<tt>/</tt>', e.g. <tt>/\\/(ad|banner)\\./</tt></li></ul>"
+                                  "<p>Any filter string can be preceded by '<tt>@@</tt>' to whitelist (allow) any matching URL, "
+                                  "which takes priority over any blacklist (blocking) filter.");
+
+    QWhatsThis::showText( QCursor::pos(), hintHelpString );
+}
+
+
+void AdBlockWidget::insertRule()
+{
+    QString rule = addFilterLineEdit->text();
+    if(rule.isEmpty())
+        return;
+    
+    listWidget->addItem( rule );
+    addFilterLineEdit->clear();
+}
+
+
+void AdBlockWidget::removeRule()
+{
+        listWidget->takeItem( listWidget->currentRow() );    
+}
+
+
+void AdBlockWidget::load()
+{
+    bool isAdBlockEnabled = ReKonfig::adBlockEnabled();
+    checkEnableAdblock->setChecked(isAdBlockEnabled);
+    
+    bool areImageFiltered = ReKonfig::hideAdsEnabled();
+    checkHideImages->setChecked(areImageFiltered);
+    
+    QStringList subscriptions = ReKonfig::subscriptionNames();
+
+    // load automatic rules
+    foreach(QString sub, subscriptions)
+    {
+        QTreeWidgetItem *subItem = new QTreeWidgetItem(treeWidget);
+        subItem->setText(0, sub);
+        loadRules(subItem);
+    }
+    
+    // load local rules
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup localGroup( config, "rules" );
+    QStringList rules = localGroup.readEntry( "local-rules" , QStringList() );
+    foreach(const QString &rule, rules)
+    {
+        listWidget->addItem( rule );
+    }
+}
+
+
+void AdBlockWidget::loadRules(QTreeWidgetItem *item)
+{
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup localGroup( config, "rules" );
+    
+    QString str = item->text(0) + "-rules";
+    kDebug() << str;
+    QStringList rules = localGroup.readEntry( str , QStringList() );
+    
+    foreach(const QString &rule, rules)
+    {
+        QTreeWidgetItem *subItem = new QTreeWidgetItem(item);
+        subItem->setText(0, rule);
+    }
+}
+
+
+void AdBlockWidget::save()
+{
+    int n;
+
+    // local rules
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup localGroup( config , "rules" );
+   
+    QStringList localRules;
+    
+    n = listWidget->count();
+    for(int i = 0; i < n; ++i)
+    {
+        QListWidgetItem *item = listWidget->takeItem(i);
+        localRules << item->text();
+    }
+    localGroup.writeEntry( "local-rules" , localRules );
+}
diff --git a/src/settings/adblockwidget.h b/src/settings/adblockwidget.h
new file mode 100644
index 00000000..67061800
--- /dev/null
+++ b/src/settings/adblockwidget.h
@@ -0,0 +1,56 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef ADBLOCK_WIDGET_H
+#define ADBLOCK_WIDGET_H
+
+
+#include "ui_settings_adblock.h"
+
+#include <QWidget>
+#include <QTreeWidgetItem>
+
+
+class AdBlockWidget : public QWidget, private Ui::adblock
+{
+Q_OBJECT
+
+public:
+    AdBlockWidget(QWidget *parent = 0);
+    
+    void save();
+    
+private slots:
+    void slotInfoLinkActivated(const QString &);
+    void insertRule();
+    void removeRule();
+
+private:
+    void load();
+    void loadRules(QTreeWidgetItem *item);
+};
+
+#endif // ADBLOCK_WIDGET_H
diff --git a/src/settings/settings_adblock.ui b/src/settings/settings_adblock.ui
new file mode 100644
index 00000000..28e1f973
--- /dev/null
+++ b/src/settings/settings_adblock.ui
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>adblock</class>
+ <widget class="QWidget" name="adblock">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>601</width>
+    <height>507</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QCheckBox" name="checkEnableAdblock">
+     <property name="text">
+      <string>&amp;Enable AdBlock</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkHideImages">
+     <property name="text">
+      <string>&amp;Hide filtered Elements</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="KTabWidget" name="tabWidget">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>Automatic Filters</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QTreeWidget" name="treeWidget">
+         <column>
+          <property name="text">
+           <string notr="true">1</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Automatic update interval:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spinBox">
+           <property name="value">
+            <number>7</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Manual Filters</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Search:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="KListWidgetSearchLine" name="searchLine"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="KListWidget" name="listWidget"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="hintLabel">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="KLineEdit" name="addFilterLineEdit"/>
+         </item>
+         <item>
+          <widget class="QToolButton" name="insertButton">
+           <property name="text">
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="removeButton">
+           <property name="text">
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KListWidget</class>
+   <extends>QListWidget</extends>
+   <header>klistwidget.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>ktabwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>KListWidgetSearchLine</class>
+   <extends>KLineEdit</extends>
+   <header>klistwidgetsearchline.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index e7a9d1e8..fa1e8891 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -36,12 +36,14 @@
 #include "application.h"
 #include "mainwindow.h"
 #include "webtab.h"
+#include "adblockwidget.h"
 
 //Ui Includes
 #include "ui_settings_general.h"
 #include "ui_settings_tabs.h"
 #include "ui_settings_fonts.h"
 #include "ui_settings_webkit.h"
+#include "ui_settings_adblock.h"
 
 // KDE Includes
 #include <KConfig>
@@ -63,12 +65,14 @@ private:
     Ui::tabs tabsUi;
     Ui::fonts fontsUi;
     Ui::webkit webkitUi;
+
+    AdBlockWidget *adBlockWidg;
     
     KCModuleProxy *proxyModule;
     KCModuleProxy *ebrowsingModule;
     KCModuleProxy *cookiesModule;
     KCModuleProxy *cacheModule;
-    KCModuleProxy *adblockModule;
+
     KShortcutsEditor *shortcutsEditor;
     
     Private(SettingsDialog *parent);
@@ -123,10 +127,10 @@ Private::Private(SettingsDialog *parent)
     KIcon webkitIcon = KIcon(QIcon(webkitIconPath));
     pageItem->setIcon(webkitIcon);
 
-    KCModuleInfo adblockInfo("khtml_filter.desktop");
-    adblockModule = new KCModuleProxy(adblockInfo,parent);
-    pageItem = parent->addPage(adblockModule, i18n(adblockInfo.moduleName().toLocal8Bit()));
-    pageItem->setIcon(KIcon(adblockInfo.icon()));
+    adBlockWidg = new AdBlockWidget(parent);
+    adBlockWidg->layout()->setMargin(0);
+    pageItem = parent->addPage(adBlockWidg , i18n("Ad Block"));
+    pageItem->setIcon( KIcon("preferences-web-browser-adblock") );
     
     shortcutsEditor = new KShortcutsEditor(Application::instance()->mainWindow()->actionCollection(), parent);
     pageItem = parent->addPage(shortcutsEditor , i18n("Shortcuts"));
@@ -137,7 +141,7 @@ Private::Private(SettingsDialog *parent)
     pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toLocal8Bit()));
     pageItem->setIcon(KIcon(ebrowsingInfo.icon()));
 
-    // WARNING remember wheh changing here that the smaller netbooks
+    // WARNING remember wheh changing here that the smallest netbooks
     // have a 1024x576 resolution. So DON'T bother that limits!!
     parent->setMinimumSize(700,525);    
 }
@@ -162,8 +166,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     connect(d->cookiesModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
     connect(d->proxyModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
     connect(d->cacheModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-    connect(d->adblockModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-    
+
     connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons()));
         
     connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
@@ -213,7 +216,7 @@ void SettingsDialog::saveSettings()
     d->proxyModule->save();
     d->cacheModule->save();
     d->shortcutsEditor->save();
-    d->adblockModule->save();
+    d->adBlockWidg->save();
 }
 
 
@@ -224,7 +227,6 @@ bool SettingsDialog::hasChanged()
             || d->cookiesModule->changed()
             || d->proxyModule->changed()
             || d->cacheModule->changed()
-            || d->adblockModule->changed()
             || d->shortcutsEditor->isModified();
             ;
 }
diff --git a/src/webpage.cpp b/src/webpage.cpp
index f1591cee..4caf5a83 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -352,15 +352,15 @@ void WebPage::downloadAllContentsWithKGet()
     QWebElementCollection images = mainFrame()->documentElement().findAll("img");
     foreach(QWebElement img, images)
     {
-	relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(),KUrl::TolerantMode); 
-	contents << baseUrl.resolved(relativeUrl).toString();
+        relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(),KUrl::TolerantMode); 
+        contents << baseUrl.resolved(relativeUrl).toString();
     }
     
     QWebElementCollection links = mainFrame()->documentElement().findAll("a");
     foreach(QWebElement link, links)
     {
-	relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(),KUrl::TolerantMode); 
-	contents << baseUrl.resolved(relativeUrl).toString();
+        relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(),KUrl::TolerantMode); 
+        contents << baseUrl.resolved(relativeUrl).toString();
     }
     
     if(!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kget"))
-- 
cgit v1.2.1


From 29e095b81d241a77f43bf4bf293d9428b6caea26 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 5 Mar 2010 23:10:20 +0100
Subject: Add middle click support for next, back and home in the main toolbar

---
 src/mainwindow.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++------
 src/mainwindow.h   |  3 +++
 2 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 60784af0..a2768bb6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -286,7 +286,8 @@ void MainWindow::setupActions()
     fullScreenShortcut.setAlternate( Qt::Key_F11 );
     a->setShortcut( fullScreenShortcut );
 
-    KStandardAction::home(this, SLOT(homePage()), actionCollection());
+    a = actionCollection()->addAction( KStandardAction::Home );
+    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(homePage(Qt::MouseButtons)));
     KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
 
     a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
@@ -345,14 +346,16 @@ void MainWindow::setupActions()
     connect(a, SIGNAL(triggered(bool)), this, SLOT(clearPrivateData()));
 
     // ========================= History related actions ==============================
-    a = KStandardAction::back(this, SLOT(openPrevious()) , actionCollection());
+    a = actionCollection()->addAction( KStandardAction::Back );
+    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(openPrevious(Qt::MouseButtons)));
 
     m_historyBackMenu = new KMenu(this);
     a->setMenu(m_historyBackMenu);
     connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowBackMenu()));
     connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(openActionUrl(QAction *)));
 
-    KStandardAction::forward(this, SLOT(openNext()) , actionCollection());
+    a = actionCollection()->addAction( KStandardAction::Forward );
+    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(openNext(Qt::MouseButtons)));
 
     // ============================== General Tab Actions ====================================
     a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this);
@@ -929,9 +932,18 @@ void MainWindow::viewPageSource()
 }
 
 
+void MainWindow::homePage(Qt::MouseButtons btn)
+{
+    if(btn == Qt::MidButton)
+        Application::instance()->loadUrl( KUrl(ReKonfig::homePage()), Rekonq::SettingOpenTab );
+    else
+        currentTab()->view()->load( QUrl(ReKonfig::homePage()) );
+}
+
+
 void MainWindow::homePage()
 {
-    currentTab()->view()->load( QUrl(ReKonfig::homePage()) );
+    homePage(Qt::LeftButton);
 }
 
 
@@ -973,18 +985,42 @@ void MainWindow::browserLoading(bool v)
 
 
 void MainWindow::openPrevious()
+{
+    openPrevious(Qt::LeftButton);
+}
+
+
+void MainWindow::openPrevious(Qt::MouseButtons btn)
 {
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoBack())
-        history->goToItem(history->backItem());
+    {
+        KUrl back = history->backItem().url();
+        if(btn == Qt::MidButton)
+            Application::instance()->loadUrl(back, Rekonq::SettingOpenTab);
+        else
+            Application::instance()->loadUrl(back);
+    }
 }
 
 
 void MainWindow::openNext()
+{
+    openNext(Qt::LeftButton);
+}
+
+
+void MainWindow::openNext(Qt::MouseButtons btn)
 {
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoForward())
-        history->goToItem(history->forwardItem());
+    {
+        KUrl next = history->forwardItem().url();
+        if(btn == Qt::MidButton)
+            Application::instance()->loadUrl(next, Rekonq::SettingOpenTab);
+        else
+            Application::instance()->loadUrl(next);
+    }
 }
 
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 57b88dfd..9e491c69 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -88,6 +88,7 @@ private:
     
 public slots:
     void homePage();
+    void homePage(Qt::MouseButtons);
 
     /**
      * Notifies a message in a popup
@@ -123,7 +124,9 @@ private slots:
 
     // history related
     void openPrevious();
+    void openPrevious(Qt::MouseButtons);
     void openNext();
+    void openNext(Qt::MouseButtons);
 
     // Find Action slots
     void find(const QString &);
-- 
cgit v1.2.1


From cf5d70ff31a166cb13f5c042f019e6193f97526d Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 00:06:27 +0100
Subject: Use default value instead of a different function

---
 src/mainwindow.cpp | 18 ------------------
 src/mainwindow.h   |  9 +++------
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a2768bb6..4b48157b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -941,12 +941,6 @@ void MainWindow::homePage(Qt::MouseButtons btn)
 }
 
 
-void MainWindow::homePage()
-{
-    homePage(Qt::LeftButton);
-}
-
-
 MainView *MainWindow::mainView() const
 {
     return m_view;
@@ -984,12 +978,6 @@ void MainWindow::browserLoading(bool v)
 }
 
 
-void MainWindow::openPrevious()
-{
-    openPrevious(Qt::LeftButton);
-}
-
-
 void MainWindow::openPrevious(Qt::MouseButtons btn)
 {
     QWebHistory *history = currentTab()->view()->history();
@@ -1004,12 +992,6 @@ void MainWindow::openPrevious(Qt::MouseButtons btn)
 }
 
 
-void MainWindow::openNext()
-{
-    openNext(Qt::LeftButton);
-}
-
-
 void MainWindow::openNext(Qt::MouseButtons btn)
 {
     QWebHistory *history = currentTab()->view()->history();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 9e491c69..b693fec1 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -87,8 +87,7 @@ private:
     void setupPanels();
     
 public slots:
-    void homePage();
-    void homePage(Qt::MouseButtons);
+    void homePage(Qt::MouseButtons = Qt::LeftButton);
 
     /**
      * Notifies a message in a popup
@@ -123,10 +122,8 @@ private slots:
     void updateWindowTitle(const QString &title = QString());
 
     // history related
-    void openPrevious();
-    void openPrevious(Qt::MouseButtons);
-    void openNext();
-    void openNext(Qt::MouseButtons);
+    void openPrevious(Qt::MouseButtons = Qt::LeftButton);
+    void openNext(Qt::MouseButtons = Qt::LeftButton);
 
     // Find Action slots
     void find(const QString &);
-- 
cgit v1.2.1


From 8217910b1bee1aeb826257be86f9e1010b6f9443 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Mar 2010 00:18:00 +0100
Subject: Changed createRequest method for KIO debugging purposes..

---
 src/networkaccessmanager.cpp | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index e6dd6d85..77597cef 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -42,12 +42,41 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData)
 {
-    // Adblock
-    if (op == QNetworkAccessManager::GetOperation)
+    QNetworkReply *reply = 0;
+    
+    switch(op)
     {
-        QNetworkReply *reply = Application::adblockManager()->block(req);
+    case QNetworkAccessManager::HeadOperation:
+        kDebug() << "HEAD OPERATION";
+        if(outgoingData)
+        {
+            QByteArray outgoingDataByteArray = outgoingData->peek(1024 * 1024);
+            kDebug() << outgoingDataByteArray;
+        }
+        break;
+    
+    case QNetworkAccessManager::GetOperation:
+        kDebug() << "GET OPERATION";
+        reply = Application::adblockManager()->block(req);
         if (reply)
             return reply;
+        break;
+    
+    case QNetworkAccessManager::PutOperation:
+        kDebug() << "PUT OPERATION";
+        break;
+    
+    case QNetworkAccessManager::PostOperation:
+        kDebug() << "POST OPERATION";
+        break;
+    
+    case QNetworkAccessManager::DeleteOperation:
+        kDebug() << "DELETE OPERATION";
+        break;
+        
+    default:
+        kDebug() << "UNKNOWN OPERATION";
+        break;
     }
 
     return AccessManager::createRequest(op,req,outgoingData);
-- 
cgit v1.2.1


From 26eb96169454a41d0c3306b6329e8751882a2d1e Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 12:47:08 +0100
Subject: Implement the highlight all feature for the find bar (enabled by
 default)

---
 src/findbar.cpp    | 26 ++++++++++++++++++++------
 src/findbar.h      |  4 +++-
 src/mainwindow.cpp | 20 ++++++++++++++++++++
 src/mainwindow.h   |  1 +
 4 files changed, 44 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 4c780aca..94def263 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -52,9 +52,13 @@
 FindBar::FindBar(QWidget *parent)
         : QWidget(parent)
         , m_lineEdit(new KLineEdit(this))
-        , m_matchCase(new QCheckBox(i18n("&Match case"), this))
         , m_hideTimer(new QTimer(this))
-{
+        , m_matchCase(new QCheckBox(i18n("&Match case"), this))
+        , m_highlightAll(new QCheckBox(i18n("&Highlight All"), this))
+{    
+    // mainwindow pointer
+    MainWindow *window = qobject_cast<MainWindow *>(parent);
+    
     QHBoxLayout *layout = new QHBoxLayout;
 
     // cosmetic
@@ -65,6 +69,7 @@ FindBar::FindBar(QWidget *parent)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
+    connect(hideButton, SIGNAL(clicked()), window, SLOT(highlightAll()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
@@ -75,9 +80,6 @@ FindBar::FindBar(QWidget *parent)
     QLabel *label = new QLabel(i18n("Find:"));
     layout->addWidget(label);
 
-    // mainwindow pointer
-    MainWindow *window = qobject_cast<MainWindow *>(parent);
-    
     // lineEdit, focusProxy
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
@@ -92,13 +94,19 @@ FindBar::FindBar(QWidget *parent)
     connect(findPrev, SIGNAL(clicked()), window, SLOT(findPrevious()));
     layout->addWidget(findNext);
     layout->addWidget(findPrev);
-
+    
     // Case sensitivity. Deliberately set so this is off by default.
     m_matchCase->setCheckState(Qt::Unchecked);
     m_matchCase->setTristate(false);
     connect(m_matchCase, SIGNAL(toggled(bool)), window, SLOT(matchCaseUpdate()));
     layout->addWidget(m_matchCase);
 
+    // Hightlight All. On by default
+    m_highlightAll->setCheckState(Qt::Checked);
+    m_highlightAll->setTristate(false);
+    connect(m_highlightAll, SIGNAL(toggled(bool)), window, SLOT(highlightAll()));
+    layout->addWidget(m_highlightAll);
+
     // stretching widget on the left
     layout->addStretch();
 
@@ -126,6 +134,12 @@ bool FindBar::matchCase() const
 }
 
 
+bool FindBar::highlightAllState() const
+{
+    return m_highlightAll->isChecked();
+}
+
+
 void FindBar::show()
 {
     // show findbar if not visible
diff --git a/src/findbar.h b/src/findbar.h
index 7a4efc59..78615f9a 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -53,6 +53,7 @@ public:
     KLineEdit *lineEdit() const;
     bool matchCase() const;
     void notifyMatch(bool match);
+    bool highlightAllState() const;
 
 public slots:
     void show();
@@ -63,8 +64,9 @@ signals:
 
 private:
     KLineEdit *m_lineEdit;
-    QCheckBox *m_matchCase;
     QTimer *m_hideTimer;
+    QCheckBox *m_matchCase;
+    QCheckBox *m_highlightAll;
 };
 
 #endif
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 60784af0..e90a5903 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -794,6 +794,8 @@ void MainWindow::findNext()
         return;
     }
     
+    highlightAll();
+    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
@@ -823,6 +825,24 @@ void MainWindow::findPrevious()
     m_findBar->notifyMatch(found);
 }
 
+void MainWindow::highlightAll()
+{
+    if (!currentTab())
+        return;
+    
+    QWebPage::FindFlags options = QWebPage::HighlightAllOccurrences;
+    
+    currentTab()->view()->findText("", options); //Clear an existing highlight
+    
+    if(m_findBar->highlightAllState() && !m_findBar->isHidden())
+    {
+	if (m_findBar->matchCase())
+	    options |= QWebPage::FindCaseSensitively;
+
+        currentTab()->view()->findText(m_lastSearch, options);
+    }
+}
+
 
 void MainWindow::zoomIn()
 {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 57b88dfd..e9da090d 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -130,6 +130,7 @@ private slots:
     void matchCaseUpdate();
     void findNext();
     void findPrevious();
+    void highlightAll();
 
     // Zoom slots
     void zoomIn();
-- 
cgit v1.2.1


From e1877d4f49ef414182f37448e1338822e5c77517 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 15:46:55 +0100
Subject: Fix capitalisation of "Highlight All"

---
 src/findbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 94def263..7cbe9d17 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -54,7 +54,7 @@ FindBar::FindBar(QWidget *parent)
         , m_lineEdit(new KLineEdit(this))
         , m_hideTimer(new QTimer(this))
         , m_matchCase(new QCheckBox(i18n("&Match case"), this))
-        , m_highlightAll(new QCheckBox(i18n("&Highlight All"), this))
+        , m_highlightAll(new QCheckBox(i18n("&Highlight all"), this))
 {    
     // mainwindow pointer
     MainWindow *window = qobject_cast<MainWindow *>(parent);
-- 
cgit v1.2.1


From 65f0f138d29e1f34626d8a25683bfe0a059fb8dc Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 23:34:45 +0100
Subject: Clear all the highlight when the find bar is closed with the esc key

---
 src/findbar.cpp    | 1 -
 src/mainwindow.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 7cbe9d17..c97fd1f9 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -69,7 +69,6 @@ FindBar::FindBar(QWidget *parent)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(hideButton, SIGNAL(clicked()), window, SLOT(highlightAll()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e90a5903..b5df7acb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -786,6 +786,8 @@ void MainWindow::findNext()
     if (!currentTab())
         return;
 
+    highlightAll();
+    
     if(m_findBar->isHidden())
     {
         QPoint previous_position = currentTab()->view()->page()->currentFrame()->scrollPosition();
@@ -794,8 +796,6 @@ void MainWindow::findNext()
         return;
     }
     
-    highlightAll();
-    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
-- 
cgit v1.2.1


From cc58fe53816a3033e0a71c6db9826eaf2de69934 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Mon, 15 Mar 2010 00:03:10 +0100
Subject: Close the tab preview when the tab is clicked

---
 src/tabbar.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 80782116..44972548 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -244,6 +244,15 @@ void TabBar::leaveEvent(QEvent *event)
 
 void TabBar::mousePressEvent(QMouseEvent *event)
 {
+    if (ReKonfig::alwaysShowTabPreviews())
+    {
+        if ( !m_previewPopup.isNull() )
+        {
+            m_previewPopup.data()->hide();
+        }
+        m_currentTabPreview = -1;
+    }
+
     // just close tab on middle mouse click
     if (event->button() == Qt::MidButton)
         return;
-- 
cgit v1.2.1


From ae8aceced59f5d8721e986e7fc1c66c9026e87df Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 15 Mar 2010 00:38:50 +0100
Subject: Created a new Network Widget containing Cache, Cookies & Proxy
 Settings. This for multiple purposes: - clean a bit our settings dialog.
 Network settings are usually the less used - Provide a unique place where
 managing the settings network related. This to implement (one day) some
 better Ui to manage them.

This commit also fixes all the handling with the network & the adblock widgets
related to updating buttons and settings Ui at the beginning.
---
 src/CMakeLists.txt               |  1 +
 src/settings/adblockwidget.cpp   | 36 ++++++++++++++-
 src/settings/adblockwidget.h     | 10 ++++
 src/settings/networkwidget.cpp   | 98 ++++++++++++++++++++++++++++++++++++++++
 src/settings/networkwidget.h     | 63 ++++++++++++++++++++++++++
 src/settings/settings_adblock.ui |  2 +-
 src/settings/settingsdialog.cpp  | 52 ++++++++-------------
 7 files changed, 226 insertions(+), 36 deletions(-)
 create mode 100644 src/settings/networkwidget.cpp
 create mode 100644 src/settings/networkwidget.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f05bbbdb..7d0c1639 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,6 +35,7 @@ SET( rekonq_KDEINIT_SRCS
     #----------------------------------------
     settings/settingsdialog.cpp
     settings/adblockwidget.cpp
+    settings/networkwidget.cpp
     #----------------------------------------
     bookmarks/bookmarksmanager.cpp
     bookmarks/bookmarkspanel.cpp
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index 45e5fd5c..8aac3e8c 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -24,15 +24,19 @@
 * ============================================================ */
 
 
+// Self Includes
 #include "adblockwidget.h"
 #include "adblockwidget.moc"
 
+// Auto Includes
 #include "rekonq.h"
 
+// KDE Includes
 #include <KSharedConfig>
 #include <KIcon>
 #include <KDebug>
 
+// Qt Includes
 #include <QString>
 #include <QWhatsThis>
 #include <QListWidgetItem>
@@ -40,6 +44,7 @@
 
 AdBlockWidget::AdBlockWidget(QWidget *parent)
     : QWidget(parent)
+    , _changed(false)
 {
     setupUi(this);
     
@@ -53,11 +58,18 @@ AdBlockWidget::AdBlockWidget(QWidget *parent)
     
     insertButton->setIcon( KIcon("list-add") );
     connect( insertButton, SIGNAL( clicked() ), this, SLOT( insertRule() ) );
-        
+            
     removeButton->setIcon( KIcon("list-remove") );
     connect( removeButton, SIGNAL( clicked() ), this, SLOT( removeRule() ) );
     
     load();
+    
+    // emit changed signal
+    connect( insertButton,       SIGNAL( clicked() ),           this, SLOT( hasChanged() ) );
+    connect( removeButton,       SIGNAL( clicked() ),           this, SLOT( hasChanged() ) );
+    connect( checkEnableAdblock, SIGNAL( stateChanged(int) ),   this, SLOT( hasChanged() ) );
+    connect( checkHideAds,       SIGNAL( stateChanged(int) ),   this, SLOT( hasChanged() ) );
+    connect( spinBox,            SIGNAL( valueChanged(int) ),   this, SLOT( hasChanged() ) );
 }
 
 
@@ -98,7 +110,10 @@ void AdBlockWidget::load()
     checkEnableAdblock->setChecked(isAdBlockEnabled);
     
     bool areImageFiltered = ReKonfig::hideAdsEnabled();
-    checkHideImages->setChecked(areImageFiltered);
+    checkHideAds->setChecked(areImageFiltered);
+    
+    int days = ReKonfig::updateInterval();
+    spinBox->setValue( days );
     
     QStringList subscriptions = ReKonfig::subscriptionNames();
 
@@ -155,4 +170,21 @@ void AdBlockWidget::save()
         localRules << item->text();
     }
     localGroup.writeEntry( "local-rules" , localRules );
+
+    ReKonfig::setAdBlockEnabled( checkEnableAdblock->isChecked() );
+    ReKonfig::setHideAdsEnabled( checkHideAds->isChecked() );
+    ReKonfig::setUpdateInterval( spinBox->value() );
+}
+
+
+void AdBlockWidget::hasChanged()
+{
+    _changed = true;
+    emit changed(true);
+}
+
+
+bool AdBlockWidget::changed()
+{
+    return _changed;
 }
diff --git a/src/settings/adblockwidget.h b/src/settings/adblockwidget.h
index 67061800..7e641f3e 100644
--- a/src/settings/adblockwidget.h
+++ b/src/settings/adblockwidget.h
@@ -28,8 +28,10 @@
 #define ADBLOCK_WIDGET_H
 
 
+// Ui Includes
 #include "ui_settings_adblock.h"
 
+// Qt Includes
 #include <QWidget>
 #include <QTreeWidgetItem>
 
@@ -42,8 +44,14 @@ public:
     AdBlockWidget(QWidget *parent = 0);
     
     void save();
+    bool changed();
+    
+signals:
+    void changed(bool);
     
 private slots:
+    void hasChanged();
+    
     void slotInfoLinkActivated(const QString &);
     void insertRule();
     void removeRule();
@@ -51,6 +59,8 @@ private slots:
 private:
     void load();
     void loadRules(QTreeWidgetItem *item);
+
+    bool _changed;
 };
 
 #endif // ADBLOCK_WIDGET_H
diff --git a/src/settings/networkwidget.cpp b/src/settings/networkwidget.cpp
new file mode 100644
index 00000000..2f5948cf
--- /dev/null
+++ b/src/settings/networkwidget.cpp
@@ -0,0 +1,98 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "networkwidget.h"
+#include "networkwidget.moc"
+
+// KDE Includes
+#include <KTabWidget>
+#include <KCModuleInfo>
+#include <KDebug>
+
+// Qt Includes
+#include <QVBoxLayout>
+
+
+NetworkWidget::NetworkWidget(QWidget *parent)
+    : QWidget(parent)
+    , _cacheModule(0)
+    , _cookiesModule(0)
+    , _proxyModule(0)
+    , _changed(false)
+{
+    QVBoxLayout *l = new QVBoxLayout(this);
+    l->setMargin(0);
+    l->setSpacing(0);
+    
+    KTabWidget *tabWidget = new KTabWidget(this);
+    l->addWidget(tabWidget);
+
+    KCModuleInfo cacheInfo("cache.desktop");                                                                              
+    _cacheModule = new KCModuleProxy(cacheInfo,parent);
+    tabWidget->addTab( _cacheModule, i18n(cacheInfo.moduleName().toLocal8Bit()) );
+    
+    KCModuleInfo cookiesInfo("cookies.desktop");
+    _cookiesModule = new KCModuleProxy(cookiesInfo,parent);
+    tabWidget->addTab( _cookiesModule, i18n(cookiesInfo.moduleName().toLocal8Bit()) );                              
+                                                                                                                      
+    KCModuleInfo proxyInfo("proxy.desktop");                                                                              
+    _proxyModule = new KCModuleProxy(proxyInfo,parent);
+    tabWidget->addTab( _proxyModule, i18n(proxyInfo.moduleName().toLocal8Bit()) );
+
+    connect(_cacheModule,   SIGNAL( changed(bool) ), this, SLOT( hasChanged() ) );
+    connect(_cookiesModule, SIGNAL( changed(bool) ), this, SLOT( hasChanged() ) );
+    connect(_proxyModule,   SIGNAL( changed(bool) ), this, SLOT( hasChanged() ) );
+}
+
+
+NetworkWidget::~NetworkWidget()
+{
+    delete _cacheModule;
+    delete _cookiesModule;
+    delete _proxyModule;
+}
+
+
+void NetworkWidget::save()
+{
+    _cookiesModule->save();
+    _proxyModule->save();
+    _cacheModule->save();
+}
+
+
+void NetworkWidget::hasChanged()
+{
+    _changed = true;
+    emit changed(true);
+}
+
+
+bool NetworkWidget::changed()
+{
+    return _changed;
+}
diff --git a/src/settings/networkwidget.h b/src/settings/networkwidget.h
new file mode 100644
index 00000000..efdd1807
--- /dev/null
+++ b/src/settings/networkwidget.h
@@ -0,0 +1,63 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef NETWORK_WIDGET_H
+#define NETWORK_WIDGET_H
+
+
+// KDE Includes
+#include <KCModuleProxy>
+
+// Qt Includes
+#include <QWidget>
+
+
+class NetworkWidget : public QWidget
+{
+Q_OBJECT
+
+public:
+    NetworkWidget(QWidget *parent = 0);
+    ~NetworkWidget();
+       
+    void save();
+    bool changed();
+
+signals:
+    void changed(bool);
+
+private slots:
+    void hasChanged();
+    
+private:
+    KCModuleProxy *_cacheModule;
+    KCModuleProxy *_cookiesModule;
+    KCModuleProxy *_proxyModule;
+
+    bool _changed;
+};
+
+#endif // NETWORK_WIDGET_H
diff --git a/src/settings/settings_adblock.ui b/src/settings/settings_adblock.ui
index 28e1f973..445431c5 100644
--- a/src/settings/settings_adblock.ui
+++ b/src/settings/settings_adblock.ui
@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="checkHideImages">
+    <widget class="QCheckBox" name="checkHideAds">
      <property name="text">
       <string>&amp;Hide filtered Elements</string>
      </property>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index fa1e8891..08d5ca6e 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -37,13 +37,13 @@
 #include "mainwindow.h"
 #include "webtab.h"
 #include "adblockwidget.h"
+#include "networkwidget.h"
 
 //Ui Includes
 #include "ui_settings_general.h"
 #include "ui_settings_tabs.h"
 #include "ui_settings_fonts.h"
 #include "ui_settings_webkit.h"
-#include "ui_settings_adblock.h"
 
 // KDE Includes
 #include <KConfig>
@@ -67,11 +67,9 @@ private:
     Ui::webkit webkitUi;
 
     AdBlockWidget *adBlockWidg;
+    NetworkWidget *networkWidg;
     
-    KCModuleProxy *proxyModule;
     KCModuleProxy *ebrowsingModule;
-    KCModuleProxy *cookiesModule;
-    KCModuleProxy *cacheModule;
 
     KShortcutsEditor *shortcutsEditor;
     
@@ -103,21 +101,6 @@ Private::Private(SettingsDialog *parent)
     widget->layout()->setMargin(0);
     pageItem = parent->addPage(widget , i18n("Fonts"));
     pageItem->setIcon(KIcon("preferences-desktop-font"));
-
-    KCModuleInfo cookiesInfo("cookies.desktop");
-    cookiesModule = new KCModuleProxy(cookiesInfo,parent);
-    pageItem = parent->addPage(cookiesModule, i18n(cookiesInfo.moduleName().toLocal8Bit()));
-    pageItem->setIcon(KIcon(cookiesInfo.icon()));
-
-    KCModuleInfo proxyInfo("proxy.desktop");
-    proxyModule = new KCModuleProxy(proxyInfo,parent);
-    pageItem = parent->addPage(proxyModule, i18n(proxyInfo.moduleName().toLocal8Bit()));
-    pageItem->setIcon(KIcon(proxyInfo.icon()));
-
-    KCModuleInfo cacheInfo("cache.desktop");
-    cacheModule = new KCModuleProxy(cacheInfo,parent);
-    pageItem = parent->addPage(cacheModule, i18n(cacheInfo.moduleName().toLocal8Bit()));
-    pageItem->setIcon(KIcon(cacheInfo.icon()));
         
     widget = new QWidget;
     webkitUi.setupUi(widget);
@@ -127,6 +110,11 @@ Private::Private(SettingsDialog *parent)
     KIcon webkitIcon = KIcon(QIcon(webkitIconPath));
     pageItem->setIcon(webkitIcon);
 
+    networkWidg = new NetworkWidget(parent);
+    networkWidg->layout()->setMargin(0);
+    pageItem = parent->addPage(networkWidg , i18n("Network"));
+    pageItem->setIcon( KIcon("preferences-system-network") );
+    
     adBlockWidg = new AdBlockWidget(parent);
     adBlockWidg->layout()->setMargin(0);
     pageItem = parent->addPage(adBlockWidg , i18n("Ad Block"));
@@ -162,15 +150,16 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 
     connect(d->generalUi.setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage()));
     
+    // update buttons
+    connect(d->adBlockWidg,     SIGNAL(changed(bool)), this, SLOT(updateButtons()));
+    connect(d->networkWidg,     SIGNAL(changed(bool)), this, SLOT(updateButtons()));
     connect(d->ebrowsingModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-    connect(d->cookiesModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-    connect(d->proxyModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-    connect(d->cacheModule, SIGNAL(changed(bool)), this, SLOT(updateButtons()));
-
-    connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons()));
-        
+    
+    connect(d->shortcutsEditor, SIGNAL(keyChange()),   this, SLOT(updateButtons()));
+    
+    // save settings
     connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
-    connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings()));
+    connect(this, SIGNAL(okClicked()),    this, SLOT(saveSettings()));
         
     setWebSettingsToolTips();
 }
@@ -212,21 +201,18 @@ void SettingsDialog::saveSettings()
 {
     ReKonfig::self()->writeConfig();
     d->ebrowsingModule->save();
-    d->cookiesModule->save();
-    d->proxyModule->save();
-    d->cacheModule->save();
     d->shortcutsEditor->save();
     d->adBlockWidg->save();
+    d->networkWidg->save();
 }
 
 
 bool SettingsDialog::hasChanged()
 {
     return KConfigDialog::hasChanged() 
-            || d->ebrowsingModule->changed()            
-            || d->cookiesModule->changed()
-            || d->proxyModule->changed()
-            || d->cacheModule->changed()
+            || d->adBlockWidg->changed()
+            || d->networkWidg->changed()
+            || d->ebrowsingModule->changed()
             || d->shortcutsEditor->isModified();
             ;
 }
-- 
cgit v1.2.1


From cb3c582272a729bd49f072f8ffe67beecc31df35 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 12:47:08 +0100
Subject: Implement the highlight all feature for the find bar (enabled by
 default)

---
 src/findbar.cpp    | 26 ++++++++++++++++++++------
 src/findbar.h      |  4 +++-
 src/mainwindow.cpp | 20 ++++++++++++++++++++
 src/mainwindow.h   |  1 +
 4 files changed, 44 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 4c780aca..94def263 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -52,9 +52,13 @@
 FindBar::FindBar(QWidget *parent)
         : QWidget(parent)
         , m_lineEdit(new KLineEdit(this))
-        , m_matchCase(new QCheckBox(i18n("&Match case"), this))
         , m_hideTimer(new QTimer(this))
-{
+        , m_matchCase(new QCheckBox(i18n("&Match case"), this))
+        , m_highlightAll(new QCheckBox(i18n("&Highlight All"), this))
+{    
+    // mainwindow pointer
+    MainWindow *window = qobject_cast<MainWindow *>(parent);
+    
     QHBoxLayout *layout = new QHBoxLayout;
 
     // cosmetic
@@ -65,6 +69,7 @@ FindBar::FindBar(QWidget *parent)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
+    connect(hideButton, SIGNAL(clicked()), window, SLOT(highlightAll()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
@@ -75,9 +80,6 @@ FindBar::FindBar(QWidget *parent)
     QLabel *label = new QLabel(i18n("Find:"));
     layout->addWidget(label);
 
-    // mainwindow pointer
-    MainWindow *window = qobject_cast<MainWindow *>(parent);
-    
     // lineEdit, focusProxy
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
@@ -92,13 +94,19 @@ FindBar::FindBar(QWidget *parent)
     connect(findPrev, SIGNAL(clicked()), window, SLOT(findPrevious()));
     layout->addWidget(findNext);
     layout->addWidget(findPrev);
-
+    
     // Case sensitivity. Deliberately set so this is off by default.
     m_matchCase->setCheckState(Qt::Unchecked);
     m_matchCase->setTristate(false);
     connect(m_matchCase, SIGNAL(toggled(bool)), window, SLOT(matchCaseUpdate()));
     layout->addWidget(m_matchCase);
 
+    // Hightlight All. On by default
+    m_highlightAll->setCheckState(Qt::Checked);
+    m_highlightAll->setTristate(false);
+    connect(m_highlightAll, SIGNAL(toggled(bool)), window, SLOT(highlightAll()));
+    layout->addWidget(m_highlightAll);
+
     // stretching widget on the left
     layout->addStretch();
 
@@ -126,6 +134,12 @@ bool FindBar::matchCase() const
 }
 
 
+bool FindBar::highlightAllState() const
+{
+    return m_highlightAll->isChecked();
+}
+
+
 void FindBar::show()
 {
     // show findbar if not visible
diff --git a/src/findbar.h b/src/findbar.h
index 7a4efc59..78615f9a 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -53,6 +53,7 @@ public:
     KLineEdit *lineEdit() const;
     bool matchCase() const;
     void notifyMatch(bool match);
+    bool highlightAllState() const;
 
 public slots:
     void show();
@@ -63,8 +64,9 @@ signals:
 
 private:
     KLineEdit *m_lineEdit;
-    QCheckBox *m_matchCase;
     QTimer *m_hideTimer;
+    QCheckBox *m_matchCase;
+    QCheckBox *m_highlightAll;
 };
 
 #endif
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4b48157b..a459cc78 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -797,6 +797,8 @@ void MainWindow::findNext()
         return;
     }
     
+    highlightAll();
+    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
@@ -826,6 +828,24 @@ void MainWindow::findPrevious()
     m_findBar->notifyMatch(found);
 }
 
+void MainWindow::highlightAll()
+{
+    if (!currentTab())
+        return;
+    
+    QWebPage::FindFlags options = QWebPage::HighlightAllOccurrences;
+    
+    currentTab()->view()->findText("", options); //Clear an existing highlight
+    
+    if(m_findBar->highlightAllState() && !m_findBar->isHidden())
+    {
+	if (m_findBar->matchCase())
+	    options |= QWebPage::FindCaseSensitively;
+
+        currentTab()->view()->findText(m_lastSearch, options);
+    }
+}
+
 
 void MainWindow::zoomIn()
 {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index b693fec1..4ccd7bf3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -130,6 +130,7 @@ private slots:
     void matchCaseUpdate();
     void findNext();
     void findPrevious();
+    void highlightAll();
 
     // Zoom slots
     void zoomIn();
-- 
cgit v1.2.1


From ce0689fc4a3bd27d46dc81b95ff94b0f53ccfff4 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 15:46:55 +0100
Subject: Fix capitalisation of "Highlight All"

---
 src/findbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 94def263..7cbe9d17 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -54,7 +54,7 @@ FindBar::FindBar(QWidget *parent)
         , m_lineEdit(new KLineEdit(this))
         , m_hideTimer(new QTimer(this))
         , m_matchCase(new QCheckBox(i18n("&Match case"), this))
-        , m_highlightAll(new QCheckBox(i18n("&Highlight All"), this))
+        , m_highlightAll(new QCheckBox(i18n("&Highlight all"), this))
 {    
     // mainwindow pointer
     MainWindow *window = qobject_cast<MainWindow *>(parent);
-- 
cgit v1.2.1


From c4a3ac8eb53f109a3da1f53f279fc86edcb92597 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 16 Mar 2010 01:45:50 +0100
Subject: First bunch of fixes for the NewTabPage + WebSnap chain. It seems
 clear (to me) that they leaks memory, so they urgently need fixes. And a
 complete redesign. This is just a first (the easiest) part of it: - Removed
 some unuseful methods, - Added some documentation for the WebSnap class -
 Cleaned code, in general

---
 src/application.cpp                   |  2 +-
 src/rekonqpage/newtabpage.cpp         |  5 +---
 src/rekonqpage/newtabpage.h           | 24 ++++++++++--------
 src/rekonqpage/previewselectorbar.cpp |  6 ++---
 src/tabbar.cpp                        |  2 +-
 src/websnap.cpp                       | 46 +++++++++++++----------------------
 src/websnap.h                         | 25 ++++++++++---------
 7 files changed, 50 insertions(+), 60 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 96254e07..b8d6f52f 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -353,7 +353,7 @@ MainWindow *Application::newMainWindow()
 
 void Application::removeMainWindow(MainWindow *window)
 {
-    m_mainWindows.removeAt(m_mainWindows.indexOf(window, 0));
+    m_mainWindows.removeOne(window);
 }
 
 
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
index 845dcf51..6fd5160d 100644
--- a/src/rekonqpage/newtabpage.cpp
+++ b/src/rekonqpage/newtabpage.cpp
@@ -56,7 +56,6 @@
 
 NewTabPage::NewTabPage(QWebFrame *frame)
     : m_root(frame->documentElement())
-    , m_url(KUrl())
 {
     QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
     QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");    
@@ -98,7 +97,7 @@ void NewTabPage::generate(KUrl url)
     }
     
     QWebPage *page = m_root.webFrame()->page();
-    page->mainFrame()->setHtml(m_html,m_url);
+    page->mainFrame()->setHtml(m_html);
 
     m_root = page->mainFrame()->documentElement().findFirst("#content");
     
@@ -109,7 +108,6 @@ void NewTabPage::generate(KUrl url)
     {
         favoritesPage();
         title = i18n("Favorites");
-        url = KUrl("about:favorites");
     }
     else if(url == KUrl("about:closedTabs"))
     {
@@ -127,7 +125,6 @@ void NewTabPage::generate(KUrl url)
         title = i18n("Bookmarks");
     }
     
-    m_url = url;
     m_root.document().findFirst("title").setPlainText(title);
 }
 
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
index d4c57299..fd04e60a 100644
--- a/src/rekonqpage/newtabpage.h
+++ b/src/rekonqpage/newtabpage.h
@@ -62,7 +62,8 @@ public:
     void snapFinished(int index, KUrl url, QString title);
     void removePreview(int index);
      
-protected:  // these are the function to build the new tab page
+protected:  
+    // these are the functions to build the new tab page
     void browsingMenu(const KUrl &currentUrl);
 
     void favoritesPage();
@@ -70,13 +71,15 @@ protected:  // these are the function to build the new tab page
     void bookmarksPage();
     void closedTabsPage();
 
+    // Previews handling
     QWebElement emptyPreview(int index);
     QWebElement loadingPreview(int index, KUrl url);
     QWebElement validPreview(int index, KUrl url, QString title);
     
-    /** This function takes a QwebElement with the .thumbnail structure.
-        It hides the "remove" and "modify" buttons->
-    */
+    /** This function takes a QwebElement with the .thumbnail structure,
+     *  hiding the "remove" and "modify" buttons
+     *
+     */
     void hideControls(QWebElement e);
     void showControls(QWebElement e);
     void setupPreview(QWebElement e, int index);
@@ -84,10 +87,13 @@ protected:  // these are the function to build the new tab page
 private:
     void createBookItem(const KBookmark &bookmark, QWebElement parent);
     
-    /** This function helps to get faster a new markup of one type,it isn't easy to create one with QWebElement.
-        It gets it in the #models div of home.html.
-        It works for all elements defined here.
-    */
+    /** This function helps to get faster a new markup of one type,
+     *  it isn't easy to create one with QWebElement.
+     *
+     *  It gets it in the #models div of home.html.
+     *  It works for all elements defined here.
+     *
+     */
     inline QWebElement markup(QString selector) 
     {
        return m_root.document().findFirst("#models > " + selector).clone();
@@ -98,8 +104,6 @@ private:
     QString m_html;
     
     QWebElement m_root;
-    
-    KUrl m_url;
 };
 
 #endif // REKONQ_NEW_TAB_PAGE
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
index d7676e3c..924a5439 100644
--- a/src/rekonqpage/previewselectorbar.cpp
+++ b/src/rekonqpage/previewselectorbar.cpp
@@ -119,10 +119,10 @@ void PreviewSelectorBar::clicked()
     
     if(page)
     {
-        KUrl url = page->mainFrame()->url();
-
-        WebSnap::savePreview(WebSnap::renderPreview(*page), url);
+        // this is done just lo let the render process being faster..
+        WebSnap::renderPreview(*page);
         
+        KUrl url = page->mainFrame()->url();        
         QStringList names = ReKonfig::previewNames();
         QStringList urls = ReKonfig::previewUrls();
         
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 44972548..0f4e1064 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -170,7 +170,7 @@ void TabBar::showTabPreview(int tab)
     m_previewPopup.data()->setFixedSize(w, h);
     
     QLabel *l = new QLabel();
-    l->setPixmap( WebSnap::renderPreview( *indexedTab->page() , w, h) );
+    l->setPixmap( WebSnap::renderPreview( *indexedTab->page(), w, h, false) );
     
     m_previewPopup.data()->setView(l);
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
diff --git a/src/websnap.cpp b/src/websnap.cpp
index ceb24b4f..906bbc1e 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -60,15 +60,11 @@ WebSnap::WebSnap(const QUrl& url, QWebFrame *frame, int index)
     m_page.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
 
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
+    
     QTimer::singleShot(0, this, SLOT(load()));
 }
 
 
-WebSnap::~WebSnap()
-{
-}
-
-
 void WebSnap::load()
 {
     m_page.mainFrame()->load(m_url);
@@ -77,7 +73,7 @@ void WebSnap::load()
 
 // NOTE please, be careful modifying this. 
 // You are playing with fire..
-QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
+QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h, bool save)
 {
     // prepare page
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
@@ -87,7 +83,10 @@ QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
     // find the best size
     QSize size;
     int width = page.mainFrame()->contentsSize().width();
-    if (width < 640) width = 640;
+    if (width < 640) 
+    {
+        width = 640;
+    }
     size = QSize(width,width*((0.0+h)/w));
     page.setViewportSize(size);
     
@@ -106,15 +105,16 @@ QPixmap WebSnap::renderPreview(const QWebPage &page, int w, int h)
     page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
     page.setViewportSize(oldSize);
     
-    return QPixmap::fromImage(pageImage);
-}
-
-
-void WebSnap::savePreview(QPixmap pm, KUrl url)
-{
-    kDebug() << "saving preview";
-    QFile::remove(fileForUrl(url).toLocalFile());
-    pm.save(fileForUrl(url).toLocalFile());
+    QPixmap pm = QPixmap::fromImage(pageImage);
+    if(save)
+    {
+        KUrl url( page.mainFrame()->url() );
+        kDebug() << "saving preview";
+        QFile::remove( fileForUrl(url).toLocalFile() );
+        pm.save(fileForUrl(url).toLocalFile());
+    }
+    
+    return pm;
 }
 
 
@@ -164,7 +164,7 @@ void WebSnap::saveResult(bool ok)
     NewTabPage p( m_frame );
     p.snapFinished(m_previewIndex, m_url, m_snapTitle);
     
-    deleteLater();
+    this->deleteLater();
 }
 
 
@@ -172,15 +172,3 @@ QString WebSnap::snapTitle()
 {
     return m_page.mainFrame()->title();
 }
-
-
-QUrl WebSnap::snapUrl()
-{
-    return m_url;
-}
-
-
-QPixmap WebSnap::previewImage()
-{
-    return m_image;
-}
diff --git a/src/websnap.h b/src/websnap.h
index 49b60769..73ed04ca 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -46,9 +46,17 @@
 
 
 /**
- * This class renders a site producing an image based
- * on that.
+ * This class is used in many classes of rekonq to produce an image 
+ * based on the site corresponding to the url passed as argument.
+ * It also cached the images to not retrieve them everytime :)
+ *
  * Heavily based on Graphics-Dojo WebSnap example (thanks!)
+ *
+ * We use this in the following rekonq classes:
+ * - TabBar class:          to show a tab preview                (given a page, you show WITHOUT saving an image)
+ * - NewTabPage class:      to show the favorites page "preview" (given an url, you show AND save an image)
+ * - PreviewSelector class: to save new favorite selection       (given a page, you show AND save an image)
+ *
  */
 class REKONQ_TESTS_EXPORT WebSnap : public QObject
 {
@@ -56,20 +64,13 @@ class REKONQ_TESTS_EXPORT WebSnap : public QObject
 
 public:
     WebSnap(const QUrl &url, QWebFrame *frame, int index);
-    ~WebSnap();
-    
-    QPixmap previewImage(); // TODO : remove
-    
-    static QPixmap renderPreview(const QWebPage &page, int w = WIDTH, int h = HEIGHT);
-    
+       
+    static QPixmap renderPreview(const QWebPage &page, int w = WIDTH, int h = HEIGHT, bool save = true);
+        
     static KUrl fileForUrl(KUrl url);
-    
     static QString guessNameFromUrl(QUrl url);
     
-    static void savePreview(QPixmap pm, KUrl url);
-    
     QString snapTitle();
-    QUrl snapUrl();
 
 private slots:
     void load();
-- 
cgit v1.2.1


From 6ff17e2ce62d5795ef2b31ee9eac1d4da7c590b5 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Tue, 16 Mar 2010 08:35:52 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 62998336..18e7a114 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,18 +1,8 @@
 [Desktop Entry]
 Name=rekonq
-Name[sv]=Rekonq
-Name[tr]=Rekonq
-Name[x-test]=xxrekonqxx
+Name[pt_BR]=rekonq
 GenericName=Webkit KDE Browser
-GenericName[de]=Webkit-Browser für KDE
-GenericName[et]=KDE Webkiti veebibrauser
-GenericName[km]=កម្មវិធី​រុករក​ Webkit KDE
-GenericName[pt]=Navegador Web com WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
-GenericName[sv]=Webkit webbläsare för KDE
-GenericName[tr]=Webkit KDE Tarayıcı
-GenericName[uk]=Переглядач мережі на WebKit для KDE
-GenericName[x-test]=xxWebkit KDE Browserxx
 Icon=rekonq
 Type=Application
 Exec=rekonq %u
-- 
cgit v1.2.1


From 220938f8ffd314c6682bc56d772de5b07c09aca9 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 17 Mar 2010 00:53:53 +0100
Subject: First Krazy rekonq-git fixes :D

---
 src/clicktoflash.cpp |  2 +-
 src/clicktoflash.h   |  2 +-
 src/webpage.cpp      | 13 +++++++------
 src/websnap.h        |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp
index 3c284b3f..76637975 100644
--- a/src/clicktoflash.cpp
+++ b/src/clicktoflash.cpp
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (c) 2009, Benjamin C. Meyer
+* Copyright (C) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
 * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
 *
 *
diff --git a/src/clicktoflash.h b/src/clicktoflash.h
index 7d6c4e05..186b5836 100644
--- a/src/clicktoflash.h
+++ b/src/clicktoflash.h
@@ -2,7 +2,7 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (c) 2009, Benjamin C. Meyer
+* Copyright (C) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
 * Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
 *
 *
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 4caf5a83..42193ed0 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -312,12 +312,13 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
                 if (finfo.exists()) 
                 {
                     QDateTime now = QDateTime::currentDateTime();
-                    KIO::RenameDialog dlg (view(), i18n("Overwrite File?"), srcUrl, destUrl,
-                                        KIO::RenameDialog_Mode(KIO::M_OVERWRITE | KIO::M_SKIP),
-                                        -1, finfo.size(),
-                                        now.toTime_t(), finfo.created().toTime_t(),
-                                        now.toTime_t(), finfo.lastModified().toTime_t());
-                    result = dlg.exec();
+                    QPointer<KIO::RenameDialog> dlg = new KIO::RenameDialog( view(), i18n("Overwrite File?"), srcUrl, destUrl,
+                                                                            KIO::RenameDialog_Mode(KIO::M_OVERWRITE | KIO::M_SKIP),
+                                                                            -1, finfo.size(),
+                                                                            now.toTime_t(), finfo.created().toTime_t(),
+                                                                            now.toTime_t(), finfo.lastModified().toTime_t());
+                    result = dlg->exec();
+                    delete dlg;
                 }
             }
         } 
diff --git a/src/websnap.h b/src/websnap.h
index 73ed04ca..e7c9e593 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -48,7 +48,7 @@
 /**
  * This class is used in many classes of rekonq to produce an image 
  * based on the site corresponding to the url passed as argument.
- * It also cached the images to not retrieve them everytime :)
+ * It also cached the images to not retrieve them every time :)
  *
  * Heavily based on Graphics-Dojo WebSnap example (thanks!)
  *
-- 
cgit v1.2.1


From 08e184b78c3a116b7ae903ad06fa4b5aae92c6f2 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Wed, 17 Mar 2010 09:54:18 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 18e7a114..8db3b5df 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,8 +1,14 @@
 [Desktop Entry]
 Name=rekonq
+Name[de]=Rekonq
+Name[pt]=rekonq
 Name[pt_BR]=rekonq
+Name[uk]=rekonq
 GenericName=Webkit KDE Browser
+GenericName[de]=WebKit-basierter Webbrowser für KDE
+GenericName[pt]=Navegador do KDE usando o WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
+GenericName[uk]=Переглядач інтернету на WebKit для KDE
 Icon=rekonq
 Type=Application
 Exec=rekonq %u
-- 
cgit v1.2.1


From 4e7f41bab9de7bc52bce787edd536f6142f4c170 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Thu, 18 Mar 2010 07:57:23 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 8db3b5df..928c8b6d 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,14 +1,20 @@
 [Desktop Entry]
 Name=rekonq
-Name[de]=Rekonq
+Name[cs]=rekonq
+Name[de]=rekonq
+Name[nds]=Rekonq
 Name[pt]=rekonq
 Name[pt_BR]=rekonq
 Name[uk]=rekonq
+Name[x-test]=xxrekonqxx
 GenericName=Webkit KDE Browser
+GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
 GenericName[de]=WebKit-basierter Webbrowser für KDE
+GenericName[nds]=Webkit-KDE-Kieker
 GenericName[pt]=Navegador do KDE usando o WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
 GenericName[uk]=Переглядач інтернету на WebKit для KDE
+GenericName[x-test]=xxWebkit KDE Browserxx
 Icon=rekonq
 Type=Application
 Exec=rekonq %u
-- 
cgit v1.2.1


From 273422713742fc45fc937f0e69cb872846a564f1 Mon Sep 17 00:00:00 2001
From: kdesvn <kdesvn@ahtec.(none)>
Date: Thu, 18 Mar 2010 20:10:33 +0000
Subject: extract i18n from all cpp files

---
 src/Messages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Messages.sh b/src/Messages.sh
index b22743a6..efa6adff 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/rekonq.pot
+$XGETTEXT *.cpp */*.cpp -o $podir/rekonq.pot
-- 
cgit v1.2.1


From 36f7955d428808d838362a7ea1d1b0f681b30555 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Fri, 19 Mar 2010 09:14:33 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 928c8b6d..b6b12078 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -2,17 +2,21 @@
 Name=rekonq
 Name[cs]=rekonq
 Name[de]=rekonq
+Name[ga]=rekonq
 Name[nds]=Rekonq
 Name[pt]=rekonq
 Name[pt_BR]=rekonq
+Name[sv]=Rekonq
 Name[uk]=rekonq
 Name[x-test]=xxrekonqxx
 GenericName=Webkit KDE Browser
 GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
 GenericName[de]=WebKit-basierter Webbrowser für KDE
+GenericName[ga]=Brabhsálaí Webkit KDE
 GenericName[nds]=Webkit-KDE-Kieker
 GenericName[pt]=Navegador do KDE usando o WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
+GenericName[sv]=Webkit webbläsare för KDE
 GenericName[uk]=Переглядач інтернету на WebKit для KDE
 GenericName[x-test]=xxWebkit KDE Browserxx
 Icon=rekonq
-- 
cgit v1.2.1


From f51c660a207364b9b5ff400a29e8ff1dba721e61 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Mar 2010 11:00:18 +0100
Subject: abp (Ad Block Plus) fake protocol support

This will let rekonq to automatically add abp subscriptions
from the adblockplus.org site (or wherever someone provides abp urls)

Anyway, consider that the raccomended way to manage adblock (by me and by
abp developers) is just adding the EasyList subscription.
rekonq just does it by default!!
---
 src/adblock/adblockmanager.cpp | 42 ++++++++++++++-------
 src/adblock/adblockmanager.h   |  5 ++-
 src/protocolhandler.cpp        | 84 +++++++++++++++++++++++++++++++++++++-----
 src/protocolhandler.h          |  3 +-
 src/rekonq.kcfg                |  6 +--
 src/settings/adblockwidget.cpp |  2 +-
 6 files changed, 113 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index d2c2b013..66e11277 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -60,7 +60,7 @@ AdBlockManager::~AdBlockManager()
 }
 
 
-void AdBlockManager::loadSettings()
+void AdBlockManager::loadSettings(bool checkUpdateDate)
 {
     _index = 0;
     _buffer.clear();
@@ -92,7 +92,7 @@ void AdBlockManager::loadSettings()
     QDateTime lastUpdate = ReKonfig::lastUpdate();  //  the day of the implementation.. :)
     int days = ReKonfig::updateInterval();
     
-    if( today > lastUpdate.addDays( days ) )
+    if( !checkUpdateDate || today > lastUpdate.addDays( days ) )
     {
         ReKonfig::setLastUpdate( today );
         
@@ -101,10 +101,10 @@ void AdBlockManager::loadSettings()
     }
 
     // else
-    QStringList names = ReKonfig::subscriptionNames();
-    foreach(const QString &name, names)
+    QStringList titles = ReKonfig::subscriptionTitles();
+    foreach(const QString &title, titles)
     {
-        rules = rulesGroup.readEntry( name + "-rules" , QStringList() );
+        rules = rulesGroup.readEntry( title + "-rules" , QStringList() );
         loadRules(rules);
     }
 }
@@ -208,13 +208,11 @@ void AdBlockManager::applyHidingRules(WebPage *page)
 
 void AdBlockManager::updateNextSubscription()
 {
-    kDebug() << "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO";
-
-    QStringList subUrlStrings = ReKonfig::subscriptionUrls();
+    QStringList locations = ReKonfig::subscriptionLocations();
     
-    if( _index < subUrlStrings.size() )
+    if( _index < locations.size() )
     {
-        QString urlString = subUrlStrings.at(_index);
+        QString urlString = locations.at(_index);
         kDebug() << "DOWNLOADING FROM " << urlString;
         KUrl subUrl = KUrl( urlString );
         
@@ -276,10 +274,28 @@ void AdBlockManager::saveRules(const QStringList &rules)
             cleanedRules << r;
     }
     
-    QStringList names = ReKonfig::subscriptionNames();
-    QString name = names.at(_index) + "-rules";
+    QStringList titles = ReKonfig::subscriptionTitles();
+    QString title = titles.at(_index) + "-rules";
     
     KSharedConfig::Ptr config = KGlobal::config();
     KConfigGroup cg( config , "rules" );
-    cg.writeEntry( name, cleanedRules );
+    cg.writeEntry( title, cleanedRules );
+}
+
+
+void AdBlockManager::addSubscription(const QString &title, const QString &location)
+{
+    QStringList titles = ReKonfig::subscriptionTitles();
+    if( titles.contains(title) )
+        return;
+    
+    QStringList locations = ReKonfig::subscriptionLocations();
+    if( locations.contains(location) )
+        return;
+    
+    titles << title;
+    locations << location;
+    
+    ReKonfig::setSubscriptionTitles(titles);
+    ReKonfig::setSubscriptionLocations(locations);
 }
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index aac78e3b..c0bd2b70 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -133,9 +133,10 @@ public:
 
     QNetworkReply *block(const QNetworkRequest &request);
     void applyHidingRules(WebPage *page);
-
+    void addSubscription(const QString &title, const QString &location);
+    
 public slots:
-    void loadSettings();
+    void loadSettings(bool checkUpdateDate = true);
 
 private:
     void updateNextSubscription();
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 70d69107..9d1560ed 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -38,6 +38,7 @@
 #include "urlbar.h"
 #include "webtab.h"
 #include "historymanager.h"
+#include "adblockmanager.h"
 
 // KDE Includes
 #include <klocalizedstring.h>
@@ -52,6 +53,7 @@
 #include <KFileItem>
 #include <KJob>
 #include <kio/udsentry.h>
+#include <KMessageBox>
 
 // Qt Includes
 #include <QLatin1String>
@@ -61,6 +63,9 @@
 #include <QFile>
 #include <QDateTime>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 ProtocolHandler::ProtocolHandler(QObject *parent)
     : QObject(parent)
@@ -87,11 +92,11 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
         return false;
     
     // "http(s)" (fast) handling
-    if( _url.protocol() == QLatin1String("http") || _url.protocol() == QLatin1String("https") )
+    if( _url.protocol() == QL1S("http") || _url.protocol() == QL1S("https") )
         return false;
     
     // javascript handling
-    if( _url.protocol() == QLatin1String("javascript") )
+    if( _url.protocol() == QL1S("javascript") )
     {
         QString scriptSource = _url.authority();
         QVariant result = frame->evaluateJavaScript(scriptSource);
@@ -99,14 +104,21 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     }
     
     // "mailto" handling
-    if ( _url.protocol() == QLatin1String("mailto") )
+    if ( _url.protocol() == QL1S("mailto") )
     {
         KToolInvocation::invokeMailer(_url);
         return true;
     }
 
+    // "abp" handling
+    if ( _url.protocol() == QL1S("abp") )
+    {
+        abpHandling();
+        return true;
+    }
+    
     // "about" handling
-    if ( _url.protocol() == QLatin1String("about") )
+    if ( _url.protocol() == QL1S("about") )
     {
         // let webkit manage the about:blank url...
         if( _url == KUrl("about:blank") )
@@ -152,12 +164,12 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
     kDebug() << "URL PROTOCOL: " << _url;
     
     // "http(s)" (fast) handling
-    if( _url.protocol() == QLatin1String("http") || _url.protocol() == QLatin1String("https") )
+    if( _url.protocol() == QL1S("http") || _url.protocol() == QL1S("https") )
         return false;
     
     // "mailto" handling: It needs to be handled both here(mail links clicked)
     // and in prehandling (mail url launched)
-    if ( _url.protocol() == QLatin1String("mailto") )
+    if ( _url.protocol() == QL1S("mailto") )
     {
         KToolInvocation::invokeMailer(_url);
         return true;
@@ -168,7 +180,7 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
     // My idea is: webkit cannot handle in any way ftp. So we have surely to return true here.
     // We start trying to guess what the url represent: it's a dir? show its contents (and download them).
     // it's a file? download it. It's another thing? beat me, but I don't know what to do...
-    if( _url.protocol() == QLatin1String("ftp") )
+    if( _url.protocol() == QL1S("ftp") )
     {
         KIO::StatJob *job = KIO::stat(_url);
         connect(job, SIGNAL(result(KJob*)), this, SLOT( slotMostLocalUrlResult(KJob*) ));
@@ -176,7 +188,7 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
     }
     
     // "file" handling. This is quite trivial :)
-    if( _url.protocol() == QLatin1String("file") )
+    if( _url.protocol() == QL1S("file") )
     {
         QFileInfo fileInfo( _url.path() );
         if(fileInfo.isDir())
@@ -269,7 +281,7 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
     msg += "</table>";
     
          
-    QString html = QString(QLatin1String(file.readAll()))
+    QString html = QString(QL1S(file.readAll()))
                             .arg(title)
                             .arg(msg)
                             ;
@@ -319,3 +331,57 @@ void ProtocolHandler::slotMostLocalUrlResult(KJob *job)
             emit downloadUrl(_url);
     }
 }
+
+
+/**
+ * abp scheme (easy) explanation
+ *
+ */
+void ProtocolHandler::abpHandling()
+{
+    kDebug() << _url;
+    
+    QString path = _url.path();
+    if( path != QL1S("subscribe") )
+        return;
+    
+    QMap<QString, QString> map = _url.queryItems( KUrl::CaseInsensitiveKeys );
+    
+    QString location = map.value( QL1S("location") );
+    kDebug() << location;
+    
+    QString title = map.value( QL1S("title") );
+    kDebug() << title;
+    
+    QString requireslocation = map.value( QL1S("requireslocation") );
+    kDebug() << requireslocation;
+    
+    QString requirestitle = map.value( QL1S("requirestitle") );
+    kDebug() << requirestitle;
+ 
+    QString info;
+    if( requirestitle.isEmpty() || requireslocation.isEmpty() )
+    {
+        info = title;
+    }
+    else
+    {
+        info = i18n("\n %1,\n %2 (required by %3)\n", title, requirestitle, title);
+    }
+    
+    if ( KMessageBox::questionYesNo( 0,
+                                     i18n("Do you want to add the following subscriptions to your adblock settings?\n") + info,
+                                     i18n("Add automatic subscription to the adblock"),
+                                     KGuiItem(i18n("Add")),
+                                     KGuiItem(i18n("Discard")) 
+                                   )
+        )
+    {
+        if( !requireslocation.isEmpty() && !requirestitle.isEmpty() )
+        {
+            Application::adblockManager()->addSubscription( requirestitle, requireslocation );
+        }
+        Application::adblockManager()->addSubscription( title, location );
+        Application::adblockManager()->loadSettings(false);
+    }
+}
diff --git a/src/protocolhandler.h b/src/protocolhandler.h
index 2a567015..99aec70a 100644
--- a/src/protocolhandler.h
+++ b/src/protocolhandler.h
@@ -74,7 +74,8 @@ private slots:
     
 private:
     QString dirHandling(const KFileItemList &list);
-   
+    void abpHandling();
+    
     KDirLister *_lister;
     QWebFrame *_frame;
     KUrl _url;
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 42ace3d3..bc41f5e1 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -161,10 +161,10 @@
         <entry name="hideAdsEnabled" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="subscriptionNames" type="StringList">
-            <default>easylist</default>
+        <entry name="subscriptionTitles" type="StringList">
+            <default>EasyList</default>
         </entry>
-        <entry name="subscriptionUrls" type="StringList">
+        <entry name="subscriptionLocations" type="StringList">
             <default>https://easylist-downloads.adblockplus.org/easylist.txt</default>
         </entry>
         <entry name="lastUpdate" type="DateTime">
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index 8aac3e8c..471f57f0 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -115,7 +115,7 @@ void AdBlockWidget::load()
     int days = ReKonfig::updateInterval();
     spinBox->setValue( days );
     
-    QStringList subscriptions = ReKonfig::subscriptionNames();
+    QStringList subscriptions = ReKonfig::subscriptionTitles();
 
     // load automatic rules
     foreach(QString sub, subscriptions)
-- 
cgit v1.2.1


From a9107d70e55c345339a22e1d29f5667e04c4b397 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Mar 2010 15:37:27 +0100
Subject: removed unuseful rekonqpage dir (we are using just a class for it)

---
 src/CMakeLists.txt                    |  17 +-
 src/newtabpage.cpp                    | 443 ++++++++++++++++++++++++++++++++++
 src/newtabpage.h                      | 109 +++++++++
 src/previewselectorbar.cpp            | 152 ++++++++++++
 src/previewselectorbar.h              |  66 +++++
 src/rekonqpage/newtabpage.cpp         | 443 ----------------------------------
 src/rekonqpage/newtabpage.h           | 109 ---------
 src/rekonqpage/previewselectorbar.cpp | 152 ------------
 src/rekonqpage/previewselectorbar.h   |  66 -----
 9 files changed, 778 insertions(+), 779 deletions(-)
 create mode 100644 src/newtabpage.cpp
 create mode 100644 src/newtabpage.h
 create mode 100644 src/previewselectorbar.cpp
 create mode 100644 src/previewselectorbar.h
 delete mode 100644 src/rekonqpage/newtabpage.cpp
 delete mode 100644 src/rekonqpage/newtabpage.h
 delete mode 100644 src/rekonqpage/previewselectorbar.cpp
 delete mode 100644 src/rekonqpage/previewselectorbar.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d0c1639..d41ebfe0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,31 +8,30 @@ ADD_SUBDIRECTORY( tests )
 
 SET( rekonq_KDEINIT_SRCS
     application.cpp 
+    clicktoflash.cpp
+    filterurljob.cpp
     findbar.cpp
     mainview.cpp
     mainwindow.cpp 
+    networkaccessmanager.cpp
+    newtabpage.cpp
+    previewselectorbar.cpp
+    protocolhandler.cpp
     sessionmanager.cpp
     tabbar.cpp
+    walletbar.cpp
+    webinspectorpanel.cpp
     webpage.cpp
     webpluginfactory.cpp
     websnap.cpp
     webview.cpp
     webtab.cpp
-    clicktoflash.cpp
-    networkaccessmanager.cpp
-    webinspectorpanel.cpp
-    walletbar.cpp
-    protocolhandler.cpp
-    filterurljob.cpp
     #----------------------------------------
     history/autosaver.cpp 
     history/historymanager.cpp
     history/historymodels.cpp
     history/historypanel.cpp
     #----------------------------------------
-    rekonqpage/newtabpage.cpp
-    rekonqpage/previewselectorbar.cpp
-    #----------------------------------------
     settings/settingsdialog.cpp
     settings/adblockwidget.cpp
     settings/networkwidget.cpp
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
new file mode 100644
index 00000000..6fd5160d
--- /dev/null
+++ b/src/newtabpage.cpp
@@ -0,0 +1,443 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "newtabpage.h"
+#include "newtabpage.moc"
+
+// Auto Includes
+#include "rekonq.h"
+
+// Local Includes
+#include "historymodels.h"
+#include "bookmarksmanager.h"
+#include "application.h"
+#include "mainwindow.h"
+#include "mainview.h"
+#include "websnap.h"
+#include "previewselectorbar.h"
+#include "webtab.h"
+
+// KDE Includes
+#include <KStandardDirs>
+#include <KIconLoader>
+#include <KDebug>
+#include <KConfig>
+#include <KConfigGroup>
+#include <KDialog>
+
+// Qt Includes
+#include <QFile>
+
+
+NewTabPage::NewTabPage(QWebFrame *frame)
+    : m_root(frame->documentElement())
+{
+    QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
+    QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");    
+    
+    QFile file(htmlFilePath);
+    bool isOpened = file.open(QIODevice::ReadOnly);
+    if (!isOpened)
+    {
+        kDebug() << "Couldn't open the home.html file";
+    }
+    else
+    {
+        m_html = file.readAll();
+        m_html.replace(QString("%2"), imagesPath);
+    }
+}
+
+
+NewTabPage::~NewTabPage()
+{
+}
+
+
+void NewTabPage::generate(KUrl url)
+{
+    if(KUrl("about:preview").isParentOf(url))
+    {
+        if(url.directory() == QString("preview/remove"))
+        {
+            removePreview(url.fileName().toInt());
+            return;
+        }
+        if(url.directory() == QString("preview/modify"))
+        {
+            int index = url.fileName().toInt();
+            Application::instance()->mainWindow()->currentTab()->createPreviewSelectorBar(index);
+            return;
+        }
+    }
+    
+    QWebPage *page = m_root.webFrame()->page();
+    page->mainFrame()->setHtml(m_html);
+
+    m_root = page->mainFrame()->documentElement().findFirst("#content");
+    
+    browsingMenu(url);
+    
+    QString title;
+    if(url == KUrl("about:favorites"))
+    {
+        favoritesPage();
+        title = i18n("Favorites");
+    }
+    else if(url == KUrl("about:closedTabs"))
+    {
+        closedTabsPage();
+        title = i18n("Closed Tabs");
+    }
+    else if(url == KUrl("about:history"))
+    {
+        historyPage();
+        title = i18n("History");
+    }
+    else if(url == KUrl("about:bookmarks"))
+    {
+        bookmarksPage();
+        title = i18n("Bookmarks");
+    }
+    
+    m_root.document().findFirst("title").setPlainText(title);
+}
+
+
+void NewTabPage::favoritesPage()
+{
+    m_root.addClass("favorites");
+    
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
+    
+    for(int i=0; i<8; ++i)
+    {
+        KUrl url = urls.at(i);
+        QWebElement prev;
+        
+        if(url.isEmpty())
+            prev = emptyPreview(i);
+        else if(!QFile::exists(WebSnap::fileForUrl(url).toLocalFile()))
+            prev = loadingPreview(i, url);
+        else
+            prev = validPreview(i, url, names.at(i));
+        
+        setupPreview(prev, i);
+        
+        m_root.appendInside(prev);
+    }
+}
+
+
+QWebElement NewTabPage::emptyPreview(int index)
+{
+    QWebElement prev = markup(".thumbnail");
+    
+    prev.findFirst(".preview img").setAttribute("src" , QString("file:///") +
+                    KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
+    prev.findFirst("span a").setPlainText(i18n("Set a Preview..."));
+    prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
+    
+    setupPreview(prev, index);
+    hideControls(prev);
+    
+    return prev;
+}
+
+
+QWebElement NewTabPage::loadingPreview(int index, KUrl url)
+{
+    QWebElement prev = markup(".thumbnail");
+    
+    prev.findFirst(".preview img").setAttribute("src" , 
+                QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
+    prev.findFirst("span a").setPlainText(i18n("Loading Preview..."));
+    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
+    
+    setupPreview(prev, index);
+    showControls(prev);
+    
+    new WebSnap(url, m_root.webFrame(), index);
+    
+    return prev;
+}
+
+
+QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
+{
+    QWebElement prev = markup(".thumbnail");
+    KUrl previewPath = WebSnap::fileForUrl(url);
+    QString iString = QVariant(index).toString();
+    
+    prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString());
+    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
+    prev.findFirst("span a").setAttribute("href", url.toMimeDataString());
+    prev.findFirst("span a").setPlainText(checkTitle(title));
+    
+    setupPreview(prev, index);
+    showControls(prev);
+    
+    return prev;
+}
+
+
+void NewTabPage::hideControls(QWebElement e)
+{
+    e.findFirst(".remove").setStyleProperty("visibility", "hidden");
+    e.findFirst(".modify").setStyleProperty("visibility", "hidden");
+}
+
+
+void NewTabPage::showControls(QWebElement e)
+{
+    e.findFirst(".remove").setStyleProperty("visibility", "visible");
+    e.findFirst(".modify").setStyleProperty("visibility", "visible");
+}
+
+
+void NewTabPage::setupPreview(QWebElement e, int index)
+{
+    e.findFirst(".remove img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+    e.findFirst(".remove").setAttribute("title", "Remove favorite");
+    e.findFirst(".modify img").setAttribute("src", QString("file:///") +
+    KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
+    e.findFirst(".modify").setAttribute("title", "Set new favorite");
+    
+    e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
+    e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString()));
+    
+    e.setAttribute("id", "preview" + QVariant(index).toString());
+}
+
+
+void NewTabPage::snapFinished(int index, KUrl url, QString title)
+{
+    // do not try to modify the page if it isn't the newTabPage
+    if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
+        return;
+    
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    QWebElement newPrev = validPreview(index, url, title);
+    
+    if(m_root.findAll(".closedTabs").count() != 0)
+        hideControls(newPrev);
+    
+    prev.replace(newPrev);
+    
+    // update title
+    if(m_root.findAll(".favorites").count() != 0)
+    {
+        QStringList names = ReKonfig::previewNames();
+        names.replace(index, title);
+        ReKonfig::setPreviewNames(names);
+        
+        ReKonfig::self()->writeConfig();
+    }
+}
+
+
+void NewTabPage::removePreview(int index)
+{
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
+    
+    urls.replace(index, QString(""));
+    names.replace(index, QString(""));
+    
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
+    ReKonfig::self()->writeConfig();
+    
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    prev.replace(emptyPreview(index));
+}
+
+
+void NewTabPage::browsingMenu(const KUrl &currentUrl)
+{
+    QList<QWebElement> navItems;
+    
+    KIconLoader *loader = KIconLoader::global();
+    
+    QWebElement nav = markup(".link"); // Favorites
+    nav.findFirst("a").setAttribute("href", "about:favorites");
+    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
+    loader->iconPath("emblem-favorite", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
+    nav.findFirst("a").appendInside(i18n("Favorites"));
+    navItems.append(nav);
+    
+    nav = markup(".link"); // Closed Tabs
+    nav.findFirst("a").setAttribute("href", "about:closedTabs");
+    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
+    loader->iconPath("tab-close", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
+    nav.findFirst("a").appendInside(i18n("Closed Tabs"));
+    navItems.append(nav);
+    
+    nav = markup(".link"); // Bookmarks
+    nav.findFirst("a").setAttribute("href", "about:bookmarks");
+    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
+    loader->iconPath("bookmarks", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
+    nav.findFirst("a").appendInside(i18n("Bookmarks"));
+    navItems.append(nav);
+    
+    nav = markup(".link"); // History
+    nav.findFirst("a").setAttribute("href", "about:history");
+    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
+    loader->iconPath("view-history", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
+    nav.findFirst("a").appendInside(i18n("History"));
+    navItems.append(nav);
+    
+    QWebElement it;
+    foreach(it, navItems)
+    {
+        if(it.findFirst("a").attribute("href") == currentUrl.toMimeDataString())
+            it.addClass("current");
+        else if(currentUrl == "about:home" && it.findFirst("a").attribute("href") == "about:favorites")
+                it.addClass("current");
+        m_root.document().findFirst("#navigation").appendInside(it);
+    }
+}
+
+
+void NewTabPage::historyPage()
+{
+    m_root.addClass("history");
+    
+    HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
+    
+    int i = 0;
+    do
+    {
+        QModelIndex index = model->index(i, 0, QModelIndex() );
+        if(model->hasChildren(index))
+        {
+            m_root.appendInside(markup("h3"));
+            m_root.lastChild().setPlainText(index.data().toString());
+            
+            for(int j=0; j< model->rowCount(index); ++j)
+            {
+                QModelIndex son = model->index(j, 0, index );
+                m_root.appendInside(son.data(HistoryModel::DateTimeRole).toDateTime().toString("hh:mm"));
+                m_root.appendInside("  ");
+                m_root.appendInside(markup("a"));
+                m_root.lastChild().setAttribute("href" , son.data(HistoryModel::UrlStringRole).toString());
+                m_root.lastChild().appendInside(son.data().toString());
+                m_root.appendInside("<br/>");
+            }
+        }
+        i++;
+    }
+    while( model->hasIndex( i , 0 , QModelIndex() ) );
+}
+
+
+void NewTabPage::bookmarksPage()
+{
+    m_root.addClass("bookmarks");
+    
+    KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
+    if (bookGroup.isNull())
+    {
+        return;
+    }
+
+    KBookmark bookmark = bookGroup.first();
+    while (!bookmark.isNull())
+    {
+        createBookItem(bookmark, m_root);
+        bookmark = bookGroup.next(bookmark);
+    }
+}
+
+
+void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent)
+{
+    if (bookmark.isGroup())
+    {
+        KBookmarkGroup group = bookmark.toGroup();
+        KBookmark bm = group.first();
+        parent.appendInside(markup("h3"));
+        parent.lastChild().setPlainText(group.text());
+        parent.appendInside(markup(".bookfolder"));
+        while (!bm.isNull())
+        {
+            createBookItem(bm, parent.lastChild()); // it is .bookfolder
+            bm = group.next(bm);
+        }
+    }
+    else if(bookmark.isSeparator())
+    {
+        parent.appendInside("<hr/>");
+    }
+    else
+    {
+        parent.appendInside(markup("a"));
+        parent.lastChild().setAttribute("href" , bookmark.url().prettyUrl());
+        parent.lastChild().setPlainText(bookmark.text());
+        parent.appendInside("<br/>");
+    }
+}
+
+
+void NewTabPage::closedTabsPage()
+{
+    m_root.addClass("closedTabs");
+    
+    QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
+    
+    for(int i=0; i < links.count(); ++i)
+    {
+        HistoryItem item = links.at(i);
+        QWebElement prev;
+        
+        if(item.url.isEmpty())
+            continue;
+        else if(!QFile::exists(WebSnap::fileForUrl(item.url).toLocalFile()))
+            prev = loadingPreview(i, item.url);
+        else
+            prev = validPreview(i, item.url, item.title);
+        
+        prev.setAttribute("id", "preview" + QVariant(i).toString());
+        hideControls(prev);
+        m_root.appendInside(prev);
+    }
+}
+
+
+QString NewTabPage::checkTitle(QString title)
+{
+    if(title.length() > 23)
+    {
+        title.truncate(20);
+        title += "...";
+    }
+    return title;
+}
diff --git a/src/newtabpage.h b/src/newtabpage.h
new file mode 100644
index 00000000..fd04e60a
--- /dev/null
+++ b/src/newtabpage.h
@@ -0,0 +1,109 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef REKONQ_NEW_TAB_PAGE
+#define REKONQ_NEW_TAB_PAGE
+
+
+// Local Includes
+#include "rekonqprivate_export.h"
+
+// KDE Includes
+#include <KUrl>
+
+// Qt Includes
+#include <QObject>
+#include <QString>
+#include <QWebElement>
+
+// Forward Includes
+class KBookmark;
+class WebPage;
+
+
+class REKONQ_TESTS_EXPORT NewTabPage : public QObject
+{
+Q_OBJECT
+
+public:
+    NewTabPage(QWebFrame *frame);
+    ~NewTabPage();
+
+    /**
+     * This method takes an about: url and loads 
+     * the corresponding part of the new tab page
+     */
+    void generate(KUrl url = KUrl("about:home"));
+    
+    void snapFinished(int index, KUrl url, QString title);
+    void removePreview(int index);
+     
+protected:  
+    // these are the functions to build the new tab page
+    void browsingMenu(const KUrl &currentUrl);
+
+    void favoritesPage();
+    void historyPage();
+    void bookmarksPage();
+    void closedTabsPage();
+
+    // Previews handling
+    QWebElement emptyPreview(int index);
+    QWebElement loadingPreview(int index, KUrl url);
+    QWebElement validPreview(int index, KUrl url, QString title);
+    
+    /** This function takes a QwebElement with the .thumbnail structure,
+     *  hiding the "remove" and "modify" buttons
+     *
+     */
+    void hideControls(QWebElement e);
+    void showControls(QWebElement e);
+    void setupPreview(QWebElement e, int index);
+     
+private:
+    void createBookItem(const KBookmark &bookmark, QWebElement parent);
+    
+    /** This function helps to get faster a new markup of one type,
+     *  it isn't easy to create one with QWebElement.
+     *
+     *  It gets it in the #models div of home.html.
+     *  It works for all elements defined here.
+     *
+     */
+    inline QWebElement markup(QString selector) 
+    {
+       return m_root.document().findFirst("#models > " + selector).clone();
+    }
+    
+    QString checkTitle(QString title);
+
+    QString m_html;
+    
+    QWebElement m_root;
+};
+
+#endif // REKONQ_NEW_TAB_PAGE
diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp
new file mode 100644
index 00000000..924a5439
--- /dev/null
+++ b/src/previewselectorbar.cpp
@@ -0,0 +1,152 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Auto Includes
+#include "previewselectorbar.h"
+#include "previewselectorbar.moc"
+
+// Local Include
+#include "rekonq.h"
+#include "websnap.h"
+#include "application.h"
+#include "mainwindow.h"
+#include "webtab.h"
+
+// KDE Includes
+#include <KIcon>
+#include <KLocalizedString>
+
+// Qt Includes
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QString>
+
+
+PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent)
+        : QWidget(parent)
+        , m_button(0)
+        , m_label(0)
+        , m_previewIndex(index)
+{
+    m_label = new QLabel(i18n("Please open up the webpage you want to add as favorite"), this);
+    m_label->setWordWrap(true);
+    
+    QToolButton *closeButton = new QToolButton(this);
+    closeButton->setAutoRaise(true);
+    closeButton->setIcon(KIcon("dialog-close"));
+    connect(closeButton, SIGNAL(clicked(bool)), this, SLOT(destroy()));
+    
+    m_button = new QPushButton(KIcon("insert-image"), i18n("Set to This Page"), this);
+    m_button->setMaximumWidth(250);
+    connect(m_button, SIGNAL(clicked(bool)), this, SLOT(clicked()));
+    
+    // layout
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->addWidget(closeButton);
+    layout->addWidget(m_label);
+    layout->addWidget(m_button);
+    
+    layout->setContentsMargins(2, 0, 2, 0);
+    
+    setLayout(layout);
+}
+
+
+PreviewSelectorBar::~PreviewSelectorBar()
+{
+}
+
+
+void PreviewSelectorBar::verifyUrl()
+{
+    
+    if(Application::instance()->mainWindow()->currentTab()->page()->mainFrame()->url().scheme() != "about")
+    {
+        m_button->setEnabled(true);
+        m_button->setToolTip("");
+    }
+    else
+    {
+        m_button->setEnabled(false);
+        m_button->setToolTip(i18n("You can not add this webpage as favorite"));
+    }
+}
+
+
+void PreviewSelectorBar::loadProgress()
+{
+    m_button->setEnabled(false);
+    m_button->setToolTip(i18n("Page is loading..."));
+}
+
+
+void PreviewSelectorBar::loadFinished()
+{
+    m_button->setEnabled(true);
+    m_button->setToolTip("");
+    
+    verifyUrl();
+}
+
+
+void PreviewSelectorBar::clicked()
+{
+    WebPage *page = Application::instance()->mainWindow()->currentTab()->page();
+    
+    if(page)
+    {
+        // this is done just lo let the render process being faster..
+        WebSnap::renderPreview(*page);
+        
+        KUrl url = page->mainFrame()->url();        
+        QStringList names = ReKonfig::previewNames();
+        QStringList urls = ReKonfig::previewUrls();
+        
+        urls.replace(m_previewIndex, url.toMimeDataString());
+        names.replace(m_previewIndex, page->mainFrame()->title());
+        
+        ReKonfig::setPreviewNames(names);
+        ReKonfig::setPreviewUrls(urls);
+        
+        ReKonfig::self()->writeConfig();
+        
+        
+        page->mainFrame()->load(KUrl("about:favorites"));
+    }
+    
+    destroy();
+}
+
+
+void PreviewSelectorBar::destroy()
+{
+    if (parentWidget() && parentWidget()->layout())
+    {
+        parentWidget()->layout()->removeWidget(this);
+    }
+    this->deleteLater();
+}
diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h
new file mode 100644
index 00000000..bb9f26c4
--- /dev/null
+++ b/src/previewselectorbar.h
@@ -0,0 +1,66 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef PREVIEWSELECTORBAR_H
+#define PREVIEWSELECTORBAR_H
+
+// Local Includes
+#include "rekonqprivate_export.h"
+#include "webpage.h"
+
+// Qt Includes
+#include <QWidget>
+#include <QPushButton>
+#include <QLabel>
+
+
+class REKONQ_TESTS_EXPORT PreviewSelectorBar : public QWidget
+{
+Q_OBJECT
+
+public:
+    PreviewSelectorBar(int index, QWidget *parent);
+    ~PreviewSelectorBar();
+    
+private slots:
+    void clicked();
+    
+    void loadProgress();
+    void loadFinished();
+    
+    void verifyUrl();
+    
+    void destroy();
+    
+private:    
+    QPushButton *m_button;
+    QLabel *m_label;
+    
+    int m_previewIndex;   
+};
+
+#endif // PREVIEWSELECTORBAR_H
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
deleted file mode 100644
index 6fd5160d..00000000
--- a/src/rekonqpage/newtabpage.cpp
+++ /dev/null
@@ -1,443 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "newtabpage.h"
-#include "newtabpage.moc"
-
-// Auto Includes
-#include "rekonq.h"
-
-// Local Includes
-#include "historymodels.h"
-#include "bookmarksmanager.h"
-#include "application.h"
-#include "mainwindow.h"
-#include "mainview.h"
-#include "websnap.h"
-#include "previewselectorbar.h"
-#include "webtab.h"
-
-// KDE Includes
-#include <KStandardDirs>
-#include <KIconLoader>
-#include <KDebug>
-#include <KConfig>
-#include <KConfigGroup>
-#include <KDialog>
-
-// Qt Includes
-#include <QFile>
-
-
-NewTabPage::NewTabPage(QWebFrame *frame)
-    : m_root(frame->documentElement())
-{
-    QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
-    QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics");    
-    
-    QFile file(htmlFilePath);
-    bool isOpened = file.open(QIODevice::ReadOnly);
-    if (!isOpened)
-    {
-        kDebug() << "Couldn't open the home.html file";
-    }
-    else
-    {
-        m_html = file.readAll();
-        m_html.replace(QString("%2"), imagesPath);
-    }
-}
-
-
-NewTabPage::~NewTabPage()
-{
-}
-
-
-void NewTabPage::generate(KUrl url)
-{
-    if(KUrl("about:preview").isParentOf(url))
-    {
-        if(url.directory() == QString("preview/remove"))
-        {
-            removePreview(url.fileName().toInt());
-            return;
-        }
-        if(url.directory() == QString("preview/modify"))
-        {
-            int index = url.fileName().toInt();
-            Application::instance()->mainWindow()->currentTab()->createPreviewSelectorBar(index);
-            return;
-        }
-    }
-    
-    QWebPage *page = m_root.webFrame()->page();
-    page->mainFrame()->setHtml(m_html);
-
-    m_root = page->mainFrame()->documentElement().findFirst("#content");
-    
-    browsingMenu(url);
-    
-    QString title;
-    if(url == KUrl("about:favorites"))
-    {
-        favoritesPage();
-        title = i18n("Favorites");
-    }
-    else if(url == KUrl("about:closedTabs"))
-    {
-        closedTabsPage();
-        title = i18n("Closed Tabs");
-    }
-    else if(url == KUrl("about:history"))
-    {
-        historyPage();
-        title = i18n("History");
-    }
-    else if(url == KUrl("about:bookmarks"))
-    {
-        bookmarksPage();
-        title = i18n("Bookmarks");
-    }
-    
-    m_root.document().findFirst("title").setPlainText(title);
-}
-
-
-void NewTabPage::favoritesPage()
-{
-    m_root.addClass("favorites");
-    
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    for(int i=0; i<8; ++i)
-    {
-        KUrl url = urls.at(i);
-        QWebElement prev;
-        
-        if(url.isEmpty())
-            prev = emptyPreview(i);
-        else if(!QFile::exists(WebSnap::fileForUrl(url).toLocalFile()))
-            prev = loadingPreview(i, url);
-        else
-            prev = validPreview(i, url, names.at(i));
-        
-        setupPreview(prev, i);
-        
-        m_root.appendInside(prev);
-    }
-}
-
-
-QWebElement NewTabPage::emptyPreview(int index)
-{
-    QWebElement prev = markup(".thumbnail");
-    
-    prev.findFirst(".preview img").setAttribute("src" , QString("file:///") +
-                    KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
-    prev.findFirst("span a").setPlainText(i18n("Set a Preview..."));
-    prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
-    
-    setupPreview(prev, index);
-    hideControls(prev);
-    
-    return prev;
-}
-
-
-QWebElement NewTabPage::loadingPreview(int index, KUrl url)
-{
-    QWebElement prev = markup(".thumbnail");
-    
-    prev.findFirst(".preview img").setAttribute("src" , 
-                QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
-    prev.findFirst("span a").setPlainText(i18n("Loading Preview..."));
-    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
-    
-    setupPreview(prev, index);
-    showControls(prev);
-    
-    new WebSnap(url, m_root.webFrame(), index);
-    
-    return prev;
-}
-
-
-QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
-{
-    QWebElement prev = markup(".thumbnail");
-    KUrl previewPath = WebSnap::fileForUrl(url);
-    QString iString = QVariant(index).toString();
-    
-    prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString());
-    prev.findFirst("a").setAttribute("href", url.toMimeDataString());
-    prev.findFirst("span a").setAttribute("href", url.toMimeDataString());
-    prev.findFirst("span a").setPlainText(checkTitle(title));
-    
-    setupPreview(prev, index);
-    showControls(prev);
-    
-    return prev;
-}
-
-
-void NewTabPage::hideControls(QWebElement e)
-{
-    e.findFirst(".remove").setStyleProperty("visibility", "hidden");
-    e.findFirst(".modify").setStyleProperty("visibility", "hidden");
-}
-
-
-void NewTabPage::showControls(QWebElement e)
-{
-    e.findFirst(".remove").setStyleProperty("visibility", "visible");
-    e.findFirst(".modify").setStyleProperty("visibility", "visible");
-}
-
-
-void NewTabPage::setupPreview(QWebElement e, int index)
-{
-    e.findFirst(".remove img").setAttribute("src", QString("file:///") +
-    KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
-    e.findFirst(".remove").setAttribute("title", "Remove favorite");
-    e.findFirst(".modify img").setAttribute("src", QString("file:///") +
-    KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState));
-    e.findFirst(".modify").setAttribute("title", "Set new favorite");
-    
-    e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
-    e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString()));
-    
-    e.setAttribute("id", "preview" + QVariant(index).toString());
-}
-
-
-void NewTabPage::snapFinished(int index, KUrl url, QString title)
-{
-    // do not try to modify the page if it isn't the newTabPage
-    if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
-        return;
-    
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    QWebElement newPrev = validPreview(index, url, title);
-    
-    if(m_root.findAll(".closedTabs").count() != 0)
-        hideControls(newPrev);
-    
-    prev.replace(newPrev);
-    
-    // update title
-    if(m_root.findAll(".favorites").count() != 0)
-    {
-        QStringList names = ReKonfig::previewNames();
-        names.replace(index, title);
-        ReKonfig::setPreviewNames(names);
-        
-        ReKonfig::self()->writeConfig();
-    }
-}
-
-
-void NewTabPage::removePreview(int index)
-{
-    QStringList names = ReKonfig::previewNames();
-    QStringList urls = ReKonfig::previewUrls();
-    
-    urls.replace(index, QString(""));
-    names.replace(index, QString(""));
-    
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
-    
-    ReKonfig::self()->writeConfig();
-    
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    prev.replace(emptyPreview(index));
-}
-
-
-void NewTabPage::browsingMenu(const KUrl &currentUrl)
-{
-    QList<QWebElement> navItems;
-    
-    KIconLoader *loader = KIconLoader::global();
-    
-    QWebElement nav = markup(".link"); // Favorites
-    nav.findFirst("a").setAttribute("href", "about:favorites");
-    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
-    loader->iconPath("emblem-favorite", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Favorites"));
-    navItems.append(nav);
-    
-    nav = markup(".link"); // Closed Tabs
-    nav.findFirst("a").setAttribute("href", "about:closedTabs");
-    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
-    loader->iconPath("tab-close", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Closed Tabs"));
-    navItems.append(nav);
-    
-    nav = markup(".link"); // Bookmarks
-    nav.findFirst("a").setAttribute("href", "about:bookmarks");
-    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
-    loader->iconPath("bookmarks", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Bookmarks"));
-    navItems.append(nav);
-    
-    nav = markup(".link"); // History
-    nav.findFirst("a").setAttribute("href", "about:history");
-    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
-    loader->iconPath("view-history", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("History"));
-    navItems.append(nav);
-    
-    QWebElement it;
-    foreach(it, navItems)
-    {
-        if(it.findFirst("a").attribute("href") == currentUrl.toMimeDataString())
-            it.addClass("current");
-        else if(currentUrl == "about:home" && it.findFirst("a").attribute("href") == "about:favorites")
-                it.addClass("current");
-        m_root.document().findFirst("#navigation").appendInside(it);
-    }
-}
-
-
-void NewTabPage::historyPage()
-{
-    m_root.addClass("history");
-    
-    HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
-    
-    int i = 0;
-    do
-    {
-        QModelIndex index = model->index(i, 0, QModelIndex() );
-        if(model->hasChildren(index))
-        {
-            m_root.appendInside(markup("h3"));
-            m_root.lastChild().setPlainText(index.data().toString());
-            
-            for(int j=0; j< model->rowCount(index); ++j)
-            {
-                QModelIndex son = model->index(j, 0, index );
-                m_root.appendInside(son.data(HistoryModel::DateTimeRole).toDateTime().toString("hh:mm"));
-                m_root.appendInside("  ");
-                m_root.appendInside(markup("a"));
-                m_root.lastChild().setAttribute("href" , son.data(HistoryModel::UrlStringRole).toString());
-                m_root.lastChild().appendInside(son.data().toString());
-                m_root.appendInside("<br/>");
-            }
-        }
-        i++;
-    }
-    while( model->hasIndex( i , 0 , QModelIndex() ) );
-}
-
-
-void NewTabPage::bookmarksPage()
-{
-    m_root.addClass("bookmarks");
-    
-    KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
-    if (bookGroup.isNull())
-    {
-        return;
-    }
-
-    KBookmark bookmark = bookGroup.first();
-    while (!bookmark.isNull())
-    {
-        createBookItem(bookmark, m_root);
-        bookmark = bookGroup.next(bookmark);
-    }
-}
-
-
-void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent)
-{
-    if (bookmark.isGroup())
-    {
-        KBookmarkGroup group = bookmark.toGroup();
-        KBookmark bm = group.first();
-        parent.appendInside(markup("h3"));
-        parent.lastChild().setPlainText(group.text());
-        parent.appendInside(markup(".bookfolder"));
-        while (!bm.isNull())
-        {
-            createBookItem(bm, parent.lastChild()); // it is .bookfolder
-            bm = group.next(bm);
-        }
-    }
-    else if(bookmark.isSeparator())
-    {
-        parent.appendInside("<hr/>");
-    }
-    else
-    {
-        parent.appendInside(markup("a"));
-        parent.lastChild().setAttribute("href" , bookmark.url().prettyUrl());
-        parent.lastChild().setPlainText(bookmark.text());
-        parent.appendInside("<br/>");
-    }
-}
-
-
-void NewTabPage::closedTabsPage()
-{
-    m_root.addClass("closedTabs");
-    
-    QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
-    
-    for(int i=0; i < links.count(); ++i)
-    {
-        HistoryItem item = links.at(i);
-        QWebElement prev;
-        
-        if(item.url.isEmpty())
-            continue;
-        else if(!QFile::exists(WebSnap::fileForUrl(item.url).toLocalFile()))
-            prev = loadingPreview(i, item.url);
-        else
-            prev = validPreview(i, item.url, item.title);
-        
-        prev.setAttribute("id", "preview" + QVariant(i).toString());
-        hideControls(prev);
-        m_root.appendInside(prev);
-    }
-}
-
-
-QString NewTabPage::checkTitle(QString title)
-{
-    if(title.length() > 23)
-    {
-        title.truncate(20);
-        title += "...";
-    }
-    return title;
-}
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
deleted file mode 100644
index fd04e60a..00000000
--- a/src/rekonqpage/newtabpage.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef REKONQ_NEW_TAB_PAGE
-#define REKONQ_NEW_TAB_PAGE
-
-
-// Local Includes
-#include "rekonqprivate_export.h"
-
-// KDE Includes
-#include <KUrl>
-
-// Qt Includes
-#include <QObject>
-#include <QString>
-#include <QWebElement>
-
-// Forward Includes
-class KBookmark;
-class WebPage;
-
-
-class REKONQ_TESTS_EXPORT NewTabPage : public QObject
-{
-Q_OBJECT
-
-public:
-    NewTabPage(QWebFrame *frame);
-    ~NewTabPage();
-
-    /**
-     * This method takes an about: url and loads 
-     * the corresponding part of the new tab page
-     */
-    void generate(KUrl url = KUrl("about:home"));
-    
-    void snapFinished(int index, KUrl url, QString title);
-    void removePreview(int index);
-     
-protected:  
-    // these are the functions to build the new tab page
-    void browsingMenu(const KUrl &currentUrl);
-
-    void favoritesPage();
-    void historyPage();
-    void bookmarksPage();
-    void closedTabsPage();
-
-    // Previews handling
-    QWebElement emptyPreview(int index);
-    QWebElement loadingPreview(int index, KUrl url);
-    QWebElement validPreview(int index, KUrl url, QString title);
-    
-    /** This function takes a QwebElement with the .thumbnail structure,
-     *  hiding the "remove" and "modify" buttons
-     *
-     */
-    void hideControls(QWebElement e);
-    void showControls(QWebElement e);
-    void setupPreview(QWebElement e, int index);
-     
-private:
-    void createBookItem(const KBookmark &bookmark, QWebElement parent);
-    
-    /** This function helps to get faster a new markup of one type,
-     *  it isn't easy to create one with QWebElement.
-     *
-     *  It gets it in the #models div of home.html.
-     *  It works for all elements defined here.
-     *
-     */
-    inline QWebElement markup(QString selector) 
-    {
-       return m_root.document().findFirst("#models > " + selector).clone();
-    }
-    
-    QString checkTitle(QString title);
-
-    QString m_html;
-    
-    QWebElement m_root;
-};
-
-#endif // REKONQ_NEW_TAB_PAGE
diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp
deleted file mode 100644
index 924a5439..00000000
--- a/src/rekonqpage/previewselectorbar.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
-* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Auto Includes
-#include "previewselectorbar.h"
-#include "previewselectorbar.moc"
-
-// Local Include
-#include "rekonq.h"
-#include "websnap.h"
-#include "application.h"
-#include "mainwindow.h"
-#include "webtab.h"
-
-// KDE Includes
-#include <KIcon>
-#include <KLocalizedString>
-
-// Qt Includes
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QString>
-
-
-PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent)
-        : QWidget(parent)
-        , m_button(0)
-        , m_label(0)
-        , m_previewIndex(index)
-{
-    m_label = new QLabel(i18n("Please open up the webpage you want to add as favorite"), this);
-    m_label->setWordWrap(true);
-    
-    QToolButton *closeButton = new QToolButton(this);
-    closeButton->setAutoRaise(true);
-    closeButton->setIcon(KIcon("dialog-close"));
-    connect(closeButton, SIGNAL(clicked(bool)), this, SLOT(destroy()));
-    
-    m_button = new QPushButton(KIcon("insert-image"), i18n("Set to This Page"), this);
-    m_button->setMaximumWidth(250);
-    connect(m_button, SIGNAL(clicked(bool)), this, SLOT(clicked()));
-    
-    // layout
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->addWidget(closeButton);
-    layout->addWidget(m_label);
-    layout->addWidget(m_button);
-    
-    layout->setContentsMargins(2, 0, 2, 0);
-    
-    setLayout(layout);
-}
-
-
-PreviewSelectorBar::~PreviewSelectorBar()
-{
-}
-
-
-void PreviewSelectorBar::verifyUrl()
-{
-    
-    if(Application::instance()->mainWindow()->currentTab()->page()->mainFrame()->url().scheme() != "about")
-    {
-        m_button->setEnabled(true);
-        m_button->setToolTip("");
-    }
-    else
-    {
-        m_button->setEnabled(false);
-        m_button->setToolTip(i18n("You can not add this webpage as favorite"));
-    }
-}
-
-
-void PreviewSelectorBar::loadProgress()
-{
-    m_button->setEnabled(false);
-    m_button->setToolTip(i18n("Page is loading..."));
-}
-
-
-void PreviewSelectorBar::loadFinished()
-{
-    m_button->setEnabled(true);
-    m_button->setToolTip("");
-    
-    verifyUrl();
-}
-
-
-void PreviewSelectorBar::clicked()
-{
-    WebPage *page = Application::instance()->mainWindow()->currentTab()->page();
-    
-    if(page)
-    {
-        // this is done just lo let the render process being faster..
-        WebSnap::renderPreview(*page);
-        
-        KUrl url = page->mainFrame()->url();        
-        QStringList names = ReKonfig::previewNames();
-        QStringList urls = ReKonfig::previewUrls();
-        
-        urls.replace(m_previewIndex, url.toMimeDataString());
-        names.replace(m_previewIndex, page->mainFrame()->title());
-        
-        ReKonfig::setPreviewNames(names);
-        ReKonfig::setPreviewUrls(urls);
-        
-        ReKonfig::self()->writeConfig();
-        
-        
-        page->mainFrame()->load(KUrl("about:favorites"));
-    }
-    
-    destroy();
-}
-
-
-void PreviewSelectorBar::destroy()
-{
-    if (parentWidget() && parentWidget()->layout())
-    {
-        parentWidget()->layout()->removeWidget(this);
-    }
-    this->deleteLater();
-}
diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h
deleted file mode 100644
index bb9f26c4..00000000
--- a/src/rekonqpage/previewselectorbar.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
-* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef PREVIEWSELECTORBAR_H
-#define PREVIEWSELECTORBAR_H
-
-// Local Includes
-#include "rekonqprivate_export.h"
-#include "webpage.h"
-
-// Qt Includes
-#include <QWidget>
-#include <QPushButton>
-#include <QLabel>
-
-
-class REKONQ_TESTS_EXPORT PreviewSelectorBar : public QWidget
-{
-Q_OBJECT
-
-public:
-    PreviewSelectorBar(int index, QWidget *parent);
-    ~PreviewSelectorBar();
-    
-private slots:
-    void clicked();
-    
-    void loadProgress();
-    void loadFinished();
-    
-    void verifyUrl();
-    
-    void destroy();
-    
-private:    
-    QPushButton *m_button;
-    QLabel *m_label;
-    
-    int m_previewIndex;   
-};
-
-#endif // PREVIEWSELECTORBAR_H
-- 
cgit v1.2.1


From 9905c8c2a2c4f3ec27e2cc55cbfde83ddd35c5ce Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 19 Mar 2010 15:50:33 +0100
Subject: NewTabPage: clean API

---
 src/newtabpage.cpp | 19 ++++++++++---------
 src/newtabpage.h   | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 6fd5160d..69a80b29 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -79,7 +79,7 @@ NewTabPage::~NewTabPage()
 }
 
 
-void NewTabPage::generate(KUrl url)
+void NewTabPage::generate(const KUrl &url)
 {
     if(KUrl("about:preview").isParentOf(url))
     {
@@ -171,7 +171,7 @@ QWebElement NewTabPage::emptyPreview(int index)
 }
 
 
-QWebElement NewTabPage::loadingPreview(int index, KUrl url)
+QWebElement NewTabPage::loadingPreview(int index, const KUrl &url)
 {
     QWebElement prev = markup(".thumbnail");
     
@@ -189,7 +189,7 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url)
 }
 
 
-QWebElement NewTabPage::validPreview(int index, KUrl url, QString title)
+QWebElement NewTabPage::validPreview(int index, const KUrl &url, const QString &title)
 {
     QWebElement prev = markup(".thumbnail");
     KUrl previewPath = WebSnap::fileForUrl(url);
@@ -237,7 +237,7 @@ void NewTabPage::setupPreview(QWebElement e, int index)
 }
 
 
-void NewTabPage::snapFinished(int index, KUrl url, QString title)
+void NewTabPage::snapFinished(int index, const KUrl &url, const QString &title)
 {
     // do not try to modify the page if it isn't the newTabPage
     if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
@@ -432,12 +432,13 @@ void NewTabPage::closedTabsPage()
 }
 
 
-QString NewTabPage::checkTitle(QString title)
+QString NewTabPage::checkTitle(const QString &title)
 {
-    if(title.length() > 23)
+    QString t(title);
+    if(t.length() > 23)
     {
-        title.truncate(20);
-        title += "...";
+        t.truncate(20);
+        t += "...";
     }
-    return title;
+    return t;
 }
diff --git a/src/newtabpage.h b/src/newtabpage.h
index fd04e60a..6d3a7ea9 100644
--- a/src/newtabpage.h
+++ b/src/newtabpage.h
@@ -57,13 +57,15 @@ public:
      * This method takes an about: url and loads 
      * the corresponding part of the new tab page
      */
-    void generate(KUrl url = KUrl("about:home"));
+    void generate(const KUrl &url = KUrl("about:home"));
     
-    void snapFinished(int index, KUrl url, QString title);
-    void removePreview(int index);
+    void snapFinished(int index, const KUrl &url, const QString &title);
+
      
-protected:  
-    // these are the functions to build the new tab page
+private:
+    // these are the "high-level" functions to build the new tab page
+    // basically, you call browsingMenu + one the the *Page methods
+    // to load a page
     void browsingMenu(const KUrl &currentUrl);
 
     void favoritesPage();
@@ -71,38 +73,46 @@ protected:
     void bookmarksPage();
     void closedTabsPage();
 
+    // --------------------------------------------------------------------------
+    // "low-level" functions
+    // we use these to create the pages over
+    
     // Previews handling
     QWebElement emptyPreview(int index);
-    QWebElement loadingPreview(int index, KUrl url);
-    QWebElement validPreview(int index, KUrl url, QString title);
+    QWebElement loadingPreview(int index, const KUrl &url);
+    QWebElement validPreview(int index, const KUrl &url, const QString &title);
+
+    void removePreview(int index);
     
-    /** This function takes a QwebElement with the .thumbnail structure,
-     *  hiding the "remove" and "modify" buttons
+    /** 
+     * This function takes a QwebElement with the .thumbnail structure,
+     * hiding the "remove" and "modify" buttons
      *
      */
     void hideControls(QWebElement e);
     void showControls(QWebElement e);
     void setupPreview(QWebElement e, int index);
      
-private:
     void createBookItem(const KBookmark &bookmark, QWebElement parent);
     
-    /** This function helps to get faster a new markup of one type,
-     *  it isn't easy to create one with QWebElement.
+    /** 
+     * This function helps to get faster a new markup of one type,
+     * it isn't easy to create one with QWebElement.
      *
-     *  It gets it in the #models div of home.html.
-     *  It works for all elements defined here.
+     * It gets it in the #models div of home.html.
+     * It works for all elements defined here.
      *
      */
-    inline QWebElement markup(QString selector) 
+    inline QWebElement markup(const QString &selector) 
     {
        return m_root.document().findFirst("#models > " + selector).clone();
     }
     
-    QString checkTitle(QString title);
+    QString checkTitle(const QString &title);
 
-    QString m_html;
     
+private:
+    QString m_html;
     QWebElement m_root;
 };
 
-- 
cgit v1.2.1


From a6ef003dd4c1b6ad08eca4f5adaa4679bbc20bce Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 20 Mar 2010 22:54:21 +0100
Subject: Downloads Page

This commit implements the downloads history page.
While it is in an horrible shape, its slots seem working well
It needs just some love..
---
 src/history/historymanager.cpp   |  53 ++++++++++++++++++++
 src/history/historymanager.h     |  32 +++++++++++-
 src/newtabpage.cpp               |  51 +++++++++++++++++++
 src/newtabpage.h                 |   7 +--
 src/protocolhandler.cpp          |   2 +
 src/settings/settings_general.ui |   7 ++-
 src/webpage.cpp                  | 105 ++++++++++++++++++++++++---------------
 7 files changed, 213 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 362fe340..39c128f4 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -451,3 +451,56 @@ KCompletion * HistoryManager::completionObject() const
 {
     return m_completion;
 }
+
+
+void HistoryManager::addDownload(const QString &srcUrl, const QString &destUrl)
+{
+    QString downloadFilePath = KStandardDirs::locateLocal("appdata" , "downloads");
+    QFile downloadFile(downloadFilePath);
+    if ( !downloadFile.open(QFile::WriteOnly | QFile::Append) )
+    {
+        kDebug() << "azz...";
+        return;
+    }
+    QDataStream out(&downloadFile);
+    out << srcUrl;
+    out << destUrl;
+    out << QDateTime::currentDateTime();
+    downloadFile.close();
+}
+
+
+DownloadList HistoryManager::downloads()
+{
+    DownloadList list;
+    
+    QString downloadFilePath = KStandardDirs::locateLocal("appdata" , "downloads");
+    QFile downloadFile(downloadFilePath);
+    if ( !downloadFile.open(QFile::ReadOnly) )
+    {
+        kDebug() << "azz...";
+        return list;
+    }
+    
+    QDataStream in(&downloadFile);
+    while(!in.atEnd())
+    {
+        QString srcUrl;
+        in >> srcUrl;
+        QString destUrl;
+        in >> destUrl;
+        QDateTime dt;
+        in >> dt;
+        DownloadItem item(srcUrl, destUrl, dt);
+        list << item;
+    }
+    return list;
+}
+
+
+bool HistoryManager::clearDownloadsHistory()
+{
+    QString downloadFilePath = KStandardDirs::locateLocal("appdata" , "downloads");
+    QFile downloadFile(downloadFilePath);
+    return downloadFile.remove();
+}
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index e744ca4b..8fc5c30e 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -57,7 +57,10 @@ public:
                          const QDateTime &d = QDateTime(), 
                          const QString &t = QString()
                         )
-            : title(t), url(u), dateTime(d) {}
+            : title(t)
+            , url(u), 
+            dateTime(d) 
+    {}
 
     inline bool operator==(const HistoryItem &other) const
     {
@@ -77,6 +80,29 @@ public:
 };
 
 
+// ---------------------------------------------------------------------------------------------------------------
+
+
+class DownloadItem
+{
+public:
+    DownloadItem() {}
+    explicit DownloadItem(const QString &srcUrl,
+                          const QString &destUrl,
+                          const QDateTime &d
+                          )
+        : srcUrlString(srcUrl)
+        , destUrlString(destUrl)
+        , dateTime(d)
+    {}
+    
+    QString srcUrlString;
+    QString destUrlString;
+    QDateTime dateTime;
+};
+
+
+typedef QList<DownloadItem> DownloadList;
 
 // ---------------------------------------------------------------------------------------------------------------
 
@@ -131,6 +157,10 @@ public:
     */
     KCompletion *completionObject() const;
 
+    void addDownload(const QString &srcUrl, const QString &destUrl);
+    DownloadList downloads();
+    bool clearDownloadsHistory();
+    
 public slots:
     void clear();
     void loadSettings();
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 69a80b29..36ddafed 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -53,6 +53,9 @@
 // Qt Includes
 #include <QFile>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 NewTabPage::NewTabPage(QWebFrame *frame)
     : m_root(frame->documentElement())
@@ -124,6 +127,11 @@ void NewTabPage::generate(const KUrl &url)
         bookmarksPage();
         title = i18n("Bookmarks");
     }
+    else if(url == KUrl("about:downloads"))
+    {
+        downloadsPage();
+        title = i18n("Downloads");
+    }
     
     m_root.document().findFirst("title").setPlainText(title);
 }
@@ -315,6 +323,13 @@ void NewTabPage::browsingMenu(const KUrl &currentUrl)
     nav.findFirst("a").appendInside(i18n("History"));
     navItems.append(nav);
     
+    nav = markup(".link"); // History
+    nav.findFirst("a").setAttribute("href", "about:downloads");
+    nav.findFirst("img").setAttribute("src" , QString("file:///" + 
+    loader->iconPath("download", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
+    nav.findFirst("a").appendInside(i18n("Downloads"));
+    navItems.append(nav);
+    
     QWebElement it;
     foreach(it, navItems)
     {
@@ -442,3 +457,39 @@ QString NewTabPage::checkTitle(const QString &title)
     }
     return t;
 }
+
+
+void NewTabPage::downloadsPage()
+{
+    m_root.addClass("downloads");
+
+    DownloadList list = Application::historyManager()->downloads();
+    
+    foreach(const DownloadItem &item, list)
+    {
+        m_root.appendInside(markup("h3"));
+        m_root.lastChild().setPlainText("");
+    
+        KUrl u = KUrl(item.destUrlString);
+        QString fName = u.fileName();
+        QString dir = QL1S("file://") + u.directory();
+        
+        m_root.appendInside( item.dateTime.toString("dddd") );
+        m_root.appendInside("<br/>");
+        m_root.appendInside( item.dateTime.toString("dd MMMM yyyy") );
+        m_root.appendInside(", ");
+        m_root.appendInside( item.dateTime.toString("hh:mm:ss") );
+        m_root.appendInside("<br/>");
+        
+        m_root.appendInside(fName);
+        m_root.appendInside("<br/>");
+        
+        m_root.appendInside(item.srcUrlString);
+        m_root.appendInside("<br/>");
+
+        m_root.appendInside(markup("a"));
+        m_root.lastChild().setAttribute("href" , dir);
+        m_root.lastChild().setPlainText("browse dir");
+        m_root.appendInside("<br/>");
+    }
+}
diff --git a/src/newtabpage.h b/src/newtabpage.h
index 6d3a7ea9..6604e4df 100644
--- a/src/newtabpage.h
+++ b/src/newtabpage.h
@@ -63,8 +63,8 @@ public:
 
      
 private:
-    // these are the "high-level" functions to build the new tab page
-    // basically, you call browsingMenu + one the the *Page methods
+    // these are the "high-level" functions to build the new tab page.
+    // Basically, you call browsingMenu + one of the *Page methods
     // to load a page
     void browsingMenu(const KUrl &currentUrl);
 
@@ -72,7 +72,8 @@ private:
     void historyPage();
     void bookmarksPage();
     void closedTabsPage();
-
+    void downloadsPage();
+    
     // --------------------------------------------------------------------------
     // "low-level" functions
     // we use these to create the pages over
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 9d1560ed..faba894b 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -142,6 +142,8 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
             case 3: // history
                 _url = KUrl("about:history");
                 break;
+            case 4: // downloads
+                _url = KUrl("about:downloads");
             default: // unuseful
                 break;
             }
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index a4503d4a..98a56591 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -262,6 +262,11 @@
           <string>History</string>
          </property>
         </item>
+        <item>
+         <property name="text">
+          <string>Downloads</string>
+         </property>
+        </item>
        </widget>
       </item>
      </layout>
@@ -284,7 +289,7 @@
        <widget class="QCheckBox" name="kcfg_kgetList">
         <property name="whatsThis">
          <string>If enabled, rekonq will display an additional context menu entry, which, when selected, lists all available links of the current website in KGet.</string>
-        </property>	
+        </property>
         <property name="text">
          <string>List links with KGet</string>
         </property>
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 42193ed0..0e7b3d8a 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -71,6 +71,9 @@
 #include <QtGui/QKeyEvent>
 #include <QWebFrame>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 WebPage::WebPage(QWidget *parent)
     : KWebPage(parent, KWalletIntegration)
@@ -292,55 +295,76 @@ QString WebPage::errorPage(QNetworkReply *reply)
 }
 
 
+// WARNING
+// this code is actually copied from KWebPage::downloadRequest to save
+// downloads data before. If you have some better ideas about,
+// feel free to let us know about :)
 void WebPage::downloadRequest(const QNetworkRequest &request)
 {
-    if (ReKonfig::kgetDownload())
-    {
-        //*Copy of kwebpage code (Shouldn't be done in kwebpage ?)
-
-        KUrl destUrl;
-        KUrl srcUrl (request.url());
-        int result = KIO::R_OVERWRITE;
-
-        do 
-        {
-            destUrl = KFileDialog::getSaveFileName(srcUrl.fileName(), QString(), view());
-
-            if (destUrl.isLocalFile()) 
-            {
-                QFileInfo finfo (destUrl.toLocalFile());
-                if (finfo.exists()) 
-                {
-                    QDateTime now = QDateTime::currentDateTime();
-                    QPointer<KIO::RenameDialog> dlg = new KIO::RenameDialog( view(), i18n("Overwrite File?"), srcUrl, destUrl,
-                                                                            KIO::RenameDialog_Mode(KIO::M_OVERWRITE | KIO::M_SKIP),
-                                                                            -1, finfo.size(),
-                                                                            now.toTime_t(), finfo.created().toTime_t(),
-                                                                            now.toTime_t(), finfo.lastModified().toTime_t());
-                    result = dlg->exec();
-                    delete dlg;
-                }
-            }
-        } 
-        while (result == KIO::R_CANCEL && destUrl.isValid());
-
-        if (result == KIO::R_OVERWRITE && destUrl.isValid()) 
+    KUrl destUrl;                                                                                                                         
+    KUrl srcUrl (request.url());                                                                                                          
+    int result = KIO::R_OVERWRITE;                                                                                                        
+                                                                                                                                          
+    do 
+    {                                                                                                                                  
+        destUrl = KFileDialog::getSaveFileName(srcUrl.fileName(), QString(), view());                                                     
+                                                                                                                                          
+        if (destUrl.isLocalFile()) 
+        {                                                                                                      
+            QFileInfo finfo( destUrl.toLocalFile() );                                                                                      
+            if ( finfo.exists() ) 
+            {                                                                                                         
+                QDateTime now = QDateTime::currentDateTime();                                                                             
+                QPointer<KIO::RenameDialog> dlg = new KIO::RenameDialog( view(), 
+                                                                         i18n("Overwrite File?"), 
+                                                                         srcUrl, 
+                                                                         destUrl,                                                  
+                                                                         KIO::RenameDialog_Mode(KIO::M_OVERWRITE | KIO::M_SKIP),                                            
+                                                                         -1, 
+                                                                         finfo.size(),                                                                                  
+                                                                         now.toTime_t(), 
+                                                                         finfo.created().toTime_t(),                                                        
+                                                                         now.toTime_t(), 
+                                                                         finfo.lastModified().toTime_t()
+                                                                        );                                                  
+                result = dlg->exec();
+                delete dlg;                                                                                                      
+            }                                                                                                                             
+        }                                                                                                                                 
+    } 
+    while ( result == KIO::R_CANCEL && destUrl.isValid() );                                                                               
+    
+    // now store data
+    // now, destUrl, srcUrl
+    Application::historyManager()->addDownload( srcUrl.pathOrUrl() , destUrl.pathOrUrl() );
+    
+    if ( result == KIO::R_OVERWRITE && destUrl.isValid() ) 
+    {                                               
+        if ( ReKonfig::kgetDownload() )
         {
-            //*End of copy code
-            
             //KGet integration:
             if(!QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.kget"))
             {
                 KToolInvocation::kdeinitExecWait("kget");
             }
             QDBusInterface kget("org.kde.kget", "/KGet", "org.kde.kget.main");
-            kget.call("addTransfer", srcUrl.prettyUrl(), destUrl.prettyUrl(), true);
+            if( kget.isValid() )
+            {
+                kget.call("addTransfer", srcUrl.prettyUrl(), destUrl.prettyUrl(), true);
+                return;
+            }
         }
         
-        return;
-    }
-    
-    KWebPage::downloadRequest(request);
+        // else, use KIO or fallback to it
+        KIO::Job *job = KIO::file_copy(srcUrl, destUrl, -1, KIO::Overwrite);                                                              
+        QVariant attr = request.attribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData));                         
+        if (attr.isValid() && attr.type() == QVariant::Map)                                                                               
+            job->setMetaData(KIO::MetaData(attr.toMap()));                                                                                
+                                                                                                                                        
+        job->addMetaData(QL1S("MaxCacheSize"), QL1S("0")); // Don't store in http cache.                                                    
+        job->addMetaData(QL1S("cache"), QL1S("cache"));   // Use entry from cache if available.                                               
+        job->uiDelegate()->setAutoErrorHandlingEnabled(true);
+    } 
 }
 
 
@@ -369,5 +393,8 @@ void WebPage::downloadAllContentsWithKGet()
         KToolInvocation::kdeinitExecWait("kget");
     }
     QDBusInterface kget("org.kde.kget", "/KGet", "org.kde.kget.main");
-    kget.call("importLinks", QVariant(contents.toList()));
+    if( kget.isValid() )
+    {
+        kget.call("importLinks", QVariant(contents.toList()));
+    }
 }
-- 
cgit v1.2.1


From bbe335e37543af9a8d235daf2584c306eeaa4e1e Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Sun, 21 Mar 2010 01:40:01 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index b6b12078..f04a8a51 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -2,6 +2,7 @@
 Name=rekonq
 Name[cs]=rekonq
 Name[de]=rekonq
+Name[en_GB]=rekonq
 Name[ga]=rekonq
 Name[nds]=Rekonq
 Name[pt]=rekonq
@@ -12,6 +13,7 @@ Name[x-test]=xxrekonqxx
 GenericName=Webkit KDE Browser
 GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
 GenericName[de]=WebKit-basierter Webbrowser für KDE
+GenericName[en_GB]=Webkit KDE Browser
 GenericName[ga]=Brabhsálaí Webkit KDE
 GenericName[nds]=Webkit-KDE-Kieker
 GenericName[pt]=Navegador do KDE usando o WebKit
-- 
cgit v1.2.1


From 2cc02d8f7a60669a49aaf281b2f956184056cb25 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Sun, 21 Mar 2010 18:35:25 +0100
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index f04a8a51..fc42e1dd 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=rekonq
 Name[cs]=rekonq
+Name[da]=rekonq
 Name[de]=rekonq
 Name[en_GB]=rekonq
 Name[ga]=rekonq
@@ -12,6 +13,7 @@ Name[uk]=rekonq
 Name[x-test]=xxrekonqxx
 GenericName=Webkit KDE Browser
 GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
+GenericName[da]=KDE-browser baseret på Webkit
 GenericName[de]=WebKit-basierter Webbrowser für KDE
 GenericName[en_GB]=Webkit KDE Browser
 GenericName[ga]=Brabhsálaí Webkit KDE
-- 
cgit v1.2.1


From 6a34b95f02848f75057f5e913e500115643fde5d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 22 Mar 2010 02:46:24 +0100
Subject: First SSL support. checking metadata missing..

---
 src/CMakeLists.txt    |   1 +
 src/sslinfodialog_p.h | 107 +++++++++++++++++++++++++
 src/webpage.cpp       | 175 +++++++++++++++++++++++++++++++++++------
 src/webpage.h         |   7 +-
 src/websslinfo.cpp    | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/websslinfo.h      |  73 +++++++++++++++++
 6 files changed, 548 insertions(+), 26 deletions(-)
 create mode 100644 src/sslinfodialog_p.h
 create mode 100644 src/websslinfo.cpp
 create mode 100644 src/websslinfo.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d41ebfe0..bc4e91c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ SET( rekonq_KDEINIT_SRCS
     webinspectorpanel.cpp
     webpage.cpp
     webpluginfactory.cpp
+    websslinfo.cpp
     websnap.cpp
     webview.cpp
     webtab.cpp
diff --git a/src/sslinfodialog_p.h b/src/sslinfodialog_p.h
new file mode 100644
index 00000000..44d3ab7c
--- /dev/null
+++ b/src/sslinfodialog_p.h
@@ -0,0 +1,107 @@
+/* This file is part of the KDE project
+ *
+ * Copyright (C) 2000-2003 George Staikos <staikos@kde.org>
+ * Copyright (C) 2000 Malte Starostik <malte@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#ifndef SSLINFODIALOG_P_H
+#define SSLINFODIALOG_P_H
+
+#include <kdemacros.h>
+
+#include <KDE/KDialog>
+#include <ktcpsocket.h>
+
+// NOTE: We need a copy of this header file is needed here because it
+// is never installed by default by KIO.
+
+/**
+ * KDE SSL Information Dialog
+ *
+ * This class creates a dialog that can be used to display information about
+ * an SSL session.
+ *
+ * There are NO GUARANTEES that KSslInfoDialog will remain binary compatible/
+ * Contact staikos@kde.org for details if needed.
+ *
+ * @author George Staikos <staikos@kde.org>
+ * @see KSSL
+ * @short KDE SSL Information Dialog
+ */
+class KDE_EXPORT KSslInfoDialog : public KDialog 
+{
+Q_OBJECT
+
+public:
+    /**
+        *  Construct a KSSL Information Dialog
+        *
+        *  @param parent the parent widget
+        */
+    explicit KSslInfoDialog(QWidget *parent = 0);
+
+    /**
+        *  Destroy this dialog
+        */
+    virtual ~KSslInfoDialog();
+
+    /**
+        *  Tell the dialog if the connection has portions that may not be
+        *  secure (ie. a mixture of secure and insecure frames)
+        *
+        *  @param isIt true if security is in question
+        */
+    void setSecurityInQuestion(bool isIt);
+
+    /**
+        *  Set information to display about the SSL connection.
+        *
+        *  @param certificateChain the certificate chain leading from the certificate
+        *         authority to the peer.
+        *  @param ip the ip of the remote host
+        *  @param host the remote hostname
+        *  @param sslProtocol the version of SSL in use (SSLv2, SSLv3, TLSv1)
+        *  @param cipher the cipher in use
+        *  @param usedBits the used bits of the key
+        *  @param bits the key size of the cipher in use
+        *  @param validationErrors errors validating the certificates, if any
+        */
+    void setSslInfo(const QList<QSslCertificate> &certificateChain,
+                    const QString &ip, const QString &host,
+                    const QString &sslProtocol, const QString &cipher,
+                    int usedBits, int bits,
+                    const QList<QList<KSslError::Error> > &validationErrors);
+
+    void setMainPartEncrypted(bool);
+    void setAuxiliaryPartsEncrypted(bool);
+
+    static QList<QList<KSslError::Error> > errorsFromString(const QString &s);
+
+private Q_SLOTS:
+    void launchConfig();
+    void displayFromChain(int);
+
+private:
+    void updateWhichPartsEncrypted();
+
+    class KSslInfoDialogPrivate;
+    KSslInfoDialogPrivate* const d;
+};
+
+#endif // SSLINFODIALOG_P_H
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 0e7b3d8a..395e9073 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -45,6 +45,8 @@
 #include "networkaccessmanager.h"
 #include "adblockmanager.h"
 
+#include "sslinfodialog_p.h"
+
 // KDE Includes
 #include <KStandardDirs>
 #include <KUrl>
@@ -73,6 +75,32 @@
 
 // Defines
 #define QL1S(x)  QLatin1String(x)
+#define QL1C(x)  QLatin1Char(x)
+
+
+// Returns true if the scheme and domain of the two urls match...
+static bool domainSchemeMatch(const QUrl& u1, const QUrl& u2)
+{
+    if (u1.scheme() != u2.scheme())
+        return false;
+
+    QStringList u1List = u1.host().split(QL1C('.'), QString::SkipEmptyParts);
+    QStringList u2List = u2.host().split(QL1C('.'), QString::SkipEmptyParts);
+
+    if (qMin(u1List.count(), u2List.count()) < 2)
+        return false;  // better safe than sorry...
+
+    while (u1List.count() > 2)
+        u1List.removeFirst();
+
+    while (u2List.count() > 2)
+        u2List.removeFirst();
+
+    return (u1List == u2List);
+}
+
+
+// ---------------------------------------------------------------------------------
 
 
 WebPage::WebPage(QWidget *parent)
@@ -92,6 +120,14 @@ WebPage::WebPage(QWidget *parent)
 
     setNetworkAccessManager(manager);
     
+    // activate ssl warnings
+    setSessionMetaData("ssl_activate_warnings", "TRUE");
+    
+    // Override the 'Accept' header sent by QtWebKit which favors XML over HTML!
+    // Setting the accept meta-data to null will force kio_http to use its own
+    // default settings for this header.
+    setSessionMetaData(QL1S("accept"), QString());
+    
     // ----- Web Plugin Factory
     setPluginFactory(new WebPluginFactory(this));
     
@@ -100,7 +136,7 @@ WebPage::WebPage(QWidget *parent)
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 
     // protocol handler signals
-    connect(&m_protHandler, SIGNAL(downloadUrl(const KUrl &)), this, SLOT(downloadUrl(const KUrl &)));
+    connect(&_protHandler, SIGNAL(downloadUrl(const KUrl &)), this, SLOT(downloadUrl(const KUrl &)));
 }
 
 
@@ -112,21 +148,54 @@ WebPage::~WebPage()
 
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
-    // advise users on resubmitting data
-    if(type == QWebPage::NavigationTypeFormResubmitted)
+    if(frame)
     {
-        int risp = KMessageBox::warningContinueCancel(view(), 
-                                                      i18n("Are you sure you want to send your data again?"), 
-                                                      i18n("Resend form data") );
-        if(risp == KMessageBox::Cancel)
+        if ( _protHandler.preHandling(request, frame) )
+        {
             return false;
+        }
+               
+        switch (type) 
+        {
+        case QWebPage::NavigationTypeLinkClicked:
+            if (_sslInfo.isValid() )
+            {
+                setRequestMetaData("ssl_was_in_use", "TRUE");
+            }
+            break;
+            
+        case QWebPage::NavigationTypeFormSubmitted:
+            break;
+            
+        case QWebPage::NavigationTypeFormResubmitted:
+            if( KMessageBox::warningContinueCancel(view(), 
+                                                    i18n("Are you sure you want to send your data again?"), 
+                                                    i18n("Resend form data") 
+                                                  )
+                == KMessageBox::Cancel)
+            {
+                return false;                
+            }
+            break;
+            
+        case QWebPage::NavigationTypeReload:
+        case QWebPage::NavigationTypeBackOrForward:
+        case QWebPage::NavigationTypeOther:
+            break;
+            
+        default:
+            break;
+        }    
+    
+        if(frame == mainFrame())
+        {
+            setRequestMetaData("main_frame_request", "TRUE");
+        }
+        else
+        {
+            setRequestMetaData("main_frame_request", "FALSE");
+        }
     }
-
-    if ( frame && m_protHandler.preHandling(request, frame) )
-    {
-        return false;
-    }
-
     return KWebPage::acceptNavigationRequest(frame, request, type);
 }
 
@@ -197,38 +266,67 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 }
 
 
-void WebPage::loadFinished(bool)
+void WebPage::loadFinished(bool ok)
 {
+    if(!ok)
+        return;
+    
     Application::adblockManager()->applyHidingRules(this);
     
+    QStringList list = ReKonfig::walletBlackList();
+    
     // KWallet Integration
-    // TODO: Add check for sites exempt from automatic form filling...
-    if (wallet()) 
+    if ( wallet() 
+         && !list.contains( mainFrame()->url().toString() ) 
+       ) 
     {
         wallet()->fillFormData(mainFrame());
     }
+    
+    // TODO: implement me!
+    if(_sslInfo.isValid())
+    {
+        // show an icon in the urlbar
+    }
+    else
+    {
+        // hide the icon in the urlbar
+    }
 }
 
 
 void WebPage::manageNetworkErrors(QNetworkReply *reply)
 {
     Q_ASSERT(reply);
-
-    WebView *v = 0;
+    QWebFrame* frame = qobject_cast<QWebFrame *>(reply->request().originatingObject());
+    const bool isMainFrameRequest = (frame == mainFrame());
     
-    // NOTE 
-    // These are not all networkreply errors, 
+    if ( isMainFrameRequest 
+         && _sslInfo.isValid()
+         && !domainSchemeMatch(reply->url(), _sslInfo.url())
+       ) 
+    {
+        //kDebug() << "Reseting cached SSL info...";
+        _sslInfo = WebSslInfo();
+    }
+            
+    // NOTE: These are not all networkreply errors, 
     // but just that supported directly by KIO
-    
     switch( reply->error() )
     {
         
-    case QNetworkReply::NoError:                            // no error. Simple :)
+    case QNetworkReply::NoError:                             // no error. Simple :)
+        if ( isMainFrameRequest && !_sslInfo.isValid() ) 
+        {
+            // Obtain and set the SSL information if any...
+            _sslInfo.fromMetaData(reply->attribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData)));
+            _sslInfo.setUrl(reply->url());
+        }
         break;
 
     case QNetworkReply::UnknownNetworkError:                 // unknown network-related error detected
 
-        if( m_protHandler.postHandling(reply->request(), mainFrame()) )
+        if( _protHandler.postHandling(reply->request(), mainFrame()) )
             break;
 
     case QNetworkReply::ContentAccessDenied:                 // access to remote content denied (similar to HTTP error 401)
@@ -247,8 +345,7 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
 
         // don't bother on elements loading errors: 
         // we'll manage just main url page ones
-        v = qobject_cast<WebView *>(view());
-        if( reply->url() != v->url() )
+        if( !isMainFrameRequest )
             break;
         
         mainFrame()->setHtml( errorPage(reply), reply->url() );
@@ -398,3 +495,31 @@ void WebPage::downloadAllContentsWithKGet()
         kget.call("importLinks", QVariant(contents.toList()));
     }
 }
+
+
+void WebPage::showSSLInfo()
+{
+    if (_sslInfo.isValid()) 
+    {
+        QPointer<KSslInfoDialog> dlg = new KSslInfoDialog ( view() );
+        dlg->setSslInfo( _sslInfo.certificateChain(),
+                         _sslInfo.peerAddress().toString(),
+                         mainFrame()->url().host(),
+                         _sslInfo.protocol(),
+                         _sslInfo.ciphers(),
+                         _sslInfo.usedChiperBits(),
+                         _sslInfo.supportedChiperBits(),
+                         KSslInfoDialog::errorsFromString( _sslInfo.certificateErrors() )
+                        );
+
+        dlg->open();
+        delete dlg;
+    } 
+    else 
+    {
+        KMessageBox::information( 0, 
+                                  i18n("The SSL information for this site appears to be corrupt."), 
+                                  i18nc("Secure Sockets Layer", "SSL")
+                                );
+    }
+}
diff --git a/src/webpage.h b/src/webpage.h
index 76927725..42d5f586 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -37,6 +37,7 @@
 #include "rekonqprivate_export.h"
 #include "protocolhandler.h"
 #include "newtabpage.h"
+#include "websslinfo.h"
 
 // KDE Includes
 #include <KWebPage>
@@ -57,6 +58,8 @@ public:
     explicit WebPage(QWidget *parent = 0);
     ~WebPage();
 
+    void showSSLInfo();
+
 public slots:
     void manageNetworkErrors(QNetworkReply *reply);
     virtual void downloadRequest(const QNetworkRequest &request);
@@ -78,7 +81,9 @@ private slots:
 private:
     QString errorPage(QNetworkReply *);
 
-    ProtocolHandler m_protHandler;
+    ProtocolHandler _protHandler;
+
+    WebSslInfo _sslInfo;
 };
 
 #endif
diff --git a/src/websslinfo.cpp b/src/websslinfo.cpp
new file mode 100644
index 00000000..ffc4918f
--- /dev/null
+++ b/src/websslinfo.cpp
@@ -0,0 +1,211 @@
+/*
+ * This file is part of the KDE project.
+ *
+ * Copyright (C) 2009 Dawit Alemayehu <adawit@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "websslinfo.h"
+
+#include <QtCore/QVariant>
+
+
+class WebSslInfo::WebSslInfoPrivate
+{
+public:
+  WebSslInfoPrivate()
+      : usedCipherBits(0), supportedCipherBits(0) {}
+
+  QUrl url;
+  QString ciphers;
+  QString protocol;
+  QString certErrors;
+  QHostAddress peerAddress;
+  QHostAddress parentAddress;
+  QList<QSslCertificate> certificateChain;
+
+  int usedCipherBits;
+  int supportedCipherBits;
+};
+
+WebSslInfo::WebSslInfo()
+           :d(new WebSslInfo::WebSslInfoPrivate)
+{
+}
+
+WebSslInfo::WebSslInfo(const WebSslInfo& other)
+           :d(new WebSslInfo::WebSslInfoPrivate)
+{
+  *this = other;
+}
+
+WebSslInfo::~WebSslInfo()
+{
+  delete d;
+  d = 0;
+}
+
+bool WebSslInfo::isValid() const
+{
+  return !d->peerAddress.isNull();
+}
+
+QUrl WebSslInfo::url() const
+{
+  return d->url;
+}
+
+QHostAddress WebSslInfo::parentAddress() const
+{
+  return d->parentAddress;
+}
+
+QHostAddress WebSslInfo::peerAddress() const
+{
+  return d->peerAddress;
+}
+
+QString WebSslInfo::protocol() const
+{
+  return d->protocol;
+}
+
+QString WebSslInfo::ciphers() const
+{
+  return d->ciphers;
+}
+
+QString WebSslInfo::certificateErrors() const
+{
+  return d->certErrors;
+}
+
+int WebSslInfo::supportedChiperBits () const
+{
+  return d->supportedCipherBits;
+}
+
+int WebSslInfo::usedChiperBits () const
+{
+  return d->usedCipherBits;
+}
+
+QList<QSslCertificate> WebSslInfo::certificateChain() const
+{
+  return d->certificateChain;
+}
+
+WebSslInfo& WebSslInfo::operator=(const WebSslInfo& other)
+{
+  d->ciphers = other.d->ciphers;
+  d->protocol = other.d->protocol;
+  d->certErrors = other.d->certErrors;
+  d->peerAddress = other.d->peerAddress;
+  d->parentAddress = other.d->parentAddress;
+  d->certificateChain = other.d->certificateChain;
+
+  d->usedCipherBits = other.d->usedCipherBits;
+  d->supportedCipherBits = other.d->supportedCipherBits;
+  d->url = other.d->url;
+
+  return *this;
+}
+
+QVariant WebSslInfo::toMetaData() const
+{
+  if (isValid()) {
+    QMap<QString, QVariant> data;
+    data.insert("ssl_in_use", true);
+    data.insert("ssl_peer_ip", d->peerAddress.toString());
+    data.insert("ssl_parent_ip", d->parentAddress.toString());
+    data.insert("ssl_protocol_version", d->protocol);
+    data.insert("ssl_cipher", d->ciphers);
+    data.insert("ssl_cert_errors", d->certErrors);
+    data.insert("ssl_cipher_used_bits", d->usedCipherBits);
+    data.insert("ssl_cipher_bits", d->supportedCipherBits);
+    QByteArray certChain;
+    Q_FOREACH(const QSslCertificate& cert, d->certificateChain)
+        certChain += cert.toPem();
+    data.insert("ssl_peer_chain", certChain);
+    return data;
+  }
+
+  return QVariant();
+}
+
+void WebSslInfo::fromMetaData(const QVariant& value)
+{
+  if (value.isValid() && value.type() == QVariant::Map) {
+    QMap<QString,QVariant> metaData = value.toMap();
+    if (metaData.value("ssl_in_use", false).toBool()) {
+        setCertificateChain(metaData.value("ssl_peer_chain").toByteArray());
+        setPeerAddress(metaData.value("ssl_peer_ip").toString());
+        setParentAddress(metaData.value("ssl_parent_ip").toString());
+        setProtocol(metaData.value("ssl_protocol_version").toString());
+        setCiphers(metaData.value("ssl_cipher").toString());
+        setCertificateErrors(metaData.value("ssl_cert_errors").toString());
+        setUsedCipherBits(metaData.value("ssl_cipher_used_bits").toString());
+        setSupportedCipherBits(metaData.value("ssl_cipher_bits").toString());
+    }
+  }
+}
+
+void WebSslInfo::setUrl (const QUrl &url)
+{
+  d->url = url;
+}
+
+void WebSslInfo::setPeerAddress(const QString& address)
+{
+  d->peerAddress = address;
+}
+
+void WebSslInfo::setParentAddress(const QString& address)
+{
+  d->parentAddress = address;
+}
+
+void WebSslInfo::setProtocol(const QString& protocol)
+{
+  d->protocol = protocol;
+}
+
+void WebSslInfo::setCertificateChain(const QByteArray& chain)
+{
+  d->certificateChain = QSslCertificate::fromData(chain);
+}
+
+void WebSslInfo::setCiphers(const QString& ciphers)
+{
+  d->ciphers = ciphers;
+}
+
+void WebSslInfo::setUsedCipherBits(const QString& bits)
+{
+  d->usedCipherBits = bits.toInt();
+}
+
+void WebSslInfo::setSupportedCipherBits(const QString& bits)
+{
+  d->supportedCipherBits = bits.toInt();
+}
+
+void WebSslInfo::setCertificateErrors(const QString& certErrors)
+{
+  d->certErrors = certErrors;
+}
diff --git a/src/websslinfo.h b/src/websslinfo.h
new file mode 100644
index 00000000..433cf053
--- /dev/null
+++ b/src/websslinfo.h
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the KDE project.
+ *
+ * Copyright (C) 2009 Dawit Alemayehu <adawit@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+#ifndef WEBSSLINFO_H
+#define WEBSSLINFO_H
+
+#include <kdemacros.h>
+
+#include <QtCore/QUrl>
+#include <QtCore/QList>
+#include <QtCore/QString>
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QSslCertificate>
+
+
+class WebSslInfo
+{
+public:
+  WebSslInfo();
+  WebSslInfo(const WebSslInfo&);
+  virtual ~WebSslInfo();
+
+  bool isValid() const;
+  QUrl url() const;
+  QHostAddress peerAddress() const;
+  QHostAddress parentAddress() const;
+  QString ciphers() const;
+  QString protocol() const;
+  QString certificateErrors() const;
+  int supportedChiperBits () const;
+  int usedChiperBits () const;
+  QList<QSslCertificate> certificateChain() const;
+
+  QVariant toMetaData() const;
+  void fromMetaData (const QVariant &);
+
+  void setUrl (const QUrl &url);
+  WebSslInfo& operator = (const WebSslInfo&);
+
+protected:
+  void setCiphers(const QString& ciphers);
+  void setProtocol(const QString& protocol);
+  void setPeerAddress(const QString& address);
+  void setParentAddress(const QString& address);
+  void setCertificateChain(const QByteArray& chain);
+  void setCertificateErrors(const QString& certErrors);
+  void setUsedCipherBits(const QString& bits);
+  void setSupportedCipherBits(const QString& bits);
+
+private:
+  class WebSslInfoPrivate;
+  WebSslInfoPrivate* d;
+};
+
+#endif // WEBSSLINFO_H
-- 
cgit v1.2.1


From 1c3456d2821b73aa3f616b773499e99facf595f3 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 22 Mar 2010 11:31:05 +0100
Subject: Fixing loading checking errors and retrieving ssl metadata. We need
 just this F*****g awesome bar to show them :)

---
 src/webpage.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 395e9073..0da17a7b 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -148,6 +148,18 @@ WebPage::~WebPage()
 
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
+    KIO::AccessManager *manager = qobject_cast<KIO::AccessManager*>(networkAccessManager());
+    KIO::MetaData metaData = manager->requestMetaData();
+    
+    // Get the SSL information sent, if any...
+    if( metaData.contains(QL1S("ssl_in_use")) ) 
+    {
+        WebSslInfo info;
+        info.fromMetaData(metaData.toVariant());
+        info.setUrl(request.url());
+        _sslInfo = info;
+    }
+    
     if(frame)
     {
         if ( _protHandler.preHandling(request, frame) )
@@ -287,10 +299,12 @@ void WebPage::loadFinished(bool ok)
     if(_sslInfo.isValid())
     {
         // show an icon in the urlbar
+        kDebug() << "----------------- SSL VALID INFO!!!! ------------------";
     }
     else
     {
         // hide the icon in the urlbar
+        kDebug() << "----------------- SSL INFO NOT VALID... ------------------";
     }
 }
 
@@ -298,6 +312,7 @@ void WebPage::loadFinished(bool ok)
 void WebPage::manageNetworkErrors(QNetworkReply *reply)
 {
     Q_ASSERT(reply);
+    WebView *v = 0;
     QWebFrame* frame = qobject_cast<QWebFrame *>(reply->request().originatingObject());
     const bool isMainFrameRequest = (frame == mainFrame());
     
@@ -343,9 +358,10 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
     case QNetworkReply::ProtocolUnknownError:                // Unknown protocol
     case QNetworkReply::ProtocolInvalidOperationError:       // requested operation is invalid for this protocol
 
-        // don't bother on elements loading errors: 
+        // don't bother on elements loading errors:
         // we'll manage just main url page ones
-        if( !isMainFrameRequest )
+        v = qobject_cast<WebView *>(view());
+        if( reply->url() != v->url() )
             break;
         
         mainFrame()->setHtml( errorPage(reply), reply->url() );
-- 
cgit v1.2.1


From c7fccbe4aa27b7dbd2eccba9ada4cdceba3490eb Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 22 Mar 2010 15:30:41 +0100
Subject: Doing "load finished" operations just on ok loading is really NOT a
 good idea..

---
 src/webpage.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 0da17a7b..06e733b0 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -278,11 +278,8 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 }
 
 
-void WebPage::loadFinished(bool ok)
+void WebPage::loadFinished(bool)
 {
-    if(!ok)
-        return;
-    
     Application::adblockManager()->applyHidingRules(this);
     
     QStringList list = ReKonfig::walletBlackList();
-- 
cgit v1.2.1


From e9670c51fef2c8447a04a30778a24646df4ef915 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Tue, 23 Mar 2010 22:56:26 +0100
Subject: A lot of fix and improvements for the bookmark and the history panels

---
 src/CMakeLists.txt                   |   1 +
 src/bookmarks/bookmarksmanager.cpp   |   4 +-
 src/bookmarks/bookmarksmanager.h     |   4 +-
 src/bookmarks/bookmarkspanel.cpp     | 441 +++++++++++++++++++++++++++++++++--
 src/bookmarks/bookmarkspanel.h       |  36 ++-
 src/bookmarks/bookmarkstreemodel.cpp | 265 ++++++++++++++-------
 src/bookmarks/bookmarkstreemodel.h   |  51 ++--
 src/history/historymodels.cpp        |   8 +
 src/history/historypanel.cpp         |  89 +++++--
 src/history/historypanel.h           |  10 +-
 src/mainwindow.cpp                   |   6 +-
 11 files changed, 774 insertions(+), 141 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc4e91c8..0cab993c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,6 +19,7 @@ SET( rekonq_KDEINIT_SRCS
     protocolhandler.cpp
     sessionmanager.cpp
     tabbar.cpp
+    urltreeview.cpp
     walletbar.cpp
     webinspectorpanel.cpp
     webpage.cpp
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index cfe26a55..9feed63a 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -178,7 +178,9 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
             bookfile = KUrl(bookmarksPath);
         }
     }
-    m_manager = KBookmarkManager::managerForExternalFile(bookfile.path());
+    // A workaround to avoid a long delay between the two changed signals of the bookmark manager
+    m_manager = KBookmarkManager::managerForFile(bookfile.path(), "rekonq");
+    
     connect(m_manager, SIGNAL(changed(const QString &, const QString &)),
             this, SLOT(slotBookmarksChanged(const QString &, const QString &)));
 
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index d4afb997..e50148e4 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -210,7 +210,9 @@ public:
      */
     KBookmarkGroup rootGroup();
 
-	KBookmarkManager *bookmarkManager() { return m_manager; }
+    KBookmarkManager *bookmarkManager() { return m_manager; }
+    BookmarkOwner *bookmarkOwner() { return m_owner; }
+    
 signals:
     /**
     * @short This signal is emitted when an url has to be loaded
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 48ca6537..c50ebcdb 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -29,6 +29,7 @@
 #include "bookmarkspanel.moc"
 
 // Local Includes
+#include "bookmarksmanager.h"
 #include "bookmarkstreemodel.h"
 #include "bookmarksproxy.h"
 
@@ -44,12 +45,21 @@
 // KDE includes
 #include <KLineEdit>
 #include <KLocalizedString>
+#include <KAction>
+#include <KMenu>
+#include <KBookmarkDialog>
+#include <KMessageBox>
 
 
 BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
-    : QDockWidget(title, parent, flags)
+    : QDockWidget(title, parent, flags),
+    m_treeView(new UrlTreeView(this)),
+    m_ac(new KActionCollection(this)),
+    menu(new KMenu(this)),
+    expandLock(false)
 {
     setup();
+    setupActions();
     setShown(ReKonfig::showBookmarksPanel());
 }
 
@@ -60,13 +70,6 @@ BookmarksPanel::~BookmarksPanel()
 }
 
 
-void BookmarksPanel::bookmarkActivated( const QModelIndex &index )
-{
-    if( index.isValid() )
-        emit openUrl( qVariantValue< KUrl >( index.data( Qt::UserRole ) ) );
-}
-
-
 void BookmarksPanel::setup()
 {
     setObjectName("bookmarksPanel");
@@ -85,19 +88,20 @@ void BookmarksPanel::setup()
     searchLabel->setBuddy( search );
 
     // setup tree view
-    QTreeView *treeView = new QTreeView(ui);
-    treeView->setUniformRowHeights(true);
-    treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    treeView->setTextElideMode(Qt::ElideMiddle);
-    treeView->setAlternatingRowColors(true);
-    treeView->header()->hide();
-    treeView->setRootIsDecorated( false );
+    m_treeView->setUniformRowHeights(true);
+    m_treeView->setTextElideMode(Qt::ElideMiddle);
+    m_treeView->setAlternatingRowColors(true);
+    m_treeView->header()->hide();
+    m_treeView->setDragEnabled(true);
+    m_treeView->setAutoExpandDelay(750);
+    m_treeView->setDefaultDropAction(Qt::MoveAction);
+    m_treeView->viewport()->setAcceptDrops(true);
 
     // put everything together
     QVBoxLayout *vBoxLayout = new QVBoxLayout;
     vBoxLayout->setContentsMargins(0, 0, 0, 0);
     vBoxLayout->addLayout(searchLayout);
-    vBoxLayout->addWidget(treeView);
+    vBoxLayout->addWidget(m_treeView);
 
     // add it to the UI
     ui->setLayout(vBoxLayout);
@@ -106,8 +110,407 @@ void BookmarksPanel::setup()
     BookmarksTreeModel *model = new BookmarksTreeModel( this );
     BookmarksProxy *proxy = new BookmarksProxy(ui);
     proxy->setSourceModel( model );
-    treeView->setModel( proxy );
+    m_treeView->setModel( proxy );
+
+    connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuBk(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuBkGroup(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenuBlank(const QPoint &)));
+    connect(m_treeView, SIGNAL(delKeyPressed()), this, SLOT(deleteBookmark()));
+    connect(m_treeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(onCollapse(const QModelIndex &)));
+    connect(m_treeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(onExpand(const QModelIndex &)));
+    connect(search, SIGNAL(textChanged(const QString &)), proxy, SLOT(setFilterFixedString(const QString &)));
+    callAutoExpand();
+}
+
+
+void BookmarksPanel::onCollapse(const QModelIndex &index)
+{
+    if(expandLock)
+        return;
+
+    KBookmark bookmark = bookmarkForIndex(index);
+    bookmark.internalElement().setAttribute("folded", "yes");
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksPanel::onExpand(const QModelIndex &index)
+{
+    if(expandLock)
+        return;
+
+    KBookmark bookmark = bookmarkForIndex(index);
+    bookmark.internalElement().setAttribute("folded", "no");
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksPanel::callAutoExpand()
+{
+    expandLock = true;
+    autoExpand();
+    expandLock = false;
+}
+
+
+void BookmarksPanel::autoExpand(const QModelIndex &root)
+{
+
+    int count = m_treeView->model()->rowCount(root);
+    QModelIndex temp;
+
+    for(int i = 0; i < count; i++)
+    {
+        temp = m_treeView->model()->index(i,0,root);
+        m_treeView->setExpanded(temp, bookmarkForIndex(temp).toGroup().isOpen());
+        autoExpand(temp);
+    }
+}
+
+
+void BookmarksPanel::setupActions()
+{
+    KAction* action;
+
+    action = new KAction(KIcon("tab-new"), i18n("Open"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInCurrentTab()));
+    m_ac.addAction("open", action);
+
+    action = new KAction(KIcon("tab-new"), i18n("Open in New Tab"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewTab()));
+    m_ac.addAction("open_tab", action);
+
+    action = new KAction(KIcon("window-new"), i18n("Open in New Window"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
+    m_ac.addAction("open_window", action);
+
+    action = new KAction(KIcon("rating"), i18n("Bookmark Page"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(bookmarkPage()));
+    m_ac.addAction("bookmark_page", action);
+
+    action = new KAction(KIcon("bookmark-new"), i18n("New Bookmark"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(newBookmark()));
+    m_ac.addAction("bookmark_new", action);
+
+    action = new KAction(KIcon("folder-new"), i18n("New Bookmark Folder"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(newBookmarkGroup()));
+    m_ac.addAction("folder_new", action);
+
+    action = new KAction(KIcon("edit-clear"), i18n("New Separator"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(newSeparator()));
+    m_ac.addAction("separator_new", action);
+
+    action = new KAction(KIcon("edit-copy"), i18n("Copy Link"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
+    m_ac.addAction("copy", action);
+
+    action = new KAction(KIcon("edit-delete"), i18n("Delete"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(deleteBookmark()));
+    m_ac.addAction("delete", action);
+
+    action = new KAction(KIcon("configure"), i18n("Properties"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(editBookmark()));
+    m_ac.addAction("properties", action);
+
+    action = new KAction(KIcon("tab-new"), i18n("Open all Bookmarks"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openAll()));
+    m_ac.addAction("open_all", action);
+}
+
+
+KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index)
+{
+    if(!index.isValid())
+        return KBookmark();
+
+    const QAbstractProxyModel* proxyModel = dynamic_cast< const QAbstractProxyModel* >(index.model());
+    QModelIndex originalIndex = proxyModel->mapToSource(index);
+
+    BtmItem *node = static_cast< BtmItem* >( originalIndex.internalPointer() );
+    return node->getBkm();
+}
+
+
+void BookmarksPanel::contextMenuBk(const QPoint &pos)
+{
+    QPoint position = m_treeView->mapToGlobal(pos);
+    QModelIndex index = m_treeView->indexAt(pos);
+    if(!index.isValid() || expandLock)
+        return;
+
+    KBookmark selected = bookmarkForIndex(index);
+
+    if(selected.isGroup())
+    {
+        contextMenuBkGroup(pos, true);
+        return;
+    }
+
+    if(selected.isSeparator())
+    {
+        contextMenuSeparator(pos);
+        return;
+    }
+
+    menu = new KMenu(this);
+
+    menu->addAction(m_ac.action("open"));
+    menu->addAction(m_ac.action("open_tab"));
+    menu->addAction(m_ac.action("open_window"));
+
+    menu->addSeparator();
+
+    menu->addAction(m_ac.action("bookmark_page"));
+    menu->addAction(m_ac.action("bookmark_new"));
+    menu->addAction(m_ac.action("folder_new"));
+    menu->addAction(m_ac.action("separator_new"));
+
+    menu->addSeparator();
+
+    menu->addAction(m_ac.action("copy"));
+
+    menu->addSeparator();
+
+    menu->addAction(m_ac.action("delete"));
+    menu->addAction(m_ac.action("properties"));
+
+    menu->popup(position);
+}
+
+
+void BookmarksPanel::contextMenuBkGroup(const QPoint &pos, bool emptyGroup)
+{
+    if(expandLock)
+        return;
+
+    QPoint position = m_treeView->mapToGlobal(pos);
+    menu = new KMenu(this);
+
+    if(!emptyGroup)
+    {
+        menu->addAction(m_ac.action("open_all"));
+        menu->addSeparator();
+    }
+
+    menu->addAction(m_ac.action("bookmark_page"));
+    menu->addAction(m_ac.action("bookmark_new"));
+    menu->addAction(m_ac.action("folder_new"));
+    menu->addAction(m_ac.action("separator_new"));
+
+    menu->addSeparator();
+
+    menu->addAction(m_ac.action("delete"));
+    menu->addAction(m_ac.action("properties"));
+
+    menu->popup(position);
+}
+
+
+void BookmarksPanel::contextMenuSeparator(const QPoint &pos)
+{
+    QPoint position = m_treeView->mapToGlobal(pos);
+    menu = new KMenu(this);
+
+    menu->addAction(m_ac.action("bookmark_page"));
+    menu->addAction(m_ac.action("bookmark_new"));
+    menu->addAction(m_ac.action("folder_new"));
+    menu->addAction(m_ac.action("separator_new"));
+
+    menu->addSeparator();
+
+    menu->addAction(m_ac.action("delete"));
+
+    menu->popup(position);
+}
+
+
+void BookmarksPanel::contextMenuBlank(const QPoint &pos)
+{
+    QPoint position = m_treeView->mapToGlobal(pos);
+    menu = new KMenu(this);
+
+    menu->addAction(m_ac.action("bookmark_page"));
+    menu->addAction(m_ac.action("bookmark_new"));
+    menu->addAction(m_ac.action("folder_new"));
+    menu->addAction(m_ac.action("separator_new"));
+
+    menu->popup(position);
+}
+
+
+void BookmarksPanel::deleteBookmark()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    if(!index.isValid())
+        return;
+
+    KBookmark selected = bookmarkForIndex(index);
+    KBookmarkGroup parent = selected.parentGroup();
+
+    parent.deleteBookmark(selected);
+    Application::instance()->bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksPanel::editBookmark()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    if(!index.isValid())
+        return;
+
+    KBookmark selected = bookmarkForIndex(index);
+
+    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
+    dialog->editBookmark(selected);
+    delete dialog;
+}
+
+
+void BookmarksPanel::openAll()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    if(!index.isValid())
+        return;
+
+    QList<KUrl> allChild = bookmarkForIndex(index).toGroup().groupUrlList();
+
+    if(allChild.length() > 8) // 8, a good choice ?
+    {
+        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open a lot of tabs : %1\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
+            return;
+    }
+
+    for(int i = 0; i < allChild.length(); i++)
+        emit openUrl(allChild.at(i).url(), Rekonq::SettingOpenTab);
+}
+
+
+void BookmarksPanel::newBookmark()
+{
+    QModelIndex index = m_treeView->currentIndex();
+
+    KBookmark selected;
+    KBookmark newBk;
+
+    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
+
+    if(index.isValid())
+    {
+        selected = bookmarkForIndex(index);
+
+         if(selected.isGroup())
+            newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"), selected);
+        else
+            newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"), selected.parentGroup());
+    }
+
+    else
+    {
+        newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"));
+    }
+
+    delete dialog;
+
+    // addBookmark already added the bookmark, but without the default favicon
+    KBookmarkGroup parent = newBk.parentGroup();
+    parent.deleteBookmark(newBk);
+    newBk.setIcon(("text-html"));
+    parent.addBookmark(newBk);
+
+    if(index.isValid())
+        parent.moveBookmark(newBk, selected);
+
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksPanel::newBookmarkGroup()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    KBookmark newBk;
+
+    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
+
+    if(index.isValid())
+    {
+        KBookmark selected = bookmarkForIndex(index);
+
+        if(selected.isGroup())
+        {
+            newBk = dialog->createNewFolder("New folder", selected);
+        }
+
+        else
+        {
+            newBk = dialog->createNewFolder("New folder", selected.parentGroup());
+            selected.parentGroup().moveBookmark(newBk, selected);
+            Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+        } 
+    }
+
+    else
+    {
+        dialog->createNewFolder("New folder");
+    }
+
+    delete dialog;
+}
+
+
+void BookmarksPanel::newSeparator()
+{
+    QModelIndex index = m_treeView->currentIndex();
+
+    KBookmark selected;
+    KBookmark newBk;
+
+    if(index.isValid())
+    {
+        selected = bookmarkForIndex(index);
+
+        if(selected.isGroup())
+            newBk = selected.toGroup().createNewSeparator();
+        else
+            newBk = selected.parentGroup().createNewSeparator();
+    }
+
+    else
+    {
+        newBk = Application::bookmarkProvider()->rootGroup().createNewSeparator();
+    }
+
+    KBookmarkGroup parent = newBk.parentGroup();
+    newBk.setIcon(("edit-clear"));
+    parent.addBookmark(newBk);
+
+    if(index.isValid())
+        parent.moveBookmark(newBk, selected);
+
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksPanel::bookmarkPage()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    KBookmarkGroup parent = Application::bookmarkProvider()->rootGroup();
+
+    if(index.isValid())
+    {
+        KBookmark selected = bookmarkForIndex(index);
+        parent = selected.parentGroup();
+
+        if(selected.isGroup())
+            parent = selected.toGroup();
+
+        KBookmark newBk = parent.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()), "text-html");
+        parent.moveBookmark(newBk, selected);
+    }
+
+    else
+    {
+       parent.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()), "text-html");
+    }
 
-    connect(search, SIGNAL(textChanged(QString)), proxy, SLOT(setFilterFixedString(QString)));
-    connect(treeView, SIGNAL( activated(QModelIndex) ), this, SLOT( bookmarkActivated(QModelIndex) ) );
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
 }
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index f5376d98..ea33e265 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -31,10 +31,17 @@
 
 // Local Includes
 #include "rekonqprivate_export.h"
+#include "application.h"
+#include "urltreeview.h"
 
 // Qt Includes
 #include <QDockWidget>
 
+// KDE Includes
+#include <KBookmark>
+#include <KActionCollection>
+#include <KMenu>
+
 // Forward Declarations
 class KUrl;
 class QModelIndex;
@@ -49,13 +56,38 @@ public:
     ~BookmarksPanel();
 
 signals:
-    void openUrl(const KUrl &);
+    void openUrl(const KUrl &, const Rekonq::OpenType &);
+    void itemHovered(const QString &);
+    void saveExpFinished(const QString &);
+    void saveRequested();
 
 private slots:
-    void bookmarkActivated( const QModelIndex &index );
+    void contextMenuBk(const QPoint &pos);
+    void contextMenuBkGroup(const QPoint &pos, const bool emptyGroup = false);
+    void contextMenuBlank(const QPoint &pos);
+    void deleteBookmark();
+    void openAll();
+    void editBookmark();
+    void newBookmark();
+    void newBookmarkGroup();
+    void newSeparator();
+    void bookmarkPage();
+    void autoExpand(const QModelIndex &root = QModelIndex());
+    void onCollapse(const QModelIndex &index);
+    void onExpand(const QModelIndex &index);
+    void callAutoExpand();
 
 private:
     void setup();
+    void setupActions();
+    void contextMenuSeparator(const QPoint &pos);
+    KBookmark bookmarkForIndex(const QModelIndex &index);
+
+    UrlTreeView *m_treeView;
+    QStringList m_expList;
+    KActionCollection m_ac;
+    KMenu *menu;
+    bool expandLock;
 };
 
 #endif // BOOKMARKSPANEL_H
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 95e5ad41..d63c92d3 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -33,94 +33,112 @@
 #include "application.h"
 #include "bookmarksmanager.h"
 
+// Qt Includes
+#include <QMimeData>
+
 // KDE includes
 #include <KBookmarkGroup>
 #include <KLocalizedString>
 
 
-class BookmarksTreeModel::BtmItem
+BtmItem::BtmItem(const KBookmark &bm)
+    : m_parent(0)
+    , m_kbm(bm)
 {
-public:
-    BtmItem(const KBookmark &bm)
-        : m_parent(0)
-        , m_kbm(bm)
-    {
-    }
-    
-    
-    ~BtmItem()
-    {
-        qDeleteAll(m_children);
-    }
+}
 
 
-    QVariant data( int role = Qt::DisplayRole ) const
-    {
-        if( m_kbm.isNull() )
-            return QVariant();  // should only happen for root item
+BtmItem::~BtmItem()
+{
+    qDeleteAll(m_children);
+}
 
-        if( role == Qt::DisplayRole )
-            return m_kbm.text();
-        if( role == Qt::DecorationRole )
-            return KIcon( m_kbm.icon() );
-        if( role == Qt::UserRole )
-            return m_kbm.url();
 
-        return QVariant();
+QVariant BtmItem::data( int role ) const
+{
+    if( m_kbm.isNull() )
+        return QVariant();  // should only happen for root item
+
+    if( role == Qt::DisplayRole )
+        return m_kbm.text();
+    if( role == Qt::DecorationRole )
+        return KIcon( m_kbm.icon() );
+    if( role == Qt::UserRole )
+        return m_kbm.url();
+    if( role == Qt::ToolTipRole)
+    {
+        QString tooltip = "";
+	
+        if(!m_kbm.text().isEmpty())
+	{
+            tooltip += m_kbm.text();
+	}
+        if(m_kbm.isGroup())
+	{
+            tooltip += " [" + QString::number(childCount()) + " " + i18n("Items") + "]";
+	}
+        if(!m_kbm.url().url().isEmpty())
+        {
+            if(!tooltip.isEmpty())
+                tooltip += "\n";
+            tooltip += m_kbm.url().url();
+        }
+        return tooltip;
     }
 
+    return QVariant();
+}
 
-    int row() const
-    {
-        if(m_parent)
-            return m_parent->m_children.indexOf( const_cast< BtmItem* >( this ) );
-        return 0;
-    }
 
+int BtmItem::row() const
+{
+    if(m_parent)
+        return m_parent->m_children.indexOf( const_cast< BtmItem* >( this ) );
+    return 0;
+}
 
-    int childCount() const
-    {
-        return m_children.count();
-    }
 
+int BtmItem::childCount() const
+{
+    return m_children.count();
+}
 
-    BtmItem* child( int n )
-    {
-        Q_ASSERT(n>=0);
-        Q_ASSERT(n<childCount());
 
-        return m_children.at(n);
-    }
+BtmItem* BtmItem::child( int n )
+{
+    Q_ASSERT(n>=0);
+    Q_ASSERT(n<childCount());
 
+    return m_children.at(n);
+}
 
-    BtmItem* parent() const
-    {
-        return m_parent;
-    }
 
+BtmItem* BtmItem::parent() const
+{
+    return m_parent;
+}
 
-    void appendChild(BtmItem *child)
-    {
-        if( !child )
-            return;
 
-        child->m_parent = this;
-        m_children << child;
-    }
+void BtmItem::appendChild(BtmItem *child)
+{
+    if( !child )
+        return;
 
+    child->m_parent = this;
+    m_children << child;
+}
 
-    void clear()
-    {
-        qDeleteAll(m_children);
-        m_children.clear();
-    }
 
-private:
-    BtmItem *m_parent;
-    QList< BtmItem* > m_children;
-    KBookmark m_kbm;
-};
+void BtmItem::clear()
+{
+    qDeleteAll(m_children);
+    m_children.clear();
+}
 
+KBookmark BtmItem::getBkm() const
+{
+    return m_kbm;
+}
 
 // -------------------------------------------------------------------------------------
 
@@ -130,8 +148,8 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent)
     , m_root(0)
 {
     resetModel();
+    connect( this, SIGNAL(bookmarkChangedFinished()), parent, SLOT(callAutoExpand()));
     connect( Application::bookmarkProvider()->bookmarkManager(), SIGNAL( changed(QString,QString) ), this, SLOT( bookmarksChanged(QString) ) );
-    connect( Application::bookmarkProvider()->bookmarkManager(), SIGNAL( bookmarksChanged(QString) ), this, SLOT( bookmarksChanged(QString) ) );
 }
 
 
@@ -179,8 +197,17 @@ QVariant BookmarksTreeModel::headerData(int section, Qt::Orientation orientation
 
 Qt::ItemFlags BookmarksTreeModel::flags(const QModelIndex &index) const
 {
-    Q_UNUSED(index)
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+    
+    if(!index.isValid())
+        return flags | Qt::ItemIsDropEnabled;
+
+    flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
+
+    if(bookmarkForIndex(index).isGroup())
+        flags |= Qt::ItemIsDropEnabled;
+    
+    return flags;
 }
 
 
@@ -258,30 +285,9 @@ QVariant BookmarksTreeModel::data(const QModelIndex &index, int role) const
 
 void BookmarksTreeModel::bookmarksChanged( const QString &groupAddress )
 {
-    if( groupAddress.isEmpty() )
-    {
-        resetModel();
-        return;
-    }
-
-    BtmItem *node = m_root;
-    QModelIndex nodeIndex;
-
-    QStringList indexChain( groupAddress.split( '/', QString::SkipEmptyParts) );
-    foreach( const QString &sIndex, indexChain ) 
-    {
-        bool ok;
-        int i = sIndex.toInt( &ok );
-        if( !ok )
-            break;
-
-        if( i < 0 || i >= node->childCount() )
-            break;
-
-        node = node->child( i );
-        nodeIndex = index( i, 0, nodeIndex );
-    }
-    emit dataChanged( index( 0, 0, nodeIndex ), index( node->childCount(), 0, nodeIndex ) );
+    Q_UNUSED(groupAddress);
+    resetModel();
+    emit bookmarkChangedFinished();
 }
 
 
@@ -322,3 +328,86 @@ void BookmarksTreeModel::populate( BtmItem *node, KBookmarkGroup bmg)
         bm = bmg.next( bm );
     }
 }
+
+
+KBookmark BookmarksTreeModel::bookmarkForIndex(const QModelIndex index) const
+{
+    return static_cast<BtmItem*>(index.internalPointer())->getBkm();
+}
+
+
+Qt::DropActions BookmarksTreeModel::supportedDropActions () const
+{
+    return Qt::MoveAction;
+}
+
+
+QStringList BookmarksTreeModel::mimeTypes () const
+{
+    return KBookmark::List::mimeDataTypes();
+}
+
+
+QMimeData* BookmarksTreeModel::mimeData( const QModelIndexList & indexes ) const
+{
+    QMimeData *mimeData = new QMimeData;
+
+    QByteArray addresse = bookmarkForIndex(indexes.first()).address().toLatin1();
+    mimeData->setData( "application/rekonq-bookmark", addresse);
+    bookmarkForIndex(indexes.first()).populateMimeData(mimeData);
+
+    return mimeData;
+}
+
+
+bool BookmarksTreeModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex & parent)
+{
+    if(action == Qt::MoveAction)
+    {
+        if(data->hasFormat("application/rekonq-bookmark"))
+        {
+            QByteArray addresses = data->data("application/rekonq-bookmark");
+            KBookmark bookmark = Application::bookmarkProvider()->bookmarkManager()->findByAddress(QString::fromLatin1(addresses.data()));
+
+            QModelIndex destIndex = index(row, column, parent);
+
+            KBookmark dropDestBookmark;
+            if(destIndex.isValid())
+                dropDestBookmark = bookmarkForIndex(destIndex);
+
+            KBookmarkGroup root = Application::bookmarkProvider()->rootGroup();
+            if(parent.isValid())
+                root = bookmarkForIndex(parent).toGroup();
+
+            if(!destIndex.isValid())
+            {
+                if(!parent.isValid()) // Drop into a blank area
+                {
+                    Application::bookmarkProvider()->rootGroup().deleteBookmark(bookmark);
+                    Application::bookmarkProvider()->rootGroup().addBookmark(bookmark);
+                }
+                else // Drop at the last item of the group or directly on the main item of the group
+                {
+                    root.deleteBookmark(bookmark);
+                    root.addBookmark(bookmark);
+                }
+            }
+
+            else
+            {
+                if(row == -1)
+                {
+                    root.deleteBookmark(bookmark);
+                    root.addBookmark(bookmark);
+                }
+                else // A classic drop
+                {
+                    root.moveBookmark(bookmark, root.previous(dropDestBookmark));
+                }
+            }
+
+            Application::bookmarkProvider()->bookmarkManager()->emitChanged(root);
+        }
+    }
+    return true;
+}
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index dfad52ba..4ff19e5f 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -38,6 +38,26 @@
 // Qt Includes
 #include <QAbstractItemModel>
 
+class BtmItem
+{
+public:
+    BtmItem(const KBookmark &bm);
+    ~BtmItem();
+    QVariant data( int role = Qt::DisplayRole ) const;
+    int row() const;
+    int childCount() const;
+    BtmItem* child( int n );
+    BtmItem* parent() const;
+    void appendChild(BtmItem *child);
+    void clear();
+    KBookmark getBkm() const;
+
+private:
+    BtmItem *m_parent;
+    QList< BtmItem* > m_children;
+    KBookmark m_kbm;
+};
+
 
 class REKONQ_TESTS_EXPORT BookmarksTreeModel : public QAbstractItemModel
 {
@@ -48,28 +68,33 @@ public:
     explicit BookmarksTreeModel(QObject *parent = 0);
     ~BookmarksTreeModel();
 
-	virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
     virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
-	virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 
-	virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
     virtual QModelIndex parent(const QModelIndex &index) const;
-	virtual QVariant data(const QModelIndex &index, int role) const;
-//     virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
+    virtual QVariant data(const QModelIndex &index, int role) const;
 
-private slots:
-	void bookmarksChanged( const QString &groupAddress );
+    virtual QStringList mimeTypes () const;
+    virtual bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent);
+    virtual Qt::DropActions supportedDropActions () const;
+    virtual QMimeData *mimeData( const QModelIndexList & indexes ) const;
 
-private:
-	class BtmItem;
-	BtmItem *m_root;
+private slots:
+    void bookmarksChanged( const QString &groupAddress );
 
-	void resetModel();
+signals:
+    void bookmarkChangedFinished();
 
+private:
+    BtmItem *m_root;
+    void resetModel();
     void setRoot(KBookmarkGroup bmg);
-	void populate( BtmItem *node, KBookmarkGroup bmg);
+    void populate( BtmItem *node, KBookmarkGroup bmg);
+    KBookmark bookmarkForIndex(const QModelIndex index) const;
 };
 
 #endif // BOOKMARKSTREEMODEL_H
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 709d0523..736dbcd7 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -118,6 +118,8 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
         return item.dateTime.date();
     case UrlRole:
         return QUrl(item.url);
+    case Qt::UserRole:
+	return KUrl(item.url);
     case UrlStringRole:
         return item.url;
     case Qt::DisplayRole:
@@ -144,6 +146,12 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const
         {
             return Application::icon(item.url);
         }
+    case Qt::ToolTipRole:
+        QString tooltip = "";
+        if(!item.title.isEmpty())
+            tooltip = item.title + "\n";
+        tooltip += item.dateTime.toString(Qt::SystemLocaleShortDate) + "\n" + item.url;
+        return tooltip;
     }
     return QVariant();
 }
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 8c8eae75..c67594ff 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -46,6 +46,9 @@
 // KDE Includes
 #include <KLineEdit>
 #include <KLocalizedString>
+#include <KMenu>
+#include <KAction>
+#include <KMessageBox>
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
@@ -70,11 +73,12 @@ void HistoryPanel::setup()
     
     QWidget *ui = new QWidget(this);
 
-    QTreeView *historyTreeView = new QTreeView(this);
-    historyTreeView->setUniformRowHeights(true);
-    historyTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    historyTreeView->setTextElideMode(Qt::ElideMiddle);
-    historyTreeView->setAlternatingRowColors(true);
+    m_treeView = new UrlTreeView(this);
+    m_treeView->setUniformRowHeights(true);
+    m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_treeView->setTextElideMode(Qt::ElideMiddle);
+    m_treeView->setAlternatingRowColors(true);
+    m_treeView->header()->hide();
 
     // add search bar
     QHBoxLayout *hBoxLayout = new QHBoxLayout;
@@ -91,7 +95,7 @@ void HistoryPanel::setup()
     QVBoxLayout *vBoxLayout = new QVBoxLayout;
     vBoxLayout->setContentsMargins(0, 0, 0, 0);
     vBoxLayout->addWidget(searchBar);
-    vBoxLayout->addWidget(historyTreeView);
+    vBoxLayout->addWidget(m_treeView);
 
     // add it to the UI
     ui->setLayout(vBoxLayout);
@@ -103,19 +107,78 @@ void HistoryPanel::setup()
 
     TreeProxyModel *treeProxyModel = new TreeProxyModel(this);
     treeProxyModel->setSourceModel(model);
-    historyTreeView->setModel(treeProxyModel);
-    historyTreeView->setExpanded(treeProxyModel->index(0, 0), true);
-    historyTreeView->header()->hideSection(1);
+    m_treeView->setModel(treeProxyModel);
+    m_treeView->setExpanded(treeProxyModel->index(0, 0), true);
+    m_treeView->header()->hideSection(1);
     QFontMetrics fm(font());
     int header = fm.width(QLatin1Char('m')) * 40;
-    historyTreeView->header()->resizeSection(0, header);
+    m_treeView->header()->resizeSection(0, header);
 
     connect(search, SIGNAL(textChanged(QString)), treeProxyModel, SLOT(setFilterFixedString(QString)));
-    connect(historyTreeView, SIGNAL(activated(const QModelIndex &)), this, SLOT(itemActivated(const QModelIndex &)));
+    connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuItem(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuGroup(const QPoint &)));
 }
 
+void HistoryPanel::contextMenuItem(const QPoint &pos)
+{
+    QPoint position = m_treeView->mapToGlobal(pos);
+    KMenu *menu = new KMenu(this);
+    KAction* action;
+
+    action = new KAction(KIcon("tab-new"), i18n("Open"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInCurrentTab()));
+    menu->addAction(action);
+
+    action = new KAction(KIcon("tab-new"), i18n("Open in new tab"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewTab()));
+    menu->addAction(action);
+
+    action = new KAction(KIcon("window-new"), i18n("Open in new window"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
+    menu->addAction(action);
+
+    action = new KAction(KIcon("edit-copy"), i18n("Copy link"), this);
+    connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
+    menu->addAction(action);
 
-void HistoryPanel::itemActivated(const QModelIndex &item)
+    if (!menu)
+        return;
+    menu->popup(position);
+}
+
+void HistoryPanel::contextMenuGroup(const QPoint &pos)
 {
-    emit openUrl( item.data(HistoryModel::UrlRole).toUrl() );
+    QPoint position = m_treeView->mapToGlobal(pos);
+    KMenu *menu = new KMenu(this);
+    KAction* action;
+
+    action = new KAction(KIcon("tab-new"), i18n("Open all Bookmarks"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openAll()));
+
+    menu->addAction(action);
+
+    if (!menu)
+        return;
+    menu->popup(position);
+}
+
+void HistoryPanel::openAll()
+{
+    QModelIndex index = m_treeView->currentIndex();
+    if(!index.isValid())
+        return;
+
+    QList<KUrl> allChild;
+
+    for(int i = 0; i < index.model()->rowCount(index); i++)
+        allChild << qVariantValue<KUrl>(index.child(i, 0).data(Qt::UserRole));
+
+    if(allChild.length() > 8) // 8, a good choice ?
+    {
+        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open a lot of tabs : %1\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
+            return;
+    }
+
+    for(int i = 0; i < allChild.length(); i++)
+        emit openUrl(allChild.at(i).url(), Rekonq::SettingOpenTab);
 }
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 6e6a9162..0c01189c 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -31,6 +31,8 @@
 
 // Local Includes
 #include "rekonqprivate_export.h"
+#include "application.h"
+#include "urltreeview.h"
 
 // Qt Includes
 #include <QDockWidget>
@@ -50,13 +52,17 @@ public:
     ~HistoryPanel();
 
 signals:
-    void openUrl(const KUrl &);
+    void openUrl(const KUrl &, const Rekonq::OpenType &);
+    void itemHovered(const QString &);
 
 private slots:
-    void itemActivated(const QModelIndex &);
+    void contextMenuItem(const QPoint &pos);
+    void contextMenuGroup(const QPoint &pos);
+    void openAll();
 
 private:
     void setup();
+    UrlTreeView *m_treeView;
 };
 
 #endif // HISTORYPANEL_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d15ce0c4..93273dc9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -500,7 +500,8 @@ void MainWindow::setupPanels()
     // STEP 1
     // Setup history panel
     m_historyPanel = new HistoryPanel(i18n("History Panel"), this);
-    connect(m_historyPanel, SIGNAL(openUrl(const KUrl&)), Application::instance(), SLOT(loadUrl(const KUrl&)));
+    connect(m_historyPanel, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)), Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType &)));
+    connect(m_historyPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
     connect(m_historyPanel, SIGNAL(destroyed()), Application::instance(), SLOT(saveConfiguration()));
 
     addDockWidget(Qt::LeftDockWidgetArea, m_historyPanel);
@@ -514,7 +515,8 @@ void MainWindow::setupPanels()
     // STEP 2
     // Setup bookmarks panel
     m_bookmarksPanel = new BookmarksPanel(i18n("Bookmarks Panel"), this);
-    connect(m_bookmarksPanel, SIGNAL(openUrl(const KUrl&)), Application::instance(), SLOT(loadUrl(const KUrl&)));
+    connect(m_bookmarksPanel, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)), Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType &)));
+    connect(m_bookmarksPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
     connect(m_bookmarksPanel, SIGNAL(destroyed()), Application::instance(), SLOT(saveConfiguration()));
 
     addDockWidget(Qt::LeftDockWidgetArea, m_bookmarksPanel);
-- 
cgit v1.2.1


From c3a78d70b23ff4bdc2faec12c97b982a06c96986 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Tue, 23 Mar 2010 23:54:50 +0100
Subject: Add missing files

---
 src/urltreeview.cpp | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/urltreeview.h   |  69 +++++++++++++++++++
 2 files changed, 264 insertions(+)
 create mode 100644 src/urltreeview.cpp
 create mode 100644 src/urltreeview.h

(limited to 'src')

diff --git a/src/urltreeview.cpp b/src/urltreeview.cpp
new file mode 100644
index 00000000..b88dc971
--- /dev/null
+++ b/src/urltreeview.cpp
@@ -0,0 +1,195 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "urltreeview.h"
+
+// Local Includes
+#include "application.h"
+
+// Qt Includes
+#include <QMouseEvent>
+#include <QClipboard>
+
+
+UrlTreeView::UrlTreeView(QWidget *parent)
+    : QTreeView(parent)
+{
+    connect(this, SIGNAL(itemHovered(const QString &)), parent, SIGNAL(itemHovered(const QString &)));
+    connect(this, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)), parent, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)));
+    setMouseTracking(true);
+    setExpandsOnDoubleClick(false);
+}
+
+
+UrlTreeView::~UrlTreeView()
+{
+}
+
+
+void UrlTreeView::mousePressEvent(QMouseEvent *event)
+{
+    const QModelIndex index = indexAt(event->pos());
+    bool expanded = isExpanded(index);
+
+    QTreeView::mousePressEvent(event);
+
+    // A change of an item expansion is handle by mouseReleaseEvent()
+    // So toggle again the item
+    if(expanded != isExpanded(index))
+        setExpanded(index, !isExpanded(index));
+    
+    if(!index.isValid())
+    {
+        clearSelection();
+        setCurrentIndex(QModelIndex());
+
+        if(event->button() == Qt::RightButton)
+            emit contextMenuEmptyRequested(event->pos());
+        return;
+    }
+
+    if(event->button() == Qt::RightButton)
+    {
+        if(index.model()->rowCount(index) == 0)
+        {
+            // An empty group needs to be handle by the panels
+            emit contextMenuItemRequested(event->pos());
+        }
+        else
+        {
+            emit contextMenuGroupRequested(event->pos());
+        }
+    }
+}
+
+
+void UrlTreeView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QTreeView::mouseReleaseEvent(event);
+
+    const QModelIndex index = indexAt(event->pos());
+    if(!index.isValid())
+        return;
+
+    if(event->button() == Qt::MidButton)
+        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewCurrentTab);
+
+    else if(event->button() == Qt::LeftButton)
+    {
+        if(index.model()->rowCount(index) == 0)
+            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+        else
+            setExpanded(index, !isExpanded(index));
+    }
+}
+
+
+void UrlTreeView::keyPressEvent(QKeyEvent *event)
+{
+    QTreeView::keyPressEvent(event);
+    QModelIndex index = currentIndex();
+
+    if(!index.isValid())
+        return;
+
+    if(event->key() == Qt::Key_Return)
+    {
+        if(index.model()->rowCount(index) == 0)
+            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+        else
+            setExpanded(index, !isExpanded(index));
+    }
+
+    else if(event->key() == Qt::Key_Delete)
+    {
+        emit delKeyPressed();
+    }
+}
+
+
+void UrlTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType)
+{
+    // To workaround a crash when the url is about:blank
+    if(url.url() == "about:blank")
+        emit openUrl(KUrl("about:home"), openType);
+    else
+        emit openUrl(url, openType);
+}
+
+
+void UrlTreeView::mouseMoveEvent(QMouseEvent *event)
+{
+    QTreeView::mouseMoveEvent(event);
+    const QModelIndex index = indexAt(event->pos());
+    if(!index.isValid())
+    {
+        emit itemHovered("");
+        return;
+    }
+    emit itemHovered(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
+}
+
+
+void UrlTreeView::openInCurrentTab()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+}
+
+
+void UrlTreeView::copyToClipboard()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    QClipboard *cb = QApplication::clipboard();
+    cb->setText(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
+}
+
+
+void UrlTreeView::openInNewTab()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
+}
+
+
+void UrlTreeView::openInNewWindow()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl( qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewWindow);
+}
diff --git a/src/urltreeview.h b/src/urltreeview.h
new file mode 100644
index 00000000..cce7a257
--- /dev/null
+++ b/src/urltreeview.h
@@ -0,0 +1,69 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef URLTREEVIEW_H
+#define URLTREEVIEW_H
+
+// Local Includes
+#include "application.h"
+
+// Qt Includes
+#include <QTreeView>
+
+
+class UrlTreeView : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    UrlTreeView(QWidget *parent = 0);
+    ~UrlTreeView();
+
+signals:
+    void openUrl(const KUrl &, const Rekonq::OpenType &);
+    void itemHovered(const QString &);
+    void delKeyPressed();
+    void contextMenuItemRequested(const QPoint &pos);
+    void contextMenuGroupRequested(const QPoint &pos);
+    void contextMenuEmptyRequested(const QPoint &pos);
+
+public slots:
+    void copyToClipboard();
+    void openInCurrentTab();
+    void openInNewTab();
+    void openInNewWindow();
+
+protected:
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+
+private:
+    void validOpenUrl(const KUrl &url, Rekonq::OpenType openType = Rekonq::CurrentTab);
+};
+
+#endif // URLTREEVIEW_H
-- 
cgit v1.2.1


From 1b99d40d92a4c1e989a53724ea527b0e7d6388ff Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Mar 2010 09:21:01 +0100
Subject: Cleaning AdblockManager::loadRules slot

---
 src/adblock/adblockmanager.cpp | 51 +++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 66e11277..71412d5d 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -84,7 +84,7 @@ void AdBlockManager::loadSettings(bool checkUpdateDate)
     KConfigGroup rulesGroup( config, "rules" );
     QStringList rules;
     rules = rulesGroup.readEntry( "local-rules" , QStringList() );
-    loadRules( rules );
+    loadRules(rules);
 
     // ----------------------------------------------------------
         
@@ -115,26 +115,35 @@ void AdBlockManager::loadRules(const QStringList &rules)
     foreach(const QString &stringRule, rules)
     {
         // ! rules are comments
-        if( !stringRule.startsWith('!') && !stringRule.startsWith('[') && !stringRule.isEmpty() )
-        {           
-            // white rules
-            if( stringRule.startsWith( QLatin1String("@@") ) )
-            {
-                AdBlockRule rule( stringRule.mid(2) );
-                _whiteList << rule;
-                continue;
-            }
-            
-            // hide (CSS) rules
-            if( stringRule.startsWith( QLatin1String("##") ) )
-            {
-                _hideList << stringRule.mid(2);
-                continue;
-            }
-
-            AdBlockRule rule( stringRule );
-            _blackList << rule;
+        if( stringRule.startsWith('!') )
+            continue;
+        
+        // [ rules are ABP infos
+        if( stringRule.startsWith('[') )
+            continue;
+        
+        // empty rules are just dangerous.. 
+        // (an empty rule in whitelist allows all, in blacklist blocks all..)
+        if( stringRule.isEmpty() )
+            continue;
+           
+        // white rules
+        if( stringRule.startsWith( QLatin1String("@@") ) )
+        {
+            AdBlockRule rule( stringRule.mid(2) );
+            _whiteList << rule;
+            continue;
         }
+        
+        // hide (CSS) rules
+        if( stringRule.startsWith( QLatin1String("##") ) )
+        {
+            _hideList << stringRule.mid(2);
+            continue;
+        }
+
+        AdBlockRule rule( stringRule );
+        _blackList << rule;
     }
 }
 
@@ -182,7 +191,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request)
 
 void AdBlockManager::applyHidingRules(WebPage *page)
 {
-    if(!page || !page->mainFrame())
+    if(!page)
         return;
     
     if (!_isAdblockEnabled)
-- 
cgit v1.2.1


From 288b838f75f91205d81d5d46201eae90e8abd51a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Mar 2010 10:51:58 +0100
Subject: This commit should finally fix settings handling

---
 src/mainwindow.cpp              | 14 +++++++++-----
 src/settings/adblockwidget.cpp  |  3 +++
 src/settings/networkwidget.cpp  |  3 +++
 src/settings/settingsdialog.cpp |  6 ++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d15ce0c4..68469cdd 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -543,6 +543,11 @@ void MainWindow::setupPanels()
 
 void MainWindow::updateConfiguration()
 {
+    kDebug() << "======================================================================================================================";
+    kDebug() << "======================================================================================================================";
+        kDebug() << "======================================================================================================================";
+            kDebug() << "======================================================================================================================";
+            
     // ============== General ==================
     m_view->updateTabBar();
 
@@ -639,14 +644,13 @@ void MainWindow::preferences()
         return;
 
     // we didn't find an instance of this dialog, so lets create it
-    QWeakPointer<SettingsDialog> s = new SettingsDialog(this);
+    QPointer<SettingsDialog> s = new SettingsDialog(this);
 
     // keep us informed when the user changes settings
-    connect(s.data(), SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
+    connect(s, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
 
-    s.data()->exec();
-    delete s.data();
-    s.clear();
+    s->exec();
+    delete s;
 }
 
 
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index 471f57f0..39df2c36 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -174,6 +174,9 @@ void AdBlockWidget::save()
     ReKonfig::setAdBlockEnabled( checkEnableAdblock->isChecked() );
     ReKonfig::setHideAdsEnabled( checkHideAds->isChecked() );
     ReKonfig::setUpdateInterval( spinBox->value() );
+
+    _changed = false;
+    emit changed(false);
 }
 
 
diff --git a/src/settings/networkwidget.cpp b/src/settings/networkwidget.cpp
index 2f5948cf..54f6e068 100644
--- a/src/settings/networkwidget.cpp
+++ b/src/settings/networkwidget.cpp
@@ -82,6 +82,9 @@ void NetworkWidget::save()
     _cookiesModule->save();
     _proxyModule->save();
     _cacheModule->save();
+
+    _changed = false;
+    emit changed(false);
 }
 
 
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 08d5ca6e..35f753d3 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -199,11 +199,17 @@ void SettingsDialog::readConfig()
 // we need this function to SAVE settings in rc file..
 void SettingsDialog::saveSettings()
 {
+    if (!hasChanged())
+        return;
+    
     ReKonfig::self()->writeConfig();
     d->ebrowsingModule->save();
     d->shortcutsEditor->save();
     d->adBlockWidg->save();
     d->networkWidg->save();
+
+    updateButtons();
+    emit settingsChanged("ReKonfig");
 }
 
 
-- 
cgit v1.2.1


From 9a7a4066e20524efd337011ba868f1f29855f754 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 24 Mar 2010 15:42:48 +0100
Subject: WebPage API cleaning

---
 src/webpage.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/webpage.h b/src/webpage.h
index 42d5f586..a3e58dc1 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -61,7 +61,6 @@ public:
     void showSSLInfo();
 
 public slots:
-    void manageNetworkErrors(QNetworkReply *reply);
     virtual void downloadRequest(const QNetworkRequest &request);
     void downloadAllContentsWithKGet();
 
@@ -76,13 +75,13 @@ protected Q_SLOTS:
     virtual void handleUnsupportedContent(QNetworkReply *reply);
 
 private slots:
+    void manageNetworkErrors(QNetworkReply *reply);
     void loadFinished(bool);
 
 private:
     QString errorPage(QNetworkReply *);
 
     ProtocolHandler _protHandler;
-
     WebSslInfo _sslInfo;
 };
 
-- 
cgit v1.2.1


From fb54d4da487fe87636fb8be042df752702d8051b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 25 Mar 2010 12:04:11 +0100
Subject: Fixed a regression (history NOT modified) introduced with commit
 29e095b81d2. Ehi guys, please take FULL attention, modifying working code..

---
 src/mainwindow.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 68469cdd..6a17d1b8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1009,12 +1009,19 @@ void MainWindow::openPrevious(Qt::MouseButtons btn)
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoBack())
     {
-        KUrl back = history->backItem().url();
         if(btn == Qt::MidButton)
+        {
+            KUrl back = history->backItem().url();
             Application::instance()->loadUrl(back, Rekonq::SettingOpenTab);
+        }
         else
-            Application::instance()->loadUrl(back);
+        {
+            history->goToItem(history->backItem());
+        }
+        
+        updateActions();
     }
+    
 }
 
 
@@ -1023,11 +1030,16 @@ void MainWindow::openNext(Qt::MouseButtons btn)
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoForward())
     {
-        KUrl next = history->forwardItem().url();
         if(btn == Qt::MidButton)
+        {
+            KUrl next = history->forwardItem().url();
             Application::instance()->loadUrl(next, Rekonq::SettingOpenTab);
+        }
         else
-            Application::instance()->loadUrl(next);
+        {
+            history->goToItem(history->forwardItem());
+        }
+        updateActions();
     }
 }
 
-- 
cgit v1.2.1


From 9ede70edadea14f3a1ee4d66ca03ec20a6133f72 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Thu, 25 Mar 2010 12:22:04 +0100
Subject: Add tests for the bookmark before toGroup()

---
 src/bookmarks/bookmarkspanel.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index c50ebcdb..fdf1b3d8 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -157,13 +157,16 @@ void BookmarksPanel::autoExpand(const QModelIndex &root)
 {
 
     int count = m_treeView->model()->rowCount(root);
-    QModelIndex temp;
+    QModelIndex index;
 
     for(int i = 0; i < count; i++)
     {
-        temp = m_treeView->model()->index(i,0,root);
-        m_treeView->setExpanded(temp, bookmarkForIndex(temp).toGroup().isOpen());
-        autoExpand(temp);
+        index = m_treeView->model()->index(i, 0, root);
+        if(index.isValid() && bookmarkForIndex(index).isGroup())
+        {
+            m_treeView->setExpanded(index, bookmarkForIndex(index).toGroup().isOpen());
+            autoExpand(index);
+        }
     }
 }
 
@@ -369,7 +372,7 @@ void BookmarksPanel::editBookmark()
 void BookmarksPanel::openAll()
 {
     QModelIndex index = m_treeView->currentIndex();
-    if(!index.isValid())
+    if(!index.isValid() || !bookmarkForIndex(index).isGroup())
         return;
 
     QList<KUrl> allChild = bookmarkForIndex(index).toGroup().groupUrlList();
-- 
cgit v1.2.1


From 860934af2c429c9676e8a6ad5fa595cfd405d164 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 26 Mar 2010 17:32:16 +0100
Subject: This commit lets rekonq embed parts instead of krunning them

DISCLAIMER:
This code really A LOT of testing. Not for the code itself,
but for the parts it lets rekonq use. I'm experiencing a lot of crashes
with the Dragon Part, in example.
---
 src/webpage.cpp          | 19 ++++++++++++++++---
 src/webpage.h            |  2 +-
 src/webpluginfactory.cpp |  8 +-------
 src/webpluginfactory.h   |  1 -
 4 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 06e733b0..71cc8be4 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -271,9 +271,22 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
             }
         }
         // case KParts::BrowserRun::Embed
-        KUrl::List list;
-        list.append(url);
-        KRun::run(*offer,url,0);
+        QString html;
+        html += "<html>";
+        html += "<head>";
+        html += "<title>";
+        html += url.pathOrUrl();
+        html += "</title>";
+        html += "<style type=\"text/css\">";
+        html += "* { border: 0; padding: 0; margin: 0; }";
+        html += "</style>";
+        html += "</head>";    
+        html += "<body>";
+        html += "<embed src=\"" + url.pathOrUrl() + "\" width=\"100%\" height=\"100%\" />";
+        html += "</body>";
+        html += "</html>";
+        
+        mainFrame()->setHtml(html, url);
     }
 }
 
diff --git a/src/webpage.h b/src/webpage.h
index a3e58dc1..abc9833c 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -80,7 +80,7 @@ private slots:
 
 private:
     QString errorPage(QNetworkReply *);
-
+    
     ProtocolHandler _protHandler;
     WebSslInfo _sslInfo;
 };
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 9e4b8ba3..79a36aa0 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -47,12 +47,6 @@ WebPluginFactory::WebPluginFactory(QObject *parent)
 }
 
 
-WebPluginFactory::~WebPluginFactory()
-{
-}
-
-
-
 void WebPluginFactory::setLoadClickToFlash(bool load)
 {
     _loadClickToFlash = load;
@@ -69,7 +63,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
     switch( ReKonfig::pluginsEnabled() )
     {
     case 0:
-        kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones...";
+        kDebug() << "No plugins found for" << mimeType << ". Falling back to KDEWebKit ones...";
         return KWebPluginFactory::create(mimeType, url, argumentNames, argumentValues);
         
     case 1:
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 9e5028b2..85122d56 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -46,7 +46,6 @@ Q_OBJECT
 
 public:
     WebPluginFactory(QObject *parent);
-    ~WebPluginFactory();
 
     virtual QObject *create(const QString &mimeType,
                             const QUrl &url,
-- 
cgit v1.2.1


From 632389517ca496031bb1cbe468d904884961bf57 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 27 Mar 2010 19:04:11 +0100
Subject: - Fix a crash when the cancel button of the add bookmark menu is
 clicked - Use the same behaviour for delete bookmark as the toolbar - Some
 strings changed - Keep the selection of a folder when it's expanded/collapsed
 - Fix the name of some methods and properties - Code cleaned a bit

---
 src/bookmarks/bookmarkspanel.cpp     | 153 +++++++++++++++++++----------------
 src/bookmarks/bookmarkspanel.h       |  19 ++---
 src/bookmarks/bookmarkstreemodel.cpp |  24 ++++--
 src/bookmarks/bookmarkstreemodel.h   |   7 +-
 src/urltreeview.cpp                  |   6 +-
 5 files changed, 119 insertions(+), 90 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index fdf1b3d8..c5c2f548 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -55,8 +55,7 @@ BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::Window
     : QDockWidget(title, parent, flags),
     m_treeView(new UrlTreeView(this)),
     m_ac(new KActionCollection(this)),
-    menu(new KMenu(this)),
-    expandLock(false)
+    m_loadingState(false)
 {
     setup();
     setupActions();
@@ -119,41 +118,41 @@ void BookmarksPanel::setup()
     connect(m_treeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(onCollapse(const QModelIndex &)));
     connect(m_treeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(onExpand(const QModelIndex &)));
     connect(search, SIGNAL(textChanged(const QString &)), proxy, SLOT(setFilterFixedString(const QString &)));
-    callAutoExpand();
+    loadFoldedState();
 }
 
 
 void BookmarksPanel::onCollapse(const QModelIndex &index)
 {
-    if(expandLock)
+    if(m_loadingState)
         return;
 
     KBookmark bookmark = bookmarkForIndex(index);
     bookmark.internalElement().setAttribute("folded", "yes");
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+    emit saveOnlyRequested();
 }
 
 
 void BookmarksPanel::onExpand(const QModelIndex &index)
 {
-    if(expandLock)
+    if(m_loadingState)
         return;
 
     KBookmark bookmark = bookmarkForIndex(index);
     bookmark.internalElement().setAttribute("folded", "no");
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+    emit saveOnlyRequested();
 }
 
 
-void BookmarksPanel::callAutoExpand()
+void BookmarksPanel::loadFoldedState()
 {
-    expandLock = true;
-    autoExpand();
-    expandLock = false;
+    m_loadingState = true;
+    loadFoldedState(QModelIndex());
+    m_loadingState = false;
 }
 
 
-void BookmarksPanel::autoExpand(const QModelIndex &root)
+void BookmarksPanel::loadFoldedState(const QModelIndex &root)
 {
 
     int count = m_treeView->model()->rowCount(root);
@@ -165,7 +164,7 @@ void BookmarksPanel::autoExpand(const QModelIndex &root)
         if(index.isValid() && bookmarkForIndex(index).isGroup())
         {
             m_treeView->setExpanded(index, bookmarkForIndex(index).toGroup().isOpen());
-            autoExpand(index);
+            loadFoldedState(index);
         }
     }
 }
@@ -177,47 +176,47 @@ void BookmarksPanel::setupActions()
 
     action = new KAction(KIcon("tab-new"), i18n("Open"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInCurrentTab()));
-    m_ac.addAction("open", action);
+    m_ac->addAction("open", action);
 
     action = new KAction(KIcon("tab-new"), i18n("Open in New Tab"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewTab()));
-    m_ac.addAction("open_tab", action);
+    m_ac->addAction("open_tab", action);
 
     action = new KAction(KIcon("window-new"), i18n("Open in New Window"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
-    m_ac.addAction("open_window", action);
+    m_ac->addAction("open_window", action);
 
-    action = new KAction(KIcon("rating"), i18n("Bookmark Page"), this);
+    action = new KAction(KIcon("rating"), i18n("Bookmark Current Page"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(bookmarkPage()));
-    m_ac.addAction("bookmark_page", action);
+    m_ac->addAction("bookmark_page", action);
 
     action = new KAction(KIcon("bookmark-new"), i18n("New Bookmark"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(newBookmark()));
-    m_ac.addAction("bookmark_new", action);
+    m_ac->addAction("bookmark_new", action);
 
     action = new KAction(KIcon("folder-new"), i18n("New Bookmark Folder"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(newBookmarkGroup()));
-    m_ac.addAction("folder_new", action);
+    m_ac->addAction("folder_new", action);
 
     action = new KAction(KIcon("edit-clear"), i18n("New Separator"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(newSeparator()));
-    m_ac.addAction("separator_new", action);
+    m_ac->addAction("separator_new", action);
 
-    action = new KAction(KIcon("edit-copy"), i18n("Copy Link"), this);
+    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Adress"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
-    m_ac.addAction("copy", action);
+    m_ac->addAction("copy", action);
 
-    action = new KAction(KIcon("edit-delete"), i18n("Delete"), this);
+    action = new KAction(KIcon("edit-delete"), i18n("Delete Bookmark"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(deleteBookmark()));
-    m_ac.addAction("delete", action);
+    m_ac->addAction("delete", action);
 
     action = new KAction(KIcon("configure"), i18n("Properties"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(editBookmark()));
-    m_ac.addAction("properties", action);
+    m_ac->addAction("properties", action);
 
-    action = new KAction(KIcon("tab-new"), i18n("Open all Bookmarks"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(openAll()));
-    m_ac.addAction("open_all", action);
+    action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openFolderInTabs()));
+    m_ac->addAction("open_all", action);
 }
 
 
@@ -238,7 +237,7 @@ void BookmarksPanel::contextMenuBk(const QPoint &pos)
 {
     QPoint position = m_treeView->mapToGlobal(pos);
     QModelIndex index = m_treeView->indexAt(pos);
-    if(!index.isValid() || expandLock)
+    if(!index.isValid() || m_loadingState)
         return;
 
     KBookmark selected = bookmarkForIndex(index);
@@ -255,27 +254,27 @@ void BookmarksPanel::contextMenuBk(const QPoint &pos)
         return;
     }
 
-    menu = new KMenu(this);
+    KMenu *menu = new KMenu(this);
 
-    menu->addAction(m_ac.action("open"));
-    menu->addAction(m_ac.action("open_tab"));
-    menu->addAction(m_ac.action("open_window"));
+    menu->addAction(m_ac->action("open"));
+    menu->addAction(m_ac->action("open_tab"));
+    menu->addAction(m_ac->action("open_window"));
 
     menu->addSeparator();
 
-    menu->addAction(m_ac.action("bookmark_page"));
-    menu->addAction(m_ac.action("bookmark_new"));
-    menu->addAction(m_ac.action("folder_new"));
-    menu->addAction(m_ac.action("separator_new"));
+    menu->addAction(m_ac->action("bookmark_page"));
+    menu->addAction(m_ac->action("bookmark_new"));
+    menu->addAction(m_ac->action("folder_new"));
+    menu->addAction(m_ac->action("separator_new"));
 
     menu->addSeparator();
 
-    menu->addAction(m_ac.action("copy"));
+    menu->addAction(m_ac->action("copy"));
 
     menu->addSeparator();
 
-    menu->addAction(m_ac.action("delete"));
-    menu->addAction(m_ac.action("properties"));
+    menu->addAction(m_ac->action("delete"));
+    menu->addAction(m_ac->action("properties"));
 
     menu->popup(position);
 }
@@ -283,27 +282,27 @@ void BookmarksPanel::contextMenuBk(const QPoint &pos)
 
 void BookmarksPanel::contextMenuBkGroup(const QPoint &pos, bool emptyGroup)
 {
-    if(expandLock)
+    if(m_loadingState)
         return;
 
     QPoint position = m_treeView->mapToGlobal(pos);
-    menu = new KMenu(this);
+    KMenu *menu = new KMenu(this);
 
     if(!emptyGroup)
     {
-        menu->addAction(m_ac.action("open_all"));
+        menu->addAction(m_ac->action("open_all"));
         menu->addSeparator();
     }
 
-    menu->addAction(m_ac.action("bookmark_page"));
-    menu->addAction(m_ac.action("bookmark_new"));
-    menu->addAction(m_ac.action("folder_new"));
-    menu->addAction(m_ac.action("separator_new"));
+    menu->addAction(m_ac->action("bookmark_page"));
+    menu->addAction(m_ac->action("bookmark_new"));
+    menu->addAction(m_ac->action("folder_new"));
+    menu->addAction(m_ac->action("separator_new"));
 
     menu->addSeparator();
 
-    menu->addAction(m_ac.action("delete"));
-    menu->addAction(m_ac.action("properties"));
+    menu->addAction(m_ac->action("delete"));
+    menu->addAction(m_ac->action("properties"));
 
     menu->popup(position);
 }
@@ -312,16 +311,16 @@ void BookmarksPanel::contextMenuBkGroup(const QPoint &pos, bool emptyGroup)
 void BookmarksPanel::contextMenuSeparator(const QPoint &pos)
 {
     QPoint position = m_treeView->mapToGlobal(pos);
-    menu = new KMenu(this);
+    KMenu *menu = new KMenu(this);
 
-    menu->addAction(m_ac.action("bookmark_page"));
-    menu->addAction(m_ac.action("bookmark_new"));
-    menu->addAction(m_ac.action("folder_new"));
-    menu->addAction(m_ac.action("separator_new"));
+    menu->addAction(m_ac->action("bookmark_page"));
+    menu->addAction(m_ac->action("bookmark_new"));
+    menu->addAction(m_ac->action("folder_new"));
+    menu->addAction(m_ac->action("separator_new"));
 
     menu->addSeparator();
 
-    menu->addAction(m_ac.action("delete"));
+    menu->addAction(m_ac->action("delete"));
 
     menu->popup(position);
 }
@@ -330,12 +329,12 @@ void BookmarksPanel::contextMenuSeparator(const QPoint &pos)
 void BookmarksPanel::contextMenuBlank(const QPoint &pos)
 {
     QPoint position = m_treeView->mapToGlobal(pos);
-    menu = new KMenu(this);
+    KMenu *menu = new KMenu(this);
 
-    menu->addAction(m_ac.action("bookmark_page"));
-    menu->addAction(m_ac.action("bookmark_new"));
-    menu->addAction(m_ac.action("folder_new"));
-    menu->addAction(m_ac.action("separator_new"));
+    menu->addAction(m_ac->action("bookmark_page"));
+    menu->addAction(m_ac->action("bookmark_new"));
+    menu->addAction(m_ac->action("folder_new"));
+    menu->addAction(m_ac->action("separator_new"));
 
     menu->popup(position);
 }
@@ -347,10 +346,22 @@ void BookmarksPanel::deleteBookmark()
     if(!index.isValid())
         return;
 
-    KBookmark selected = bookmarkForIndex(index);
-    KBookmarkGroup parent = selected.parentGroup();
+    KBookmark bm = bookmarkForIndex(index);
+    bool folder = bm.isGroup();
+
+    if (KMessageBox::warningContinueCancel(
+            QApplication::activeWindow(),
+            folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", bm.text())
+                   : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", bm.text()),
+            folder ? i18n("Bookmark Folder Deletion")
+                   : i18n("Bookmark Deletion"),
+            KStandardGuiItem::del())
+          != KMessageBox::Continue
+        )
+        return;
 
-    parent.deleteBookmark(selected);
+
+    bm.parentGroup().deleteBookmark(bm);
     Application::instance()->bookmarkProvider()->bookmarkManager()->emitChanged();
 }
 
@@ -369,7 +380,7 @@ void BookmarksPanel::editBookmark()
 }
 
 
-void BookmarksPanel::openAll()
+void BookmarksPanel::openFolderInTabs()
 {
     QModelIndex index = m_treeView->currentIndex();
     if(!index.isValid() || !bookmarkForIndex(index).isGroup())
@@ -402,18 +413,22 @@ void BookmarksPanel::newBookmark()
         selected = bookmarkForIndex(index);
 
          if(selected.isGroup())
-            newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"), selected);
+            newBk = dialog->addBookmark("New bookmark", KUrl(), selected);
         else
-            newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"), selected.parentGroup());
+            newBk = dialog->addBookmark("New bookmark", KUrl(), selected.parentGroup());
     }
 
     else
     {
-        newBk = dialog->addBookmark("New bookmark", KUrl("www.kde.org"));
+        newBk = dialog->addBookmark("New bookmark", KUrl());
     }
 
     delete dialog;
 
+    // a click on cancel
+    if(newBk.isNull())
+        return;
+
     // addBookmark already added the bookmark, but without the default favicon
     KBookmarkGroup parent = newBk.parentGroup();
     parent.deleteBookmark(newBk);
@@ -493,7 +508,7 @@ void BookmarksPanel::newSeparator()
 }
 
 
-void BookmarksPanel::bookmarkPage()
+void BookmarksPanel::bookmarkCurrentPage()
 {
     QModelIndex index = m_treeView->currentIndex();
     KBookmarkGroup parent = Application::bookmarkProvider()->rootGroup();
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index ea33e265..be52804f 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -40,7 +40,6 @@
 // KDE Includes
 #include <KBookmark>
 #include <KActionCollection>
-#include <KMenu>
 
 // Forward Declarations
 class KUrl;
@@ -58,24 +57,24 @@ public:
 signals:
     void openUrl(const KUrl &, const Rekonq::OpenType &);
     void itemHovered(const QString &);
-    void saveExpFinished(const QString &);
-    void saveRequested();
+    void saveOnlyRequested();
 
 private slots:
     void contextMenuBk(const QPoint &pos);
     void contextMenuBkGroup(const QPoint &pos, const bool emptyGroup = false);
     void contextMenuBlank(const QPoint &pos);
     void deleteBookmark();
-    void openAll();
+    void openFolderInTabs();
     void editBookmark();
     void newBookmark();
     void newBookmarkGroup();
     void newSeparator();
-    void bookmarkPage();
-    void autoExpand(const QModelIndex &root = QModelIndex());
     void onCollapse(const QModelIndex &index);
     void onExpand(const QModelIndex &index);
-    void callAutoExpand();
+    void bookmarkCurrentPage();
+    void loadFoldedState(const QModelIndex &root);
+    void loadFoldedState();
+
 
 private:
     void setup();
@@ -84,10 +83,8 @@ private:
     KBookmark bookmarkForIndex(const QModelIndex &index);
 
     UrlTreeView *m_treeView;
-    QStringList m_expList;
-    KActionCollection m_ac;
-    KMenu *menu;
-    bool expandLock;
+    KActionCollection *m_ac;
+    bool m_loadingState;
 };
 
 #endif // BOOKMARKSPANEL_H
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index d63c92d3..836401a6 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -148,8 +148,9 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent)
     , m_root(0)
 {
     resetModel();
-    connect( this, SIGNAL(bookmarkChangedFinished()), parent, SLOT(callAutoExpand()));
-    connect( Application::bookmarkProvider()->bookmarkManager(), SIGNAL( changed(QString,QString) ), this, SLOT( bookmarksChanged(QString) ) );
+    connect( this, SIGNAL(bookmarksUpdated()), parent, SLOT(loadFoldedState()));
+    connect( Application::bookmarkProvider()->bookmarkManager(), SIGNAL( changed(QString,QString) ), this, SLOT( bookmarksChanged() ) );
+    connect( parent, SIGNAL(saveOnlyRequested()), this, SLOT(saveOnly()) );
 }
 
 
@@ -283,11 +284,10 @@ QVariant BookmarksTreeModel::data(const QModelIndex &index, int role) const
 }
 
 
-void BookmarksTreeModel::bookmarksChanged( const QString &groupAddress )
+void BookmarksTreeModel::bookmarksChanged()
 {
-    Q_UNUSED(groupAddress);
     resetModel();
-    emit bookmarkChangedFinished();
+    emit bookmarksUpdated();
 }
 
 
@@ -336,6 +336,20 @@ KBookmark BookmarksTreeModel::bookmarkForIndex(const QModelIndex index) const
 }
 
 
+void BookmarksTreeModel::saveOnly()
+{
+    disconnect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(QString,QString)), this, SLOT(bookmarksChanged()));
+    connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(QString,QString)), this, SLOT(reconnectManager()));
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
+
+void BookmarksTreeModel::reconnectManager()
+{
+    connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL( changed(QString,QString) ), this, SLOT(bookmarksChanged()));
+}
+
+
 Qt::DropActions BookmarksTreeModel::supportedDropActions () const
 {
     return Qt::MoveAction;
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 4ff19e5f..b312ab2d 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -84,13 +84,16 @@ public:
     virtual QMimeData *mimeData( const QModelIndexList & indexes ) const;
 
 private slots:
-    void bookmarksChanged( const QString &groupAddress );
+    void bookmarksChanged();
+    void saveOnly();
+    void reconnectManager();
 
 signals:
-    void bookmarkChangedFinished();
+    void bookmarksUpdated();
 
 private:
     BtmItem *m_root;
+
     void resetModel();
     void setRoot(KBookmarkGroup bmg);
     void populate( BtmItem *node, KBookmarkGroup bmg);
diff --git a/src/urltreeview.cpp b/src/urltreeview.cpp
index b88dc971..507a7973 100644
--- a/src/urltreeview.cpp
+++ b/src/urltreeview.cpp
@@ -74,7 +74,7 @@ void UrlTreeView::mousePressEvent(QMouseEvent *event)
 
     if(event->button() == Qt::RightButton)
     {
-        if(index.model()->rowCount(index) == 0)
+        if(model()->rowCount(index) == 0)
         {
             // An empty group needs to be handle by the panels
             emit contextMenuItemRequested(event->pos());
@@ -100,7 +100,7 @@ void UrlTreeView::mouseReleaseEvent(QMouseEvent *event)
 
     else if(event->button() == Qt::LeftButton)
     {
-        if(index.model()->rowCount(index) == 0)
+        if(model()->rowCount(index) == 0)
             validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
         else
             setExpanded(index, !isExpanded(index));
@@ -118,7 +118,7 @@ void UrlTreeView::keyPressEvent(QKeyEvent *event)
 
     if(event->key() == Qt::Key_Return)
     {
-        if(index.model()->rowCount(index) == 0)
+        if(model()->rowCount(index) == 0)
             validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
         else
             setExpanded(index, !isExpanded(index));
-- 
cgit v1.2.1


From f5a40919219ef5210598a87054af34b331ebe31e Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 27 Mar 2010 20:08:59 +0100
Subject: Fix the bookmarkCurrentPage slot name

---
 src/bookmarks/bookmarkspanel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index c5c2f548..a1bc4f51 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -187,7 +187,7 @@ void BookmarksPanel::setupActions()
     m_ac->addAction("open_window", action);
 
     action = new KAction(KIcon("rating"), i18n("Bookmark Current Page"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(bookmarkPage()));
+    connect(action, SIGNAL(triggered()), this, SLOT(bookmarkCurrentPage()));
     m_ac->addAction("bookmark_page", action);
 
     action = new KAction(KIcon("bookmark-new"), i18n("New Bookmark"), this);
-- 
cgit v1.2.1


From a3020fb4be790a79af806b4d22b5d9bdc790ee7f Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 27 Mar 2010 20:20:12 +0100
Subject: Fix missing strings on the history panel

---
 src/bookmarks/bookmarkspanel.cpp | 2 +-
 src/history/historypanel.cpp     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index a1bc4f51..c249566d 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -202,7 +202,7 @@ void BookmarksPanel::setupActions()
     connect(action, SIGNAL(triggered()), this, SLOT(newSeparator()));
     m_ac->addAction("separator_new", action);
 
-    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Adress"), this);
+    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Address"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
     m_ac->addAction("copy", action);
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index c67594ff..a45e3508 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -129,15 +129,15 @@ void HistoryPanel::contextMenuItem(const QPoint &pos)
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInCurrentTab()));
     menu->addAction(action);
 
-    action = new KAction(KIcon("tab-new"), i18n("Open in new tab"), this);
+    action = new KAction(KIcon("tab-new"), i18n("Open in New Tab"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewTab()));
     menu->addAction(action);
 
-    action = new KAction(KIcon("window-new"), i18n("Open in new window"), this);
+    action = new KAction(KIcon("window-new"), i18n("Open in New Window"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
     menu->addAction(action);
 
-    action = new KAction(KIcon("edit-copy"), i18n("Copy link"), this);
+    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Address"), this);
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
     menu->addAction(action);
 
@@ -152,7 +152,7 @@ void HistoryPanel::contextMenuGroup(const QPoint &pos)
     KMenu *menu = new KMenu(this);
     KAction* action;
 
-    action = new KAction(KIcon("tab-new"), i18n("Open all Bookmarks"), this);
+    action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(openAll()));
 
     menu->addAction(action);
-- 
cgit v1.2.1


From 6183e8e1c21807299f04f4e84c43486cf684f140 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 27 Mar 2010 22:17:20 +0100
Subject: - Remove the Add Bookmark action from the different context menus -
 Add Bookmark Here now add the bookmark on top of the selected item - ctor
 initialisation for the UrlTreeView of the history panel

---
 src/bookmarks/bookmarkspanel.cpp | 55 ++--------------------------------------
 src/bookmarks/bookmarkspanel.h   |  1 -
 src/history/historypanel.cpp     |  4 +--
 3 files changed, 4 insertions(+), 56 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index c249566d..2f530c6c 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -186,14 +186,10 @@ void BookmarksPanel::setupActions()
     connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
     m_ac->addAction("open_window", action);
 
-    action = new KAction(KIcon("rating"), i18n("Bookmark Current Page"), this);
+    action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(bookmarkCurrentPage()));
     m_ac->addAction("bookmark_page", action);
 
-    action = new KAction(KIcon("bookmark-new"), i18n("New Bookmark"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(newBookmark()));
-    m_ac->addAction("bookmark_new", action);
-
     action = new KAction(KIcon("folder-new"), i18n("New Bookmark Folder"), this);
     connect(action, SIGNAL(triggered()), this, SLOT(newBookmarkGroup()));
     m_ac->addAction("folder_new", action);
@@ -263,7 +259,6 @@ void BookmarksPanel::contextMenuBk(const QPoint &pos)
     menu->addSeparator();
 
     menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("bookmark_new"));
     menu->addAction(m_ac->action("folder_new"));
     menu->addAction(m_ac->action("separator_new"));
 
@@ -295,7 +290,6 @@ void BookmarksPanel::contextMenuBkGroup(const QPoint &pos, bool emptyGroup)
     }
 
     menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("bookmark_new"));
     menu->addAction(m_ac->action("folder_new"));
     menu->addAction(m_ac->action("separator_new"));
 
@@ -314,7 +308,6 @@ void BookmarksPanel::contextMenuSeparator(const QPoint &pos)
     KMenu *menu = new KMenu(this);
 
     menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("bookmark_new"));
     menu->addAction(m_ac->action("folder_new"));
     menu->addAction(m_ac->action("separator_new"));
 
@@ -332,7 +325,6 @@ void BookmarksPanel::contextMenuBlank(const QPoint &pos)
     KMenu *menu = new KMenu(this);
 
     menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("bookmark_new"));
     menu->addAction(m_ac->action("folder_new"));
     menu->addAction(m_ac->action("separator_new"));
 
@@ -399,49 +391,6 @@ void BookmarksPanel::openFolderInTabs()
 }
 
 
-void BookmarksPanel::newBookmark()
-{
-    QModelIndex index = m_treeView->currentIndex();
-
-    KBookmark selected;
-    KBookmark newBk;
-
-    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
-
-    if(index.isValid())
-    {
-        selected = bookmarkForIndex(index);
-
-         if(selected.isGroup())
-            newBk = dialog->addBookmark("New bookmark", KUrl(), selected);
-        else
-            newBk = dialog->addBookmark("New bookmark", KUrl(), selected.parentGroup());
-    }
-
-    else
-    {
-        newBk = dialog->addBookmark("New bookmark", KUrl());
-    }
-
-    delete dialog;
-
-    // a click on cancel
-    if(newBk.isNull())
-        return;
-
-    // addBookmark already added the bookmark, but without the default favicon
-    KBookmarkGroup parent = newBk.parentGroup();
-    parent.deleteBookmark(newBk);
-    newBk.setIcon(("text-html"));
-    parent.addBookmark(newBk);
-
-    if(index.isValid())
-        parent.moveBookmark(newBk, selected);
-
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-}
-
-
 void BookmarksPanel::newBookmarkGroup()
 {
     QModelIndex index = m_treeView->currentIndex();
@@ -522,7 +471,7 @@ void BookmarksPanel::bookmarkCurrentPage()
             parent = selected.toGroup();
 
         KBookmark newBk = parent.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()), "text-html");
-        parent.moveBookmark(newBk, selected);
+        parent.moveBookmark(newBk, selected.parentGroup().previous(selected));
     }
 
     else
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index be52804f..f8528b71 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -66,7 +66,6 @@ private slots:
     void deleteBookmark();
     void openFolderInTabs();
     void editBookmark();
-    void newBookmark();
     void newBookmarkGroup();
     void newSeparator();
     void onCollapse(const QModelIndex &index);
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index a45e3508..03f2b880 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -52,7 +52,8 @@
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
-    : QDockWidget(title, parent, flags)
+    : QDockWidget(title, parent, flags),
+    m_treeView(new UrlTreeView(this))
 {
     setup();
     setShown(ReKonfig::showHistoryPanel());
@@ -73,7 +74,6 @@ void HistoryPanel::setup()
     
     QWidget *ui = new QWidget(this);
 
-    m_treeView = new UrlTreeView(this);
     m_treeView->setUniformRowHeights(true);
     m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
     m_treeView->setTextElideMode(Qt::ElideMiddle);
-- 
cgit v1.2.1


From 64408ad486db25f0124f934aed55af72f2cd6d39 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 28 Mar 2010 10:12:45 +0200
Subject: update is better than repaint :)

---
 src/urlbar/urlbar.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 718d9f67..189d19fe 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -155,7 +155,7 @@ void UrlBar::setUrl(const QUrl& url)
 void UrlBar::setProgress(int progress)
 {
     m_progress = progress;
-    repaint();
+    update();
 }
 
 
@@ -225,14 +225,14 @@ void UrlBar::loadFinished(bool)
 {
     // reset progress bar after small delay
     m_progress = 0;
-    QTimer::singleShot(200, this, SLOT(repaint()));
+    QTimer::singleShot(200, this, SLOT(update()));
 }
 
 
 void UrlBar::updateProgress(int progress)
 {
     m_progress = progress;
-    repaint();
+    update();
 }
 
 
@@ -295,7 +295,7 @@ QLinearGradient UrlBar::generateGradient(const QColor &color, int height)
 void UrlBar::setBackgroundColor(QColor c)
 {
     s_defaultBaseColor = c;
-    repaint();
+    update();
 }
 
 
-- 
cgit v1.2.1


From 942c55b945443a2e6dd9a2d3660347fc2176630a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 29 Mar 2010 11:47:42 +0200
Subject: This commit merge all our work about new UrlBar.

DISCLAIMER: this is far from perfect, but we finally have a good starting point to work on.. :)

Jonas Gastal started working on it in the 0.3 times, startin from CompletionBase code ..
.. I did some work on another idea, proposing (in code) a new "suggest engine" created from scratch...
Lionel Chauvin finally merged our ideas and implemented what you are seeing (and improved it, too!)..

- New suggestion items (Firefox style)
- a mockup on the known urls (rekonq style)
- for now, automatic Google and Wikipedia searches (more coming)..
- a beautiful animation :)
- quite all rough edges smoothed

--------------------------------------------------------
Squashed commit of the following:

commit d9cf43da421c7f6c71f78444ff1935c414468b98
commit 9dcb6e18f8a3e9ae8ef1cd1299d47d37393aa6e5
commit 6c4bf2b2040ea20c78c5703f20c6bc88b7e40169
commit 8488df67115d186489f34210b638c150c66f62d3
commit 066ab907661282b1ffa4cf640739c20b4c7b6556
commit c23e23cbca7ab3197c570651a95d3f8fea270d78
commit 60655b0a8685a76e2b8b7a457bfded974bc98b4c
commit 9a8817db124b55f501c9e5d3415a975ee6f92d68
commit 61312b6b577a535a4d56758b3bd3ea38812d5139
commit b6a3f4ea12423a063eafa641cedd13b890b9d392
commit 5e8e2f851edb42bc2deed296c26c58c3d7570381
commit 2904d828f71ac8ff46a53e58da8f45b5aa16e7ef
---------------------------------------------------------
---
 src/CMakeLists.txt                 |   3 +
 src/bookmarks/bookmarksmanager.cpp |  14 ++-
 src/bookmarks/bookmarksmanager.h   |   7 ++
 src/mainview.cpp                   |   3 +-
 src/urlbar/completionwidget.cpp    | 242 +++++++++++++++++++++++++++++++++++++
 src/urlbar/completionwidget.h      |  77 ++++++++++++
 src/urlbar/lineedit.cpp            |   4 +-
 src/urlbar/lineedit.h              |  12 +-
 src/urlbar/listitem.cpp            | 173 ++++++++++++++++++++++++++
 src/urlbar/listitem.h              |  59 +++++++++
 src/urlbar/urlbar.cpp              | 200 +++++++++++++++---------------
 src/urlbar/urlbar.h                |  28 ++---
 src/urlbar/urlresolver.cpp         | 177 +++++++++++++++++++++++++++
 src/urlbar/urlresolver.h           |  72 +++++++++++
 14 files changed, 939 insertions(+), 132 deletions(-)
 create mode 100644 src/urlbar/completionwidget.cpp
 create mode 100644 src/urlbar/completionwidget.h
 create mode 100644 src/urlbar/listitem.cpp
 create mode 100644 src/urlbar/listitem.h
 create mode 100644 src/urlbar/urlresolver.cpp
 create mode 100644 src/urlbar/urlresolver.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cab993c..a68faa59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,9 @@ SET( rekonq_KDEINIT_SRCS
     #----------------------------------------
     urlbar/urlbar.cpp
     urlbar/lineedit.cpp
+    urlbar/completionwidget.cpp
+    urlbar/urlresolver.cpp
+    urlbar/listitem.cpp
 )
 
 
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 9feed63a..89e39ef8 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -161,7 +161,12 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
         , m_actionCollection(new KActionCollection(this))
         , m_bookmarkMenu(0)
         , m_bookmarkToolBar(0)
+        , m_completion(0)
 {
+    // take care of the completion object
+    m_completion = new KCompletion;
+    m_completion->setOrder( KCompletion::Weighted );
+
     KUrl bookfile = KUrl("~/.kde/share/apps/konqueror/bookmarks.xml");  // share konqueror bookmarks
 
     if (!QFile::exists(bookfile.path()))
@@ -222,6 +227,7 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
         return;
 
     m_bookmarkToolBar->clear(); // FIXME CRASH
+    m_completion->clear();
 
     KBookmark bookmark = toolBarGroup.first();
     while (!bookmark.isNull())
@@ -287,7 +293,8 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
         return a;
     }
     else
-    {
+    {        
+        m_completion->addItem(bookmark.url().path());
         return new KBookmarkAction(bookmark, m_owner, this);
     }
 }
@@ -297,3 +304,8 @@ KBookmarkGroup BookmarkProvider::rootGroup()
 {
     return m_manager->root();
 }
+
+KCompletion *BookmarkProvider::completionObject() const
+{
+    return m_completion;
+}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index e50148e4..18ff3ef0 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -39,6 +39,7 @@
 
 // KDE Includes
 #include <KBookmarkOwner>
+#include <KCompletion>
 
 // Forward Declarations
 class BookmarkProvider;
@@ -213,6 +214,11 @@ public:
     KBookmarkManager *bookmarkManager() { return m_manager; }
     BookmarkOwner *bookmarkOwner() { return m_owner; }
     
+    /**
+    * @returns the KCompletion object.
+    */
+    KCompletion *completionObject() const;
+
 signals:
     /**
     * @short This signal is emitted when an url has to be loaded
@@ -247,6 +253,7 @@ private:
     KActionCollection *m_actionCollection;
     BookmarkMenu *m_bookmarkMenu;
     KToolBar *m_bookmarkToolBar;
+    KCompletion *m_completion;
 };
 
 #endif
diff --git a/src/mainview.cpp b/src/mainview.cpp
index f2152364..6643becb 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -242,8 +242,7 @@ void MainView::clear()
 {
     // FIXME (the programmer, not the code)
     // What exactly do we need to clear here?
-    m_urlBar->clearHistory();
-    m_urlBar->clear();
+     m_urlBar->clear();
 
     m_recentlyClosedTabs.clear();
 }
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
new file mode 100644
index 00000000..42abcb73
--- /dev/null
+++ b/src/urlbar/completionwidget.cpp
@@ -0,0 +1,242 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "completionwidget.h"
+#include "completionwidget.moc"
+
+// KDE Includes
+#include <KGlobalSettings>
+#include <KDebug>
+#include <KUrl>
+
+// Qt Includes
+#include <QPoint>
+#include <QSize>
+#include <QVBoxLayout>
+#include <QString>
+#include <QEvent>
+#include <QKeyEvent>
+
+#define MAX_ELEMENTS 9
+#include "application.h"
+
+CompletionWidget::CompletionWidget( QWidget *parent)
+:QFrame( parent, Qt::ToolTip)
+    , _parent(parent)
+    , _currentIndex(-1)
+{
+    QPalette p(palette());
+    p.setColor(QPalette::Background, Qt::white); //todo: choose the correct color
+    setPalette(p);
+    setFrameStyle(QFrame::Panel);
+    setLayoutDirection(Qt::LeftToRight);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(0);
+    setLayout(layout);
+
+}
+
+
+void CompletionWidget::insertSearchList(const UrlSearchList &list)
+{
+    _list = list;
+    int min = MAX_ELEMENTS;
+    if(list.count() < min)
+        min = list.count();
+    
+    for(int i = 0; i<min ; ++i)
+    {
+        UrlSearchItem item = list.at(i);
+        ListItem *suggestion = new ListItem(item);
+        connect(suggestion, SIGNAL(itemClicked(ListItem *)), this, SLOT(itemChosen(ListItem *)));
+        suggestion->setObjectName( QString::number(i) );
+        layout()->addWidget( suggestion );
+    }
+}
+
+
+void CompletionWidget::sizeAndPosition()
+{
+    // size
+    setFixedHeight(layout()->count() * 44 );
+    setFixedWidth( _parent->width() );
+
+    // position
+    QPoint p = _parent->mapToGlobal( QPoint(0,0) );
+    move(p.x(), p.y() + _parent->height());
+}
+
+
+void CompletionWidget::popup()
+{
+    down();
+    sizeAndPosition();
+    if (!isVisible()) 
+        show();
+}
+
+
+void CompletionWidget::up()
+{
+    // deactivate previous
+    if(_currentIndex != -1)
+    {
+        ListItem *widget = findChild<ListItem *>( QString::number(_currentIndex) );
+        widget->deactivate();
+    }
+
+    if(_currentIndex > 0)
+        _currentIndex--;
+    else
+        _currentIndex=layout()->count()-1;       
+
+    // activate "new" current
+    ListItem *widget = findChild<ListItem *>( QString::number(_currentIndex) );
+    widget->activate();
+}
+
+KUrl CompletionWidget::currentUrl()
+{
+    return _list.at(_currentIndex).url;
+}
+
+void CompletionWidget::down()
+{
+    // deactivate previous
+    if(_currentIndex != -1)
+    {
+        ListItem *widget = findChild<ListItem *>( QString::number(_currentIndex) );
+        widget->deactivate();
+    }
+    
+    if(_currentIndex < _list.count() -1)
+        _currentIndex++;
+    else
+        _currentIndex=0;
+            
+    // activate "new" current
+    ListItem *widget = findChild<ListItem *>( QString::number(_currentIndex) );
+    widget->activate();
+}
+
+void CompletionWidget::clear()
+{
+    QLayoutItem *child;
+    while ((child = layout()->takeAt(0)) != 0) 
+    {
+        delete child->widget(); 
+        delete child;
+    }
+    _currentIndex = -1;
+}
+
+
+bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
+{
+    int type = e->type();
+    QWidget *wid = qobject_cast<QWidget*>(o);
+    
+    if (o == this) 
+    {
+        return false;
+    }
+
+    //hide conditions of the CompletionWidget
+    if (wid 
+        && ((wid == _parent && (type == QEvent::Move || type == QEvent::Resize))  
+        || ((wid->windowFlags() & Qt::Window) 
+            && (type == QEvent::Move || type == QEvent::Hide || type == QEvent::WindowDeactivate) 
+            && wid == _parent->window())
+        || (type == QEvent::MouseButtonPress && !isAncestorOf(wid)))
+       )
+    {
+        hide();
+        return false;
+    }
+
+    //actions on the CompletionWidget
+    if (wid && wid->isAncestorOf(_parent) && isVisible()) 
+    {
+        if ( type == QEvent::KeyPress ) 
+        {
+            QKeyEvent *ev = static_cast<QKeyEvent *>( e );
+            switch ( ev->key() ) 
+            {
+                case Qt::Key_Up:
+                case Qt::Key_Backtab:
+                    if (ev->modifiers() == Qt::NoButton || (ev->modifiers() & Qt::ShiftModifier)) 
+                    {
+                        up();
+                        ev->accept();
+                        return true;
+                    }
+                    break;
+
+                case Qt::Key_Down:
+                case Qt::Key_Tab:
+                    if (ev->modifiers() == Qt::NoButton)
+                    {
+                        down();
+                        ev->accept();
+                        return true;
+                    }
+                    break;
+
+                case Qt::Key_Return:
+                        hide();
+                        emit chosenUrl(currentUrl().url());
+                        ev->accept();
+                        return true;
+                    break;
+            }
+        }
+    }
+
+    return QFrame::eventFilter(o,e);
+}
+
+
+void CompletionWidget::setVisible( bool visible )
+{
+    if (visible) 
+    {
+        Application::instance()->installEventFilter(this);
+    }
+    else
+    {
+        Application::instance()->removeEventFilter(this);
+    }
+    
+    QFrame::setVisible(visible);
+}
+
+
+void CompletionWidget::itemChosen(ListItem *item)
+{
+    emit chosenUrl(_list.at(layout()->indexOf(item)).url);
+    hide();
+}
\ No newline at end of file
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
new file mode 100644
index 00000000..7b474bd8
--- /dev/null
+++ b/src/urlbar/completionwidget.h
@@ -0,0 +1,77 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef COMPLETION_WIDGET_H
+#define COMPLETION_WIDGET_H
+
+
+// Local Includes
+#include "urlresolver.h"
+#include "listitem.h"
+
+// Qt Includes
+#include <QFrame>
+
+// KDE Includes
+#include <KLineEdit>
+
+// Forward Declarations
+class KUrl;
+
+
+class CompletionWidget : public QFrame
+{
+Q_OBJECT
+
+public:
+    CompletionWidget(QWidget *parent);
+
+    void insertSearchList(const UrlSearchList &list);
+    void popup();
+
+    void up();
+    void down();
+    void clear();
+    virtual bool eventFilter(QObject *obj, QEvent *ev);
+    void setVisible(bool visible);
+    KUrl currentUrl();
+    
+private slots:
+    void itemChosen(ListItem *item);
+
+signals:
+    void chosenUrl(const QString&);
+
+private:
+    void sizeAndPosition();
+    
+    QWidget *_parent;
+
+    UrlSearchList _list;
+    int _currentIndex;
+};
+
+#endif // COMPLETION_WIDGET_H
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index db36bd0c..f3c93e8e 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 1ac3af2e..d76a5fcb 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -2,9 +2,9 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2009-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -30,9 +30,6 @@
 #define LINEEDIT_H
 
 
-// Local Includes
-#include "rekonqprivate_export.h"
-
 // KDE Includes
 #include <KLineEdit>
 
@@ -42,7 +39,7 @@ class QFocusEvent;
 class QKeyEvent;
 
 
-class REKONQ_TESTS_EXPORT LineEdit : public KLineEdit
+class LineEdit : public KLineEdit
 {
     Q_OBJECT
 
@@ -50,9 +47,12 @@ public:
     explicit LineEdit(QWidget *parent = 0);
     virtual ~LineEdit();
 
+    
 protected:
     virtual void keyPressEvent(QKeyEvent*);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
+
+
 };
 
 #endif // LINEEDIT_H
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
new file mode 100644
index 00000000..92951cb7
--- /dev/null
+++ b/src/urlbar/listitem.cpp
@@ -0,0 +1,173 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "listitem.h"   
+
+// Local Includes
+#include "urlresolver.h"
+#include "application.h"
+
+// KDE Includes
+#include <KIcon>
+#include <KStandardDirs>
+#include <KDebug>
+
+// Qt Includes
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QSizePolicy>
+#include <QPixmap>
+#include <QStylePainter>
+#include <QFile>
+
+ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
+    : QWidget(parent),
+    m_option()
+{
+    QHBoxLayout *hLayout = new QHBoxLayout;
+    QVBoxLayout *vLayout = new QVBoxLayout;
+
+    QLabel *previewLabel = new QLabel;
+    previewLabel->setFixedSize(40,30);
+    QPixmap preview;
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(item.url) + ".png", true);
+    if(QFile::exists(path))
+    {
+        preview.load(path);
+        previewLabel->setPixmap(preview.scaled(40,30));
+    }
+    else
+    {
+        if(item.icon.startsWith( QLatin1String("http://") ) )
+            preview = Application::icon( item.icon ).pixmap(22);
+    }
+    previewLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+    
+    hLayout->addWidget(previewLabel);
+    hLayout->addLayout(vLayout);
+    
+    QLabel *titleLabel = new QLabel("<b>" + item.title + "</b>");
+    titleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    
+    QLabel *urlLabel = new QLabel("<i>" + item.url + "</i>");
+    urlLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        
+    vLayout->addWidget(titleLabel);
+    vLayout->addWidget(urlLabel);
+
+
+    QLabel *iconLabel = new QLabel;
+    QPixmap pixmap;
+    if(item.icon.startsWith( QLatin1String("http://") ) )
+        pixmap = Application::icon( item.icon ).pixmap(18);
+    else
+        pixmap = KIcon(item.icon).pixmap(18);
+
+    iconLabel->setPixmap(pixmap);
+    iconLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+    hLayout->addWidget(iconLabel);
+
+    setLayout(hLayout);
+    
+    m_option.initFrom(this);
+    m_option.direction = Qt::LeftToRight;
+    
+    deactivate();
+}
+
+ListItem::~ListItem()
+{
+    disconnect();
+}
+
+
+//TODO: REMOVE DUPLICATE CODE WITH PREVIEWIMAGE
+QString ListItem::guessNameFromUrl(QUrl url)
+{
+    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
+    
+    // TODO learn Regular Expressions :)
+    // and implement something better here..
+    name.remove('/');
+    name.remove('&');
+    name.remove('.');
+    name.remove('-');
+    name.remove('_');
+    name.remove('?');
+    name.remove('=');
+    name.remove('+');
+    
+    return name;
+}
+
+
+void ListItem::activate()
+{
+    m_option.state |= QStyle::State_Selected;
+    repaint();
+}
+
+
+void ListItem::deactivate()
+{
+    m_option.state  &= ~QStyle::State_Selected;
+    repaint();
+}
+
+void ListItem::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    
+    if( m_option.state.testFlag(QStyle::State_Selected) ||  m_option.state.testFlag(QStyle::State_MouseOver))
+    {
+        QPainter painter(this);
+        m_option.rect=QRect(QPoint(),size());
+        style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &m_option, &painter, this);
+    }
+}
+
+void ListItem::enterEvent(QEvent *e)
+{
+    m_option.state |= QStyle::State_MouseOver;
+    repaint();
+    QWidget::enterEvent(e);
+}
+
+void ListItem::leaveEvent(QEvent *e)
+{
+    m_option.state &= ~QStyle::State_MouseOver;
+    repaint();
+    QWidget::enterEvent(e);
+}
+
+void ListItem::mousePressEvent(QMouseEvent *e)
+{
+    emit itemClicked(this);
+    QWidget::mousePressEvent(e);
+}
+
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
new file mode 100644
index 00000000..6aa3f1e9
--- /dev/null
+++ b/src/urlbar/listitem.h
@@ -0,0 +1,59 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Qt Includes
+#include <QWidget>
+#include <QStyleOptionViewItemV4>
+
+// Forward Declarations
+class UrlSearchItem;
+
+
+class ListItem : public QWidget
+{
+Q_OBJECT
+
+public:
+    ListItem(const UrlSearchItem &item, QWidget *parent = 0);
+    ~ListItem();
+
+    void activate();
+    void deactivate();
+
+signals:
+    void itemClicked(ListItem *item);
+
+protected:
+   virtual void paintEvent(QPaintEvent *event);
+   virtual void enterEvent(QEvent *);
+   virtual void leaveEvent(QEvent *);
+   virtual void mousePressEvent(QMouseEvent *e);
+
+private:
+    QStyleOptionViewItemV4 m_option;
+    QString guessNameFromUrl(QUrl url);
+
+};
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 189d19fe..54a0a02d 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -36,8 +36,7 @@
 #include "lineedit.h"
 #include "mainwindow.h"
 #include "webview.h"
-#include "historymanager.h"
-#include "webtab.h"
+#include "urlresolver.h"
 
 // KDE Includes
 #include <KDebug>
@@ -49,43 +48,44 @@
 #include <QPaintEvent>
 #include <QPalette>
 #include <QTimer>
-
+#include <QVBoxLayout>
 
 QColor UrlBar::s_defaultBaseColor;
 
 
 UrlBar::UrlBar(QWidget *parent)
-        : KHistoryComboBox(true, parent)
-        , m_lineEdit(new LineEdit)
-        , m_progress(0)
+    : KComboBox(true, parent)
+    , m_lineEdit(new LineEdit)
+    , m_progress(0)
+    , m_box(new CompletionWidget(this))
 {
-    setUrlDropsEnabled(true);
-    setAutoDeleteCompletionObject(true);
-
     //cosmetic
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setMinimumWidth(180);
-    
-    setTrapReturnKey(true);
-
-    setupLineEdit();
 
-    // add every item to history
-    connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&)));
-    connect(completionBox(), SIGNAL(activated(const QString&)), SLOT(activated(const QString&)));
+    // signal handlings
+    setTrapReturnKey(true);
+    setUrlDropsEnabled(true);
+    
+    // Make m_lineEdit background transparent
+    QPalette p = m_lineEdit->palette();
+    p.setColor(QPalette::Base, Qt::transparent);
+    m_lineEdit->setPalette(p);
 
-    connect(this, SIGNAL(cleared()), SLOT(cleared()));
+    if (!s_defaultBaseColor.isValid())
+    {
+        s_defaultBaseColor = palette().color(QPalette::Base);
+    }
 
-    // setup completion box
-    setCompletionObject( Application::historyManager()->completionObject() );
-    
-    // set dropdown list background
-    QPalette p = view()->palette();
-    p.setColor(QPalette::Base, palette().color(QPalette::Base));
-    view()->setPalette(p);
+    setLineEdit(m_lineEdit);
 
+    // clear the URL bar
+    m_lineEdit->clear();
     // load urls on activated urlbar signal
-    connect(this, SIGNAL(activated(const KUrl&)), Application::instance(), SLOT(loadUrl(const KUrl&)));
+    connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&)));
+    
+    installEventFilter(m_box);
+    connect(m_box, SIGNAL(chosenUrl(const QString&)), SLOT(activated(const QString&)));
 }
 
 
@@ -96,7 +96,7 @@ UrlBar::~UrlBar()
 
 void UrlBar::selectAll() const
 {
-    lineEdit()->selectAll();
+    m_lineEdit->selectAll();
 }
 
 
@@ -106,42 +106,12 @@ KUrl UrlBar::url() const
 }
 
 
-KLineEdit *UrlBar::lineEdit() const
-{
-    return m_lineEdit;
-}
-
-
-void UrlBar::setupLineEdit()
-{
-    // Make m_lineEdit background transparent
-    QPalette p = m_lineEdit->palette();
-    p.setColor(QPalette::Base, Qt::transparent);
-    m_lineEdit->setPalette(p);
-
-    if (!s_defaultBaseColor.isValid())
-    {
-        s_defaultBaseColor = palette().color(QPalette::Base);
-    }
-
-    setLineEdit(m_lineEdit);
-
-    // Make the lineedit consume the Qt::Key_Enter event...
-    lineEdit()->setTrapReturnKey(true);
-
-    lineEdit()->setHandleSignals(true);
-
-    // clear the URL bar
-    lineEdit()->clear();
-}
-
-
 void UrlBar::setUrl(const QUrl& url)
 {
     if(url.scheme() == "about")
     {
         m_currentUrl = KUrl();
-        updateUrl();    // updateUrl before setFocus        
+        updateUrl();
         setFocus();
     }
     else
@@ -149,6 +119,7 @@ void UrlBar::setUrl(const QUrl& url)
         m_currentUrl = KUrl(url);
         updateUrl();
     }
+
 }
 
 
@@ -195,29 +166,21 @@ void UrlBar::updateUrl()
     // Must be AFTER setCurrentIndex
     if (!hasFocus())
     {
-        lineEdit()->setCursorPosition(0);
+        m_lineEdit->setCursorPosition(0);
     }
 }
 
 
 void UrlBar::activated(const QString& urlString)
 {
+    disconnect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    
     if (urlString.isEmpty())
         return;
 
-    // this fix urlbar behaviour, removing focus from there and enabling
-    // loading animation. Temporary fix??
-    Application::instance()->mainWindow()->currentTab()->setFocus();
-
-    setUrl( KUrl(urlString) );
-    emit activated( KUrl(urlString) );
-}
-
-
-void UrlBar::cleared()
-{
-    // clear the history on user's request from context menu
-    clear();
+    clearFocus();
+    setUrl(urlString);
+    Application::instance()->loadUrl(m_currentUrl);
 }
 
 
@@ -243,7 +206,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
     p.setColor(QPalette::Base, s_defaultBaseColor);
     setPalette(p);
 
-    KHistoryComboBox::paintEvent(event);
+    KComboBox::paintEvent(event);
 
     if (!hasFocus())
     {
@@ -261,7 +224,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
         painter.setBrush(generateGradient(loadingColor, height()));
         painter.setPen(Qt::transparent);
 
-        QRect backgroundRect = lineEdit()->frameGeometry();
+        QRect backgroundRect = m_lineEdit->frameGeometry();
         int mid = backgroundRect.width() * m_progress / 100;
         QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
         painter.drawRect(progressRect);
@@ -272,7 +235,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
 
 QSize UrlBar::sizeHint() const
 {
-    return lineEdit()->sizeHint();
+    return m_lineEdit->sizeHint();
 }
 
 
@@ -308,43 +271,70 @@ bool UrlBar::isLoading()
     return true;
 }
 
-
 void UrlBar::keyPressEvent(QKeyEvent *event)
 {
+
+    // this handles the Modifiers + Return key combinations
     QString currentText = m_lineEdit->text().trimmed();
-    if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
+    if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
+        && !currentText.startsWith(QLatin1String("http://"), Qt::CaseInsensitive))
     {
-        if( !currentText.startsWith(QLatin1String("http://"), Qt::CaseInsensitive) )
+        QString append;
+        if (event->modifiers() == Qt::ControlModifier)
         {
-            QString append;
-            if (event->modifiers() == Qt::ControlModifier)
-            {
-                append = QLatin1String(".com");
-            }
-            else if (event->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
-            {
-                append = QLatin1String(".org");
-            }
-            else if (event->modifiers() == Qt::ShiftModifier)
-            {
-                append = QLatin1String(".net");
-            }
-
-            QUrl url(QLatin1String("http://www.") + currentText);
-            QString host = url.host();
-            if (!host.endsWith(append, Qt::CaseInsensitive))
-            {
-                host += append;
-                url.setHost(host);
-                m_lineEdit->setText(url.toString());
-            }
+            append = QLatin1String(".com");
         }
-        else
+        else if (event->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
+        {
+            append = QLatin1String(".org");
+        }
+        else if (event->modifiers() == Qt::ShiftModifier)
+        {
+            append = QLatin1String(".net");
+        }
+
+        QUrl url(QLatin1String("http://www.") + currentText);
+        QString host = url.host();
+        if (!host.endsWith(append, Qt::CaseInsensitive))
         {
-            // fill lineEdit with its stripped contents to remove trailing spaces
-            m_lineEdit->setText(currentText);
+            host += append;
+            url.setHost(host);
+            m_lineEdit->setText(url.toString());
         }
     }
+    
+    KComboBox::keyPressEvent(event);
+}
+
+
+void UrlBar::suggestUrls(const QString &text)
+{   
+    if (!hasFocus())
+    {
+        return;
+    }
+
+    if(text.isEmpty())
+    {
+        m_box->hide();
+        return;
+    }
+
+    UrlResolver res(text);
+    UrlSearchList list = res.orderedSearchItems();
+
+    if(list.count() > 0)
+    {
+        m_box->clear();
+        m_box->insertSearchList(list);
+        m_box->popup();
+    }
+}
 
-    KHistoryComboBox::keyPressEvent(event);
+void UrlBar::focusInEvent(QFocusEvent *event)
+{
+    // activate suggestions on edit text
+    connect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    
+    KComboBox::focusInEvent(event);
 }
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 39911bb2..ef53d63a 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -2,10 +2,10 @@
 *
 * This file is a part of the rekonq project
 *
-* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Domrachev Alexandr <alexandr.domrachev@gmail.com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
-* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2009 by Lionel Chauvin <megabigbug@yahoo.fr>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -32,23 +32,23 @@
 
 
 // Local Includes
-#include "rekonqprivate_export.h"
 #include "lineedit.h"
+#include "completionwidget.h"
 
 // KDE Includes
 #include <KUrl>
-#include <KHistoryComboBox>
+#include <KComboBox>
 
 // Qt Includes
 #include <QUrl>
+#include <QPointer>
 
 // Forward Declarations
 class QLinearGradient;
 class QWidget;
-class KCompletion;
 
 
-class REKONQ_TESTS_EXPORT UrlBar : public KHistoryComboBox
+class UrlBar : public KComboBox
 {
     Q_OBJECT
 
@@ -61,31 +61,24 @@ public:
     QSize sizeHint() const;
     void setBackgroundColor(QColor);
     bool isLoading();
-    
     void setProgress(int progress);
 
-signals:
-    void activated(const KUrl&);
-
 public slots:
     void setUrl(const QUrl &url);
     void updateProgress(int progress);
     void updateUrl();
-    
+
 private slots:
     void activated(const QString& url);
     void loadFinished(bool);
-    void cleared();
+    void suggestUrls(const QString &editedText);
 
 protected:
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
+    virtual void focusInEvent(QFocusEvent *event);
 
 private:
-    void setupLineEdit();
-
-    KLineEdit *lineEdit() const;
-
     static QLinearGradient generateGradient(const QColor &color, int height);
 
     static QColor s_defaultBaseColor;
@@ -94,6 +87,9 @@ private:
 
     KUrl m_currentUrl;
     int m_progress;
+
+    CompletionWidget *m_box;
+    KUrl m_suggestedUrl;
 };
 
 #endif
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
new file mode 100644
index 00000000..b2bf50af
--- /dev/null
+++ b/src/urlbar/urlresolver.cpp
@@ -0,0 +1,177 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "urlresolver.h"
+
+// Local Includes
+#include "application.h"
+#include "historymanager.h"
+#include "bookmarksmanager.h"
+
+// KDE Includes
+#include <KUriFilter>
+#include <KCompletion>
+#include <KDebug>
+#include <KService>
+#include <KConfig>
+#include <KConfigGroup>
+
+// Qt Includes
+#include <QString>
+#include <QByteArray>
+#include <QUrl>
+
+
+// NOTE default kurifilter plugin list (at least in my box)
+// 1. "kshorturifilter"
+// 2. "kurisearchfilter"
+// 3. "localdomainurifilter"
+// 4 ."kuriikwsfilter"
+// 5. "fixhosturifilter"
+
+
+UrlResolver::UrlResolver(const QString &typedUrl)
+    : _urlString(typedUrl)
+{
+}
+
+
+UrlSearchList UrlResolver::orderedSearchItems()
+{
+    // NOTE: the logic here is : "we wanna suggest (at least) 9 elements"
+    // so we have (more or less) 3 from first results (1 from QUrl Resolutions, 2 from 
+    // default search engines).
+    // There are 6 remaining: if bookmarkResults + historyResults <= 6, catch all, else
+    // catch first 3 results from the two resulting lists :)
+    
+    UrlSearchList list;
+    
+    list << qurlFromUserInputResolution();
+    list << webSearchesResolution();
+    int firstResults = list.count();
+    int checkPoint = 9 - firstResults;
+    
+    UrlSearchList historyList = historyResolution();
+    int historyResults = historyList.count();
+    
+    UrlSearchList bookmarksList = bookmarksResolution();
+    int bookmarkResults = bookmarksList.count();
+    
+    if(historyResults + bookmarkResults > checkPoint)
+    {
+        historyList = historyList.mid(0,3);
+        bookmarksList = bookmarksList.mid(0,3);
+    }
+    list << historyList;
+    list << bookmarksList;
+    
+    return list;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// PRIVATE ENGINES
+
+
+// STEP 1 = QUrl from User Input (easily the best solution... )
+UrlSearchList UrlResolver::qurlFromUserInputResolution()
+{
+    UrlSearchList list;
+    
+    QString url2 = _urlString;
+    QUrl urlFromUserInput = QUrl::fromUserInput(url2);
+    if(urlFromUserInput.isValid())
+    {
+        QByteArray ba = urlFromUserInput.toEncoded();
+        if(!ba.isEmpty())
+        {
+            QString str(ba);
+            UrlSearchItem it(str);
+            list << it;
+        }
+    }
+    
+    return list;
+}
+
+
+// STEP 2 = Web Searches
+UrlSearchList UrlResolver::webSearchesResolution()
+{
+    UrlSearchList list;
+    
+    QString url1 = _urlString;
+    if(KUrl(url1).isRelative() && !url1.contains('.'))
+    {
+        // KUriFilter has the worst performance possible here and let this trick unusable
+        QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(url1);
+        QString gTitle = i18n("Search Google for ") + url1;
+        UrlSearchItem gItem(gUrl, gTitle, QString("http://www.google.com") );
+        list << gItem;
+        
+        QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
+        QString wTitle = i18n("Search Wikipedia for ") + url1;
+        UrlSearchItem wItem(wUrl, wTitle, QString("http://wikipedia.org") );
+        list << wItem;
+    }
+
+    return list;
+}
+
+
+// STEP 3 = history completion
+UrlSearchList UrlResolver::historyResolution()
+{
+    UrlSearchList list;
+    
+    KCompletion *historyCompletion = Application::historyManager()->completionObject();
+    QStringList historyResults = historyCompletion->substringCompletion(_urlString);
+    Q_FOREACH(const QString &s, historyResults)
+    {
+        UrlSearchItem it(s, s, QString("view-history"));
+        list << it;
+    }
+
+    return list;
+}
+
+
+// STEP 4 = bookmarks completion
+UrlSearchList UrlResolver::bookmarksResolution()
+{
+    UrlSearchList list;
+    
+    KCompletion *bookmarkCompletion = Application::bookmarkProvider()->completionObject();
+    QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
+    Q_FOREACH(const QString &s, bookmarkResults)
+    {
+        UrlSearchItem it( s, QString(), QString("rating") );
+        list << it;
+    }
+
+    return list;
+}
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
new file mode 100644
index 00000000..0a880150
--- /dev/null
+++ b/src/urlbar/urlresolver.h
@@ -0,0 +1,72 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef URL_RESOLVER_H
+#define URL_RESOLVER_H
+
+
+// Qt Includes
+#include <QString>
+#include <QList>
+
+// Forward Declarations
+class KUrl;
+
+class UrlSearchItem
+{
+public:
+    QString url;
+    QString title;
+    QString icon;
+    
+    UrlSearchItem(const QString &_url, const QString &_title = QString(), const QString &_icon = QString())
+        : url(_url), title(_title), icon(_icon)
+    {};
+};
+
+typedef QList <UrlSearchItem> UrlSearchList;
+
+
+// ----------------------------------------------------------------------
+
+
+class UrlResolver
+{
+public:
+    UrlResolver(const QString &typedUrl);
+    
+    UrlSearchList orderedSearchItems();
+
+private:
+    QString _urlString;
+
+    UrlSearchList webSearchesResolution();
+    UrlSearchList historyResolution();
+    UrlSearchList qurlFromUserInputResolution();
+    UrlSearchList bookmarksResolution();
+};
+
+#endif // URL_RESOLVER_H
-- 
cgit v1.2.1


From d9796c992638d4c4d740415e29a0766a92d2e101 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sat, 27 Mar 2010 15:25:38 +0100
Subject: Improve Downloads page appearance : the downloads info are shown on 3
 lines with the icon of the file

---
 src/data/home.html | 14 ++++++++++++++
 src/newtabpage.cpp | 40 ++++++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 50564d55..96c0bd06 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -142,6 +142,18 @@ margin-left: 2em;
 margin-bottom: 0.5em;
 }
 
+/* -------------------------------------------------------- */
+/* Downloads page */
+
+.download{
+margin: 1.5em 0;
+}
+
+.download img{
+float: left;
+margin-right: 5px;
+}
+
 /* -------------------------------------------------------- */
 </style>
 </head>
@@ -155,6 +167,7 @@ margin-bottom: 0.5em;
 </div>
 
 <div id="models" style="display:none">
+    <div></div>
     <div class="link">
         <a href="">
             <img src="" />
@@ -177,6 +190,7 @@ margin-bottom: 0.5em;
     <h3></h3>
     <a></a>
     <br />
+    <img />
     <p class="bookfolder"></p>
 </div>
 
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 36ddafed..c61eb60d 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -467,29 +467,37 @@ void NewTabPage::downloadsPage()
     
     foreach(const DownloadItem &item, list)
     {
-        m_root.appendInside(markup("h3"));
-        m_root.lastChild().setPlainText("");
+        m_root.prependInside(markup("div"));
+        
+        QWebElement div = m_root.firstChild();
+        div.addClass("download");
     
         KUrl u = KUrl(item.destUrlString);
         QString fName = u.fileName();
         QString dir = QL1S("file://") + u.directory();
         
-        m_root.appendInside( item.dateTime.toString("dddd") );
-        m_root.appendInside("<br/>");
-        m_root.appendInside( item.dateTime.toString("dd MMMM yyyy") );
-        m_root.appendInside(", ");
-        m_root.appendInside( item.dateTime.toString("hh:mm:ss") );
-        m_root.appendInside("<br/>");
+        KIconLoader *loader = KIconLoader::global();
+        QString iconPath = "file://" + loader->iconPath(KMimeType::iconNameForUrl(u), KIconLoader::Desktop);
+        
+        div.appendInside(markup("img"));
+        div.lastChild().setAttribute("src", iconPath );
         
-        m_root.appendInside(fName);
-        m_root.appendInside("<br/>");
+        div.appendInside("<strong>" + fName + "</strong>");
+        div.appendInside(" - ");
+        div.appendInside( item.dateTime.toString("'<em>'dd MMMM yyyy hh:mm'</em>'") );
+        div.appendInside("<br/>");
         
-        m_root.appendInside(item.srcUrlString);
-        m_root.appendInside("<br/>");
+        div.appendInside(item.srcUrlString);
+        div.appendInside("<br/>");
 
-        m_root.appendInside(markup("a"));
-        m_root.lastChild().setAttribute("href" , dir);
-        m_root.lastChild().setPlainText("browse dir");
-        m_root.appendInside("<br/>");
+        div.appendInside(markup("a"));
+        div.lastChild().setAttribute("href" , dir);
+        div.lastChild().setPlainText("Browse dir");
+        
+        /* TODO : make this link work
+        div.appendInside(" - ");
+        div.appendInside(markup("a"));
+        div.lastChild().setAttribute("href" , u.toMimeDataString());
+        div.lastChild().setPlainText("Open file");*/
     }
 }
-- 
cgit v1.2.1


From c6e137acee1f707d33afd6bf5bbbe994167d6a2f Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Mon, 29 Mar 2010 18:32:16 +0200
Subject: Add mid click support for the completition widget of the url bar

---
 src/urlbar/completionwidget.cpp | 13 ++++++++-----
 src/urlbar/completionwidget.h   |  5 +++--
 src/urlbar/listitem.cpp         |  3 ++-
 src/urlbar/listitem.h           |  2 +-
 src/urlbar/urlbar.cpp           |  6 +++---
 src/urlbar/urlbar.h             |  2 +-
 6 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 42abcb73..3ea35a0b 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -72,7 +72,7 @@ void CompletionWidget::insertSearchList(const UrlSearchList &list)
     {
         UrlSearchItem item = list.at(i);
         ListItem *suggestion = new ListItem(item);
-        connect(suggestion, SIGNAL(itemClicked(ListItem *)), this, SLOT(itemChosen(ListItem *)));
+        connect(suggestion, SIGNAL(itemClicked(ListItem *, Qt::MouseButton)), this, SLOT(itemChosen(ListItem *, Qt::MouseButton)));
         suggestion->setObjectName( QString::number(i) );
         layout()->addWidget( suggestion );
     }
@@ -208,7 +208,7 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
 
                 case Qt::Key_Return:
                         hide();
-                        emit chosenUrl(currentUrl().url());
+                        emit chosenUrl(currentUrl().url(), Rekonq::CurrentTab);
                         ev->accept();
                         return true;
                     break;
@@ -235,8 +235,11 @@ void CompletionWidget::setVisible( bool visible )
 }
 
 
-void CompletionWidget::itemChosen(ListItem *item)
+void CompletionWidget::itemChosen(ListItem *item, Qt::MouseButton button)
 {
-    emit chosenUrl(_list.at(layout()->indexOf(item)).url);
+    if(button == Qt::MidButton)
+        emit chosenUrl(_list.at(layout()->indexOf(item)).url, Rekonq::NewCurrentTab);
+    else
+        emit chosenUrl(_list.at(layout()->indexOf(item)).url, Rekonq::CurrentTab);
     hide();
-}
\ No newline at end of file
+}
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 7b474bd8..64d33189 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -29,6 +29,7 @@
 
 
 // Local Includes
+#include "application.h"
 #include "urlresolver.h"
 #include "listitem.h"
 
@@ -60,10 +61,10 @@ public:
     KUrl currentUrl();
     
 private slots:
-    void itemChosen(ListItem *item);
+    void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton);
 
 signals:
-    void chosenUrl(const QString&);
+    void chosenUrl(const QString&, Rekonq::OpenType);
 
 private:
     void sizeAndPosition();
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 92951cb7..d9837c7e 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -44,6 +44,7 @@
 #include <QPixmap>
 #include <QStylePainter>
 #include <QFile>
+#include <QMouseEvent>
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent),
@@ -167,7 +168,7 @@ void ListItem::leaveEvent(QEvent *e)
 
 void ListItem::mousePressEvent(QMouseEvent *e)
 {
-    emit itemClicked(this);
+    emit itemClicked(this, e->button());
     QWidget::mousePressEvent(e);
 }
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 6aa3f1e9..ac476d4b 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -44,7 +44,7 @@ public:
     void deactivate();
 
 signals:
-    void itemClicked(ListItem *item);
+    void itemClicked(ListItem *item, Qt::MouseButton);
 
 protected:
    virtual void paintEvent(QPaintEvent *event);
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 54a0a02d..57108d29 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -85,7 +85,7 @@ UrlBar::UrlBar(QWidget *parent)
     connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&)));
     
     installEventFilter(m_box);
-    connect(m_box, SIGNAL(chosenUrl(const QString&)), SLOT(activated(const QString&)));
+    connect(m_box, SIGNAL(chosenUrl(const QString&, Rekonq::OpenType)), SLOT(activated(const QString&, Rekonq::OpenType)));
 }
 
 
@@ -171,7 +171,7 @@ void UrlBar::updateUrl()
 }
 
 
-void UrlBar::activated(const QString& urlString)
+void UrlBar::activated(const QString& urlString, Rekonq::OpenType type)
 {
     disconnect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
@@ -180,7 +180,7 @@ void UrlBar::activated(const QString& urlString)
 
     clearFocus();
     setUrl(urlString);
-    Application::instance()->loadUrl(m_currentUrl);
+    Application::instance()->loadUrl(m_currentUrl, type);
 }
 
 
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index ef53d63a..552d1ee0 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -69,7 +69,7 @@ public slots:
     void updateUrl();
 
 private slots:
-    void activated(const QString& url);
+    void activated(const QString& url, Rekonq::OpenType = Rekonq::CurrentTab);
     void loadFinished(bool);
     void suggestUrls(const QString &editedText);
 
-- 
cgit v1.2.1


From 0daaf2f04b4e2be4c8a63f6008b4653ea08e1054 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Mon, 29 Mar 2010 21:33:44 +0200
Subject: detect if user type an url and order the results accordingly

---
 src/urlbar/urlresolver.cpp | 48 +++++++++++++++++++++++++++++++++++-----------
 src/urlbar/urlresolver.h   |  1 +
 2 files changed, 38 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index b2bf50af..3f87b989 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -70,8 +70,17 @@ UrlSearchList UrlResolver::orderedSearchItems()
     
     UrlSearchList list;
     
-    list << qurlFromUserInputResolution();
-    list << webSearchesResolution();
+    if(isHttp())
+    {
+        list << qurlFromUserInputResolution();
+        list << webSearchesResolution();
+    }
+    else
+    {  
+        list << webSearchesResolution();
+        list << qurlFromUserInputResolution();
+    }
+
     int firstResults = list.count();
     int checkPoint = 9 - firstResults;
     
@@ -93,6 +102,21 @@ UrlSearchList UrlResolver::orderedSearchItems()
 }
 
 
+bool UrlResolver::isHttp()
+{
+    QString r = "[\\d\\w-.]+\\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|"\
+    "c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|"\
+    "h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|"\
+    "m[acdghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eouw]|"\
+    "s[abcdeghijklmnortuvyz]|t[cdfghjkmnoprtvwz]|u[augkmsyz]|v[aceginu]|w[fs]|"\
+    "y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\
+    "pro)";
+
+    return (QRegExp(r, Qt::CaseInsensitive).indexIn(_urlString) != -1) 
+            || _urlString.startsWith("http:") 
+            || _urlString.startsWith("https:");
+}
+
 //////////////////////////////////////////////////////////////////////////
 // PRIVATE ENGINES
 
@@ -108,10 +132,12 @@ UrlSearchList UrlResolver::qurlFromUserInputResolution()
     {
         QByteArray ba = urlFromUserInput.toEncoded();
         if(!ba.isEmpty())
-        {
-            QString str(ba);
-            UrlSearchItem it(str);
-            list << it;
+        {           
+            QString gUrl = QString(ba);
+            QString gTitle = i18n("Browse");
+            UrlSearchItem gItem(gUrl, gTitle, QString("") );
+            list << gItem;
+
         }
     }
     
@@ -125,7 +151,7 @@ UrlSearchList UrlResolver::webSearchesResolution()
     UrlSearchList list;
     
     QString url1 = _urlString;
-    if(KUrl(url1).isRelative() && !url1.contains('.'))
+    if(KUrl(url1).isRelative())
     {
         // KUriFilter has the worst performance possible here and let this trick unusable
         QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(url1);
@@ -133,10 +159,10 @@ UrlSearchList UrlResolver::webSearchesResolution()
         UrlSearchItem gItem(gUrl, gTitle, QString("http://www.google.com") );
         list << gItem;
         
-        QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
-        QString wTitle = i18n("Search Wikipedia for ") + url1;
-        UrlSearchItem wItem(wUrl, wTitle, QString("http://wikipedia.org") );
-        list << wItem;
+//         QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
+//         QString wTitle = i18n("Search Wikipedia for ") + url1;
+//         UrlSearchItem wItem(wUrl, wTitle, QString("http://wikipedia.org") );
+//         list << wItem;
     }
 
     return list;
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 0a880150..4231aaab 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -67,6 +67,7 @@ private:
     UrlSearchList historyResolution();
     UrlSearchList qurlFromUserInputResolution();
     UrlSearchList bookmarksResolution();
+    bool isHttp();
 };
 
 #endif // URL_RESOLVER_H
-- 
cgit v1.2.1


From b1f39e13b1d2199b2f8a9bef3c213715a36dd146 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Mon, 29 Mar 2010 23:20:37 +0200
Subject: add title for bookmarks in the list

---
 src/bookmarks/bookmarksmanager.cpp | 50 +++++++++++++++++++++++++++++++++++++-
 src/bookmarks/bookmarksmanager.h   |  4 +++
 src/urlbar/urlresolver.cpp         |  3 ++-
 3 files changed, 55 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 89e39ef8..9c3201e6 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -294,7 +294,7 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
     }
     else
     {        
-        m_completion->addItem(bookmark.url().path());
+        m_completion->addItem(bookmark.url().url());
         return new KBookmarkAction(bookmark, m_owner, this);
     }
 }
@@ -309,3 +309,51 @@ KCompletion *BookmarkProvider::completionObject() const
 {
     return m_completion;
 }
+
+
+
+
+
+QString BookmarkProvider::titleForBookmarkUrl(QString url)
+{
+    QString title = "";
+    KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
+    if (bookGroup.isNull())
+    {
+        return title;
+    }
+
+    KBookmark bookmark = bookGroup.first();
+    while (!bookmark.isNull() && title.isEmpty())
+    {
+        title = titleForBookmarkUrl(bookmark, url);
+        bookmark = bookGroup.next(bookmark);
+    }
+    
+    return title;
+}
+
+
+QString BookmarkProvider::titleForBookmarkUrl(const KBookmark &bookmark, QString url)
+{
+    QString title = "";
+    if (bookmark.isGroup())
+    {
+        KBookmarkGroup group = bookmark.toGroup();
+        KBookmark bm = group.first();
+        while (!bm.isNull() && title.isEmpty())
+        {
+            title = titleForBookmarkUrl(bm, url); // it is .bookfolder
+            bm = group.next(bm);
+        }
+    }
+    else if(!bookmark.isSeparator() && bookmark.url()==url)
+    {
+        title = bookmark.fullText();
+    }
+    
+    return title;
+}
+
+
+
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 18ff3ef0..ace06e95 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -219,6 +219,8 @@ public:
     */
     KCompletion *completionObject() const;
 
+    QString titleForBookmarkUrl(QString url);
+    
 signals:
     /**
     * @short This signal is emitted when an url has to be loaded
@@ -245,8 +247,10 @@ public slots:
      */
     void slotBookmarksChanged(const QString &group, const QString &caller);
 
+    
 private:
     KAction *fillBookmarkBar(const KBookmark &bookmark);
+    QString titleForBookmarkUrl(const KBookmark &bookmark, QString url);
 
     KBookmarkManager *m_manager;
     BookmarkOwner *m_owner;
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 3f87b989..cb61ad95 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -195,9 +195,10 @@ UrlSearchList UrlResolver::bookmarksResolution()
     QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, bookmarkResults)
     {
-        UrlSearchItem it( s, QString(), QString("rating") );
+        UrlSearchItem it( s, Application::bookmarkProvider()->titleForBookmarkUrl(s), QString("rating") );
         list << it;
     }
 
+
     return list;
 }
-- 
cgit v1.2.1


From 73a3dd68e9e9ffcecf9a09aceb479efccb0980ca Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 30 Mar 2010 09:44:03 +0200
Subject: fixing crash on manual rules saving

---
 src/settings/adblockwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
index 39df2c36..2f431c1e 100644
--- a/src/settings/adblockwidget.cpp
+++ b/src/settings/adblockwidget.cpp
@@ -166,7 +166,7 @@ void AdBlockWidget::save()
     n = listWidget->count();
     for(int i = 0; i < n; ++i)
     {
-        QListWidgetItem *item = listWidget->takeItem(i);
+        QListWidgetItem *item = listWidget->item(i);
         localRules << item->text();
     }
     localGroup.writeEntry( "local-rules" , localRules );
-- 
cgit v1.2.1


From 80b37fa28d6c4e148ac0c69e91e07c1679866c54 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 30 Mar 2010 11:26:07 +0200
Subject: Cleaning urlbar API and improving animation

WARNING:
This is the best animation I could provide with the KComboBox class.
In the KLineEdit derived it works perfectly. In the Combos there are some
shadows on top :(

Squashed commit of the following:

commit 01e72a1996161028f8dbdc4e355daf00f954eace
commit 8bc032d98a4987d3b01566ac520f5e8a1a095dd0
commit bc5cfd9f7d1b34f5af06dd7af6de8d3b2edb277b
commit 73b4deac84d91fece407b9c700dcc61e36a34327
commit c55b753913b2619607c6aa11cabbf77ca3c84e3e
commit b901fbe71b7539f65260c4fa9bbfb22f4ea997b9
commit 1de363d9614c1309ac1ac4a8eea7e70be7f2f3ed
commit 76d6373f8b6c41f5c27b8404db2074f9bfc309c9
commit d741aa7109db016abc292d49fb45d15bb09e6c01
---
 src/mainview.cpp        |  28 ++++---------
 src/mainview.h          |   2 +-
 src/mainwindow.cpp      |   8 ++--
 src/urlbar/lineedit.cpp |   2 +-
 src/urlbar/urlbar.cpp   | 109 +++++++++++++++++++-----------------------------
 src/urlbar/urlbar.h     |  17 +++-----
 6 files changed, 64 insertions(+), 102 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 6643becb..a00325fb 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -275,41 +275,31 @@ void MainView::currentChanged(int index)
     m_currentTabIndex = index;
 
     if (oldTab)
-    {        
-        // disconnecting webview from urlbar
-        disconnect(oldTab->view(), SIGNAL(loadProgress(int)), urlBar(), SLOT(updateProgress(int)));
-        disconnect(oldTab->view(), SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
-        disconnect(oldTab->view(), SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
-    
+    {           
         // disconnecting webpage from mainview
         disconnect(oldTab->page(), SIGNAL(statusBarMessage(const QString&)),
                    this, SIGNAL(showStatusBarMessage(const QString&)));
         disconnect(oldTab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
                    this, SIGNAL(linkHovered(const QString&)));
     }
-
-    // connecting webview with urlbar
-    connect(tab->view(), SIGNAL(loadProgress(int)), urlBar(), SLOT(updateProgress(int)));
-    connect(tab->view(), SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
-    connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
     
     connect(tab->page(), SIGNAL(statusBarMessage(const QString&)), 
             this, SIGNAL(showStatusBarMessage(const QString&)));
     connect(tab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), 
             this, SIGNAL(linkHovered(const QString&)));
 
-    emit setCurrentTitle(tab->view()->title());
-    urlBar()->setUrl(tab->view()->url());
-    urlBar()->setProgress(tab->progress());
-
+    emit currentTitle(tab->view()->title());
+    urlBar()->setCurrentTab(tab);
+    
     // clean up "status bar"
     emit showStatusBarMessage( QString() );
 
     // notify UI to eventually switch stop/reload button
-    if(urlBar()->isLoading())
-        emit browserTabLoading(true);
-    else
+    int progr = tab->progress();
+    if(progr == 0)
         emit browserTabLoading(false);
+    else
+        emit browserTabLoading(true);
     
     // update zoom slider
     if(!Application::instance()->mainWindowList().isEmpty())
@@ -613,7 +603,7 @@ void MainView::webViewTitleChanged(const QString &title)
     }
     if (currentIndex() == index)
     {
-        emit setCurrentTitle(tabTitle);
+        emit currentTitle(tabTitle);
     }
     Application::historyManager()->updateHistoryEntry(view->url(), tabTitle);
 }
diff --git a/src/mainview.h b/src/mainview.h
index 061ad1aa..fc10c2d9 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -105,7 +105,7 @@ signals:
     void lastTabClosed();
 
     // current tab signals
-    void setCurrentTitle(const QString &url);
+    void currentTitle(const QString &url);
     void showStatusBarMessage(const QString &message, Rekonq::Notify status = Rekonq::Info);
     void linkHovered(const QString &link);
     void browserTabLoading(bool);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6efd58ed..6701ea2e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -215,7 +215,7 @@ void MainWindow::postLaunch()
     connect(m_view, SIGNAL(linkHovered(const QString&)), this, SLOT(notifyMessage(const QString&)));
 
     // --------- connect signals and slots
-    connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(updateWindowTitle(const QString &)));
+    connect(m_view, SIGNAL(currentTitle(const QString &)), this, SLOT(updateWindowTitle(const QString &)));
     connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
 
     // (shift +) ctrl + tab switching
@@ -751,7 +751,7 @@ void MainWindow::privateBrowsing(bool enable)
         if (button == KMessageBox::Continue)
         {
             settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
-            m_view->urlBar()->setBackgroundColor(Qt::lightGray); // palette().color(QPalette::Active, QPalette::Background));
+            m_view->urlBar()->setPrivateMode(true);
         }
         else
         {
@@ -761,8 +761,8 @@ void MainWindow::privateBrowsing(bool enable)
     else
     {
         settings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
-        m_view->urlBar()->setBackgroundColor(palette().color(QPalette::Active, QPalette::Base));
-
+        m_view->urlBar()->setPrivateMode(false);
+        
         m_lastSearch.clear();
         m_view->clear();
         m_view->reloadAllTabs();
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index f3c93e8e..ac92b858 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -42,7 +42,7 @@ LineEdit::LineEdit(QWidget* parent)
     setMinimumWidth(200);
     setFocusPolicy(Qt::WheelFocus);
     setHandleSignals(true);
-    setClearButtonShown(true);
+    setClearButtonShown(false);
 }
 
 
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 57108d29..a04d6534 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -50,14 +50,13 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-QColor UrlBar::s_defaultBaseColor;
-
 
 UrlBar::UrlBar(QWidget *parent)
     : KComboBox(true, parent)
     , m_lineEdit(new LineEdit)
-    , m_progress(0)
     , m_box(new CompletionWidget(this))
+    , _tab(0)
+    , _privateMode(false)
 {
     //cosmetic
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
@@ -72,11 +71,6 @@ UrlBar::UrlBar(QWidget *parent)
     p.setColor(QPalette::Base, Qt::transparent);
     m_lineEdit->setPalette(p);
 
-    if (!s_defaultBaseColor.isValid())
-    {
-        s_defaultBaseColor = palette().color(QPalette::Base);
-    }
-
     setLineEdit(m_lineEdit);
 
     // clear the URL bar
@@ -123,13 +117,6 @@ void UrlBar::setUrl(const QUrl& url)
 }
 
 
-void UrlBar::setProgress(int progress)
-{
-    m_progress = progress;
-    update();
-}
-
-
 void UrlBar::updateUrl()
 {
     // Don't change my typed url...
@@ -184,26 +171,21 @@ void UrlBar::activated(const QString& urlString, Rekonq::OpenType type)
 }
 
 
-void UrlBar::loadFinished(bool)
-{
-    // reset progress bar after small delay
-    m_progress = 0;
-    QTimer::singleShot(200, this, SLOT(update()));
-}
-
-
-void UrlBar::updateProgress(int progress)
-{
-    m_progress = progress;
-    update();
-}
-
-
 void UrlBar::paintEvent(QPaintEvent *event)
 {
+    QColor backgroundColor;
+    if( _privateMode )
+    {
+        backgroundColor = QColor(192, 192, 192);  // gray
+    }
+    else
+    {
+        backgroundColor = Application::palette().color(QPalette::Base);
+    }
+    
     // set background color of UrlBar
     QPalette p = palette();
-    p.setColor(QPalette::Base, s_defaultBaseColor);
+    p.setColor(QPalette::Base, backgroundColor);
     setPalette(p);
 
     KComboBox::paintEvent(event);
@@ -221,11 +203,20 @@ void UrlBar::paintEvent(QPaintEvent *event)
         {
             loadingColor = QColor(116, 192, 250);
         }
-        painter.setBrush(generateGradient(loadingColor, height()));
+        int progr = _tab->progress();
+        
+        backgroundColor.setAlpha(0);
+        backgroundColor.setAlpha(200);
+        QLinearGradient gradient(0, 0, width(), height() );
+        gradient.setColorAt(0, loadingColor);
+        gradient.setColorAt(((double)progr)/100, backgroundColor);
+        
+        painter.setBrush( gradient );
         painter.setPen(Qt::transparent);
 
+
         QRect backgroundRect = m_lineEdit->frameGeometry();
-        int mid = backgroundRect.width() * m_progress / 100;
+        int mid = backgroundRect.width() * progr / 100;
         QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
         painter.drawRect(progressRect);
         painter.end();
@@ -239,41 +230,8 @@ QSize UrlBar::sizeHint() const
 }
 
 
-QLinearGradient UrlBar::generateGradient(const QColor &color, int height)
-{
-    QColor base = s_defaultBaseColor;
-    base.setAlpha(0);
-    QColor barColor = color;
-    barColor.setAlpha(200);
-    QLinearGradient gradient(0, 0, 0, height);
-    gradient.setColorAt(0, base);
-    gradient.setColorAt(0.25, barColor.lighter(120));
-    gradient.setColorAt(0.5, barColor);
-    gradient.setColorAt(0.75, barColor.lighter(120));
-    gradient.setColorAt(1, base);
-    return gradient;
-}
-
-
-void UrlBar::setBackgroundColor(QColor c)
-{
-    s_defaultBaseColor = c;
-    update();
-}
-
-
-bool UrlBar::isLoading()
-{
-    if(m_progress == 0)
-    {
-        return false;
-    }
-    return true;
-}
-
 void UrlBar::keyPressEvent(QKeyEvent *event)
 {
-
     // this handles the Modifiers + Return key combinations
     QString currentText = m_lineEdit->text().trimmed();
     if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
@@ -338,3 +296,22 @@ void UrlBar::focusInEvent(QFocusEvent *event)
     
     KComboBox::focusInEvent(event);
 }
+
+
+void UrlBar::setCurrentTab(WebTab *tab)
+{
+    if(_tab)
+        disconnect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setUrl(const QUrl &)));
+    _tab = tab;
+    connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setUrl(const QUrl &)));
+
+    // update it now (the first time)
+    setUrl( _tab->url() );
+    update();
+}
+
+
+void UrlBar::setPrivateMode(bool on)
+{
+    _privateMode = on;
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 552d1ee0..991b9038 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -34,6 +34,7 @@
 // Local Includes
 #include "lineedit.h"
 #include "completionwidget.h"
+#include "webtab.h"
 
 // KDE Includes
 #include <KUrl>
@@ -59,18 +60,16 @@ public:
     void selectAll() const;
     KUrl url() const;
     QSize sizeHint() const;
-    void setBackgroundColor(QColor);
-    bool isLoading();
-    void setProgress(int progress);
 
+    void setCurrentTab(WebTab *);
+    void setPrivateMode(bool on);
+    
 public slots:
     void setUrl(const QUrl &url);
-    void updateProgress(int progress);
     void updateUrl();
 
 private slots:
     void activated(const QString& url, Rekonq::OpenType = Rekonq::CurrentTab);
-    void loadFinished(bool);
     void suggestUrls(const QString &editedText);
 
 protected:
@@ -79,17 +78,13 @@ protected:
     virtual void focusInEvent(QFocusEvent *event);
 
 private:
-    static QLinearGradient generateGradient(const QColor &color, int height);
-
-    static QColor s_defaultBaseColor;
-
     LineEdit *m_lineEdit;
 
     KUrl m_currentUrl;
-    int m_progress;
 
     CompletionWidget *m_box;
-    KUrl m_suggestedUrl;
+    WebTab *_tab;
+    bool _privateMode;
 };
 
 #endif
-- 
cgit v1.2.1


From c5e684b649d5aac0424abcd573c1cb1a3e7dbb9d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 30 Mar 2010 17:14:54 +0200
Subject: Not so stupid, after all..

---
 src/adblock/adblockmanager.cpp | 44 ++++++++++++++++++++++++++++++++++++------
 src/adblock/adblockmanager.h   |  2 +-
 src/networkaccessmanager.cpp   | 17 ++++++++++------
 src/networkaccessmanager.h     |  6 +++++-
 4 files changed, 55 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 71412d5d..e4986264 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -148,7 +148,7 @@ void AdBlockManager::loadRules(const QStringList &rules)
 }
 
 
-QNetworkReply *AdBlockManager::block(const QNetworkRequest &request)
+QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *page)
 {
     if (!_isAdblockEnabled)
         return 0;
@@ -179,6 +179,19 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request)
             kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********";
             kDebug() << "Filter exp: " << filter.pattern();
             kDebug() << "UrlString:  " << urlString;
+            
+            QWebElement document = page->mainFrame()->documentElement();
+            QWebElementCollection elements = document.findAll("*");
+            foreach (QWebElement el, elements) 
+            {
+                if(filter.match( el.attribute("src") ) )
+                {
+                    kDebug() << "MATCHES ATTRIBUTE!!!!!";
+                    el.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
+                    el.removeFromDocument();
+                }
+            }
+            
             AdBlockNetworkReply *reply = new AdBlockNetworkReply(request, urlString, this);
             return reply;        
         }
@@ -197,19 +210,38 @@ void AdBlockManager::applyHidingRules(WebPage *page)
     if (!_isAdblockEnabled)
         return;
     
+//     // BLACK RULES 
+//     foreach(const AdBlockRule &filter, _blackList)
+//     {
+//         QWebElementCollection elements = document.findAll("*");
+//         foreach (QWebElement el, elements) 
+//         {
+//             if(filter.match( el.attribute("src") ) )
+//             {
+//                 kDebug() << "MATCHES!!!!!";
+//                 el.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
+//                 el.removeFromDocument();
+//             }
+//         }
+//     }
+    
     if (!_isHideAdsEnabled)
         return;
+
+    QWebElement document = page->mainFrame()->documentElement();
     
+    // HIDE RULES
     foreach(const QString &filter, _hideList)
     {
-        QWebElement document = page->mainFrame()->documentElement();
         QWebElementCollection elements = document.findAll(filter);
 
-        foreach (QWebElement element, elements) 
+        foreach (QWebElement el, elements) 
         {
-            kDebug() << "Hide element: " << element.localName();
-            element.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
-            element.removeFromDocument();
+            if(el.isNull())
+                continue;
+            kDebug() << "Hide element: " << el.localName();
+            el.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
+            el.removeFromDocument();
         }
     }
 }
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index c0bd2b70..9b1cc915 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -131,7 +131,7 @@ public:
     AdBlockManager(QObject *parent = 0);
     ~AdBlockManager();
 
-    QNetworkReply *block(const QNetworkRequest &request);
+    QNetworkReply *block(const QNetworkRequest &request, WebPage *page);
     void applyHidingRules(WebPage *page);
     void addSubscription(const QString &title, const QString &location);
     
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 77597cef..99337206 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -32,10 +32,15 @@
 // Local Includes
 #include "application.h"
 #include "adblockmanager.h"
+#include "webpage.h"
+
+// KDE Includes
 #include <KDebug>
 
+
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
     : AccessManager(parent)
+    , _parentPage( qobject_cast<WebPage *>(parent) )
 {
 }
 
@@ -48,16 +53,16 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
     {
     case QNetworkAccessManager::HeadOperation:
         kDebug() << "HEAD OPERATION";
-        if(outgoingData)
-        {
-            QByteArray outgoingDataByteArray = outgoingData->peek(1024 * 1024);
-            kDebug() << outgoingDataByteArray;
-        }
+//         if(outgoingData)
+//         {
+//             QByteArray outgoingDataByteArray = outgoingData->peek(1024 * 1024);
+//             kDebug() << outgoingDataByteArray;
+//         }
         break;
     
     case QNetworkAccessManager::GetOperation:
         kDebug() << "GET OPERATION";
-        reply = Application::adblockManager()->block(req);
+        reply = Application::adblockManager()->block(req, _parentPage);
         if (reply)
             return reply;
         break;
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 5e55c1e6..352f67d6 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -31,6 +31,7 @@
 
 // Local Includes
 #include "rekonqprivate_export.h"
+#include "webpage.h"
 
 // KDE Includes
 #include <kio/accessmanager.h>
@@ -44,10 +45,13 @@ class REKONQ_TESTS_EXPORT NetworkAccessManager : public AccessManager
     Q_OBJECT
 
 public:
-    NetworkAccessManager(QObject *parent = 0);
+    NetworkAccessManager(QObject *parent);
 
 protected:
     virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0);
+
+private:
+    WebPage *_parentPage;
 };
 
 #endif // NETWORKACCESSMANAGER_H
-- 
cgit v1.2.1


From 66e7ed81f0612a11bcc424658ceec733447975a5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 31 Mar 2010 01:33:48 +0200
Subject: This is just a stupid idea, but it seems working well.. :) The idea
 basically is: hide and set dimensione to ZERO to adblocked elements. This
 seems cleaning page WARNING: NEED TESTS!!!

---
 src/adblock/adblockmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index e4986264..feb92864 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -188,7 +188,8 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa
                 {
                     kDebug() << "MATCHES ATTRIBUTE!!!!!";
                     el.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
-                    el.removeFromDocument();
+                    el.setStyleProperty(QLatin1String("width"), QLatin1String("0"));
+                    el.setStyleProperty(QLatin1String("height"), QLatin1String("0"));
                 }
             }
             
-- 
cgit v1.2.1


From 5b4569933c22f85835a7605bd1d59df849b4f36a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 31 Mar 2010 09:41:10 +0200
Subject: This patch solves some problems of clipped text I cannot value this
 is completely safe, but sizeAndPosition() slot is surely something to take
 care..

Courtesy patch from Peter Hedlund.
Thanks :)

CCMAIL:peter@peterandlinda.com
CCMAIL:rekonq@kde.org
---
 src/urlbar/completionwidget.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 3ea35a0b..3a54f890 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -82,7 +82,14 @@ void CompletionWidget::insertSearchList(const UrlSearchList &list)
 void CompletionWidget::sizeAndPosition()
 {
     // size
-    setFixedHeight(layout()->count() * 44 );
+    int h = 34;
+    ListItem *widget;
+    for(int i = 0; i < layout()->count(); ++i)
+    {
+        widget = findChild<ListItem *>( QString::number(i) );
+        h = qMax(widget->sizeHint().height(), h);
+    }
+    setFixedHeight(layout()->count() * (h + 10) );
     setFixedWidth( _parent->width() );
 
     // position
@@ -206,6 +213,7 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                     }
                     break;
 
+                case Qt::Key_Enter:
                 case Qt::Key_Return:
                         hide();
                         emit chosenUrl(currentUrl().url(), Rekonq::CurrentTab);
-- 
cgit v1.2.1


From a6da0df7e0f72f1d7185e39815c17b7fab07d790 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 31 Mar 2010 10:54:02 +0200
Subject: Auto Scrolling, first bunch. key combinations just work :)

---
 src/adblock/adblockmanager.cpp | 15 -------
 src/webview.cpp                | 88 +++++++++++++++++++++++++++++++++++++-----
 src/webview.h                  | 10 +++--
 3 files changed, 85 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index feb92864..0a139bdc 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -211,21 +211,6 @@ void AdBlockManager::applyHidingRules(WebPage *page)
     if (!_isAdblockEnabled)
         return;
     
-//     // BLACK RULES 
-//     foreach(const AdBlockRule &filter, _blackList)
-//     {
-//         QWebElementCollection elements = document.findAll("*");
-//         foreach (QWebElement el, elements) 
-//         {
-//             if(filter.match( el.attribute("src") ) )
-//             {
-//                 kDebug() << "MATCHES!!!!!";
-//                 el.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
-//                 el.removeFromDocument();
-//             }
-//         }
-//     }
-    
     if (!_isHideAdsEnabled)
         return;
 
diff --git a/src/webview.cpp b/src/webview.cpp
index 80d44d10..294b7c85 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -62,7 +62,10 @@
 
 WebView::WebView(QWidget* parent)
     : KWebView(parent, false)
-    , m_mousePos( QPoint(0,0) )
+    , _mousePos( QPoint(0,0) )
+    , _scrollTimer( new QTimer(this) )
+    , _VScrollSpeed(0)
+    , _HScrollSpeed(0)
 {
     WebPage *page = new WebPage(this);
     setPage(page);
@@ -80,6 +83,10 @@ WebView::WebView(QWidget* parent)
     // loadUrl signal
     connect(this, SIGNAL(loadUrl(const KUrl &, const Rekonq::OpenType &)), 
             Application::instance(), SLOT(loadUrl(const KUrl &, const Rekonq::OpenType &)));
+
+    // scrolling timer
+    connect(_scrollTimer, SIGNAL(timeout()), this, SLOT(scrollFrameChanged()));
+    _scrollTimer->setInterval(50);
 }
 
 
@@ -330,7 +337,7 @@ void WebView::mousePressEvent(QMouseEvent *event)
 
 void WebView::mouseMoveEvent(QMouseEvent *event)
 {
-    m_mousePos = event->pos();
+    _mousePos = event->pos();
     if (Application::instance()->mainWindow()->isFullScreen())
     {        
         if (event->pos().y()>=0 && event->pos().y()<=4)
@@ -348,7 +355,7 @@ void WebView::mouseMoveEvent(QMouseEvent *event)
 
 QPoint WebView::mousePos()
 {
-    return m_mousePos;
+    return _mousePos;
 }
 
 
@@ -404,16 +411,61 @@ void WebView::openLinkInNewTab()
 
 void WebView::keyPressEvent(QKeyEvent *event)
 {
-    if ((event->modifiers() == Qt::ControlModifier) && (event->key() == Qt::Key_C))
+    if ( event->modifiers() == Qt::ControlModifier )
     {
-        triggerPageAction(KWebPage::Copy);
-        return;
-    }
+        if ( event->key() == Qt::Key_C )
+        {
+            triggerPageAction(KWebPage::Copy);
+            return;
+        }
 
-    if ((event->modifiers() == Qt::ControlModifier) && (event->key() == Qt::Key_A))
+        if ( event->key() == Qt::Key_A )
+        {
+            triggerPageAction(KWebPage::SelectAll);
+            return;
+        }
+    }
+    
+    if ( event->modifiers() == Qt::ShiftModifier )
     {
-        triggerPageAction(KWebPage::SelectAll);
-        return;
+        kDebug() << "scrolling..";
+        if( event->key() == Qt::Key_Up )
+        {
+            _VScrollSpeed -= 1;
+            _scrollTimer->start();
+            return;
+        }
+        
+        if( event->key() == Qt::Key_Down )
+        {
+            _VScrollSpeed += 1;
+            _scrollTimer->start();
+            return;
+        }
+        
+        if( event->key() == Qt::Key_Right )
+        {
+            _HScrollSpeed += 1;
+            _scrollTimer->start();
+            return;
+        }
+        
+        if( event->key() == Qt::Key_Left )
+        {
+            _HScrollSpeed -= 1;
+            _scrollTimer->start();
+            return;
+        }
+        
+        if(_scrollTimer->isActive())
+        {
+            _scrollTimer->stop();
+        }
+        else
+        {
+            if(_VScrollSpeed || _HScrollSpeed)
+                _scrollTimer->start();
+        }
     }
     
     KWebView::keyPressEvent(event);
@@ -433,3 +485,19 @@ void WebView::loadUrlInNewTab(const KUrl &url)
 {
     emit loadUrl(url, Rekonq::SettingOpenTab);
 }
+
+
+void WebView::scrollFrameChanged()
+{
+    // do the scrolling
+    page()->currentFrame()->scroll( _HScrollSpeed, _VScrollSpeed );
+    
+    // check if we reached the end
+    int y = page()->currentFrame()->scrollPosition().y();
+    if (y == 0 || y == page()->currentFrame()->scrollBarMaximum(Qt::Vertical))
+        _VScrollSpeed = 0;
+
+    int x = page()->currentFrame()->scrollPosition().x();
+    if (x == 0 || x == page()->currentFrame()->scrollBarMaximum(Qt::Horizontal))
+        _HScrollSpeed = 0;
+}
diff --git a/src/webview.h b/src/webview.h
index b0700e8f..59105267 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -30,8 +30,6 @@
 
 // Local Includes
 #include "rekonqprivate_export.h"
-
-// Local Includes
 #include "application.h"
 
 // KDE Includes
@@ -70,11 +68,17 @@ private slots:
     void viewImage(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
     void inspect();
 
+    void scrollFrameChanged();
+    
 signals:
     void loadUrl(const KUrl &, const Rekonq::OpenType &);
     
 private:
-    QPoint m_mousePos;
+    QPoint _mousePos;
+
+    QTimer *_scrollTimer;
+    int _VScrollSpeed;
+    int _HScrollSpeed;
 };
 
 #endif
-- 
cgit v1.2.1


From 7d53c477afdfb8013a8ae086d577d46e42455615 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 1 Apr 2010 11:06:00 +0200
Subject: 3 pixels preview's dilemma

Johannes Zellner's patch. Thanks :)

CCMAIL:johannes.zellner@nokia.com
---
 src/tabbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 0f4e1064..518b1a96 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -176,7 +176,7 @@ void TabBar::showTabPreview(int tab)
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
     m_previewPopup.data()->layout()->setMargin(0);
 
-    QPoint pos( tabRect(tab).x() , tabRect(tab).y() + tabRect(tab).height() - 3);
+    QPoint pos( tabRect(tab).x() , tabRect(tab).y() + tabRect(tab).height());
     m_previewPopup.data()->show(mapToGlobal(pos));
 }
 
-- 
cgit v1.2.1


From b44a0fd574329a54a8377b5fe9e58748f846611f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 1 Apr 2010 15:38:45 +0200
Subject: Cleaning awesome bar code a bit.. - update is better than repaint
 (this also probably solves the flickering results update) - right scope for
 some methods - removed KUrl use from there

---
 src/urlbar/completionwidget.cpp | 17 +++++++++--------
 src/urlbar/completionwidget.h   | 18 +++++++-----------
 src/urlbar/lineedit.h           |  3 ---
 src/urlbar/listitem.cpp         | 19 ++++++++++++-------
 src/urlbar/listitem.h           |  3 +--
 src/urlbar/urlresolver.h        |  2 --
 6 files changed, 29 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 3a54f890..27fcfbad 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -28,6 +28,9 @@
 #include "completionwidget.h"
 #include "completionwidget.moc"
 
+// Local Includes
+#include "application.h"
+
 // KDE Includes
 #include <KGlobalSettings>
 #include <KDebug>
@@ -41,16 +44,17 @@
 #include <QEvent>
 #include <QKeyEvent>
 
+// Defines
 #define MAX_ELEMENTS 9
-#include "application.h"
+
 
 CompletionWidget::CompletionWidget( QWidget *parent)
-:QFrame( parent, Qt::ToolTip)
+    :QFrame( parent, Qt::ToolTip)
     , _parent(parent)
     , _currentIndex(-1)
 {
     QPalette p(palette());
-    p.setColor(QPalette::Background, Qt::white); //todo: choose the correct color
+    p.setColor(QPalette::Background, Qt::white); // TODO: choose the correct color
     setPalette(p);
     setFrameStyle(QFrame::Panel);
     setLayoutDirection(Qt::LeftToRight);
@@ -126,10 +130,6 @@ void CompletionWidget::up()
     widget->activate();
 }
 
-KUrl CompletionWidget::currentUrl()
-{
-    return _list.at(_currentIndex).url;
-}
 
 void CompletionWidget::down()
 {
@@ -150,6 +150,7 @@ void CompletionWidget::down()
     widget->activate();
 }
 
+
 void CompletionWidget::clear()
 {
     QLayoutItem *child;
@@ -216,7 +217,7 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
                         hide();
-                        emit chosenUrl(currentUrl().url(), Rekonq::CurrentTab);
+                        emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
                         ev->accept();
                         return true;
                     break;
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 64d33189..a714bb17 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -33,32 +33,26 @@
 #include "urlresolver.h"
 #include "listitem.h"
 
-// Qt Includes
-#include <QFrame>
-
 // KDE Includes
 #include <KLineEdit>
 
-// Forward Declarations
-class KUrl;
+// Qt Includes
+#include <QFrame>
 
 
 class CompletionWidget : public QFrame
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     CompletionWidget(QWidget *parent);
 
     void insertSearchList(const UrlSearchList &list);
     void popup();
-
-    void up();
-    void down();
     void clear();
+
     virtual bool eventFilter(QObject *obj, QEvent *ev);
     void setVisible(bool visible);
-    KUrl currentUrl();
     
 private slots:
     void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton);
@@ -68,7 +62,9 @@ signals:
 
 private:
     void sizeAndPosition();
-    
+    void up();
+    void down();
+
     QWidget *_parent;
 
     UrlSearchList _list;
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index d76a5fcb..67ded052 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -47,12 +47,9 @@ public:
     explicit LineEdit(QWidget *parent = 0);
     virtual ~LineEdit();
 
-    
 protected:
     virtual void keyPressEvent(QKeyEvent*);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
-
-
 };
 
 #endif // LINEEDIT_H
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index d9837c7e..ee63a156 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -46,9 +46,10 @@
 #include <QFile>
 #include <QMouseEvent>
 
+
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
-    : QWidget(parent),
-    m_option()
+    : QWidget(parent)
+    , m_option()
 {
     QHBoxLayout *hLayout = new QHBoxLayout;
     QVBoxLayout *vLayout = new QVBoxLayout;
@@ -101,6 +102,7 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     deactivate();
 }
 
+
 ListItem::~ListItem()
 {
     disconnect();
@@ -130,16 +132,17 @@ QString ListItem::guessNameFromUrl(QUrl url)
 void ListItem::activate()
 {
     m_option.state |= QStyle::State_Selected;
-    repaint();
+    update();
 }
 
 
 void ListItem::deactivate()
 {
     m_option.state  &= ~QStyle::State_Selected;
-    repaint();
+    update();
 }
 
+
 void ListItem::paintEvent(QPaintEvent *event)
 {
     Q_UNUSED(event);
@@ -152,23 +155,25 @@ void ListItem::paintEvent(QPaintEvent *event)
     }
 }
 
+
 void ListItem::enterEvent(QEvent *e)
 {
     m_option.state |= QStyle::State_MouseOver;
-    repaint();
+    update();
     QWidget::enterEvent(e);
 }
 
+
 void ListItem::leaveEvent(QEvent *e)
 {
     m_option.state &= ~QStyle::State_MouseOver;
-    repaint();
+    update();
     QWidget::enterEvent(e);
 }
 
+
 void ListItem::mousePressEvent(QMouseEvent *e)
 {
     emit itemClicked(this, e->button());
     QWidget::mousePressEvent(e);
 }
-
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index ac476d4b..1e7b0805 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -34,7 +34,7 @@ class UrlSearchItem;
 
 class ListItem : public QWidget
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     ListItem(const UrlSearchItem &item, QWidget *parent = 0);
@@ -55,5 +55,4 @@ protected:
 private:
     QStyleOptionViewItemV4 m_option;
     QString guessNameFromUrl(QUrl url);
-
 };
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 4231aaab..3033fc38 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -32,8 +32,6 @@
 #include <QString>
 #include <QList>
 
-// Forward Declarations
-class KUrl;
 
 class UrlSearchItem
 {
-- 
cgit v1.2.1


From df47feec690a840eb2633672f7ab36d53ab192b3 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 29 Mar 2010 19:30:27 +0200
Subject: Remove limitation to the number of favorites. You are now able to add
 and remove favorites. Some work needed on the "add favorite" button

---
 src/newtabpage.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index c61eb60d..7d8787d7 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -86,6 +86,23 @@ void NewTabPage::generate(const KUrl &url)
 {
     if(KUrl("about:preview").isParentOf(url))
     {
+        if(url.fileName() == QString("add"))
+        {
+            QStringList names = ReKonfig::previewNames();
+            QStringList urls = ReKonfig::previewUrls();
+            
+            names.append("");
+            urls.append("");
+            
+            ReKonfig::setPreviewNames(names);
+            ReKonfig::setPreviewUrls(urls);
+            
+            // Why doesn't it work well ?
+            // m_root.appendInside(emptyPreview(names.length() - 1));
+            // Replacing with this :
+            generate(KUrl("about:favorites"));
+            return;
+        }
         if(url.directory() == QString("preview/remove"))
         {
             removePreview(url.fileName().toInt());
@@ -141,10 +158,13 @@ void NewTabPage::favoritesPage()
 {
     m_root.addClass("favorites");
     
+    // TODO : create a nice button to replace this ugly link
+    m_root.document().findFirst("#navigation").appendOutside("<a href=\"about:preview/add\">Add Preview</a>");
+    
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
-    for(int i=0; i<8; ++i)
+    for(int i=0; i < urls.count() ; ++i)
     {
         KUrl url = urls.at(i);
         QWebElement prev;
@@ -173,7 +193,7 @@ QWebElement NewTabPage::emptyPreview(int index)
     prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString()));
     
     setupPreview(prev, index);
-    hideControls(prev);
+    //hideControls(prev);
     
     return prev;
 }
@@ -276,16 +296,31 @@ void NewTabPage::removePreview(int index)
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
-    urls.replace(index, QString(""));
-    names.replace(index, QString(""));
-    
-    ReKonfig::setPreviewNames(names);
-    ReKonfig::setPreviewUrls(urls);
+    if(urls.at(index) == "")
+    {
+        urls.removeAt(index);
+        names.removeAt(index);
+        
+        // modify config before
+        ReKonfig::setPreviewNames(names);
+        ReKonfig::setPreviewUrls(urls);
+        
+        // reload to update index
+        generate(KUrl("about:favorites"));
+    }
+    else
+    {
+        urls.replace(index, QString(""));
+        names.replace(index, QString(""));
+        
+        QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+        prev.replace(emptyPreview(index));
+        
+        ReKonfig::setPreviewNames(names);
+        ReKonfig::setPreviewUrls(urls);
+    }
     
     ReKonfig::self()->writeConfig();
-    
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    prev.replace(emptyPreview(index));
 }
 
 
-- 
cgit v1.2.1


From bdc95a7a090c2cff888cc96dd612ba9449b01329 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 31 Mar 2010 15:15:31 +0200
Subject: Button on top-right to add a preview

---
 src/data/home.html | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
 src/newtabpage.cpp | 20 ++++++++++++--------
 2 files changed, 57 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 96c0bd06..6b9cd383 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -49,23 +49,55 @@ color: black;
 }
 
 /* -------------------------------------------------------- */
-/* Navigation bar */
+/* Top bar */
 
-#navigation {
+#top {
+margin: 20px;
+}
+
+.topBar {
 display: inline-block;
-margin: 2%;
 border-width: 5px;
+}
+
+#navigation {
 -webkit-border-image: url(%2/bg2.png) 12 12 12 12  stretch stretch;
+max-width: 75%;
+}
+
+#actions, #balance {
+margin-top: 12px;
+width: 10%;
+}
+
+#actions {
+float: right;
+}
+
+#balance {
+display: hidden; float: left;
+height: 16px;
 }
 
 .link {
 display: inline-block;
 }
-.link img {
-vertical-align: middle; margin-right: 5px;
+.link img, .link span {
+vertical-align: middle; display: inline-block; 
 }
-.link a {
-color: black; 
+color: black;
+
+#actions .link {
+-webkit-transition-property: opacity;
+-webkit-transition-duration: 0.8s;
+-webkit-transition-timing-function: ease;
+opacity: 0.2;
+}
+#actions .link:hover {
+opacity: 1;
+}
+#actions .link img {
+margin-right: 3px; width: 16px;
 }
 
 .current{
@@ -161,7 +193,11 @@ margin-right: 5px;
 <body>
 
 <div id="rekonq-newtabpage">
-    <div id="navigation"></div>
+    <div id="top">
+        <div class="topBar" id="balance"></div> <!-- This # is the same size as #actions to center #navigation -->
+        <div class="topBar" id="navigation"></div>
+        <div class="topBar" id="actions"></div>
+    </div>
     <div id="content">
     </div>
 </div>
@@ -171,6 +207,7 @@ margin-right: 5px;
     <div class="link">
         <a href="">
             <img src="" />
+            <span></span>
         </a>
     </div>
     <div class="thumbnail">
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 7d8787d7..98377d8a 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -158,8 +158,12 @@ void NewTabPage::favoritesPage()
 {
     m_root.addClass("favorites");
     
-    // TODO : create a nice button to replace this ugly link
-    m_root.document().findFirst("#navigation").appendOutside("<a href=\"about:preview/add\">Add Preview</a>");
+    QWebElement add = markup(".link");
+    add.findFirst("a").setAttribute("href", "about:preview/add");
+    add.findFirst("img").setAttribute("src" , QString("file:///" + 
+                                    KIconLoader::global()->iconPath("list-add", KIconLoader::Small || KIconLoader::SizeSmall)));
+    add.findFirst("span").appendInside(i18n("Add Preview"));
+    m_root.document().findFirst("#actions").appendInside(add);
     
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
@@ -334,35 +338,35 @@ void NewTabPage::browsingMenu(const KUrl &currentUrl)
     nav.findFirst("a").setAttribute("href", "about:favorites");
     nav.findFirst("img").setAttribute("src" , QString("file:///" + 
     loader->iconPath("emblem-favorite", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Favorites"));
+    nav.findFirst("span").appendInside(i18n("Favorites"));
     navItems.append(nav);
     
     nav = markup(".link"); // Closed Tabs
     nav.findFirst("a").setAttribute("href", "about:closedTabs");
     nav.findFirst("img").setAttribute("src" , QString("file:///" + 
     loader->iconPath("tab-close", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Closed Tabs"));
+    nav.findFirst("span").appendInside(i18n("Closed Tabs"));
     navItems.append(nav);
     
     nav = markup(".link"); // Bookmarks
     nav.findFirst("a").setAttribute("href", "about:bookmarks");
     nav.findFirst("img").setAttribute("src" , QString("file:///" + 
     loader->iconPath("bookmarks", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Bookmarks"));
+    nav.findFirst("span").appendInside(i18n("Bookmarks"));
     navItems.append(nav);
     
     nav = markup(".link"); // History
     nav.findFirst("a").setAttribute("href", "about:history");
     nav.findFirst("img").setAttribute("src" , QString("file:///" + 
     loader->iconPath("view-history", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("History"));
+    nav.findFirst("span").appendInside(i18n("History"));
     navItems.append(nav);
     
-    nav = markup(".link"); // History
+    nav = markup(".link"); // Downloads
     nav.findFirst("a").setAttribute("href", "about:downloads");
     nav.findFirst("img").setAttribute("src" , QString("file:///" + 
     loader->iconPath("download", KIconLoader::Desktop ||KIconLoader::SizeSmall)));
-    nav.findFirst("a").appendInside(i18n("Downloads"));
+    nav.findFirst("span").appendInside(i18n("Downloads"));
     navItems.append(nav);
     
     QWebElement it;
-- 
cgit v1.2.1


From 2dc8113cca580d76d0ecf7821ea1fa91a3051202 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 31 Mar 2010 16:09:43 +0200
Subject: Fix detail after rebase

---
 src/data/home.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 6b9cd383..4afbf2ed 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -85,7 +85,9 @@ display: inline-block;
 .link img, .link span {
 vertical-align: middle; display: inline-block; 
 }
+.link a, .link span {
 color: black;
+}
 
 #actions .link {
 -webkit-transition-property: opacity;
@@ -162,7 +164,7 @@ float: right;
 float: left;
 }
 
-.thumbnail a:hover, span {
+.thumbnail a:hover, .thumbnail span {
 color:#3F7AB7;
 }
 
-- 
cgit v1.2.1


From 7f2ed90b03d28dca82fb38ceb43a2866d0d19a69 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 1 Apr 2010 19:35:00 +0200
Subject: Previews are now always completely removed when clicking the x

---
 src/newtabpage.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 98377d8a..3e21d0fe 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -300,30 +300,14 @@ void NewTabPage::removePreview(int index)
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
-    if(urls.at(index) == "")
-    {
-        urls.removeAt(index);
-        names.removeAt(index);
-        
-        // modify config before
-        ReKonfig::setPreviewNames(names);
-        ReKonfig::setPreviewUrls(urls);
-        
-        // reload to update index
-        generate(KUrl("about:favorites"));
-    }
-    else
-    {
-        urls.replace(index, QString(""));
-        names.replace(index, QString(""));
-        
-        QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-        prev.replace(emptyPreview(index));
-        
-        ReKonfig::setPreviewNames(names);
-        ReKonfig::setPreviewUrls(urls);
-    }
+    urls.removeAt(index);
+    names.removeAt(index);
+    
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
     
+    generate(KUrl("about:favorites"));
+
     ReKonfig::self()->writeConfig();
 }
 
-- 
cgit v1.2.1


From 1bcb6b3509ee9396d45ab9a400764586ffb29594 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 2 Apr 2010 17:39:35 +0200
Subject: more gentle autoscroll.. less intrusive scrollTimer

---
 src/webview.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index 294b7c85..6e3718e0 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -86,7 +86,7 @@ WebView::WebView(QWidget* parent)
 
     // scrolling timer
     connect(_scrollTimer, SIGNAL(timeout()), this, SLOT(scrollFrameChanged()));
-    _scrollTimer->setInterval(50);
+    _scrollTimer->setInterval(100);
 }
 
 
@@ -426,34 +426,38 @@ void WebView::keyPressEvent(QKeyEvent *event)
         }
     }
     
+    // Auto Scrolling
     if ( event->modifiers() == Qt::ShiftModifier )
     {
-        kDebug() << "scrolling..";
         if( event->key() == Qt::Key_Up )
         {
-            _VScrollSpeed -= 1;
-            _scrollTimer->start();
+            _VScrollSpeed--;
+            if( !_scrollTimer->isActive() )
+                _scrollTimer->start();
             return;
         }
         
         if( event->key() == Qt::Key_Down )
         {
-            _VScrollSpeed += 1;
-            _scrollTimer->start();
+            _VScrollSpeed++;
+            if( !_scrollTimer->isActive() )
+                _scrollTimer->start();
             return;
         }
         
         if( event->key() == Qt::Key_Right )
         {
-            _HScrollSpeed += 1;
-            _scrollTimer->start();
+            _HScrollSpeed++;
+            if( !_scrollTimer->isActive() )
+                _scrollTimer->start();
             return;
         }
         
         if( event->key() == Qt::Key_Left )
         {
-            _HScrollSpeed -= 1;
-            _scrollTimer->start();
+            _HScrollSpeed--;
+            if( !_scrollTimer->isActive() )
+                _scrollTimer->start();
             return;
         }
         
-- 
cgit v1.2.1


From 45acb07245d52a51e5b486eaab3c4fdddc2ccbad Mon Sep 17 00:00:00 2001
From: lionelc <lionelc@lionelc.(none)>
Date: Tue, 30 Mar 2010 11:01:44 +0200
Subject: display bookmark and history item only if string typed is longer than
 3 chars

---
 src/urlbar/urlresolver.cpp | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index cb61ad95..5593f566 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -81,23 +81,26 @@ UrlSearchList UrlResolver::orderedSearchItems()
         list << qurlFromUserInputResolution();
     }
 
-    int firstResults = list.count();
-    int checkPoint = 9 - firstResults;
-    
-    UrlSearchList historyList = historyResolution();
-    int historyResults = historyList.count();
-    
-    UrlSearchList bookmarksList = bookmarksResolution();
-    int bookmarkResults = bookmarksList.count();
-    
-    if(historyResults + bookmarkResults > checkPoint)
+    if (_urlString.length()>2)
     {
-        historyList = historyList.mid(0,3);
-        bookmarksList = bookmarksList.mid(0,3);
+        int firstResults = list.count();
+        int checkPoint = 9 - firstResults;
+
+        UrlSearchList historyList = historyResolution();
+        int historyResults = historyList.count();
+
+        UrlSearchList bookmarksList = bookmarksResolution();
+        int bookmarkResults = bookmarksList.count();
+
+        if(historyResults + bookmarkResults > checkPoint)
+        {
+            historyList = historyList.mid(0,3);
+            bookmarksList = bookmarksList.mid(0,3);
+        }
+        list << historyList;
+        list << bookmarksList;
     }
-    list << historyList;
-    list << bookmarksList;
-    
+
     return list;
 }
 
-- 
cgit v1.2.1


From a2cb9efc54c78c47e41196f0121ca00255a4a7ab Mon Sep 17 00:00:00 2001
From: lionelc <lionelc@lionelc.(none)>
Date: Tue, 30 Mar 2010 11:37:25 +0200
Subject: add title for history items

---
 src/bookmarks/bookmarksmanager.cpp |  5 +++++
 src/history/historymanager.cpp     | 26 +++++++++++++++++++++++++-
 src/history/historymanager.h       |  2 ++
 src/urlbar/urlresolver.cpp         |  2 +-
 4 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 9c3201e6..95adf387 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -330,6 +330,11 @@ QString BookmarkProvider::titleForBookmarkUrl(QString url)
         bookmark = bookGroup.next(bookmark);
     }
     
+    if (title.isEmpty())
+    {
+        title = url;
+    }
+    
     return title;
 }
 
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 39c128f4..7aded714 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -362,7 +362,7 @@ void HistoryManager::load()
 
         // Add item to completion object
         QString _url = item.url;
-        _url.remove(QRegExp("^http://|/$"));
+        //_url.remove(QRegExp("^http://|/$"));
         m_completion->addItem(_url);
     }
     if (needToSort)
@@ -504,3 +504,27 @@ bool HistoryManager::clearDownloadsHistory()
     QFile downloadFile(downloadFilePath);
     return downloadFile.remove();
 }
+
+
+QString HistoryManager::titleForHistoryUrl(QString url)
+{
+    QString title = "";
+
+    int i = 0;
+    while (i< history().count() && title.isEmpty())
+    {
+        if (history().at(i).url == url)
+        {
+             title = history().at(i).title;
+        }
+        i++;
+    }
+    
+    if (title.isEmpty())
+    {
+        title = url;
+    }
+
+    return title;
+}
+
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index 8fc5c30e..9a844672 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -141,6 +141,8 @@ public:
     void updateHistoryEntry(const KUrl &url, const QString &title);
     void removeHistoryEntry(const KUrl &url, const QString &title = QString());
 
+    QString titleForHistoryUrl(QString url);
+    
     int historyLimit() const;
     void setHistoryLimit(int limit);
 
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 5593f566..3877a6c2 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -181,7 +181,7 @@ UrlSearchList UrlResolver::historyResolution()
     QStringList historyResults = historyCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, historyResults)
     {
-        UrlSearchItem it(s, s, QString("view-history"));
+        UrlSearchItem it(s, Application::historyManager()->titleForHistoryUrl(s), QString("view-history"));
         list << it;
     }
 
-- 
cgit v1.2.1


From a2aa033e21d1746b5479836e8d8363dcb4654d8a Mon Sep 17 00:00:00 2001
From: lionelc <lionelc@lionelc.(none)>
Date: Tue, 30 Mar 2010 19:45:27 +0200
Subject: manage common item of bookmarks and history

---
 src/urlbar/urlresolver.cpp | 27 +++++++++++++++++++++++++--
 src/urlbar/urlresolver.h   |  2 ++
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 3877a6c2..ef071c30 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -53,6 +53,10 @@
 // 4 ."kuriikwsfilter"
 // 5. "fixhosturifilter"
 
+bool UrlSearchItem::operator==(UrlSearchItem i)
+{ 
+    return url==i.url; 
+}
 
 UrlResolver::UrlResolver(const QString &typedUrl)
     : _urlString(typedUrl)
@@ -97,8 +101,27 @@ UrlSearchList UrlResolver::orderedSearchItems()
             historyList = historyList.mid(0,3);
             bookmarksList = bookmarksList.mid(0,3);
         }
-        list << historyList;
-        list << bookmarksList;
+        
+        QList<UrlSearchItem> common;
+        
+        foreach (UrlSearchItem i, historyList)
+        {
+            if (!bookmarksList.contains(i)) 
+                list << i;
+            else 
+                common << i;
+        }
+        
+        foreach (UrlSearchItem i, common)
+        {
+                list << i;
+        }
+        
+        foreach (UrlSearchItem i, bookmarksList)
+        {
+            if (!common.contains(i)) 
+                list << i;
+        }
     }
 
     return list;
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 3033fc38..54b96d63 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -43,6 +43,8 @@ public:
     UrlSearchItem(const QString &_url, const QString &_title = QString(), const QString &_icon = QString())
         : url(_url), title(_title), icon(_icon)
     {};
+    
+    bool operator==(UrlSearchItem i);
 };
 
 typedef QList <UrlSearchItem> UrlSearchList;
-- 
cgit v1.2.1


From b18f2e5dfcc17615d73fdbd20cb4e312ea83dfaf Mon Sep 17 00:00:00 2001
From: lionelc <lionelc@lionelc.(none)>
Date: Thu, 1 Apr 2010 19:53:18 +0200
Subject: multiple icons for type of items display icon of website

---
 src/urlbar/completionwidget.cpp | 13 ++-----
 src/urlbar/listitem.cpp         | 80 ++++++++++++++++++++++++++++++-----------
 src/urlbar/listitem.h           |  2 ++
 src/urlbar/urlresolver.cpp      | 16 ++++++---
 src/urlbar/urlresolver.h        | 20 ++++++++---
 5 files changed, 92 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 27fcfbad..740f1471 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -44,9 +44,6 @@
 #include <QEvent>
 #include <QKeyEvent>
 
-// Defines
-#define MAX_ELEMENTS 9
-
 
 CompletionWidget::CompletionWidget( QWidget *parent)
     :QFrame( parent, Qt::ToolTip)
@@ -68,16 +65,12 @@ CompletionWidget::CompletionWidget( QWidget *parent)
 void CompletionWidget::insertSearchList(const UrlSearchList &list)
 {
     _list = list;
-    int min = MAX_ELEMENTS;
-    if(list.count() < min)
-        min = list.count();
-    
-    for(int i = 0; i<min ; ++i)
+    int i=0;
+    foreach(UrlSearchItem item, _list)
     {
-        UrlSearchItem item = list.at(i);
         ListItem *suggestion = new ListItem(item);
         connect(suggestion, SIGNAL(itemClicked(ListItem *, Qt::MouseButton)), this, SLOT(itemChosen(ListItem *, Qt::MouseButton)));
-        suggestion->setObjectName( QString::number(i) );
+        suggestion->setObjectName( QString::number(i++) );
         layout()->addWidget( suggestion );
     }
 }
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index ee63a156..959db360 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -45,32 +45,52 @@
 #include <QStylePainter>
 #include <QFile>
 #include <QMouseEvent>
+#include <QWebSettings>
 
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent)
     , m_option()
 {
+    //preview and icon
+    
     QHBoxLayout *hLayout = new QHBoxLayout;
-    QVBoxLayout *vLayout = new QVBoxLayout;
+ 
+    QLabel *previewLabelIcon = new QLabel;
+    previewLabelIcon->setFixedSize(45,33);
+    hLayout->addWidget(previewLabelIcon);
 
-    QLabel *previewLabel = new QLabel;
-    previewLabel->setFixedSize(40,30);
-    QPixmap preview;
+    QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(item.url)).pixmap(16);
     QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(item.url) + ".png", true);
     if(QFile::exists(path))
     {
+        QLabel *previewLabel = new QLabel(previewLabelIcon);
+        previewLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
+        QPixmap preview;
         preview.load(path);
-        previewLabel->setPixmap(preview.scaled(40,30));
-    }
-    else
+        if (!pixmapIcon.isNull())
+        {
+            previewLabel->setFixedSize(38,29);
+            previewLabel->setPixmap(preview.scaled(38,29, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+        }
+        else
+        {
+            previewLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+            previewLabel->setFixedSize(45,33);
+            previewLabel->setPixmap(preview.scaled(45,33, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));  
+        }
+    } 
+
+    if (!pixmapIcon.isNull())
     {
-        if(item.icon.startsWith( QLatin1String("http://") ) )
-            preview = Application::icon( item.icon ).pixmap(22);
+        QLabel *iconLabel = new QLabel(previewLabelIcon);
+        iconLabel->setPixmap(pixmapIcon);
+        iconLabel->move(27, 16);
     }
-    previewLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
     
-    hLayout->addWidget(previewLabel);
+    //title and url
+    
+    QVBoxLayout *vLayout = new QVBoxLayout;  
     hLayout->addLayout(vLayout);
     
     QLabel *titleLabel = new QLabel("<b>" + item.title + "</b>");
@@ -82,17 +102,27 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     vLayout->addWidget(titleLabel);
     vLayout->addWidget(urlLabel);
 
+    //type icon
 
-    QLabel *iconLabel = new QLabel;
-    QPixmap pixmap;
-    if(item.icon.startsWith( QLatin1String("http://") ) )
-        pixmap = Application::icon( item.icon ).pixmap(18);
-    else
-        pixmap = KIcon(item.icon).pixmap(18);
+    if (item.type & UrlSearchItem::Browse)
+    {
+        insertIcon(hLayout, "applications-internet");
+    }
+    
+    if (item.type & UrlSearchItem::Search)
+    {
+         insertIcon(hLayout, "edit-find");
+    }
+   
+    if (item.type & UrlSearchItem::Bookmark)
+    {
+         insertIcon(hLayout, "rating");
+    }
 
-    iconLabel->setPixmap(pixmap);
-    iconLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-    hLayout->addWidget(iconLabel);
+    if (item.type & UrlSearchItem::History)
+    {
+         insertIcon(hLayout, "view-history");
+    }
 
     setLayout(hLayout);
     
@@ -109,6 +139,16 @@ ListItem::~ListItem()
 }
 
 
+void ListItem::insertIcon(QLayout *layout, QString icon)
+{
+    QLabel *iconLabel = new QLabel;
+    QPixmap pixmap = KIcon(icon).pixmap(18);
+    iconLabel->setPixmap(pixmap);
+    iconLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
+    layout->addWidget(iconLabel);
+}
+
+
 //TODO: REMOVE DUPLICATE CODE WITH PREVIEWIMAGE
 QString ListItem::guessNameFromUrl(QUrl url)
 {
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 1e7b0805..de22d739 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -26,6 +26,7 @@
 
 // Qt Includes
 #include <QWidget>
+#include <QLayout>
 #include <QStyleOptionViewItemV4>
 
 // Forward Declarations
@@ -55,4 +56,5 @@ protected:
 private:
     QStyleOptionViewItemV4 m_option;
     QString guessNameFromUrl(QUrl url);
+    void insertIcon(QLayout *layout, QString icon);
 };
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index ef071c30..ff90ce14 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -45,6 +45,7 @@
 #include <QByteArray>
 #include <QUrl>
 
+#define MAX_ELEMENTS 9
 
 // NOTE default kurifilter plugin list (at least in my box)
 // 1. "kshorturifilter"
@@ -106,10 +107,15 @@ UrlSearchList UrlResolver::orderedSearchItems()
         
         foreach (UrlSearchItem i, historyList)
         {
-            if (!bookmarksList.contains(i)) 
+            if (!bookmarksList.contains(i))
+            {
                 list << i;
+            }
             else 
+            {
+                i.type |= UrlSearchItem::Bookmark;
                 common << i;
+            }
         }
         
         foreach (UrlSearchItem i, common)
@@ -161,7 +167,7 @@ UrlSearchList UrlResolver::qurlFromUserInputResolution()
         {           
             QString gUrl = QString(ba);
             QString gTitle = i18n("Browse");
-            UrlSearchItem gItem(gUrl, gTitle, QString("") );
+            UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle, QString("") );
             list << gItem;
 
         }
@@ -182,7 +188,7 @@ UrlSearchList UrlResolver::webSearchesResolution()
         // KUriFilter has the worst performance possible here and let this trick unusable
         QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(url1);
         QString gTitle = i18n("Search Google for ") + url1;
-        UrlSearchItem gItem(gUrl, gTitle, QString("http://www.google.com") );
+        UrlSearchItem gItem(UrlSearchItem::Search, gUrl, gTitle, QString("http://www.google.com") );
         list << gItem;
         
 //         QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
@@ -204,7 +210,7 @@ UrlSearchList UrlResolver::historyResolution()
     QStringList historyResults = historyCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, historyResults)
     {
-        UrlSearchItem it(s, Application::historyManager()->titleForHistoryUrl(s), QString("view-history"));
+        UrlSearchItem it(UrlSearchItem::History, s, Application::historyManager()->titleForHistoryUrl(s), QString("view-history"));
         list << it;
     }
 
@@ -221,7 +227,7 @@ UrlSearchList UrlResolver::bookmarksResolution()
     QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, bookmarkResults)
     {
-        UrlSearchItem it( s, Application::bookmarkProvider()->titleForBookmarkUrl(s), QString("rating") );
+        UrlSearchItem it(UrlSearchItem::Bookmark, s, Application::bookmarkProvider()->titleForBookmarkUrl(s), QString("rating") );
         list << it;
     }
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 54b96d63..489a5a79 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -35,13 +35,25 @@
 
 class UrlSearchItem
 {
-public:
+
+    public:
+
+    enum types 
+    { 
+        Search     = 0x00000001,
+        Browse     = 0x00000010,
+        History    = 0x00000100,
+        Bookmark   = 0x00001000,
+        Suggestion = 0x00010000,
+    };   
+
+    int type;
     QString url;
     QString title;
     QString icon;
-    
-    UrlSearchItem(const QString &_url, const QString &_title = QString(), const QString &_icon = QString())
-        : url(_url), title(_title), icon(_icon)
+
+    UrlSearchItem(const int &_type, const QString &_url, const QString &_title = QString(), const QString &_icon = QString())
+        : type(_type), url(_url), title(_title), icon(_icon)
     {};
     
     bool operator==(UrlSearchItem i);
-- 
cgit v1.2.1


From ce03d5d4687f7d789ddfacdd51c4281eb9193487 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 2 Apr 2010 22:10:24 +0200
Subject: hide suggestions on ESC key

---
 src/urlbar/urlbar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index a04d6534..0dc91a1e 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -232,6 +232,12 @@ QSize UrlBar::sizeHint() const
 
 void UrlBar::keyPressEvent(QKeyEvent *event)
 {
+    if(event->key() == Qt::Key_Escape)
+    {
+        m_box->hide();
+        return;
+    }
+    
     // this handles the Modifiers + Return key combinations
     QString currentText = m_lineEdit->text().trimmed();
     if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
-- 
cgit v1.2.1


From c28496c854a41baf865fc6e34b9d0453034ee84b Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 3 Apr 2010 23:09:25 +0200
Subject: - Add the control modifier support for back, next and home actions
 and for the UrlTreeView - Use SettingsOpenTab to open a link in a new tab
 with the bookmark toolbar

---
 src/bookmarks/bookmarksmanager.cpp |  2 +-
 src/mainwindow.cpp                 | 25 ++++++++++++-------------
 src/mainwindow.h                   |  6 +++---
 src/urltreeview.cpp                |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 95adf387..6a5417fc 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -66,7 +66,7 @@ void BookmarkOwner::openBookmark(const KBookmark & bookmark,
 {
     if (keyboardModifiers & Qt::ControlModifier || mouseButtons == Qt::MidButton)
     {
-        emit openUrl(bookmark.url(), Rekonq::NewCurrentTab);
+        emit openUrl(bookmark.url(), Rekonq::SettingOpenTab);
     }
     else
     {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6701ea2e..2c31de05 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -93,6 +93,7 @@
 #include <QtDBus/QDBusReply>
 
 #include <QtWebKit/QWebHistory>
+#include <QKeyEvent>
 
 
 MainWindow::MainWindow()
@@ -287,7 +288,7 @@ void MainWindow::setupActions()
     a->setShortcut( fullScreenShortcut );
 
     a = actionCollection()->addAction( KStandardAction::Home );
-    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(homePage(Qt::MouseButtons)));
+    connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(homePage(Qt::MouseButtons, Qt::KeyboardModifiers)));
     KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
 
     a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
@@ -347,7 +348,7 @@ void MainWindow::setupActions()
 
     // ========================= History related actions ==============================
     a = actionCollection()->addAction( KStandardAction::Back );
-    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(openPrevious(Qt::MouseButtons)));
+    connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(openPrevious(Qt::MouseButtons, Qt::KeyboardModifiers)));
 
     m_historyBackMenu = new KMenu(this);
     a->setMenu(m_historyBackMenu);
@@ -355,7 +356,7 @@ void MainWindow::setupActions()
     connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(openActionUrl(QAction *)));
 
     a = actionCollection()->addAction( KStandardAction::Forward );
-    connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(openNext(Qt::MouseButtons)));
+    connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(openNext(Qt::MouseButtons, Qt::KeyboardModifiers)));
 
     // ============================== General Tab Actions ====================================
     a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this);
@@ -960,9 +961,9 @@ void MainWindow::viewPageSource()
 }
 
 
-void MainWindow::homePage(Qt::MouseButtons btn)
+void MainWindow::homePage(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
 {
-    if(btn == Qt::MidButton)
+    if(mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
         Application::instance()->loadUrl( KUrl(ReKonfig::homePage()), Rekonq::SettingOpenTab );
     else
         currentTab()->view()->load( QUrl(ReKonfig::homePage()) );
@@ -1006,15 +1007,14 @@ void MainWindow::browserLoading(bool v)
 }
 
 
-void MainWindow::openPrevious(Qt::MouseButtons btn)
+void MainWindow::openPrevious(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
 {
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoBack())
     {
-        if(btn == Qt::MidButton)
+        if(mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
         {
-            KUrl back = history->backItem().url();
-            Application::instance()->loadUrl(back, Rekonq::SettingOpenTab);
+            Application::instance()->loadUrl(history->backItem().url(), Rekonq::SettingOpenTab);
         }
         else
         {
@@ -1027,15 +1027,14 @@ void MainWindow::openPrevious(Qt::MouseButtons btn)
 }
 
 
-void MainWindow::openNext(Qt::MouseButtons btn)
+void MainWindow::openNext(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers keyboardModifiers)
 {
     QWebHistory *history = currentTab()->view()->history();
     if (history->canGoForward())
     {
-        if(btn == Qt::MidButton)
+        if(mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
         {
-            KUrl next = history->forwardItem().url();
-            Application::instance()->loadUrl(next, Rekonq::SettingOpenTab);
+            Application::instance()->loadUrl(history->forwardItem().url(), Rekonq::SettingOpenTab);
         }
         else
         {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 4ccd7bf3..d1509066 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -87,7 +87,7 @@ private:
     void setupPanels();
     
 public slots:
-    void homePage(Qt::MouseButtons = Qt::LeftButton);
+    void homePage(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
 
     /**
      * Notifies a message in a popup
@@ -122,8 +122,8 @@ private slots:
     void updateWindowTitle(const QString &title = QString());
 
     // history related
-    void openPrevious(Qt::MouseButtons = Qt::LeftButton);
-    void openNext(Qt::MouseButtons = Qt::LeftButton);
+    void openPrevious(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
+    void openNext(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier);
 
     // Find Action slots
     void find(const QString &);
diff --git a/src/urltreeview.cpp b/src/urltreeview.cpp
index 507a7973..b8be9dd2 100644
--- a/src/urltreeview.cpp
+++ b/src/urltreeview.cpp
@@ -95,7 +95,7 @@ void UrlTreeView::mouseReleaseEvent(QMouseEvent *event)
     if(!index.isValid())
         return;
 
-    if(event->button() == Qt::MidButton)
+    if(event->button() == Qt::MidButton || event->modifiers() == Qt::ControlModifier)
         validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewCurrentTab);
 
     else if(event->button() == Qt::LeftButton)
-- 
cgit v1.2.1


From 5229b51d6199227e7c7351e167d47c50cbc39f8d Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 3 Apr 2010 23:13:10 +0200
Subject: Use SettingsOpenTab for UrlTreeView to

---
 src/urltreeview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/urltreeview.cpp b/src/urltreeview.cpp
index b8be9dd2..aeaef2f7 100644
--- a/src/urltreeview.cpp
+++ b/src/urltreeview.cpp
@@ -96,7 +96,7 @@ void UrlTreeView::mouseReleaseEvent(QMouseEvent *event)
         return;
 
     if(event->button() == Qt::MidButton || event->modifiers() == Qt::ControlModifier)
-        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewCurrentTab);
+        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
 
     else if(event->button() == Qt::LeftButton)
     {
-- 
cgit v1.2.1


From 500ebf552c119a2b47a952e89ed2e68ec3951477 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 3 Apr 2010 23:30:48 +0200
Subject: Useless import

---
 src/mainwindow.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2c31de05..c49df102 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -93,7 +93,6 @@
 #include <QtDBus/QDBusReply>
 
 #include <QtWebKit/QWebHistory>
-#include <QKeyEvent>
 
 
 MainWindow::MainWindow()
-- 
cgit v1.2.1


From 9de0047a2d07dd77905a4d6160b6387af7fac4a0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 5 Apr 2010 00:17:30 +0200
Subject: A "nice" hack to fix bug 211557

BUG: 211557
---
 src/webview.cpp | 8 ++++++++
 src/webview.h   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index 6e3718e0..2083cef3 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -425,6 +425,14 @@ void WebView::keyPressEvent(QKeyEvent *event)
             return;
         }
     }
+ 
+    QWebHitTestResult result = page()->mainFrame()->hitTestContent( mapFromGlobal( QCursor::pos() ) );
+    
+    if( result.isContentEditable() )
+    {
+        KWebView::keyPressEvent(event);
+        return;
+    }
     
     // Auto Scrolling
     if ( event->modifiers() == Qt::ShiftModifier )
diff --git a/src/webview.h b/src/webview.h
index 59105267..85ebf46a 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -52,7 +52,7 @@ public:
 
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
-    void mousePressEvent(QMouseEvent *event);// need to be ported
+    void mousePressEvent(QMouseEvent *event);   // need to be ported
     void mouseMoveEvent(QMouseEvent *event);
     void keyPressEvent(QKeyEvent *event);
 
-- 
cgit v1.2.1


From 352168759ea96b35296eaf33790fbe073b69f69b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 5 Apr 2010 01:31:13 +0200
Subject: This commit is the first implementation of a new new new urlbar Here
 are its features: - KLineEdit based - ability to easily add "icons" :) - SSL
 informations shown (a-la firefox) - smoother animation - cleaner code - data
 QString, not KUrl based (Users type string, not urls!!!)

---
 src/CMakeLists.txt        |   1 +
 src/mainview.cpp          |  68 +++++++--------
 src/mainwindow.cpp        |   5 --
 src/protocolhandler.cpp   |   1 -
 src/urlbar/iconbutton.cpp |  76 +++++++++++++++++
 src/urlbar/iconbutton.h   |  51 ++++++++++++
 src/urlbar/lineedit.cpp   |  71 +++++++++++++++-
 src/urlbar/lineedit.h     |  19 ++++-
 src/urlbar/urlbar.cpp     | 208 +++++++++++++++++-----------------------------
 src/urlbar/urlbar.h       |  20 ++---
 src/webpage.cpp           |  35 ++++----
 src/webpage.h             |   6 +-
 12 files changed, 349 insertions(+), 212 deletions(-)
 create mode 100644 src/urlbar/iconbutton.cpp
 create mode 100644 src/urlbar/iconbutton.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a68faa59..8728bff8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,6 +49,7 @@ SET( rekonq_KDEINIT_SRCS
     #----------------------------------------
     urlbar/urlbar.cpp
     urlbar/lineedit.cpp
+    urlbar/iconbutton.cpp
     urlbar/completionwidget.cpp
     urlbar/urlresolver.cpp
     urlbar/listitem.cpp
diff --git a/src/mainview.cpp b/src/mainview.cpp
index a00325fb..b5829806 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -366,7 +366,7 @@ void MainView::newTab()
         w->load( KUrl("about:home") );
         break;
     case 1: // blank page
-        urlBar()->setUrl(KUrl(""));
+        urlBar()->clear();
         break;
     case 2: // homepage
         w->load( KUrl(ReKonfig::homePage()) );
@@ -452,16 +452,18 @@ void MainView::cloneTab(int index)
 // When index is -1 index chooses the current tab
 void MainView::closeTab(int index)
 {
+    urlBar()->clear();
+    
     // open default homePage if just one tab is opened
     if (count() == 1)
     {
         WebView *w = currentWebTab()->view();
-        urlBar()->setUrl(KUrl(""));
         switch(ReKonfig::newTabsBehaviour())
         {
         case 0: // new tab page
         case 1: // blank page
             w->load( KUrl("about:home") );
+            urlBar()->setFocus();
             break;
         case 2: // homepage
             w->load( KUrl(ReKonfig::homePage()) );
@@ -469,7 +471,6 @@ void MainView::closeTab(int index)
         default:
             break;
         }
-        urlBar()->setFocus();
         return;
     }
 
@@ -478,43 +479,36 @@ void MainView::closeTab(int index)
     if (index < 0 || index >= count())
         return;
 
-    bool hasFocus = false;
     WebTab *tab = webTab(index);
-    if (tab)
-    {
-        if (tab->view()->isModified())
-        {
-            int risp = KMessageBox::warningContinueCancel(this,
-                        i18n("This tab contains changes that have not been submitted.\n"
-                             "Closing the tab will discard these changes.\n"
-                             "Do you really want to close this tab?\n"),
-                        i18n("Closing Modified Tab"), KGuiItem(i18n("Close &Tab"),"tab-close"), KStandardGuiItem::cancel());
-            if (risp != KMessageBox::Continue)
-                return;
-        }
-        hasFocus = tab->hasFocus();
-
-        // store close tab except homepage
-        if (!tab->url().prettyUrl().startsWith( QLatin1String("about:") ) && !tab->url().isEmpty())
-        {
-            QString title = tab->view()->title();
-            QString url = tab->url().prettyUrl();
-            HistoryItem item(url, QDateTime::currentDateTime(), title);
-            m_recentlyClosedTabs.removeAll(item);
-            m_recentlyClosedTabs.prepend(item);
-        }
+    if (!tab)
+        return;
 
-        removeTab(index);
-        updateTabBar();        // UI operation: do it ASAP!!
-        tab->deleteLater();    // tab is scheduled for deletion.
-        
-        emit tabsChanged();
+    if (tab->view()->isModified())
+    {
+        int risp = KMessageBox::warningContinueCancel(this,
+                    i18n("This tab contains changes that have not been submitted.\n"
+                            "Closing the tab will discard these changes.\n"
+                            "Do you really want to close this tab?\n"),
+                    i18n("Closing Modified Tab"), KGuiItem(i18n("Close &Tab"),"tab-close"), KStandardGuiItem::cancel());
+        if (risp != KMessageBox::Continue)
+            return;
+    }
 
-        if (hasFocus && count() > 0)
-        {
-            currentWebTab()->setFocus();
-        }       
+    // store close tab except homepage
+    if (!tab->url().prettyUrl().startsWith( QLatin1String("about:") ) && !tab->url().isEmpty())
+    {
+        QString title = tab->view()->title();
+        QString url = tab->url().prettyUrl();
+        HistoryItem item(url, QDateTime::currentDateTime(), title);
+        m_recentlyClosedTabs.removeAll(item);
+        m_recentlyClosedTabs.prepend(item);
     }
+
+    removeTab(index);
+    updateTabBar();        // UI operation: do it ASAP!!
+    tab->deleteLater();    // tab is scheduled for deletion.
+    
+    emit tabsChanged();
 }
 
 
@@ -582,8 +576,6 @@ void MainView::webViewIconChanged()
         delete movie;
         label->setMovie(0);
         label->setPixmap(icon.pixmap(16, 16));
-
-        urlBar()->updateUrl();
     }
 }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6701ea2e..85f14738 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -545,11 +545,6 @@ void MainWindow::setupPanels()
 
 void MainWindow::updateConfiguration()
 {
-    kDebug() << "======================================================================================================================";
-    kDebug() << "======================================================================================================================";
-        kDebug() << "======================================================================================================================";
-            kDebug() << "======================================================================================================================";
-            
     // ============== General ==================
     m_view->updateTabBar();
 
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index faba894b..f6867e81 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -305,7 +305,6 @@ void ProtocolHandler::showResults(const KFileItemList &list)
     _frame->setHtml( html, _url );
 
     Application::instance()->mainWindow()->currentTab()->setFocus();
-    Application::instance()->mainWindow()->mainView()->urlBar()->setUrl(_url);
     Application::historyManager()->addHistoryEntry( _url.prettyUrl() );
 
     delete _lister;
diff --git a/src/urlbar/iconbutton.cpp b/src/urlbar/iconbutton.cpp
new file mode 100644
index 00000000..60008993
--- /dev/null
+++ b/src/urlbar/iconbutton.cpp
@@ -0,0 +1,76 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "iconbutton.h"
+#include "iconbutton.moc"
+
+// Local Includes
+#include "application.h"
+
+// KDE Includes
+#include <KDebug>
+
+
+IconButton::IconButton(QWidget *parent)
+    : QToolButton(parent)
+{
+    QPalette p = palette();
+    p.setColor( QPalette::Button, Qt::transparent );
+    setPalette(p);
+
+    setCursor(Qt::ArrowCursor);
+    setStyleSheet("IconButton { border: none; padding: 0px}");
+}
+
+
+void IconButton::setIconUrl(const KUrl &url, bool trusted)
+{
+    setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    setIcon( Application::icon(url) );
+    setText( url.host() );
+    
+    if(trusted)
+    {
+        setStyleSheet("IconButton { background-color:#0F0; padding: 2px }");
+    }
+    else
+    {
+        setStyleSheet("IconButton { background-color:#F00; padding: 2px}");
+    }
+    
+    adjustSize();
+}
+
+
+void IconButton::updateIcon(KIcon icon)
+{
+    setToolButtonStyle(Qt::ToolButtonIconOnly);
+    setIcon( icon );
+
+    setStyleSheet("IconButton { background-color:transparent; border: none; padding: 0px}");
+    adjustSize();
+}
diff --git a/src/urlbar/iconbutton.h b/src/urlbar/iconbutton.h
new file mode 100644
index 00000000..b66e212b
--- /dev/null
+++ b/src/urlbar/iconbutton.h
@@ -0,0 +1,51 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy 
+* defined in Section 14 of version 3 of the license.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+
+#ifndef ICON_BUTTON_H
+#define ICON_BUTTON_H
+
+
+// KDE Includes
+#include <KUrl>
+#include <KIcon>
+
+// Qt Includes
+#include <QToolButton>
+
+
+class IconButton : public QToolButton
+{
+    Q_OBJECT
+
+public:
+    IconButton(QWidget *parent = 0);
+
+    void setIconUrl(const KUrl &url, bool trusted);
+    void updateIcon(KIcon icon);
+};
+
+#endif // ICON_BUTTON_H
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index ac92b858..f7af1f61 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -30,24 +30,64 @@
 #include "lineedit.h"
 #include "lineedit.moc"
 
+// KDE Includes
+#include <klocalizedstring.h>
+#include <KDebug>
+
 // Qt Includes
 #include <QtGui/QContextMenuEvent>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QKeyEvent>
+#include <QStyleOptionFrameV2>
+#include <QPainter>
 
 
 LineEdit::LineEdit(QWidget* parent)
-        : KLineEdit(parent)
+    : KLineEdit(parent)
+    , _icon( new IconButton(this) )
 {
+    // cosmetic
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setMinimumWidth(200);
-    setFocusPolicy(Qt::WheelFocus);
-    setHandleSignals(true);
+    setMinimumHeight(26);
+    updateStyles();
+    
+    // doesn't show the clear button
     setClearButtonShown(false);
+    
+    // trap Key_Enter & Key_Return events, while emitting the returnPressed signal
+    setTrapReturnKey(true);
+    
+    // insert decoded URLs
+    setUrlDropsEnabled(true);
+
+    // accept focus, via tabbing, clicking & wheeling
+    setFocusPolicy(Qt::WheelFocus);
+    
+    // disable completion object (we have our own :) )
+    setCompletionObject(0);
 }
 
 
 LineEdit::~LineEdit()
 {
+    delete _icon;
+}
+
+
+void LineEdit::updateStyles()
+{
+    adjustSize();
+    _icon->adjustSize();
+    if(_icon->toolButtonStyle() == Qt::ToolButtonIconOnly)
+        _icon->move( 4, 3);
+    else
+        _icon->move( 2, 1);
+    
+    int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+    setStyleSheet(QString("LineEdit { padding-left: %1px; } ").arg(_icon->sizeHint().width() + frameWidth + 1));
+
+    update();
 }
 
 
@@ -67,3 +107,28 @@ void LineEdit::mouseDoubleClickEvent(QMouseEvent *)
 {
     selectAll();
 }
+
+
+IconButton *LineEdit::iconButton() const
+{
+    return _icon;
+}
+
+
+void LineEdit::paintEvent(QPaintEvent *event)
+{
+    KLineEdit::paintEvent(event);
+    
+    if (text().isEmpty() && !hasFocus()) 
+    {
+        QStyleOptionFrame option;
+        initStyleOption(&option);
+        QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &option, this);
+        QPainter painter(this);
+        painter.setPen(Qt::gray);
+        painter.drawText( textRect, 
+                          Qt::AlignLeft | Qt::AlignVCenter, 
+                          i18n("Search Bookmarks, History, Google.. and the Kitchen Sink!")
+                        );
+    }
+}
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 67ded052..96f25918 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -30,13 +30,20 @@
 #define LINEEDIT_H
 
 
+// Local Includes
+#include "iconbutton.h"
+
 // KDE Includes
 #include <KLineEdit>
+#include <KIcon>
+
+#include <QToolButton>
 
 // Forward Declarations
 class QContextMenuEvent;
 class QFocusEvent;
 class QKeyEvent;
+class QStyleOptionFrameV2;
 
 
 class LineEdit : public KLineEdit
@@ -46,10 +53,18 @@ class LineEdit : public KLineEdit
 public:
     explicit LineEdit(QWidget *parent = 0);
     virtual ~LineEdit();
-
+    
+    IconButton *iconButton() const;
+    
+    void updateStyles();
+    
 protected:
-    virtual void keyPressEvent(QKeyEvent*);
+    virtual void keyPressEvent(QKeyEvent *);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
+    virtual void paintEvent(QPaintEvent *);
+    
+private:    
+    IconButton *_icon;    
 };
 
 #endif // LINEEDIT_H
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 0dc91a1e..dd14a4a3 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -50,124 +50,59 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 UrlBar::UrlBar(QWidget *parent)
-    : KComboBox(true, parent)
-    , m_lineEdit(new LineEdit)
-    , m_box(new CompletionWidget(this))
+    : LineEdit(parent)
+    , _box(new CompletionWidget(this))
     , _tab(0)
     , _privateMode(false)
 {
-    //cosmetic
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    setMinimumWidth(180);
-
-    // signal handlings
-    setTrapReturnKey(true);
-    setUrlDropsEnabled(true);
-    
-    // Make m_lineEdit background transparent
-    QPalette p = m_lineEdit->palette();
-    p.setColor(QPalette::Base, Qt::transparent);
-    m_lineEdit->setPalette(p);
-
-    setLineEdit(m_lineEdit);
-
-    // clear the URL bar
-    m_lineEdit->clear();
     // load urls on activated urlbar signal
-    connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&)));
-    
-    installEventFilter(m_box);
-    connect(m_box, SIGNAL(chosenUrl(const QString&, Rekonq::OpenType)), SLOT(activated(const QString&, Rekonq::OpenType)));
-}
-
-
-UrlBar::~UrlBar()
-{
-}
+    connect(this, SIGNAL(returnPressed(const QString&)), this, SLOT(activated(const QString&)));
 
-
-void UrlBar::selectAll() const
-{
-    m_lineEdit->selectAll();
+    // suggestions
+    installEventFilter(_box);
+    connect(_box, SIGNAL(chosenUrl(const QString&, Rekonq::OpenType)), SLOT(activated(const QString&, Rekonq::OpenType)));
 }
 
 
-KUrl UrlBar::url() const
+UrlBar::~UrlBar()
 {
-    return m_currentUrl;
+    delete _box;
 }
 
 
-void UrlBar::setUrl(const QUrl& url)
+void UrlBar::setQUrl(const QUrl& url)
 {
-    if(url.scheme() == "about")
+    if(url.scheme() == QL1S("about") )
     {
-        m_currentUrl = KUrl();
-        updateUrl();
+        iconButton()->updateIcon( KIcon("arrow-right") );
         setFocus();
     }
     else
     {
-        m_currentUrl = KUrl(url);
-        updateUrl();
+        LineEdit::setUrl(url);
+        setCursorPosition(0);
+        iconButton()->updateIcon( Application::icon(url) );
     }
 
-}
-
-
-void UrlBar::updateUrl()
-{
-    // Don't change my typed url...
-    // FIXME this is not a proper solution (also if it works...)
-    if(hasFocus())
-    {
-        kDebug() << "Don't change my typed url...";
-        return;
-    }
-
-    KIcon icon;
-    if(m_currentUrl.isEmpty()) 
-    {
-        icon = KIcon("arrow-right");
-    }
-    else 
-    {
-        icon = Application::icon(m_currentUrl);
-    }
-
-    if (count())
-    {
-        changeUrl(0, icon, m_currentUrl);
-    }
-    else
-    {
-        insertUrl(0, icon, m_currentUrl);
-    }
-
-    setCurrentIndex(0);
-
-    // important security consideration: always display the beginning
-    // of the url rather than its end to prevent spoofing attempts.
-    // Must be AFTER setCurrentIndex
-    if (!hasFocus())
-    {
-        m_lineEdit->setCursorPosition(0);
-    }
+    updateStyles();
 }
 
 
 void UrlBar::activated(const QString& urlString, Rekonq::OpenType type)
 {
-    disconnect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
     if (urlString.isEmpty())
         return;
 
     clearFocus();
-    setUrl(urlString);
-    Application::instance()->loadUrl(m_currentUrl, type);
+    setText(urlString);
+    Application::instance()->loadUrl(urlString, type);
 }
 
 
@@ -185,17 +120,16 @@ void UrlBar::paintEvent(QPaintEvent *event)
     
     // set background color of UrlBar
     QPalette p = palette();
-    p.setColor(QPalette::Base, backgroundColor);
-    setPalette(p);
 
-    KComboBox::paintEvent(event);
-
-    if (!hasFocus())
+    int progr = _tab->progress();
+    if (progr == 0) 
+    {
+        p.setBrush(QPalette::Base, backgroundColor);
+    } 
+    else 
     {
-        QPainter painter(this);
-
         QColor loadingColor;
-        if (m_currentUrl.scheme() == QLatin1String("https"))
+        if ( _tab->url().scheme() == QLatin1String("https"))
         {
             loadingColor = QColor(248, 248, 100);
         }
@@ -203,30 +137,16 @@ void UrlBar::paintEvent(QPaintEvent *event)
         {
             loadingColor = QColor(116, 192, 250);
         }
-        int progr = _tab->progress();
-        
-        backgroundColor.setAlpha(0);
-        backgroundColor.setAlpha(200);
-        QLinearGradient gradient(0, 0, width(), height() );
+    
+    
+        QLinearGradient gradient(0, 0, width(), 0);
         gradient.setColorAt(0, loadingColor);
         gradient.setColorAt(((double)progr)/100, backgroundColor);
-        
-        painter.setBrush( gradient );
-        painter.setPen(Qt::transparent);
-
-
-        QRect backgroundRect = m_lineEdit->frameGeometry();
-        int mid = backgroundRect.width() * progr / 100;
-        QRect progressRect(backgroundRect.x(), backgroundRect.y(), mid, backgroundRect.height());
-        painter.drawRect(progressRect);
-        painter.end();
+        p.setBrush(QPalette::Base, gradient);
     }
-}
-
-
-QSize UrlBar::sizeHint() const
-{
-    return m_lineEdit->sizeHint();
+    setPalette(p);
+    
+    LineEdit::paintEvent(event);
 }
 
 
@@ -234,12 +154,12 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
 {
     if(event->key() == Qt::Key_Escape)
     {
-        m_box->hide();
+        _box->hide();
         return;
     }
     
     // this handles the Modifiers + Return key combinations
-    QString currentText = m_lineEdit->text().trimmed();
+    QString currentText = text().trimmed();
     if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
         && !currentText.startsWith(QLatin1String("http://"), Qt::CaseInsensitive))
     {
@@ -263,11 +183,11 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
         {
             host += append;
             url.setHost(host);
-            m_lineEdit->setText(url.toString());
+            setText(url.toString());
         }
     }
     
-    KComboBox::keyPressEvent(event);
+    LineEdit::keyPressEvent(event);
 }
 
 
@@ -280,7 +200,7 @@ void UrlBar::suggestUrls(const QString &text)
 
     if(text.isEmpty())
     {
-        m_box->hide();
+        _box->hide();
         return;
     }
 
@@ -289,31 +209,41 @@ void UrlBar::suggestUrls(const QString &text)
 
     if(list.count() > 0)
     {
-        m_box->clear();
-        m_box->insertSearchList(list);
-        m_box->popup();
+        _box->clear();
+        _box->insertSearchList(list);
+        _box->popup();
     }
 }
 
+
 void UrlBar::focusInEvent(QFocusEvent *event)
 {
     // activate suggestions on edit text
-    connect(this, SIGNAL(editTextChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
-    KComboBox::focusInEvent(event);
+    LineEdit::focusInEvent(event);
 }
 
 
 void UrlBar::setCurrentTab(WebTab *tab)
 {
     if(_tab)
-        disconnect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setUrl(const QUrl &)));
+    {
+        disconnect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
+        disconnect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
+        disconnect(_tab->page(), SIGNAL(validSSLInfo(bool)), this, SLOT(setTrustedHost(bool)));
+        disconnect(iconButton(), SIGNAL(clicked()), _tab->page(), SLOT(showSSLInfo()));
+    }
     _tab = tab;
-    connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setUrl(const QUrl &)));
-
+    connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
+    connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
+    connect(_tab->page(), SIGNAL(validSSLInfo(bool)), this, SLOT(setTrustedHost(bool)));
+    connect(iconButton(), SIGNAL(clicked()), _tab->page(), SLOT(showSSLInfo()));
+            
     // update it now (the first time)
-    setUrl( _tab->url() );
-    update();
+    updateStyles();
+    _tab->view()->setFocus();
+    setQUrl( _tab->url() );
 }
 
 
@@ -321,3 +251,21 @@ void UrlBar::setPrivateMode(bool on)
 {
     _privateMode = on;
 }
+
+
+void UrlBar::loadFinished()
+{
+    // show RSS
+    
+    // show KGet downloads??
+    
+    // last, but not least
+    updateStyles();
+}
+
+
+void UrlBar::setTrustedHost(bool on)
+{
+    kDebug() << "SET TRUSTED HOST..";
+    iconButton()->setIconUrl( _tab->url() , on );
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 991b9038..848073db 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -49,7 +49,7 @@ class QLinearGradient;
 class QWidget;
 
 
-class UrlBar : public KComboBox
+class UrlBar : public LineEdit
 {
     Q_OBJECT
 
@@ -57,32 +57,24 @@ public:
     UrlBar(QWidget *parent = 0);
     ~UrlBar();
 
-    void selectAll() const;
-    KUrl url() const;
-    QSize sizeHint() const;
-
     void setCurrentTab(WebTab *);
     void setPrivateMode(bool on);
-    
-public slots:
-    void setUrl(const QUrl &url);
-    void updateUrl();
 
 private slots:
     void activated(const QString& url, Rekonq::OpenType = Rekonq::CurrentTab);
     void suggestUrls(const QString &editedText);
+    void setQUrl(const QUrl &url);
 
+    void loadFinished();
+    void setTrustedHost(bool on);
+    
 protected:
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
     virtual void focusInEvent(QFocusEvent *event);
 
 private:
-    LineEdit *m_lineEdit;
-
-    KUrl m_currentUrl;
-
-    CompletionWidget *m_box;
+    CompletionWidget *_box;
     WebTab *_tab;
     bool _privateMode;
 };
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 71cc8be4..8dc0ef96 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -304,18 +304,9 @@ void WebPage::loadFinished(bool)
     {
         wallet()->fillFormData(mainFrame());
     }
-    
-    // TODO: implement me!
-    if(_sslInfo.isValid())
-    {
-        // show an icon in the urlbar
-        kDebug() << "----------------- SSL VALID INFO!!!! ------------------";
-    }
-    else
-    {
-        // hide the icon in the urlbar
-        kDebug() << "----------------- SSL INFO NOT VALID... ------------------";
-    }
+
+    if( mainFrame()->url().scheme() == QL1S("https") )
+        emit validSSLInfo( _sslInfo.isValid() );
 }
 
 
@@ -538,13 +529,23 @@ void WebPage::showSSLInfo()
                          KSslInfoDialog::errorsFromString( _sslInfo.certificateErrors() )
                         );
 
-        dlg->open();
+        dlg->exec();
         delete dlg;
-    } 
-    else 
+        
+        return;
+    }
+    
+    if( mainFrame()->url().scheme() == QL1S("https") )
+    {
+        KMessageBox::error( view(), 
+                              i18n("The SSL information for this site appears to be corrupt."), 
+                              i18nc("Secure Sockets Layer", "SSL")
+                            );
+    }
+    else
     {
-        KMessageBox::information( 0, 
-                                  i18n("The SSL information for this site appears to be corrupt."), 
+        KMessageBox::information( view(), 
+                                  i18n("This site doesn't contain SSL information."), 
                                   i18nc("Secure Sockets Layer", "SSL")
                                 );
     }
diff --git a/src/webpage.h b/src/webpage.h
index abc9833c..479d0cd3 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -58,8 +58,6 @@ public:
     explicit WebPage(QWidget *parent = 0);
     ~WebPage();
 
-    void showSSLInfo();
-
 public slots:
     virtual void downloadRequest(const QNetworkRequest &request);
     void downloadAllContentsWithKGet();
@@ -77,7 +75,11 @@ protected Q_SLOTS:
 private slots:
     void manageNetworkErrors(QNetworkReply *reply);
     void loadFinished(bool);
+    void showSSLInfo();
 
+signals:
+    void validSSLInfo(bool);
+    
 private:
     QString errorPage(QNetworkReply *);
     
-- 
cgit v1.2.1


From 7f5321462a87329b0429b1c34274bef40eef510b Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 5 Apr 2010 11:26:02 +0200
Subject: NewTabPage : add buttons in #actions : "Clear Private Data" for
 history and bookmarks, "Edit Downloads"

---
 src/data/home.html |  4 ++--
 src/newtabpage.cpp | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 4afbf2ed..97bec22d 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -62,12 +62,12 @@ border-width: 5px;
 
 #navigation {
 -webkit-border-image: url(%2/bg2.png) 12 12 12 12  stretch stretch;
-max-width: 75%;
+max-width: 55%;
 }
 
 #actions, #balance {
 margin-top: 12px;
-width: 10%;
+width: 20%;
 }
 
 #actions {
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 3e21d0fe..e2837f94 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -115,6 +115,17 @@ void NewTabPage::generate(const KUrl &url)
             return;
         }
     }
+    if(url.fileName() == QString("clear"))
+    {
+        Application::instance()->mainWindow()->actionByName("clear_private_data")->trigger();
+        generate(QString("about:" + url.directory()));
+        return;
+    }
+    if(url == KUrl("about:bookmarks/edit"))
+    {   
+        Application::bookmarkProvider()->bookmarkManager()->slotEditBookmarks();
+        return;
+    }
     
     QWebPage *page = m_root.webFrame()->page();
     page->mainFrame()->setHtml(m_html);
@@ -369,6 +380,13 @@ void NewTabPage::historyPage()
 {
     m_root.addClass("history");
     
+    QWebElement clearData = markup(".link");
+    clearData.findFirst("a").setAttribute("href", "about:history/clear");
+    QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("edit-clear", KIconLoader::SizeSmall || KIconLoader::Small));
+    clearData.findFirst("img").setAttribute("src" , iconPath );
+    clearData.findFirst("span").appendInside(i18n("Clear Private Data"));
+    m_root.document().findFirst("#actions").appendInside(clearData);
+    
     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
     
     int i = 0;
@@ -401,6 +419,13 @@ void NewTabPage::bookmarksPage()
 {
     m_root.addClass("bookmarks");
     
+    QWebElement editBookmarks = markup(".link");
+    editBookmarks.findFirst("a").setAttribute("href", "about:bookmarks/edit");
+    QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("bookmarks-organize", KIconLoader::SizeSmall || KIconLoader::Small));
+    editBookmarks.findFirst("img").setAttribute("src" , iconPath);
+    editBookmarks.findFirst("span").appendInside(i18n("Edit Bookmarks"));
+    m_root.document().findFirst("#actions").appendInside(editBookmarks);
+    
     KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
     if (bookGroup.isNull())
     {
@@ -485,6 +510,13 @@ QString NewTabPage::checkTitle(const QString &title)
 void NewTabPage::downloadsPage()
 {
     m_root.addClass("downloads");
+    
+    QWebElement clearData = markup(".link");
+    clearData.findFirst("a").setAttribute("href", "about:downloads/clear");
+    QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("edit-clear", KIconLoader::SizeSmall || KIconLoader::Small));
+    clearData.findFirst("img").setAttribute("src" , iconPath );
+    clearData.findFirst("span").appendInside(i18n("Clear Private Data"));
+    m_root.document().findFirst("#actions").appendInside(clearData);
 
     DownloadList list = Application::historyManager()->downloads();
     
-- 
cgit v1.2.1


From b4f7463d6f4c760d4bab84fd3b4c8ac71b228ae3 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 2 Apr 2010 19:06:26 +0200
Subject: Clear downloads in "clear private data" dialog

---
 src/cleardata.ui   | 12 +++++++++++-
 src/mainwindow.cpp |  7 ++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/cleardata.ui b/src/cleardata.ui
index b70d3b5a..7de7543f 100644
--- a/src/cleardata.ui
+++ b/src/cleardata.ui
@@ -24,7 +24,17 @@
    <item>
     <widget class="QCheckBox" name="clearHistory">
      <property name="text">
-      <string>History</string>
+      <string>Visited pages history</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="clearDownloads">
+     <property name="text">
+      <string>Downloads history</string>
      </property>
      <property name="checked">
       <bool>true</bool>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 85f14738..af26ef42 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1186,7 +1186,12 @@ void MainWindow::clearPrivateData()
         {
             Application::historyManager()->clear();
         }
-
+        
+        if(clearWidget.clearDownloads->isChecked())
+        {
+            Application::historyManager()->clearDownloadsHistory();
+        }
+        
         if(clearWidget.clearCookies->isChecked())
         {
             QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer");
-- 
cgit v1.2.1


From 15beca589c67f6b4d014c4a28387763e84613387 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sat, 27 Mar 2010 16:00:05 +0100
Subject: Modified default config to only load 2 previews on first sartup

---
 src/rekonq.kcfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index bc41f5e1..ea09acbc 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -34,10 +34,10 @@
 <!-- New Tab Page Settings -->
   <group name="NewTabPage">
     <entry name="previewNames" type="StringList">
-        <default>KDE Homepage,KDE-Apps,KDE-Look,UserBase,KDE Community Forums,TechBase,Planet KDE,rekonq</default>
+        <default>KDE Homepage,UserBase,,,,,,</default>
     </entry>
     <entry name="previewUrls" type="StringList">
-        <default>http://www.kde.org,http://kde-apps.org,http://kde-look.org,http://userbase.kde.org,http://forum.kde.org,http://techbase.kde.org,http://planetkde.org,http://rekonq.sourceforge.net</default>
+        <default>http://www.kde.org,http://userbase.kde.org,,,,,,</default>
     </entry>
   </group>
 
-- 
cgit v1.2.1


From 817500ffb63a26e534edff7524e8c2988e851506 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Mon, 5 Apr 2010 13:46:34 +0200
Subject: Load the url when an url is dropped onto the urlbar

---
 src/urlbar/urlbar.cpp | 7 +++++++
 src/urlbar/urlbar.h   | 1 +
 2 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index dd14a4a3..35934bf4 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -269,3 +269,10 @@ void UrlBar::setTrustedHost(bool on)
     kDebug() << "SET TRUSTED HOST..";
     iconButton()->setIconUrl( _tab->url() , on );
 }
+
+
+void UrlBar::dropEvent(QDropEvent *event)
+{
+    LineEdit::dropEvent(event);
+    activated(text());
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 848073db..3b28fb3a 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -72,6 +72,7 @@ protected:
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
     virtual void focusInEvent(QFocusEvent *event);
+    virtual void dropEvent(QDropEvent *event);
 
 private:
     CompletionWidget *_box;
-- 
cgit v1.2.1


From 969efc9bddcc1b21d1c70f301d8cb0d44904c9c5 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 6 Apr 2010 01:20:04 +0200
Subject: I confused mouse cursor with the key one :) Here is another hack to
 fix bug 211557

DISCLAIMER: this, as the previous, is an hack NOT a solution

BUG: 211557
---
 src/webview.cpp | 8 +++++---
 src/webview.h   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index 2083cef3..e874411d 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -66,6 +66,7 @@ WebView::WebView(QWidget* parent)
     , _scrollTimer( new QTimer(this) )
     , _VScrollSpeed(0)
     , _HScrollSpeed(0)
+    , _disableAutoScroll(false)
 {
     WebPage *page = new WebPage(this);
     setPage(page);
@@ -320,6 +321,9 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
 
 void WebView::mousePressEvent(QMouseEvent *event)
 {
+    QWebHitTestResult result = page()->mainFrame()->hitTestContent( event->pos() );
+    _disableAutoScroll = result.isContentEditable();
+    
     switch(event->button())
     {
       case Qt::XButton1:
@@ -426,9 +430,7 @@ void WebView::keyPressEvent(QKeyEvent *event)
         }
     }
  
-    QWebHitTestResult result = page()->mainFrame()->hitTestContent( mapFromGlobal( QCursor::pos() ) );
-    
-    if( result.isContentEditable() )
+    if(_disableAutoScroll)
     {
         KWebView::keyPressEvent(event);
         return;
diff --git a/src/webview.h b/src/webview.h
index 85ebf46a..0fe83ae4 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -79,6 +79,7 @@ private:
     QTimer *_scrollTimer;
     int _VScrollSpeed;
     int _HScrollSpeed;
+    bool _disableAutoScroll;
 };
 
 #endif
-- 
cgit v1.2.1


From bc50e818065dff096a1c55a2b37e82a5ac205296 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <fcastelli@novell.com>
Date: Tue, 6 Apr 2010 12:43:34 +0200
Subject: Do not update downloads history when private browsing is enabled.

---
 src/history/historymanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 7aded714..097f9ee2 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -455,6 +455,9 @@ KCompletion * HistoryManager::completionObject() const
 
 void HistoryManager::addDownload(const QString &srcUrl, const QString &destUrl)
 {
+    QWebSettings *globalSettings = QWebSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+      return;
     QString downloadFilePath = KStandardDirs::locateLocal("appdata" , "downloads");
     QFile downloadFile(downloadFilePath);
     if ( !downloadFile.open(QFile::WriteOnly | QFile::Append) )
-- 
cgit v1.2.1


From a48a5a4157e9af22adb3a7673203ed8ced5ceeab Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Tue, 6 Apr 2010 12:43:21 +0200
Subject: - Enable context menu for folders and separators of the bookmark bar
 - Use the same context menu for the bookmark panel and the bookmark bar - Use
 a list to store the different bookmark bars   - Fix the different crashes
 when there are more than one window   - When the bookmarks are changed, all
 the bars are refreshed

---
 src/CMakeLists.txt                    |   1 +
 src/bookmarks/bookmarkcontextmenu.cpp | 309 ++++++++++++++++++++++++++++++++++
 src/bookmarks/bookmarkcontextmenu.h   |  63 +++++++
 src/bookmarks/bookmarksmanager.cpp    | 132 +++++++++++----
 src/bookmarks/bookmarksmanager.h      |  27 ++-
 src/bookmarks/bookmarkspanel.cpp      | 307 +++------------------------------
 src/bookmarks/bookmarkspanel.h        |  14 +-
 src/history/historypanel.cpp          |  10 +-
 src/mainwindow.cpp                    |   1 +
 9 files changed, 524 insertions(+), 340 deletions(-)
 create mode 100644 src/bookmarks/bookmarkcontextmenu.cpp
 create mode 100644 src/bookmarks/bookmarkcontextmenu.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8728bff8..73eda88c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,7 @@ SET( rekonq_KDEINIT_SRCS
     bookmarks/bookmarkspanel.cpp
     bookmarks/bookmarkstreemodel.cpp
     bookmarks/bookmarksproxy.cpp
+    bookmarks/bookmarkcontextmenu.cpp
     #----------------------------------------
     adblock/adblockmanager.cpp
     adblock/adblocknetworkreply.cpp
diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
new file mode 100644
index 00000000..ccb63143
--- /dev/null
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -0,0 +1,309 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "bookmarkcontextmenu.h"
+
+// Local Includes
+#include "application.h"
+#include "bookmarksmanager.h"
+
+// KDE Includes
+#include <KMessageBox>
+#include <KActionCollection>
+#include <KBookmarkDialog>
+
+
+BookmarkContextMenu::BookmarkContextMenu(const KBookmark & bookmark, KBookmarkManager *manager, KBookmarkOwner *owner, QWidget *parent)
+    : KBookmarkContextMenu(bookmark, manager, owner, parent)
+    , m_ac(new KActionCollection(this))
+{
+    setupActions();
+}
+
+
+void BookmarkContextMenu::setupActions()
+{
+    KAction* action;
+
+    action = new KAction(KIcon("tab-new"), i18n("Open"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openInCurrentTab()));
+    m_ac->addAction("open", action);
+
+    action = new KAction(KIcon("tab-new"), i18n("Open in New Tab"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openInNewTab()));
+    m_ac->addAction("open_tab", action);
+
+    action = new KAction(KIcon("window-new"), i18n("Open in New Window"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openInNewWindow()));
+    m_ac->addAction("open_window", action);
+
+    action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(bookmarkCurrentPage()));
+    m_ac->addAction("bookmark_page", action);
+
+    action = new KAction(KIcon("folder-new"), i18n("New Bookmark Folder"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(newBookmarkGroup()));
+    m_ac->addAction("folder_new", action);
+
+    action = new KAction(KIcon("edit-clear"), i18n("New Separator"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(newSeparator()));
+    m_ac->addAction("separator_new", action);
+
+    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Address"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(copyToClipboard()));
+    m_ac->addAction("copy", action);
+
+    action = new KAction(KIcon("edit-delete"), i18n("Delete Bookmark"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(deleteBookmark()));
+    m_ac->addAction("delete", action);
+
+    action = new KAction(KIcon("configure"), i18n("Properties"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(editBookmark()));
+    m_ac->addAction("properties", action);
+
+    action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
+    connect(action, SIGNAL(triggered()), this, SLOT(openFolderInTabs()));
+    m_ac->addAction("open_all", action);
+}
+
+
+void BookmarkContextMenu::addBookmarkActions()
+{
+    addAction(m_ac->action("open"));
+    addAction(m_ac->action("open_tab"));
+    addAction(m_ac->action("open_window"));
+
+    addSeparator();
+
+    addAction(m_ac->action("bookmark_page"));
+    addAction(m_ac->action("folder_new"));
+    addAction(m_ac->action("separator_new"));
+
+    addSeparator();
+
+    addAction(m_ac->action("copy"));
+
+    addSeparator();
+
+    addAction(m_ac->action("delete"));
+    addAction(m_ac->action("properties"));
+}
+
+
+void BookmarkContextMenu::addFolderActions()
+{
+    if(!bookmark().toGroup().first().isNull())
+    {
+        addAction(m_ac->action("open_all"));
+        addSeparator();
+    }
+
+    addAction(m_ac->action("bookmark_page"));
+    addAction(m_ac->action("folder_new"));
+    addAction(m_ac->action("separator_new"));
+
+    addSeparator();
+
+    addAction(m_ac->action("delete"));
+    addAction(m_ac->action("properties"));
+}
+
+
+void BookmarkContextMenu::addSeparatorActions()
+{
+    addAction(m_ac->action("bookmark_page"));
+    addAction(m_ac->action("folder_new"));
+    addAction(m_ac->action("separator_new"));
+
+    addSeparator();
+
+    addAction(m_ac->action("delete"));
+}
+
+
+void BookmarkContextMenu::addActions()
+{
+    if(bookmark().isGroup())
+    {
+        addFolderActions();
+    }
+
+    else if(bookmark().isSeparator())
+    {
+        addSeparatorActions();
+    }
+
+    else if(bookmark().isNull())
+    {
+        addAction(m_ac->action("bookmark_page"));
+        addAction(m_ac->action("folder_new"));
+        addAction(m_ac->action("separator_new"));
+    }
+
+    else
+    {
+        addBookmarkActions();
+    }
+}
+
+
+void BookmarkContextMenu::openInCurrentTab()
+{
+    Application::instance()->loadUrl(bookmark().url());
+}
+
+
+void BookmarkContextMenu::openInNewTab()
+{
+    Application::instance()->loadUrl(bookmark().url(), Rekonq::SettingOpenTab);
+}
+
+
+void BookmarkContextMenu::openInNewWindow()
+{
+    Application::instance()->loadUrl(bookmark().url(), Rekonq::NewWindow);
+}
+
+void BookmarkContextMenu::deleteBookmark()
+{
+    KBookmark bm = bookmark();
+    bool folder = bm.isGroup();
+
+    if (KMessageBox::warningContinueCancel(
+            QApplication::activeWindow(),
+            folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", bm.text())
+                   : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", bm.text()),
+            folder ? i18n("Bookmark Folder Deletion")
+                   : i18n("Bookmark Deletion"),
+            KStandardGuiItem::del())
+          != KMessageBox::Continue
+        )
+        return;
+
+    bm.parentGroup().deleteBookmark(bm);
+    manager()->emitChanged();
+}
+
+
+void BookmarkContextMenu::editBookmark()
+{
+    KBookmark selected = bookmark();
+
+    KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow());
+    dialog->editBookmark(selected);
+    delete dialog;
+}
+
+
+void BookmarkContextMenu::openFolderInTabs()
+{
+    if(bookmark().isGroup())
+        owner()->openFolderinTabs(bookmark().toGroup());
+}
+
+
+void BookmarkContextMenu::newBookmarkGroup()
+{
+    KBookmark newBk;
+    KBookmark selected = bookmark();
+    KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow());
+
+    if(!selected.isNull())
+    {
+        if(selected.isGroup())
+        {
+            newBk = dialog->createNewFolder("New folder", selected);
+        }
+
+        else
+        {
+            newBk = dialog->createNewFolder("New folder", selected.parentGroup());
+            selected.parentGroup().moveBookmark(newBk, selected);
+            manager()->emitChanged();
+        }
+    }
+    else
+    {
+        dialog->createNewFolder("New folder");
+    }
+
+    delete dialog;
+}
+
+
+void BookmarkContextMenu::newSeparator()
+{
+    KBookmark selected = bookmark();
+    KBookmark newBk;
+
+    if(!selected.isNull())
+    {
+        if(selected.isGroup())
+            newBk = selected.toGroup().createNewSeparator();
+        else
+            newBk = selected.parentGroup().createNewSeparator();
+    }
+
+    else
+    {
+        newBk = Application::bookmarkProvider()->rootGroup().createNewSeparator();
+    }
+
+    KBookmarkGroup parent = newBk.parentGroup();
+    newBk.setIcon(("edit-clear"));
+    parent.addBookmark(newBk);
+
+    if(!selected.isNull())
+        parent.moveBookmark(newBk, selected);
+
+    manager()->emitChanged();
+}
+
+
+void BookmarkContextMenu::bookmarkCurrentPage()
+{
+    KBookmarkGroup parent = Application::bookmarkProvider()->rootGroup();
+    KBookmark selected = bookmark();
+
+    if(!selected.isNull())
+    {
+        parent = selected.parentGroup();
+
+        if(selected.isGroup())
+            parent = selected.toGroup();
+
+        KBookmark newBk = parent.addBookmark(owner()->currentTitle(), KUrl(owner()->currentUrl()), "text-html");
+        parent.moveBookmark(newBk, selected.parentGroup().previous(selected));
+    }
+
+    else
+    {
+       parent.addBookmark(owner()->currentTitle(), KUrl(owner()->currentUrl()), "text-html");
+    }
+
+    manager()->emitChanged();
+}
diff --git a/src/bookmarks/bookmarkcontextmenu.h b/src/bookmarks/bookmarkcontextmenu.h
new file mode 100644
index 00000000..38fbc71a
--- /dev/null
+++ b/src/bookmarks/bookmarkcontextmenu.h
@@ -0,0 +1,63 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef BOOKMARKCONTEXTMENU_H
+#define BOOKMARKCONTEXTMENU_H
+
+// Local Includes
+#include "application.h"
+
+// Qt Includes
+#include <KBookmarkMenu>
+
+
+class BookmarkContextMenu : public KBookmarkContextMenu
+{
+    Q_OBJECT
+public:
+    BookmarkContextMenu(const KBookmark & bk, KBookmarkManager * manager, KBookmarkOwner *owner, QWidget * parent = 0);
+    virtual void addActions();
+
+private slots:
+    void openInCurrentTab();
+    void openInNewTab();
+    void openInNewWindow();
+    void deleteBookmark();
+    void openFolderInTabs();
+    void editBookmark();
+    void newBookmarkGroup();
+    void newSeparator();
+    void bookmarkCurrentPage();
+
+private:
+    void setupActions();
+    void addFolderActions();
+    void addBookmarkActions();
+    void addSeparatorActions();
+    KActionCollection *m_ac;
+};
+
+#endif // BOOKMARKCONTEXTMENU_H
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 6a5417fc..8cdc5d8e 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -34,18 +34,18 @@
 #include "mainwindow.h"
 #include "webtab.h"
 #include "webview.h"
+#include "bookmarkcontextmenu.h"
 
 // KDE Includes
 #include <KActionCollection>
-#include <KBookmark>
 #include <KBookmarkAction>
 #include <KBookmarkGroup>
-#include <KBookmarkMenu>
 #include <KToolBar>
 #include <KDebug>
 #include <KMenu>
 #include <KStandardDirs>
 #include <KUrl>
+#include <KMessageBox>
 
 // Qt Includes
 #include <QtCore/QFile>
@@ -96,6 +96,13 @@ QString BookmarkOwner::currentTitle() const
 void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)
 {
     QList<KUrl> urlList = bm.groupUrlList();
+
+    if(urlList.length() > 8)
+    {
+        if(!(KMessageBox::warningContinueCancel(Application::instance()->mainWindow(), i18n("You are about to open %1 tabs.\nAre you sure  ?", QString::number(urlList.length()))) == KMessageBox::Continue))
+            return;
+    }
+
     QList<KUrl>::iterator url;
     for (url = urlList.begin(); url != urlList.end(); ++url)
     {
@@ -126,12 +133,10 @@ BookmarkMenu::~BookmarkMenu()
 
 KMenu *BookmarkMenu::viewContextMenu(QAction *action)
 {
-    // contextMenu() returns an invalid  KMenu (seg fault) for the folders in the toolbar
-    KMenu *menu = contextMenu(action);
-    if(menu)
-        return menu;
-
-    return 0;   // new KMenu();
+    KBookmarkActionInterface* act = dynamic_cast<KBookmarkActionInterface *>(action);
+     if (!act)
+         return 0;
+     return new BookmarkContextMenu(act->bookmark(), manager(), owner());
 }
 
 
@@ -160,7 +165,6 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
         , m_owner(0)
         , m_actionCollection(new KActionCollection(this))
         , m_bookmarkMenu(0)
-        , m_bookmarkToolBar(0)
         , m_completion(0)
 {
     // take care of the completion object
@@ -204,36 +208,44 @@ BookmarkProvider::~BookmarkProvider()
 }
 
 
-void BookmarkProvider::setupBookmarkBar(KToolBar *t)
+void BookmarkProvider::setupBookmarkBar(KToolBar *toolbar)
 {
-    m_bookmarkToolBar = t;
-    connect(m_bookmarkToolBar, SIGNAL(customContextMenuRequested(const QPoint &)),
+    KToolBar *bookmarkToolBar = toolbar;
+    m_bookmarkToolBars.append(toolbar);
+    connect(bookmarkToolBar, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(contextMenu(const QPoint &)));
 
     slotBookmarksChanged("", "");
 }
 
+void BookmarkProvider::removeToolBar(KToolBar *toolbar)
+{
+    m_bookmarkToolBars.removeOne(toolbar);
+}
 
 void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString &caller)
 {
     Q_UNUSED(group)
     Q_UNUSED(caller)
 
-    if (!m_bookmarkToolBar)
-        return;
-
-    KBookmarkGroup toolBarGroup = m_manager->toolbar();
-    if (toolBarGroup.isNull())
-        return;
-
-    m_bookmarkToolBar->clear(); // FIXME CRASH
-    m_completion->clear();
-
-    KBookmark bookmark = toolBarGroup.first();
-    while (!bookmark.isNull())
+    foreach(KToolBar *bookmarkToolBar, m_bookmarkToolBars)
     {
-        m_bookmarkToolBar->addAction(fillBookmarkBar(bookmark));
-        bookmark = toolBarGroup.next(bookmark);
+        if (bookmarkToolBar)
+        {
+            KBookmarkGroup toolBarGroup = m_manager->toolbar();
+            if (toolBarGroup.isNull())
+                return;
+
+            bookmarkToolBar->clear();
+            m_completion->clear();
+
+            KBookmark bookmark = toolBarGroup.first();
+            while (!bookmark.isNull())
+            {
+                bookmarkToolBar->addAction(fillBookmarkBar(bookmark));
+                bookmark = toolBarGroup.next(bookmark);
+            }
+        }
     }
 }
 
@@ -249,13 +261,22 @@ QAction *BookmarkProvider::actionByName(const QString &name)
 
 void BookmarkProvider::contextMenu(const QPoint &point)
 {
-    KAction* action = dynamic_cast<KAction*>(m_bookmarkToolBar->actionAt(point));
+    if(m_bookmarkToolBars.isEmpty())
+        return;
+
+    KToolBar *bookmarkToolBar = m_bookmarkToolBars.at(0);
+    if(!bookmarkToolBar)
+        return;
+
+    KAction* action = dynamic_cast<KAction*>(bookmarkToolBar->actionAt(point));
     if (!action)
         return;
+
     KMenu *menu = m_bookmarkMenu->viewContextMenu(action);
     if (!menu)
         return;
-    menu->popup(m_bookmarkToolBar->mapToGlobal(point));
+
+    menu->popup(bookmarkToolBar->mapToGlobal(point));
 }
 
 
@@ -276,19 +297,23 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
     {
         KBookmarkGroup group = bookmark.toGroup();
         KBookmark bm = group.first();
-        KActionMenu *menuAction = new KActionMenu(KIcon(bookmark.icon()), bookmark.text(), this);
-        menuAction->setDelayed(false);
+        BookmarkActionMenu *menuAction = new BookmarkActionMenu(group, this);
+
         while (!bm.isNull())
         {
             menuAction->addAction(fillBookmarkBar(bm));
             bm = group.next(bm);
         }
+
+        menuAction->addFolderActions();
         return menuAction;
     }
  
     if(bookmark.isSeparator())
     {
-        KAction *a = new KAction(this);
+        KAction *a = new KBookmarkAction(bookmark, m_owner, this);
+        a->setText("");
+        a->setIcon(QIcon());
         a->setSeparator(true);
         return a;
     }
@@ -305,15 +330,13 @@ KBookmarkGroup BookmarkProvider::rootGroup()
     return m_manager->root();
 }
 
+
 KCompletion *BookmarkProvider::completionObject() const
 {
     return m_completion;
 }
 
 
-
-
-
 QString BookmarkProvider::titleForBookmarkUrl(QString url)
 {
     QString title = "";
@@ -361,4 +384,45 @@ QString BookmarkProvider::titleForBookmarkUrl(const KBookmark &bookmark, QString
 }
 
 
+// ----------------------------------------------------------------------------------------------
+
+
+BookmarkActionMenu::BookmarkActionMenu(const KBookmarkGroup &bm, QObject *parent)
+    : KBookmarkActionMenu(bm, bm.text(), parent)
+    , m_group(bm)
+{
+    setIcon(KIcon(bm.icon()));
+    setDelayed(false);
+}
+
+
+void BookmarkActionMenu::addFolderActions()
+{
+    addSeparator();
+    KAction *action;
+
+    if(!m_group.first().isNull())
+    {
+        action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
+        connect(action, SIGNAL(triggered(bool)), this, SLOT(openActionInTabs()));
+        addAction(action);
+    }
+
+    action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
+    connect(action, SIGNAL(triggered(bool)), this, SLOT(bookmarkCurrentPage()));
+    addAction(action);
+}
+
+
+void BookmarkActionMenu::bookmarkCurrentPage()
+{
+    m_group.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()));
+    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
+}
+
 
+void BookmarkActionMenu::openActionInTabs()
+{
+    if(!m_group.isNull())
+        Application::bookmarkProvider()->bookmarkOwner()->openFolderinTabs(m_group);
+}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index ace06e95..3c21bc67 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -194,6 +194,7 @@ public:
     */
     void setupBookmarkBar(KToolBar *);
 
+    void removeToolBar(KToolBar*);
 
     /**
      * @short Get action by name
@@ -220,7 +221,7 @@ public:
     KCompletion *completionObject() const;
 
     QString titleForBookmarkUrl(QString url);
-    
+
 signals:
     /**
     * @short This signal is emitted when an url has to be loaded
@@ -256,8 +257,30 @@ private:
     BookmarkOwner *m_owner;
     KActionCollection *m_actionCollection;
     BookmarkMenu *m_bookmarkMenu;
-    KToolBar *m_bookmarkToolBar;
+    QList<KToolBar*> m_bookmarkToolBars;
     KCompletion *m_completion;
 };
 
+
+// ------------------------------------------------------------------------------------------
+
+
+class BookmarkActionMenu : public KBookmarkActionMenu
+{
+    Q_OBJECT
+
+public:
+    BookmarkActionMenu (const KBookmarkGroup &bm, QObject *parent);
+    void addFolderActions();
+
+private slots:
+    void openActionInTabs();
+    void bookmarkCurrentPage();
+
+private:
+    KBookmarkGroup m_group;
+
+};
+
+
 #endif
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 2f530c6c..6360b313 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -32,6 +32,7 @@
 #include "bookmarksmanager.h"
 #include "bookmarkstreemodel.h"
 #include "bookmarksproxy.h"
+#include "bookmarkcontextmenu.h"
 
 // Auto Includes
 #include "rekonq.h"
@@ -39,26 +40,21 @@
 // Qt includes
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QTreeView>
 #include <QHeaderView>
 
 // KDE includes
 #include <KLineEdit>
 #include <KLocalizedString>
-#include <KAction>
 #include <KMenu>
-#include <KBookmarkDialog>
 #include <KMessageBox>
 
 
 BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
     : QDockWidget(title, parent, flags),
     m_treeView(new UrlTreeView(this)),
-    m_ac(new KActionCollection(this)),
     m_loadingState(false)
 {
     setup();
-    setupActions();
     setShown(ReKonfig::showBookmarksPanel());
 }
 
@@ -111,9 +107,9 @@ void BookmarksPanel::setup()
     proxy->setSourceModel( model );
     m_treeView->setModel( proxy );
 
-    connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuBk(const QPoint &)));
-    connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuBkGroup(const QPoint &)));
-    connect(m_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenuBlank(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)));
+    connect(m_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)));
     connect(m_treeView, SIGNAL(delKeyPressed()), this, SLOT(deleteBookmark()));
     connect(m_treeView, SIGNAL(collapsed(const QModelIndex &)), this, SLOT(onCollapse(const QModelIndex &)));
     connect(m_treeView, SIGNAL(expanded(const QModelIndex &)), this, SLOT(onExpand(const QModelIndex &)));
@@ -122,6 +118,19 @@ void BookmarksPanel::setup()
 }
 
 
+KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index)
+{
+    if(!index.isValid())
+        return KBookmark();
+
+    const QAbstractProxyModel* proxyModel = dynamic_cast< const QAbstractProxyModel* >(index.model());
+    QModelIndex originalIndex = proxyModel->mapToSource(index);
+
+    BtmItem *node = static_cast< BtmItem* >( originalIndex.internalPointer() );
+    return node->getBkm();
+}
+
+
 void BookmarksPanel::onCollapse(const QModelIndex &index)
 {
     if(m_loadingState)
@@ -170,165 +179,16 @@ void BookmarksPanel::loadFoldedState(const QModelIndex &root)
 }
 
 
-void BookmarksPanel::setupActions()
+void BookmarksPanel::contextMenu(const QPoint &pos)
 {
-    KAction* action;
-
-    action = new KAction(KIcon("tab-new"), i18n("Open"), this);
-    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInCurrentTab()));
-    m_ac->addAction("open", action);
-
-    action = new KAction(KIcon("tab-new"), i18n("Open in New Tab"), this);
-    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewTab()));
-    m_ac->addAction("open_tab", action);
-
-    action = new KAction(KIcon("window-new"), i18n("Open in New Window"), this);
-    connect(action, SIGNAL(triggered()), m_treeView, SLOT(openInNewWindow()));
-    m_ac->addAction("open_window", action);
-
-    action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(bookmarkCurrentPage()));
-    m_ac->addAction("bookmark_page", action);
-
-    action = new KAction(KIcon("folder-new"), i18n("New Bookmark Folder"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(newBookmarkGroup()));
-    m_ac->addAction("folder_new", action);
-
-    action = new KAction(KIcon("edit-clear"), i18n("New Separator"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(newSeparator()));
-    m_ac->addAction("separator_new", action);
-
-    action = new KAction(KIcon("edit-copy"), i18n("Copy Link Address"), this);
-    connect(action, SIGNAL(triggered()), m_treeView, SLOT(copyToClipboard()));
-    m_ac->addAction("copy", action);
-
-    action = new KAction(KIcon("edit-delete"), i18n("Delete Bookmark"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(deleteBookmark()));
-    m_ac->addAction("delete", action);
-
-    action = new KAction(KIcon("configure"), i18n("Properties"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(editBookmark()));
-    m_ac->addAction("properties", action);
-
-    action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
-    connect(action, SIGNAL(triggered()), this, SLOT(openFolderInTabs()));
-    m_ac->addAction("open_all", action);
-}
-
-
-KBookmark BookmarksPanel::bookmarkForIndex(const QModelIndex &index)
-{
-    if(!index.isValid())
-        return KBookmark();
-
-    const QAbstractProxyModel* proxyModel = dynamic_cast< const QAbstractProxyModel* >(index.model());
-    QModelIndex originalIndex = proxyModel->mapToSource(index);
-
-    BtmItem *node = static_cast< BtmItem* >( originalIndex.internalPointer() );
-    return node->getBkm();
-}
-
-
-void BookmarksPanel::contextMenuBk(const QPoint &pos)
-{
-    QPoint position = m_treeView->mapToGlobal(pos);
     QModelIndex index = m_treeView->indexAt(pos);
-    if(!index.isValid() || m_loadingState)
-        return;
-
-    KBookmark selected = bookmarkForIndex(index);
-
-    if(selected.isGroup())
-    {
-        contextMenuBkGroup(pos, true);
-        return;
-    }
-
-    if(selected.isSeparator())
-    {
-        contextMenuSeparator(pos);
-        return;
-    }
-
-    KMenu *menu = new KMenu(this);
-
-    menu->addAction(m_ac->action("open"));
-    menu->addAction(m_ac->action("open_tab"));
-    menu->addAction(m_ac->action("open_window"));
-
-    menu->addSeparator();
-
-    menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("folder_new"));
-    menu->addAction(m_ac->action("separator_new"));
-
-    menu->addSeparator();
-
-    menu->addAction(m_ac->action("copy"));
-
-    menu->addSeparator();
-
-    menu->addAction(m_ac->action("delete"));
-    menu->addAction(m_ac->action("properties"));
-
-    menu->popup(position);
-}
-
-
-void BookmarksPanel::contextMenuBkGroup(const QPoint &pos, bool emptyGroup)
-{
     if(m_loadingState)
         return;
 
-    QPoint position = m_treeView->mapToGlobal(pos);
-    KMenu *menu = new KMenu(this);
-
-    if(!emptyGroup)
-    {
-        menu->addAction(m_ac->action("open_all"));
-        menu->addSeparator();
-    }
-
-    menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("folder_new"));
-    menu->addAction(m_ac->action("separator_new"));
-
-    menu->addSeparator();
-
-    menu->addAction(m_ac->action("delete"));
-    menu->addAction(m_ac->action("properties"));
-
-    menu->popup(position);
-}
-
-
-void BookmarksPanel::contextMenuSeparator(const QPoint &pos)
-{
-    QPoint position = m_treeView->mapToGlobal(pos);
-    KMenu *menu = new KMenu(this);
-
-    menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("folder_new"));
-    menu->addAction(m_ac->action("separator_new"));
-
-    menu->addSeparator();
-
-    menu->addAction(m_ac->action("delete"));
-
-    menu->popup(position);
-}
-
-
-void BookmarksPanel::contextMenuBlank(const QPoint &pos)
-{
-    QPoint position = m_treeView->mapToGlobal(pos);
-    KMenu *menu = new KMenu(this);
-
-    menu->addAction(m_ac->action("bookmark_page"));
-    menu->addAction(m_ac->action("folder_new"));
-    menu->addAction(m_ac->action("separator_new"));
+    KBookmark selected = bookmarkForIndex(index);
 
-    menu->popup(position);
+    BookmarkContextMenu *menu = new BookmarkContextMenu(selected, Application::bookmarkProvider()->bookmarkManager(), Application::bookmarkProvider()->bookmarkOwner(), this);
+    menu->popup(m_treeView->mapToGlobal(pos));
 }
 
 
@@ -356,128 +216,3 @@ void BookmarksPanel::deleteBookmark()
     bm.parentGroup().deleteBookmark(bm);
     Application::instance()->bookmarkProvider()->bookmarkManager()->emitChanged();
 }
-
-
-void BookmarksPanel::editBookmark()
-{
-    QModelIndex index = m_treeView->currentIndex();
-    if(!index.isValid())
-        return;
-
-    KBookmark selected = bookmarkForIndex(index);
-
-    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
-    dialog->editBookmark(selected);
-    delete dialog;
-}
-
-
-void BookmarksPanel::openFolderInTabs()
-{
-    QModelIndex index = m_treeView->currentIndex();
-    if(!index.isValid() || !bookmarkForIndex(index).isGroup())
-        return;
-
-    QList<KUrl> allChild = bookmarkForIndex(index).toGroup().groupUrlList();
-
-    if(allChild.length() > 8) // 8, a good choice ?
-    {
-        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open a lot of tabs : %1\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
-            return;
-    }
-
-    for(int i = 0; i < allChild.length(); i++)
-        emit openUrl(allChild.at(i).url(), Rekonq::SettingOpenTab);
-}
-
-
-void BookmarksPanel::newBookmarkGroup()
-{
-    QModelIndex index = m_treeView->currentIndex();
-    KBookmark newBk;
-
-    KBookmarkDialog *dialog = Application::bookmarkProvider()->bookmarkOwner()->bookmarkDialog(Application::bookmarkProvider()->bookmarkManager(), QApplication::activeWindow());
-
-    if(index.isValid())
-    {
-        KBookmark selected = bookmarkForIndex(index);
-
-        if(selected.isGroup())
-        {
-            newBk = dialog->createNewFolder("New folder", selected);
-        }
-
-        else
-        {
-            newBk = dialog->createNewFolder("New folder", selected.parentGroup());
-            selected.parentGroup().moveBookmark(newBk, selected);
-            Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-        } 
-    }
-
-    else
-    {
-        dialog->createNewFolder("New folder");
-    }
-
-    delete dialog;
-}
-
-
-void BookmarksPanel::newSeparator()
-{
-    QModelIndex index = m_treeView->currentIndex();
-
-    KBookmark selected;
-    KBookmark newBk;
-
-    if(index.isValid())
-    {
-        selected = bookmarkForIndex(index);
-
-        if(selected.isGroup())
-            newBk = selected.toGroup().createNewSeparator();
-        else
-            newBk = selected.parentGroup().createNewSeparator();
-    }
-
-    else
-    {
-        newBk = Application::bookmarkProvider()->rootGroup().createNewSeparator();
-    }
-
-    KBookmarkGroup parent = newBk.parentGroup();
-    newBk.setIcon(("edit-clear"));
-    parent.addBookmark(newBk);
-
-    if(index.isValid())
-        parent.moveBookmark(newBk, selected);
-
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-}
-
-
-void BookmarksPanel::bookmarkCurrentPage()
-{
-    QModelIndex index = m_treeView->currentIndex();
-    KBookmarkGroup parent = Application::bookmarkProvider()->rootGroup();
-
-    if(index.isValid())
-    {
-        KBookmark selected = bookmarkForIndex(index);
-        parent = selected.parentGroup();
-
-        if(selected.isGroup())
-            parent = selected.toGroup();
-
-        KBookmark newBk = parent.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()), "text-html");
-        parent.moveBookmark(newBk, selected.parentGroup().previous(selected));
-    }
-
-    else
-    {
-       parent.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()), "text-html");
-    }
-
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-}
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index f8528b71..374c48f4 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -39,7 +39,6 @@
 
 // KDE Includes
 #include <KBookmark>
-#include <KActionCollection>
 
 // Forward Declarations
 class KUrl;
@@ -60,29 +59,20 @@ signals:
     void saveOnlyRequested();
 
 private slots:
-    void contextMenuBk(const QPoint &pos);
-    void contextMenuBkGroup(const QPoint &pos, const bool emptyGroup = false);
-    void contextMenuBlank(const QPoint &pos);
+    void contextMenu(const QPoint &pos);
+
     void deleteBookmark();
-    void openFolderInTabs();
-    void editBookmark();
-    void newBookmarkGroup();
-    void newSeparator();
     void onCollapse(const QModelIndex &index);
     void onExpand(const QModelIndex &index);
-    void bookmarkCurrentPage();
     void loadFoldedState(const QModelIndex &root);
     void loadFoldedState();
 
 
 private:
     void setup();
-    void setupActions();
-    void contextMenuSeparator(const QPoint &pos);
     KBookmark bookmarkForIndex(const QModelIndex &index);
 
     UrlTreeView *m_treeView;
-    KActionCollection *m_ac;
     bool m_loadingState;
 };
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 03f2b880..ec84bc02 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -121,7 +121,6 @@ void HistoryPanel::setup()
 
 void HistoryPanel::contextMenuItem(const QPoint &pos)
 {
-    QPoint position = m_treeView->mapToGlobal(pos);
     KMenu *menu = new KMenu(this);
     KAction* action;
 
@@ -143,12 +142,11 @@ void HistoryPanel::contextMenuItem(const QPoint &pos)
 
     if (!menu)
         return;
-    menu->popup(position);
+    menu->popup(m_treeView->mapToGlobal(pos));
 }
 
 void HistoryPanel::contextMenuGroup(const QPoint &pos)
 {
-    QPoint position = m_treeView->mapToGlobal(pos);
     KMenu *menu = new KMenu(this);
     KAction* action;
 
@@ -159,7 +157,7 @@ void HistoryPanel::contextMenuGroup(const QPoint &pos)
 
     if (!menu)
         return;
-    menu->popup(position);
+    menu->popup(m_treeView->mapToGlobal(pos));
 }
 
 void HistoryPanel::openAll()
@@ -173,9 +171,9 @@ void HistoryPanel::openAll()
     for(int i = 0; i < index.model()->rowCount(index); i++)
         allChild << qVariantValue<KUrl>(index.child(i, 0).data(Qt::UserRole));
 
-    if(allChild.length() > 8) // 8, a good choice ?
+    if(allChild.length() > 8)
     {
-        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open a lot of tabs : %1\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
+        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open %1 tabs.\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
             return;
     }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d5831fdb..13adab3d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -160,6 +160,7 @@ MainWindow::MainWindow()
 
 MainWindow::~MainWindow()
 {
+    Application::bookmarkProvider()->removeToolBar(m_bmBar);
     Application::instance()->removeMainWindow(this);
     delete m_popup;
 }
-- 
cgit v1.2.1


From c53637d8b4c45b444c5e5d1d74d4a2bc0a34ef97 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Tue, 6 Apr 2010 16:48:05 +0200
Subject: Add a missing slot

---
 src/bookmarks/bookmarkcontextmenu.cpp | 18 ++++++++++++++++--
 src/bookmarks/bookmarkcontextmenu.h   |  1 +
 src/bookmarks/bookmarksmanager.cpp    |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index ccb63143..1d50cfe9 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -31,6 +31,9 @@
 #include "application.h"
 #include "bookmarksmanager.h"
 
+// Qt Includes
+#include <QClipboard>
+
 // KDE Includes
 #include <KMessageBox>
 #include <KActionCollection>
@@ -188,6 +191,17 @@ void BookmarkContextMenu::openInNewWindow()
     Application::instance()->loadUrl(bookmark().url(), Rekonq::NewWindow);
 }
 
+
+void BookmarkContextMenu::copyToClipboard()
+{
+    if(bookmark().isNull())
+        return;
+
+    QClipboard *cb = QApplication::clipboard();
+    cb->setText(bookmark().url().url());
+}
+
+
 void BookmarkContextMenu::deleteBookmark()
 {
     KBookmark bm = bookmark();
@@ -228,7 +242,6 @@ void BookmarkContextMenu::openFolderInTabs()
 
 void BookmarkContextMenu::newBookmarkGroup()
 {
-    KBookmark newBk;
     KBookmark selected = bookmark();
     KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow());
 
@@ -236,11 +249,12 @@ void BookmarkContextMenu::newBookmarkGroup()
     {
         if(selected.isGroup())
         {
-            newBk = dialog->createNewFolder("New folder", selected);
+            dialog->createNewFolder("New folder", selected);
         }
 
         else
         {
+            KBookmark newBk;
             newBk = dialog->createNewFolder("New folder", selected.parentGroup());
             selected.parentGroup().moveBookmark(newBk, selected);
             manager()->emitChanged();
diff --git a/src/bookmarks/bookmarkcontextmenu.h b/src/bookmarks/bookmarkcontextmenu.h
index 38fbc71a..7f00738a 100644
--- a/src/bookmarks/bookmarkcontextmenu.h
+++ b/src/bookmarks/bookmarkcontextmenu.h
@@ -45,6 +45,7 @@ private slots:
     void openInCurrentTab();
     void openInNewTab();
     void openInNewWindow();
+    void copyToClipboard();
     void deleteBookmark();
     void openFolderInTabs();
     void editBookmark();
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 8cdc5d8e..07b0238f 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -218,11 +218,13 @@ void BookmarkProvider::setupBookmarkBar(KToolBar *toolbar)
     slotBookmarksChanged("", "");
 }
 
+
 void BookmarkProvider::removeToolBar(KToolBar *toolbar)
 {
     m_bookmarkToolBars.removeOne(toolbar);
 }
 
+
 void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString &caller)
 {
     Q_UNUSED(group)
-- 
cgit v1.2.1


From c51282fb7d0092c6a5587e33b1bdfb609290edf1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 7 Apr 2010 02:10:20 +0200
Subject: Some stupid not so important fixes

---
 src/bookmarks/bookmarkcontextmenu.cpp | 7 ++++---
 src/bookmarks/bookmarkcontextmenu.h   | 2 ++
 src/history/historypanel.cpp          | 9 ++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index 1d50cfe9..dedec097 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -31,14 +31,14 @@
 #include "application.h"
 #include "bookmarksmanager.h"
 
-// Qt Includes
-#include <QClipboard>
-
 // KDE Includes
 #include <KMessageBox>
 #include <KActionCollection>
 #include <KBookmarkDialog>
 
+// Qt Includes
+#include <QClipboard>
+
 
 BookmarkContextMenu::BookmarkContextMenu(const KBookmark & bookmark, KBookmarkManager *manager, KBookmarkOwner *owner, QWidget *parent)
     : KBookmarkContextMenu(bookmark, manager, owner, parent)
@@ -321,3 +321,4 @@ void BookmarkContextMenu::bookmarkCurrentPage()
 
     manager()->emitChanged();
 }
+
diff --git a/src/bookmarks/bookmarkcontextmenu.h b/src/bookmarks/bookmarkcontextmenu.h
index 7f00738a..2028df39 100644
--- a/src/bookmarks/bookmarkcontextmenu.h
+++ b/src/bookmarks/bookmarkcontextmenu.h
@@ -37,6 +37,7 @@
 class BookmarkContextMenu : public KBookmarkContextMenu
 {
     Q_OBJECT
+
 public:
     BookmarkContextMenu(const KBookmark & bk, KBookmarkManager * manager, KBookmarkOwner *owner, QWidget * parent = 0);
     virtual void addActions();
@@ -62,3 +63,4 @@ private:
 };
 
 #endif // BOOKMARKCONTEXTMENU_H
+
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index ec84bc02..87b5fe55 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -119,6 +119,7 @@ void HistoryPanel::setup()
     connect(m_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuGroup(const QPoint &)));
 }
 
+
 void HistoryPanel::contextMenuItem(const QPoint &pos)
 {
     KMenu *menu = new KMenu(this);
@@ -145,6 +146,7 @@ void HistoryPanel::contextMenuItem(const QPoint &pos)
     menu->popup(m_treeView->mapToGlobal(pos));
 }
 
+
 void HistoryPanel::contextMenuGroup(const QPoint &pos)
 {
     KMenu *menu = new KMenu(this);
@@ -160,6 +162,7 @@ void HistoryPanel::contextMenuGroup(const QPoint &pos)
     menu->popup(m_treeView->mapToGlobal(pos));
 }
 
+
 void HistoryPanel::openAll()
 {
     QModelIndex index = m_treeView->currentIndex();
@@ -173,10 +176,14 @@ void HistoryPanel::openAll()
 
     if(allChild.length() > 8)
     {
-        if(!(KMessageBox::warningContinueCancel(this, i18n("You are about to open %1 tabs.\nAre you sure  ?", QString::number(allChild.length()))) == KMessageBox::Continue))
+        if( !(KMessageBox::warningContinueCancel(this, 
+                                                i18n("You are about to open %1 tabs.\nAre you sure  ?", 
+                                                QString::number(allChild.length()))) == KMessageBox::Continue)
+          )
             return;
     }
 
     for(int i = 0; i < allChild.length(); i++)
         emit openUrl(allChild.at(i).url(), Rekonq::SettingOpenTab);
 }
+
-- 
cgit v1.2.1


From c5fb79456e9bc46094bddbc5c3375e7d3b4e0a80 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 7 Apr 2010 03:03:05 +0200
Subject: Add Copyright

---
 src/bookmarks/bookmarksmanager.cpp | 1 +
 src/bookmarks/bookmarksmanager.h   | 1 +
 src/bookmarks/bookmarkspanel.cpp   | 1 +
 src/bookmarks/bookmarkspanel.h     | 1 +
 4 files changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 07b0238f..31bf2278 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -5,6 +5,7 @@
 * Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
 * Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 3c21bc67..c8264633 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -5,6 +5,7 @@
 * Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
 * Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
 * Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 6360b313..611031b5 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
 * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 374c48f4..86794d3a 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -4,6 +4,7 @@
 *
 * Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
 * Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
 *
 *
 * This program is free software; you can redistribute it and/or
-- 
cgit v1.2.1


From 43dc2695d62fd2e4fc01aff608bb2af3e8335040 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 8 Apr 2010 02:53:38 +0200
Subject: This is a really big commit, implementing the new urlbar

- removed previous SSL animation, we have now a nice yellow lock :)
- faster and cleaner animations
- reenabled the old stacked widget, to avoid stupid refreshes and fix some regressions
- implemented some "right icons": KGet, SSL, RSS. For now, just SSL is full featured
- clean up the box :) Some old & unuseful files removed, some icons added
- Pano's request: grey text shown everytime in the empty bar

Again and again:
this is not the first, but the second implementation of the new urlbar UI.
About me this is clearly better than the first or the previous.
But it needs love :D

BUG: 230125
BUG: 231015
CCBUG: 228040
BUG: 227272
---
 src/CMakeLists.txt        |   1 -
 src/application.cpp       |   2 +-
 src/data/CMakeLists.txt   |   5 ++-
 src/data/bot.gif          | Bin 644 -> 0 bytes
 src/data/closed.png       | Bin 118 -> 0 bytes
 src/data/kget-icon.png    | Bin 0 -> 743 bytes
 src/data/open.png         | Bin 120 -> 0 bytes
 src/data/rss-icon.png     | Bin 0 -> 794 bytes
 src/data/ssl-icon.png     | Bin 0 -> 780 bytes
 src/data/top.png          | Bin 786 -> 0 bytes
 src/data/webkit-icon.png  | Bin 25694 -> 8121 bytes
 src/mainview.cpp          |  56 +++++++++++++++----------
 src/mainview.h            |   7 ++--
 src/mainwindow.cpp        |   3 +-
 src/protocolhandler.cpp   |  16 +++----
 src/urlbar/iconbutton.cpp |  76 ---------------------------------
 src/urlbar/iconbutton.h   |  51 -----------------------
 src/urlbar/lineedit.cpp   |  97 ++++++++++++++++++++++++++++++++----------
 src/urlbar/lineedit.h     |  36 +++++++++++++---
 src/urlbar/urlbar.cpp     | 104 +++++++++++++++++++++++-----------------------
 src/urlbar/urlbar.h       |   2 -
 src/webpage.cpp           |   3 --
 src/webpage.h             |   3 --
 src/webtab.cpp            |  34 +++++++++++++++
 src/webtab.h              |   7 +++-
 25 files changed, 248 insertions(+), 255 deletions(-)
 delete mode 100644 src/data/bot.gif
 delete mode 100644 src/data/closed.png
 create mode 100644 src/data/kget-icon.png
 delete mode 100644 src/data/open.png
 create mode 100644 src/data/rss-icon.png
 create mode 100644 src/data/ssl-icon.png
 delete mode 100644 src/data/top.png
 delete mode 100644 src/urlbar/iconbutton.cpp
 delete mode 100644 src/urlbar/iconbutton.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73eda88c..102935a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,6 @@ SET( rekonq_KDEINIT_SRCS
     #----------------------------------------
     urlbar/urlbar.cpp
     urlbar/lineedit.cpp
-    urlbar/iconbutton.cpp
     urlbar/completionwidget.cpp
     urlbar/urlresolver.cpp
     urlbar/listitem.cpp
diff --git a/src/application.cpp b/src/application.cpp
index b8d6f52f..3405a1b2 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -398,5 +398,5 @@ void Application::loadResolvedUrl(ThreadWeaver::Job *job)
 void Application::newWindow()
 {
     loadUrl( KUrl("about:home"), Rekonq::NewWindow );
-    mainWindow()->mainView()->urlBar()->setFocus();
+    mainWindow()->mainView()->urlBarWidget()->setFocus();
 }
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 0af92f5e..481f8cda 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,5 +1,8 @@
 INSTALL( 
-    FILES bg2.png bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png category.png button.png
+    FILES 
+    bg2.png bg.png tile.gif category.png button.png
+    busywidget.gif loading.mng  
+    webkit-icon.png rss-icon.png kget-icon.png ssl-icon.png
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
 )
 
diff --git a/src/data/bot.gif b/src/data/bot.gif
deleted file mode 100644
index 2f9abde4..00000000
Binary files a/src/data/bot.gif and /dev/null differ
diff --git a/src/data/closed.png b/src/data/closed.png
deleted file mode 100644
index 2b1bf01e..00000000
Binary files a/src/data/closed.png and /dev/null differ
diff --git a/src/data/kget-icon.png b/src/data/kget-icon.png
new file mode 100644
index 00000000..367d2bca
Binary files /dev/null and b/src/data/kget-icon.png differ
diff --git a/src/data/open.png b/src/data/open.png
deleted file mode 100644
index fee6f3fb..00000000
Binary files a/src/data/open.png and /dev/null differ
diff --git a/src/data/rss-icon.png b/src/data/rss-icon.png
new file mode 100644
index 00000000..46fe641b
Binary files /dev/null and b/src/data/rss-icon.png differ
diff --git a/src/data/ssl-icon.png b/src/data/ssl-icon.png
new file mode 100644
index 00000000..2c71397b
Binary files /dev/null and b/src/data/ssl-icon.png differ
diff --git a/src/data/top.png b/src/data/top.png
deleted file mode 100644
index 9ebf0234..00000000
Binary files a/src/data/top.png and /dev/null differ
diff --git a/src/data/webkit-icon.png b/src/data/webkit-icon.png
index b3ec677a..780b0b16 100644
Binary files a/src/data/webkit-icon.png and b/src/data/webkit-icon.png differ
diff --git a/src/mainview.cpp b/src/mainview.cpp
index b5829806..d5c552f2 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -64,7 +64,7 @@
 
 MainView::MainView(MainWindow *parent)
     : KTabWidget(parent)
-    , m_urlBar(new UrlBar(this))
+    , _bars(new QStackedWidget(this))
     , m_addTabButton(0)
     , m_currentTabIndex(0)
     , m_parentWindow(parent)
@@ -92,6 +92,7 @@ MainView::MainView(MainWindow *parent)
     connect(tabBar, SIGNAL(detachTab(int)),         this,   SLOT(detachTab(int))    );
     
     connect(tabBar, SIGNAL(tabCloseRequested(int)), this,   SLOT(closeTab(int)) );
+    connect(tabBar, SIGNAL(tabMoved(int, int)),     this,   SLOT(movedTab(int, int)) );
     
     // current page index changing
     connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
@@ -119,8 +120,6 @@ void MainView::postLaunch()
 
 void MainView::updateTabButtonPosition()
 {
-    kDebug() << "updating new tab button position..";
-    
     static bool ButtonInCorner = false;
 
     int tabWidgetWidth = frameSize().width();
@@ -151,7 +150,6 @@ void MainView::updateTabButtonPosition()
         // Y position is fixed
         // Here I noticed with some emphiric valutations ( :D )
         // that 2 look better than 0, just that..
-
         m_addTabButton->move(newPosX, 2);
     }
 }
@@ -170,9 +168,15 @@ TabBar *MainView::tabBar() const
 }
 
 
-UrlBar *MainView::urlBar() const 
+UrlBar *MainView::urlBar() const
+{
+    return qobject_cast<UrlBar *>(_bars->widget(m_currentTabIndex));
+}
+
+
+QWidget *MainView::urlBarWidget() const 
 { 
-    return m_urlBar; 
+    return _bars; 
 }
 
 
@@ -238,16 +242,6 @@ void MainView::webStop()
 }
 
 
-void MainView::clear()
-{
-    // FIXME (the programmer, not the code)
-    // What exactly do we need to clear here?
-     m_urlBar->clear();
-
-    m_recentlyClosedTabs.clear();
-}
-
-
 // When index is -1 index chooses the current tab
 void MainView::reloadTab(int index)
 {
@@ -289,7 +283,7 @@ void MainView::currentChanged(int index)
             this, SIGNAL(linkHovered(const QString&)));
 
     emit currentTitle(tab->view()->title());
-    urlBar()->setCurrentTab(tab);
+    _bars->setCurrentIndex(index);
     
     // clean up "status bar"
     emit showStatusBarMessage( QString() );
@@ -326,7 +320,8 @@ WebTab *MainView::webTab(int index) const
 WebTab *MainView::newWebTab(bool focused, bool nearParent)
 {
     WebTab* tab = new WebTab(this);
-
+    UrlBar *bar = new UrlBar(tab);
+    
     // connecting webview with mainview
     connect(tab->view(), SIGNAL(loadStarted()), this, SLOT(webViewLoadStarted()));
     connect(tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webViewLoadFinished(bool)));
@@ -339,10 +334,15 @@ WebTab *MainView::newWebTab(bool focused, bool nearParent)
     connect(tab->view()->page(), SIGNAL(printRequested(QWebFrame *)), this, SIGNAL(printRequested(QWebFrame *)));
     
     if (nearParent)
+    {
         insertTab(currentIndex() + 1, tab, i18n("(Untitled)"));
+        _bars->insertWidget(currentIndex() + 1, bar);
+    }
     else
+    {
         addTab(tab, i18n("(Untitled)"));
-
+        _bars->addWidget(bar);
+    }
     updateTabBar();
     
     if (focused)
@@ -374,7 +374,7 @@ void MainView::newTab()
     default:
         break;
     }
-    urlBar()->setFocus();
+    urlBarWidget()->setFocus();
 }
 
 
@@ -452,8 +452,6 @@ void MainView::cloneTab(int index)
 // When index is -1 index chooses the current tab
 void MainView::closeTab(int index)
 {
-    urlBar()->clear();
-    
     // open default homePage if just one tab is opened
     if (count() == 1)
     {
@@ -463,7 +461,7 @@ void MainView::closeTab(int index)
         case 0: // new tab page
         case 1: // blank page
             w->load( KUrl("about:home") );
-            urlBar()->setFocus();
+            urlBarWidget()->setFocus();
             break;
         case 2: // homepage
             w->load( KUrl(ReKonfig::homePage()) );
@@ -507,6 +505,10 @@ void MainView::closeTab(int index)
     removeTab(index);
     updateTabBar();        // UI operation: do it ASAP!!
     tab->deleteLater();    // tab is scheduled for deletion.
+
+    QWidget *urlbar = _bars->widget(index);
+    _bars->removeWidget(urlbar);
+    urlbar->deleteLater();
     
     emit tabsChanged();
 }
@@ -679,3 +681,11 @@ void MainView::detachTab(int index)
     
     Application::instance()->loadUrl(url, Rekonq::NewWindow);
 }
+
+
+void MainView::movedTab(int from,int to)
+{
+    QWidget *bar = _bars->widget(from);
+    _bars->removeWidget(bar);
+    _bars->insertWidget(to, bar);
+}
diff --git a/src/mainview.h b/src/mainview.h
index fc10c2d9..272cf82e 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -44,6 +44,7 @@
 
 // Qt Includes
 #include <QtGui/QToolButton>
+#include <QStackedWidget>
 
 // Forward Declarations
 class QUrl;
@@ -69,6 +70,7 @@ public:
     MainView(MainWindow *parent);
     ~MainView();
 
+    QWidget *urlBarWidget() const;
     UrlBar *urlBar() const;
     WebTab *webTab(int index) const;
 
@@ -85,7 +87,6 @@ public:
     void setTabBarHidden(bool hide);
     
     QToolButton *addTabButton() const;
-    void clear();
 
     /**
      * This function creates a new empty tab
@@ -146,7 +147,7 @@ private slots:
     void windowCloseRequested();
 
     void postLaunch();
-
+    void movedTab(int,int);
 
 protected:
     virtual void resizeEvent(QResizeEvent *event);
@@ -169,7 +170,7 @@ private:
 
 // --------------------------------------------------------------------------
 
-    UrlBar *m_urlBar;
+    QStackedWidget *_bars;
 
     QString m_loadingGitPath;
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 13adab3d..c49f8e7c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -177,7 +177,7 @@ void MainWindow::setupToolbars()
 
     // location bar
     KAction *urlBarAction = new KAction(this);
-    urlBarAction->setDefaultWidget(m_view->urlBar());
+    urlBarAction->setDefaultWidget(m_view->urlBarWidget());
     m_mainBar->addAction( urlBarAction );
 
     m_mainBar->addAction( actionByName("bookmarksActionMenu") );
@@ -760,7 +760,6 @@ void MainWindow::privateBrowsing(bool enable)
         m_view->urlBar()->setPrivateMode(false);
         
         m_lastSearch.clear();
-        m_view->clear();
         m_view->reloadAllTabs();
     }
 }
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index f6867e81..1458bdf5 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -85,16 +85,14 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
     _url = request.url();
     _frame = frame;
     
-    kDebug() << "URL PROTOCOL: " << _url;
-    
-    // relative urls
-    if(_url.isRelative())
-        return false;
-    
     // "http(s)" (fast) handling
     if( _url.protocol() == QL1S("http") || _url.protocol() == QL1S("https") )
         return false;
-    
+
+    // relative urls
+    if(_url.isRelative())
+        return false;
+        
     // javascript handling
     if( _url.protocol() == QL1S("javascript") )
     {
@@ -148,7 +146,9 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
                 break;
             }
         }
-        
+    
+        Application::instance()->mainWindow()->mainView()->urlBar()->clearRightIcons();
+
         NewTabPage p(frame);
         p.generate(_url);
         return true;
diff --git a/src/urlbar/iconbutton.cpp b/src/urlbar/iconbutton.cpp
deleted file mode 100644
index 60008993..00000000
--- a/src/urlbar/iconbutton.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "iconbutton.h"
-#include "iconbutton.moc"
-
-// Local Includes
-#include "application.h"
-
-// KDE Includes
-#include <KDebug>
-
-
-IconButton::IconButton(QWidget *parent)
-    : QToolButton(parent)
-{
-    QPalette p = palette();
-    p.setColor( QPalette::Button, Qt::transparent );
-    setPalette(p);
-
-    setCursor(Qt::ArrowCursor);
-    setStyleSheet("IconButton { border: none; padding: 0px}");
-}
-
-
-void IconButton::setIconUrl(const KUrl &url, bool trusted)
-{
-    setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    setIcon( Application::icon(url) );
-    setText( url.host() );
-    
-    if(trusted)
-    {
-        setStyleSheet("IconButton { background-color:#0F0; padding: 2px }");
-    }
-    else
-    {
-        setStyleSheet("IconButton { background-color:#F00; padding: 2px}");
-    }
-    
-    adjustSize();
-}
-
-
-void IconButton::updateIcon(KIcon icon)
-{
-    setToolButtonStyle(Qt::ToolButtonIconOnly);
-    setIcon( icon );
-
-    setStyleSheet("IconButton { background-color:transparent; border: none; padding: 0px}");
-    adjustSize();
-}
diff --git a/src/urlbar/iconbutton.h b/src/urlbar/iconbutton.h
deleted file mode 100644
index b66e212b..00000000
--- a/src/urlbar/iconbutton.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy 
-* defined in Section 14 of version 3 of the license.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-
-#ifndef ICON_BUTTON_H
-#define ICON_BUTTON_H
-
-
-// KDE Includes
-#include <KUrl>
-#include <KIcon>
-
-// Qt Includes
-#include <QToolButton>
-
-
-class IconButton : public QToolButton
-{
-    Q_OBJECT
-
-public:
-    IconButton(QWidget *parent = 0);
-
-    void setIconUrl(const KUrl &url, bool trusted);
-    void updateIcon(KIcon icon);
-};
-
-#endif // ICON_BUTTON_H
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index f7af1f61..8e689a46 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -33,6 +33,8 @@
 // KDE Includes
 #include <klocalizedstring.h>
 #include <KDebug>
+#include <KStandardDirs>
+#include <KIconLoader>
 
 // Qt Includes
 #include <QtGui/QContextMenuEvent>
@@ -42,6 +44,18 @@
 #include <QPainter>
 
 
+IconButton::IconButton(QWidget *parent)
+    : QToolButton(parent)
+{
+    setToolButtonStyle(Qt::ToolButtonIconOnly);
+    setStyleSheet("IconButton { background-color:transparent; border: none; padding: 0px}");
+    setCursor(Qt::ArrowCursor);
+}
+
+
+// -----------------------------------------------------------------------------------------------------------
+
+
 LineEdit::LineEdit(QWidget* parent)
     : KLineEdit(parent)
     , _icon( new IconButton(this) )
@@ -49,8 +63,11 @@ LineEdit::LineEdit(QWidget* parent)
     // cosmetic
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setMinimumWidth(200);
-    setMinimumHeight(26);
-    updateStyles();
+    setMinimumHeight(20);
+
+    // initial style
+    _icon->move(4,6);
+    setStyleSheet( QString("LineEdit { padding: 0 0 0 %1px;} ").arg(_icon->sizeHint().width()) );
     
     // doesn't show the clear button
     setClearButtonShown(false);
@@ -75,22 +92,6 @@ LineEdit::~LineEdit()
 }
 
 
-void LineEdit::updateStyles()
-{
-    adjustSize();
-    _icon->adjustSize();
-    if(_icon->toolButtonStyle() == Qt::ToolButtonIconOnly)
-        _icon->move( 4, 3);
-    else
-        _icon->move( 2, 1);
-    
-    int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-    setStyleSheet(QString("LineEdit { padding-left: %1px; } ").arg(_icon->sizeHint().width() + frameWidth + 1));
-
-    update();
-}
-
-
 void LineEdit::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Escape)
@@ -117,18 +118,70 @@ IconButton *LineEdit::iconButton() const
 
 void LineEdit::paintEvent(QPaintEvent *event)
 {
+    // you need this before our code to draw inside the line edit..
     KLineEdit::paintEvent(event);
     
-    if (text().isEmpty() && !hasFocus()) 
-    {
+    if (text().isEmpty()) 
+    {       
         QStyleOptionFrame option;
         initStyleOption(&option);
         QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &option, this);
         QPainter painter(this);
         painter.setPen(Qt::gray);
         painter.drawText( textRect, 
-                          Qt::AlignLeft | Qt::AlignVCenter, 
-                          i18n("Search Bookmarks, History, Google.. and the Kitchen Sink!")
+                          Qt::AlignCenter, 
+                          i18n("Search Bookmarks, History, Google.. just start typing here!")
                         );
     }
 }
+
+
+IconButton *LineEdit::addRightIcon(LineEdit::icon ic)
+{
+    IconButton *rightIcon = new IconButton(this);
+    
+    switch(ic)
+    {
+    case LineEdit::KGet:
+        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/kget-icon.png")) );
+        break;
+    case LineEdit::RSS:
+        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/rss-icon.png")) );
+        break;
+    case LineEdit::SSL:
+        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/ssl-icon.png")) );
+        break;
+    default:
+        kDebug() << "ERROR.. default non extant case!!";
+        break;
+    }
+    
+    _rightIconsList << rightIcon;
+    int iconsCount = _rightIconsList.count();
+    rightIcon->move( width() - 23*iconsCount, 6);
+    rightIcon->show();
+    
+    return rightIcon;
+}
+
+
+void LineEdit::clearRightIcons()
+{
+    qDeleteAll(_rightIconsList);
+    _rightIconsList.clear();
+}
+
+
+void LineEdit::resizeEvent(QResizeEvent *event)
+{
+    KLineEdit::resizeEvent(event);
+    
+    int iconsCount = _rightIconsList.count();
+    int w = width();
+    
+    for(int i = 0; i < iconsCount; ++i)
+    {
+        IconButton *bt = _rightIconsList.at(i);
+        bt->move( w - 23*(i+1), 6);
+    }
+}
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 96f25918..5b8ff2a3 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -30,13 +30,11 @@
 #define LINEEDIT_H
 
 
-// Local Includes
-#include "iconbutton.h"
-
 // KDE Includes
 #include <KLineEdit>
 #include <KIcon>
 
+// Qt Includes
 #include <QToolButton>
 
 // Forward Declarations
@@ -46,25 +44,53 @@ class QKeyEvent;
 class QStyleOptionFrameV2;
 
 
+class IconButton : public QToolButton
+{
+    Q_OBJECT
+
+public:
+    IconButton(QWidget *parent = 0);
+};
+
+
+// ------------------------------------------------------------------------------------
+
+
+// Definitions
+typedef QList<IconButton *> IconButtonPointerList;
+
+
 class LineEdit : public KLineEdit
 {
     Q_OBJECT
 
 public:
+    
+    enum icon
+    { 
+        KGet    = 0x00000001,
+        RSS     = 0x00000010,
+        SSL     = 0x00000100,
+    };   
+
     explicit LineEdit(QWidget *parent = 0);
     virtual ~LineEdit();
     
     IconButton *iconButton() const;
     
-    void updateStyles();
+    void clearRightIcons();
     
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
     virtual void paintEvent(QPaintEvent *);
+    virtual void resizeEvent(QResizeEvent *);
     
+    IconButton *addRightIcon(LineEdit::icon );
+
 private:    
-    IconButton *_icon;    
+    IconButton *_icon;
+    IconButtonPointerList _rightIconsList;
 };
 
 #endif // LINEEDIT_H
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 35934bf4..c5201a1c 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -31,6 +31,9 @@
 #include "urlbar.h"
 #include "urlbar.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
 // Local Includes
 #include "application.h"
 #include "lineedit.h"
@@ -60,6 +63,11 @@ UrlBar::UrlBar(QWidget *parent)
     , _tab(0)
     , _privateMode(false)
 {
+    _tab = qobject_cast<WebTab *>(parent);
+    
+    connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
+    connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
+    
     // load urls on activated urlbar signal
     connect(this, SIGNAL(returnPressed(const QString&)), this, SLOT(activated(const QString&)));
 
@@ -77,19 +85,21 @@ UrlBar::~UrlBar()
 
 void UrlBar::setQUrl(const QUrl& url)
 {
+    // find a better place? Ideally a loadStarted connected slot..
+    clearRightIcons();
+    
     if(url.scheme() == QL1S("about") )
     {
-        iconButton()->updateIcon( KIcon("arrow-right") );
+        iconButton()->setIcon( KIcon("arrow-right") );
+        clear();
         setFocus();
     }
     else
     {
         LineEdit::setUrl(url);
         setCursorPosition(0);
-        iconButton()->updateIcon( Application::icon(url) );
+        iconButton()->setIcon( Application::icon(url) );
     }
-
-    updateStyles();
 }
 
 
@@ -111,7 +121,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
     QColor backgroundColor;
     if( _privateMode )
     {
-        backgroundColor = QColor(192, 192, 192);  // gray
+        backgroundColor = QColor(220, 220, 220);  // light gray
     }
     else
     {
@@ -124,21 +134,16 @@ void UrlBar::paintEvent(QPaintEvent *event)
     int progr = _tab->progress();
     if (progr == 0) 
     {
+        if( _tab->url().scheme() == QL1S("https") )
+        {
+            backgroundColor = QColor(255, 255, 171);  // light yellow
+        }
         p.setBrush(QPalette::Base, backgroundColor);
     } 
     else 
     {
-        QColor loadingColor;
-        if ( _tab->url().scheme() == QLatin1String("https"))
-        {
-            loadingColor = QColor(248, 248, 100);
-        }
-        else
-        {
-            loadingColor = QColor(116, 192, 250);
-        }
-    
-    
+        QColor loadingColor = QColor(116, 192, 250);
+        
         QLinearGradient gradient(0, 0, width(), 0);
         gradient.setColorAt(0, loadingColor);
         gradient.setColorAt(((double)progr)/100, backgroundColor);
@@ -225,54 +230,47 @@ void UrlBar::focusInEvent(QFocusEvent *event)
 }
 
 
-void UrlBar::setCurrentTab(WebTab *tab)
+void UrlBar::setPrivateMode(bool on)
 {
-    if(_tab)
-    {
-        disconnect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
-        disconnect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
-        disconnect(_tab->page(), SIGNAL(validSSLInfo(bool)), this, SLOT(setTrustedHost(bool)));
-        disconnect(iconButton(), SIGNAL(clicked()), _tab->page(), SLOT(showSSLInfo()));
-    }
-    _tab = tab;
-    connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
-    connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
-    connect(_tab->page(), SIGNAL(validSSLInfo(bool)), this, SLOT(setTrustedHost(bool)));
-    connect(iconButton(), SIGNAL(clicked()), _tab->page(), SLOT(showSSLInfo()));
-            
-    // update it now (the first time)
-    updateStyles();
-    _tab->view()->setFocus();
-    setQUrl( _tab->url() );
+    _privateMode = on;
 }
 
 
-void UrlBar::setPrivateMode(bool on)
+void UrlBar::dropEvent(QDropEvent *event)
 {
-    _privateMode = on;
+    LineEdit::dropEvent(event);
+    activated(text());
 }
 
 
 void UrlBar::loadFinished()
 {
-    // show RSS
+    if(_tab->progress() != 0)
+        return;
+    
+    if(_tab->url().scheme() == QL1S("about") )
+        return;
     
     // show KGet downloads??
+    if(ReKonfig::kgetList())
+    {
+        IconButton *bt = addRightIcon(LineEdit::KGet);
+        connect(bt, SIGNAL(clicked()), _tab->page(), SLOT(downloadAllContentsWithKGet()));
+    }
     
-    // last, but not least
-    updateStyles();
-}
-
-
-void UrlBar::setTrustedHost(bool on)
-{
-    kDebug() << "SET TRUSTED HOST..";
-    iconButton()->setIconUrl( _tab->url() , on );
-}
-
-
-void UrlBar::dropEvent(QDropEvent *event)
-{
-    LineEdit::dropEvent(event);
-    activated(text());
+    // show RSS
+    if(_tab->hasRSSInfo())
+    {
+        IconButton *bt = addRightIcon(LineEdit::RSS);
+        connect(bt, SIGNAL(clicked()), _tab, SLOT(showRSSInfo()));
+    }
+    
+    // show SSL
+    if(_tab->url().scheme() == QL1S("https") )
+    {
+        IconButton *bt = addRightIcon(LineEdit::SSL);
+        connect(bt, SIGNAL(clicked()), _tab->page(), SLOT(showSSLInfo()));
+    }
+    
+    update();
 }
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 3b28fb3a..2536c27b 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -57,7 +57,6 @@ public:
     UrlBar(QWidget *parent = 0);
     ~UrlBar();
 
-    void setCurrentTab(WebTab *);
     void setPrivateMode(bool on);
 
 private slots:
@@ -66,7 +65,6 @@ private slots:
     void setQUrl(const QUrl &url);
 
     void loadFinished();
-    void setTrustedHost(bool on);
     
 protected:
     virtual void paintEvent(QPaintEvent *event);
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 8dc0ef96..628b0136 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -304,9 +304,6 @@ void WebPage::loadFinished(bool)
     {
         wallet()->fillFormData(mainFrame());
     }
-
-    if( mainFrame()->url().scheme() == QL1S("https") )
-        emit validSSLInfo( _sslInfo.isValid() );
 }
 
 
diff --git a/src/webpage.h b/src/webpage.h
index 479d0cd3..9583cc22 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -76,9 +76,6 @@ private slots:
     void manageNetworkErrors(QNetworkReply *reply);
     void loadFinished(bool);
     void showSSLInfo();
-
-signals:
-    void validSSLInfo(bool);
     
 private:
     QString errorPage(QNetworkReply *);
diff --git a/src/webtab.cpp b/src/webtab.cpp
index b4e59d84..fd44cc10 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -49,6 +49,7 @@
 #include <KActionMenu>
 #include <KWebView>
 #include <kwebwallet.h>
+#include <KDE/KMessageBox>
 
 // Qt Includes
 #include <QContextMenuEvent>
@@ -59,6 +60,9 @@
 #include <QAction>
 #include <QVBoxLayout>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 WebTab::WebTab(QWidget *parent)
     : QWidget(parent)
@@ -171,3 +175,33 @@ void WebTab::createPreviewSelectorBar(int index)
     connect(page(), SIGNAL(loadFinished(bool)), bar, SLOT(loadFinished()));
     connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), bar, SLOT(verifyUrl()));
 }
+
+
+bool WebTab::hasRSSInfo()
+{
+    _rssList.clear();
+    QWebElementCollection col = page()->mainFrame()->findAllElements("link");
+    foreach(QWebElement el, col)
+    {
+        if( el.attribute("type") == QL1S("application/rss+xml") || el.attribute("type") == QL1S("application/rss+xml") )
+            _rssList << KUrl( el.attribute("href") );
+    }
+    
+    return !_rssList.isEmpty();
+}
+
+
+void WebTab::showRSSInfo()
+{
+    QString urlList = QString("Here are the rss link found: <br /><br />");
+    foreach(const KUrl &url, _rssList)
+    {
+        urlList += QString("<a href=\"") + url.url() + QString("\">") + url.url() + QString("</a><br />");
+    }
+    urlList += QString("<br />Enough for now.. waiting for some cool akonadi based feeds management :)");
+    
+    KMessageBox::information( view(), 
+                              urlList,
+                              "RSS Management"
+                            );
+}
diff --git a/src/webtab.h b/src/webtab.h
index 9837cd63..9054a7c1 100644
--- a/src/webtab.h
+++ b/src/webtab.h
@@ -57,15 +57,20 @@ public:
 
     int progress();
     void createPreviewSelectorBar(int index);
+
+    bool hasRSSInfo();
     
 private slots:
     void updateProgress(int progress);
     void loadFinished(bool);
 
     void createWalletBar(const QString &, const QUrl &);
-
+    void showRSSInfo();
+    
 private:
     int m_progress;
+    
+    KUrl::List _rssList;
 };
 
 #endif
-- 
cgit v1.2.1


From ae4d9f2741f489e926217368fda4e19d33ae2969 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Thu, 8 Apr 2010 22:32:41 +0200
Subject: Focus again the line edit of the find bar when Ctrl + F is pressed
 and the find bar is already shown. Fix bug 233706

---
 src/findbar.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 7cbe9d17..43612fc7 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -143,15 +143,14 @@ bool FindBar::highlightAllState() const
 void FindBar::show()
 {
     // show findbar if not visible
-    if (isVisible())
-        return;
-    
-    QWidget::show();
+    if(isHidden())
+    {
+        QWidget::show();
+        emit searchString(m_lineEdit->text());
+    }
+
     m_hideTimer->start(60000);
-    
-    // emit a new find signal with the current text
-    emit(searchString(m_lineEdit->text()));
-    
+            
     // set focus to findbar if user select showFindBar shortcut
     m_lineEdit->setFocus();
     m_lineEdit->selectAll();
-- 
cgit v1.2.1


From 2000e8acb0e5f851dfc4024b48c7f08610fc857e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 9 Apr 2010 00:57:44 +0200
Subject: Re-enabling all KDE url magics

---
 src/application.cpp | 82 ++++++++++++++++++++++++++++-------------------------
 src/application.h   |  2 ++
 2 files changed, 46 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 3405a1b2..48264440 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -289,53 +289,23 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
     if (url.isEmpty())
         return;
 
-    // sanitization
-    KUrl loadingUrl( url.toEncoded() );
-
-    if ( !loadingUrl.isValid() )
+    if ( !url.isValid() )
     {
-        KMessageBox::error(0, i18n("Malformed URL:\n%1", loadingUrl.url(KUrl::RemoveTrailingSlash)));
+        KMessageBox::error(0, i18n("Malformed URL:\n%1", url.url(KUrl::RemoveTrailingSlash)));
         return;
     }
 
-    // first, create the webview(s) to not let hangs UI..
-    WebTab *tab = 0;
-    MainWindow *w = 0;
-    w = (type == Rekonq::NewWindow) 
-        ? newMainWindow()
-        : mainWindow();
-        
-    switch(type)
-    {
-    case Rekonq::SettingOpenTab:
-        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewCurrentTab:
-        tab = w->mainView()->newWebTab(true);
-        break;
-    case Rekonq::NewBackTab:
-        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewWindow:
-    case Rekonq::CurrentTab:
-        tab = w->mainView()->currentWebTab();
-        break;
-    };
-    
-    WebView *view = tab->view();
-    
-    if (view)
-    {
-        FilterUrlJob *job = new FilterUrlJob(view, loadingUrl.pathOrUrl(), this);
-        Weaver::instance()->enqueue(job);
-    }
+    prepareLoading(url.pathOrUrl(), type);
 }
 
 
 
 void Application::loadUrl(const QString& urlString,  const Rekonq::OpenType& type)
-{    
-    return loadUrl( QUrl::fromUserInput(urlString), type );
+{
+    if(urlString.isEmpty())
+        return;
+
+    prepareLoading(urlString, type);
 }
 
 
@@ -400,3 +370,39 @@ void Application::newWindow()
     loadUrl( KUrl("about:home"), Rekonq::NewWindow );
     mainWindow()->mainView()->urlBarWidget()->setFocus();
 }
+
+
+void Application::prepareLoading(const QString& urlString, const Rekonq::OpenType& type)
+{
+    // first, create the webview(s) to not let hangs UI..
+    WebTab *tab = 0;
+    MainWindow *w = 0;
+    w = (type == Rekonq::NewWindow) 
+        ? newMainWindow()
+        : mainWindow();
+        
+    switch(type)
+    {
+    case Rekonq::SettingOpenTab:
+        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewCurrentTab:
+        tab = w->mainView()->newWebTab(true);
+        break;
+    case Rekonq::NewBackTab:
+        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewWindow:
+    case Rekonq::CurrentTab:
+        tab = w->mainView()->currentWebTab();
+        break;
+    };
+    
+    WebView *view = tab->view();
+    
+    if (view)
+    {
+        FilterUrlJob *job = new FilterUrlJob(view, urlString, this);
+        Weaver::instance()->enqueue(job);
+    }
+}
diff --git a/src/application.h b/src/application.h
index 4340b004..760f7943 100644
--- a/src/application.h
+++ b/src/application.h
@@ -141,6 +141,8 @@ private slots:
     void loadResolvedUrl(ThreadWeaver::Job *);
     
 private:
+    void prepareLoading(const QString& urlString, const Rekonq::OpenType& type);
+    
     static QWeakPointer<HistoryManager> s_historyManager;
     static QWeakPointer<BookmarkProvider> s_bookmarkProvider;
     static QWeakPointer<SessionManager> s_sessionManager;
-- 
cgit v1.2.1


From 49faf17ac19b0ff351f7c7812e8d1f85d7cf82fc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 9 Apr 2010 01:09:17 +0200
Subject: Using oxygen icons, removing the other ones and adding some tooltips
 there :)

---
 src/data/CMakeLists.txt |   2 +-
 src/data/kget-icon.png  | Bin 743 -> 0 bytes
 src/data/rss-icon.png   | Bin 794 -> 0 bytes
 src/data/ssl-icon.png   | Bin 780 -> 0 bytes
 src/urlbar/lineedit.cpp |   9 ++++++---
 5 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 src/data/kget-icon.png
 delete mode 100644 src/data/rss-icon.png
 delete mode 100644 src/data/ssl-icon.png

(limited to 'src')

diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 481f8cda..6ff3fefd 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -2,7 +2,7 @@ INSTALL(
     FILES 
     bg2.png bg.png tile.gif category.png button.png
     busywidget.gif loading.mng  
-    webkit-icon.png rss-icon.png kget-icon.png ssl-icon.png
+    webkit-icon.png
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
 )
 
diff --git a/src/data/kget-icon.png b/src/data/kget-icon.png
deleted file mode 100644
index 367d2bca..00000000
Binary files a/src/data/kget-icon.png and /dev/null differ
diff --git a/src/data/rss-icon.png b/src/data/rss-icon.png
deleted file mode 100644
index 46fe641b..00000000
Binary files a/src/data/rss-icon.png and /dev/null differ
diff --git a/src/data/ssl-icon.png b/src/data/ssl-icon.png
deleted file mode 100644
index 2c71397b..00000000
Binary files a/src/data/ssl-icon.png and /dev/null differ
diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index 8e689a46..059a0178 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -143,13 +143,16 @@ IconButton *LineEdit::addRightIcon(LineEdit::icon ic)
     switch(ic)
     {
     case LineEdit::KGet:
-        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/kget-icon.png")) );
+        rightIcon->setIcon( KIcon("download") );
+        rightIcon->setToolTip( i18n("List all links with KGet") );
         break;
     case LineEdit::RSS:
-        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/rss-icon.png")) );
+        rightIcon->setIcon( KIcon("application-rss+xml") );
+        rightIcon->setToolTip( i18n("List all available RSS feeds") );
         break;
     case LineEdit::SSL:
-        rightIcon->setIcon( QIcon(KStandardDirs::locate("data", "rekonq/pics/ssl-icon.png")) );
+        rightIcon->setIcon( KIcon("object-locked") );
+        rightIcon->setToolTip( i18n("Show SSL Infos") );
         break;
     default:
         kDebug() << "ERROR.. default non extant case!!";
-- 
cgit v1.2.1


From 7fedb0bcaf32ca5cb1de9e4815de08df7098426b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 9 Apr 2010 02:06:33 +0200
Subject: Fixing icons position and saving a couple of moveEvents

---
 src/urlbar/lineedit.cpp | 11 +++++++----
 src/urlbar/urlbar.cpp   |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index 059a0178..09c158fa 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -63,10 +63,9 @@ LineEdit::LineEdit(QWidget* parent)
     // cosmetic
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setMinimumWidth(200);
-    setMinimumHeight(20);
+    setMinimumHeight(26);
 
     // initial style
-    _icon->move(4,6);
     setStyleSheet( QString("LineEdit { padding: 0 0 0 %1px;} ").arg(_icon->sizeHint().width()) );
     
     // doesn't show the clear button
@@ -177,7 +176,8 @@ void LineEdit::clearRightIcons()
 
 void LineEdit::resizeEvent(QResizeEvent *event)
 {
-    KLineEdit::resizeEvent(event);
+    int newHeight = ( height() - 19 )/2;
+    _icon->move(4, newHeight );
     
     int iconsCount = _rightIconsList.count();
     int w = width();
@@ -185,6 +185,9 @@ void LineEdit::resizeEvent(QResizeEvent *event)
     for(int i = 0; i < iconsCount; ++i)
     {
         IconButton *bt = _rightIconsList.at(i);
-        bt->move( w - 23*(i+1), 6);
+        bt->move( w - 25*(i+1), newHeight );
     }
+
+    KLineEdit::resizeEvent(event);
+
 }
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index c5201a1c..adc011f0 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -249,7 +249,10 @@ void UrlBar::loadFinished()
         return;
     
     if(_tab->url().scheme() == QL1S("about") )
+    {
+        update();
         return;
+    }
     
     // show KGet downloads??
     if(ReKonfig::kgetList())
-- 
cgit v1.2.1


From a6b8d5b899d71df421bdf0d6ac6433e025f90b26 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Fri, 9 Apr 2010 09:04:39 +0200
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index fc42e1dd..a1cdf988 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -6,6 +6,7 @@ Name[de]=rekonq
 Name[en_GB]=rekonq
 Name[ga]=rekonq
 Name[nds]=Rekonq
+Name[pl]=rekonq
 Name[pt]=rekonq
 Name[pt_BR]=rekonq
 Name[sv]=Rekonq
@@ -18,6 +19,7 @@ GenericName[de]=WebKit-basierter Webbrowser für KDE
 GenericName[en_GB]=Webkit KDE Browser
 GenericName[ga]=Brabhsálaí Webkit KDE
 GenericName[nds]=Webkit-KDE-Kieker
+GenericName[pl]=Przeglądarka Webkit dla KDE
 GenericName[pt]=Navegador do KDE usando o WebKit
 GenericName[pt_BR]=Navegador Webkit do KDE
 GenericName[sv]=Webkit webbläsare för KDE
-- 
cgit v1.2.1


From e893e3ac421bc01c0931aa7a30acbec194f2c050 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Fri, 9 Apr 2010 16:36:26 +0200
Subject: Remove trailing space

---
 src/findbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 43612fc7..48a3c4e0 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -150,7 +150,7 @@ void FindBar::show()
     }
 
     m_hideTimer->start(60000);
-            
+    
     // set focus to findbar if user select showFindBar shortcut
     m_lineEdit->setFocus();
     m_lineEdit->selectAll();
-- 
cgit v1.2.1


From 5f4f46a2ca51cd2d05a7c3cbb082f395462c7f7f Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 9 Apr 2010 18:11:00 +0200
Subject: Better datetime for downloads page

---
 src/newtabpage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index e2837f94..043648e7 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -49,6 +49,7 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDialog>
+#include <KCalendarSystem>
 
 // Qt Includes
 #include <QFile>
@@ -539,7 +540,8 @@ void NewTabPage::downloadsPage()
         
         div.appendInside("<strong>" + fName + "</strong>");
         div.appendInside(" - ");
-        div.appendInside( item.dateTime.toString("'<em>'dd MMMM yyyy hh:mm'</em>'") );
+        QString date = KGlobal::locale()->formatDateTime(item.dateTime, KLocale::FancyLongDate);
+        div.appendInside("<em>" + date + "</em>");
         div.appendInside("<br/>");
         
         div.appendInside(item.srcUrlString);
-- 
cgit v1.2.1


From 7e81a6735dccfd66193b08bcdd0dcde5fdd999c7 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 9 Apr 2010 19:01:59 +0200
Subject: Do not save infos about canceled downloads

---
 src/webpage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 628b0136..65dda0a0 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -445,12 +445,12 @@ void WebPage::downloadRequest(const QNetworkRequest &request)
     } 
     while ( result == KIO::R_CANCEL && destUrl.isValid() );                                                                               
     
-    // now store data
-    // now, destUrl, srcUrl
-    Application::historyManager()->addDownload( srcUrl.pathOrUrl() , destUrl.pathOrUrl() );
-    
     if ( result == KIO::R_OVERWRITE && destUrl.isValid() ) 
-    {                                               
+    {                                   
+        // now store data
+        // now, destUrl, srcUrl
+        Application::historyManager()->addDownload( srcUrl.pathOrUrl() , destUrl.pathOrUrl() );
+        
         if ( ReKonfig::kgetDownload() )
         {
             //KGet integration:
-- 
cgit v1.2.1


From 23d65a3a5c1e6c0e2501d41ae0660c89085dbb84 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 10 Apr 2010 00:35:01 +0200
Subject: Fix focus problems and trim search strings (fix encodings problems,
 step 1)

---
 src/mainview.cpp      | 10 ++++++++--
 src/urlbar/urlbar.cpp |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index d5c552f2..a5eaa748 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -61,6 +61,9 @@
 #include <QWidget>
 #include <QVBoxLayout>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 MainView::MainView(MainWindow *parent)
     : KTabWidget(parent)
@@ -300,7 +303,10 @@ void MainView::currentChanged(int index)
         Application::instance()->mainWindow()->setZoomSliderFactor(tab->view()->zoomFactor());
 
     // set focus to the current webview
-    tab->view()->setFocus();
+    if(tab->url().scheme() == QL1S("about"))
+        _bars->currentWidget()->setFocus();
+    else
+        tab->view()->setFocus();
 }
 
 
@@ -374,7 +380,7 @@ void MainView::newTab()
     default:
         break;
     }
-    urlBarWidget()->setFocus();
+    _bars->currentWidget()->setFocus();
 }
 
 
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index adc011f0..6f916482 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -112,7 +112,7 @@ void UrlBar::activated(const QString& urlString, Rekonq::OpenType type)
 
     clearFocus();
     setText(urlString);
-    Application::instance()->loadUrl(urlString, type);
+    Application::instance()->loadUrl(urlString.trimmed(), type);
 }
 
 
-- 
cgit v1.2.1


From c94d51b54d9e69ba03e10c91649f366e0102ee7e Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Sat, 10 Apr 2010 11:38:47 +0200
Subject: Improved "Clear Private Data" dialog appearance Not a Qt::sheet : use
 a gradient for background Add Caption Descriptive button text <h3> "clear the
 following items" Spacers

---
 src/cleardata.ui   | 36 ++++++++++++++++++++++++++++++++----
 src/mainwindow.cpp |  6 +++++-
 2 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/cleardata.ui b/src/cleardata.ui
index 7de7543f..effb2d7e 100644
--- a/src/cleardata.ui
+++ b/src/cleardata.ui
@@ -2,12 +2,15 @@
 <ui version="4.0">
  <class>ClearDataWidget</class>
  <widget class="QWidget" name="ClearDataWidget">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>260</width>
-    <height>208</height>
+    <width>245</width>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,11 +19,33 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
-      <string>Clear the following items:</string>
+      <string>&lt;h3&gt;Clear the following items:&lt;/h3&gt;</string>
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QCheckBox" name="clearHistory">
      <property name="text">
@@ -86,10 +111,13 @@
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>15</height>
       </size>
      </property>
     </spacer>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c49f8e7c..c8794664 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1169,8 +1169,12 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
 
 void MainWindow::clearPrivateData()
 {
-    QWeakPointer<KDialog> dialog = new KDialog(this, Qt::Sheet);
+    QWeakPointer<KDialog> dialog = new KDialog(this);
+    dialog.data()->setCaption(i18n("Clear Private Data"));
     dialog.data()->setButtons(KDialog::Ok | KDialog::Cancel);
+    
+    dialog.data()->button(KDialog::Ok)->setIcon(KIcon("edit-clear"));
+    dialog.data()->button(KDialog::Ok)->setText(i18n("Clear"));
 
     Ui::ClearDataWidget clearWidget;
     QWidget widget;
-- 
cgit v1.2.1


From 8e7ae730edbbe3643b3549b5fb35be5c278a714b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 11 Apr 2010 12:32:29 +0200
Subject: Removing overkilling WeakPointer from data clean dialog and fixing a
 memory leak there..

---
 src/mainwindow.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c8794664..56b69cc6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1169,20 +1169,20 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
 
 void MainWindow::clearPrivateData()
 {
-    QWeakPointer<KDialog> dialog = new KDialog(this);
-    dialog.data()->setCaption(i18n("Clear Private Data"));
-    dialog.data()->setButtons(KDialog::Ok | KDialog::Cancel);
+    QPointer<KDialog> dialog = new KDialog(this);
+    dialog->setCaption(i18n("Clear Private Data"));
+    dialog->setButtons(KDialog::Ok | KDialog::Cancel);
     
-    dialog.data()->button(KDialog::Ok)->setIcon(KIcon("edit-clear"));
-    dialog.data()->button(KDialog::Ok)->setText(i18n("Clear"));
+    dialog->button(KDialog::Ok)->setIcon(KIcon("edit-clear"));
+    dialog->button(KDialog::Ok)->setText(i18n("Clear"));
 
     Ui::ClearDataWidget clearWidget;
     QWidget widget;
     clearWidget.setupUi(&widget);
 
-    dialog.data()->setMainWidget(&widget);
+    dialog->setMainWidget(&widget);
 
-    if (dialog.data()->exec() == KDialog::Accepted)
+    if (dialog->exec() == KDialog::Ok)
     {
         if(clearWidget.clearHistory->isChecked())
         {
@@ -1223,6 +1223,8 @@ void MainWindow::clearPrivateData()
             }
         }
     }
+    
+    dialog->deleteLater();
 }
 
 
-- 
cgit v1.2.1


From 138801dfa40b1bbbbbf0ce6a5bd8e04977b9ccdc Mon Sep 17 00:00:00 2001
From: pano <pano@arch.localdomain>
Date: Sun, 11 Apr 2010 12:55:15 +0200
Subject: fix strings

---
 src/urlbar/urlresolver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index ff90ce14..5f025cb5 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -187,12 +187,12 @@ UrlSearchList UrlResolver::webSearchesResolution()
     {
         // KUriFilter has the worst performance possible here and let this trick unusable
         QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(url1);
-        QString gTitle = i18n("Search Google for ") + url1;
+        QString gTitle = i18n("Search Google for %1", url1);
         UrlSearchItem gItem(UrlSearchItem::Search, gUrl, gTitle, QString("http://www.google.com") );
         list << gItem;
         
 //         QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
-//         QString wTitle = i18n("Search Wikipedia for ") + url1;
+//         QString wTitle = i18n("Search Wikipedia for %1", url1);
 //         UrlSearchItem wItem(wUrl, wTitle, QString("http://wikipedia.org") );
 //         list << wItem;
     }
-- 
cgit v1.2.1


From d2b1a62a0ecdd286b9d83275170a3322ffafd32c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 12 Apr 2010 02:00:13 +0200
Subject: URLBAR ANIMATION: implementation fix

This commit follows the logic explained somewhere else, moving rekonq
to a better management for urls from user input.
1) users type strings --> we store them in QStrings
2) app load urls --> we should ever work with KUrls, trying to guess users needs

Here I also removed the unuseful QString icon from UrlSearchItem definition, as we
just have a type (Search, Browse, History, Books..), a (k)url and an Application::icon
method :)
---
 src/urlbar/completionwidget.h |  2 +-
 src/urlbar/listitem.cpp       | 57 +++++++++++++++++--------------------------
 src/urlbar/listitem.h         |  6 +++--
 src/urlbar/urlbar.cpp         | 11 +++------
 src/urlbar/urlbar.h           |  2 +-
 src/urlbar/urlresolver.cpp    | 34 +++++++++-----------------
 src/urlbar/urlresolver.h      | 10 +++++---
 7 files changed, 51 insertions(+), 71 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index a714bb17..ab78e489 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -58,7 +58,7 @@ private slots:
     void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton);
 
 signals:
-    void chosenUrl(const QString&, Rekonq::OpenType);
+    void chosenUrl(const KUrl &, Rekonq::OpenType);
 
 private:
     void sizeAndPosition();
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 959db360..91af352b 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -35,6 +35,7 @@
 #include <KIcon>
 #include <KStandardDirs>
 #include <KDebug>
+#include <KUrl>
 
 // Qt Includes
 #include <QHBoxLayout>
@@ -45,12 +46,10 @@
 #include <QStylePainter>
 #include <QFile>
 #include <QMouseEvent>
-#include <QWebSettings>
 
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent)
-    , m_option()
 {
     //preview and icon
     
@@ -60,7 +59,9 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     previewLabelIcon->setFixedSize(45,33);
     hLayout->addWidget(previewLabelIcon);
 
-    QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(item.url)).pixmap(16);
+    // pixmap should ever exists
+    QPixmap pixmapIcon = Application::icon(item.url).pixmap(16);
+    
     QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(item.url) + ".png", true);
     if(QFile::exists(path))
     {
@@ -68,35 +69,23 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
         previewLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
         QPixmap preview;
         preview.load(path);
-        if (!pixmapIcon.isNull())
-        {
-            previewLabel->setFixedSize(38,29);
-            previewLabel->setPixmap(preview.scaled(38,29, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-        }
-        else
-        {
-            previewLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-            previewLabel->setFixedSize(45,33);
-            previewLabel->setPixmap(preview.scaled(45,33, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));  
-        }
+        
+        previewLabel->setFixedSize(38,29);
+        previewLabel->setPixmap(preview.scaled(38,29, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
     } 
 
-    if (!pixmapIcon.isNull())
-    {
-        QLabel *iconLabel = new QLabel(previewLabelIcon);
-        iconLabel->setPixmap(pixmapIcon);
-        iconLabel->move(27, 16);
-    }
-    
-    //title and url
+    QLabel *iconLabel = new QLabel(previewLabelIcon);
+    iconLabel->setPixmap(pixmapIcon);
+    iconLabel->move(27, 16);
     
+    //title and url    
     QVBoxLayout *vLayout = new QVBoxLayout;  
     hLayout->addLayout(vLayout);
     
     QLabel *titleLabel = new QLabel("<b>" + item.title + "</b>");
     titleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     
-    QLabel *urlLabel = new QLabel("<i>" + item.url + "</i>");
+    QLabel *urlLabel = new QLabel("<i>" + item.url.url() + "</i>");
     urlLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         
     vLayout->addWidget(titleLabel);
@@ -126,8 +115,8 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
 
     setLayout(hLayout);
     
-    m_option.initFrom(this);
-    m_option.direction = Qt::LeftToRight;
+    _option.initFrom(this);
+    _option.direction = Qt::LeftToRight;
     
     deactivate();
 }
@@ -150,9 +139,9 @@ void ListItem::insertIcon(QLayout *layout, QString icon)
 
 
 //TODO: REMOVE DUPLICATE CODE WITH PREVIEWIMAGE
-QString ListItem::guessNameFromUrl(QUrl url)
+QString ListItem::guessNameFromUrl(KUrl url)
 {
-    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
+    QString name = url.url();// toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
     
     // TODO learn Regular Expressions :)
     // and implement something better here..
@@ -171,14 +160,14 @@ QString ListItem::guessNameFromUrl(QUrl url)
 
 void ListItem::activate()
 {
-    m_option.state |= QStyle::State_Selected;
+    _option.state |= QStyle::State_Selected;
     update();
 }
 
 
 void ListItem::deactivate()
 {
-    m_option.state  &= ~QStyle::State_Selected;
+    _option.state  &= ~QStyle::State_Selected;
     update();
 }
 
@@ -187,18 +176,18 @@ void ListItem::paintEvent(QPaintEvent *event)
 {
     Q_UNUSED(event);
     
-    if( m_option.state.testFlag(QStyle::State_Selected) ||  m_option.state.testFlag(QStyle::State_MouseOver))
+    if( _option.state.testFlag(QStyle::State_Selected) ||  _option.state.testFlag(QStyle::State_MouseOver) )
     {
         QPainter painter(this);
-        m_option.rect=QRect(QPoint(),size());
-        style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &m_option, &painter, this);
+        _option.rect = QRect(QPoint(),size());
+        style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &_option, &painter, this);
     }
 }
 
 
 void ListItem::enterEvent(QEvent *e)
 {
-    m_option.state |= QStyle::State_MouseOver;
+    _option.state |= QStyle::State_MouseOver;
     update();
     QWidget::enterEvent(e);
 }
@@ -206,7 +195,7 @@ void ListItem::enterEvent(QEvent *e)
 
 void ListItem::leaveEvent(QEvent *e)
 {
-    m_option.state &= ~QStyle::State_MouseOver;
+    _option.state &= ~QStyle::State_MouseOver;
     update();
     QWidget::enterEvent(e);
 }
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index de22d739..1b594115 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -31,6 +31,7 @@
 
 // Forward Declarations
 class UrlSearchItem;
+class KUrl;
 
 
 class ListItem : public QWidget
@@ -54,7 +55,8 @@ protected:
    virtual void mousePressEvent(QMouseEvent *e);
 
 private:
-    QStyleOptionViewItemV4 m_option;
-    QString guessNameFromUrl(QUrl url);
+    QString guessNameFromUrl(KUrl url);
     void insertIcon(QLayout *layout, QString icon);
+    
+    QStyleOptionViewItemV4 _option;
 };
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 6f916482..3b79b06b 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -73,7 +73,7 @@ UrlBar::UrlBar(QWidget *parent)
 
     // suggestions
     installEventFilter(_box);
-    connect(_box, SIGNAL(chosenUrl(const QString&, Rekonq::OpenType)), SLOT(activated(const QString&, Rekonq::OpenType)));
+    connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
 }
 
 
@@ -103,16 +103,13 @@ void UrlBar::setQUrl(const QUrl& url)
 }
 
 
-void UrlBar::activated(const QString& urlString, Rekonq::OpenType type)
+void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
 {
     disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
-    if (urlString.isEmpty())
-        return;
-
     clearFocus();
-    setText(urlString);
-    Application::instance()->loadUrl(urlString.trimmed(), type);
+    setUrl(url);
+    Application::instance()->loadUrl(url, type);
 }
 
 
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 2536c27b..a473638b 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -60,7 +60,7 @@ public:
     void setPrivateMode(bool on);
 
 private slots:
-    void activated(const QString& url, Rekonq::OpenType = Rekonq::CurrentTab);
+    void activated(const KUrl& url, Rekonq::OpenType = Rekonq::CurrentTab);
     void suggestUrls(const QString &editedText);
     void setQUrl(const QUrl &url);
 
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 5f025cb5..4ff6b461 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -60,7 +60,7 @@ bool UrlSearchItem::operator==(UrlSearchItem i)
 }
 
 UrlResolver::UrlResolver(const QString &typedUrl)
-    : _urlString(typedUrl)
+    : _urlString( typedUrl.trimmed() )
 {
 }
 
@@ -162,15 +162,10 @@ UrlSearchList UrlResolver::qurlFromUserInputResolution()
     QUrl urlFromUserInput = QUrl::fromUserInput(url2);
     if(urlFromUserInput.isValid())
     {
-        QByteArray ba = urlFromUserInput.toEncoded();
-        if(!ba.isEmpty())
-        {           
-            QString gUrl = QString(ba);
-            QString gTitle = i18n("Browse");
-            UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle, QString("") );
-            list << gItem;
-
-        }
+        KUrl gUrl(urlFromUserInput);
+        QString gTitle = i18n("Browse");
+        UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle);
+        list << gItem;
     }
     
     return list;
@@ -182,19 +177,14 @@ UrlSearchList UrlResolver::webSearchesResolution()
 {
     UrlSearchList list;
     
-    QString url1 = _urlString;
-    if(KUrl(url1).isRelative())
+    KUrl url1(_urlString);
+    if(url1.isRelative())
     {
         // KUriFilter has the worst performance possible here and let this trick unusable
-        QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(url1);
-        QString gTitle = i18n("Search Google for %1", url1);
-        UrlSearchItem gItem(UrlSearchItem::Search, gUrl, gTitle, QString("http://www.google.com") );
+        KUrl gUrl( QString("gg:") + _urlString );
+        QString gTitle = i18n("Search Google for %1", _urlString);
+        UrlSearchItem gItem(UrlSearchItem::Search, gUrl, gTitle );
         list << gItem;
-        
-//         QString wUrl = QString("http://en.wikipedia.org/wiki/Special:Search?search=%1&go=Go").arg(url1);
-//         QString wTitle = i18n("Search Wikipedia for %1", url1);
-//         UrlSearchItem wItem(wUrl, wTitle, QString("http://wikipedia.org") );
-//         list << wItem;
     }
 
     return list;
@@ -210,7 +200,7 @@ UrlSearchList UrlResolver::historyResolution()
     QStringList historyResults = historyCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, historyResults)
     {
-        UrlSearchItem it(UrlSearchItem::History, s, Application::historyManager()->titleForHistoryUrl(s), QString("view-history"));
+        UrlSearchItem it(UrlSearchItem::History, KUrl(s), Application::historyManager()->titleForHistoryUrl(s) ); //, QString("view-history"));
         list << it;
     }
 
@@ -227,7 +217,7 @@ UrlSearchList UrlResolver::bookmarksResolution()
     QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, bookmarkResults)
     {
-        UrlSearchItem it(UrlSearchItem::Bookmark, s, Application::bookmarkProvider()->titleForBookmarkUrl(s), QString("rating") );
+        UrlSearchItem it(UrlSearchItem::Bookmark, KUrl(s), Application::bookmarkProvider()->titleForBookmarkUrl(s) ); //, QString("rating") );
         list << it;
     }
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 489a5a79..3c082e00 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -28,6 +28,9 @@
 #define URL_RESOLVER_H
 
 
+// KDE Includes
+#include <KUrl>
+
 // Qt Includes
 #include <QString>
 #include <QList>
@@ -48,12 +51,11 @@ class UrlSearchItem
     };   
 
     int type;
-    QString url;
+    KUrl url;
     QString title;
-    QString icon;
 
-    UrlSearchItem(const int &_type, const QString &_url, const QString &_title = QString(), const QString &_icon = QString())
-        : type(_type), url(_url), title(_title), icon(_icon)
+    UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString())
+        : type(_type), url(_url), title(_title)
     {};
     
     bool operator==(UrlSearchItem i);
-- 
cgit v1.2.1


From eb52521b43669aab1c38ab9872a53386b776662d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 13 Apr 2010 03:01:42 +0200
Subject: This commit is (quite) last in the urlbar encodings fix series. It
 fixes: BUG: 233159 BUG: 234168 Moreover it "cleans" road to fix (not yet, but
 we are near..) another bug CCBUG: 230771 at least from the rekonq side.

Changes in there
- cleaning and fixing filterurljob class (responsible for the encodings)
- using urls instead of strings in the resolver class (work with right data..)
- letting first box appearance without item selection and adding one signal to use
the filterurljob class directly.
---
 src/filterurljob.cpp            | 11 ++++++++---
 src/urlbar/completionwidget.cpp |  6 ++++--
 src/urlbar/completionwidget.h   |  3 ++-
 src/urlbar/urlbar.cpp           | 13 +++++++++++--
 src/urlbar/urlbar.h             |  2 +-
 5 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp
index e74f8ec8..f94b7810 100644
--- a/src/filterurljob.cpp
+++ b/src/filterurljob.cpp
@@ -58,7 +58,12 @@ void FilterUrlJob::run()
     // the beautiful KDE web browsing shortcuts
     KUriFilterData data(_urlString);
     data.setCheckForExecutables(false); // if true, queries like "rekonq" or "dolphin" are considered as executables
-    _url = KUriFilter::self()->filterUri(data) 
-        ? data.uri().pathOrUrl() 
-        : QUrl::fromUserInput( _urlString );
+
+    if(KUriFilter::self()->filterUri(data) && data.uriType() != KUriFilterData::Error)
+    {
+        QString tempUrlString = data.uri().url();
+        _url = KUrl(tempUrlString);
+    }
+    else
+        _url = QUrl::fromUserInput( _urlString );
 }
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 740f1471..0733b1f0 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -97,7 +97,6 @@ void CompletionWidget::sizeAndPosition()
 
 void CompletionWidget::popup()
 {
-    down();
     sizeAndPosition();
     if (!isVisible()) 
         show();
@@ -210,7 +209,10 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
                         hide();
-                        emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
+                        if(_currentIndex >= 0)
+                            emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
+                        else
+                            emit loadTypedUrl();
                         ev->accept();
                         return true;
                     break;
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index ab78e489..57a8bed0 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -59,7 +59,8 @@ private slots:
 
 signals:
     void chosenUrl(const KUrl &, Rekonq::OpenType);
-
+    void loadTypedUrl();
+    
 private:
     void sizeAndPosition();
     void up();
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 3b79b06b..5423e5d0 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -74,6 +74,7 @@ UrlBar::UrlBar(QWidget *parent)
     // suggestions
     installEventFilter(_box);
     connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
+    connect(_box, SIGNAL(loadTypedUrl()), this, SLOT(activated()));
 }
 
 
@@ -108,8 +109,16 @@ void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
     disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
     clearFocus();
-    setUrl(url);
-    Application::instance()->loadUrl(url, type);
+    KUrl loadingUrl;
+    
+    if(url.isEmpty())
+        loadingUrl = KUrl(text());
+    else
+        loadingUrl = url;
+    
+    setUrl(loadingUrl);
+    
+    Application::instance()->loadUrl(loadingUrl, type);
 }
 
 
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index a473638b..684a205e 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -60,7 +60,7 @@ public:
     void setPrivateMode(bool on);
 
 private slots:
-    void activated(const KUrl& url, Rekonq::OpenType = Rekonq::CurrentTab);
+    void activated(const KUrl& url = KUrl(), Rekonq::OpenType = Rekonq::CurrentTab);
     void suggestUrls(const QString &editedText);
     void setQUrl(const QUrl &url);
 
-- 
cgit v1.2.1


From 9997ffeb38ccafa26ed54b5c9033f0de96f088b8 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Tue, 13 Apr 2010 09:00:38 +0200
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index a1cdf988..1d2a60ec 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -4,6 +4,7 @@ Name[cs]=rekonq
 Name[da]=rekonq
 Name[de]=rekonq
 Name[en_GB]=rekonq
+Name[es]=rekonq
 Name[ga]=rekonq
 Name[nds]=Rekonq
 Name[pl]=rekonq
@@ -17,6 +18,7 @@ GenericName[cs]=Prohlížeč pro KDE založený na Webkitu
 GenericName[da]=KDE-browser baseret på Webkit
 GenericName[de]=WebKit-basierter Webbrowser für KDE
 GenericName[en_GB]=Webkit KDE Browser
+GenericName[es]=Navegador Webkit para KDE
 GenericName[ga]=Brabhsálaí Webkit KDE
 GenericName[nds]=Webkit-KDE-Kieker
 GenericName[pl]=Przeglądarka Webkit dla KDE
-- 
cgit v1.2.1


From b7deeaf321b9f145018811eb4ce78776c06d9832 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 13 Apr 2010 11:11:05 +0200
Subject: oops :) QT_FATAL_WARNINGS=1 rekonq --> crash Fixed

---
 src/urlbar/urlbar.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 5423e5d0..dcdda533 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -68,9 +68,6 @@ UrlBar::UrlBar(QWidget *parent)
     connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
     connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
     
-    // load urls on activated urlbar signal
-    connect(this, SIGNAL(returnPressed(const QString&)), this, SLOT(activated(const QString&)));
-
     // suggestions
     installEventFilter(_box);
     connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
-- 
cgit v1.2.1


From 493c497d23ccb2962880dd8746e4fac4c1788241 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 02:33:49 +0200
Subject: Lionel's fixes to the UI. (at least the first bits, but they seems
 working really well :) )

---
 src/urlbar/completionwidget.cpp | 23 +++++++----------------
 src/urlbar/listitem.cpp         |  9 ++++++++-
 2 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 0733b1f0..311694b3 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -50,45 +50,36 @@ CompletionWidget::CompletionWidget( QWidget *parent)
     , _parent(parent)
     , _currentIndex(-1)
 {
-    QPalette p(palette());
-    p.setColor(QPalette::Background, Qt::white); // TODO: choose the correct color
-    setPalette(p);
     setFrameStyle(QFrame::Panel);
     setLayoutDirection(Qt::LeftToRight);
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setMargin(0);
+    layout->setSpacing(0);
     setLayout(layout);
-
 }
 
 
 void CompletionWidget::insertSearchList(const UrlSearchList &list)
 {
     _list = list;
-    int i=0;
+    int i = 0;
     foreach(UrlSearchItem item, _list)
     {
         ListItem *suggestion = new ListItem(item);
+        suggestion->setBackgroundRole(i%2 ? QPalette::AlternateBase : QPalette::Base);
         connect(suggestion, SIGNAL(itemClicked(ListItem *, Qt::MouseButton)), this, SLOT(itemChosen(ListItem *, Qt::MouseButton)));
-        suggestion->setObjectName( QString::number(i++) );
+        suggestion->setObjectName( QString::number(i) );
         layout()->addWidget( suggestion );
+        i++;
     }
 }
 
 
 void CompletionWidget::sizeAndPosition()
 {
-    // size
-    int h = 34;
-    ListItem *widget;
-    for(int i = 0; i < layout()->count(); ++i)
-    {
-        widget = findChild<ListItem *>( QString::number(i) );
-        h = qMax(widget->sizeHint().height(), h);
-    }
-    setFixedHeight(layout()->count() * (h + 10) );
     setFixedWidth( _parent->width() );
-
+    adjustSize();
+    
     // position
     QPoint p = _parent->mapToGlobal( QPoint(0,0) );
     move(p.x(), p.y() + _parent->height());
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 91af352b..61a739f8 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -51,7 +51,14 @@
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent)
 {
-    //preview and icon
+    setAutoFillBackground(true);
+    
+    QPalette p = palette();
+    p.setColor(QPalette::Base, Qt::white);                    // TODO: choose the correct color
+    p.setColor(QPalette::AlternateBase, QColor(247,247,247)); // TODO: choose the correct color
+    setPalette(p);
+    
+    // ----------------------------------------
     
     QHBoxLayout *hLayout = new QHBoxLayout;
  
-- 
cgit v1.2.1


From 85dec247bde3a46298d0b9a9a6b7faa5e8d33bf8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 10:30:16 +0200
Subject: Finally cleaning Application class, getting rid of loadUrl(string)
 slot

---
 src/application.cpp | 82 +++++++++++++++++++++--------------------------------
 src/application.h   |  6 ----
 2 files changed, 33 insertions(+), 55 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index 48264440..db6d3c32 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -154,7 +154,7 @@ int Application::newInstance()
             // Create a new one and load there sites...
             loadUrl(args->arg(0), Rekonq::CurrentTab);
             for (int i = 1; i < args->count(); ++i)
-                loadUrl(args->arg(i), Rekonq::SettingOpenTab);
+                loadUrl( KUrl( args->arg(i) ), Rekonq::SettingOpenTab);
         }
         else
         {
@@ -165,7 +165,7 @@ int Application::newInstance()
                 MainWindow *m = m_mainWindows.at(index - 1).data();
                 m->activateWindow();
                 for (int i = 0; i < args->count(); ++i)
-                    loadUrl(args->arg(i), Rekonq::NewCurrentTab);
+                    loadUrl( KUrl( args->arg(i) ), Rekonq::NewCurrentTab);
             }
         }
     }
@@ -295,17 +295,37 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
         return;
     }
 
-    prepareLoading(url.pathOrUrl(), type);
-}
-
-
-
-void Application::loadUrl(const QString& urlString,  const Rekonq::OpenType& type)
-{
-    if(urlString.isEmpty())
-        return;
-
-    prepareLoading(urlString, type);
+    // first, create the webview(s) to not let hangs UI..
+    WebTab *tab = 0;
+    MainWindow *w = 0;
+    w = (type == Rekonq::NewWindow) 
+        ? newMainWindow()
+        : mainWindow();
+        
+    switch(type)
+    {
+    case Rekonq::SettingOpenTab:
+        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewCurrentTab:
+        tab = w->mainView()->newWebTab(true);
+        break;
+    case Rekonq::NewBackTab:
+        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewWindow:
+    case Rekonq::CurrentTab:
+        tab = w->mainView()->currentWebTab();
+        break;
+    };
+    
+    WebView *view = tab->view();
+    
+    if (view)
+    {
+        FilterUrlJob *job = new FilterUrlJob(view, url.pathOrUrl(), this);
+        Weaver::instance()->enqueue(job);
+    }
 }
 
 
@@ -370,39 +390,3 @@ void Application::newWindow()
     loadUrl( KUrl("about:home"), Rekonq::NewWindow );
     mainWindow()->mainView()->urlBarWidget()->setFocus();
 }
-
-
-void Application::prepareLoading(const QString& urlString, const Rekonq::OpenType& type)
-{
-    // first, create the webview(s) to not let hangs UI..
-    WebTab *tab = 0;
-    MainWindow *w = 0;
-    w = (type == Rekonq::NewWindow) 
-        ? newMainWindow()
-        : mainWindow();
-        
-    switch(type)
-    {
-    case Rekonq::SettingOpenTab:
-        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewCurrentTab:
-        tab = w->mainView()->newWebTab(true);
-        break;
-    case Rekonq::NewBackTab:
-        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewWindow:
-    case Rekonq::CurrentTab:
-        tab = w->mainView()->currentWebTab();
-        break;
-    };
-    
-    WebView *view = tab->view();
-    
-    if (view)
-    {
-        FilterUrlJob *job = new FilterUrlJob(view, urlString, this);
-        Weaver::instance()->enqueue(job);
-    }
-}
diff --git a/src/application.h b/src/application.h
index 760f7943..c268d586 100644
--- a/src/application.h
+++ b/src/application.h
@@ -123,10 +123,6 @@ public slots:
     void loadUrl( const KUrl& url,
                   const Rekonq::OpenType& type = Rekonq::CurrentTab
                 );
-           
-    void loadUrl( const QString& urlString,
-                  const Rekonq::OpenType& type = Rekonq::CurrentTab
-                );    
 
     void newWindow();
     void removeMainWindow(MainWindow *window);
@@ -141,8 +137,6 @@ private slots:
     void loadResolvedUrl(ThreadWeaver::Job *);
     
 private:
-    void prepareLoading(const QString& urlString, const Rekonq::OpenType& type);
-    
     static QWeakPointer<HistoryManager> s_historyManager;
     static QWeakPointer<BookmarkProvider> s_bookmarkProvider;
     static QWeakPointer<SessionManager> s_sessionManager;
-- 
cgit v1.2.1


From 6a5f7762fa7e2876d63c4adb9a1842acef0c7333 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 10:39:36 +0200
Subject: Stupid commit :) Renamed urltreeview files to paneltreeviews one to
 let my konsole tab completion easily work. Blame me for this..

---
 src/CMakeLists.txt               |   2 +-
 src/bookmarks/bookmarkspanel.cpp |   6 +-
 src/bookmarks/bookmarkspanel.h   |   4 +-
 src/history/historypanel.cpp     |   4 +-
 src/history/historypanel.h       |   4 +-
 src/paneltreeview.cpp            | 196 +++++++++++++++++++++++++++++++++++++++
 src/paneltreeview.h              |  69 ++++++++++++++
 src/urltreeview.cpp              | 195 --------------------------------------
 src/urltreeview.h                |  69 --------------
 9 files changed, 275 insertions(+), 274 deletions(-)
 create mode 100644 src/paneltreeview.cpp
 create mode 100644 src/paneltreeview.h
 delete mode 100644 src/urltreeview.cpp
 delete mode 100644 src/urltreeview.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 102935a6..2ab308de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,11 +15,11 @@ SET( rekonq_KDEINIT_SRCS
     mainwindow.cpp 
     networkaccessmanager.cpp
     newtabpage.cpp
+    paneltreeview.cpp
     previewselectorbar.cpp
     protocolhandler.cpp
     sessionmanager.cpp
     tabbar.cpp
-    urltreeview.cpp
     walletbar.cpp
     webinspectorpanel.cpp
     webpage.cpp
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 611031b5..0caf0f31 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -51,9 +51,9 @@
 
 
 BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
-    : QDockWidget(title, parent, flags),
-    m_treeView(new UrlTreeView(this)),
-    m_loadingState(false)
+    : QDockWidget(title, parent, flags)
+    , m_treeView(new PanelTreeView(this))
+    , m_loadingState(false)
 {
     setup();
     setShown(ReKonfig::showBookmarksPanel());
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 86794d3a..90597c73 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -33,7 +33,7 @@
 // Local Includes
 #include "rekonqprivate_export.h"
 #include "application.h"
-#include "urltreeview.h"
+#include "paneltreeview.h"
 
 // Qt Includes
 #include <QDockWidget>
@@ -73,7 +73,7 @@ private:
     void setup();
     KBookmark bookmarkForIndex(const QModelIndex &index);
 
-    UrlTreeView *m_treeView;
+    PanelTreeView *m_treeView;
     bool m_loadingState;
 };
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index 87b5fe55..8c36dfa8 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -52,8 +52,8 @@
 
 
 HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags)
-    : QDockWidget(title, parent, flags),
-    m_treeView(new UrlTreeView(this))
+    : QDockWidget(title, parent, flags)
+    , m_treeView(new PanelTreeView(this))
 {
     setup();
     setShown(ReKonfig::showHistoryPanel());
diff --git a/src/history/historypanel.h b/src/history/historypanel.h
index 0c01189c..a4dfaf64 100644
--- a/src/history/historypanel.h
+++ b/src/history/historypanel.h
@@ -32,7 +32,7 @@
 // Local Includes
 #include "rekonqprivate_export.h"
 #include "application.h"
-#include "urltreeview.h"
+#include "paneltreeview.h"
 
 // Qt Includes
 #include <QDockWidget>
@@ -62,7 +62,7 @@ private slots:
 
 private:
     void setup();
-    UrlTreeView *m_treeView;
+    PanelTreeView *m_treeView;
 };
 
 #endif // HISTORYPANEL_H
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
new file mode 100644
index 00000000..c13caf4d
--- /dev/null
+++ b/src/paneltreeview.cpp
@@ -0,0 +1,196 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "paneltreeview.h"
+#include "paneltreeview.moc"
+
+// Local Includes
+#include "application.h"
+
+// Qt Includes
+#include <QMouseEvent>
+#include <QClipboard>
+
+
+PanelTreeView::PanelTreeView(QWidget *parent)
+    : QTreeView(parent)
+{
+    connect(this, SIGNAL(itemHovered(const QString &)), parent, SIGNAL(itemHovered(const QString &)));
+    connect(this, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)), parent, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)));
+    setMouseTracking(true);
+    setExpandsOnDoubleClick(false);
+}
+
+
+PanelTreeView::~PanelTreeView()
+{
+}
+
+
+void PanelTreeView::mousePressEvent(QMouseEvent *event)
+{
+    const QModelIndex index = indexAt(event->pos());
+    bool expanded = isExpanded(index);
+
+    QTreeView::mousePressEvent(event);
+
+    // A change of an item expansion is handle by mouseReleaseEvent()
+    // So toggle again the item
+    if(expanded != isExpanded(index))
+        setExpanded(index, !isExpanded(index));
+    
+    if(!index.isValid())
+    {
+        clearSelection();
+        setCurrentIndex(QModelIndex());
+
+        if(event->button() == Qt::RightButton)
+            emit contextMenuEmptyRequested(event->pos());
+        return;
+    }
+
+    if(event->button() == Qt::RightButton)
+    {
+        if(model()->rowCount(index) == 0)
+        {
+            // An empty group needs to be handle by the panels
+            emit contextMenuItemRequested(event->pos());
+        }
+        else
+        {
+            emit contextMenuGroupRequested(event->pos());
+        }
+    }
+}
+
+
+void PanelTreeView::mouseReleaseEvent(QMouseEvent *event)
+{
+    QTreeView::mouseReleaseEvent(event);
+
+    const QModelIndex index = indexAt(event->pos());
+    if(!index.isValid())
+        return;
+
+    if(event->button() == Qt::MidButton || event->modifiers() == Qt::ControlModifier)
+        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
+
+    else if(event->button() == Qt::LeftButton)
+    {
+        if(model()->rowCount(index) == 0)
+            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+        else
+            setExpanded(index, !isExpanded(index));
+    }
+}
+
+
+void PanelTreeView::keyPressEvent(QKeyEvent *event)
+{
+    QTreeView::keyPressEvent(event);
+    QModelIndex index = currentIndex();
+
+    if(!index.isValid())
+        return;
+
+    if(event->key() == Qt::Key_Return)
+    {
+        if(model()->rowCount(index) == 0)
+            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+        else
+            setExpanded(index, !isExpanded(index));
+    }
+
+    else if(event->key() == Qt::Key_Delete)
+    {
+        emit delKeyPressed();
+    }
+}
+
+
+void PanelTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType)
+{
+    // To workaround a crash when the url is about:blank
+    if(url.url() == "about:blank")
+        emit openUrl(KUrl("about:home"), openType);
+    else
+        emit openUrl(url, openType);
+}
+
+
+void PanelTreeView::mouseMoveEvent(QMouseEvent *event)
+{
+    QTreeView::mouseMoveEvent(event);
+    const QModelIndex index = indexAt(event->pos());
+    if(!index.isValid())
+    {
+        emit itemHovered("");
+        return;
+    }
+    emit itemHovered(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
+}
+
+
+void PanelTreeView::openInCurrentTab()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
+}
+
+
+void PanelTreeView::copyToClipboard()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    QClipboard *cb = QApplication::clipboard();
+    cb->setText(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
+}
+
+
+void PanelTreeView::openInNewTab()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
+}
+
+
+void PanelTreeView::openInNewWindow()
+{
+    QModelIndex index = currentIndex();
+    if(!index.isValid())
+        return;
+
+    validOpenUrl( qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewWindow);
+}
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
new file mode 100644
index 00000000..93d7a33e
--- /dev/null
+++ b/src/paneltreeview.h
@@ -0,0 +1,69 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef PANELTREEVIEW_H
+#define PANELTREEVIEW_H
+
+// Local Includes
+#include "application.h"
+
+// Qt Includes
+#include <QTreeView>
+
+
+class PanelTreeView : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    PanelTreeView(QWidget *parent = 0);
+    ~PanelTreeView();
+
+signals:
+    void openUrl(const KUrl &, const Rekonq::OpenType &);
+    void itemHovered(const QString &);
+    void delKeyPressed();
+    void contextMenuItemRequested(const QPoint &pos);
+    void contextMenuGroupRequested(const QPoint &pos);
+    void contextMenuEmptyRequested(const QPoint &pos);
+
+public slots:
+    void copyToClipboard();
+    void openInCurrentTab();
+    void openInNewTab();
+    void openInNewWindow();
+
+protected:
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+
+private:
+    void validOpenUrl(const KUrl &url, Rekonq::OpenType openType = Rekonq::CurrentTab);
+};
+
+#endif // PANELTREEVIEW_H
diff --git a/src/urltreeview.cpp b/src/urltreeview.cpp
deleted file mode 100644
index aeaef2f7..00000000
--- a/src/urltreeview.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
-* defined in Section 14 of version 3 of the license.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "urltreeview.h"
-
-// Local Includes
-#include "application.h"
-
-// Qt Includes
-#include <QMouseEvent>
-#include <QClipboard>
-
-
-UrlTreeView::UrlTreeView(QWidget *parent)
-    : QTreeView(parent)
-{
-    connect(this, SIGNAL(itemHovered(const QString &)), parent, SIGNAL(itemHovered(const QString &)));
-    connect(this, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)), parent, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)));
-    setMouseTracking(true);
-    setExpandsOnDoubleClick(false);
-}
-
-
-UrlTreeView::~UrlTreeView()
-{
-}
-
-
-void UrlTreeView::mousePressEvent(QMouseEvent *event)
-{
-    const QModelIndex index = indexAt(event->pos());
-    bool expanded = isExpanded(index);
-
-    QTreeView::mousePressEvent(event);
-
-    // A change of an item expansion is handle by mouseReleaseEvent()
-    // So toggle again the item
-    if(expanded != isExpanded(index))
-        setExpanded(index, !isExpanded(index));
-    
-    if(!index.isValid())
-    {
-        clearSelection();
-        setCurrentIndex(QModelIndex());
-
-        if(event->button() == Qt::RightButton)
-            emit contextMenuEmptyRequested(event->pos());
-        return;
-    }
-
-    if(event->button() == Qt::RightButton)
-    {
-        if(model()->rowCount(index) == 0)
-        {
-            // An empty group needs to be handle by the panels
-            emit contextMenuItemRequested(event->pos());
-        }
-        else
-        {
-            emit contextMenuGroupRequested(event->pos());
-        }
-    }
-}
-
-
-void UrlTreeView::mouseReleaseEvent(QMouseEvent *event)
-{
-    QTreeView::mouseReleaseEvent(event);
-
-    const QModelIndex index = indexAt(event->pos());
-    if(!index.isValid())
-        return;
-
-    if(event->button() == Qt::MidButton || event->modifiers() == Qt::ControlModifier)
-        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
-
-    else if(event->button() == Qt::LeftButton)
-    {
-        if(model()->rowCount(index) == 0)
-            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
-        else
-            setExpanded(index, !isExpanded(index));
-    }
-}
-
-
-void UrlTreeView::keyPressEvent(QKeyEvent *event)
-{
-    QTreeView::keyPressEvent(event);
-    QModelIndex index = currentIndex();
-
-    if(!index.isValid())
-        return;
-
-    if(event->key() == Qt::Key_Return)
-    {
-        if(model()->rowCount(index) == 0)
-            validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
-        else
-            setExpanded(index, !isExpanded(index));
-    }
-
-    else if(event->key() == Qt::Key_Delete)
-    {
-        emit delKeyPressed();
-    }
-}
-
-
-void UrlTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType)
-{
-    // To workaround a crash when the url is about:blank
-    if(url.url() == "about:blank")
-        emit openUrl(KUrl("about:home"), openType);
-    else
-        emit openUrl(url, openType);
-}
-
-
-void UrlTreeView::mouseMoveEvent(QMouseEvent *event)
-{
-    QTreeView::mouseMoveEvent(event);
-    const QModelIndex index = indexAt(event->pos());
-    if(!index.isValid())
-    {
-        emit itemHovered("");
-        return;
-    }
-    emit itemHovered(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
-}
-
-
-void UrlTreeView::openInCurrentTab()
-{
-    QModelIndex index = currentIndex();
-    if(!index.isValid())
-        return;
-
-    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)));
-}
-
-
-void UrlTreeView::copyToClipboard()
-{
-    QModelIndex index = currentIndex();
-    if(!index.isValid())
-        return;
-
-    QClipboard *cb = QApplication::clipboard();
-    cb->setText(qVariantValue< KUrl >(index.data(Qt::UserRole)).url());
-}
-
-
-void UrlTreeView::openInNewTab()
-{
-    QModelIndex index = currentIndex();
-    if(!index.isValid())
-        return;
-
-    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
-}
-
-
-void UrlTreeView::openInNewWindow()
-{
-    QModelIndex index = currentIndex();
-    if(!index.isValid())
-        return;
-
-    validOpenUrl( qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewWindow);
-}
diff --git a/src/urltreeview.h b/src/urltreeview.h
deleted file mode 100644
index cce7a257..00000000
--- a/src/urltreeview.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
-*
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License or (at your option) version 3 or any later version
-* accepted by the membership of KDE e.V. (or its successor approved
-* by the membership of KDE e.V.), which shall act as a proxy
-* defined in Section 14 of version 3 of the license.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-#ifndef URLTREEVIEW_H
-#define URLTREEVIEW_H
-
-// Local Includes
-#include "application.h"
-
-// Qt Includes
-#include <QTreeView>
-
-
-class UrlTreeView : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    UrlTreeView(QWidget *parent = 0);
-    ~UrlTreeView();
-
-signals:
-    void openUrl(const KUrl &, const Rekonq::OpenType &);
-    void itemHovered(const QString &);
-    void delKeyPressed();
-    void contextMenuItemRequested(const QPoint &pos);
-    void contextMenuGroupRequested(const QPoint &pos);
-    void contextMenuEmptyRequested(const QPoint &pos);
-
-public slots:
-    void copyToClipboard();
-    void openInCurrentTab();
-    void openInNewTab();
-    void openInNewWindow();
-
-protected:
-    void mouseReleaseEvent(QMouseEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void mouseMoveEvent(QMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-
-private:
-    void validOpenUrl(const KUrl &url, Rekonq::OpenType openType = Rekonq::CurrentTab);
-};
-
-#endif // URLTREEVIEW_H
-- 
cgit v1.2.1


From e8e18f0b164c78c2ea410cad0e1e1033b1b24ab2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 11:36:47 +0200
Subject: Set default background to white

BUG:232552
---
 src/bookmarks/bookmarksmanager.cpp | 7 +++----
 src/data/CMakeLists.txt            | 8 ++++++--
 src/data/default.css               | 8 ++++++++
 src/mainwindow.cpp                 | 9 ++++++---
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 src/data/default.css

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 31bf2278..d54abb3c 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -55,8 +55,8 @@
 
 
 BookmarkOwner::BookmarkOwner(QObject *parent)
-        : QObject(parent)
-        , KBookmarkOwner()
+    : QObject(parent)
+    , KBookmarkOwner()
 {
 }
 
@@ -119,11 +119,10 @@ BookmarkMenu::BookmarkMenu(KBookmarkManager *manager,
                            KBookmarkOwner *owner,
                            KMenu *menu,
                            KActionCollection* actionCollection)
-        : KBookmarkMenu(manager, owner, menu, actionCollection)
+    : KBookmarkMenu(manager, owner, menu, actionCollection)
 
 {
     KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this);
-//     a->setText(i18n("Bookmark this Page"));
     actionCollection->addAction(QLatin1String("rekonq_add_bookmark"),a);
 }
 
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 6ff3fefd..ef777c9c 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -7,7 +7,9 @@ INSTALL(
 )
 
 INSTALL( 
-    FILES defaultbookmarks.xbel
+    FILES 
+    defaultbookmarks.xbel
+    default.css
     DESTINATION ${DATA_INSTALL_DIR}/rekonq
 )
 
@@ -17,6 +19,8 @@ INSTALL(
 )
 
 INSTALL( 
-    FILES rekonqinfo.html home.html
+    FILES 
+    rekonqinfo.html 
+    home.html
     DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
 )
diff --git a/src/data/default.css b/src/data/default.css
new file mode 100644
index 00000000..47c8e93d
--- /dev/null
+++ b/src/data/default.css
@@ -0,0 +1,8 @@
+/*
+rekonq default css properties
+this file will not be considered
+setting a local stylesheet in rekonq config
+*/
+
+/* Set background color to white for sites forgetting this */
+background-color:#FFFFFF;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 56b69cc6..abee13d5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -599,7 +599,10 @@ void MainWindow::updateConfiguration()
 
     // Applies user defined CSS to all open webpages. If there no longer is a
     // user defined CSS removes it from all open webpages.
-    defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS());
+    if(ReKonfig::userCSS().isEmpty())
+        defaultSettings->setUserStyleSheetUrl( KUrl(KStandardDirs::locate("appdata" , "default.css")) );
+    else
+        defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS());
 
     // ====== load Settings on main classes
     Application::historyManager()->loadSettings();
@@ -842,8 +845,8 @@ void MainWindow::highlightAll()
     
     if(m_findBar->highlightAllState() && !m_findBar->isHidden())
     {
-	if (m_findBar->matchCase())
-	    options |= QWebPage::FindCaseSensitively;
+    if (m_findBar->matchCase())
+        options |= QWebPage::FindCaseSensitively;
 
         currentTab()->view()->findText(m_lastSearch, options);
     }
-- 
cgit v1.2.1


From c05b14ad0f8358171f4dc199e61dc0a259d0aa65 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 11:59:43 +0200
Subject: Proper solutions are always the best ones :) Fix duplicated right
 icons.

CCBUG: 234320
---
 src/protocolhandler.cpp | 2 --
 src/urlbar/lineedit.h   | 7 ++++---
 src/urlbar/urlbar.cpp   | 6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 1458bdf5..c97bc475 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -146,8 +146,6 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
                 break;
             }
         }
-    
-        Application::instance()->mainWindow()->mainView()->urlBar()->clearRightIcons();
 
         NewTabPage p(frame);
         p.generate(_url);
diff --git a/src/urlbar/lineedit.h b/src/urlbar/lineedit.h
index 5b8ff2a3..68cdc7d1 100644
--- a/src/urlbar/lineedit.h
+++ b/src/urlbar/lineedit.h
@@ -77,9 +77,7 @@ public:
     virtual ~LineEdit();
     
     IconButton *iconButton() const;
-    
-    void clearRightIcons();
-    
+
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
@@ -88,6 +86,9 @@ protected:
     
     IconButton *addRightIcon(LineEdit::icon );
 
+private slots:
+    void clearRightIcons();
+
 private:    
     IconButton *_icon;
     IconButtonPointerList _rightIconsList;
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index dcdda533..051277e2 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -67,7 +67,8 @@ UrlBar::UrlBar(QWidget *parent)
     
     connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
     connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
-    
+    connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons()));
+        
     // suggestions
     installEventFilter(_box);
     connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
@@ -83,9 +84,6 @@ UrlBar::~UrlBar()
 
 void UrlBar::setQUrl(const QUrl& url)
 {
-    // find a better place? Ideally a loadStarted connected slot..
-    clearRightIcons();
-    
     if(url.scheme() == QL1S("about") )
     {
         iconButton()->setIcon( KIcon("arrow-right") );
-- 
cgit v1.2.1


From a219ae2f7306d2d513eccf988ad9d2fd679c934c Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 14 Apr 2010 11:58:50 +0200
Subject: Don't create "Open Folder in Tabs" action when there are only folders
 or separators Implement a missing method : currentBookmarkList() which now
 allow "Bookmarks Tabs as Folder BUG: 234234

---
 src/bookmarks/bookmarksmanager.cpp | 34 ++++++++++++++++++++++++++++++----
 src/bookmarks/bookmarksmanager.h   |  2 ++
 2 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index d54abb3c..7e933599 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -35,6 +35,7 @@
 #include "mainwindow.h"
 #include "webtab.h"
 #include "webview.h"
+#include "mainview.h"
 #include "bookmarkcontextmenu.h"
 
 // KDE Includes
@@ -53,7 +54,6 @@
 #include <QtGui/QActionGroup>
 
 
-
 BookmarkOwner::BookmarkOwner(QObject *parent)
     : QObject(parent)
     , KBookmarkOwner()
@@ -112,6 +112,22 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)
 }
 
 
+QList< QPair<QString, QString> > BookmarkOwner::currentBookmarkList() const
+{
+    QList< QPair<QString, QString> > bkList;
+    int tabNumber = Application::instance()->mainWindow()->mainView()->count();
+
+    for(int i = 0; i < tabNumber; i++)
+    {
+        QPair<QString, QString> item;
+        item.first = Application::instance()->mainWindow()->mainView()->webTab(i)->view()->title();
+        item.second = Application::instance()->mainWindow()->mainView()->webTab(i)->url().url();
+        bkList += item;
+    }
+    return bkList;
+}
+
+
 // ------------------------------------------------------------------------------------------------------
 
 
@@ -405,9 +421,19 @@ void BookmarkActionMenu::addFolderActions()
 
     if(!m_group.first().isNull())
     {
-        action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
-        connect(action, SIGNAL(triggered(bool)), this, SLOT(openActionInTabs()));
-        addAction(action);
+        KBookmark bookmark = m_group.first();
+
+        while(bookmark.isGroup() || bookmark.isSeparator())
+        {
+            bookmark = m_group.next(bookmark);
+        }
+
+        if(!bookmark.isNull())
+        {
+            action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
+            connect(action, SIGNAL(triggered(bool)), this, SLOT(openActionInTabs()));
+            addAction(action);
+        }
     }
 
     action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index c8264633..7fb02970 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -115,6 +115,8 @@ public:
     */
     virtual void openFolderinTabs(const KBookmarkGroup &bm);
 
+    virtual QList< QPair<QString, QString> > currentBookmarkList() const;
+
 signals:
     /**
      * This signal is emitted when an url has to be loaded
-- 
cgit v1.2.1


From 5a731041a743ccdeaeb91e30f420cd19676e63dd Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Wed, 14 Apr 2010 12:17:01 +0200
Subject: Fix highlightAll() indentation :)

---
 src/mainwindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index abee13d5..898aa842 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -845,8 +845,8 @@ void MainWindow::highlightAll()
     
     if(m_findBar->highlightAllState() && !m_findBar->isHidden())
     {
-    if (m_findBar->matchCase())
-        options |= QWebPage::FindCaseSensitively;
+        if (m_findBar->matchCase())
+            options |= QWebPage::FindCaseSensitively;
 
         currentTab()->view()->findText(m_lastSearch, options);
     }
-- 
cgit v1.2.1


From 22e9045e3f04d0e5f566ada2e06d3ba4aa609d66 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 16:00:29 +0200
Subject: Fix default css

---
 src/data/default.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/default.css b/src/data/default.css
index 47c8e93d..3ddd3026 100644
--- a/src/data/default.css
+++ b/src/data/default.css
@@ -5,4 +5,6 @@ setting a local stylesheet in rekonq config
 */
 
 /* Set background color to white for sites forgetting this */
+body{
 background-color:#FFFFFF;
+}
\ No newline at end of file
-- 
cgit v1.2.1


From fa2287de034db6ce80dd1d966bde4844350f9e87 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 14 Apr 2010 16:19:35 +0200
Subject: moc fixes

---
 src/bookmarks/bookmarkcontextmenu.cpp | 1 +
 src/bookmarks/bookmarkcontextmenu.h   | 1 -
 src/urlbar/listitem.cpp               | 1 +
 src/urlbar/listitem.h                 | 7 +++++++
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index dedec097..aab6af90 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -26,6 +26,7 @@
 
 // Self Includes
 #include "bookmarkcontextmenu.h"
+#include "bookmarkcontextmenu.moc"
 
 // Local Includes
 #include "application.h"
diff --git a/src/bookmarks/bookmarkcontextmenu.h b/src/bookmarks/bookmarkcontextmenu.h
index 2028df39..c8c903d8 100644
--- a/src/bookmarks/bookmarkcontextmenu.h
+++ b/src/bookmarks/bookmarkcontextmenu.h
@@ -63,4 +63,3 @@ private:
 };
 
 #endif // BOOKMARKCONTEXTMENU_H
-
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 61a739f8..18e8352d 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -26,6 +26,7 @@
 
 // Self Includes
 #include "listitem.h"   
+#include "listitem.moc"   
 
 // Local Includes
 #include "urlresolver.h"
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 1b594115..18ec8a33 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -24,6 +24,10 @@
 * ============================================================ */
 
 
+#ifndef LISTITEM_H
+#define LISTITEM_H
+
+
 // Qt Includes
 #include <QWidget>
 #include <QLayout>
@@ -60,3 +64,6 @@ private:
     
     QStyleOptionViewItemV4 _option;
 };
+
+
+#endif // LISTITEM_H
-- 
cgit v1.2.1


From 9060cdc9b2c0ea60f19a74f30d2136204e891e19 Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Thu, 15 Apr 2010 08:08:55 +0200
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 1d2a60ec..df564c47 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -6,6 +6,7 @@ Name[de]=rekonq
 Name[en_GB]=rekonq
 Name[es]=rekonq
 Name[ga]=rekonq
+Name[lt]=rekonq
 Name[nds]=Rekonq
 Name[pl]=rekonq
 Name[pt]=rekonq
@@ -20,6 +21,7 @@ GenericName[de]=WebKit-basierter Webbrowser für KDE
 GenericName[en_GB]=Webkit KDE Browser
 GenericName[es]=Navegador Webkit para KDE
 GenericName[ga]=Brabhsálaí Webkit KDE
+GenericName[lt]=Webkit KDE naršyklė
 GenericName[nds]=Webkit-KDE-Kieker
 GenericName[pl]=Przeglądarka Webkit dla KDE
 GenericName[pt]=Navegador do KDE usando o WebKit
-- 
cgit v1.2.1


From ee9fc135d6ee214e999aebebb59459fce9147b38 Mon Sep 17 00:00:00 2001
From: lionelc <lionelc@lionelc.(none)>
Date: Thu, 15 Apr 2010 18:36:07 +0200
Subject: introduce search listitem

---
 src/urlbar/completionwidget.cpp |  35 ++--
 src/urlbar/completionwidget.h   |   4 +-
 src/urlbar/listitem.cpp         | 404 ++++++++++++++++++++++++++++++----------
 src/urlbar/listitem.h           | 149 ++++++++++++++-
 src/urlbar/urlbar.cpp           |   2 +-
 src/urlbar/urlresolver.cpp      |  58 +++---
 src/urlbar/urlresolver.h        |  19 +-
 7 files changed, 510 insertions(+), 161 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 311694b3..42824af9 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -59,18 +59,18 @@ CompletionWidget::CompletionWidget( QWidget *parent)
 }
 
 
-void CompletionWidget::insertSearchList(const UrlSearchList &list)
+void CompletionWidget::insertSearchList(const UrlSearchList &list, const QString& text)
 {
     _list = list;
     int i = 0;
     foreach(UrlSearchItem item, _list)
     {
-        ListItem *suggestion = new ListItem(item);
-        suggestion->setBackgroundRole(i%2 ? QPalette::AlternateBase : QPalette::Base);
+        ListItem *suggestion = ListItemFactory::create(item, text);
+        suggestion->setBackgroundRole(i%2 ? QPalette::AlternateBase: QPalette::Base);     
         connect(suggestion, SIGNAL(itemClicked(ListItem *, Qt::MouseButton)), this, SLOT(itemChosen(ListItem *, Qt::MouseButton)));
-        suggestion->setObjectName( QString::number(i) );
+        connect(this, SIGNAL(nextItemSubChoice()), suggestion, SLOT(nextItemSubChoice()));
+        suggestion->setObjectName( QString::number(i++) );
         layout()->addWidget( suggestion );
-        i++;
     }
 }
 
@@ -88,8 +88,9 @@ void CompletionWidget::sizeAndPosition()
 
 void CompletionWidget::popup()
 {
+    down();
     sizeAndPosition();
-    if (!isVisible()) 
+    if (!isVisible())
         show();
 }
 
@@ -195,17 +196,23 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                         ev->accept();
                         return true;
                     }
+                    else if (ev->modifiers() & Qt::ControlModifier)
+                    {
+                        emit nextItemSubChoice();
+                        ev->accept();
+                        return true;
+                    }
                     break;
-
+                    
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
-                        hide();
-                        if(_currentIndex >= 0)
-                            emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
-                        else
-                            emit loadTypedUrl();
-                        ev->accept();
-                        return true;
+                    hide();
+                    if(_currentIndex >= 0)
+                        emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
+                    else
+                        emit loadTypedUrl();
+                    ev->accept();
+                    return true;
                     break;
             }
         }
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 57a8bed0..25b6f5eb 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -47,7 +47,7 @@ class CompletionWidget : public QFrame
 public:
     CompletionWidget(QWidget *parent);
 
-    void insertSearchList(const UrlSearchList &list);
+    void insertSearchList(const UrlSearchList &list, const QString& text);
     void popup();
     void clear();
 
@@ -59,6 +59,7 @@ private slots:
 
 signals:
     void chosenUrl(const KUrl &, Rekonq::OpenType);
+    void nextItemSubChoice();
     void loadTypedUrl();
     
 private:
@@ -70,6 +71,7 @@ private:
 
     UrlSearchList _list;
     int _currentIndex;
+    QString *_searchEngine;
 };
 
 #endif // COMPLETION_WIDGET_H
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 18e8352d..ef09d4f3 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -36,7 +36,10 @@
 #include <KIcon>
 #include <KStandardDirs>
 #include <KDebug>
-#include <KUrl>
+#include <QActionGroup>
+#include <KConfigGroup>
+#include <KIcon>
+
 
 // Qt Includes
 #include <QHBoxLayout>
@@ -45,111 +48,203 @@
 #include <QSizePolicy>
 #include <QPixmap>
 #include <QStylePainter>
-#include <QFile>
 #include <QMouseEvent>
+#include <QWebSettings>
+#include <QFile>
 
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent)
+    , m_option()
+    , m_url(item.url)
 {
     setAutoFillBackground(true);
+
+    m_option.initFrom(this);
+    m_option.direction = Qt::LeftToRight;
+
+    QPalette p(palette());
+    p.setColor(QPalette::Base, Qt::white); // TODO: choose the correct color
     
-    QPalette p = palette();
-    p.setColor(QPalette::Base, Qt::white);                    // TODO: choose the correct color
     p.setColor(QPalette::AlternateBase, QColor(247,247,247)); // TODO: choose the correct color
     setPalette(p);
-    
-    // ----------------------------------------
-    
+
     QHBoxLayout *hLayout = new QHBoxLayout;
- 
-    QLabel *previewLabelIcon = new QLabel;
-    previewLabelIcon->setFixedSize(45,33);
-    hLayout->addWidget(previewLabelIcon);
+    hLayout->setSpacing(4);
+    setLayout(hLayout);
 
-    // pixmap should ever exists
-    QPixmap pixmapIcon = Application::icon(item.url).pixmap(16);
-    
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(item.url) + ".png", true);
-    if(QFile::exists(path))
-    {
-        QLabel *previewLabel = new QLabel(previewLabelIcon);
-        previewLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
-        QPixmap preview;
-        preview.load(path);
-        
-        previewLabel->setFixedSize(38,29);
-        previewLabel->setPixmap(preview.scaled(38,29, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-    } 
+    deactivate();            
+}
 
-    QLabel *iconLabel = new QLabel(previewLabelIcon);
-    iconLabel->setPixmap(pixmapIcon);
-    iconLabel->move(27, 16);
-    
-    //title and url    
-    QVBoxLayout *vLayout = new QVBoxLayout;  
-    hLayout->addLayout(vLayout);
-    
-    QLabel *titleLabel = new QLabel("<b>" + item.title + "</b>");
-    titleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    
-    QLabel *urlLabel = new QLabel("<i>" + item.url.url() + "</i>");
-    urlLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-        
-    vLayout->addWidget(titleLabel);
-    vLayout->addWidget(urlLabel);
 
-    //type icon
+ListItem::~ListItem()
+{
+    disconnect();
+}
+
 
-    if (item.type & UrlSearchItem::Browse)
-    {
-        insertIcon(hLayout, "applications-internet");
-    }
+
+void ListItem::activate()
+{
+    m_option.state |= QStyle::State_Selected;
+    update();
+}
+
+
+void ListItem::deactivate()
+{
+    m_option.state  &= ~QStyle::State_Selected;
+    update();
+}
+
+
+void ListItem::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
     
-    if (item.type & UrlSearchItem::Search)
-    {
-         insertIcon(hLayout, "edit-find");
-    }
-   
-    if (item.type & UrlSearchItem::Bookmark)
+    if( m_option.state.testFlag(QStyle::State_Selected) ||  m_option.state.testFlag(QStyle::State_MouseOver))
     {
-         insertIcon(hLayout, "rating");
+        QPainter painter(this);
+        m_option.rect=QRect(QPoint(),size());
+        style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &m_option, &painter, this);
     }
+    
+    QWidget::paintEvent(event);
+}
 
-    if (item.type & UrlSearchItem::History)
-    {
-         insertIcon(hLayout, "view-history");
-    }
 
-    setLayout(hLayout);
-    
-    _option.initFrom(this);
-    _option.direction = Qt::LeftToRight;
-    
-    deactivate();
+void ListItem::enterEvent(QEvent *e)
+{
+    m_option.state |= QStyle::State_MouseOver;
+    update();
+    QWidget::enterEvent(e);
 }
 
 
-ListItem::~ListItem()
+void ListItem::leaveEvent(QEvent *e)
 {
-    disconnect();
+    m_option.state &= ~QStyle::State_MouseOver;
+    update();
+    QWidget::enterEvent(e);
+}
+
+
+void ListItem::mousePressEvent(QMouseEvent *e)
+{
+    emit itemClicked(this, e->button());
+    QWidget::mousePressEvent(e);
+}
+
+
+KUrl ListItem::url()
+{
+    return m_url;
+}
+
+void ListItem::nextItemSubChoice()
+{
+    //will be override
 }
 
 
-void ListItem::insertIcon(QLayout *layout, QString icon)
+TypeIcon::TypeIcon(int type, QWidget *parent)
+:QLabel(parent)
+{
+    setMinimumWidth(40);
+    QHBoxLayout *hLayout = new QHBoxLayout;
+    hLayout->setMargin(0);
+    hLayout->setAlignment(Qt::AlignRight);
+    setLayout(hLayout);
+    
+    if (type & UrlSearchItem::Search) hLayout->addWidget(getIcon("edit-find"));
+    if (type & UrlSearchItem::Browse) hLayout->addWidget(getIcon("applications-internet"));  
+    if (type & UrlSearchItem::Bookmark) hLayout->addWidget(getIcon("rating"));
+    if (type & UrlSearchItem::History) hLayout->addWidget(getIcon("view-history"));
+}
+
+
+QLabel *TypeIcon::getIcon(QString icon)
 {
     QLabel *iconLabel = new QLabel;
-    QPixmap pixmap = KIcon(icon).pixmap(18);
+    iconLabel->setFixedSize(16,16);  
+    QPixmap pixmap = KIcon(icon).pixmap(16);
     iconLabel->setPixmap(pixmap);
-    iconLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
-    layout->addWidget(iconLabel);
+    return iconLabel;
+}
+
+
+
+ItemIcon::ItemIcon(QString icon, QWidget *parent)
+:QLabel(parent)
+{
+    QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(icon)).pixmap(16);
+    if (pixmapIcon.isNull())
+    {
+        pixmapIcon = KIcon("text-html").pixmap(16);
+    }
+
+    setFixedSize(16,16);
+    setPixmap(pixmapIcon);
+}
+
+
+ItemText::ItemText(QString text, QString underlined, QWidget *parent)
+:QLabel(underlineText(text,underlined), parent)
+{
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+}
+
+
+QString ItemText::underlineText(QString text, QString textToUnderline)
+{
+    QString t = text;
+    t = t.replace(QRegExp("("+textToUnderline+")", Qt::CaseInsensitive), "<u>\\1</u>");
+    return t;
+}
+
+
+//--------------------------------------------------------------------------------------------
+
+
+PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
+:ListItem(item, parent)
+{
+    QLabel *previewLabelIcon = new QLabel;
+    previewLabelIcon->setFixedSize(45,33);
+    new ItemPreview(item.url.url(), 38, 29, previewLabelIcon);
+    ItemIcon* icon = new ItemIcon(item.url.url(), previewLabelIcon);
+    icon->move(27, 16);
+    layout()->addWidget(previewLabelIcon);
+  
+    QVBoxLayout *vLayout = new QVBoxLayout; 
+    vLayout->setMargin(0);
+    ((QHBoxLayout *)layout())->addLayout(vLayout);
+    vLayout->addWidget(new ItemText(item.title, text));
+    vLayout->addWidget(new ItemText("<i>" + item.url.url() + "</i>", text));
+    layout()->addWidget(new TypeIcon(item.type));
+}
+
+
+ItemPreview::ItemPreview(QString url, int width, int height, QWidget *parent)
+:QLabel(parent)
+{
+    setFixedSize(width, height);
+    setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
+
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(url) + ".png", true);
+    if(QFile::exists(path))
+    {     
+        QPixmap preview;
+        preview.load(path);
+        setPixmap(preview.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+    }
 }
 
 
 //TODO: REMOVE DUPLICATE CODE WITH PREVIEWIMAGE
-QString ListItem::guessNameFromUrl(KUrl url)
+QString ItemPreview::guessNameFromUrl(QUrl url)
 {
-    QString name = url.url();// toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
+    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
     
     // TODO learn Regular Expressions :)
     // and implement something better here..
@@ -165,52 +260,173 @@ QString ListItem::guessNameFromUrl(KUrl url)
     return name;
 }
 
+//--------------------------------------------------------------------------------------------
+QString SearchListItem::m_currentEngine = "";
 
-void ListItem::activate()
+SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
+    :ListItem(item, parent)
+    ,m_text(text)
 {
-    _option.state |= QStyle::State_Selected;
-    update();
+    if (m_currentEngine == "") m_currentEngine = EngineBar::defaultEngine();
+    
+    m_iconLabel = new ItemIcon("edit-find", this); //TODO: get the default engine icon
+    m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text), text);
+    m_engineBar = new EngineBar(text, m_currentEngine, this);
+    
+    layout()->addWidget(m_iconLabel);
+    layout()->addWidget(m_titleLabel);
+    layout()->addWidget(new QLabel("Engines: "));
+    layout()->addWidget(m_engineBar);
+    layout()->addWidget(new TypeIcon(item.type));
+    
+    connect(m_engineBar, SIGNAL(searchEngineChanged(QString, QString)), this, SLOT(changeSearchEngine(QString, QString)));
 }
 
 
-void ListItem::deactivate()
+QString SearchListItem::searchItemTitle(QString engine, QString text)
 {
-    _option.state  &= ~QStyle::State_Selected;
-    update();
+    return QString("Search "+ engine +" for <u>"+text+"</u>");
 }
 
 
-void ListItem::paintEvent(QPaintEvent *event)
+void SearchListItem::changeSearchEngine(QString url, QString engine)
 {
-    Q_UNUSED(event);
+    m_titleLabel->setText(searchItemTitle(engine,m_text));
+    m_iconLabel->setPixmap(Application::icon(url).pixmap(16));
+    m_url = KUrl(url);
+    m_currentEngine = engine;
+}
+
+
+void SearchListItem::nextItemSubChoice()
+{
+    m_engineBar->selectNextEngine();
+}
+
+
+EngineBar::EngineBar(QString text, QString selectedEngine, QWidget *parent)
+:KToolBar(parent)
+{
+    setIconSize(QSize(16,16));
+    setToolButtonStyle(Qt::ToolButtonIconOnly);
+    
+    m_engineGroup = new QActionGroup(this);
+    m_engineGroup->setExclusive(true);
+    
+    KConfig config("kuriikwsfilterrc"); //Share with konqueror
+    KConfigGroup cg = config.group("General");
+    QStringList favoriteEngines;
+    favoriteEngines << "wikipedia" << "google"; //defaults
+    favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
+    QString defaultEngine = cg.readEntry("DefaultSearchEngine", "google");
+    KService::Ptr service;
+    
+    service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine));
+    m_engineGroup->addAction(newEngineAction(service, selectedEngine, text));
     
-    if( _option.state.testFlag(QStyle::State_Selected) ||  _option.state.testFlag(QStyle::State_MouseOver) )
+    Q_FOREACH(const QString &engine, favoriteEngines)
     {
-        QPainter painter(this);
-        _option.rect = QRect(QPoint(),size());
-        style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &_option, &painter, this);
+        if(!engine.isEmpty())
+        {
+            service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
+            if(service && service->desktopEntryName()!=defaultEngine)
+            {
+                m_engineGroup->addAction(newEngineAction(service, selectedEngine, text));
+            }
+        }
     }
+    
+    addActions(m_engineGroup->actions());
 }
 
 
-void ListItem::enterEvent(QEvent *e)
+QString EngineBar::defaultEngine()
+{    
+    KConfig config("kuriikwsfilterrc"); //Share with konqueror
+    KConfigGroup cg = config.group("General");
+    QString d = cg.readEntry("DefaultSearchEngine", "google");
+    KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(d));
+    return service->name();
+}
+
+
+KAction *EngineBar::newEngineAction(KService::Ptr service, QString selectedEngine, QString text)
 {
-    _option.state |= QStyle::State_MouseOver;
-    update();
-    QWidget::enterEvent(e);
+    QString url = service->property("Query").toString();
+    url = url.replace("\\{@}",text);
+    KAction *a = new KAction(Application::icon(url), service->name(), this);
+    a->setCheckable(true);
+    if (service->name()==selectedEngine) a->setChecked(true);
+    a->setData(QStringList() << url << service->name());
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(changeSearchEngine()));
+
+    return a;
 }
 
 
-void ListItem::leaveEvent(QEvent *e)
+void EngineBar::changeSearchEngine()
 {
-    _option.state &= ~QStyle::State_MouseOver;
-    update();
-    QWidget::enterEvent(e);
+    KAction *a = qobject_cast<KAction*>(sender());
+    QStringList list = a->data().toStringList();    
+    emit searchEngineChanged(list.first(), list.last());
 }
 
 
-void ListItem::mousePressEvent(QMouseEvent *e)
+void EngineBar::selectNextEngine()
 {
-    emit itemClicked(this, e->button());
-    QWidget::mousePressEvent(e);
+     QList<QAction *> e = m_engineGroup->actions();
+     int i = 0;
+     while(i<e.count() && !e.at(i)->isChecked())
+     {
+         i++;
+     }
+     
+     if (i+1 == e.count())
+     {
+         e.at(0)->setChecked(true);
+         e.at(0)->trigger();
+     }
+     else
+     {
+         e.at(i+1)->setChecked(true);  
+         e.at(i+1)->trigger();
+     }
 }
+
+
+//--------------------------------------------------------------------------------------------
+
+
+BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
+:ListItem(item, parent)
+{
+    QString url = text;
+    layout()->addWidget(new ItemIcon(item.url.url()));
+    layout()->addWidget(new ItemText("Browse <i>http://" + url.remove("http://") + "</i>", text));
+    layout()->addWidget(new TypeIcon(item.type));
+}
+
+
+//--------------------------------------------------------------------------------------------
+
+
+ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text, QWidget *parent)
+{
+    ListItem *newItem;
+    
+    if (item.type & UrlSearchItem::Browse)
+    {
+        newItem = new BrowseListItem(item, text, parent);
+    }
+    else if (item.type & UrlSearchItem::Search)
+    {
+        newItem = new SearchListItem(item, text, parent);
+    }
+    else
+    {
+        newItem = new PreviewListItem(item, text, parent);
+    }
+    
+    return newItem;
+}
+
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 18ec8a33..6a6c433f 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -23,19 +23,25 @@
 *
 * ============================================================ */
 
-
 #ifndef LISTITEM_H
 #define LISTITEM_H
 
+// KDE Includes
+#include <KToolBar>
+#include <KAction>
+#include <KService>
+
+// Local Includes
+#include "urlresolver.h"
 
 // Qt Includes
 #include <QWidget>
 #include <QLayout>
 #include <QStyleOptionViewItemV4>
+#include <QLabel>
 
 // Forward Declarations
 class UrlSearchItem;
-class KUrl;
 
 
 class ListItem : public QWidget
@@ -44,11 +50,16 @@ class ListItem : public QWidget
 
 public:
     ListItem(const UrlSearchItem &item, QWidget *parent = 0);
-    ~ListItem();
+    virtual ~ListItem();
 
     void activate();
     void deactivate();
 
+    KUrl url();
+    
+public slots:
+    virtual void nextItemSubChoice();
+
 signals:
     void itemClicked(ListItem *item, Qt::MouseButton);
 
@@ -59,11 +70,135 @@ protected:
    virtual void mousePressEvent(QMouseEvent *e);
 
 private:
-    QString guessNameFromUrl(KUrl url);
-    void insertIcon(QLayout *layout, QString icon);
+    QStyleOptionViewItemV4 m_option;    
+ 
+protected:
+    KUrl m_url;
+};
+
+
+class TypeIcon : public QLabel
+{
+    Q_OBJECT
+    
+    public:
+        TypeIcon(int type, QWidget *parent = 0);
+    private:
+        QLabel *getIcon(QString icon);
+};
+
+
+class ItemIcon : public QLabel
+{
+    Q_OBJECT
+
+    public:
+        ItemIcon(QString icon, QWidget *parent = 0);
+};
+
+
+class ItemText : public QLabel
+{
+    Q_OBJECT
+    
+    public:
+        ItemText(QString text, QString underlined, QWidget *parent = 0);
+        QString underlineText(QString text, QString textToUnderline);
+};
+
+
+//-------------------------------------------------------------------------------------------------
+
+class EngineBar : public KToolBar
+{
+    Q_OBJECT
+    
+    public:
+        EngineBar(QString text, QString selectedEngine, QWidget *parent = 0);
+        static QString defaultEngine();
+        void selectNextEngine();
+        
+    signals:
+        void searchEngineChanged(QString url, QString engine);
+
+    private slots:
+        void changeSearchEngine();
+    
+    private:
+        KAction *newEngineAction(KService::Ptr service, QString selectedEngine, QString text);
+
+        QActionGroup *m_engineGroup;
+};
+
+
+class SearchListItem : public ListItem
+{
+    Q_OBJECT
+    
+    public:
+        SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+        
+    public slots:
+        virtual void nextItemSubChoice();
+
+    protected:
+        
+        
+    private slots:
+        void changeSearchEngine(QString url, QString engine);
+        
+    private:
+        QString searchItemTitle(QString engine, QString text);
+        ItemText* m_titleLabel;
+        ItemIcon* m_iconLabel;
+        EngineBar* m_engineBar;
+        QString m_text;
+        static QString m_currentEngine;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+
+class PreviewListItem : public ListItem
+{
+    Q_OBJECT
+    
+    public:
+        PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+};
+
+
+class ItemPreview : public QLabel
+{
+    Q_OBJECT
+    
+    public:
+        ItemPreview(QString url,int width, int height, QWidget *parent = 0);
+
+    private:
+        static QString guessNameFromUrl(QUrl url);
+};
+
+//-------------------------------------------------------------------------------------------------
+
+class BrowseListItem : public ListItem
+{
+    Q_OBJECT
     
-    QStyleOptionViewItemV4 _option;
+    public:
+        BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    protected:
+
+};
+
+//-------------------------------------------------------------------------------------------------
+
+class ListItemFactory
+{
+    public:
+        static ListItem *create(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+        
 };
 
 
-#endif // LISTITEM_H
+#endif
\ No newline at end of file
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 051277e2..4abd4622 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -216,7 +216,7 @@ void UrlBar::suggestUrls(const QString &text)
     if(list.count() > 0)
     {
         _box->clear();
-        _box->insertSearchList(list);
+        _box->insertSearchList(list, text);
         _box->popup();
     }
 }
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 4ff6b461..fd4cdfcb 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -60,7 +60,7 @@ bool UrlSearchItem::operator==(UrlSearchItem i)
 }
 
 UrlResolver::UrlResolver(const QString &typedUrl)
-    : _urlString( typedUrl.trimmed() )
+    : _urlString(typedUrl.trimmed())
 {
 }
 
@@ -78,19 +78,15 @@ UrlSearchList UrlResolver::orderedSearchItems()
     if(isHttp())
     {
         list << qurlFromUserInputResolution();
-        list << webSearchesResolution();
-    }
-    else
-    {  
-        list << webSearchesResolution();
-        list << qurlFromUserInputResolution();
     }
+        
+    list << webSearchesResolution();
 
     if (_urlString.length()>2)
     {
         int firstResults = list.count();
         int checkPoint = 9 - firstResults;
-
+        
         UrlSearchList historyList = historyResolution();
         int historyResults = historyList.count();
 
@@ -136,7 +132,12 @@ UrlSearchList UrlResolver::orderedSearchItems()
 
 bool UrlResolver::isHttp()
 {
-    QString r = "[\\d\\w-.]+\\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|"\
+    QString ipv4 = "^0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])"\
+    "\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
+    
+    QString ipv6 = "^([0-9a-fA-F]{4}|0)(\\:([0-9a-fA-F]{4}|0)){7}";
+    
+    QString address = "[\\d\\w-.]+\\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|"\
     "c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|"\
     "h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|"\
     "m[acdghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eouw]|"\
@@ -144,9 +145,11 @@ bool UrlResolver::isHttp()
     "y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\
     "pro)";
 
-    return (QRegExp(r, Qt::CaseInsensitive).indexIn(_urlString) != -1) 
-            || _urlString.startsWith("http:") 
-            || _urlString.startsWith("https:");
+    return _urlString.startsWith("http://")  
+            || _urlString.startsWith("https://")
+            || (QRegExp(address, Qt::CaseInsensitive).indexIn(_urlString) != -1)
+            || (QRegExp(ipv4, Qt::CaseInsensitive).indexIn(_urlString) != -1)
+            || (QRegExp(ipv6, Qt::CaseInsensitive).indexIn(_urlString) != -1);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -156,19 +159,8 @@ bool UrlResolver::isHttp()
 // STEP 1 = QUrl from User Input (easily the best solution... )
 UrlSearchList UrlResolver::qurlFromUserInputResolution()
 {
-    UrlSearchList list;
-    
-    QString url2 = _urlString;
-    QUrl urlFromUserInput = QUrl::fromUserInput(url2);
-    if(urlFromUserInput.isValid())
-    {
-        KUrl gUrl(urlFromUserInput);
-        QString gTitle = i18n("Browse");
-        UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle);
-        list << gItem;
-    }
-    
-    return list;
+    UrlSearchItem gItem(UrlSearchItem::Browse, KUrl(_urlString), QString());
+    return UrlSearchList() << gItem;
 }
 
 
@@ -176,14 +168,12 @@ UrlSearchList UrlResolver::qurlFromUserInputResolution()
 UrlSearchList UrlResolver::webSearchesResolution()
 {
     UrlSearchList list;
-    
-    KUrl url1(_urlString);
-    if(url1.isRelative())
+
+    if(KUrl(_urlString).isRelative())
     {
-        // KUriFilter has the worst performance possible here and let this trick unusable
-        KUrl gUrl( QString("gg:") + _urlString );
-        QString gTitle = i18n("Search Google for %1", _urlString);
-        UrlSearchItem gItem(UrlSearchItem::Search, gUrl, gTitle );
+        QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(_urlString);
+        QString gTitle = i18n("Search Google for ") + _urlString;
+        UrlSearchItem gItem(UrlSearchItem::Search, KUrl(), gTitle);
         list << gItem;
     }
 
@@ -200,7 +190,7 @@ UrlSearchList UrlResolver::historyResolution()
     QStringList historyResults = historyCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, historyResults)
     {
-        UrlSearchItem it(UrlSearchItem::History, KUrl(s), Application::historyManager()->titleForHistoryUrl(s) ); //, QString("view-history"));
+        UrlSearchItem it(UrlSearchItem::History, KUrl(s), Application::historyManager()->titleForHistoryUrl(s));
         list << it;
     }
 
@@ -217,7 +207,7 @@ UrlSearchList UrlResolver::bookmarksResolution()
     QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
     Q_FOREACH(const QString &s, bookmarkResults)
     {
-        UrlSearchItem it(UrlSearchItem::Bookmark, KUrl(s), Application::bookmarkProvider()->titleForBookmarkUrl(s) ); //, QString("rating") );
+        UrlSearchItem it(UrlSearchItem::Bookmark, KUrl(s), Application::bookmarkProvider()->titleForBookmarkUrl(s));
         list << it;
     }
 
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 3c082e00..610b1fd0 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -27,7 +27,6 @@
 #ifndef URL_RESOLVER_H
 #define URL_RESOLVER_H
 
-
 // KDE Includes
 #include <KUrl>
 
@@ -43,21 +42,21 @@ class UrlSearchItem
 
     enum types 
     { 
-        Search     = 0x00000001,
-        Browse     = 0x00000010,
-        History    = 0x00000100,
-        Bookmark   = 0x00001000,
-        Suggestion = 0x00010000,
+        Search          = 0x00000001,
+        Browse          = 0x00000010,
+        History         = 0x00000100,
+        Bookmark        = 0x00001000,
     };   
 
     int type;
     KUrl url;
     QString title;
+    QString icon;
 
-    UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString())
-        : type(_type), url(_url), title(_title)
+    UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString(), const QString &_icon = QString())
+    : type(_type), url(_url), title(_title), icon(_icon)
     {};
-    
+
     bool operator==(UrlSearchItem i);
 };
 
@@ -75,7 +74,7 @@ public:
     UrlSearchList orderedSearchItems();
 
 private:
-    QString _urlString;
+    QString _urlString; //TODO: give a better name
 
     UrlSearchList webSearchesResolution();
     UrlSearchList historyResolution();
-- 
cgit v1.2.1


From 5abfd807fcadc72235872ee874bef85246001a88 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 15 Apr 2010 23:55:38 +0200
Subject: Mouse move autoscroll implementation

---
 src/webview.cpp | 44 +++++++++++++++++++++++++++++++++++++++-----
 src/webview.h   |  6 ++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/webview.cpp b/src/webview.cpp
index e874411d..6f6ec128 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -66,7 +66,8 @@ WebView::WebView(QWidget* parent)
     , _scrollTimer( new QTimer(this) )
     , _VScrollSpeed(0)
     , _HScrollSpeed(0)
-    , _disableAutoScroll(false)
+    , _canEnableAutoScroll(true)
+    , _isAutoScrollEnabled(false)
 {
     WebPage *page = new WebPage(this);
     setPage(page);
@@ -321,27 +322,60 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
 
 void WebView::mousePressEvent(QMouseEvent *event)
 {
-    QWebHitTestResult result = page()->mainFrame()->hitTestContent( event->pos() );
-    _disableAutoScroll = result.isContentEditable();
+    if(_isAutoScrollEnabled)
+    {
+        setCursor(Qt::ArrowCursor);
+        _VScrollSpeed = 0;
+        _HScrollSpeed = 0;
+        _scrollTimer->stop();
+        _isAutoScrollEnabled = false;
+        return;
+    }
     
+    QWebHitTestResult result = page()->mainFrame()->hitTestContent( event->pos() );
+    _canEnableAutoScroll = !result.isContentEditable()  && result.linkUrl().isEmpty();
+        
     switch(event->button())
     {
       case Qt::XButton1:
         triggerPageAction(KWebPage::Back);
         break;
+      
       case Qt::XButton2:
         triggerPageAction(KWebPage::Forward);
         break;
+      
+      case Qt::MidButton:
+        if(_canEnableAutoScroll && !_isAutoScrollEnabled)
+        {
+            setCursor( KIcon("transform-move").pixmap(32) );
+            _clickPos = event->pos();
+            _isAutoScrollEnabled = true;
+        }
+        break;
+        
       default:
-        KWebView::mousePressEvent(event);
         break;
     };
+    KWebView::mousePressEvent(event);
 }
 
 
 void WebView::mouseMoveEvent(QMouseEvent *event)
 {
     _mousePos = event->pos();
+    
+    if(_isAutoScrollEnabled)
+    {
+        QPoint r = _mousePos - _clickPos;
+        _HScrollSpeed = r.x() / 2;  // you are too fast..
+        _VScrollSpeed = r.y() / 2;
+        if( !_scrollTimer->isActive() )
+                _scrollTimer->start();
+        
+        return;
+    }
+    
     if (Application::instance()->mainWindow()->isFullScreen())
     {        
         if (event->pos().y()>=0 && event->pos().y()<=4)
@@ -430,7 +464,7 @@ void WebView::keyPressEvent(QKeyEvent *event)
         }
     }
  
-    if(_disableAutoScroll)
+    if(!_canEnableAutoScroll)
     {
         KWebView::keyPressEvent(event);
         return;
diff --git a/src/webview.h b/src/webview.h
index 0fe83ae4..c6ca2688 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -52,7 +52,7 @@ public:
 
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
-    void mousePressEvent(QMouseEvent *event);   // need to be ported
+    void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
     void keyPressEvent(QKeyEvent *event);
 
@@ -75,11 +75,13 @@ signals:
     
 private:
     QPoint _mousePos;
+    QPoint _clickPos;
 
     QTimer *_scrollTimer;
     int _VScrollSpeed;
     int _HScrollSpeed;
-    bool _disableAutoScroll;
+    bool _canEnableAutoScroll;
+    bool _isAutoScrollEnabled;
 };
 
 #endif
-- 
cgit v1.2.1


From 72e0446fbc7017e7703102f733568a4f2e3c5195 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 16 Apr 2010 03:14:48 +0200
Subject: Fixing Lionel's merge request:

- clean/fix APIs

- removed no more used methods/signals from CompletionWidget

- use item->url() (as it has been defined)

- Change the "pointing out text" from underline to bold (better, IMO)

- QString --> Q/K url, as needed

- Restore UrlFromUserInput engine: why it has been deleted?

- Comment out the isHttp() check. That way I cannot in any way connect
to localhost or to my home server. Apart from typing their IPs..

- Partially fixed the switch search engine implementation. Btw, I have to say
I really don't like rekonq switch my default engine just because one time I decided
to give a try to another... Not sure about.

- Something more coming.. But tomorrow! Now it's 3:20 am here.
Good night!
---
 src/urlbar/completionwidget.cpp |  19 +++---
 src/urlbar/completionwidget.h   |   1 -
 src/urlbar/listitem.cpp         |  86 ++++++++++++++----------
 src/urlbar/listitem.h           | 142 +++++++++++++++++++++++-----------------
 src/urlbar/urlbar.cpp           |  22 +++----
 src/urlbar/urlbar.h             |   3 +-
 src/urlbar/urlresolver.cpp      |  56 ++++++++++------
 src/urlbar/urlresolver.h        |   7 +-
 8 files changed, 194 insertions(+), 142 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 42824af9..83e99f9d 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -45,8 +45,8 @@
 #include <QKeyEvent>
 
 
-CompletionWidget::CompletionWidget( QWidget *parent)
-    :QFrame( parent, Qt::ToolTip)
+CompletionWidget::CompletionWidget(QWidget *parent)
+    : QFrame( parent, Qt::ToolTip)
     , _parent(parent)
     , _currentIndex(-1)
 {
@@ -206,12 +206,12 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                     
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
-                    hide();
-                    if(_currentIndex >= 0)
-                        emit chosenUrl(_list.at(_currentIndex).url, Rekonq::CurrentTab);
-                    else
-                        emit loadTypedUrl();
+
+                    // need this to let ListItem magic work..
+                    ListItem *child = findChild<ListItem *>( QString::number(_currentIndex) );
+                    emit chosenUrl( child->url(), Rekonq::CurrentTab);                                              
                     ev->accept();
+                    hide();
                     return true;
                     break;
             }
@@ -233,6 +233,7 @@ void CompletionWidget::setVisible( bool visible )
         Application::instance()->removeEventFilter(this);
     }
     
+
     QFrame::setVisible(visible);
 }
 
@@ -240,8 +241,8 @@ void CompletionWidget::setVisible( bool visible )
 void CompletionWidget::itemChosen(ListItem *item, Qt::MouseButton button)
 {
     if(button == Qt::MidButton)
-        emit chosenUrl(_list.at(layout()->indexOf(item)).url, Rekonq::NewCurrentTab);
+        emit chosenUrl( item->url(), Rekonq::NewCurrentTab);
     else
-        emit chosenUrl(_list.at(layout()->indexOf(item)).url, Rekonq::CurrentTab);
+        emit chosenUrl( item->url(), Rekonq::CurrentTab);
     hide();
 }
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 25b6f5eb..125e186a 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -60,7 +60,6 @@ private slots:
 signals:
     void chosenUrl(const KUrl &, Rekonq::OpenType);
     void nextItemSubChoice();
-    void loadTypedUrl();
     
 private:
     void sizeAndPosition();
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index ef09d4f3..7d1d39b2 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -40,7 +40,6 @@
 #include <KConfigGroup>
 #include <KIcon>
 
-
 // Qt Includes
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -147,8 +146,11 @@ void ListItem::nextItemSubChoice()
 }
 
 
+// ---------------------------------------------------------------
+
+
 TypeIcon::TypeIcon(int type, QWidget *parent)
-:QLabel(parent)
+    : QLabel(parent)
 {
     setMinimumWidth(40);
     QHBoxLayout *hLayout = new QHBoxLayout;
@@ -173,9 +175,11 @@ QLabel *TypeIcon::getIcon(QString icon)
 }
 
 
+// ---------------------------------------------------------------
+
 
-ItemIcon::ItemIcon(QString icon, QWidget *parent)
-:QLabel(parent)
+ItemIcon::ItemIcon(const QString &icon, QWidget *parent)
+    : QLabel(parent)
 {
     QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(icon)).pixmap(16);
     if (pixmapIcon.isNull())
@@ -188,18 +192,16 @@ ItemIcon::ItemIcon(QString icon, QWidget *parent)
 }
 
 
-ItemText::ItemText(QString text, QString underlined, QWidget *parent)
-:QLabel(underlineText(text,underlined), parent)
-{
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-}
+// ---------------------------------------------------------------
 
 
-QString ItemText::underlineText(QString text, QString textToUnderline)
+ItemText::ItemText(const QString &text, const QString &textToPointOut, QWidget *parent)
+    : QLabel(parent)
 {
     QString t = text;
-    t = t.replace(QRegExp("("+textToUnderline+")", Qt::CaseInsensitive), "<u>\\1</u>");
-    return t;
+    t = t.replace(QRegExp("(" + textToPointOut + ")", Qt::CaseInsensitive), "<b>\\1</b>");
+    setText(t);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
 }
 
 
@@ -207,7 +209,7 @@ QString ItemText::underlineText(QString text, QString textToUnderline)
 
 
 PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
-:ListItem(item, parent)
+    : ListItem(item, parent)
 {
     QLabel *previewLabelIcon = new QLabel;
     previewLabelIcon->setFixedSize(45,33);
@@ -225,13 +227,16 @@ PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text,
 }
 
 
-ItemPreview::ItemPreview(QString url, int width, int height, QWidget *parent)
-:QLabel(parent)
+// ---------------------------------------------------------------
+
+
+ItemPreview::ItemPreview(const QString &url, int width, int height, QWidget *parent)
+    : QLabel(parent)
 {
     setFixedSize(width, height);
     setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
 
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(url) + ".png", true);
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl( QUrl(url) ) + ".png", true);
     if(QFile::exists(path))
     {     
         QPixmap preview;
@@ -260,12 +265,16 @@ QString ItemPreview::guessNameFromUrl(QUrl url)
     return name;
 }
 
-//--------------------------------------------------------------------------------------------
+
+// ---------------------------------------------------------------
+
+
 QString SearchListItem::m_currentEngine = "";
 
+
 SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
-    :ListItem(item, parent)
-    ,m_text(text)
+    : ListItem(item, parent)
+    , m_text(text)
 {
     if (m_currentEngine == "") m_currentEngine = EngineBar::defaultEngine();
     
@@ -273,6 +282,9 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
     m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text), text);
     m_engineBar = new EngineBar(text, m_currentEngine, this);
     
+    // without this it will not work :)
+    m_url = m_engineBar->url();
+    
     layout()->addWidget(m_iconLabel);
     layout()->addWidget(m_titleLabel);
     layout()->addWidget(new QLabel("Engines: "));
@@ -292,8 +304,9 @@ QString SearchListItem::searchItemTitle(QString engine, QString text)
 void SearchListItem::changeSearchEngine(QString url, QString engine)
 {
     m_titleLabel->setText(searchItemTitle(engine,m_text));
-    m_iconLabel->setPixmap(Application::icon(url).pixmap(16));
-    m_url = KUrl(url);
+    m_iconLabel->setPixmap(Application::icon( KUrl(url) ).pixmap(16));
+    QString url2 = url.replace("\\{@}",m_text);
+    m_url = KUrl(url2);
     m_currentEngine = engine;
 }
 
@@ -304,9 +317,9 @@ void SearchListItem::nextItemSubChoice()
 }
 
 
-EngineBar::EngineBar(QString text, QString selectedEngine, QWidget *parent)
-:KToolBar(parent)
-{
+EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent)
+    : KToolBar(parent)
+{   
     setIconSize(QSize(16,16));
     setToolButtonStyle(Qt::ToolButtonIconOnly);
     
@@ -322,7 +335,12 @@ EngineBar::EngineBar(QString text, QString selectedEngine, QWidget *parent)
     KService::Ptr service;
     
     service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine));
-    m_engineGroup->addAction(newEngineAction(service, selectedEngine, text));
+    m_engineGroup->addAction(newEngineAction(service, selectedEngine));
+    
+    // set url;
+    QString url = service->property("Query").toString();
+    url = url.replace("\\{@}",text);
+    m_url = KUrl(url);
     
     Q_FOREACH(const QString &engine, favoriteEngines)
     {
@@ -331,7 +349,7 @@ EngineBar::EngineBar(QString text, QString selectedEngine, QWidget *parent)
             service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
             if(service && service->desktopEntryName()!=defaultEngine)
             {
-                m_engineGroup->addAction(newEngineAction(service, selectedEngine, text));
+                m_engineGroup->addAction(newEngineAction(service, selectedEngine));
             }
         }
     }
@@ -350,13 +368,14 @@ QString EngineBar::defaultEngine()
 }
 
 
-KAction *EngineBar::newEngineAction(KService::Ptr service, QString selectedEngine, QString text)
+KAction *EngineBar::newEngineAction(KService::Ptr service, QString selectedEngine)
 {
-    QString url = service->property("Query").toString();
-    url = url.replace("\\{@}",text);
-    KAction *a = new KAction(Application::icon(url), service->name(), this);
+    KAction *a = new KAction(Application::icon(m_url), service->name(), this);
     a->setCheckable(true);
     if (service->name()==selectedEngine) a->setChecked(true);
+    
+    QString url = service->property("Query").toString();
+    
     a->setData(QStringList() << url << service->name());
     connect(a, SIGNAL(triggered(bool)), this, SLOT(changeSearchEngine()));
 
@@ -394,11 +413,11 @@ void EngineBar::selectNextEngine()
 }
 
 
-//--------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------
 
 
 BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
-:ListItem(item, parent)
+    : ListItem(item, parent)
 {
     QString url = text;
     layout()->addWidget(new ItemIcon(item.url.url()));
@@ -407,7 +426,7 @@ BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, Q
 }
 
 
-//--------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------
 
 
 ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text, QWidget *parent)
@@ -429,4 +448,3 @@ ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text
     
     return newItem;
 }
-
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 6a6c433f..e355160a 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -23,17 +23,19 @@
 *
 * ============================================================ */
 
+
 #ifndef LISTITEM_H
 #define LISTITEM_H
 
+
+// Local Includes
+#include "urlresolver.h"
+
 // KDE Includes
 #include <KToolBar>
 #include <KAction>
 #include <KService>
 
-// Local Includes
-#include "urlresolver.h"
-
 // Qt Includes
 #include <QWidget>
 #include <QLayout>
@@ -77,128 +79,146 @@ protected:
 };
 
 
+// -------------------------------------------------------------------------
+
+
 class TypeIcon : public QLabel
 {
     Q_OBJECT
     
-    public:
-        TypeIcon(int type, QWidget *parent = 0);
-    private:
-        QLabel *getIcon(QString icon);
+public:
+    TypeIcon(int type, QWidget *parent = 0);
+
+private:
+    QLabel *getIcon(QString icon);
 };
 
 
+// -------------------------------------------------------------------------
+
+
 class ItemIcon : public QLabel
 {
     Q_OBJECT
 
-    public:
-        ItemIcon(QString icon, QWidget *parent = 0);
+public:
+    ItemIcon(const QString &icon, QWidget *parent = 0);
 };
 
 
+// -------------------------------------------------------------------------
+
+
 class ItemText : public QLabel
 {
     Q_OBJECT
     
-    public:
-        ItemText(QString text, QString underlined, QWidget *parent = 0);
-        QString underlineText(QString text, QString textToUnderline);
+public:
+    ItemText(const QString &text, const QString &textToPointOut, QWidget *parent = 0);
 };
 
 
-//-------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------
+
 
 class EngineBar : public KToolBar
 {
     Q_OBJECT
     
-    public:
-        EngineBar(QString text, QString selectedEngine, QWidget *parent = 0);
-        static QString defaultEngine();
-        void selectNextEngine();
-        
-    signals:
-        void searchEngineChanged(QString url, QString engine);
-
-    private slots:
-        void changeSearchEngine();
+public:
+    EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent = 0);
+    static QString defaultEngine();
+    void selectNextEngine();
+    KUrl url() { return m_url; };
     
-    private:
-        KAction *newEngineAction(KService::Ptr service, QString selectedEngine, QString text);
+signals:
+    void searchEngineChanged(QString url, QString engine);
+
+private slots:
+    void changeSearchEngine();
+
+private:
+    KAction *newEngineAction(KService::Ptr service, QString selectedEngine);
 
-        QActionGroup *m_engineGroup;
+    QActionGroup *m_engineGroup;
+    KUrl m_url;
 };
 
 
+// -------------------------------------------------------------------------
+
+
 class SearchListItem : public ListItem
 {
     Q_OBJECT
     
-    public:
-        SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
-        
-    public slots:
-        virtual void nextItemSubChoice();
-
-    protected:
-        
-        
-    private slots:
-        void changeSearchEngine(QString url, QString engine);
-        
-    private:
-        QString searchItemTitle(QString engine, QString text);
-        ItemText* m_titleLabel;
-        ItemIcon* m_iconLabel;
-        EngineBar* m_engineBar;
-        QString m_text;
-        static QString m_currentEngine;
+public:
+    SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    
+public slots:
+    virtual void nextItemSubChoice();
+    
+private slots:
+    void changeSearchEngine(QString url, QString engine);
+    
+private:
+    QString searchItemTitle(QString engine, QString text);
+    ItemText* m_titleLabel;
+    ItemIcon* m_iconLabel;
+    EngineBar* m_engineBar;
+    QString m_text;
+    
+    static QString m_currentEngine;
 };
 
 
-//-------------------------------------------------------------------------------------------------
+// -------------------------------------------------------------------------
+
 
 class PreviewListItem : public ListItem
 {
     Q_OBJECT
     
-    public:
-        PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+public:
+    PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
 };
 
 
+// -------------------------------------------------------------------------
+
+
 class ItemPreview : public QLabel
 {
     Q_OBJECT
     
-    public:
-        ItemPreview(QString url,int width, int height, QWidget *parent = 0);
+public:
+    ItemPreview(const QString &url, int width, int height, QWidget *parent = 0);
 
-    private:
-        static QString guessNameFromUrl(QUrl url);
+private:
+    static QString guessNameFromUrl(QUrl url);
 };
 
-//-------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------------------------------
+
 
 class BrowseListItem : public ListItem
 {
     Q_OBJECT
     
-    public:
-        BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
-    protected:
-
+public:
+    BrowseListItem(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
 };
 
+
 //-------------------------------------------------------------------------------------------------
 
+
 class ListItemFactory
 {
-    public:
-        static ListItem *create(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
-        
+public:
+    static ListItem *create(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 4abd4622..4e7310bf 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -72,7 +72,9 @@ UrlBar::UrlBar(QWidget *parent)
     // suggestions
     installEventFilter(_box);
     connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
-    connect(_box, SIGNAL(loadTypedUrl()), this, SLOT(activated()));
+    
+    // load typed urls
+    connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &)));
 }
 
 
@@ -104,16 +106,8 @@ void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
     disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
     
     clearFocus();
-    KUrl loadingUrl;
-    
-    if(url.isEmpty())
-        loadingUrl = KUrl(text());
-    else
-        loadingUrl = url;
-    
-    setUrl(loadingUrl);
-    
-    Application::instance()->loadUrl(loadingUrl, type);
+    setUrl(url);
+    Application::instance()->loadUrl(url, type);
 }
 
 
@@ -278,3 +272,9 @@ void UrlBar::loadFinished()
     
     update();
 }
+
+
+void UrlBar::loadTyped(const QString &text)
+{
+    activated(KUrl(text));
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 684a205e..804188f7 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -60,11 +60,12 @@ public:
     void setPrivateMode(bool on);
 
 private slots:
-    void activated(const KUrl& url = KUrl(), Rekonq::OpenType = Rekonq::CurrentTab);
+    void activated(const KUrl& url, Rekonq::OpenType = Rekonq::CurrentTab);
     void suggestUrls(const QString &editedText);
     void setQUrl(const QUrl &url);
 
     void loadFinished();
+    void loadTyped(const QString &);
     
 protected:
     virtual void paintEvent(QPaintEvent *event);
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index fd4cdfcb..5b4b1625 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -45,8 +45,10 @@
 #include <QByteArray>
 #include <QUrl>
 
+// defines
 #define MAX_ELEMENTS 9
 
+
 // NOTE default kurifilter plugin list (at least in my box)
 // 1. "kshorturifilter"
 // 2. "kurisearchfilter"
@@ -54,13 +56,15 @@
 // 4 ."kuriikwsfilter"
 // 5. "fixhosturifilter"
 
+
 bool UrlSearchItem::operator==(UrlSearchItem i)
 { 
     return url==i.url; 
 }
 
+
 UrlResolver::UrlResolver(const QString &typedUrl)
-    : _urlString(typedUrl.trimmed())
+    : _typedString(typedUrl.trimmed())
 {
 }
 
@@ -75,15 +79,17 @@ UrlSearchList UrlResolver::orderedSearchItems()
     
     UrlSearchList list;
     
-    if(isHttp())
-    {
-        list << qurlFromUserInputResolution();
-    }
+//     if(isHttp())
+//     {
+//         list << qurlFromUserInputResolution();
+//     }
         
     list << webSearchesResolution();
 
-    if (_urlString.length()>2)
+    if (_typedString.length() >= 2)
     {
+        list << qurlFromUserInputResolution();
+        
         int firstResults = list.count();
         int checkPoint = 9 - firstResults;
         
@@ -145,13 +151,14 @@ bool UrlResolver::isHttp()
     "y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\
     "pro)";
 
-    return _urlString.startsWith("http://")  
-            || _urlString.startsWith("https://")
-            || (QRegExp(address, Qt::CaseInsensitive).indexIn(_urlString) != -1)
-            || (QRegExp(ipv4, Qt::CaseInsensitive).indexIn(_urlString) != -1)
-            || (QRegExp(ipv6, Qt::CaseInsensitive).indexIn(_urlString) != -1);
+    return _typedString.startsWith("http://")  
+            || _typedString.startsWith("https://")
+            || (QRegExp(address, Qt::CaseInsensitive).indexIn(_typedString) != -1)
+            || (QRegExp(ipv4, Qt::CaseInsensitive).indexIn(_typedString) != -1)
+            || (QRegExp(ipv6, Qt::CaseInsensitive).indexIn(_typedString) != -1);
 }
 
+
 //////////////////////////////////////////////////////////////////////////
 // PRIVATE ENGINES
 
@@ -159,8 +166,18 @@ bool UrlResolver::isHttp()
 // STEP 1 = QUrl from User Input (easily the best solution... )
 UrlSearchList UrlResolver::qurlFromUserInputResolution()
 {
-    UrlSearchItem gItem(UrlSearchItem::Browse, KUrl(_urlString), QString());
-    return UrlSearchList() << gItem;
+    UrlSearchList list;
+    QString url2 = _typedString;
+    QUrl urlFromUserInput = QUrl::fromUserInput(url2);
+    if(urlFromUserInput.isValid())
+    {
+        KUrl gUrl(urlFromUserInput);
+        QString gTitle = i18n("Browse");
+        UrlSearchItem gItem(UrlSearchItem::Browse, gUrl, gTitle);
+        list << gItem;
+    }
+
+    return list;
 }
 
 
@@ -169,11 +186,9 @@ UrlSearchList UrlResolver::webSearchesResolution()
 {
     UrlSearchList list;
 
-    if(KUrl(_urlString).isRelative())
-    {
-        QString gUrl = QString("http://www.google.com/search?q=%1&ie=UTF-8&oe=UTF-8").arg(_urlString);
-        QString gTitle = i18n("Search Google for ") + _urlString;
-        UrlSearchItem gItem(UrlSearchItem::Search, KUrl(), gTitle);
+    if(KUrl(_typedString).isRelative())
+    {        
+        UrlSearchItem gItem(UrlSearchItem::Search, KUrl(), QString() );    // others will find this url..
         list << gItem;
     }
 
@@ -187,7 +202,7 @@ UrlSearchList UrlResolver::historyResolution()
     UrlSearchList list;
     
     KCompletion *historyCompletion = Application::historyManager()->completionObject();
-    QStringList historyResults = historyCompletion->substringCompletion(_urlString);
+    QStringList historyResults = historyCompletion->substringCompletion(_typedString);
     Q_FOREACH(const QString &s, historyResults)
     {
         UrlSearchItem it(UrlSearchItem::History, KUrl(s), Application::historyManager()->titleForHistoryUrl(s));
@@ -204,13 +219,12 @@ UrlSearchList UrlResolver::bookmarksResolution()
     UrlSearchList list;
     
     KCompletion *bookmarkCompletion = Application::bookmarkProvider()->completionObject();
-    QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_urlString);
+    QStringList bookmarkResults = bookmarkCompletion->substringCompletion(_typedString);
     Q_FOREACH(const QString &s, bookmarkResults)
     {
         UrlSearchItem it(UrlSearchItem::Bookmark, KUrl(s), Application::bookmarkProvider()->titleForBookmarkUrl(s));
         list << it;
     }
 
-
     return list;
 }
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 610b1fd0..22a9de4f 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -51,10 +51,9 @@ class UrlSearchItem
     int type;
     KUrl url;
     QString title;
-    QString icon;
 
-    UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString(), const QString &_icon = QString())
-    : type(_type), url(_url), title(_title), icon(_icon)
+    UrlSearchItem(const int &_type, const KUrl &_url, const QString &_title = QString())
+    : type(_type), url(_url), title(_title)
     {};
 
     bool operator==(UrlSearchItem i);
@@ -74,7 +73,7 @@ public:
     UrlSearchList orderedSearchItems();
 
 private:
-    QString _urlString; //TODO: give a better name
+    QString _typedString;
 
     UrlSearchList webSearchesResolution();
     UrlSearchList historyResolution();
-- 
cgit v1.2.1


From d8ea755c2b4ce9c22bf7543b3f345d90f434e8cf Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Fri, 16 Apr 2010 17:32:38 +0200
Subject: Fix a bug in NewTabPage::snapFinished When you started to load
 closedTabs and opened favorites, previews were replaced when background load
 of previews finished. Changes : - preview titles are saved only when urls
 match - previews are replaced only when urls match - added some checks to
 prevent NewTabPage to have strange behaviour in the future

---
 src/newtabpage.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 043648e7..d7671937 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -283,20 +283,9 @@ void NewTabPage::setupPreview(QWebElement e, int index)
 
 void NewTabPage::snapFinished(int index, const KUrl &url, const QString &title)
 {
-    // do not try to modify the page if it isn't the newTabPage
-    if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
-        return;
-    
-    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
-    QWebElement newPrev = validPreview(index, url, title);
-    
-    if(m_root.findAll(".closedTabs").count() != 0)
-        hideControls(newPrev);
-    
-    prev.replace(newPrev);
-    
-    // update title
-    if(m_root.findAll(".favorites").count() != 0)
+    // Update title if necessary
+    QStringList urls = ReKonfig::previewUrls();
+    if(KUrl(urls.at(index)) == url)
     {
         QStringList names = ReKonfig::previewNames();
         names.replace(index, title);
@@ -304,6 +293,23 @@ void NewTabPage::snapFinished(int index, const KUrl &url, const QString &title)
         
         ReKonfig::self()->writeConfig();
     }
+    
+    // Update page, but only if open
+    if(m_root.document().findAll("#rekonq-newtabpage").count() == 0)
+        return;
+    if(m_root.findAll(".favorites").count() == 0 && m_root.findAll(".closedTabs").count() == 0)
+        return;
+        
+    QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString());
+    if(KUrl(prev.findFirst("a").attribute("href")) == url)
+    {
+        QWebElement newPrev = validPreview(index, url, title);
+        
+        if(m_root.findAll(".closedTabs").count() != 0)
+            hideControls(newPrev);
+        
+        prev.replace(newPrev);
+    }
 }
 
 
-- 
cgit v1.2.1


From 3f43542ea6857760d1da6b78ebc152ca4bfc286b Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Fri, 16 Apr 2010 22:14:38 +0200
Subject: fix text pointed in the search item

---
 src/urlbar/listitem.cpp | 8 +++++---
 src/urlbar/listitem.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 7d1d39b2..6f91aabd 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -199,7 +199,9 @@ ItemText::ItemText(const QString &text, const QString &textToPointOut, QWidget *
     : QLabel(parent)
 {
     QString t = text;
-    t = t.replace(QRegExp("(" + textToPointOut + ")", Qt::CaseInsensitive), "<b>\\1</b>");
+    if (!textToPointOut.isEmpty())
+        t = t.replace(QRegExp("(" + textToPointOut + ")", Qt::CaseInsensitive), "<b>\\1</b>");
+
     setText(t);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
 }
@@ -279,7 +281,7 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
     if (m_currentEngine == "") m_currentEngine = EngineBar::defaultEngine();
     
     m_iconLabel = new ItemIcon("edit-find", this); //TODO: get the default engine icon
-    m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text), text);
+    m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text));
     m_engineBar = new EngineBar(text, m_currentEngine, this);
     
     // without this it will not work :)
@@ -297,7 +299,7 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
 
 QString SearchListItem::searchItemTitle(QString engine, QString text)
 {
-    return QString("Search "+ engine +" for <u>"+text+"</u>");
+    return QString("Search "+ engine +" for <b>"+text+"</b>");
 }
 
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index e355160a..2f6f898a 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -114,7 +114,7 @@ class ItemText : public QLabel
     Q_OBJECT
     
 public:
-    ItemText(const QString &text, const QString &textToPointOut, QWidget *parent = 0);
+    ItemText(const QString &text, const QString &textToPointOut = QString(), QWidget *parent = 0);
 };
 
 
-- 
cgit v1.2.1


From 91617e9098ba903081886bd5fd6ae827deaec9f8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 17 Apr 2010 11:10:54 +0200
Subject: As we are providing an "Add preview" mechanism, no need to show 6
 empty squares..

---
 src/rekonq.kcfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index ea09acbc..c999d063 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -34,10 +34,10 @@
 <!-- New Tab Page Settings -->
   <group name="NewTabPage">
     <entry name="previewNames" type="StringList">
-        <default>KDE Homepage,UserBase,,,,,,</default>
+        <default>KDE Homepage,UserBase,rekonq site</default>
     </entry>
     <entry name="previewUrls" type="StringList">
-        <default>http://www.kde.org,http://userbase.kde.org,,,,,,</default>
+        <default>http://www.kde.org,http://userbase.kde.org,http://rekonq.sourceforge.net</default>
     </entry>
   </group>
 
-- 
cgit v1.2.1


From ad1b58215550c99f708a1ef03b5f8f38c179348b Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 17 Apr 2010 16:03:25 +0200
Subject: - Enable context menu for actions inside bookmark bar folder -
 Reverse bookmarks and bookmark managing option on the bookmarkActionMenu (as
 we discussed with Lionel) - Common actionMenu between bookmark bars and the
 bookmarkActionMenu - Use BookmarkContextMenu instead of KBookmarkContextMenu
 in the bookmarkActionMenu

---
 src/bookmarks/bookmarksmanager.cpp   | 182 ++++++++++++++++++++---------------
 src/bookmarks/bookmarksmanager.h     |  36 +++----
 src/bookmarks/bookmarkstreemodel.cpp |   5 +
 src/mainwindow.cpp                   |   1 -
 4 files changed, 119 insertions(+), 105 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 7e933599..e7b24a09 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -94,9 +94,9 @@ QString BookmarkOwner::currentTitle() const
 }
 
 
-void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)
+void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark)
 {
-    QList<KUrl> urlList = bm.groupUrlList();
+    QList<KUrl> urlList = bookmark.groupUrlList();
 
     if(urlList.length() > 8)
     {
@@ -107,7 +107,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)
     QList<KUrl>::iterator url;
     for (url = urlList.begin(); url != urlList.end(); ++url)
     {
-        Application::instance()->loadUrl(*url, Rekonq::NewCurrentTab);
+        emit openUrl(*url, Rekonq::NewCurrentTab);
     }
 }
 
@@ -136,23 +136,35 @@ BookmarkMenu::BookmarkMenu(KBookmarkManager *manager,
                            KMenu *menu,
                            KActionCollection* actionCollection)
     : KBookmarkMenu(manager, owner, menu, actionCollection)
-
 {
     KAction *a = KStandardAction::addBookmark(this, SLOT(slotAddBookmark()), this);
     actionCollection->addAction(QLatin1String("rekonq_add_bookmark"),a);
+    refill();
+}
+
+
+BookmarkMenu::BookmarkMenu(KBookmarkManager  *manager,
+                           KBookmarkOwner  *owner,
+                           KMenu  *parentMenu,
+                           const QString &parentAddress)
+    : KBookmarkMenu(manager, owner, parentMenu, parentAddress)
+{
+    refill();
 }
 
+
 BookmarkMenu::~BookmarkMenu()
 {
 }
 
 
-KMenu *BookmarkMenu::viewContextMenu(QAction *action)
+KMenu * BookmarkMenu::contextMenu(QAction *act)
 {
-    KBookmarkActionInterface* act = dynamic_cast<KBookmarkActionInterface *>(action);
-     if (!act)
+
+    KBookmarkActionInterface* action = dynamic_cast<KBookmarkActionInterface *>(act);
+     if (!action)
          return 0;
-     return new BookmarkContextMenu(act->bookmark(), manager(), owner());
+     return new BookmarkContextMenu(action->bookmark(), manager(), owner());
 }
 
 
@@ -172,6 +184,76 @@ void BookmarkMenu::slotAddBookmark()
 }
 
 
+QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark)
+{
+    if(bookmark.isGroup())
+    {
+        KBookmarkActionMenu *actionMenu = new KBookmarkActionMenu(bookmark, this);
+        new BookmarkMenu(manager(), owner(), actionMenu->menu(), bookmark.address());
+        return actionMenu;
+    }
+    else if(bookmark.isSeparator())
+    {
+        return KBookmarkMenu::actionForBookmark(bookmark);
+    }
+    else
+    {
+        Application::bookmarkProvider()->completionObject()->addItem(bookmark.url().url());
+        return  new KBookmarkAction( bookmark, owner(), this );
+    }
+}
+
+
+void BookmarkMenu::refill()
+{
+    fillBookmarks();
+
+    if(parentMenu()->actions().count() > 0)
+        parentMenu()->addSeparator();
+
+    if(isRoot())
+    {
+        addAddBookmark();
+        addAddBookmarksList();
+        addNewFolder();
+        addEditBookmarks();
+
+    }
+    else
+    {
+        addOpenFolderInTabs();
+        addAddBookmark();
+        addAddBookmarksList();
+        addNewFolder();
+    }
+}
+
+
+void BookmarkMenu::addOpenFolderInTabs()
+{
+    KAction *action;
+    KBookmarkGroup group = manager()->findByAddress(parentAddress()).toGroup();
+
+    if(!group.first().isNull())
+    {
+        KBookmark bookmark = group.first();
+
+        while(bookmark.isGroup() || bookmark.isSeparator())
+        {
+            bookmark = group.next(bookmark);
+        }
+
+        if(!bookmark.isNull())
+        {
+            action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
+            action->setHelpText( i18n( "Open all bookmarks in this folder as a new tab." ) );
+            connect(action, SIGNAL(triggered(bool)), this, SLOT(slotOpenFolderInTabs()));
+            parentMenu()->addAction(action);
+        }
+    }
+}
+
+
 // ------------------------------------------------------------------------------------------------------
 
 
@@ -203,7 +285,7 @@ BookmarkProvider::BookmarkProvider(QObject *parent)
             bookfile = KUrl(bookmarksPath);
         }
     }
-    // A workaround to avoid a long delay between the two changed signals of the bookmark manager
+
     m_manager = KBookmarkManager::managerForFile(bookfile.path(), "rekonq");
     
     connect(m_manager, SIGNAL(changed(const QString &, const QString &)),
@@ -227,8 +309,9 @@ BookmarkProvider::~BookmarkProvider()
 void BookmarkProvider::setupBookmarkBar(KToolBar *toolbar)
 {
     KToolBar *bookmarkToolBar = toolbar;
-    m_bookmarkToolBars.append(toolbar);
-    connect(bookmarkToolBar, SIGNAL(customContextMenuRequested(const QPoint &)),
+    m_bookmarkToolBars.append(bookmarkToolBar);
+    bookmarkToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(bookmarkToolbar, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(contextMenu(const QPoint &)));
 
     slotBookmarksChanged("", "");
@@ -246,6 +329,8 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
     Q_UNUSED(group)
     Q_UNUSED(caller)
 
+    m_completion->clear();
+
     foreach(KToolBar *bookmarkToolBar, m_bookmarkToolBars)
     {
         if (bookmarkToolBar)
@@ -255,7 +340,6 @@ void BookmarkProvider::slotBookmarksChanged(const QString &group, const QString
                 return;
 
             bookmarkToolBar->clear();
-            m_completion->clear();
 
             KBookmark bookmark = toolBarGroup.first();
             while (!bookmark.isNull())
@@ -286,11 +370,11 @@ void BookmarkProvider::contextMenu(const QPoint &point)
     if(!bookmarkToolBar)
         return;
 
-    KAction* action = dynamic_cast<KAction*>(bookmarkToolBar->actionAt(point));
+    KBookmarkActionInterface* action = dynamic_cast<KBookmarkActionInterface *>(bookmarkToolBar->actionAt(point));
     if (!action)
         return;
 
-    KMenu *menu = m_bookmarkMenu->viewContextMenu(action);
+    KMenu *menu = new BookmarkContextMenu(action->bookmark(), bookmarkManager(), bookmarkOwner());
     if (!menu)
         return;
 
@@ -313,17 +397,10 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
 {
     if (bookmark.isGroup())
     {
-        KBookmarkGroup group = bookmark.toGroup();
-        KBookmark bm = group.first();
-        BookmarkActionMenu *menuAction = new BookmarkActionMenu(group, this);
-
-        while (!bm.isNull())
-        {
-            menuAction->addAction(fillBookmarkBar(bm));
-            bm = group.next(bm);
-        }
+        KBookmarkActionMenu *menuAction = new KBookmarkActionMenu(bookmark.toGroup(), this);
+        menuAction->setDelayed(false);
+        new BookmarkMenu(bookmarkManager(), bookmarkOwner(), menuAction->menu(), bookmark.address());
 
-        menuAction->addFolderActions();
         return menuAction;
     }
  
@@ -336,8 +413,7 @@ KAction *BookmarkProvider::fillBookmarkBar(const KBookmark &bookmark)
         return a;
     }
     else
-    {        
-        m_completion->addItem(bookmark.url().url());
+    {
         return new KBookmarkAction(bookmark, m_owner, this);
     }
 }
@@ -400,57 +476,3 @@ QString BookmarkProvider::titleForBookmarkUrl(const KBookmark &bookmark, QString
     
     return title;
 }
-
-
-// ----------------------------------------------------------------------------------------------
-
-
-BookmarkActionMenu::BookmarkActionMenu(const KBookmarkGroup &bm, QObject *parent)
-    : KBookmarkActionMenu(bm, bm.text(), parent)
-    , m_group(bm)
-{
-    setIcon(KIcon(bm.icon()));
-    setDelayed(false);
-}
-
-
-void BookmarkActionMenu::addFolderActions()
-{
-    addSeparator();
-    KAction *action;
-
-    if(!m_group.first().isNull())
-    {
-        KBookmark bookmark = m_group.first();
-
-        while(bookmark.isGroup() || bookmark.isSeparator())
-        {
-            bookmark = m_group.next(bookmark);
-        }
-
-        if(!bookmark.isNull())
-        {
-            action = new KAction(KIcon("tab-new"), i18n("Open Folder in Tabs"), this);
-            connect(action, SIGNAL(triggered(bool)), this, SLOT(openActionInTabs()));
-            addAction(action);
-        }
-    }
-
-    action = new KAction(KIcon("bookmark-new"), i18n("Add Bookmark Here"), this);
-    connect(action, SIGNAL(triggered(bool)), this, SLOT(bookmarkCurrentPage()));
-    addAction(action);
-}
-
-
-void BookmarkActionMenu::bookmarkCurrentPage()
-{
-    m_group.addBookmark(Application::bookmarkProvider()->bookmarkOwner()->currentTitle(), KUrl(Application::bookmarkProvider()->bookmarkOwner()->currentUrl()));
-    Application::bookmarkProvider()->bookmarkManager()->emitChanged();
-}
-
-
-void BookmarkActionMenu::openActionInTabs()
-{
-    if(!m_group.isNull())
-        Application::bookmarkProvider()->bookmarkOwner()->openFolderinTabs(m_group);
-}
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 7fb02970..8d09e122 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -113,7 +113,7 @@ public:
     * The default implementation does nothing.
     * This is only called if supportsTabs() returns true
     */
-    virtual void openFolderinTabs(const KBookmarkGroup &bm);
+    virtual void openFolderinTabs(const KBookmarkGroup &bookmark);
 
     virtual QList< QPair<QString, QString> > currentBookmarkList() const;
 
@@ -133,7 +133,6 @@ signals:
 // KDE Includes
 #include <KBookmarkMenu>
 
-
 /**
  * This class represent the rekonq bookmarks menu.
  * It's just a simple class inherited from KBookmarkMenu
@@ -148,13 +147,23 @@ public:
                  KBookmarkOwner* owner,
                  KMenu* menu,
                  KActionCollection* actionCollection);
+    BookmarkMenu(KBookmarkManager  *manager,
+                 KBookmarkOwner  *owner,
+                 KMenu  *parentMenu,
+                 const QString &parentAddress);
     ~BookmarkMenu();
 
-    virtual KMenu *viewContextMenu(QAction* action);
+protected:
+    virtual KMenu * contextMenu(QAction * act);
+    virtual void refill();
+    virtual QAction* actionForBookmark(const KBookmark &bookmark);
 
 protected slots:
     void slotAddBookmark();
 
+private:
+    void addOpenFolderInTabs();
+
 };
 
 
@@ -265,25 +274,4 @@ private:
 };
 
 
-// ------------------------------------------------------------------------------------------
-
-
-class BookmarkActionMenu : public KBookmarkActionMenu
-{
-    Q_OBJECT
-
-public:
-    BookmarkActionMenu (const KBookmarkGroup &bm, QObject *parent);
-    void addFolderActions();
-
-private slots:
-    void openActionInTabs();
-    void bookmarkCurrentPage();
-
-private:
-    KBookmarkGroup m_group;
-
-};
-
-
 #endif
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 836401a6..e731940c 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -323,6 +323,11 @@ void BookmarksTreeModel::populate( BtmItem *node, KBookmarkGroup bmg)
         BtmItem *newChild = new BtmItem( bm );
         if( bm.isGroup() )
             populate( newChild, bm.toGroup() );
+        else
+        {
+            Application::bookmarkProvider()->completionObject()->addItem(bm.url().url());
+            //QMessageBox::information(new QWidget(), "", bm.url().url());
+        }
 
         node->appendChild( newChild );
         bm = bmg.next( bm );
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 898aa842..3c8874e1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -187,7 +187,6 @@ void MainWindow::setupToolbars()
     
     // =========== Bookmarks ToolBar ================================
     m_bmBar->setAcceptDrops(true);
-    m_bmBar->setContextMenuPolicy(Qt::CustomContextMenu);
     Application::bookmarkProvider()->setupBookmarkBar(m_bmBar);
 
     if(ReKonfig::firstExecution())
-- 
cgit v1.2.1


From bac4a843a3e11fe2a7af52cb4fab189761515e7c Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 17 Apr 2010 16:18:39 +0200
Subject: Forget to save file

---
 src/bookmarks/bookmarkstreemodel.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index e731940c..836401a6 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -323,11 +323,6 @@ void BookmarksTreeModel::populate( BtmItem *node, KBookmarkGroup bmg)
         BtmItem *newChild = new BtmItem( bm );
         if( bm.isGroup() )
             populate( newChild, bm.toGroup() );
-        else
-        {
-            Application::bookmarkProvider()->completionObject()->addItem(bm.url().url());
-            //QMessageBox::information(new QWidget(), "", bm.url().url());
-        }
 
         node->appendChild( newChild );
         bm = bmg.next( bm );
-- 
cgit v1.2.1


From 7fe3643b5401e73d2e27e552fb64222fe44dc643 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 17 Apr 2010 17:55:04 +0200
Subject: Fix compile

---
 src/bookmarks/bookmarksmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index e7b24a09..df6bc54b 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -311,7 +311,7 @@ void BookmarkProvider::setupBookmarkBar(KToolBar *toolbar)
     KToolBar *bookmarkToolBar = toolbar;
     m_bookmarkToolBars.append(bookmarkToolBar);
     bookmarkToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(bookmarkToolbar, SIGNAL(customContextMenuRequested(const QPoint &)),
+    connect(bookmarkToolBar, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(contextMenu(const QPoint &)));
 
     slotBookmarksChanged("", "");
-- 
cgit v1.2.1


From dbb6991b2fd9a2b76fd954d214e9c907c8123ea6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 17 Apr 2010 18:03:19 +0200
Subject: Based on Lionel's merge request #80: letting CompletionWidget being
 independent from the Urlbar

---
 src/urlbar/completionwidget.cpp | 38 ++++++++++++++++++++++++++++++++------
 src/urlbar/completionwidget.h   | 10 +++++-----
 src/urlbar/urlbar.cpp           | 40 +++++-----------------------------------
 src/urlbar/urlbar.h             | 11 +++--------
 4 files changed, 45 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 83e99f9d..d6777b18 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -30,6 +30,7 @@
 
 // Local Includes
 #include "application.h"
+#include "urlresolver.h"
 
 // KDE Includes
 #include <KGlobalSettings>
@@ -173,6 +174,8 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
     //actions on the CompletionWidget
     if (wid && wid->isAncestorOf(_parent) && isVisible()) 
     {
+        ListItem *child;
+    
         if ( type == QEvent::KeyPress ) 
         {
             QKeyEvent *ev = static_cast<QKeyEvent *>( e );
@@ -196,7 +199,7 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                         ev->accept();
                         return true;
                     }
-                    else if (ev->modifiers() & Qt::ControlModifier)
+                    if (ev->modifiers() & Qt::ControlModifier)
                     {
                         emit nextItemSubChoice();
                         ev->accept();
@@ -206,18 +209,19 @@ bool CompletionWidget::eventFilter( QObject *o, QEvent *e )
                     
                 case Qt::Key_Enter:
                 case Qt::Key_Return:
-
-                    // need this to let ListItem magic work..
-                    ListItem *child = findChild<ListItem *>( QString::number(_currentIndex) );
+                    child = findChild<ListItem *>( QString::number(_currentIndex) );
                     emit chosenUrl( child->url(), Rekonq::CurrentTab);                                              
                     ev->accept();
                     hide();
                     return true;
-                    break;
+                    
+                case Qt::Key_Escape:
+                    hide();
+                    return true;
             }
         }
     }
-
+    
     return QFrame::eventFilter(o,e);
 }
 
@@ -246,3 +250,25 @@ void CompletionWidget::itemChosen(ListItem *item, Qt::MouseButton button)
         emit chosenUrl( item->url(), Rekonq::CurrentTab);
     hide();
 }
+
+
+
+
+void CompletionWidget::suggestUrls(const QString &text)
+{   
+    if(text.isEmpty())
+    {
+        hide();
+        return;
+    }
+
+    UrlResolver res(text);
+    UrlSearchList list = res.orderedSearchItems();
+
+    if(list.count() > 0)
+    {
+        clear();
+        insertSearchList(list, text);
+        popup();
+    }
+}
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 125e186a..896518fc 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -30,7 +30,6 @@
 
 // Local Includes
 #include "application.h"
-#include "urlresolver.h"
 #include "listitem.h"
 
 // KDE Includes
@@ -47,21 +46,22 @@ class CompletionWidget : public QFrame
 public:
     CompletionWidget(QWidget *parent);
 
-    void insertSearchList(const UrlSearchList &list, const QString& text);
-    void popup();
-    void clear();
-
     virtual bool eventFilter(QObject *obj, QEvent *ev);
     void setVisible(bool visible);
     
 private slots:
     void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton);
+    void suggestUrls(const QString &text);
 
 signals:
     void chosenUrl(const KUrl &, Rekonq::OpenType);
     void nextItemSubChoice();
     
 private:
+    void insertSearchList(const UrlSearchList &list, const QString& text);
+    void popup();
+    void clear();
+
     void sizeAndPosition();
     void up();
     void down();
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 4e7310bf..a4c7a0e0 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -38,8 +38,9 @@
 #include "application.h"
 #include "lineedit.h"
 #include "mainwindow.h"
+#include "webtab.h"
 #include "webview.h"
-#include "urlresolver.h"
+#include "completionwidget.h"
 
 // KDE Includes
 #include <KDebug>
@@ -71,7 +72,7 @@ UrlBar::UrlBar(QWidget *parent)
         
     // suggestions
     installEventFilter(_box);
-    connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), SLOT(activated(const KUrl &, Rekonq::OpenType)));
+    connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType)));
     
     // load typed urls
     connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &)));
@@ -103,7 +104,7 @@ void UrlBar::setQUrl(const QUrl& url)
 
 void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
 {
-    disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    disconnect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &)));
     
     clearFocus();
     setUrl(url);
@@ -152,12 +153,6 @@ void UrlBar::paintEvent(QPaintEvent *event)
 
 void UrlBar::keyPressEvent(QKeyEvent *event)
 {
-    if(event->key() == Qt::Key_Escape)
-    {
-        _box->hide();
-        return;
-    }
-    
     // this handles the Modifiers + Return key combinations
     QString currentText = text().trimmed();
     if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
@@ -191,35 +186,10 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
 }
 
 
-void UrlBar::suggestUrls(const QString &text)
-{   
-    if (!hasFocus())
-    {
-        return;
-    }
-
-    if(text.isEmpty())
-    {
-        _box->hide();
-        return;
-    }
-
-    UrlResolver res(text);
-    UrlSearchList list = res.orderedSearchItems();
-
-    if(list.count() > 0)
-    {
-        _box->clear();
-        _box->insertSearchList(list, text);
-        _box->popup();
-    }
-}
-
-
 void UrlBar::focusInEvent(QFocusEvent *event)
 {
     // activate suggestions on edit text
-    connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(suggestUrls(const QString &)));
+    connect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &)));
     
     LineEdit::focusInEvent(event);
 }
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 804188f7..3ecd914e 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -33,20 +33,16 @@
 
 // Local Includes
 #include "lineedit.h"
-#include "completionwidget.h"
-#include "webtab.h"
+#include "application.h"
 
 // KDE Includes
 #include <KUrl>
-#include <KComboBox>
-
-// Qt Includes
-#include <QUrl>
-#include <QPointer>
 
 // Forward Declarations
 class QLinearGradient;
 class QWidget;
+class CompletionWidget;
+class WebTab;
 
 
 class UrlBar : public LineEdit
@@ -61,7 +57,6 @@ public:
 
 private slots:
     void activated(const KUrl& url, Rekonq::OpenType = Rekonq::CurrentTab);
-    void suggestUrls(const QString &editedText);
     void setQUrl(const QUrl &url);
 
     void loadFinished();
-- 
cgit v1.2.1


From 8ef95ed5f65c07020a91b9fce306eacc0309794a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 17 Apr 2010 18:27:40 +0200
Subject: Clean tab previews, not showing on loading removed a duplicated 
 method and save one QPixmap in WebSnap class

---
 src/tabbar.cpp          |  5 ++++-
 src/urlbar/listitem.cpp | 24 +++---------------------
 src/urlbar/listitem.h   |  3 ---
 src/websnap.cpp         |  8 +++++---
 src/websnap.h           |  1 -
 5 files changed, 12 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 518b1a96..f8da57b1 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -164,13 +164,16 @@ void TabBar::showTabPreview(int tab)
     delete m_previewPopup.data();
     m_previewPopup.clear();
     
+    if (indexedTab->progress() != 0)
+        return;
+     
     m_previewPopup = new KPassivePopup(this);
     m_previewPopup.data()->setFrameShape(QFrame::StyledPanel);
     m_previewPopup.data()->setFrameShadow(QFrame::Plain);
     m_previewPopup.data()->setFixedSize(w, h);
     
     QLabel *l = new QLabel();
-    l->setPixmap( WebSnap::renderPreview( *indexedTab->page(), w, h, false) );
+    l->setPixmap( WebSnap::renderPreview( *indexedTab->page(), w, h, true) );
     
     m_previewPopup.data()->setView(l);
     m_previewPopup.data()->layout()->setAlignment(Qt::AlignTop);
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 6f91aabd..229b43e9 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -31,6 +31,7 @@
 // Local Includes
 #include "urlresolver.h"
 #include "application.h"
+#include "websnap.h"
 
 // KDE Includes
 #include <KIcon>
@@ -238,7 +239,8 @@ ItemPreview::ItemPreview(const QString &url, int width, int height, QWidget *par
     setFixedSize(width, height);
     setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
 
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl( QUrl(url) ) + ".png", true);
+    KUrl u = WebSnap::fileForUrl( QUrl(url) );
+    QString path = u.pathOrUrl();
     if(QFile::exists(path))
     {     
         QPixmap preview;
@@ -248,26 +250,6 @@ ItemPreview::ItemPreview(const QString &url, int width, int height, QWidget *par
 }
 
 
-//TODO: REMOVE DUPLICATE CODE WITH PREVIEWIMAGE
-QString ItemPreview::guessNameFromUrl(QUrl url)
-{
-    QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash );
-    
-    // TODO learn Regular Expressions :)
-    // and implement something better here..
-    name.remove('/');
-    name.remove('&');
-    name.remove('.');
-    name.remove('-');
-    name.remove('_');
-    name.remove('?');
-    name.remove('=');
-    name.remove('+');
-    
-    return name;
-}
-
-
 // ---------------------------------------------------------------
 
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 2f6f898a..8a6f520f 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -193,9 +193,6 @@ class ItemPreview : public QLabel
     
 public:
     ItemPreview(const QString &url, int width, int height, QWidget *parent = 0);
-
-private:
-    static QString guessNameFromUrl(QUrl url);
 };
 
 
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 906bbc1e..612fdf4e 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -146,20 +146,22 @@ QString WebSnap::guessNameFromUrl(QUrl url)
 
 void WebSnap::saveResult(bool ok)
 {
+    QPixmap image = QPixmap();
+    
     // crude error-checking
     if (!ok) 
     {
         kDebug() << "Error loading site..";
         m_snapTitle = "Error...";
-        m_image = QPixmap();
+        
     }
     else
     {
-        m_image = renderPreview(m_page, WIDTH, HEIGHT);
+        image = renderPreview(m_page, WIDTH, HEIGHT);
         m_snapTitle = m_page.mainFrame()->title();
     }
     QFile::remove(fileForUrl(m_url).toLocalFile());
-    m_image.save(fileForUrl(m_url).toLocalFile());
+    image.save(fileForUrl(m_url).toLocalFile());
     
     NewTabPage p( m_frame );
     p.snapFinished(m_previewIndex, m_url, m_snapTitle);
diff --git a/src/websnap.h b/src/websnap.h
index e7c9e593..9773b4cc 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -78,7 +78,6 @@ private slots:
 
 private:
     QWebPage m_page;
-    QPixmap m_image;
 
     QUrl m_url;
     QString m_snapTitle;
-- 
cgit v1.2.1


From ceba6a65a94b69f495977b24dc592b53896f25f1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 17 Apr 2010 18:51:58 +0200
Subject: Workaound the focus bar problem

---
 src/urlbar/completionwidget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index d6777b18..be86238d 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -256,6 +256,10 @@ void CompletionWidget::itemChosen(ListItem *item, Qt::MouseButton button)
 
 void CompletionWidget::suggestUrls(const QString &text)
 {   
+    QWidget *w = qobject_cast<QWidget *>(parent());
+    if(!w->hasFocus())
+        return;
+
     if(text.isEmpty())
     {
         hide();
-- 
cgit v1.2.1


From 708e029be1c2d790aa6891841f5425d8671e0bf3 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 17 Apr 2010 23:22:48 +0200
Subject: Fix the completition widget opening when the urlbar has the focus and
 we want to load an url It fix also the same issue with redirection

---
 src/urlbar/urlbar.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index a4c7a0e0..8c6c0749 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -95,6 +95,7 @@ void UrlBar::setQUrl(const QUrl& url)
     }
     else
     {
+        clearFocus();
         LineEdit::setUrl(url);
         setCursorPosition(0);
         iconButton()->setIcon( Application::icon(url) );
-- 
cgit v1.2.1


From 67f95af6b1649cd07ac2e3ba5a09ef1b7b875574 Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sat, 17 Apr 2010 23:33:31 +0200
Subject: Fix the url bar focus when the only tab is closed

---
 src/mainview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index a5eaa748..cb2e3b11 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -467,7 +467,7 @@ void MainView::closeTab(int index)
         case 0: // new tab page
         case 1: // blank page
             w->load( KUrl("about:home") );
-            urlBarWidget()->setFocus();
+            urlBar()->setFocus();
             break;
         case 2: // homepage
             w->load( KUrl(ReKonfig::homePage()) );
-- 
cgit v1.2.1


From 254ea3a16b2e99502fd1e55318f7b3e2d683b3ee Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sun, 18 Apr 2010 07:10:51 +0200
Subject: fix bold: "browse" was bold if the user type "browse"

---
 src/urlbar/listitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 229b43e9..4b9831b2 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -405,7 +405,7 @@ BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, Q
 {
     QString url = text;
     layout()->addWidget(new ItemIcon(item.url.url()));
-    layout()->addWidget(new ItemText("Browse <i>http://" + url.remove("http://") + "</i>", text));
+    layout()->addWidget(new ItemText("Browse <i>http://<b>" + url.remove("http://") + "</b></i>"));
     layout()->addWidget(new TypeIcon(item.type));
 }
 
-- 
cgit v1.2.1


From 6d4ce10b740eb4fbc38b923dd56ef2e3cb66e97f Mon Sep 17 00:00:00 2001
From: Script Kiddy <sysadmin@kde.org>
Date: Sun, 18 Apr 2010 08:28:37 +0200
Subject: SVN_SILENT made messages (.desktop file)

---
 src/data/rekonq.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index df564c47..b0f8f2e3 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -5,6 +5,7 @@ Name[da]=rekonq
 Name[de]=rekonq
 Name[en_GB]=rekonq
 Name[es]=rekonq
+Name[fr]=rekonq
 Name[ga]=rekonq
 Name[lt]=rekonq
 Name[nds]=Rekonq
@@ -20,6 +21,7 @@ GenericName[da]=KDE-browser baseret på Webkit
 GenericName[de]=WebKit-basierter Webbrowser für KDE
 GenericName[en_GB]=Webkit KDE Browser
 GenericName[es]=Navegador Webkit para KDE
+GenericName[fr]=Navigateur Webkit pour KDE
 GenericName[ga]=Brabhsálaí Webkit KDE
 GenericName[lt]=Webkit KDE naršyklė
 GenericName[nds]=Webkit-KDE-Kieker
-- 
cgit v1.2.1


From f085f421a62caac836cee3359cafb566e9cbc5ae Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 18 Apr 2010 11:45:09 +0200
Subject: RSS relative url fixing. This patch solves bug #234579 and is heavily
 based on the one provided by Thomas Fryda in its bug report. Thanks :)

BUG: 234579
---
 src/webtab.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index fd44cc10..8af1055c 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -184,7 +184,20 @@ bool WebTab::hasRSSInfo()
     foreach(QWebElement el, col)
     {
         if( el.attribute("type") == QL1S("application/rss+xml") || el.attribute("type") == QL1S("application/rss+xml") )
-            _rssList << KUrl( el.attribute("href") );
+        {
+            KUrl u = KUrl( el.attribute("href") );
+            if(u.isRelative())
+            {
+                u = url();
+                // NOTE
+                // cd() is probably better than setPath() here, 
+                // for all those url sites just having a path
+                if(u.cd( el.attribute("href") ))
+                    _rssList << u;
+            }
+            else
+                _rssList << u;
+        }
     }
     
     return !_rssList.isEmpty();
-- 
cgit v1.2.1


From 613d007b66f74683cc86e3ce8bda42992ae840f1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Apr 2010 09:51:04 +0200
Subject: the "real" fix for 234579

CCBUG:234579
---
 src/webtab.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index 8af1055c..6bafd04a 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -185,18 +185,19 @@ bool WebTab::hasRSSInfo()
     {
         if( el.attribute("type") == QL1S("application/rss+xml") || el.attribute("type") == QL1S("application/rss+xml") )
         {
-            KUrl u = KUrl( el.attribute("href") );
-            if(u.isRelative())
+            if( el.attribute("href").startsWith( QL1S("http") ) )
             {
-                u = url();
+                _rssList << KUrl( el.attribute("href") );
+            }
+            else
+            {
+                KUrl u = url();
                 // NOTE
                 // cd() is probably better than setPath() here, 
                 // for all those url sites just having a path
                 if(u.cd( el.attribute("href") ))
                     _rssList << u;
             }
-            else
-                _rssList << u;
         }
     }
     
-- 
cgit v1.2.1


From 93ad10ce9a9e1f02f43837edafb83b08cc90f1d4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Apr 2010 11:17:57 +0200
Subject: Implementing a new default engine choice for rekonq

---
 src/rekonq.kcfg                  |   5 +-
 src/settings/settings_general.ui | 105 ++++++++---------------------
 src/settings/settings_tabs.ui    | 138 ++++++++++++++++++++++++++++++++++++++-
 src/urlbar/listitem.cpp          |  45 ++++++++++---
 src/urlbar/listitem.h            |   1 +
 5 files changed, 202 insertions(+), 92 deletions(-)

(limited to 'src')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index c999d063..860809cd 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -61,7 +61,10 @@
     <entry name="kgetList" type="Bool">
         <default>false</default>
     </entry>
-  </group>
+    <entry name="searchEngine" type="Int">
+        <default>0</default>
+    </entry>
+   </group>
 
 <!-- Tabs Settings -->
   <group name="Tabs">
diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index 98a56591..00277133 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>751</width>
-    <height>523</height>
+    <width>552</width>
+    <height>512</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -150,11 +150,11 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>New Tabs Behaviour</string>
+      <string>Search Engine</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <item>
+       <widget class="QLabel" name="label_3">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -169,73 +169,20 @@
         </property>
         <property name="baseSize">
          <size>
-          <width>120</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>New tab opens:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="KComboBox" name="kcfg_newTabsBehaviour">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <item>
-         <property name="text">
-          <string>New Tab Page</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Blank Page</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string comment="@item:inlistbox">Home Page</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>120</width>
+          <width>0</width>
           <height>0</height>
          </size>
         </property>
-        <property name="baseSize">
-         <size>
-          <width>120</width>
-          <height>0</height>
-         </size>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
         </property>
         <property name="text">
-         <string>New tab page starts with:</string>
+         <string>Default search engine:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="KComboBox" name="kcfg_newTabStartPage">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
+      <item>
+       <widget class="KComboBox" name="kcfg_searchEngine">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -244,27 +191,27 @@
         </property>
         <item>
          <property name="text">
-          <string>Favorites</string>
+          <string>google</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Closed Tabs</string>
+          <string>altavista</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Bookmarks</string>
+          <string>lycos</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>History</string>
+          <string>wikipedia</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Downloads</string>
+          <string>wolfram</string>
          </property>
         </item>
        </widget>
@@ -277,14 +224,7 @@
      <property name="title">
       <string>Download Manager</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_5">
-      <item>
-       <widget class="QCheckBox" name="kcfg_kgetDownload">
-        <property name="text">
-         <string>Use KGet for downloading files</string>
-        </property>
-       </widget>
-      </item>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QCheckBox" name="kcfg_kgetList">
         <property name="whatsThis">
@@ -295,6 +235,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_kgetDownload">
+        <property name="text">
+         <string>Use KGet for downloading files</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -306,7 +253,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>179</height>
       </size>
      </property>
     </spacer>
diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 9104843a..45579e90 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -6,14 +6,139 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>456</width>
-    <height>329</height>
+    <width>483</width>
+    <height>427</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Tabs</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>New Tabs Behaviour</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>120</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>120</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>New tab opens:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="KComboBox" name="kcfg_newTabsBehaviour">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>New Tab Page</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Blank Page</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string comment="@item:inlistbox">Home Page</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>120</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>120</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>New tab page starts with:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="KComboBox" name="kcfg_newTabStartPage">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>Favorites</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Closed Tabs</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Bookmarks</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>History</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Downloads</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_4">
      <property name="title">
@@ -79,13 +204,20 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>142</height>
+       <height>120</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 4b9831b2..d35da547 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -28,6 +28,9 @@
 #include "listitem.h"   
 #include "listitem.moc"   
 
+// Auto Includes
+#include "rekonq.h"
+
 // Local Includes
 #include "urlresolver.h"
 #include "application.h"
@@ -52,6 +55,9 @@
 #include <QWebSettings>
 #include <QFile>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     : QWidget(parent)
@@ -260,7 +266,8 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
     : ListItem(item, parent)
     , m_text(text)
 {
-    if (m_currentEngine == "") m_currentEngine = EngineBar::defaultEngine();
+    if (m_currentEngine == "") 
+        m_currentEngine = EngineBar::defaultEngine();
     
     m_iconLabel = new ItemIcon("edit-find", this); //TODO: get the default engine icon
     m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text));
@@ -315,10 +322,10 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget
     QStringList favoriteEngines;
     favoriteEngines << "wikipedia" << "google"; //defaults
     favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
-    QString defaultEngine = cg.readEntry("DefaultSearchEngine", "google");
-    KService::Ptr service;
     
-    service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine));
+    // default engine
+    QString defaultEngine = EngineBar::defaultEngine();
+    KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine));
     m_engineGroup->addAction(newEngineAction(service, selectedEngine));
     
     // set url;
@@ -344,11 +351,31 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget
 
 QString EngineBar::defaultEngine()
 {    
-    KConfig config("kuriikwsfilterrc"); //Share with konqueror
-    KConfigGroup cg = config.group("General");
-    QString d = cg.readEntry("DefaultSearchEngine", "google");
-    KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(d));
-    return service->name();
+    int n = ReKonfig::searchEngine();
+    QString engine;
+    switch(n)
+    {
+    case 0:
+        engine = QL1S("google");
+        break;
+    case 1:
+        engine = QL1S("altavista");
+        break;
+    case 2:
+        engine = QL1S("lycos");
+        break;
+    case 3:
+        engine = QL1S("wikipedia");
+        break;
+    case 4:
+        engine = QL1S("wolfram");
+        break;
+    default:
+        engine = QL1S("google");
+        break;
+    }
+
+    return engine;
 }
 
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 8a6f520f..a9dc8213 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -127,6 +127,7 @@ class EngineBar : public KToolBar
     
 public:
     EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent = 0);
+    
     static QString defaultEngine();
     void selectNextEngine();
     KUrl url() { return m_url; };
-- 
cgit v1.2.1


From 1fda71fe3d8a2cbbfd25a7fc0e687219267c8eb2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Apr 2010 11:54:46 +0200
Subject: Suggestions activation on demand

---
 src/urlbar/urlbar.cpp | 37 ++++++++++++++++++++++++++++---------
 src/urlbar/urlbar.h   |  7 ++++++-
 2 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 8c6c0749..6d1b19c9 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -60,7 +60,6 @@
 
 UrlBar::UrlBar(QWidget *parent)
     : LineEdit(parent)
-    , _box(new CompletionWidget(this))
     , _tab(0)
     , _privateMode(false)
 {
@@ -69,19 +68,18 @@ UrlBar::UrlBar(QWidget *parent)
     connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
     connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
     connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons()));
-        
-    // suggestions
-    installEventFilter(_box);
-    connect(_box, SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType)));
     
     // load typed urls
     connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &)));
+
+    activateSuggestions(true);
 }
 
 
 UrlBar::~UrlBar()
 {
-    delete _box;
+    activateSuggestions(false);
+    _box.clear();
 }
 
 
@@ -105,7 +103,7 @@ void UrlBar::setQUrl(const QUrl& url)
 
 void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
 {
-    disconnect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &)));
+    activateSuggestions(false);
     
     clearFocus();
     setUrl(url);
@@ -189,8 +187,7 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
 
 void UrlBar::focusInEvent(QFocusEvent *event)
 {
-    // activate suggestions on edit text
-    connect(this, SIGNAL(textChanged(const QString &)), _box, SLOT(suggestUrls(const QString &)));
+    activateSuggestions(true);
     
     LineEdit::focusInEvent(event);
 }
@@ -249,3 +246,25 @@ void UrlBar::loadTyped(const QString &text)
 {
     activated(KUrl(text));
 }
+
+
+void UrlBar::activateSuggestions(bool b)
+{
+    if(b)
+    {
+        if(_box.isNull())
+        {
+            _box = new CompletionWidget(this);
+            installEventFilter(_box.data());
+            connect(_box.data(), SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(activated(const KUrl &, Rekonq::OpenType)));
+
+            // activate suggestions on edit text
+            connect(this, SIGNAL(textChanged(const QString &)), _box.data(), SLOT(suggestUrls(const QString &)));
+        }
+    }
+    else
+    {
+        removeEventFilter(_box.data());
+        _box.data()->deleteLater();
+    }
+}
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 3ecd914e..9adc35a3 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -38,6 +38,9 @@
 // KDE Includes
 #include <KUrl>
 
+// Qt Includes
+#include <QWeakPointer>
+
 // Forward Declarations
 class QLinearGradient;
 class QWidget;
@@ -69,7 +72,9 @@ protected:
     virtual void dropEvent(QDropEvent *event);
 
 private:
-    CompletionWidget *_box;
+    void activateSuggestions(bool);
+    
+    QWeakPointer<CompletionWidget> _box;
     WebTab *_tab;
     bool _privateMode;
 };
-- 
cgit v1.2.1


From edda4a325583f466187bb9f7694fe58cf5428f68 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 19 Apr 2010 11:55:13 +0200
Subject: Fix Clear Private Data dialog - Don't use the value returned by
 QDialog::exec(), it looks like it is buggy - Add cache cleaning, solution
 found in konqueror/settings/kio/cache.cpp

---
 src/mainwindow.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3c8874e1..cb90f818 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -71,6 +71,7 @@
 #include <KToggleAction>
 #include <KStandardDirs>
 #include <KActionCategory>
+#include <KProcess>
 
 // Qt Includes
 #include <QtCore/QTimer>
@@ -1183,8 +1184,9 @@ void MainWindow::clearPrivateData()
     clearWidget.setupUi(&widget);
 
     dialog->setMainWidget(&widget);
+    dialog->exec();
 
-    if (dialog->exec() == KDialog::Ok)
+    if (dialog->result() == QDialog::Accepted)
     {
         if(clearWidget.clearHistory->isChecked())
         {
@@ -1204,7 +1206,8 @@ void MainWindow::clearPrivateData()
 
         if(clearWidget.clearCachedPages->isChecked())
         {
-            // TODO implement me!
+            KProcess::startDetached(KStandardDirs::findExe("kio_http_cache_cleaner"), 
+                                    QStringList(QLatin1String("--clear-all")));
         }
 
         if(clearWidget.clearWebIcons->isChecked())
-- 
cgit v1.2.1


From 01ba6c12f56b3ce87be9cc654d2e5336d7697fe0 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Mon, 19 Apr 2010 12:29:55 +0200
Subject: Add some text when a newtabpage is empty for users to know that this
 isn't a bug

---
 src/data/home.html |  7 +++++++
 src/newtabpage.cpp | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

(limited to 'src')

diff --git a/src/data/home.html b/src/data/home.html
index 97bec22d..25236743 100644
--- a/src/data/home.html
+++ b/src/data/home.html
@@ -189,6 +189,13 @@ margin-right: 5px;
 }
 
 /* -------------------------------------------------------- */
+/* Empty pages : in the end : need to overwrite */
+#content.empty {
+margin-top: 10%;
+text-align: center;
+}
+
+
 </style>
 </head>
 
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index d7671937..b709375a 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -180,6 +180,13 @@ void NewTabPage::favoritesPage()
     QStringList names = ReKonfig::previewNames();
     QStringList urls = ReKonfig::previewUrls();
     
+    if(urls.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("You can add a preview by clicking the \"Add Preview\" button in the top-right corner of this page"));
+        return;
+    }
+    
     for(int i=0; i < urls.count() ; ++i)
     {
         KUrl url = urls.at(i);
@@ -396,6 +403,13 @@ void NewTabPage::historyPage()
     
     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
     
+    if(model->rowCount() == 0)
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("Your browsing history is empty"));
+        return;
+    }
+    
     int i = 0;
     do
     {
@@ -436,6 +450,8 @@ void NewTabPage::bookmarksPage()
     KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup();
     if (bookGroup.isNull())
     {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("You have no bookmarks"));
         return;
     }
 
@@ -483,6 +499,13 @@ void NewTabPage::closedTabsPage()
     
     QList<HistoryItem> links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
     
+    if(links.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("There are no recently closed tabs"));
+        return;
+    }
+    
     for(int i=0; i < links.count(); ++i)
     {
         HistoryItem item = links.at(i);
@@ -527,6 +550,13 @@ void NewTabPage::downloadsPage()
 
     DownloadList list = Application::historyManager()->downloads();
     
+    if(list.isEmpty())
+    {
+        m_root.addClass("empty");
+        m_root.setPlainText(i18n("There are no recently downloaded files to show"));
+        return;
+    }
+    
     foreach(const DownloadItem &item, list)
     {
         m_root.prependInside(markup("div"));
-- 
cgit v1.2.1


From 1f8a013b182660c6f12c75f740cd5beac70f0949 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Apr 2010 16:21:33 +0200
Subject: Fix urlbar string as suggested by Johannes Zellner

---
 src/urlbar/lineedit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/urlbar/lineedit.cpp b/src/urlbar/lineedit.cpp
index 09c158fa..6236512f 100644
--- a/src/urlbar/lineedit.cpp
+++ b/src/urlbar/lineedit.cpp
@@ -129,7 +129,7 @@ void LineEdit::paintEvent(QPaintEvent *event)
         painter.setPen(Qt::gray);
         painter.drawText( textRect, 
                           Qt::AlignCenter, 
-                          i18n("Search Bookmarks, History, Google.. just start typing here!")
+                          i18n("Search Bookmarks, History, Web.. just start typing here!")
                         );
     }
 }
-- 
cgit v1.2.1


From f0b4144b957727a6031226a3ec84eabf53f0e0b9 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Apr 2010 17:18:01 +0200
Subject: this commit renames Item classes with this logic - Listitem inherited
 classes are TYPE + "Listitem" - QLabel inherited classes are TYPE + Label

---
 src/urlbar/listitem.cpp | 47 +++++++++++++++++++++++++----------------------
 src/urlbar/listitem.h   | 20 ++++++++++----------
 2 files changed, 35 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index d35da547..0ecc56fe 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -75,7 +75,7 @@ ListItem::ListItem(const UrlSearchItem &item, QWidget *parent)
     p.setColor(QPalette::AlternateBase, QColor(247,247,247)); // TODO: choose the correct color
     setPalette(p);
 
-    QHBoxLayout *hLayout = new QHBoxLayout;
+    QHBoxLayout *hLayout = new QHBoxLayout(this);
     hLayout->setSpacing(4);
     setLayout(hLayout);
 
@@ -156,11 +156,11 @@ void ListItem::nextItemSubChoice()
 // ---------------------------------------------------------------
 
 
-TypeIcon::TypeIcon(int type, QWidget *parent)
+TypeIconLabel::TypeIconLabel(int type, QWidget *parent)
     : QLabel(parent)
 {
     setMinimumWidth(40);
-    QHBoxLayout *hLayout = new QHBoxLayout;
+    QHBoxLayout *hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);
     hLayout->setAlignment(Qt::AlignRight);
     setLayout(hLayout);
@@ -172,9 +172,9 @@ TypeIcon::TypeIcon(int type, QWidget *parent)
 }
 
 
-QLabel *TypeIcon::getIcon(QString icon)
+QLabel *TypeIconLabel::getIcon(QString icon)
 {
-    QLabel *iconLabel = new QLabel;
+    QLabel *iconLabel = new QLabel(this);
     iconLabel->setFixedSize(16,16);  
     QPixmap pixmap = KIcon(icon).pixmap(16);
     iconLabel->setPixmap(pixmap);
@@ -185,7 +185,7 @@ QLabel *TypeIcon::getIcon(QString icon)
 // ---------------------------------------------------------------
 
 
-ItemIcon::ItemIcon(const QString &icon, QWidget *parent)
+IconLabel::IconLabel(const QString &icon, QWidget *parent)
     : QLabel(parent)
 {
     QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(icon)).pixmap(16);
@@ -202,7 +202,7 @@ ItemIcon::ItemIcon(const QString &icon, QWidget *parent)
 // ---------------------------------------------------------------
 
 
-ItemText::ItemText(const QString &text, const QString &textToPointOut, QWidget *parent)
+TextLabel::TextLabel(const QString &text, const QString &textToPointOut, QWidget *parent)
     : QLabel(parent)
 {
     QString t = text;
@@ -220,26 +220,26 @@ ItemText::ItemText(const QString &text, const QString &textToPointOut, QWidget *
 PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
     : ListItem(item, parent)
 {
-    QLabel *previewLabelIcon = new QLabel;
+    QLabel *previewLabelIcon = new QLabel(parent);
     previewLabelIcon->setFixedSize(45,33);
-    new ItemPreview(item.url.url(), 38, 29, previewLabelIcon);
-    ItemIcon* icon = new ItemIcon(item.url.url(), previewLabelIcon);
+    new PreviewLabel(item.url.url(), 38, 29, previewLabelIcon);
+    IconLabel* icon = new IconLabel(item.url.url(), previewLabelIcon);
     icon->move(27, 16);
     layout()->addWidget(previewLabelIcon);
   
-    QVBoxLayout *vLayout = new QVBoxLayout; 
+    QVBoxLayout *vLayout = new QVBoxLayout(this); 
     vLayout->setMargin(0);
     ((QHBoxLayout *)layout())->addLayout(vLayout);
-    vLayout->addWidget(new ItemText(item.title, text));
-    vLayout->addWidget(new ItemText("<i>" + item.url.url() + "</i>", text));
-    layout()->addWidget(new TypeIcon(item.type));
+    vLayout->addWidget( new TextLabel(item.title, text, this) );
+    vLayout->addWidget( new TextLabel("<i>" + item.url.url() + "</i>", text, this) );
+    layout()->addWidget( new TypeIconLabel(item.type, this) );
 }
 
 
 // ---------------------------------------------------------------
 
 
-ItemPreview::ItemPreview(const QString &url, int width, int height, QWidget *parent)
+PreviewLabel::PreviewLabel(const QString &url, int width, int height, QWidget *parent)
     : QLabel(parent)
 {
     setFixedSize(width, height);
@@ -269,8 +269,8 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
     if (m_currentEngine == "") 
         m_currentEngine = EngineBar::defaultEngine();
     
-    m_iconLabel = new ItemIcon("edit-find", this); //TODO: get the default engine icon
-    m_titleLabel = new ItemText(searchItemTitle(m_currentEngine, text));
+    m_iconLabel = new IconLabel("edit-find", this); //TODO: get the default engine icon
+    m_titleLabel = new TextLabel(searchItemTitle(m_currentEngine, text));
     m_engineBar = new EngineBar(text, m_currentEngine, this);
     
     // without this it will not work :)
@@ -278,9 +278,9 @@ SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, Q
     
     layout()->addWidget(m_iconLabel);
     layout()->addWidget(m_titleLabel);
-    layout()->addWidget(new QLabel("Engines: "));
+    layout()->addWidget( new QLabel( i18n("Engines: "), this ) );
     layout()->addWidget(m_engineBar);
-    layout()->addWidget(new TypeIcon(item.type));
+    layout()->addWidget( new TypeIconLabel(item.type, this) );
     
     connect(m_engineBar, SIGNAL(searchEngineChanged(QString, QString)), this, SLOT(changeSearchEngine(QString, QString)));
 }
@@ -308,6 +308,9 @@ void SearchListItem::nextItemSubChoice()
 }
 
 
+// -----------------------------------------------------------------------------------------------
+
+
 EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent)
     : KToolBar(parent)
 {   
@@ -431,9 +434,9 @@ BrowseListItem::BrowseListItem(const UrlSearchItem &item, const QString &text, Q
     : ListItem(item, parent)
 {
     QString url = text;
-    layout()->addWidget(new ItemIcon(item.url.url()));
-    layout()->addWidget(new ItemText("Browse <i>http://<b>" + url.remove("http://") + "</b></i>"));
-    layout()->addWidget(new TypeIcon(item.type));
+    layout()->addWidget( new IconLabel(item.url.url(), this) );
+    layout()->addWidget( new TextLabel( QL1S("Browse <i>http://<b>") + url.remove("http://") + QL1S("</b></i>"), QString(), this) );
+    layout()->addWidget( new TypeIconLabel(item.type, this) );
 }
 
 
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index a9dc8213..67bfb764 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -82,12 +82,12 @@ protected:
 // -------------------------------------------------------------------------
 
 
-class TypeIcon : public QLabel
+class TypeIconLabel : public QLabel
 {
     Q_OBJECT
     
 public:
-    TypeIcon(int type, QWidget *parent = 0);
+    TypeIconLabel(int type, QWidget *parent = 0);
 
 private:
     QLabel *getIcon(QString icon);
@@ -97,24 +97,24 @@ private:
 // -------------------------------------------------------------------------
 
 
-class ItemIcon : public QLabel
+class IconLabel : public QLabel
 {
     Q_OBJECT
 
 public:
-    ItemIcon(const QString &icon, QWidget *parent = 0);
+    IconLabel(const QString &icon, QWidget *parent = 0);
 };
 
 
 // -------------------------------------------------------------------------
 
 
-class ItemText : public QLabel
+class TextLabel : public QLabel
 {
     Q_OBJECT
     
 public:
-    ItemText(const QString &text, const QString &textToPointOut = QString(), QWidget *parent = 0);
+    TextLabel(const QString &text, const QString &textToPointOut = QString(), QWidget *parent = 0);
 };
 
 
@@ -164,8 +164,8 @@ private slots:
     
 private:
     QString searchItemTitle(QString engine, QString text);
-    ItemText* m_titleLabel;
-    ItemIcon* m_iconLabel;
+    TextLabel* m_titleLabel;
+    IconLabel* m_iconLabel;
     EngineBar* m_engineBar;
     QString m_text;
     
@@ -188,12 +188,12 @@ public:
 // -------------------------------------------------------------------------
 
 
-class ItemPreview : public QLabel
+class PreviewLabel : public QLabel
 {
     Q_OBJECT
     
 public:
-    ItemPreview(const QString &url, int width, int height, QWidget *parent = 0);
+    PreviewLabel(const QString &url, int width, int height, QWidget *parent = 0);
 };
 
 
-- 
cgit v1.2.1


From 7d11112b0c1836695dee398a5122051a0ec99585 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 20 Apr 2010 00:42:12 +0200
Subject: Fix default engine implementation and fix a bit code

---
 src/urlbar/completionwidget.cpp | 44 ++++++++++++++++--
 src/urlbar/completionwidget.h   |  8 +++-
 src/urlbar/listitem.cpp         | 98 +++++++++++++++--------------------------
 src/urlbar/listitem.h           |  7 ++-
 4 files changed, 86 insertions(+), 71 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index be86238d..8307940b 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -28,6 +28,9 @@
 #include "completionwidget.h"
 #include "completionwidget.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
 // Local Includes
 #include "application.h"
 #include "urlresolver.h"
@@ -45,11 +48,15 @@
 #include <QEvent>
 #include <QKeyEvent>
 
+// Defines
+#define QL1S(x)  QLatin1String(x)
+
 
 CompletionWidget::CompletionWidget(QWidget *parent)
-    : QFrame( parent, Qt::ToolTip)
+    : QFrame(parent, Qt::ToolTip)
     , _parent(parent)
     , _currentIndex(-1)
+    , _searchEngine( defaultSearchEngine() )
 {
     setFrameStyle(QFrame::Panel);
     setLayoutDirection(Qt::LeftToRight);
@@ -66,8 +73,8 @@ void CompletionWidget::insertSearchList(const UrlSearchList &list, const QString
     int i = 0;
     foreach(UrlSearchItem item, _list)
     {
-        ListItem *suggestion = ListItemFactory::create(item, text);
-        suggestion->setBackgroundRole(i%2 ? QPalette::AlternateBase: QPalette::Base);     
+        ListItem *suggestion = ListItemFactory::create(item, text, this);
+        suggestion->setBackgroundRole(i%2 ? QPalette::AlternateBase : QPalette::Base);     
         connect(suggestion, SIGNAL(itemClicked(ListItem *, Qt::MouseButton)), this, SLOT(itemChosen(ListItem *, Qt::MouseButton)));
         connect(this, SIGNAL(nextItemSubChoice()), suggestion, SLOT(nextItemSubChoice()));
         suggestion->setObjectName( QString::number(i++) );
@@ -268,7 +275,6 @@ void CompletionWidget::suggestUrls(const QString &text)
 
     UrlResolver res(text);
     UrlSearchList list = res.orderedSearchItems();
-
     if(list.count() > 0)
     {
         clear();
@@ -276,3 +282,33 @@ void CompletionWidget::suggestUrls(const QString &text)
         popup();
     }
 }
+
+
+QString CompletionWidget::defaultSearchEngine()
+{
+    int n = ReKonfig::searchEngine();
+    QString engine;
+    switch(n)
+    {
+    case 0:
+        engine = QL1S("google");
+        break;
+    case 1:
+        engine = QL1S("altavista");
+        break;
+    case 2:
+        engine = QL1S("lycos");
+        break;
+    case 3:
+        engine = QL1S("wikipedia");
+        break;
+    case 4:
+        engine = QL1S("wolfram");
+        break;
+    default:
+        engine = QL1S("google");
+        break;
+    }
+
+    return engine;
+}
diff --git a/src/urlbar/completionwidget.h b/src/urlbar/completionwidget.h
index 896518fc..e9851484 100644
--- a/src/urlbar/completionwidget.h
+++ b/src/urlbar/completionwidget.h
@@ -49,6 +49,9 @@ public:
     virtual bool eventFilter(QObject *obj, QEvent *ev);
     void setVisible(bool visible);
     
+    QString searchEngine() { return _searchEngine; };
+    void setCurrentEngine(const QString &engine) { _searchEngine = engine; };
+    
 private slots:
     void itemChosen(ListItem *item, Qt::MouseButton = Qt::LeftButton);
     void suggestUrls(const QString &text);
@@ -58,6 +61,8 @@ signals:
     void nextItemSubChoice();
     
 private:
+    QString defaultSearchEngine();
+    
     void insertSearchList(const UrlSearchList &list, const QString& text);
     void popup();
     void clear();
@@ -70,7 +75,8 @@ private:
 
     UrlSearchList _list;
     int _currentIndex;
-    QString *_searchEngine;
+
+    QString _searchEngine;
 };
 
 #endif // COMPLETION_WIDGET_H
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 0ecc56fe..7dc22dda 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -35,6 +35,7 @@
 #include "urlresolver.h"
 #include "application.h"
 #include "websnap.h"
+#include "completionwidget.h"
 
 // KDE Includes
 #include <KIcon>
@@ -188,12 +189,7 @@ QLabel *TypeIconLabel::getIcon(QString icon)
 IconLabel::IconLabel(const QString &icon, QWidget *parent)
     : QLabel(parent)
 {
-    QPixmap pixmapIcon = KIcon(QWebSettings::iconForUrl(icon)).pixmap(16);
-    if (pixmapIcon.isNull())
-    {
-        pixmapIcon = KIcon("text-html").pixmap(16);
-    }
-
+    QPixmap pixmapIcon = Application::icon( KUrl(icon) ).pixmap(16);
     setFixedSize(16,16);
     setPixmap(pixmapIcon);
 }
@@ -220,7 +216,7 @@ TextLabel::TextLabel(const QString &text, const QString &textToPointOut, QWidget
 PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
     : ListItem(item, parent)
 {
-    QLabel *previewLabelIcon = new QLabel(parent);
+    QLabel *previewLabelIcon = new QLabel(this);
     previewLabelIcon->setFixedSize(45,33);
     new PreviewLabel(item.url.url(), 38, 29, previewLabelIcon);
     IconLabel* icon = new IconLabel(item.url.url(), previewLabelIcon);
@@ -229,9 +225,10 @@ PreviewListItem::PreviewListItem(const UrlSearchItem &item, const QString &text,
   
     QVBoxLayout *vLayout = new QVBoxLayout(this); 
     vLayout->setMargin(0);
-    ((QHBoxLayout *)layout())->addLayout(vLayout);
     vLayout->addWidget( new TextLabel(item.title, text, this) );
     vLayout->addWidget( new TextLabel("<i>" + item.url.url() + "</i>", text, this) );
+    ((QHBoxLayout *)layout())->addLayout(vLayout);
+    
     layout()->addWidget( new TypeIconLabel(item.type, this) );
 }
 
@@ -259,27 +256,25 @@ PreviewLabel::PreviewLabel(const QString &url, int width, int height, QWidget *p
 // ---------------------------------------------------------------
 
 
-QString SearchListItem::m_currentEngine = "";
-
-
 SearchListItem::SearchListItem(const UrlSearchItem &item, const QString &text, QWidget *parent)
     : ListItem(item, parent)
     , m_text(text)
 {
-    if (m_currentEngine == "") 
-        m_currentEngine = EngineBar::defaultEngine();
+    CompletionWidget *w = qobject_cast<CompletionWidget *>(parent);
+    QString currentEngine = w->searchEngine();
+    kDebug() << currentEngine;
     
     m_iconLabel = new IconLabel("edit-find", this); //TODO: get the default engine icon
-    m_titleLabel = new TextLabel(searchItemTitle(m_currentEngine, text));
-    m_engineBar = new EngineBar(text, m_currentEngine, this);
+    m_titleLabel = new TextLabel( searchItemTitle(currentEngine, text), QString(), this);
+    m_engineBar = new EngineBar(text, currentEngine, parent);
     
     // without this it will not work :)
     m_url = m_engineBar->url();
     
-    layout()->addWidget(m_iconLabel);
-    layout()->addWidget(m_titleLabel);
+    layout()->addWidget( m_iconLabel );
+    layout()->addWidget( m_titleLabel );
     layout()->addWidget( new QLabel( i18n("Engines: "), this ) );
-    layout()->addWidget(m_engineBar);
+    layout()->addWidget( m_engineBar );
     layout()->addWidget( new TypeIconLabel(item.type, this) );
     
     connect(m_engineBar, SIGNAL(searchEngineChanged(QString, QString)), this, SLOT(changeSearchEngine(QString, QString)));
@@ -296,9 +291,11 @@ void SearchListItem::changeSearchEngine(QString url, QString engine)
 {
     m_titleLabel->setText(searchItemTitle(engine,m_text));
     m_iconLabel->setPixmap(Application::icon( KUrl(url) ).pixmap(16));
-    QString url2 = url.replace("\\{@}",m_text);
+    QString url2 = url.replace( QL1S("\\{@}"), m_text);
     m_url = KUrl(url2);
-    m_currentEngine = engine;
+
+    CompletionWidget *w = qobject_cast<CompletionWidget *>(parent());
+    w->setCurrentEngine( engine );
 }
 
 
@@ -327,8 +324,10 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget
     favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
     
     // default engine
-    QString defaultEngine = EngineBar::defaultEngine();
+    CompletionWidget *w = qobject_cast<CompletionWidget *>(parent);
+    QString defaultEngine = w->searchEngine();
     KService::Ptr service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(defaultEngine));
+    
     m_engineGroup->addAction(newEngineAction(service, selectedEngine));
     
     // set url;
@@ -341,7 +340,7 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget
         if(!engine.isEmpty())
         {
             service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
-            if(service && service->desktopEntryName()!=defaultEngine)
+            if(service && service->desktopEntryName() != defaultEngine)
             {
                 m_engineGroup->addAction(newEngineAction(service, selectedEngine));
             }
@@ -352,45 +351,16 @@ EngineBar::EngineBar(const QString &text, const QString &selectedEngine, QWidget
 }
 
 
-QString EngineBar::defaultEngine()
-{    
-    int n = ReKonfig::searchEngine();
-    QString engine;
-    switch(n)
-    {
-    case 0:
-        engine = QL1S("google");
-        break;
-    case 1:
-        engine = QL1S("altavista");
-        break;
-    case 2:
-        engine = QL1S("lycos");
-        break;
-    case 3:
-        engine = QL1S("wikipedia");
-        break;
-    case 4:
-        engine = QL1S("wolfram");
-        break;
-    default:
-        engine = QL1S("google");
-        break;
-    }
-
-    return engine;
-}
-
-
 KAction *EngineBar::newEngineAction(KService::Ptr service, QString selectedEngine)
 {
     KAction *a = new KAction(Application::icon(m_url), service->name(), this);
     a->setCheckable(true);
-    if (service->name()==selectedEngine) a->setChecked(true);
+    if (service->name()==selectedEngine) 
+        a->setChecked(true);
     
     QString url = service->property("Query").toString();
     
-    a->setData(QStringList() << url << service->name());
+    a->setData( QStringList() << url << service->desktopEntryName() );
     connect(a, SIGNAL(triggered(bool)), this, SLOT(changeSearchEngine()));
 
     return a;
@@ -447,18 +417,22 @@ ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text
 {
     ListItem *newItem;
     
-    if (item.type & UrlSearchItem::Browse)
+    switch(item.type)
     {
+    case UrlSearchItem::Browse:
         newItem = new BrowseListItem(item, text, parent);
-    }
-    else if (item.type & UrlSearchItem::Search)
-    {
+        break;
+    
+    case UrlSearchItem::Search:
         newItem = new SearchListItem(item, text, parent);
-    }
-    else
-    {
+        break;
+    
+    case UrlSearchItem::History:
+    case UrlSearchItem::Bookmark:
+    default:
         newItem = new PreviewListItem(item, text, parent);
+        break;
     }
-    
+   
     return newItem;
 }
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 67bfb764..de42fd03 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -128,7 +128,6 @@ class EngineBar : public KToolBar
 public:
     EngineBar(const QString &text, const QString &selectedEngine, QWidget *parent = 0);
     
-    static QString defaultEngine();
     void selectNextEngine();
     KUrl url() { return m_url; };
     
@@ -164,12 +163,12 @@ private slots:
     
 private:
     QString searchItemTitle(QString engine, QString text);
+
     TextLabel* m_titleLabel;
     IconLabel* m_iconLabel;
     EngineBar* m_engineBar;
-    QString m_text;
     
-    static QString m_currentEngine;
+    QString m_text;
 };
 
 
@@ -215,7 +214,7 @@ public:
 class ListItemFactory
 {
 public:
-    static ListItem *create(const UrlSearchItem &item, const QString &text, QWidget *parent = 0);
+    static ListItem *create(const UrlSearchItem &item, const QString &text, QWidget *parent);
 };
 
 
-- 
cgit v1.2.1


From 2fc4da5614113a8a184f6bdd05185cc875d9ce27 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 20 Apr 2010 00:58:19 +0200
Subject: deleting replies as explained in QNetworkAccessManager docs

---
 src/webpage.cpp | 12 +++++++++---
 src/webview.cpp |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 65dda0a0..6cc9d531 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -251,7 +251,8 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
             isLocal 
                 ? KMessageBox::sorry(view(), i18n("No service can handle this :(") ) 
                 : downloadRequest( reply->request() );
-            return;
+            
+            return reply->deleteLater();
         }
 
         if(!isLocal)
@@ -263,9 +264,11 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
                 case KParts::BrowserOpenOrSaveQuestion::Save:
                     kDebug() << "service handling: download!";
                     downloadRequest( reply->request() );
-                    return;
+                    return reply->deleteLater();               
+                    
                 case KParts::BrowserOpenOrSaveQuestion::Cancel:
-                    return;
+                    return reply->deleteLater();               
+                    
                 default: // non extant case
                     break;
             }
@@ -287,6 +290,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         html += "</html>";
         
         mainFrame()->setHtml(html, url);
+        return reply->deleteLater();
     }
 }
 
@@ -370,6 +374,8 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
         break;
 
     }
+    
+    reply->deleteLater();
 }
 
 
diff --git a/src/webview.cpp b/src/webview.cpp
index 6f6ec128..f48afffb 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -94,7 +94,8 @@ WebView::WebView(QWidget* parent)
 
 WebView::~WebView()
 {
-     disconnect();
+    delete _scrollTimer;
+    disconnect(); 
 }
 
 
-- 
cgit v1.2.1


From caadc8d30c2cc51dd784bb487c4d696ad1152f92 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 20 Apr 2010 11:22:59 +0200
Subject: Partially fixing deleteLater related crashes. But... why these
 crashes happen if Qt Docs say to delete (later) them?

---
 src/webpage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 6cc9d531..2b2957f6 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -252,7 +252,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
                 ? KMessageBox::sorry(view(), i18n("No service can handle this :(") ) 
                 : downloadRequest( reply->request() );
             
-            return reply->deleteLater();
+            return;
         }
 
         if(!isLocal)
@@ -264,7 +264,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
                 case KParts::BrowserOpenOrSaveQuestion::Save:
                     kDebug() << "service handling: download!";
                     downloadRequest( reply->request() );
-                    return reply->deleteLater();               
+                    return;               
                     
                 case KParts::BrowserOpenOrSaveQuestion::Cancel:
                     return reply->deleteLater();               
@@ -290,7 +290,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         html += "</html>";
         
         mainFrame()->setHtml(html, url);
-        return reply->deleteLater();
+        return;
     }
 }
 
-- 
cgit v1.2.1


From f68a57ae64887cc1d9c18efed629df3b1cc49bb8 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 20 Apr 2010 12:34:12 +0200
Subject: Reverting the switch case to an if-else one. I forgot t consider the
 particular condition in it. Sorry for the mistake.

---
 src/urlbar/listitem.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 7dc22dda..a182c1a2 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -417,21 +417,20 @@ ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text
 {
     ListItem *newItem;
     
-    switch(item.type)
+    if(item.type & UrlSearchItem::Browse)
     {
-    case UrlSearchItem::Browse:
         newItem = new BrowseListItem(item, text, parent);
-        break;
-    
-    case UrlSearchItem::Search:
-        newItem = new SearchListItem(item, text, parent);
-        break;
-    
-    case UrlSearchItem::History:
-    case UrlSearchItem::Bookmark:
-    default:
-        newItem = new PreviewListItem(item, text, parent);
-        break;
+    }
+    else
+    {
+        if(item.type & UrlSearchItem::Search)
+        {
+            newItem = new SearchListItem(item, text, parent);
+        }
+        else
+        {
+            newItem = new PreviewListItem(item, text, parent);
+        }
     }
    
     return newItem;
-- 
cgit v1.2.1


From a708a0e447af81412599ec16e8d47e06dc584eb0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 20 Apr 2010 16:43:10 +0200
Subject: New (empty) urlbar test and improved protocolhandler test

---
 src/tests/CMakeLists.txt                | 14 ++++++-
 src/tests/networkaccessmanager_test.cpp |  2 +-
 src/tests/protocolhandler_test.cpp      | 56 +++++++++++++++----------
 src/tests/urlbar_test.cpp               | 74 +++++++++++++++++++++++++++++++++
 src/urlbar/urlbar.h                     |  3 +-
 5 files changed, 125 insertions(+), 24 deletions(-)
 create mode 100644 src/tests/urlbar_test.cpp

(limited to 'src')

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index e05a056b..3bc9a27f 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES (   ${CMAKE_CURRENT_BINARY_DIR}
                         ${CMAKE_CURRENT_SOURCE_DIR}/../adblock
                         ${CMAKE_CURRENT_SOURCE_DIR}/../bookmarks
                         ${CMAKE_CURRENT_SOURCE_DIR}/../history
-                        ${CMAKE_CURRENT_SOURCE_DIR}/../rekonqpage
                         ${CMAKE_CURRENT_SOURCE_DIR}/../settings
                         ${CMAKE_CURRENT_SOURCE_DIR}/../urlbar
                         ${KDE4_INCLUDES}
@@ -68,6 +67,7 @@ target_link_libraries( protocolhandler_test
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTNETWORK_LIBRARY}
     ${QT_QTTEST_LIBRARY}
 )
 
@@ -153,4 +153,16 @@ target_link_libraries( webview_test
     ${QT_QTTEST_LIBRARY}
 )
 
+##### ------------- urlbar test
+
+kde4_add_unit_test( urlbar_test urlbar_test.cpp )
+
+target_link_libraries( urlbar_test
+    kdeinit_rekonq
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KDEWEBKIT_LIBS}
+    ${QT_QTTEST_LIBRARY}
+)
+
 ############################################################
diff --git a/src/tests/networkaccessmanager_test.cpp b/src/tests/networkaccessmanager_test.cpp
index 68ffc108..ac6cf89e 100644
--- a/src/tests/networkaccessmanager_test.cpp
+++ b/src/tests/networkaccessmanager_test.cpp
@@ -47,7 +47,7 @@ private:
 
 void NetworkAccessManagerTest::initTestCase()
 {
-    manager = new NetworkAccessManager;
+    manager = new NetworkAccessManager(this);
 }
 
 
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
index 71d8d9ec..a3c78c2f 100644
--- a/src/tests/protocolhandler_test.cpp
+++ b/src/tests/protocolhandler_test.cpp
@@ -24,6 +24,7 @@
 #include <QtCore>
 #include <QtGui>
 #include <QtTest>
+#include <QtNetwork>
 #include <QtWebKit>
 
 #include "protocolhandler.h"
@@ -69,45 +70,58 @@ void ProtocolhandlerTest::cleanupTestCase()
 void ProtocolhandlerTest::preHandling_data()
 {
     QTest::addColumn<QString>("urlString");
+    QTest::addColumn<bool>("result");
     
-    QTest::newRow("mailto")     << "mailto:me@here.com";
-    QTest::newRow("relative")   << "google.it";
-    QTest::newRow("javascript") << "javascript:alertbox('hello')";
-    QTest::newRow("aboutblank") << "about:blank";
-    QTest::newRow("abouthome")  << "about:home";
-    QTest::newRow("ftp")        << "ftp://ftp.kde.org";
-    QTest::newRow("file")       << "file:///home";
+    QTest::newRow("mailto")     << "mailto:me@here.com"             << true  ;
+    QTest::newRow("relative")   << "google.it"                      << false ;
+    QTest::newRow("javascript") << "javascript:alertbox('hello')"   << true  ;
+    QTest::newRow("aboutblank") << "about:blank"                    << false ;
+    QTest::newRow("abouthome")  << "about:home"                     << true  ;
+    QTest::newRow("ftp")        << "ftp://ftp.kde.org"              << false ;
+    QTest::newRow("file")       << "file:///home"                   << false ;
 }
 
 
 void ProtocolhandlerTest::preHandling()
 {
-//     QFETCH( QString, urlString );
-//     
-//     QWebView *view = new QWebView;
-//     QWebFrame *frame = view->page()->mainFrame();
-//     
-//     QNetworkRequest *request = new QNetworkRequest( QUrl(urlString) );
-//     handler->preHandling( request, frame );
+    QFETCH( QString, urlString );
+    QFETCH( bool   , result    );
+    
+    QWebView *view = new QWebView;
+    QWebFrame *frame = view->page()->mainFrame();
+    
+    QNetworkRequest request = QNetworkRequest( QUrl(urlString) );
+
+    QCOMPARE( handler->preHandling( request, frame ) , result );
 }
 
 
 void ProtocolhandlerTest::postHandling_data()
 {
     QTest::addColumn<QString>("urlString");
+    QTest::addColumn<bool>("result");
     
-    QTest::newRow("mailto")     << "mailto:me@here.com";
-    QTest::newRow("relative")   << "google.it";
-    QTest::newRow("javascript") << "javascript:alertbox('hello')";
-    QTest::newRow("aboutblank") << "about:blank";
-    QTest::newRow("abouthome")  << "about:home";
-    QTest::newRow("ftp")        << "ftp://ftp.kde.org";
-    QTest::newRow("file")       << "file:///home";
+    QTest::newRow("mailto")     << "mailto:me@here.com"             << true  ;
+    QTest::newRow("relative")   << "google.it"                      << false ;
+    QTest::newRow("javascript") << "javascript:alertbox('hello')"   << false ;
+    QTest::newRow("aboutblank") << "about:blank"                    << false ;
+    QTest::newRow("abouthome")  << "about:home"                     << false ;
+    QTest::newRow("ftp")        << "ftp://ftp.kde.org"              << true  ;
+    QTest::newRow("file")       << "file:///home"                   << true  ;
 }
 
 
 void ProtocolhandlerTest::postHandling()
 {
+    QFETCH( QString, urlString );
+    QFETCH( bool   , result    );
+    
+    QWebView *view = new QWebView;
+    QWebFrame *frame = view->page()->mainFrame();
+    
+    QNetworkRequest request = QNetworkRequest( QUrl(urlString) );
+
+    QCOMPARE( handler->postHandling( request, frame ) , result );
 }
     
 // -------------------------------------------
diff --git a/src/tests/urlbar_test.cpp b/src/tests/urlbar_test.cpp
new file mode 100644
index 00000000..7a1fb40b
--- /dev/null
+++ b/src/tests/urlbar_test.cpp
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010 Andrea Diamantini <adjam7@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+
+
+#include <qtest_kde.h>
+
+#include <QtCore>
+#include <QtGui>
+#include <QtTest>
+
+#include "webpage.h"
+#include "webview.h"
+#include "webtab.h"
+
+#include "urlbar.h"
+
+
+class UrlBarTest : public QObject
+{
+    Q_OBJECT
+    
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    
+private slots:
+
+private:
+    UrlBar *bar;
+    WebTab *tab;
+};
+
+
+// -------------------------------------------
+
+void UrlBarTest::initTestCase()
+{
+    tab = new WebTab;
+    bar = new UrlBar(tab);
+}
+
+
+void UrlBarTest::cleanupTestCase()
+{
+    delete bar;
+    delete tab;
+}
+    
+    
+// -------------------------------------------
+
+
+
+// -------------------------------------------
+
+QTEST_KDEMAIN(UrlBarTest,GUI)
+#include "urlbar_test.moc"
diff --git a/src/urlbar/urlbar.h b/src/urlbar/urlbar.h
index 9adc35a3..28afc21e 100644
--- a/src/urlbar/urlbar.h
+++ b/src/urlbar/urlbar.h
@@ -32,6 +32,7 @@
 
 
 // Local Includes
+#include "rekonqprivate_export.h"
 #include "lineedit.h"
 #include "application.h"
 
@@ -48,7 +49,7 @@ class CompletionWidget;
 class WebTab;
 
 
-class UrlBar : public LineEdit
+class REKONQ_TESTS_EXPORT UrlBar : public LineEdit
 {
     Q_OBJECT
 
-- 
cgit v1.2.1


From f85feb1a9b2a75a6dcfbbad323649c01544a9f0c Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 21 Apr 2010 01:41:13 +0200
Subject: Nebulon's patch. Reverting a beautiful fix by me letting rekonq
 joyfully crashing on every non default action

---
 src/webpage.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 2b2957f6..a75272cd 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -267,7 +267,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
                     return;               
                     
                 case KParts::BrowserOpenOrSaveQuestion::Cancel:
-                    return reply->deleteLater();               
+                    return;               
                     
                 default: // non extant case
                     break;
@@ -374,8 +374,6 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
         break;
 
     }
-    
-    reply->deleteLater();
 }
 
 
-- 
cgit v1.2.1