summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/application.cpp37
-rw-r--r--src/history/historymodels.cpp32
-rw-r--r--src/history/historymodels.h31
-rw-r--r--src/rekonqpage/newtabpage.cpp1092
-rw-r--r--src/rekonqpage/newtabpage.h125
-rw-r--r--src/rekonqpage/thumbupdater.cpp85
-rw-r--r--src/rekonqpage/thumbupdater.h58
-rw-r--r--src/tabwindow/tabwindow.cpp3
-rw-r--r--src/webtab/protocolhandler.cpp7
10 files changed, 1444 insertions, 30 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cadf481..d5d5c8c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,9 @@ set(rekonq_KDEINIT_SRCS
icons/iconmanager.cpp
icons/webicon.cpp
#----------------------------------------
+ rekonqpage/newtabpage.cpp
+ rekonqpage/thumbupdater.cpp
+ #----------------------------------------
settings/settingsdialog.cpp
settings/appearancewidget.cpp
settings/advancedwidget.cpp
@@ -163,6 +166,7 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/download
${CMAKE_CURRENT_SOURCE_DIR}/history
${CMAKE_CURRENT_SOURCE_DIR}/icons
+ ${CMAKE_CURRENT_SOURCE_DIR}/rekonqpage
${CMAKE_CURRENT_SOURCE_DIR}/settings
${CMAKE_CURRENT_SOURCE_DIR}/sync
${CMAKE_CURRENT_SOURCE_DIR}/urlbar
diff --git a/src/application.cpp b/src/application.cpp
index da87063d..c36ea441 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -179,33 +179,26 @@ int Application::newInstance()
{
if (isFirstLoad)
{
- if (hasToBeRecoveredFromCrash)
+ // NOTE: just load new tabs/windows without arguments
+ // if NOT is Session restored...
+ if (!isSessionRestored())
{
- loadUrl(KUrl("about:closedTabs"), Rekonq::NewWindow);
- }
- else
- {
- // NOTE: just load new tabs/windows without arguments
- // if NOT is Session restored...
- if (!isSessionRestored())
+ switch (ReKonfig::startupBehaviour())
{
- switch (ReKonfig::startupBehaviour())
+ case 0: // open home page
+ loadUrl(KUrl(ReKonfig::homePage()) , Rekonq::NewWindow);
+ break;
+ case 1: // open new tab page
+ loadUrl(KUrl("about:home"), Rekonq::NewWindow);
+ break;
+ case 2: // restore session
+ if (SessionManager::self()->restoreSessionFromScratch())
{
- case 0: // open home page
- newTabWindow()->newCleanTab();
- break;
- case 1: // open new tab page
- loadUrl(KUrl("about:home"), Rekonq::NewWindow);
- break;
- case 2: // restore session
- if (SessionManager::self()->restoreSessionFromScratch())
- {
- break;
- }
- default:
- newTabWindow()->newCleanTab();
break;
}
+ default:
+ newTabWindow()->newCleanTab();
+ break;
}
}
}
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 9ffc2643..48cdc78e 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -741,3 +741,35 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i
endRemoveRows();
}
}
+
+
+// ----------------------------------------------------------------------------------------------------------
+
+
+UrlFilterProxyModel::UrlFilterProxyModel(QObject *parent)
+ : QSortFilterProxyModel(parent)
+{
+ setFilterCaseSensitivity(Qt::CaseInsensitive);
+}
+
+
+bool UrlFilterProxyModel::filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const
+{
+ return recursiveMatch(sourceModel()->index(source_row, 0, source_parent));
+}
+
+
+bool UrlFilterProxyModel::recursiveMatch(const QModelIndex &index) const
+{
+ if (index.data().toString().contains(filterRegExp()))
+ return true;
+
+ int numChildren = sourceModel()->rowCount(index);
+ for (int childRow = 0; childRow < numChildren; ++childRow)
+ {
+ if (recursiveMatch(sourceModel()->index(childRow, 0, index)))
+ return true;
+ }
+
+ return false;
+}
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 44569fa2..be0cb442 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -26,8 +26,8 @@
* ============================================================ */
-#ifndef HISTORYMODELS_H
-#define HISTORYMODELS_H
+#ifndef HISTORY_MODELS_H
+#define HISTORY_MODELS_H
// Rekonq Includes
@@ -40,6 +40,7 @@
#include <QHash>
#include <QAbstractTableModel>
#include <QAbstractProxyModel>
+#include <QSortFilterProxyModel>
// Forward Declarations
class HistoryManager;
@@ -176,4 +177,28 @@ private:
};
-#endif // HISTORYMODELS_H
+// ----------------------------------------------------------------------------------------------------------------------
+
+
+/**
+ * QSortFilterProxyModel hides all children which parent doesn't
+ * match the filter. This class is used to change this behavior.
+ * If a url matches the filter it'll be shown,
+ * even if it's parent doesn't match it.
+ */
+class UrlFilterProxyModel : public QSortFilterProxyModel
+{
+ Q_OBJECT
+
+public:
+ explicit UrlFilterProxyModel(QObject *parent = 0);
+
+protected:
+ virtual bool filterAcceptsRow(const int source_row, const QModelIndex &source_parent) const;
+
+ // returns true if index or any of his children match the filter
+ bool recursiveMatch(const QModelIndex &index) const;
+};
+
+
+#endif // HISTORY_MODELS_H
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp
new file mode 100644
index 00000000..efcebe9e
--- /dev/null
+++ b/src/rekonqpage/newtabpage.cpp
@@ -0,0 +1,1092 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+// Self Includes
+#include "newtabpage.h"
+#include "newtabpage.moc"
+
+// Auto Includes
+#include "rekonq.h"
+
+// Manager Includes
+#include "bookmarkmanager.h"
+#include "downloadmanager.h"
+#include "iconmanager.h"
+
+#include "historymanager.h"
+#include "historymodels.h"
+
+// Local Includes
+#include "application.h"
+#include "previewselectorbar.h"
+#include "thumbupdater.h"
+#include "websnap.h"
+#include "webpage.h"
+#include "webtab.h"
+
+// KDE Includes
+#include <KBookmarkManager>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMimeType>
+#include <KRun>
+#include <KStandardDirs>
+
+// Qt Includes
+#include <QFile>
+#include <QAction>
+#include <QWebFrame>
+#include <QProcess>
+
+
+NewTabPage::NewTabPage(QWebFrame *frame)
+ : QObject(frame)
+ , m_root(frame->documentElement())
+ , m_showFullHistory(false)
+{
+ QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
+ QString dataPath = QL1S("file://") + htmlFilePath;
+ dataPath.remove(QL1S("/htmls/home.html"));
+
+ QFile file(htmlFilePath);
+ bool isOpened = file.open(QIODevice::ReadOnly);
+ if (!isOpened)
+ {
+ kDebug() << "Couldn't open the home.html file";
+ }
+ else
+ {
+ m_html = file.readAll();
+ m_html.replace(QL1S("$DEFAULT_PATH"), dataPath);
+ }
+}
+
+
+void NewTabPage::generate(const KUrl &url)
+{
+ QWebFrame *parentFrame = qobject_cast<QWebFrame *>(parent());
+ QWebPage *pg = parentFrame->page();
+ WebView *view = qobject_cast<WebView *>(pg->parent());
+ WebTab *tab = qobject_cast<WebTab *>(view->parent());
+
+ // about:preview links
+ if (KUrl("about:settings").isParentOf(url))
+ {
+ if (url.fileName() == QL1S("network"))
+ {
+ QString program = QL1S("kcmshell4");
+ QStringList arguments;
+ arguments << QL1S("kcm_networkmanagement");
+ QProcess *proc = new QProcess(parent());
+ proc->start(program, arguments);
+ return;
+ }
+
+ if (url.fileName() == QL1S("proxy"))
+ {
+ QString program = QL1S("kcmshell4");
+ QStringList arguments;
+ arguments << QL1S("proxy");
+ QProcess *proc = new QProcess(parent());
+ proc->start(program, arguments);
+ return;
+ }
+
+ if (url.fileName() == QL1S("firewall"))
+ {
+ QString program = QL1S("kcmshell4");
+ QStringList arguments;
+ arguments << QL1S("kcm-ufw");
+ QProcess *proc = new QProcess(parent());
+ proc->start(program, arguments);
+ return;
+ }
+ }
+
+ // about:preview links
+ if (KUrl("about:preview").isParentOf(url))
+ {
+ if (url.fileName() == QL1S("add"))
+ {
+ QStringList names = ReKonfig::previewNames();
+ QStringList urls = ReKonfig::previewUrls();
+
+ int index = urls.count();
+
+ names.append("");
+ urls.append("");
+
+ ReKonfig::setPreviewNames(names);
+ ReKonfig::setPreviewUrls(urls);
+
+ loadPageForUrl(KUrl("about:favorites"));
+
+ tab->createPreviewSelectorBar(index);
+ return;
+ }
+
+ if (url.directory() == QL1S("preview/remove"))
+ {
+ int index = url.fileName().toInt();
+ removePreview(index);
+ return;
+ }
+
+ if (url.directory() == QL1S("preview/modify"))
+ {
+ int index = url.fileName().toInt();
+ tab->createPreviewSelectorBar(index);
+ return;
+ }
+
+ if (url.directory() == QL1S("preview/reload"))
+ {
+ int index = url.fileName().toInt();
+ reloadPreview(index);
+ return;
+ }
+ }
+
+// // about:tabs links
+// if (KUrl("about:tabs").isParentOf(url))
+// {
+// if (url.fileName() == QL1S("show"))
+// {
+// const int winIndex = url.queryItem(QL1S("win")).toInt();
+// const int tabIndex = url.queryItem(QL1S("tab")).toInt();
+//
+// MainWindow *w = rApp->mainWindowList().at(winIndex).data();
+//
+// // close about:tabs tab
+// rApp->mainWindow()->mainView()->closeTab(rApp->mainWindow()->mainView()->currentIndex());
+//
+// // show requested tab
+// w->mainView()->setCurrentIndex(tabIndex);
+// if (w != rApp->mainWindow())
+// w->raise();
+// return;
+// }
+//
+// if (url.fileName() == QL1S("remove"))
+// {
+// const int winIndex = url.queryItem(QL1S("win")).toInt();
+// const int tabIndex = url.queryItem(QL1S("tab")).toInt();
+//
+// MainWindow *w = rApp->mainWindowList().at(winIndex).data();
+// w->mainView()->closeTab(tabIndex);
+// loadPageForUrl(KUrl("about:tabs"));
+// return;
+// }
+// }
+//
+// // about:closedTabs links
+// if (KUrl("about:closedTabs").isParentOf(url))
+// {
+// if (url.fileName() == QL1S("restore"))
+// {
+// const int tabIndex = url.queryItem(QL1S("tab")).toInt();
+//
+// rApp->mainWindow()->mainView()->restoreClosedTab(tabIndex, false);
+// return;
+// }
+// }
+
+ // about:history links
+ if (KUrl("about:history").isParentOf(url))
+ {
+ if (url.fileName() == QL1S("clear"))
+ {
+ HistoryManager::self()->clear();
+ loadPageForUrl(KUrl("about:history"));
+ return;
+ }
+
+ if (url.fileName() == QL1S("showAllItems"))
+ {
+ m_showFullHistory = true;
+ loadPageForUrl(KUrl("about:history"));
+ return;
+ }
+
+ if (url.fileName() == QL1S("search"))
+ {
+ QString value = url.queryItemValue(QL1S("q"));
+ loadPageForUrl(KUrl("about:history"), value);
+ return;
+ }
+
+ }
+
+ // about:downloads links
+ if (KUrl("about:downloads").isParentOf(url))
+ {
+ if (url.fileName() == QL1S("clear"))
+ {
+ DownloadManager::self()->clearDownloadsHistory();
+ loadPageForUrl(KUrl("about:downloads"));
+ return;
+ }
+
+ if (url.fileName() == QL1S("search"))
+ {
+ QString value = url.queryItemValue(QL1S("q"));
+ loadPageForUrl(KUrl("about:downloads"), value);
+ return;
+ }
+
+ if (url.fileName() == QL1S("opendir"))
+ {
+ QString value = url.queryItemValue(QL1S("q"));
+ KUrl dirUrl = KUrl(value);
+ (void)new KRun(dirUrl, tab, 0, dirUrl.isLocalFile());
+ return;
+ }
+
+ if (url.fileName() == QL1S("removeItem"))
+ {
+ int value = url.queryItemValue(QL1S("item")).toInt();
+ DownloadManager::self()->removeDownloadItem(value);
+ loadPageForUrl(KUrl("about:downloads"));
+ return;
+ }
+ }
+
+ if (url == KUrl("about:bookmarks/edit"))
+ {
+ BookmarkManager::self()->slotEditBookmarks();
+ return;
+ }
+
+
+ if (url == KUrl("about:favorites/save"))
+ {
+ saveFavorites();
+ return;
+ }
+
+
+ loadPageForUrl(url);
+}
+
+
+void NewTabPage::loadPageForUrl(const KUrl &url, const QString & filter)
+{
+ // webFrame can be null. See bug:282092
+ QWebFrame *parentFrame = qobject_cast<QWebFrame *>(parent());
+ if (!parentFrame)
+ {
+ kDebug() << "NULL PARENT FRAME: PAGE NOT LOADED";
+ return;
+ }
+
+ parentFrame->setHtml(m_html);
+
+ m_root = parentFrame->documentElement().findFirst(QL1S("#content"));
+
+ browsingMenu(url);
+
+ QString title;
+ QByteArray encodedUrl = url.toEncoded();
+ if (encodedUrl == QByteArray("about:favorites"))
+ {
+ favoritesPage();
+// updateWindowIcon();
+ title = i18n("Favorites");
+ m_root.document().findFirst(QL1S("title")).setPlainText(title);
+ initJS();
+ return;
+ }
+// else if (encodedUrl == QByteArray("about:closedTabs"))
+// {
+// closedTabsPage();
+// updateWindowIcon();
+// title = i18n("Closed Tabs");
+// }
+ else if (encodedUrl == QByteArray("about:history"))
+ {
+ historyPage(filter);
+// updateWindowIcon();
+ title = i18n("History");
+ }
+ else if (encodedUrl == QByteArray("about:bookmarks"))
+ {
+ bookmarksPage();
+// updateWindowIcon();
+ title = i18n("Bookmarks");
+ }
+ else if (encodedUrl == QByteArray("about:downloads"))
+ {
+ downloadsPage(filter);
+// updateWindowIcon();
+ title = i18n("Downloads");
+ }
+// else if (encodedUrl == QByteArray("about:tabs"))
+// {
+// tabsPage();
+// updateWindowIcon();
+// title = i18n("Tabs");
+// }
+
+ m_root.document().findFirst(QL1S("title")).setPlainText(title);
+}
+
+
+// ----------------------------------------------------------------------------
+// HIGH-LEVEL FUNCTIONS
+
+
+void NewTabPage::browsingMenu(const KUrl &currentUrl)
+{
+ QList<QWebElement> navItems;
+
+ // Favorites
+ navItems.append(createLinkItem(i18n("Favorites"),
+ QL1S("about:favorites"),
+ QL1S("emblem-favorite"),
+ KIconLoader::Toolbar));
+
+// // Closed Tabs
+// navItems.append(createLinkItem(i18n("Closed Tabs"),
+// QL1S("about:closedTabs"),
+// QL1S("tab-close"),
+// KIconLoader::Toolbar));
+
+ // Bookmarks
+ navItems.append(createLinkItem(i18n("Bookmarks"),
+ QL1S("about:bookmarks"),
+ QL1S("bookmarks"),
+ KIconLoader::Toolbar));
+
+ // History
+ navItems.append(createLinkItem(i18n("History"),
+ QL1S("about:history"),
+ QL1S("view-history"),
+ KIconLoader::Toolbar));
+
+ // Downloads
+ navItems.append(createLinkItem(i18n("Downloads"),
+ QL1S("about:downloads"),
+ QL1S("download"),
+ KIconLoader::Toolbar));
+
+// // Tabs
+// navItems.append(createLinkItem(i18n("Tabs"),
+// QL1S("about:tabs"),
+// QL1S("tab-duplicate"),
+// KIconLoader::Toolbar));
+
+ Q_FOREACH(QWebElement it, navItems)
+ {
+ const QString aTagString(QL1C('a'));
+ const QString hrefAttributeString(QL1S("href"));
+
+ if (it.findFirst(aTagString).attribute(hrefAttributeString) == currentUrl.toMimeDataString())
+ it.addClass(QL1S("current"));
+ else if (currentUrl == QL1S("about:home") && it.findFirst(aTagString).attribute(hrefAttributeString) == QL1S("about:favorites"))
+ it.addClass(QL1S("current"));
+ m_root.document().findFirst(QL1S("#navigation")).appendInside(it);
+ }
+}
+
+
+void NewTabPage::favoritesPage()
+{
+ m_root.addClass(QL1S("favorites"));
+
+ QWebElement add = createLinkItem(i18n("Add Favorite"),
+ QL1S("about:preview/add"),
+ QL1S("list-add"),
+ KIconLoader::Toolbar);
+ add.setAttribute(QL1S("class"), QL1S("right"));
+ m_root.document().findFirst("#actions").appendInside(add);
+
+ QStringList names = ReKonfig::previewNames();
+ QStringList urls = ReKonfig::previewUrls();
+
+ if (urls.isEmpty())
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("You can add a favorite by clicking the \"Add Favorite\" button in the top-right corner of this page"));
+ return;
+ }
+
+ for (int i = 0; i < urls.count() ; ++i)
+ {
+ KUrl url = KUrl(urls.at(i));
+
+ QWebElement prev = url.isEmpty()
+ ? emptyPreview(i)
+ : validPreview(i, url, QString::number(i + 1) + QL1S(" - ") + names.at(i));
+
+ m_root.appendInside(prev);
+ }
+}
+
+
+void NewTabPage::historyPage(const QString & filter)
+{
+ m_root.addClass(QL1S("history"));
+
+ QWebElement searchForm = createFormItem(i18n("Search History"), QL1S("about:history/search"));
+ searchForm.setAttribute(QL1S("class"), QL1S("left"));
+
+ m_root.document().findFirst(QL1S("#actions")).appendInside(searchForm);
+
+ QWebElement clearHistory = createLinkItem(i18n("Clear History"),
+ QL1S("about:history/clear"),
+ QL1S("edit-clear"),
+ KIconLoader::Toolbar);
+ clearHistory.setAttribute(QL1S("class"), QL1S("right"));
+ m_root.document().findFirst(QL1S("#actions")).appendInside(clearHistory);
+
+ HistoryTreeModel *model = HistoryManager::self()->historyTreeModel();
+ UrlFilterProxyModel *proxy = new UrlFilterProxyModel(this);
+ proxy->setSourceModel(model);
+
+ bool filterIsEmpty = filter.isEmpty();
+
+ if (!filterIsEmpty)
+ proxy->setFilterFixedString(filter);
+
+ if (proxy->rowCount() == 0)
+ {
+ if (filterIsEmpty)
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("Your browsing history is empty"));
+ }
+ else
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("No matches for string %1 in history", filter));
+ }
+ return;
+ }
+
+ int i = 0;
+ const int maxTextSize = 103;
+ const int truncateSize = 100;
+ do
+ {
+ QModelIndex index = proxy->index(i, 0, QModelIndex());
+ if (proxy->hasChildren(index))
+ {
+ m_root.appendInside(markup(QL1S("h3")));
+ m_root.lastChild().setPlainText(index.data().toString());
+
+ m_root.appendInside(markup(QL1S(".historyfolder")));
+ QWebElement little = m_root.lastChild();
+ for (int j = 0; j < proxy->rowCount(index); ++j)
+ {
+ QModelIndex son = proxy->index(j, 0, index);
+ KUrl u = son.data(HistoryModel::UrlStringRole).toUrl();
+
+ little.appendInside(son.data(HistoryModel::DateTimeRole).toDateTime().toString("hh:mm"));
+ little.appendInside(QL1S("&nbsp;&nbsp;"));
+ little.appendInside(markup(QL1S("img")));
+ little.lastChild().setAttribute(QL1S("src"), IconManager::self()->iconPathForUrl(u));
+ little.lastChild().setAttribute(QL1S("width"), QL1S("16"));
+ little.lastChild().setAttribute(QL1S("height"), QL1S("16"));
+ little.appendInside(QL1S("&nbsp;&nbsp;"));
+ little.appendInside(markup(QL1S("a")));
+ little.lastChild().setAttribute(QL1S("href") , u.url());
+
+ QString shownUrl = son.data().toString();
+ if (shownUrl.length() > maxTextSize)
+ {
+ shownUrl.truncate(truncateSize);
+ shownUrl += QL1S("...");
+ }
+ little.lastChild().appendInside(shownUrl);
+
+ little.appendInside(QL1S("<br />"));
+ }
+ }
+ i++;
+ if (filterIsEmpty && m_showFullHistory == false && (i == 2))
+ {
+ m_root.appendInside(markup(QL1S("a")));
+ m_root.lastChild().setAttribute(QL1S("class") , QL1S("greybox"));
+ m_root.lastChild().setAttribute(QL1S("href") , QL1S("about:history/showAllItems"));
+ m_root.lastChild().setPlainText(i18n("Show full History"));
+ return;
+ }
+ }
+ while (proxy->hasIndex(i , 0 , QModelIndex()));
+
+ m_showFullHistory = false;
+}
+
+
+void NewTabPage::bookmarksPage()
+{
+ m_root.addClass(QL1S("bookmarks"));
+
+ QWebElement editBookmarks = createLinkItem(i18n("Edit Bookmarks"),
+ QL1S("about:bookmarks/edit"),
+ QL1S("bookmarks-organize"),
+ KIconLoader::Toolbar);
+ editBookmarks.setAttribute(QL1S("class"), QL1S("right"));
+ m_root.document().findFirst(QL1S("#actions")).appendInside(editBookmarks);
+
+ KBookmarkGroup bookGroup = BookmarkManager::self()->rootGroup();
+ if (bookGroup.isNull())
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("You have no bookmarks"));
+ return;
+ }
+
+ KBookmark bookmark = bookGroup.first();
+
+ m_root.appendInside(markup(QL1S(".bookmarkfolder")));
+ QWebElement rootFolder = m_root.lastChild();
+ rootFolder.appendInside(markup(QL1S("h4")));
+ rootFolder.lastChild().setPlainText(i18n("Unsorted"));
+
+ while (!bookmark.isNull())
+ {
+ createBookmarkItem(bookmark, rootFolder);
+ bookmark = bookGroup.next(bookmark);
+ }
+}
+
+
+// void NewTabPage::closedTabsPage()
+// {
+// m_root.addClass(QL1S("closedTabs"));
+//
+// QList<TabHistory> links = rApp->mainWindow()->mainView()->recentlyClosedTabs();
+//
+// if (links.isEmpty())
+// {
+// m_root.addClass(QL1S("empty"));
+// m_root.setPlainText(i18n("There are no recently closed tabs"));
+// return;
+// }
+//
+// for (int i = 0; i < links.count(); ++i)
+// {
+// TabHistory item = links.at(i);
+// QWebElement prev;
+//
+// if (item.url.isEmpty())
+// continue;
+//
+// prev = closedTabPreview(i, item.url, item.title);
+//
+// prev.setAttribute(QL1S("id"), QL1S("preview") + QVariant(i).toString());
+//
+// // hide controls
+// prev.findFirst(QL1S(".right")).setStyleProperty(QL1S("visibility"), QL1S("hidden"));
+// prev.findFirst(QL1S(".left")).setStyleProperty(QL1S("visibility"), QL1S("hidden"));
+//
+// m_root.appendInside(prev);
+// }
+// }
+
+
+void NewTabPage::downloadsPage(const QString & filter)
+{
+ m_root.addClass(QL1S("downloads"));
+
+ QWebElement searchForm = createFormItem(i18n("Search Downloads"), QL1S("about:downloads/search"));
+ searchForm.setAttribute(QL1S("class"), QL1S("left"));
+ m_root.document().findFirst(QL1S("#actions")).appendInside(searchForm);
+
+ QWebElement clearDownloads = createLinkItem(i18n("Clear Downloads"),
+ QL1S("about:downloads/clear"),
+ QL1S("edit-clear"),
+ KIconLoader::Toolbar);
+ clearDownloads.setAttribute(QL1S("class"), QL1S("right"));
+ m_root.document().findFirst(QL1S("#actions")).appendInside(clearDownloads);
+
+ DownloadList list = DownloadManager::self()->downloads();
+
+ bool filterIsEmpty = filter.isEmpty();
+
+ if (list.isEmpty())
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("There are no recently downloaded files to show"));
+ return;
+ }
+
+ int i = 0;
+
+ Q_FOREACH(DownloadItem * item, list)
+ {
+ KUrl u = item->destUrl();
+ QString fName = u.fileName();
+
+ QString srcUrl = item->originUrl();
+
+ if (!filterIsEmpty)
+ {
+ if (!fName.contains(filter, Qt::CaseInsensitive) && !srcUrl.contains(filter, Qt::CaseInsensitive))
+ continue;
+ }
+
+ m_root.prependInside(markup(QL1S("div")));
+
+ QWebElement div = m_root.firstChild();
+ div.addClass(QL1S("download"));
+
+ QString dir = u.directory();
+ QString file = dir + QL1C('/') + fName;
+
+ KIconLoader *loader = KIconLoader::global();
+ QString iconPath = QL1S("file://") + loader->iconPath(KMimeType::iconNameForUrl(u), KIconLoader::Desktop);
+
+ div.appendInside(markup(QL1S("img")));
+ div.lastChild().setAttribute(QL1S("src"), iconPath);
+
+ div.appendInside(QL1S("<strong>") + fName + QL1S("</strong>"));
+ div.appendInside(QL1S(" - "));
+ QString date = KGlobal::locale()->formatDateTime(item->dateTime(), KLocale::FancyLongDate);
+ div.appendInside(QL1S("<em>") + date + QL1S("</em>"));
+ div.appendInside(QL1S("<br />"));
+
+ div.appendInside(QL1S("<a href=") + srcUrl + QL1C('>') + srcUrl + QL1S("</a>"));
+ div.appendInside(QL1S("<br />"));
+
+ switch (item->state())
+ {
+ case DownloadItem::KGetManaged:
+ div.appendInside(QL1S("<em>") + i18n("This download is managed by KGet. Check it to grab information about its state") + QL1S("</em>"));
+ break;
+
+ case DownloadItem::Suspended:
+ div.appendInside(QL1S("<em>") + i18n("Suspended") + QL1S("</em>"));
+ break;
+
+ case DownloadItem::Downloading:
+ div.appendInside(QL1S("<em>") + i18n("Downloading now...") + QL1S("</em>"));
+ break;
+
+ case DownloadItem::Errors:
+ div.appendInside(QL1S("<em>") + i18nc("%1 = Error description", "Error: %1", item->errorString()) + QL1S("</em>"));
+ break;
+
+ case DownloadItem::Done:
+ default:
+ if (QFile::exists(file))
+ {
+ div.appendInside(markup(QL1S("a")));
+ div.lastChild().setAttribute(QL1S("class"), QL1S("greylink"));
+ div.lastChild().setAttribute(QL1S("href"), QL1S("about:downloads/opendir?q=") + QL1S("file://") + dir);
+ div.lastChild().setPlainText(i18n("Open directory"));
+
+ div.appendInside(QL1S(" - "));
+
+ div.appendInside(markup(QL1S("a")));
+ div.lastChild().setAttribute(QL1S("class"), QL1S("greylink"));
+ div.lastChild().setAttribute(QL1S("href"), QL1S("file://") + file);
+ div.lastChild().setPlainText(i18n("Open file"));
+ }
+ else
+ {
+ div.appendInside(QL1S("<em>") + QL1S("Removed") + QL1S("</em>"));
+ }
+
+ div.appendInside(QL1S(" - "));
+
+ div.appendInside(markup(QL1S("a")));
+ div.lastChild().setAttribute(QL1S("class"), QL1S("greylink"));
+ div.lastChild().setAttribute(QL1S("href"), QL1S("about:downloads/removeItem?item=") + QString::number(i));
+ div.lastChild().setPlainText(i18n("Remove from list"));
+
+ break;
+ }
+
+ i++;
+ }
+
+ if (i == 0)
+ {
+ m_root.addClass(QL1S("empty"));
+ m_root.setPlainText(i18n("No matches for string %1 in downloads", filter));
+ }
+}
+
+
+// void NewTabPage::tabsPage()
+// {
+// m_root.addClass(QL1S("tabs"));
+//
+// int wins = 0;
+// Q_FOREACH(const QWeakPointer<MainWindow> &wPointer, rApp->mainWindowList())
+// {
+// m_root.appendInside(markup(QL1S("h3")));
+// m_root.lastChild().setPlainText(i18n("Window"));
+//
+// MainWindow *w = wPointer.data();
+//
+// const int tabCount = w->mainView()->count();
+// for (int i = 0; i < tabCount; ++i)
+// {
+// KUrl url = w->mainView()->webTab(i)->url();
+//
+// if (!WebSnap::existsImage(url))
+// {
+// kDebug() << "image doesn't exist for url: " << url;
+// QPixmap preview = WebSnap::renderPagePreview(*w->mainView()->webTab(i)->page());
+// QString path = WebSnap::imagePathFromUrl(url.url());
+// preview.save(path);
+// }
+// QString name = w->mainView()->webTab(i)->view()->title();
+// QWebElement prev;
+//
+// prev = tabPreview(wins, i, url, name);
+//
+// m_root.appendInside(prev);
+// }
+//
+// wins++;
+// }
+// }
+
+
+// ----------------------------------------------------------------------------
+// LOW-LEVEL FUNCTIONS
+
+
+QWebElement NewTabPage::emptyPreview(int index)
+{
+ QWebElement prev = markup(QL1S(".thumbnail"));
+
+ prev.findFirst(QL1S(".preview img")).setAttribute(QL1S("src") ,
+ QL1S("file:///") + KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop));
+ prev.findFirst(QL1S("span a")).setPlainText(i18n("Set a Preview..."));
+ prev.findFirst(QL1S("a")).setAttribute(QL1S("href"),
+ QL1S("about:preview/modify/") + QVariant(index).toString());
+
+ setupPreview(prev, index, false);
+
+ return prev;
+}
+
+
+void NewTabPage::reloadPreview(int index)
+{
+ QString id = QL1S("#preview") + QString::number(index);
+ QWebElement thumb = m_root.document().findFirst(id);
+
+ QString urlString = ReKonfig::previewUrls().at(index);
+ QString nameString = ReKonfig::previewNames().at(index);
+
+ QString title = checkTitle(QString::number(index + 1) + QL1S(" - ") + nameString);
+
+ ThumbUpdater *t = new ThumbUpdater(thumb, urlString, title);
+ t->updateThumb();
+}
+
+
+QWebElement NewTabPage::validPreview(int index, const KUrl &url, const QString &title)
+{
+ QWebElement prev = markup(QL1S(".thumbnail"));
+
+ QString previewPath = WebSnap::existsImage(url)
+ ? QL1S("file://") + WebSnap::imagePathFromUrl(url)
+ : IconManager::self()->iconPathForUrl(url)
+ ;
+
+ prev.findFirst(QL1S(".preview img")).setAttribute(QL1S("src") , previewPath);
+ prev.findFirst(QL1S("a")).setAttribute(QL1S("href"), url.toMimeDataString());
+ prev.findFirst(QL1S("span a")).setAttribute(QL1S("href"), url.toMimeDataString());
+ prev.findFirst(QL1S("span a")).setPlainText(checkTitle(title));
+
+ setupPreview(prev, index, true);
+ return prev;
+}
+
+
+QWebElement NewTabPage::tabPreview(int winIndex, int tabIndex, const KUrl &url, const QString &title)
+{
+ QWebElement prev = markup(QL1S(".thumbnail"));
+ QString previewPath = QL1S("file://") + WebSnap::imagePathFromUrl(url);
+
+ QString href = QL1S("about:tabs/show?win=") + QString::number(winIndex) + QL1S("&tab=") + QString::number(tabIndex);
+
+ prev.findFirst(QL1S(".preview img")).setAttribute(QL1S("src") , previewPath);
+ prev.findFirst(QL1S("a")).setAttribute(QL1S("href"), href);
+ prev.findFirst(QL1S("span a")).setAttribute(QL1S("href"), href);
+ prev.findFirst(QL1S("span a")).setPlainText(checkTitle(title));
+
+ setupTabPreview(prev, winIndex, tabIndex);
+
+ prev.findFirst(QL1S(".right")).setStyleProperty(QL1S("visibility"), QL1S("visible"));
+ prev.findFirst(QL1S(".left")).setStyleProperty(QL1S("visibility"), QL1S("hidden"));
+
+ return prev;
+}
+
+
+QWebElement NewTabPage::closedTabPreview(int index, const KUrl &url, const QString &title)
+{
+ QWebElement prev = markup(QL1S(".thumbnail"));
+
+ QString previewPath = WebSnap::existsImage(url)
+ ? QL1S("file://") + WebSnap::imagePathFromUrl(url)
+ : IconManager::self()->iconPathForUrl(url)
+ ;
+
+ QString href = QL1S("about:closedTabs/restore?tab=") + QString::number(index);
+
+ prev.findFirst(QL1S(".preview img")).setAttribute(QL1S("src") , previewPath);
+ prev.findFirst(QL1S("a")).setAttribute(QL1S("href"), href);
+ prev.findFirst(QL1S("span a")).setAttribute(QL1S("href"), href);
+ prev.findFirst(QL1S("span a")).setPlainText(checkTitle(title));
+
+ setupPreview(prev, index, true);
+ return prev;
+}
+
+
+void NewTabPage::setupPreview(QWebElement e, int index, bool showControls)
+{
+ e.findFirst(QL1S(".right img")).setAttribute(QL1S("src"),
+ QL1S("file:///") + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+
+ e.findFirst(QL1S(".right")).setAttribute(QL1S("title"), i18n("Remove favorite"));
+
+ e.findFirst(QL1S(".left img")).setAttribute(QL1S("src"),
+ QL1S("file:///") + KIconLoader::global()->iconPath("view-refresh", KIconLoader::DefaultState));
+
+ e.findFirst(QL1S(".left")).setAttribute(QL1S("title"), i18n("Reload thumbnail"));
+
+ e.findFirst(QL1S(".left")).setAttribute(QL1S("href"), QL1S("about:preview/reload/") + QVariant(index).toString());
+ e.findFirst(QL1S(".right")).setAttribute(QL1S("href"), QL1S("about:preview/remove/") + QVariant(index).toString());
+
+ e.setAttribute(QL1S("id"), QL1S("preview") + QVariant(index).toString());
+
+ if (showControls)
+ {
+ e.findFirst(QL1S(".right")).setStyleProperty(QL1S("visibility"), QL1S("visible"));
+ e.findFirst(QL1S(".left")).setStyleProperty(QL1S("visibility"), QL1S("visible"));
+ }
+}
+
+
+void NewTabPage::setupTabPreview(QWebElement e, int winIndex, int tabIndex)
+{
+ e.findFirst(QL1S(".right img")).setAttribute(QL1S("src"),
+ QL1S("file:///") + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState));
+ e.findFirst(QL1S(".right")).setAttribute(QL1S("title"), QL1S("Close Tab"));
+
+ QString href = QL1S("about:tabs/remove?win=") + QString::number(winIndex) + QL1S("&tab=") + QString::number(tabIndex);
+ e.findFirst(QL1S(".right")).setAttribute(QL1S("href"), href);
+
+ e.setAttribute(QL1S("id"), QL1S("win") + QString::number(winIndex) + QL1S("tab") + QString::number(tabIndex));
+}
+
+
+void NewTabPage::removePreview(int index)
+{
+ QStringList names = ReKonfig::previewNames();
+ QStringList urls = ReKonfig::previewUrls();
+
+ urls.removeAt(index);
+ names.removeAt(index);
+
+ ReKonfig::setPreviewNames(names);
+ ReKonfig::setPreviewUrls(urls);
+
+ loadPageForUrl(KUrl("about:favorites"));
+
+ ReKonfig::self()->writeConfig();
+}
+
+
+void NewTabPage::createBookmarkGroup(const KBookmark &bookmark, QWebElement parent)
+{
+ KBookmarkGroup group = bookmark.toGroup();
+ KBookmark bm = group.first();
+
+ parent.appendInside(markup(QL1S(".bookmarkfolder")));
+ QWebElement folder = parent.lastChild();
+ folder.appendInside(markup(QL1S("h4")));
+ folder.lastChild().setPlainText(group.fullText());
+
+ while (!bm.isNull())
+ {
+ createBookmarkItem(bm, folder);
+ bm = group.next(bm);
+ }
+}
+
+
+void NewTabPage::createBookmarkItem(const KBookmark &bookmark, QWebElement parent)
+{
+ QString cacheDir = QL1S("file://") + KStandardDirs::locateLocal("cache" , "" , true);
+ QString icon = QL1S("file://") + KGlobal::dirs()->findResource("icon", "oxygen/16x16/mimetypes/text-html.png");
+
+ if (bookmark.isGroup())
+ {
+ createBookmarkGroup(bookmark, m_root);
+ return;
+ }
+ else if (bookmark.isSeparator())
+ {
+ kDebug() << "SEPARATOR";
+ parent.appendInside(QL1S("<hr />"));
+ }
+ else
+ {
+ QString b = bookmark.icon();
+ if (b.contains(QL1S("favicons")))
+ icon = cacheDir + bookmark.icon() + QL1S(".png");
+
+ parent.appendInside(markup(QL1S("a")));
+ QWebElement bookmarkElement = parent.lastChild();
+ bookmarkElement.setAttribute(QL1S("href") , bookmark.url().prettyUrl());
+ bookmarkElement.addClass("bookmark");
+
+ bookmarkElement.appendInside(markup(QL1S("img")));
+ bookmarkElement.lastChild().setAttribute(QL1S("src") , icon);
+ bookmarkElement.lastChild().setAttribute(QL1S("width") , QL1S("16"));
+ bookmarkElement.lastChild().setAttribute(QL1S("height") , QL1S("16"));
+ bookmarkElement.appendInside(QL1S(" "));
+ bookmarkElement.appendInside(checkTitle(bookmark.fullText(), 40));
+ }
+}
+
+
+QString NewTabPage::checkTitle(const QString &title, int max)
+{
+ QString t(title);
+ if (t.length() > max)
+ {
+ t.truncate(max - 3);
+ t += QL1S("...");
+ }
+ return t;
+}
+
+
+QWebElement NewTabPage::createLinkItem(const QString &title, const QString &urlString, const QString &iconPath, int groupOrSize) const
+{
+ const KIconLoader * const loader = KIconLoader::global();
+
+ QWebElement nav = markup(QL1S(".link"));
+ nav.findFirst(QL1S("a")).setAttribute(QL1S("href"), urlString);
+ nav.findFirst(QL1S("img")).setAttribute(QL1S("src"), QL1S("file://") + loader->iconPath(iconPath, groupOrSize));
+ nav.findFirst(QL1S("span")).appendInside(title);
+ return nav;
+}
+
+
+QWebElement NewTabPage::createFormItem(const QString &title, const QString &urlString) const
+{
+ QWebElement form = markup(QL1S("form"));
+
+ form.setAttribute(QL1S("method"), QL1S("GET"));
+ form.setAttribute(QL1S("action"), urlString);
+
+ form.appendInside(markup(QL1S("input")));
+ form.lastChild().setAttribute(QL1S("type"), QL1S("text"));
+ form.lastChild().setAttribute(QL1S("name"), QL1S("q"));
+
+ form.appendInside(markup(QL1S("input")));
+ form.lastChild().setAttribute(QL1S("type"), QL1S("submit"));
+ form.lastChild().setAttribute(QL1S("value"), title);
+
+ return form;
+}
+
+
+void NewTabPage::initJS()
+{
+ QWebFrame *parentFrame = qobject_cast<QWebFrame *>(parent());
+ QString oldHTML = parentFrame->toHtml();
+
+ QString includes;
+ includes += QL1S("<head>");
+ includes += QL1S("<script src=\"$DEFAULT_PATH/htmls/jquery-1.7.2.min.js\" type=\"text/javascript\"></script>");
+ includes += QL1S("<script src=\"$DEFAULT_PATH/htmls/jquery-ui-1.8.20.custom.min.js\" type=\"text/javascript\"></script>");
+
+ QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html");
+ QString dataPath = QL1S("file://") + htmlFilePath;
+ dataPath.remove(QL1S("/htmls/home.html"));
+
+ includes.replace(QL1S("$DEFAULT_PATH"), dataPath);
+
+ oldHTML.replace(QL1S("<head>"), includes);
+
+ QString javascript;
+ javascript += QL1S("<body>");
+ javascript += QL1S("<script>");
+ javascript += QL1S("$(function() {");
+ javascript += QL1S(" $( \"#content\" ).sortable({");
+ javascript += QL1S(" revert: true,");
+ javascript += QL1S(" cursor: \"move\",");
+ javascript += QL1S(" distance: 30,");
+ javascript += QL1S(" update: function(event, ui) { window.location.href = \"about:favorites/save\"; }");
+ javascript += QL1S(" });");
+ javascript += QL1S(" $( \".thumbnail\" ).disableSelection();");
+ javascript += QL1S("});");
+ javascript += QL1S("</script>");
+
+ oldHTML.replace(QL1S("<body>"), javascript);
+
+ parentFrame->setHtml(oldHTML);
+}
+
+
+void NewTabPage::saveFavorites()
+{
+ QStringList names = ReKonfig::previewNames();
+ QStringList urls = ReKonfig::previewUrls();
+
+ QStringList newNames = names;
+ QStringList newUrls = urls;
+
+ QWebElementCollection coll = m_root.document().findAll(QL1S(".thumbnail"));
+ QList<QWebElement> list = coll.toList();
+
+ int i = 0;
+
+ Q_FOREACH(QWebElement e, list)
+ {
+ if (!e.hasAttribute(QL1S("id")))
+ continue;
+
+ QString id = e.attribute(QL1S("id"));
+ kDebug() << "id: " << id;
+ int index = id.remove(QL1S("preview")).toInt();
+ kDebug() << "INDEX: " << index;
+
+ newNames.replace(i, names.at(index));
+ newUrls.replace(i, urls.at(index));
+ i++;
+ }
+
+ ReKonfig::setPreviewNames(newNames);
+ ReKonfig::setPreviewUrls(newUrls);
+
+ loadPageForUrl(KUrl("about:favorites"));
+}
diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h
new file mode 100644
index 00000000..1c8d423d
--- /dev/null
+++ b/src/rekonqpage/newtabpage.h
@@ -0,0 +1,125 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+
+#ifndef REKONQ_NEW_TAB_PAGE
+#define REKONQ_NEW_TAB_PAGE
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// KDE Includes
+#include <KUrl>
+
+// Qt Includes
+#include <QObject>
+#include <QString>
+#include <QWebElement>
+
+// Forward Declarations
+class KBookmark;
+class QWebFrame;
+
+
+class REKONQ_TESTS_EXPORT NewTabPage : public QObject
+{
+ Q_OBJECT
+
+public:
+ NewTabPage(QWebFrame *frame);
+
+ /**
+ * This method takes an about: url and loads
+ * the corresponding part of the new tab page
+ */
+ void generate(const KUrl &url = KUrl("about:home"));
+
+private:
+ // these are the "high-level" functions to build the new tab page.
+ // Basically, you call browsingMenu + one of the *Page methods
+ // to load a page
+ void browsingMenu(const KUrl &currentUrl);
+
+ void favoritesPage();
+ void historyPage(const QString & filter = QString());
+ void bookmarksPage();
+ void closedTabsPage();
+ void downloadsPage(const QString & filter = QString());
+ void tabsPage();
+
+ void loadPageForUrl(const KUrl &url, const QString & filter = QString());
+
+ // --------------------------------------------------------------------------
+ // "low-level" functions
+ // we use these to create the pages over
+
+ // Previews handling
+ QWebElement emptyPreview(int index);
+ QWebElement validPreview(int index, const KUrl &url, const QString &title);
+ QWebElement tabPreview(int winIndex, int tabIndex, const KUrl &url, const QString &title);
+ QWebElement closedTabPreview(int index, const KUrl &url, const QString &title);
+
+ void reloadPreview(int index);
+ void removePreview(int index);
+
+ void setupPreview(QWebElement e, int index, bool showControls);
+ void setupTabPreview(QWebElement e, int winIndex, int tabIndex);
+
+ void createBookmarkItem(const KBookmark &bookmark, QWebElement parent);
+ void createBookmarkGroup(const KBookmark &bookmark, QWebElement parent);
+
+ QWebElement createLinkItem(const QString &title, const QString &urlString, const QString &iconPath, int groupOrSize) const;
+ QWebElement createFormItem(const QString &title, const QString &urlString) const;
+
+ /**
+ * This function helps to get faster a new markup of one type,
+ * it isn't easy to create one with QWebElement.
+ *
+ * It gets it in the #models div of home.html.
+ * It works for all elements defined here.
+ *
+ */
+ inline QWebElement markup(const QString &selector) const
+ {
+ return m_root.document().findFirst("#models > " + selector).clone();
+ }
+
+ QString checkTitle(const QString &title, int max = 20);
+
+ void updateWindowIcon();
+
+ void initJS();
+ void saveFavorites();
+
+private:
+ QString m_html;
+ QWebElement m_root;
+
+ bool m_showFullHistory;
+};
+
+#endif // REKONQ_NEW_TAB_PAGE
diff --git a/src/rekonqpage/thumbupdater.cpp b/src/rekonqpage/thumbupdater.cpp
new file mode 100644
index 00000000..4590d60b
--- /dev/null
+++ b/src/rekonqpage/thumbupdater.cpp
@@ -0,0 +1,85 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2012 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 "thumbupdater.h"
+#include "thumbupdater.moc"
+
+// Local Includes
+#include "application.h"
+#include "iconmanager.h"
+#include "websnap.h"
+
+// KDE Includes
+#include <KLocale>
+#include <KStandardDirs>
+
+// Qt Includes
+#include <QWebFrame>
+
+
+ThumbUpdater::ThumbUpdater(QWebElement el, const QString & urlString, const QString & nameString, QObject *parent)
+ : QObject(parent)
+ , _thumb(el)
+ , _url(urlString)
+ , _title(nameString)
+{
+}
+
+
+void ThumbUpdater::updateThumb()
+{
+ // Set loading animation
+ _thumb.findFirst(QL1S(".preview img")).setAttribute(QL1S("src"), QL1S("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif"));
+ _thumb.findFirst(QL1S("span a")).setPlainText(i18n("Loading Preview..."));
+
+ // Load URL
+ QWebFrame *frame = qobject_cast<QWebFrame *>(parent());
+ WebSnap *snap = new WebSnap(KUrl(_url), frame);
+ connect(snap, SIGNAL(snapDone(bool)), this, SLOT(updateImage(bool)), Qt::UniqueConnection);
+}
+
+
+ThumbUpdater::~ThumbUpdater()
+{
+ kDebug() << "bye bye";
+}
+
+
+void ThumbUpdater::updateImage(bool ok)
+{
+ KUrl u(_url);
+
+ QString previewPath = ok
+ ? QL1S("file://") + WebSnap::imagePathFromUrl(u)
+ : IconManager::self()->iconPathForUrl(u)
+ ;
+
+ _thumb.findFirst(QL1S(".preview img")).setAttribute(QL1S("src"), previewPath);
+ _thumb.findFirst(QL1S("span a")).setPlainText(_title);
+
+ this->deleteLater();
+}
diff --git a/src/rekonqpage/thumbupdater.h b/src/rekonqpage/thumbupdater.h
new file mode 100644
index 00000000..2544969f
--- /dev/null
+++ b/src/rekonqpage/thumbupdater.h
@@ -0,0 +1,58 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2012 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 THUMB_UPDATER_H
+#define THUMB_UPDATER_H
+
+
+// Rekonq Includes
+#include "rekonq_defines.h"
+
+// Qt Includes
+#include <QObject>
+#include <QWebElement>
+
+
+class REKONQ_TESTS_EXPORT ThumbUpdater : public QObject
+{
+ Q_OBJECT
+
+public:
+ ThumbUpdater(QWebElement el, const QString & urlString, const QString & nameString, QObject *parent = 0);
+ ~ThumbUpdater();
+
+ void updateThumb();
+
+private Q_SLOTS:
+ void updateImage(bool);
+
+private:
+ QWebElement _thumb;
+ QString _url;
+ QString _title;
+};
+
+#endif // THUMB_UPDATER_H
diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp
index a971080e..a0f43fa1 100644
--- a/src/tabwindow/tabwindow.cpp
+++ b/src/tabwindow/tabwindow.cpp
@@ -192,8 +192,7 @@ void TabWindow::loadUrl(const KUrl &url, Rekonq::OpenType type, TabHistory *hist
void TabWindow::newCleanTab()
{
- QUrl u = QUrl::fromUserInput("/DATI/WEBPAGES/HomePage/index.htm");
- loadUrl(u, Rekonq::NewFocusedTab);
+ loadUrl(QUrl("about:home"), Rekonq::NewFocusedTab);
}
diff --git a/src/webtab/protocolhandler.cpp b/src/webtab/protocolhandler.cpp
index ab2f0b8e..dd5527bd 100644
--- a/src/webtab/protocolhandler.cpp
+++ b/src/webtab/protocolhandler.cpp
@@ -36,7 +36,8 @@
#include "webpage.h"
#include "webtab.h"
#include "urlbar.h"
-// #include "newtabpage.h"
+
+#include "newtabpage.h"
// KDE Includes
#include <KIO/Job>
@@ -169,8 +170,8 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
WebPage *page = qobject_cast<WebPage *>(frame->page());
page->setIsOnRekonqPage(true);
-// FIXME NewTabPage p(frame);
-// p.generate(_url);
+ NewTabPage p(frame);
+ p.generate(_url);
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 03:55:54 +0000