From e1791ac7190b8fc570c7097f48d2ad2b5cd29ee1 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Sep 2009 18:33:32 +0200
Subject: Open new tab near previous

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

(limited to 'src')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 7c91b992..3836ddd0 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -274,7 +274,8 @@ WebView *MainView::newWebView(bool focused)
     connect(webView->page(), SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
     connect(webView->page(), SIGNAL(printRequested(QWebFrame *)), this, SIGNAL(printRequested(QWebFrame *)));
 
-    addTab(webView, i18n("(Untitled)"));
+    // opening tab NEAR the previous
+    insertTab(currentIndex() + 1, webView, i18n("(Untitled)"));
        
     if (focused)
     {
-- 
cgit v1.2.1


From 7c6db1a17dbede4911d2c13cd36a485272f3e5a4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 13 Sep 2009 18:20:57 +0200
Subject: We have thumbnails! Hugh!

---
 src/CMakeLists.txt |   1 +
 src/homepage.cpp   | 216 ++++++++++++++++++++++++++++++++---------------------
 src/homepage.h     |   9 +--
 src/websnap.cpp    |  88 ++++++++++++++++++++++
 src/websnap.h      |  65 ++++++++++++++++
 5 files changed, 286 insertions(+), 93 deletions(-)
 create mode 100644 src/websnap.cpp
 create mode 100644 src/websnap.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7d54c39..db3722fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 ### ------- SETTING REKONQ FILES..
 
 SET( rekonq_SRCS
+    websnap.cpp
     homepage.cpp
     networkaccessmanager.cpp
     autosaver.cpp 
diff --git a/src/homepage.cpp b/src/homepage.cpp
index 6acd4afd..59078c51 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -32,6 +32,7 @@
 #include "historymodels.h"
 #include "bookmarks.h"
 #include "application.h"
+#include "websnap.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -46,7 +47,6 @@ HomePage::HomePage(QObject *parent)
     : QObject(parent)
 {
     m_homePagePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
-    m_imagesPath = "file://" + KStandardDirs::locate("appdata", "pics/");
 }
 
 
@@ -65,114 +65,156 @@ QString HomePage::rekonqHomePage()
         return QString("");
     }
 
-    QString history = fillHistory();
-
-    QString bookmarks = fillBookmarks();
+    QString speed = speedDial();
+    QString search = searchEngines();
+    QString closedtabs = recentlyClosedTabs();
+    
 
     QString html = QString(QLatin1String(file.readAll()))
-                        .arg(m_imagesPath)
-                        .arg(history)
-                        .arg(bookmarks);
+                        .arg(search)
+                        .arg(closedtabs)
+                        .arg(speed)
+                        ;
 
     return html;
 }
 
 
-QString HomePage::fillHistory()
+QString HomePage::speedDial()
 {
-    QString history = QString();
-    HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
+    KUrl::List ul ;
+    ul << KUrl("http://www.google.it") << KUrl("http://www.kde.org") << KUrl("http://rekonq.sourceforge.net")
+    << KUrl("http://www.slacky.eu") << KUrl("http://kde-apps.org") << KUrl("http://www.kernel.org") 
+    << KUrl("http://it.wikipedia.org") << KUrl("http://www.adjam.org") << KUrl("http://adjamblog.wordpress.com");
     
-    int i = 0;
-    do
+    QString speed = QString();
+    for(int i = 0; i< ul.count(); ++i)
     {
-        QModelIndex index = model->index(i, 0, QModelIndex() );
-        if(model->hasChildren(index))
-        {
-            QString s = QString::number(i);
-            history += createSubMenu(index.data().toString(), s);
-            history += "<p id=\"y" + s + "\" class=\"indent\" style=\"display:none\">";
-            for(int j=0; j< model->rowCount(index); ++j)
-            {
-                QModelIndex son = model->index(j, 0, index );
-// FIXME add an icon to each history item   history += "<img src=\"" + ciao + "\" alt=\"icon\" />";
-                history += QString("<a href=\"") + son.data(HistoryModel::UrlStringRole).toString() + QString("\">") + 
-                        son.data().toString() + QString("</a><br />");
-            }
-            history += "</p>";
-        }
-        else
+        KUrl url = ul.at(i);
+        QString fileName = QString("thumb") + QString::number(i) + QString(".png");
+        QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + fileName, true);
+        if( !QFile::exists(path) )
         {
-            history += QString("<p> NO CHILDREN: ") + index.data().toString() + QString("</p>");
+            kDebug() << "websnap";
+            WebSnap *ws = new WebSnap(url, fileName);
         }
-        i++;
+        
+        speed += "<img class=\"thumbnail\" src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
     }
-    while( model->hasIndex( i , 0 , QModelIndex() ) );
-
-    return history;
-    
+    return speed;
 }
 
 
-QString HomePage::fillBookmarks()
+QString HomePage::searchEngines()
 {
-    KBookmarkGroup toolBarGroup = Application::bookmarkProvider()->rootGroup();
-    if (toolBarGroup.isNull())
-    {
-        return QString("Error retrieving bookmarks!");
-    }
-
-    QString str = QString("");
-    KBookmark bookmark = toolBarGroup.first();
-    while (!bookmark.isNull())
-    {
-        str += createBookItem(bookmark);
-        bookmark = toolBarGroup.next(bookmark);
-    }
+    QString engines = "engines";
     
-    return str;
+    return engines;
 }
 
 
-QString HomePage::createSubMenu(const QString &item, const QString &s)
+QString HomePage::recentlyClosedTabs()
 {
-    QString menu = "<div onClick=\"ToggleVisibility('x" + s + "','y" + s + "')\">";
+    QString closedtabs = "closed";
 
-    menu += "<p><img id=\"x" + s + "\" src=\"" + m_imagesPath + "closed.png\" /> <b><u>" + item + "</u></b></p></div>";
-    return menu;
+    return closedtabs;
 }
 
-
-QString HomePage::createBookItem(const KBookmark &bookmark)
-{
-    static int i = 0;
-    
-    if (bookmark.isGroup())
-    {
-        QString result = QString("");
-        QString ss = "b" + QString::number(i);
-        i++;
-        
-        KBookmarkGroup group = bookmark.toGroup();
-        KBookmark bm = group.first();
-        result += createSubMenu( bookmark.text() , ss );
-        result += "<p id=\"y" + ss + "\" class=\"indent\" style=\"display:none\">";
-
-        while (!bm.isNull())
-        {
-            result += createBookItem(bm);    //menuAction->addAction(fillBookmarkBar(bm));
-            bm = group.next(bm);
-        }
-        result += "</p>";
-        return result;
-    }
- 
-    if(bookmark.isSeparator())
-    {
-        return QString("<hr />");
-    }
-    
-    QString str = ""; // FIXME Add icon "<img src=\"" + KStandardDirs::findResource( "icon", bookmark.icon() + ".png" ) + "\" alt=\"icon\" />";
-    str += "<a href=\"" + bookmark.url().prettyUrl() + "\">" + bookmark.text() + "</a><br />";
-    return str;
-}
+// QString HomePage::fillHistory()
+// {
+//     QString history = QString();
+//     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
+//     
+//     int i = 0;
+//     do
+//     {
+//         QModelIndex index = model->index(i, 0, QModelIndex() );
+//         if(model->hasChildren(index))
+//         {
+//             QString s = QString::number(i);
+//             history += createSubMenu(index.data().toString(), s);
+//             history += "<p id=\"y" + s + "\" class=\"indent\" style=\"display:none\">";
+//             for(int j=0; j< model->rowCount(index); ++j)
+//             {
+//                 QModelIndex son = model->index(j, 0, index );
+// // FIXME add an icon to each history item   history += "<img src=\"" + ciao + "\" alt=\"icon\" />";
+//                 history += QString("<a href=\"") + son.data(HistoryModel::UrlStringRole).toString() + QString("\">") + 
+//                         son.data().toString() + QString("</a><br />");
+//             }
+//             history += "</p>";
+//         }
+//         else
+//         {
+//             history += QString("<p> NO CHILDREN: ") + index.data().toString() + QString("</p>");
+//         }
+//         i++;
+//     }
+//     while( model->hasIndex( i , 0 , QModelIndex() ) );
+// 
+//     return history;
+//     
+// }
+// 
+// 
+// QString HomePage::fillBookmarks()
+// {
+//     KBookmarkGroup toolBarGroup = Application::bookmarkProvider()->rootGroup();
+//     if (toolBarGroup.isNull())
+//     {
+//         return QString("Error retrieving bookmarks!");
+//     }
+// 
+//     QString str = QString("");
+//     KBookmark bookmark = toolBarGroup.first();
+//     while (!bookmark.isNull())
+//     {
+//         str += createBookItem(bookmark);
+//         bookmark = toolBarGroup.next(bookmark);
+//     }
+//     
+//     return str;
+// }
+// 
+// 
+// QString HomePage::createSubMenu(const QString &item, const QString &s)
+// {
+//     QString menu = "<div onClick=\"ToggleVisibility('x" + s + "','y" + s + "')\">";
+// 
+//     menu += "<p><img id=\"x" + s + "\" src=\"" + m_imagesPath + "closed.png\" /> <b><u>" + item + "</u></b></p></div>";
+//     return menu;
+// }
+// 
+// 
+// QString HomePage::createBookItem(const KBookmark &bookmark)
+// {
+//     static int i = 0;
+//     
+//     if (bookmark.isGroup())
+//     {
+//         QString result = QString("");
+//         QString ss = "b" + QString::number(i);
+//         i++;
+//         
+//         KBookmarkGroup group = bookmark.toGroup();
+//         KBookmark bm = group.first();
+//         result += createSubMenu( bookmark.text() , ss );
+//         result += "<p id=\"y" + ss + "\" class=\"indent\" style=\"display:none\">";
+// 
+//         while (!bm.isNull())
+//         {
+//             result += createBookItem(bm);    //menuAction->addAction(fillBookmarkBar(bm));
+//             bm = group.next(bm);
+//         }
+//         result += "</p>";
+//         return result;
+//     }
+//  
+//     if(bookmark.isSeparator())
+//     {
+//         return QString("<hr />");
+//     }
+//     
+//     QString str = ""; // FIXME Add icon "<img src=\"" + KStandardDirs::findResource( "icon", bookmark.icon() + ".png" ) + "\" alt=\"icon\" />";
+//     str += "<a href=\"" + bookmark.url().prettyUrl() + "\">" + bookmark.text() + "</a><br />";
+//     return str;
+// }
diff --git a/src/homepage.h b/src/homepage.h
index e8b5b4f5..c4ef7fc5 100644
--- a/src/homepage.h
+++ b/src/homepage.h
@@ -46,14 +46,11 @@ public:
     QString rekonqHomePage();
     
 private:
-    QString fillHistory();
-    QString fillBookmarks();
-
-    QString createSubMenu(const QString &, const QString &);
-    QString createBookItem(const KBookmark &);
+    QString speedDial();
+    QString searchEngines();
+    QString recentlyClosedTabs();
 
     QString m_homePagePath;
-    QString m_imagesPath;
 };
 
 #endif // REKONQ_HOME_PAGE
diff --git a/src/websnap.cpp b/src/websnap.cpp
new file mode 100644
index 00000000..8bacd3b2
--- /dev/null
+++ b/src/websnap.cpp
@@ -0,0 +1,88 @@
+/* ============================================================
+*
+* 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>
+*
+*
+* 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 "websnap.h"
+#include "websnap.moc"
+
+#include <KDebug>
+#include <KStandardDirs>
+
+#include <QSize>
+#include <QWebFrame>
+#include <QPainter>
+#include <QTimer>
+
+
+WebSnap::WebSnap(const KUrl &url, const QString &fileName)
+    : QObject()
+    , m_url(url)
+    , m_image(QImage())
+    , m_fileName(fileName)
+{
+    m_targetSize = QSize(200, 150);
+    connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
+    QTimer::singleShot(0, this, SLOT(load()));
+
+}
+
+
+void WebSnap::load()
+{
+    m_page.mainFrame()->load(m_url);
+}
+
+
+void WebSnap::saveResult(bool ok)
+{
+    // crude error-checking
+    if (!ok) 
+    {
+        kDebug() << "Error loading site..";
+        emit finished();
+        return;
+    }
+
+    // find proper size, we stick to sensible aspect ratio
+    QSize size = m_page.mainFrame()->contentsSize();
+    size.setHeight(size.width() * m_targetSize.height() / m_targetSize.width());
+    
+    // create the target surface
+    m_image = QImage( size , QImage::Format_ARGB32_Premultiplied);
+    m_image.fill(Qt::transparent);
+
+    // render and rescale
+    QPainter p(&m_image);
+    m_page.setViewportSize(m_page.mainFrame()->contentsSize());
+    m_page.mainFrame()->render(&p);
+    p.end();
+    m_image = m_image.scaled(m_targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + m_fileName, true);
+    m_image.save( path );
+
+    emit finished();
+}
diff --git a/src/websnap.h b/src/websnap.h
new file mode 100644
index 00000000..cbb786c7
--- /dev/null
+++ b/src/websnap.h
@@ -0,0 +1,65 @@
+/* ============================================================
+*
+* 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>
+*
+*
+* 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 WEB_SNAP_H
+#define WEB_SNAP_H
+
+
+#include <KUrl>
+
+#include <QtCore/QObject>
+#include <QImage>
+#include <QWebPage>
+
+
+/**
+ * This class renders a site producing an image based
+ * on that.
+ * Heavily based on Graphics-Dojo WebSnap example (thanks!)
+ */
+class WebSnap : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebSnap(const KUrl &url, const QString &fileName);
+
+signals:
+    void finished();
+
+private slots:
+    void load();
+    void saveResult(bool ok);
+
+private:
+    QWebPage m_page;
+    KUrl m_url;
+    QImage m_image;
+    QString m_fileName;
+    QSize m_targetSize;
+};
+
+#endif // WEB_SNAP_H
-- 
cgit v1.2.1


From abea114ea32993cd6e41fc3b821deafa345c783b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 13 Sep 2009 18:28:02 +0200
Subject: Adding url to previews

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

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 59078c51..957118f8 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -99,7 +99,9 @@ QString HomePage::speedDial()
             WebSnap *ws = new WebSnap(url, fileName);
         }
         
-        speed += "<img class=\"thumbnail\" src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
+        speed += "<div class=\"thumbnail\"><img src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
+        speed += "<br />";
+        speed += "<a href=\"" + url.prettyUrl() + "\">" + url.prettyUrl() + "</a></div>";
     }
     return speed;
 }
@@ -107,7 +109,7 @@ QString HomePage::speedDial()
 
 QString HomePage::searchEngines()
 {
-    QString engines = "engines";
+    QString engines = "engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines ";
     
     return engines;
 }
@@ -115,7 +117,7 @@ QString HomePage::searchEngines()
 
 QString HomePage::recentlyClosedTabs()
 {
-    QString closedtabs = "closed";
+    QString closedtabs = "engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines closed";
 
     return closedtabs;
 }
-- 
cgit v1.2.1


From 0506db8875284f5dc324e8b22674a7d3f1c575fe Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 13 Sep 2009 18:40:41 +0200
Subject: Search Engine, first draft

Time to cook, now :)
Hope you glad this "technologic" preview
---
 src/homepage.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 957118f8..430fa9a6 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -38,6 +38,8 @@
 #include <KStandardDirs>
 #include <KIconLoader>
 #include <KDebug>
+#include <KConfig>
+#include <KConfigGroup>
 
 // Qt Includes
 #include <QFile>
@@ -109,7 +111,29 @@ QString HomePage::speedDial()
 
 QString HomePage::searchEngines()
 {
-    QString engines = "engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines ";
+    QString engines = "<h2>Search Engines</h2>";
+    
+    KConfig config("kuriikwsfilterrc"); //Share with konqueror
+    KConfigGroup cg = config.group("General");
+    QStringList favoriteEngines;
+    favoriteEngines << "google" << "wikipedia"; //defaults
+    favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
+
+    foreach (const QString &engine, favoriteEngines)
+    {
+        if(!engine.isEmpty())
+        {
+            engines += engine + ": <input type=\"text\" name=\"" + engine + "\" /><br />"; 
+//             service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
+//             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->setData(searchProviderPrefix);
+//             connect(a, SIGNAL(triggered(bool)), this, SLOT(slotSearch()));
+//             searchMenu->addAction(a);
+        }
+    }
     
     return engines;
 }
-- 
cgit v1.2.1


From b476c9caf91f94b8448dfce6565662d7d8a95156 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Sep 2009 00:05:14 +0200
Subject: Fixing a bit examples, positions, links and so on..

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

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 430fa9a6..20276f57 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -85,9 +85,9 @@ QString HomePage::rekonqHomePage()
 QString HomePage::speedDial()
 {
     KUrl::List ul ;
-    ul << KUrl("http://www.google.it") << KUrl("http://www.kde.org") << KUrl("http://rekonq.sourceforge.net")
+    ul << KUrl("http://www.google.com") << KUrl("http://www.kde.org") << KUrl("http://sourceforge.net")
     << KUrl("http://www.slacky.eu") << KUrl("http://kde-apps.org") << KUrl("http://www.kernel.org") 
-    << KUrl("http://it.wikipedia.org") << KUrl("http://www.adjam.org") << KUrl("http://adjamblog.wordpress.com");
+    << KUrl("http://it.wikipedia.org") << KUrl("http://www.adjam.org") << KUrl("http://wordpress.com");
     
     QString speed = QString();
     for(int i = 0; i< ul.count(); ++i)
@@ -101,9 +101,11 @@ QString HomePage::speedDial()
             WebSnap *ws = new WebSnap(url, fileName);
         }
         
-        speed += "<div class=\"thumbnail\"><img src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
+        speed += "<div class=\"thumbnail\">";
+        speed += "<a href=\"" + url.prettyUrl() + "\">";
+        speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
         speed += "<br />";
-        speed += "<a href=\"" + url.prettyUrl() + "\">" + url.prettyUrl() + "</a></div>";
+        speed += url.prettyUrl() + "</a></div>";
     }
     return speed;
 }
@@ -141,7 +143,7 @@ QString HomePage::searchEngines()
 
 QString HomePage::recentlyClosedTabs()
 {
-    QString closedtabs = "engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines engines closed";
+    QString closedtabs = "<h2>Recently closed tabs</h2>";
 
     return closedtabs;
 }
-- 
cgit v1.2.1


From f59b52ea590fcef4f76b8691edec542e133c1b78 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Sep 2009 00:24:08 +0200
Subject: Recently closed tabs: first implementation

---
 src/homepage.cpp | 12 ++++++++++--
 src/mainview.cpp | 12 +++++++++++-
 src/mainview.h   |  4 ++++
 3 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 20276f57..6a327b3a 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -32,6 +32,8 @@
 #include "historymodels.h"
 #include "bookmarks.h"
 #include "application.h"
+#include "mainwindow.h"
+#include "mainview.h"
 #include "websnap.h"
 
 // KDE Includes
@@ -143,9 +145,15 @@ QString HomePage::searchEngines()
 
 QString HomePage::recentlyClosedTabs()
 {
-    QString closedtabs = "<h2>Recently closed tabs</h2>";
+    QString closed = "<h2>Recently closed tabs</h2>";
 
-    return closedtabs;
+    KUrl::List links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
+    
+    foreach(const KUrl &url, links)
+    {
+        closed += "<a href=\"" + url.prettyUrl() + "\">" + url.prettyUrl() + "</a><br />";
+    }
+    return closed;
 }
 
 // QString HomePage::fillHistory()
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 3836ddd0..a40729a3 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -176,6 +176,8 @@ void MainView::clear()
     /// TODO What exactly do we need to clear here?
     m_urlBar->clearHistory();
     m_urlBar->clear();
+
+    m_recentlyClosedTabs.clear();
 }
 
 
@@ -403,11 +405,13 @@ void MainView::slotCloseTab(int index)
             int risp = KMessageBox::questionYesNo(this,
                         i18n("You have modified this page and when closing it you would lose the modifications.\n"
                              "Do you really want to close this page?\n"),
-                        i18n("Do you really want to close this page?"));
+                        i18n("Closing tab confirmation"));
             if (risp == KMessageBox::No)
                 return;
         }
         hasFocus = tab->hasFocus();
+        
+        m_recentlyClosedTabs.prepend(tab->url());
     }
 
     QWidget *webView = widget(index);
@@ -583,3 +587,9 @@ void MainView::resizeEvent(QResizeEvent *event)
 {
     KTabWidget::resizeEvent(event);
 }
+
+
+KUrl::List MainView::recentlyClosedTabs()
+{
+    return m_recentlyClosedTabs;
+}
diff --git a/src/mainview.h b/src/mainview.h
index c59cca1a..ba79d9f8 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -71,6 +71,8 @@ public:
     WebView *currentWebView() const;
     int webViewIndex(WebView *webView) const;
 
+    KUrl::List recentlyClosedTabs();
+    
     /**
      * show and hide TabBar if user doesn't choose
      * "Always Show TabBar" option
@@ -158,6 +160,8 @@ private:
     QString m_loadingGitPath;
     
     int m_currentTabIndex;
+
+    KUrl::List m_recentlyClosedTabs;
 };
 
 #endif // MAINVIEW_H
-- 
cgit v1.2.1


From 0af4d7e7ead3004092380d9f6baa74edf063cf27 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 14 Sep 2009 01:12:32 +0200
Subject: Google search engine

---
 src/homepage.cpp | 137 ++++++++-----------------------------------------------
 1 file changed, 18 insertions(+), 119 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 6a327b3a..a04b6e6d 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -117,27 +117,25 @@ QString HomePage::searchEngines()
 {
     QString engines = "<h2>Search Engines</h2>";
     
-    KConfig config("kuriikwsfilterrc"); //Share with konqueror
-    KConfigGroup cg = config.group("General");
-    QStringList favoriteEngines;
-    favoriteEngines << "google" << "wikipedia"; //defaults
-    favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
+//     KConfig config("kuriikwsfilterrc"); //Share with konqueror
+//     KConfigGroup cg = config.group("General");
+//     QStringList favoriteEngines;
+//     favoriteEngines << "google" << "wikipedia"; //defaults
+//     favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
+// 
+//     foreach (const QString &engine, favoriteEngines)
+//     {
+//         if(!engine.isEmpty())
+//         {
+//             engines += engine + ": <input type=\"text\" name=\"" + engine + "\" /><br />";
+//         }
+//     }
 
-    foreach (const QString &engine, favoriteEngines)
-    {
-        if(!engine.isEmpty())
-        {
-            engines += engine + ": <input type=\"text\" name=\"" + engine + "\" /><br />"; 
-//             service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(engine));
-//             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->setData(searchProviderPrefix);
-//             connect(a, SIGNAL(triggered(bool)), this, SLOT(slotSearch()));
-//             searchMenu->addAction(a);
-        }
-    }
+    // Google search engine
+    engines += "<form method=\"get\" action=\"http://www.google.com/search\">";
+    engines += "<label for=\"q\">Google:</label>";
+    engines += "<input type=\"text\" name=\"q\" />";
+    engines += "</form>";
     
     return engines;
 }
@@ -155,102 +153,3 @@ QString HomePage::recentlyClosedTabs()
     }
     return closed;
 }
-
-// QString HomePage::fillHistory()
-// {
-//     QString history = QString();
-//     HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
-//     
-//     int i = 0;
-//     do
-//     {
-//         QModelIndex index = model->index(i, 0, QModelIndex() );
-//         if(model->hasChildren(index))
-//         {
-//             QString s = QString::number(i);
-//             history += createSubMenu(index.data().toString(), s);
-//             history += "<p id=\"y" + s + "\" class=\"indent\" style=\"display:none\">";
-//             for(int j=0; j< model->rowCount(index); ++j)
-//             {
-//                 QModelIndex son = model->index(j, 0, index );
-// // FIXME add an icon to each history item   history += "<img src=\"" + ciao + "\" alt=\"icon\" />";
-//                 history += QString("<a href=\"") + son.data(HistoryModel::UrlStringRole).toString() + QString("\">") + 
-//                         son.data().toString() + QString("</a><br />");
-//             }
-//             history += "</p>";
-//         }
-//         else
-//         {
-//             history += QString("<p> NO CHILDREN: ") + index.data().toString() + QString("</p>");
-//         }
-//         i++;
-//     }
-//     while( model->hasIndex( i , 0 , QModelIndex() ) );
-// 
-//     return history;
-//     
-// }
-// 
-// 
-// QString HomePage::fillBookmarks()
-// {
-//     KBookmarkGroup toolBarGroup = Application::bookmarkProvider()->rootGroup();
-//     if (toolBarGroup.isNull())
-//     {
-//         return QString("Error retrieving bookmarks!");
-//     }
-// 
-//     QString str = QString("");
-//     KBookmark bookmark = toolBarGroup.first();
-//     while (!bookmark.isNull())
-//     {
-//         str += createBookItem(bookmark);
-//         bookmark = toolBarGroup.next(bookmark);
-//     }
-//     
-//     return str;
-// }
-// 
-// 
-// QString HomePage::createSubMenu(const QString &item, const QString &s)
-// {
-//     QString menu = "<div onClick=\"ToggleVisibility('x" + s + "','y" + s + "')\">";
-// 
-//     menu += "<p><img id=\"x" + s + "\" src=\"" + m_imagesPath + "closed.png\" /> <b><u>" + item + "</u></b></p></div>";
-//     return menu;
-// }
-// 
-// 
-// QString HomePage::createBookItem(const KBookmark &bookmark)
-// {
-//     static int i = 0;
-//     
-//     if (bookmark.isGroup())
-//     {
-//         QString result = QString("");
-//         QString ss = "b" + QString::number(i);
-//         i++;
-//         
-//         KBookmarkGroup group = bookmark.toGroup();
-//         KBookmark bm = group.first();
-//         result += createSubMenu( bookmark.text() , ss );
-//         result += "<p id=\"y" + ss + "\" class=\"indent\" style=\"display:none\">";
-// 
-//         while (!bm.isNull())
-//         {
-//             result += createBookItem(bm);    //menuAction->addAction(fillBookmarkBar(bm));
-//             bm = group.next(bm);
-//         }
-//         result += "</p>";
-//         return result;
-//     }
-//  
-//     if(bookmark.isSeparator())
-//     {
-//         return QString("<hr />");
-//     }
-//     
-//     QString str = ""; // FIXME Add icon "<img src=\"" + KStandardDirs::findResource( "icon", bookmark.icon() + ".png" ) + "\" alt=\"icon\" />";
-//     str += "<a href=\"" + bookmark.url().prettyUrl() + "\">" + bookmark.text() + "</a><br />";
-//     return str;
-// }
-- 
cgit v1.2.1


From 78d922d6433be8375b18a92418c635c04fe9bb4a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 15 Sep 2009 02:39:22 +0200
Subject: Initial newtab page settings implementation it doesn't really fit our
 needs. Just a starting point..

---
 src/CMakeLists.txt         |   1 +
 src/homepage.cpp           |  85 ++++++++++++++---------
 src/homepage.h             |   3 +-
 src/rekonq.kcfg            |  14 ++++
 src/settings.cpp           |  67 +++++++++++++++++-
 src/settings.h             |   5 ++
 src/settings_newtabpage.ui | 164 +++++++++++++++++++++++++++++++++++++++++++++
 src/websnap.cpp            |   5 +-
 src/websnap.h              |   2 +-
 9 files changed, 310 insertions(+), 36 deletions(-)
 create mode 100644 src/settings_newtabpage.ui

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db3722fb..9b24e2ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ KDE4_ADD_UI_FILES( rekonq_SRCS
     password.ui
     proxy.ui
     settings_general.ui
+    settings_newtabpage.ui
     settings_fonts.ui
     settings_proxy.ui
     settings_webkit.ui
diff --git a/src/homepage.cpp b/src/homepage.cpp
index a04b6e6d..1f759108 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -28,6 +28,9 @@
 #include "homepage.h"
 #include "homepage.moc"
 
+// Auto Includes
+#include "rekonq.h"
+
 // Local Includes
 #include "historymodels.h"
 #include "bookmarks.h"
@@ -71,12 +74,12 @@ QString HomePage::rekonqHomePage()
 
     QString speed = speedDial();
     QString search = searchEngines();
-    QString closedtabs = recentlyClosedTabs();
+    QString lastBlock = ReKonfig::useRecentlyClosedTabs() ? recentlyClosedTabs() : fillRecentHistory(); 
     
 
     QString html = QString(QLatin1String(file.readAll()))
                         .arg(search)
-                        .arg(closedtabs)
+                        .arg(lastBlock)
                         .arg(speed)
                         ;
 
@@ -86,28 +89,20 @@ QString HomePage::rekonqHomePage()
 
 QString HomePage::speedDial()
 {
-    KUrl::List ul ;
-    ul << KUrl("http://www.google.com") << KUrl("http://www.kde.org") << KUrl("http://sourceforge.net")
-    << KUrl("http://www.slacky.eu") << KUrl("http://kde-apps.org") << KUrl("http://www.kernel.org") 
-    << KUrl("http://it.wikipedia.org") << KUrl("http://www.adjam.org") << KUrl("http://wordpress.com");
+    QStringList names = ReKonfig::previewNames();
+    QStringList urls = ReKonfig::previewUrls();
     
     QString speed = QString();
-    for(int i = 0; i< ul.count(); ++i)
+    for(int i = 0; i< urls.count(); ++i)
     {
-        KUrl url = ul.at(i);
         QString fileName = QString("thumb") + QString::number(i) + QString(".png");
         QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + fileName, true);
-        if( !QFile::exists(path) )
-        {
-            kDebug() << "websnap";
-            WebSnap *ws = new WebSnap(url, fileName);
-        }
         
         speed += "<div class=\"thumbnail\">";
-        speed += "<a href=\"" + url.prettyUrl() + "\">";
-        speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + url.prettyUrl() + "\" />";
+        speed += "<a href=\"" + urls.at(i) + "\">";
+        speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
         speed += "<br />";
-        speed += url.prettyUrl() + "</a></div>";
+        speed += names.at(i) + "</a></div>";
     }
     return speed;
 }
@@ -117,20 +112,6 @@ QString HomePage::searchEngines()
 {
     QString engines = "<h2>Search Engines</h2>";
     
-//     KConfig config("kuriikwsfilterrc"); //Share with konqueror
-//     KConfigGroup cg = config.group("General");
-//     QStringList favoriteEngines;
-//     favoriteEngines << "google" << "wikipedia"; //defaults
-//     favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
-// 
-//     foreach (const QString &engine, favoriteEngines)
-//     {
-//         if(!engine.isEmpty())
-//         {
-//             engines += engine + ": <input type=\"text\" name=\"" + engine + "\" /><br />";
-//         }
-//     }
-
     // Google search engine
     engines += "<form method=\"get\" action=\"http://www.google.com/search\">";
     engines += "<label for=\"q\">Google:</label>";
@@ -144,12 +125,52 @@ QString HomePage::searchEngines()
 QString HomePage::recentlyClosedTabs()
 {
     QString closed = "<h2>Recently closed tabs</h2>";
-
+    closed += "<ul>";
+    
     KUrl::List links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs();
     
     foreach(const KUrl &url, links)
     {
-        closed += "<a href=\"" + url.prettyUrl() + "\">" + url.prettyUrl() + "</a><br />";
+        closed += "<li><a href=\"" + url.prettyUrl() + "\">" + url.prettyUrl() + "</a></li>";
     }
+    
+    closed += "</ul>";
     return closed;
 }
+
+
+QString HomePage::fillRecentHistory()
+{
+    QString history = "<h2>Last 20 visited sites</h2>";
+    history += "<ul>";
+    
+    HistoryTreeModel *model = Application::historyManager()->historyTreeModel();
+    
+    int i = 0;
+    do
+    {
+        QModelIndex index = model->index(i, 0, QModelIndex() );
+        if(model->hasChildren(index))
+        {
+            for(int j=0; j< model->rowCount(index) && i<20 ; ++j)
+            {
+                QModelIndex son = model->index(j, 0, index );
+
+                history += "<li>";
+                history += QString("<a href=\"") + son.data(HistoryModel::UrlStringRole).toString() + QString("\">");
+                history += son.data().toString();
+                history += QString("</a>");
+                history += "</li>";
+                
+                i++;
+            }
+        }
+        i++;
+    }
+    while( i<20 || model->hasIndex( i , 0 , QModelIndex() ) );
+
+    history += "<ul>";
+    
+    return history;
+    
+}
\ No newline at end of file
diff --git a/src/homepage.h b/src/homepage.h
index c4ef7fc5..82117664 100644
--- a/src/homepage.h
+++ b/src/homepage.h
@@ -49,7 +49,8 @@ private:
     QString speedDial();
     QString searchEngines();
     QString recentlyClosedTabs();
-
+    QString fillRecentHistory();
+    
     QString m_homePagePath;
 };
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 401ce58c..6b57a9fa 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -9,6 +9,20 @@
 <kcfgfile name="rekonqrc" />
 
 
+<!-- New Tab Page Settings -->
+  <group name="NewTabPage">
+    <entry name="previewNames" type="StringList">
+        <default>KDE site,Google,rekonq,SourceForge,kde-apps,kernel, wikipedia,wordpress,adjam site</default>
+    </entry>
+    <entry name="previewUrls" type="StringList">
+        <default>http://www.kde.org,http://www.google.com,http://rekonq.sourceforge.net,http://sourceforge.net,http://kde-apps.org,http://www.kernel.org,http://wikipedia.org,http://wordpress.com,http://www.adjam.org</default>
+    </entry>
+    <entry name="useRecentlyClosedTabs" type="Bool">
+        <default>false</default>
+    </entry>
+  </group>
+
+
 <!-- General Settings -->
   <group name="General">
     <entry name="useNewTabPage" type="Bool">
diff --git a/src/settings.cpp b/src/settings.cpp
index 843b3375..dd61e357 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -38,9 +38,11 @@
 #include "mainwindow.h"
 #include "networkaccessmanager.h"
 #include "webview.h"
+#include "websnap.h"
 
 //Ui Includes
 #include "ui_settings_general.h"
+#include "ui_settings_newtabpage.h"
 #include "ui_settings_fonts.h"
 #include "ui_settings_proxy.h"
 #include "ui_settings_webkit.h"
@@ -62,6 +64,7 @@ class Private
 {
 private:
     Ui::general generalUi;
+    Ui::newtabpage newtabpageUi;
     Ui::fonts fontsUi;
     Ui::proxy proxyUi;
     Ui::webkit webkitUi;
@@ -85,6 +88,12 @@ Private::Private(SettingsDialog *parent)
     pageItem = parent->addPage(widget , i18n("General"));
     pageItem->setIcon(KIcon("rekonq"));
 
+    widget = new QWidget;
+    newtabpageUi.setupUi(widget);
+    widget->layout()->setMargin(0);
+    pageItem = parent->addPage(widget , i18n("New Tab Page"));
+    pageItem->setIcon(KIcon("tab-new"));
+    
     widget = new QWidget;
     fontsUi.setupUi(widget);
     widget->layout()->setMargin(0);
@@ -130,6 +139,7 @@ Private::Private(SettingsDialog *parent)
 SettingsDialog::SettingsDialog(QWidget *parent)
         : KConfigDialog(parent, "rekonfig", ReKonfig::self())
         , d(new Private(this))
+        , m_progress(0)
 {
     setFaceType(KPageDialog::List);
     showButtonSeparator(true);
@@ -146,7 +156,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     
     connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
     connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings()));
-    
+    connect(this, SIGNAL(okClicked()), this, SLOT(updateSnaps()));
+        
     setWebSettingsToolTips();
 }
 
@@ -177,6 +188,23 @@ void SettingsDialog::setWebSettingsToolTips()
 // we need this function to UPDATE the config widget data..
 void SettingsDialog::readConfig()
 {
+    // ====== New Tab Page
+    QTableWidget *t = d->newtabpageUi.tableWidget;
+    QStringList names, urls;
+    names = ReKonfig::previewNames();
+    urls = ReKonfig::previewUrls();
+    for(int i=0; i<9; ++i)
+    {
+        QTableWidgetItem *name = new QTableWidgetItem( names.at(i) );
+        t->setItem(i,0,name);
+        QTableWidgetItem *url = new QTableWidgetItem( urls.at(i) );
+        t->setItem(i,1,url);
+    }
+
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
+    
     // ======= Fonts
     d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
 
@@ -190,6 +218,17 @@ void SettingsDialog::readConfig()
 // we need this function to SAVE settings in rc file..
 void SettingsDialog::saveSettings()
 {
+    QTableWidget *t = d->newtabpageUi.tableWidget;
+    QStringList names, urls;
+    for(int i=0; i<9; ++i)
+    {
+        names << t->item(i,0)->text();
+        urls << t->item(i,1)->text();
+    }
+
+    ReKonfig::setPreviewNames(names);
+    ReKonfig::setPreviewUrls(urls);
+    
     ReKonfig::self()->writeConfig();
     d->ebrowsingModule->save();
     d->cookiesModule->save();
@@ -214,3 +253,29 @@ void SettingsDialog::setHomeToCurrentPage()
         d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl());
     }
 }
+
+
+void SettingsDialog::updateSnaps()
+{
+    if(hasChanged())
+    {
+        QStringList urls = ReKonfig::previewUrls();
+        for(int i=0; i<9; ++i)
+        {
+            QString fileName = QString("thumb") + QString::number(i) + QString(".png");
+            WebSnap *ws = new WebSnap(urls.at(i), fileName);
+            connect(ws, SIGNAL(finished()), this, SLOT(polish()));
+        }
+        m_progress = new KProgressDialog(this, i18n("Loading..."), i18n("Retrieving site images..."));
+        m_progress->progressBar()->setRange(0,8);
+        m_progress->show();
+    }
+}
+
+
+void SettingsDialog::polish()
+{
+    WebSnap *ws = qobject_cast<WebSnap*>(sender());
+    delete ws;
+    m_progress->progressBar()->setValue( m_progress->progressBar()->value() + 1);
+}
\ No newline at end of file
diff --git a/src/settings.h b/src/settings.h
index 0be89173..9278d758 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -31,6 +31,7 @@
 
 // KDE Includes
 #include <KConfigDialog>
+#include <KProgressDialog>
 
 // Forward Declarations
 class QWidget;
@@ -50,11 +51,15 @@ private:
     Private* const d;
     void setWebSettingsToolTips();
 
+    KProgressDialog *m_progress;
 private slots:
     void readConfig();
     void saveSettings();
 
     void setHomeToCurrentPage();
+
+    void updateSnaps();
+    void polish();
 };
 
 #endif // SETTINGS_H
diff --git a/src/settings_newtabpage.ui b/src/settings_newtabpage.ui
new file mode 100644
index 00000000..006185c0
--- /dev/null
+++ b/src/settings_newtabpage.ui
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>newtabpage</class>
+ <widget class="QWidget" name="newtabpage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>377</width>
+    <height>444</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Previews</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QTableWidget" name="tableWidget">
+        <property name="rowCount">
+         <number>9</number>
+        </property>
+        <property name="columnCount">
+         <number>2</number>
+        </property>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <row/>
+        <column/>
+        <column/>
+        <item row="0" column="0">
+         <property name="text">
+          <string>KDE site</string>
+         </property>
+        </item>
+        <item row="0" column="1">
+         <property name="text">
+          <string>http://www.kde.org</string>
+         </property>
+        </item>
+        <item row="1" column="0">
+         <property name="text">
+          <string>KDE apps</string>
+         </property>
+        </item>
+        <item row="1" column="1">
+         <property name="text">
+          <string>http://kde-apps.org</string>
+         </property>
+        </item>
+        <item row="2" column="0">
+         <property name="text">
+          <string>rekonq site</string>
+         </property>
+        </item>
+        <item row="2" column="1">
+         <property name="text">
+          <string>http://rekonq.sourceforge.net</string>
+         </property>
+        </item>
+        <item row="3" column="0">
+         <property name="text">
+          <string>Google</string>
+         </property>
+        </item>
+        <item row="3" column="1">
+         <property name="text">
+          <string>http://www.google.com</string>
+         </property>
+        </item>
+        <item row="4" column="0">
+         <property name="text">
+          <string>Wikipedia</string>
+         </property>
+        </item>
+        <item row="4" column="1">
+         <property name="text">
+          <string>http://wikipedia.org</string>
+         </property>
+        </item>
+        <item row="5" column="0">
+         <property name="text">
+          <string>SourceForge</string>
+         </property>
+        </item>
+        <item row="5" column="1">
+         <property name="text">
+          <string>http://sourceforge.net</string>
+         </property>
+        </item>
+        <item row="6" column="0">
+         <property name="text">
+          <string>Kernel</string>
+         </property>
+        </item>
+        <item row="6" column="1">
+         <property name="text">
+          <string>http://www.kernel.org</string>
+         </property>
+        </item>
+        <item row="7" column="0">
+         <property name="text">
+          <string>Wordpress</string>
+         </property>
+        </item>
+        <item row="7" column="1">
+         <property name="text">
+          <string>http://wordpress.com</string>
+         </property>
+        </item>
+        <item row="8" column="0">
+         <property name="text">
+          <string>Planet KDE</string>
+         </property>
+        </item>
+        <item row="8" column="1">
+         <property name="text">
+          <string>http://planetkde.org</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>blocks</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QRadioButton" name="kcfg_useRecentlyClosedTabs">
+        <property name="text">
+         <string>show last 20 visited sites</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButton_2">
+        <property name="text">
+         <string>show recently closed tabs</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 8bacd3b2..05ea17a9 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -33,6 +33,7 @@
 
 #include <QSize>
 #include <QWebFrame>
+#include <QWebSettings>
 #include <QPainter>
 #include <QTimer>
 
@@ -43,10 +44,12 @@ WebSnap::WebSnap(const KUrl &url, const QString &fileName)
     , m_image(QImage())
     , m_fileName(fileName)
 {
+    // this to not register websnap history
+    m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+    
     m_targetSize = QSize(200, 150);
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
     QTimer::singleShot(0, this, SLOT(load()));
-
 }
 
 
diff --git a/src/websnap.h b/src/websnap.h
index cbb786c7..8993fd08 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -46,7 +46,7 @@ class WebSnap : public QObject
 
 public:
     WebSnap(const KUrl &url, const QString &fileName);
-
+    
 signals:
     void finished();
 
-- 
cgit v1.2.1


From a25e22d7b195877666237007665ce20e1358753b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 15 Sep 2009 12:37:14 +0200
Subject: Fixing state. Rekonq is not usable now, but this seems a good tech
 preview. Anyway, performance is definitely a problem with this method, also
 loading just the first time.

Looking at the other way... :)
---
 src/homepage.cpp   | 12 ++++++++++--
 src/homepage.h     |  2 +-
 src/mainview.cpp   | 24 +++++++++++++++++++++++-
 src/mainview.h     |  1 +
 src/mainwindow.cpp |  2 +-
 src/settings.cpp   | 28 ----------------------------
 src/settings.h     |  5 -----
 src/websnap.cpp    |  8 ++++----
 8 files changed, 40 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 1f759108..52668036 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -97,7 +97,15 @@ QString HomePage::speedDial()
     {
         QString fileName = QString("thumb") + QString::number(i) + QString(".png");
         QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + fileName, true);
-        
+        if( !QFile::exists(path) )
+        {
+            kDebug() << "websnap" << i << "=========================================================";
+            WebSnap *ws = new WebSnap(urls.at(i), fileName);
+            
+            // we need polish being in an extant object!!
+            connect(ws, SIGNAL(finished()), Application::instance()->mainWindow()->mainView(), SLOT(polish()));
+        }
+
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
         speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
@@ -173,4 +181,4 @@ QString HomePage::fillRecentHistory()
     
     return history;
     
-}
\ No newline at end of file
+}
diff --git a/src/homepage.h b/src/homepage.h
index 82117664..7604f0c3 100644
--- a/src/homepage.h
+++ b/src/homepage.h
@@ -40,7 +40,7 @@ class HomePage : public QObject
 Q_OBJECT
     
 public:
-    HomePage(QObject *parent = 0);
+    HomePage(QObject *parent);
     ~HomePage();
 
     QString rekonqHomePage();
diff --git a/src/mainview.cpp b/src/mainview.cpp
index a40729a3..2a3545b4 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -42,6 +42,7 @@
 #include "webview.h"
 #include "sessionmanager.h"
 #include "homepage.h"
+#include "websnap.h"
 
 // KDE Includes
 #include <KUrl>
@@ -299,7 +300,7 @@ void MainView::newTab()
     urlBar()->setUrl(KUrl(""));
     urlBar()->setFocus();
     
-    HomePage p;
+    HomePage p(w);
     
     switch(ReKonfig::newTabsBehaviour())
     {
@@ -593,3 +594,24 @@ KUrl::List MainView::recentlyClosedTabs()
 {
     return m_recentlyClosedTabs;
 }
+
+
+void MainView::polish()
+{
+    static int i = 0;
+    WebSnap *ws = qobject_cast<WebSnap*>(sender());
+    delete ws;
+    
+    i++;
+    if(i<9)
+    {
+        WebView *w = currentWebView();
+        HomePage p(w);
+        w->setHtml( p.rekonqHomePage() );
+        kDebug() << "ciao---------------------------------------------____";
+    }
+    else
+    {
+        kDebug() << "EROORORORORORORORORORO";
+    }
+}
diff --git a/src/mainview.h b/src/mainview.h
index ba79d9f8..1ba4a63d 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -124,6 +124,7 @@ public slots:
     void slotWebReload();
     void slotWebStop();
 
+    void polish();
 
 private slots:
     void slotCurrentChanged(int index);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1dc56f7a..5a095a72 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -743,7 +743,7 @@ void MainWindow::slotHome()
     
     if(ReKonfig::useNewTabPage())
     {
-        HomePage p;
+        HomePage p(w);
         w->setHtml( p.rekonqHomePage(), QUrl());
     }
     else
diff --git a/src/settings.cpp b/src/settings.cpp
index dd61e357..9767b676 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -139,7 +139,6 @@ Private::Private(SettingsDialog *parent)
 SettingsDialog::SettingsDialog(QWidget *parent)
         : KConfigDialog(parent, "rekonfig", ReKonfig::self())
         , d(new Private(this))
-        , m_progress(0)
 {
     setFaceType(KPageDialog::List);
     showButtonSeparator(true);
@@ -156,7 +155,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     
     connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings()));
     connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings()));
-    connect(this, SIGNAL(okClicked()), this, SLOT(updateSnaps()));
         
     setWebSettingsToolTips();
 }
@@ -253,29 +251,3 @@ void SettingsDialog::setHomeToCurrentPage()
         d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl());
     }
 }
-
-
-void SettingsDialog::updateSnaps()
-{
-    if(hasChanged())
-    {
-        QStringList urls = ReKonfig::previewUrls();
-        for(int i=0; i<9; ++i)
-        {
-            QString fileName = QString("thumb") + QString::number(i) + QString(".png");
-            WebSnap *ws = new WebSnap(urls.at(i), fileName);
-            connect(ws, SIGNAL(finished()), this, SLOT(polish()));
-        }
-        m_progress = new KProgressDialog(this, i18n("Loading..."), i18n("Retrieving site images..."));
-        m_progress->progressBar()->setRange(0,8);
-        m_progress->show();
-    }
-}
-
-
-void SettingsDialog::polish()
-{
-    WebSnap *ws = qobject_cast<WebSnap*>(sender());
-    delete ws;
-    m_progress->progressBar()->setValue( m_progress->progressBar()->value() + 1);
-}
\ No newline at end of file
diff --git a/src/settings.h b/src/settings.h
index 9278d758..0be89173 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -31,7 +31,6 @@
 
 // KDE Includes
 #include <KConfigDialog>
-#include <KProgressDialog>
 
 // Forward Declarations
 class QWidget;
@@ -51,15 +50,11 @@ private:
     Private* const d;
     void setWebSettingsToolTips();
 
-    KProgressDialog *m_progress;
 private slots:
     void readConfig();
     void saveSettings();
 
     void setHomeToCurrentPage();
-
-    void updateSnaps();
-    void polish();
 };
 
 #endif // SETTINGS_H
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 05ea17a9..1f564223 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -65,7 +65,6 @@ void WebSnap::saveResult(bool ok)
     if (!ok) 
     {
         kDebug() << "Error loading site..";
-        emit finished();
         return;
     }
 
@@ -85,7 +84,8 @@ void WebSnap::saveResult(bool ok)
     m_image = m_image.scaled(m_targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 
     QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + m_fileName, true);
-    m_image.save( path );
-
-    emit finished();
+    if( m_image.save(path) )
+    {
+        emit finished();
+    }
 }
-- 
cgit v1.2.1


From 32d0da0ba3c17281c4a69ee84b42e98246eb3c5d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 15 Sep 2009 12:58:56 +0200
Subject: First adjustments and code about it (it's really simple, anyway..Qt
 rocks!!!)

---
 src/homepage.cpp | 18 ++++++------------
 src/mainview.cpp | 21 ---------------------
 src/mainview.h   |  2 --
 src/webpage.cpp  |  3 +++
 4 files changed, 9 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 52668036..0cd966f4 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -95,20 +95,14 @@ QString HomePage::speedDial()
     QString speed = QString();
     for(int i = 0; i< urls.count(); ++i)
     {
-        QString fileName = QString("thumb") + QString::number(i) + QString(".png");
-        QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + fileName, true);
-        if( !QFile::exists(path) )
-        {
-            kDebug() << "websnap" << i << "=========================================================";
-            WebSnap *ws = new WebSnap(urls.at(i), fileName);
-            
-            // we need polish being in an extant object!!
-            connect(ws, SIGNAL(finished()), Application::instance()->mainWindow()->mainView(), SLOT(polish()));
-        }
-
+        QString pageName = QString("page") + QString::number(i);
+        
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
-        speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
+        speed += "<object type=\"application/x-qt-plugin\"; classId=\"WebView\" name=\"" + pageName + "\" width=\"200\">";
+        speed += "<param name=\"load\" value=\"" + urls.at(i) + "\">"; 
+        speed += "</object>";
+//         speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
         speed += "<br />";
         speed += names.at(i) + "</a></div>";
     }
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 2a3545b4..038562e8 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -594,24 +594,3 @@ KUrl::List MainView::recentlyClosedTabs()
 {
     return m_recentlyClosedTabs;
 }
-
-
-void MainView::polish()
-{
-    static int i = 0;
-    WebSnap *ws = qobject_cast<WebSnap*>(sender());
-    delete ws;
-    
-    i++;
-    if(i<9)
-    {
-        WebView *w = currentWebView();
-        HomePage p(w);
-        w->setHtml( p.rekonqHomePage() );
-        kDebug() << "ciao---------------------------------------------____";
-    }
-    else
-    {
-        kDebug() << "EROORORORORORORORORORO";
-    }
-}
diff --git a/src/mainview.h b/src/mainview.h
index 1ba4a63d..8a5c5cfa 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -124,8 +124,6 @@ public slots:
     void slotWebReload();
     void slotWebStop();
 
-    void polish();
-
 private slots:
     void slotCurrentChanged(int index);
 
diff --git a/src/webpage.cpp b/src/webpage.cpp
index b33d2cce..ea902932 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -73,6 +73,9 @@ WebPage::WebPage(QObject *parent)
         , m_pressedButtons(Qt::NoButton)
         , m_requestedUrl()
 {
+    // Enable plugin support
+    settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+   
     setForwardUnsupportedContent(true);
 
     setNetworkAccessManager(Application::networkAccessManager());
-- 
cgit v1.2.1


From 47a26d10894d4c88d219dba8d04c0eae4ea48974 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 15 Sep 2009 17:14:14 +0200
Subject: Here we are, embedding Qt Widgets..

Now it's time to RUN working or I'll be dismissed!!

This implementation works quite fine, it's a bit slow but really
better than the previous one.
It crashes gloriously loading flash contents (Qt bug? WebPlugin one's?)
and does not resize well webviews..
---
 src/CMakeLists.txt       |  2 +-
 src/homepage.cpp         |  3 +-
 src/mainview.cpp         |  1 -
 src/rekonq.kcfg          |  4 +--
 src/settings.cpp         |  1 -
 src/webpage.cpp          |  6 ++--
 src/webpluginfactory.cpp | 76 ++++++++++++++++++++++++++++++++++++++++
 src/webpluginfactory.h   | 52 +++++++++++++++++++++++++++
 src/websnap.cpp          | 91 ------------------------------------------------
 src/websnap.h            | 65 ----------------------------------
 src/webview.h            |  4 +++
 11 files changed, 139 insertions(+), 166 deletions(-)
 create mode 100644 src/webpluginfactory.cpp
 create mode 100644 src/webpluginfactory.h
 delete mode 100644 src/websnap.cpp
 delete mode 100644 src/websnap.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b24e2ec..755ae33d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 ### ------- SETTING REKONQ FILES..
 
 SET( rekonq_SRCS
-    websnap.cpp
     homepage.cpp
     networkaccessmanager.cpp
     autosaver.cpp 
@@ -24,6 +23,7 @@ SET( rekonq_SRCS
     lineedit.cpp
     webpage.cpp
     sessionmanager.cpp
+    webpluginfactory.cpp
 )
 
 
diff --git a/src/homepage.cpp b/src/homepage.cpp
index 0cd966f4..f6867c7e 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -37,7 +37,6 @@
 #include "application.h"
 #include "mainwindow.h"
 #include "mainview.h"
-#include "websnap.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -99,7 +98,7 @@ QString HomePage::speedDial()
         
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
-        speed += "<object type=\"application/x-qt-plugin\"; classId=\"WebView\" name=\"" + pageName + "\" width=\"200\">";
+        speed += "<object type=\"application/x-qt-plugin\" data=\"" + urls.at(i) + "\" classId=\"WebView\" name=\"" + pageName + "\" width=\"200\">";
         speed += "<param name=\"load\" value=\"" + urls.at(i) + "\">"; 
         speed += "</object>";
 //         speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 038562e8..accc1610 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -42,7 +42,6 @@
 #include "webview.h"
 #include "sessionmanager.h"
 #include "homepage.h"
-#include "websnap.h"
 
 // KDE Includes
 #include <KUrl>
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 6b57a9fa..417b7fbc 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -12,10 +12,10 @@
 <!-- New Tab Page Settings -->
   <group name="NewTabPage">
     <entry name="previewNames" type="StringList">
-        <default>KDE site,Google,rekonq,SourceForge,kde-apps,kernel, wikipedia,wordpress,adjam site</default>
+        <default>KDE site,Google,rekonq</default>
     </entry>
     <entry name="previewUrls" type="StringList">
-        <default>http://www.kde.org,http://www.google.com,http://rekonq.sourceforge.net,http://sourceforge.net,http://kde-apps.org,http://www.kernel.org,http://wikipedia.org,http://wordpress.com,http://www.adjam.org</default>
+        <default>http://www.kde.org,http://www.google.com,http://rekonq.sourceforge.net</default>
     </entry>
     <entry name="useRecentlyClosedTabs" type="Bool">
         <default>false</default>
diff --git a/src/settings.cpp b/src/settings.cpp
index 9767b676..504e2460 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -38,7 +38,6 @@
 #include "mainwindow.h"
 #include "networkaccessmanager.h"
 #include "webview.h"
-#include "websnap.h"
 
 //Ui Includes
 #include "ui_settings_general.h"
diff --git a/src/webpage.cpp b/src/webpage.cpp
index ea902932..697cf448 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -42,6 +42,7 @@
 #include "cookiejar.h"
 #include "networkaccessmanager.h"
 #include "webview.h"
+#include "webpluginfactory.h"
 
 // KDE Includes
 #include <KStandardDirs>
@@ -73,9 +74,8 @@ WebPage::WebPage(QObject *parent)
         , m_pressedButtons(Qt::NoButton)
         , m_requestedUrl()
 {
-    // Enable plugin support
-    settings()->setAttribute(QWebSettings::PluginsEnabled, true);
-   
+    setPluginFactory(new WebPluginFactory(this));
+    
     setForwardUnsupportedContent(true);
 
     setNetworkAccessManager(Application::networkAccessManager());
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
new file mode 100644
index 00000000..1ff1b783
--- /dev/null
+++ b/src/webpluginfactory.cpp
@@ -0,0 +1,76 @@
+/* ============================================================
+*
+* 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 "webpluginfactory.h"
+#include "webpluginfactory.moc"
+
+#include "webview.h"
+#include "webpage.h"
+
+#include <QWebFrame>
+
+#include "application.h"
+#include "mainwindow.h"
+
+WebPluginFactory::WebPluginFactory(QObject *parent)
+    : QWebPluginFactory(parent)
+{
+}
+
+
+WebPluginFactory::~WebPluginFactory()
+{
+}
+
+
+QObject *WebPluginFactory::create(const QString &mimeType,
+                                  const QUrl &url,
+                                  const QStringList &argumentNames,
+                                  const QStringList &argumentValues) const
+{
+    Q_UNUSED(mimeType)
+    Q_UNUSED(argumentNames)
+    Q_UNUSED(argumentValues)
+
+    WebView* w = new WebView( Application::instance()->mainWindow()->currentTab() );
+    w->load(url);
+//     w->page()->setViewportSize(w->page()->mainFrame()->contentsSize());
+    return w;
+}
+
+
+QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
+{
+    QList<QWebPluginFactory::Plugin> plugins;
+    
+    QWebPluginFactory::Plugin p;
+    p.name = "WebView";
+    p.description = "plugin for embedding WebViews";
+    plugins.append(p);
+    
+    return plugins;
+}
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
new file mode 100644
index 00000000..c63b0ce3
--- /dev/null
+++ b/src/webpluginfactory.h
@@ -0,0 +1,52 @@
+/* ============================================================
+*
+* 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 WEB_PLUGIN_FACTORY_H
+#define WEB_PLUGIN_FACTORY_H
+
+
+#include <QtWebKit/QWebPluginFactory>
+#include <QtCore/QList>
+#include <QtGui/QWidget>
+
+
+class WebPluginFactory : public QWebPluginFactory
+{
+Q_OBJECT
+
+public:
+    WebPluginFactory(QObject *parent);
+    ~WebPluginFactory();
+
+    virtual QObject *create(const QString &mimeType,
+                            const QUrl &url,
+                            const QStringList &argumentNames,
+                            const QStringList &argumentValues) const;
+
+    virtual QList<Plugin> plugins() const;
+};
+
+#endif // WEB_PLUGIN_FACTORY_H
diff --git a/src/websnap.cpp b/src/websnap.cpp
deleted file mode 100644
index 1f564223..00000000
--- a/src/websnap.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ============================================================
-*
-* 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>
-*
-*
-* 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 "websnap.h"
-#include "websnap.moc"
-
-#include <KDebug>
-#include <KStandardDirs>
-
-#include <QSize>
-#include <QWebFrame>
-#include <QWebSettings>
-#include <QPainter>
-#include <QTimer>
-
-
-WebSnap::WebSnap(const KUrl &url, const QString &fileName)
-    : QObject()
-    , m_url(url)
-    , m_image(QImage())
-    , m_fileName(fileName)
-{
-    // this to not register websnap history
-    m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
-    
-    m_targetSize = QSize(200, 150);
-    connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
-    QTimer::singleShot(0, this, SLOT(load()));
-}
-
-
-void WebSnap::load()
-{
-    m_page.mainFrame()->load(m_url);
-}
-
-
-void WebSnap::saveResult(bool ok)
-{
-    // crude error-checking
-    if (!ok) 
-    {
-        kDebug() << "Error loading site..";
-        return;
-    }
-
-    // find proper size, we stick to sensible aspect ratio
-    QSize size = m_page.mainFrame()->contentsSize();
-    size.setHeight(size.width() * m_targetSize.height() / m_targetSize.width());
-    
-    // create the target surface
-    m_image = QImage( size , QImage::Format_ARGB32_Premultiplied);
-    m_image.fill(Qt::transparent);
-
-    // render and rescale
-    QPainter p(&m_image);
-    m_page.setViewportSize(m_page.mainFrame()->contentsSize());
-    m_page.mainFrame()->render(&p);
-    p.end();
-    m_image = m_image.scaled(m_targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + m_fileName, true);
-    if( m_image.save(path) )
-    {
-        emit finished();
-    }
-}
diff --git a/src/websnap.h b/src/websnap.h
deleted file mode 100644
index 8993fd08..00000000
--- a/src/websnap.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ============================================================
-*
-* 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>
-*
-*
-* 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 WEB_SNAP_H
-#define WEB_SNAP_H
-
-
-#include <KUrl>
-
-#include <QtCore/QObject>
-#include <QImage>
-#include <QWebPage>
-
-
-/**
- * This class renders a site producing an image based
- * on that.
- * Heavily based on Graphics-Dojo WebSnap example (thanks!)
- */
-class WebSnap : public QObject
-{
-    Q_OBJECT
-
-public:
-    WebSnap(const KUrl &url, const QString &fileName);
-    
-signals:
-    void finished();
-
-private slots:
-    void load();
-    void saveResult(bool ok);
-
-private:
-    QWebPage m_page;
-    KUrl m_url;
-    QImage m_image;
-    QString m_fileName;
-    QSize m_targetSize;
-};
-
-#endif // WEB_SNAP_H
diff --git a/src/webview.h b/src/webview.h
index f1e5272c..16b199ff 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -45,6 +45,9 @@ class WebView : public QWebView
 
 public:
     explicit WebView(QWidget *parent = 0);
+    
+    // Q_DECLARE_METATYPE requires a copy-constructor
+    WebView(const WebView &);
 
     WebPage *page();
     KUrl url() const;
@@ -82,5 +85,6 @@ private:
     int m_progress;
     QString m_statusBarText;
 };
+Q_DECLARE_METATYPE(WebView)
 
 #endif
-- 
cgit v1.2.1


From 5f10ca0b9a9872b6dafc687976de28d6128c0aff Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 17 Sep 2009 03:25:18 +0200
Subject: Fixing previews dimension..

---
 src/webpluginfactory.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 1ff1b783..b836e620 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -58,7 +58,15 @@ QObject *WebPluginFactory::create(const QString &mimeType,
 
     WebView* w = new WebView( Application::instance()->mainWindow()->currentTab() );
     w->load(url);
-//     w->page()->setViewportSize(w->page()->mainFrame()->contentsSize());
+    QWebFrame *frame = w->page()->mainFrame();
+
+    QSize size = frame->contentsSize();
+    qreal zoom = size.height()/150.;
+    frame->setZoomFactor(zoom);
+
+    frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+    frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
+    
     return w;
 }
 
-- 
cgit v1.2.1


From 0d298edde05485569d9b2c1594905edc3637aaec Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 17 Sep 2009 16:22:07 +0200
Subject: trivial fix

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

(limited to 'src')

diff --git a/src/settings.cpp b/src/settings.cpp
index 504e2460..c43b23fc 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -190,7 +190,7 @@ void SettingsDialog::readConfig()
     QStringList names, urls;
     names = ReKonfig::previewNames();
     urls = ReKonfig::previewUrls();
-    for(int i=0; i<9; ++i)
+    for(int i=0; i< urls.count(); ++i)
     {
         QTableWidgetItem *name = new QTableWidgetItem( names.at(i) );
         t->setItem(i,0,name);
-- 
cgit v1.2.1


From 81a22b4fb23c1704b22956f5d4a8855202d136ad Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 15:16:19 +0200
Subject: First changes..

---
 src/CMakeLists.txt       |  1 +
 src/homepage.cpp         |  6 +++---
 src/webpluginfactory.cpp | 39 ++++++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 755ae33d..4aa01913 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 SET( rekonq_SRCS
     homepage.cpp
+    websnap.cpp
     networkaccessmanager.cpp
     autosaver.cpp 
     application.cpp 
diff --git a/src/homepage.cpp b/src/homepage.cpp
index f6867c7e..00f0611a 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -98,10 +98,10 @@ QString HomePage::speedDial()
         
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
-        speed += "<object type=\"application/x-qt-plugin\" data=\"" + urls.at(i) + "\" classId=\"WebView\" name=\"" + pageName + "\" width=\"200\">";
-        speed += "<param name=\"load\" value=\"" + urls.at(i) + "\">"; 
+        speed += "<object type=\"application/image-preview\" width=\"200\">";
+        speed += "<param name=\"url\" value=\"" + urls.at(i) + "\">"; 
+        speed += "<param name=\"fileName\" value=\"" + pageName + "\">"; 
         speed += "</object>";
-//         speed += "<img src=\"" + path + "\" width=\"200\" alt=\"" + names.at(i) + "\" />";
         speed += "<br />";
         speed += names.at(i) + "</a></div>";
     }
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index b836e620..3754c03d 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -31,6 +31,8 @@
 #include "webview.h"
 #include "webpage.h"
 
+#include "websnap.h"
+
 #include <QWebFrame>
 
 #include "application.h"
@@ -52,22 +54,25 @@ QObject *WebPluginFactory::create(const QString &mimeType,
                                   const QStringList &argumentNames,
                                   const QStringList &argumentValues) const
 {
-    Q_UNUSED(mimeType)
-    Q_UNUSED(argumentNames)
-    Q_UNUSED(argumentValues)
-
-    WebView* w = new WebView( Application::instance()->mainWindow()->currentTab() );
-    w->load(url);
-    QWebFrame *frame = w->page()->mainFrame();
+    if(mimeType == QString("application/image-preview") )
+    {
+        QString url, fileName;
+        int i = 0;
+        Q_FOREACH(const QString &key, argumentNames)
+        {
+            if(key == QString("url"))
+                url = argumentValues.at(i);
+            if(key == QString("fileName"))
+                url = argumentValues.at(i);            
+            ++i;
+        }
+        return new WebSnap(url,fileName);
+    }
 
-    QSize size = frame->contentsSize();
-    qreal zoom = size.height()/150.;
-    frame->setZoomFactor(zoom);
-
-    frame->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
-    frame->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
-    
-    return w;
+    kDebug() << "No plugins found for" << mimeType;
+    QWebView* webView = new QWebView;
+    webView->load(url);
+    return webView;
 }
 
 
@@ -76,8 +81,8 @@ QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
     QList<QWebPluginFactory::Plugin> plugins;
     
     QWebPluginFactory::Plugin p;
-    p.name = "WebView";
-    p.description = "plugin for embedding WebViews";
+    p.name = "application/image-preview";
+    p.description = "plugin for embedding Web snapped images";
     plugins.append(p);
     
     return plugins;
-- 
cgit v1.2.1


From f45214653b3b773d57f94064e43386410a30f465 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 16:42:20 +0200
Subject: LAST BRANCH (promised!!)

first commit here. We have the homepage classes
---
 src/CMakeLists.txt       |  1 +
 src/previewimage.cpp     | 49 +++++++++++++++++++++++++
 src/previewimage.h       | 57 +++++++++++++++++++++++++++++
 src/webpluginfactory.cpp | 12 +++----
 src/websnap.cpp          | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/websnap.h            | 67 ++++++++++++++++++++++++++++++++++
 src/webview.h            |  6 +---
 7 files changed, 273 insertions(+), 13 deletions(-)
 create mode 100644 src/previewimage.cpp
 create mode 100644 src/previewimage.h
 create mode 100644 src/websnap.cpp
 create mode 100644 src/websnap.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4aa01913..c443de2e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 SET( rekonq_SRCS
     homepage.cpp
+    previewimage.cpp
     websnap.cpp
     networkaccessmanager.cpp
     autosaver.cpp 
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
new file mode 100644
index 00000000..300b7ee7
--- /dev/null
+++ b/src/previewimage.cpp
@@ -0,0 +1,49 @@
+/* ============================================================
+*
+* 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/>.
+*
+* ============================================================ */
+
+#include "previewimage.h"
+#include "previewimage.moc"
+
+#include <KUrl>
+#include <KStandardDirs>
+
+
+PreviewImage::PreviewImage(const KUrl &url, const QString &fileName)
+    : QLabel()
+    , m_url(url)
+    , m_fileName(fileName)
+{
+    QString path = KStandardDirs::locate("appdata", "pics/loading.mng"); //QString("thumbs/") + m_fileName, true);
+    setPixmap( QPixmap(path) );
+}
+
+
+PreviewImage::~PreviewImage()
+{
+}
+
+void PreviewImage::doItYourself()
+{
+}
diff --git a/src/previewimage.h b/src/previewimage.h
new file mode 100644
index 00000000..e0ee3aec
--- /dev/null
+++ b/src/previewimage.h
@@ -0,0 +1,57 @@
+/* ============================================================
+*
+* 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
+
+
+#include <QLabel>
+#include <QImage>
+#include <KUrl>
+
+
+class PreviewImage : public QLabel
+{
+    Q_OBJECT
+
+public:
+    explicit PreviewImage(const KUrl &url, const QString &fileName);
+    
+    PreviewImage(const PreviewImage &);     // Q_DECLARE_METATYPE requires a copy-constructor
+
+    ~PreviewImage();
+    
+public slots:
+    void doItYourself();
+    
+private:
+    QPixmap m_pixmap;
+    KUrl m_url;
+    QString m_fileName;
+};
+// Q_DECLARE_METATYPE(PreviewImage)
+
+#endif // PREVIEW_IMAGE_H
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 3754c03d..9ff0011d 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -28,15 +28,11 @@
 #include "webpluginfactory.h"
 #include "webpluginfactory.moc"
 
-#include "webview.h"
-#include "webpage.h"
-
-#include "websnap.h"
-
-#include <QWebFrame>
-
 #include "application.h"
 #include "mainwindow.h"
+#include "previewimage.h"
+
+#include <KDebug>
 
 WebPluginFactory::WebPluginFactory(QObject *parent)
     : QWebPluginFactory(parent)
@@ -66,7 +62,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
                 url = argumentValues.at(i);            
             ++i;
         }
-        return new WebSnap(url,fileName);
+        return new PreviewImage(url,fileName);
     }
 
     kDebug() << "No plugins found for" << mimeType;
diff --git a/src/websnap.cpp b/src/websnap.cpp
new file mode 100644
index 00000000..4892d78f
--- /dev/null
+++ b/src/websnap.cpp
@@ -0,0 +1,94 @@
+/* ============================================================
+*
+* 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>
+*
+*
+* 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 "websnap.h"
+#include "websnap.moc"
+
+#include <KDebug>
+#include <KStandardDirs>
+
+#include <QSize>
+#include <QWebFrame>
+#include <QWebSettings>
+#include <QPainter>
+#include <QTimer>
+
+
+#define WIDTH  200
+#define HEIGHT 150
+
+
+WebSnap::WebSnap(const KUrl &url, const QString &fileName)
+    : QObject()
+    , m_url(url)
+    , m_image(new QImage(WIDTH, HEIGHT, QImage::Format_ARGB32_Premultiplied))
+    , m_fileName(fileName)
+{
+    // this to not register websnap history
+    m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+    
+    m_targetSize = QSize(200, 150);
+    connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
+    QTimer::singleShot(0, this, SLOT(load()));
+}
+
+
+void WebSnap::load()
+{
+    m_page.mainFrame()->load(m_url);
+}
+
+
+void WebSnap::saveResult(bool ok)
+{
+    // crude error-checking
+    if (!ok) 
+    {
+        kDebug() << "Error loading site..";
+        return;
+    }
+
+    // find proper size, we stick to sensible aspect ratio
+    QSize size = m_page.mainFrame()->contentsSize();
+    size.setHeight(size.width() * 150 / 200);
+    
+    // create the target surface
+    m_image->fill(Qt::transparent);
+
+    // render and rescale
+    QPainter p(m_image);
+    m_page.setViewportSize(m_page.mainFrame()->contentsSize());
+    m_page.mainFrame()->render(&p);
+    p.end();
+    *m_image = (*m_image).scaled(WIDTH, HEIGHT, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + m_fileName, true);
+    if( m_image->save(path) )
+    {
+        emit finished();
+    }
+}
diff --git a/src/websnap.h b/src/websnap.h
new file mode 100644
index 00000000..be2ad10b
--- /dev/null
+++ b/src/websnap.h
@@ -0,0 +1,67 @@
+/* ============================================================
+*
+* 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>
+*
+*
+* 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 WEB_SNAP_H
+#define WEB_SNAP_H
+
+
+#include <KUrl>
+
+#include <QtCore/QObject>
+#include <QImage>
+#include <QWebPage>
+
+
+/**
+ * This class renders a site producing an image based
+ * on that.
+ * Heavily based on Graphics-Dojo WebSnap example (thanks!)
+ */
+class WebSnap : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebSnap(const KUrl &url, const QString &fileName);
+    
+    QImage *previewImage();
+    
+signals:
+    void finished();
+
+private slots:
+    void load();
+    void saveResult(bool ok);
+
+private:
+    QWebPage m_page;
+    KUrl m_url;
+    QImage *m_image;
+    QString m_fileName;
+    QSize m_targetSize;
+};
+
+#endif // WEB_SNAP_H
diff --git a/src/webview.h b/src/webview.h
index 16b199ff..a132a193 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -45,10 +45,7 @@ class WebView : public QWebView
 
 public:
     explicit WebView(QWidget *parent = 0);
-    
-    // Q_DECLARE_METATYPE requires a copy-constructor
-    WebView(const WebView &);
-
+  
     WebPage *page();
     KUrl url() const;
     QString lastStatusBarText() const;
@@ -85,6 +82,5 @@ private:
     int m_progress;
     QString m_statusBarText;
 };
-Q_DECLARE_METATYPE(WebView)
 
 #endif
-- 
cgit v1.2.1


From d201abbd56715f53b48b27ccc0f1bf0b346f449e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 17:21:37 +0200
Subject: It finally works!

Need some fixes to be merged..
---
 src/homepage.cpp         |  3 ---
 src/previewimage.cpp     | 15 ++++++++++-----
 src/previewimage.h       | 14 ++++++--------
 src/webpluginfactory.cpp | 16 +++++++---------
 src/websnap.cpp          | 27 +++++++++++++++++----------
 src/websnap.h            |  9 ++++-----
 6 files changed, 44 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 00f0611a..76c4f393 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -94,13 +94,10 @@ QString HomePage::speedDial()
     QString speed = QString();
     for(int i = 0; i< urls.count(); ++i)
     {
-        QString pageName = QString("page") + QString::number(i);
-        
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
         speed += "<object type=\"application/image-preview\" width=\"200\">";
         speed += "<param name=\"url\" value=\"" + urls.at(i) + "\">"; 
-        speed += "<param name=\"fileName\" value=\"" + pageName + "\">"; 
         speed += "</object>";
         speed += "<br />";
         speed += names.at(i) + "</a></div>";
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
index 300b7ee7..2d963171 100644
--- a/src/previewimage.cpp
+++ b/src/previewimage.cpp
@@ -28,22 +28,27 @@
 
 #include <KUrl>
 #include <KStandardDirs>
+#include <KDebug>
 
-
-PreviewImage::PreviewImage(const KUrl &url, const QString &fileName)
+PreviewImage::PreviewImage(const QString &url)
     : QLabel()
-    , m_url(url)
-    , m_fileName(fileName)
+    , ws(0)
 {
     QString path = KStandardDirs::locate("appdata", "pics/loading.mng"); //QString("thumbs/") + m_fileName, true);
     setPixmap( QPixmap(path) );
+    kDebug() << url;
+    ws = new WebSnap( KUrl(url) );
+    connect(ws, SIGNAL(finished()), this, SLOT(setSiteImage()));
 }
 
 
 PreviewImage::~PreviewImage()
 {
+    kDebug() << "bye bye..";
 }
 
-void PreviewImage::doItYourself()
+void PreviewImage::setSiteImage()
 {
+    kDebug() << "Done. works?";
+    setPixmap( ws->previewImage() );
 }
diff --git a/src/previewimage.h b/src/previewimage.h
index e0ee3aec..7cb6c00b 100644
--- a/src/previewimage.h
+++ b/src/previewimage.h
@@ -28,9 +28,10 @@
 #define PREVIEW_IMAGE_H
 
 
+#include "websnap.h"
+
 #include <QLabel>
 #include <QImage>
-#include <KUrl>
 
 
 class PreviewImage : public QLabel
@@ -38,20 +39,17 @@ class PreviewImage : public QLabel
     Q_OBJECT
 
 public:
-    explicit PreviewImage(const KUrl &url, const QString &fileName);
+    PreviewImage(const QString &url);
     
-    PreviewImage(const PreviewImage &);     // Q_DECLARE_METATYPE requires a copy-constructor
-
     ~PreviewImage();
     
 public slots:
-    void doItYourself();
+    void setSiteImage();
     
 private:
     QPixmap m_pixmap;
-    KUrl m_url;
-    QString m_fileName;
+
+    WebSnap *ws;
 };
-// Q_DECLARE_METATYPE(PreviewImage)
 
 #endif // PREVIEW_IMAGE_H
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 9ff0011d..9d7755c5 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -50,19 +50,17 @@ QObject *WebPluginFactory::create(const QString &mimeType,
                                   const QStringList &argumentNames,
                                   const QStringList &argumentValues) const
 {
+    kDebug() << "loading mimeType: " << mimeType;
+    
     if(mimeType == QString("application/image-preview") )
     {
-        QString url, fileName;
-        int i = 0;
-        Q_FOREACH(const QString &key, argumentNames)
+        for(int i = 0; i<argumentNames.count(); ++i)
         {
-            if(key == QString("url"))
-                url = argumentValues.at(i);
-            if(key == QString("fileName"))
-                url = argumentValues.at(i);            
-            ++i;
+            if(argumentNames.at(i) == QString("url"))
+            {
+                return new PreviewImage( argumentValues.at(i) );
+            }
         }
-        return new PreviewImage(url,fileName);
     }
 
     kDebug() << "No plugins found for" << mimeType;
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 4892d78f..349f2329 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -42,16 +42,13 @@
 #define HEIGHT 150
 
 
-WebSnap::WebSnap(const KUrl &url, const QString &fileName)
+WebSnap::WebSnap(const KUrl &url)
     : QObject()
     , m_url(url)
-    , m_image(new QImage(WIDTH, HEIGHT, QImage::Format_ARGB32_Premultiplied))
-    , m_fileName(fileName)
 {
     // this to not register websnap history
     m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
     
-    m_targetSize = QSize(200, 150);
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
     QTimer::singleShot(0, this, SLOT(load()));
 }
@@ -59,6 +56,7 @@ WebSnap::WebSnap(const KUrl &url, const QString &fileName)
 
 void WebSnap::load()
 {
+    kDebug() << "loading..";
     m_page.mainFrame()->load(m_url);
 }
 
@@ -74,21 +72,30 @@ void WebSnap::saveResult(bool ok)
 
     // find proper size, we stick to sensible aspect ratio
     QSize size = m_page.mainFrame()->contentsSize();
-    size.setHeight(size.width() * 150 / 200);
+    size.setHeight(size.width() * HEIGHT / WIDTH );
     
     // create the target surface
-    m_image->fill(Qt::transparent);
+    m_image = QPixmap(WIDTH, HEIGHT);
+    m_image.fill(Qt::transparent);
 
     // render and rescale
-    QPainter p(m_image);
+    QPainter p(&m_image);
     m_page.setViewportSize(m_page.mainFrame()->contentsSize());
     m_page.mainFrame()->render(&p);
     p.end();
-    *m_image = (*m_image).scaled(WIDTH, HEIGHT, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+    m_image = m_image.scaled(WIDTH, HEIGHT, Qt::KeepAspectRatioByExpanding);
 
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + m_fileName, true);
-    if( m_image->save(path) )
+    
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/uno.png"), true);
+    if( m_image.save(path) )
     {
+        kDebug() << "finished";
         emit finished();
     }
 }
+
+
+QPixmap WebSnap::previewImage()
+{
+    return m_image;
+}
diff --git a/src/websnap.h b/src/websnap.h
index be2ad10b..7e77da49 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -31,7 +31,7 @@
 #include <KUrl>
 
 #include <QtCore/QObject>
-#include <QImage>
+#include <QPixmap>
 #include <QWebPage>
 
 
@@ -45,9 +45,9 @@ class WebSnap : public QObject
     Q_OBJECT
 
 public:
-    WebSnap(const KUrl &url, const QString &fileName);
+    WebSnap(const KUrl &url);
     
-    QImage *previewImage();
+    QPixmap previewImage();
     
 signals:
     void finished();
@@ -59,9 +59,8 @@ private slots:
 private:
     QWebPage m_page;
     KUrl m_url;
-    QImage *m_image;
+    QPixmap m_image;
     QString m_fileName;
-    QSize m_targetSize;
 };
 
 #endif // WEB_SNAP_H
-- 
cgit v1.2.1


From 5d47c66cefab5f6ee5be15cc8887525e22233de0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 19:02:27 +0200
Subject: Fixed options show recently closed tabs / show recent history

---
 src/homepage.cpp           |  2 +-
 src/rekonq.kcfg            |  4 +-
 src/settings.cpp           |  8 +++-
 src/settings_newtabpage.ui | 94 +---------------------------------------------
 4 files changed, 11 insertions(+), 97 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 76c4f393..1f056a92 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -73,7 +73,7 @@ QString HomePage::rekonqHomePage()
 
     QString speed = speedDial();
     QString search = searchEngines();
-    QString lastBlock = ReKonfig::useRecentlyClosedTabs() ? recentlyClosedTabs() : fillRecentHistory(); 
+    QString lastBlock = ReKonfig::showLastVisitedSites() ? fillRecentHistory() : recentlyClosedTabs() ; 
     
 
     QString html = QString(QLatin1String(file.readAll()))
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 417b7fbc..16a77d2c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -17,8 +17,8 @@
     <entry name="previewUrls" type="StringList">
         <default>http://www.kde.org,http://www.google.com,http://rekonq.sourceforge.net</default>
     </entry>
-    <entry name="useRecentlyClosedTabs" type="Bool">
-        <default>false</default>
+    <entry name="showLastVisitedSites" type="Bool">
+        <default>true</default>
     </entry>
   </group>
 
diff --git a/src/settings.cpp b/src/settings.cpp
index c43b23fc..ae8ccc4d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -200,7 +200,9 @@ void SettingsDialog::readConfig()
 
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
-    
+
+    d->newtabpageUi.showLastVisitedSites->setChecked( ReKonfig::showLastVisitedSites() );
+
     
     // ======= Fonts
     d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
@@ -225,7 +227,9 @@ void SettingsDialog::saveSettings()
 
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
-    
+
+    ReKonfig::setShowLastVisitedSites( d->newtabpageUi.showLastVisitedSites->isChecked() );
+
     ReKonfig::self()->writeConfig();
     d->ebrowsingModule->save();
     d->cookiesModule->save();
diff --git a/src/settings_newtabpage.ui b/src/settings_newtabpage.ui
index 006185c0..2061d285 100644
--- a/src/settings_newtabpage.ui
+++ b/src/settings_newtabpage.ui
@@ -39,96 +39,6 @@
         <row/>
         <column/>
         <column/>
-        <item row="0" column="0">
-         <property name="text">
-          <string>KDE site</string>
-         </property>
-        </item>
-        <item row="0" column="1">
-         <property name="text">
-          <string>http://www.kde.org</string>
-         </property>
-        </item>
-        <item row="1" column="0">
-         <property name="text">
-          <string>KDE apps</string>
-         </property>
-        </item>
-        <item row="1" column="1">
-         <property name="text">
-          <string>http://kde-apps.org</string>
-         </property>
-        </item>
-        <item row="2" column="0">
-         <property name="text">
-          <string>rekonq site</string>
-         </property>
-        </item>
-        <item row="2" column="1">
-         <property name="text">
-          <string>http://rekonq.sourceforge.net</string>
-         </property>
-        </item>
-        <item row="3" column="0">
-         <property name="text">
-          <string>Google</string>
-         </property>
-        </item>
-        <item row="3" column="1">
-         <property name="text">
-          <string>http://www.google.com</string>
-         </property>
-        </item>
-        <item row="4" column="0">
-         <property name="text">
-          <string>Wikipedia</string>
-         </property>
-        </item>
-        <item row="4" column="1">
-         <property name="text">
-          <string>http://wikipedia.org</string>
-         </property>
-        </item>
-        <item row="5" column="0">
-         <property name="text">
-          <string>SourceForge</string>
-         </property>
-        </item>
-        <item row="5" column="1">
-         <property name="text">
-          <string>http://sourceforge.net</string>
-         </property>
-        </item>
-        <item row="6" column="0">
-         <property name="text">
-          <string>Kernel</string>
-         </property>
-        </item>
-        <item row="6" column="1">
-         <property name="text">
-          <string>http://www.kernel.org</string>
-         </property>
-        </item>
-        <item row="7" column="0">
-         <property name="text">
-          <string>Wordpress</string>
-         </property>
-        </item>
-        <item row="7" column="1">
-         <property name="text">
-          <string>http://wordpress.com</string>
-         </property>
-        </item>
-        <item row="8" column="0">
-         <property name="text">
-          <string>Planet KDE</string>
-         </property>
-        </item>
-        <item row="8" column="1">
-         <property name="text">
-          <string>http://planetkde.org</string>
-         </property>
-        </item>
        </widget>
       </item>
      </layout>
@@ -141,14 +51,14 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QRadioButton" name="kcfg_useRecentlyClosedTabs">
+       <widget class="QRadioButton" name="showLastVisitedSites">
         <property name="text">
          <string>show last 20 visited sites</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton_2">
+       <widget class="QRadioButton" name="showRecentlyClosedTabs">
         <property name="text">
          <string>show recently closed tabs</string>
         </property>
-- 
cgit v1.2.1


From e2f57546558b2d90147cced3beee541e7e1cae9e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 19:22:51 +0200
Subject: Faster loading..

---
 src/homepage.cpp         |  3 ++-
 src/previewimage.cpp     | 27 ++++++++++++++++++++-------
 src/previewimage.h       |  2 +-
 src/webpluginfactory.cpp | 10 ++++++++--
 src/websnap.cpp          | 12 +++++++-----
 src/websnap.h            |  7 ++++---
 6 files changed, 42 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/homepage.cpp b/src/homepage.cpp
index 1f056a92..14db5806 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -97,7 +97,8 @@ QString HomePage::speedDial()
         speed += "<div class=\"thumbnail\">";
         speed += "<a href=\"" + urls.at(i) + "\">";
         speed += "<object type=\"application/image-preview\" width=\"200\">";
-        speed += "<param name=\"url\" value=\"" + urls.at(i) + "\">"; 
+        speed += "<param name=\"url\" value=\"" + urls.at(i) + "\">";
+        speed += "<param name=\"position\" value=\"" + QString::number(i) + "\">"; 
         speed += "</object>";
         speed += "<br />";
         speed += names.at(i) + "</a></div>";
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
index 2d963171..d027bfd1 100644
--- a/src/previewimage.cpp
+++ b/src/previewimage.cpp
@@ -26,19 +26,32 @@
 #include "previewimage.h"
 #include "previewimage.moc"
 
+#include <QFile>
+
 #include <KUrl>
 #include <KStandardDirs>
 #include <KDebug>
 
-PreviewImage::PreviewImage(const QString &url)
+PreviewImage::PreviewImage(const QString &url, const QString &pos)
     : QLabel()
     , ws(0)
-{
-    QString path = KStandardDirs::locate("appdata", "pics/loading.mng"); //QString("thumbs/") + m_fileName, true);
-    setPixmap( QPixmap(path) );
-    kDebug() << url;
-    ws = new WebSnap( KUrl(url) );
-    connect(ws, SIGNAL(finished()), this, SLOT(setSiteImage()));
+{   
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/rek") + pos + ".png", true);
+    
+    if(QFile::exists(path))
+    {
+        kDebug() << "exists! Loading it...";
+        m_pixmap.load(path);
+        setPixmap( m_pixmap );
+    }
+    else
+    {
+        QString path = KStandardDirs::locate("appdata", "pics/loading.mng");
+        setPixmap( QPixmap(path) );
+    
+        ws = new WebSnap( url, pos );
+        connect(ws, SIGNAL(finished()), this, SLOT(setSiteImage()));
+    }
 }
 
 
diff --git a/src/previewimage.h b/src/previewimage.h
index 7cb6c00b..612d98c6 100644
--- a/src/previewimage.h
+++ b/src/previewimage.h
@@ -39,7 +39,7 @@ class PreviewImage : public QLabel
     Q_OBJECT
 
 public:
-    PreviewImage(const QString &url);
+    PreviewImage(const QString &url, const QString &pos);
     
     ~PreviewImage();
     
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index 9d7755c5..1e599327 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -53,14 +53,20 @@ QObject *WebPluginFactory::create(const QString &mimeType,
     kDebug() << "loading mimeType: " << mimeType;
     
     if(mimeType == QString("application/image-preview") )
-    {
+    {   
+        QString url, pos;
         for(int i = 0; i<argumentNames.count(); ++i)
         {
             if(argumentNames.at(i) == QString("url"))
             {
-                return new PreviewImage( argumentValues.at(i) );
+                url = argumentValues.at(i);
+            }
+            if(argumentNames.at(i) == QString("position"))
+            {
+                pos = argumentValues.at(i);
             }
         }
+        return new PreviewImage(url, pos);
     }
 
     kDebug() << "No plugins found for" << mimeType;
diff --git a/src/websnap.cpp b/src/websnap.cpp
index 349f2329..ec537b32 100644
--- a/src/websnap.cpp
+++ b/src/websnap.cpp
@@ -36,19 +36,21 @@
 #include <QWebSettings>
 #include <QPainter>
 #include <QTimer>
+#include <QFile>
 
 
 #define WIDTH  200
 #define HEIGHT 150
 
 
-WebSnap::WebSnap(const KUrl &url)
+WebSnap::WebSnap(const QString &url, const QString &pos)
     : QObject()
-    , m_url(url)
 {
+    m_url = url;
+    m_pos = pos;
+
     // this to not register websnap history
     m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
-    
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(saveResult(bool)));
     QTimer::singleShot(0, this, SLOT(load()));
 }
@@ -57,7 +59,7 @@ WebSnap::WebSnap(const KUrl &url)
 void WebSnap::load()
 {
     kDebug() << "loading..";
-    m_page.mainFrame()->load(m_url);
+    m_page.mainFrame()->load( QUrl(m_url) );
 }
 
 
@@ -86,7 +88,7 @@ void WebSnap::saveResult(bool ok)
     m_image = m_image.scaled(WIDTH, HEIGHT, Qt::KeepAspectRatioByExpanding);
 
     
-    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/uno.png"), true);
+    QString path = KStandardDirs::locateLocal("cache", QString("thumbs/rek") + m_pos + ".png", true);
     if( m_image.save(path) )
     {
         kDebug() << "finished";
diff --git a/src/websnap.h b/src/websnap.h
index 7e77da49..2bcdfef8 100644
--- a/src/websnap.h
+++ b/src/websnap.h
@@ -45,7 +45,7 @@ class WebSnap : public QObject
     Q_OBJECT
 
 public:
-    WebSnap(const KUrl &url);
+    WebSnap(const QString &url, const QString &pos);
     
     QPixmap previewImage();
     
@@ -58,9 +58,10 @@ private slots:
 
 private:
     QWebPage m_page;
-    KUrl m_url;
     QPixmap m_image;
-    QString m_fileName;
+
+    QString m_url;
+    QString m_pos;
 };
 
 #endif // WEB_SNAP_H
-- 
cgit v1.2.1


From a7dda23ffb4c2be14c7ac909162a2fc86861d198 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 18 Sep 2009 19:26:33 +0200
Subject: Really fixed 2 commits ago options.. :)

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

(limited to 'src')

diff --git a/src/settings.cpp b/src/settings.cpp
index ae8ccc4d..1950c40a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -201,8 +201,11 @@ void SettingsDialog::readConfig()
     ReKonfig::setPreviewNames(names);
     ReKonfig::setPreviewUrls(urls);
 
-    d->newtabpageUi.showLastVisitedSites->setChecked( ReKonfig::showLastVisitedSites() );
-
+    if( ReKonfig::showLastVisitedSites() )
+        d->newtabpageUi.showLastVisitedSites->setChecked( true );
+    else
+        d->newtabpageUi.showRecentlyClosedTabs->setChecked( true );
+        
     
     // ======= Fonts
     d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
-- 
cgit v1.2.1