diff options
| -rw-r--r-- | src/data/home.html | 4 | ||||
| -rw-r--r-- | src/newtabpage.cpp | 46 | ||||
| -rw-r--r-- | src/newtabpage.h | 1 |
3 files changed, 41 insertions, 10 deletions
diff --git a/src/data/home.html b/src/data/home.html index 97398f9a..082191c4 100644 --- a/src/data/home.html +++ b/src/data/home.html @@ -162,7 +162,7 @@ opacity: 0; .remove { float: right; } -.modify { +.reload { float: left; } @@ -250,7 +250,7 @@ text-align: center; </div> </a> <div class="title"> - <a class="button modify"><img /></a> + <a class="button reload"><img /></a> <span><a></a></span> <a class="button remove"><img /></a> </div> diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 9b5c1559..c4788d6d 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -105,17 +105,27 @@ void NewTabPage::generate(const KUrl &url) rApp->mainWindow()->currentTab()->createPreviewSelectorBar(index); return; } + if (url.directory() == QL1S("preview/remove")) { - removePreview(url.fileName().toInt()); + int index = url.fileName().toInt(); + removePreview(index); return; } + if (url.directory() == QL1S("preview/modify")) { int index = url.fileName().toInt(); rApp->mainWindow()->currentTab()->createPreviewSelectorBar(index); return; } + + if (url.directory() == QL1S("preview/reload")) + { + int index = url.fileName().toInt(); + reloadPreview(index); + return; + } } // about:tabs links @@ -603,6 +613,26 @@ QWebElement NewTabPage::emptyPreview(int index) } +void NewTabPage::reloadPreview(int index) +{ + QString id = QL1S("#preview") + QString::number(index); + QWebElement thumb = m_root.document().findFirst(id); + + // 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...")); + + QString urlString = ReKonfig::previewUrls().at(index); + QString nameString = ReKonfig::previewNames().at(index); + + kDebug() << "URL: " << urlString; + kDebug() << "NAME: " << nameString; + + // Load URL + QWebFrame *frame = qobject_cast<QWebFrame *>(parent()); + WebSnap *snap = new WebSnap(KUrl(urlString), frame); +} + // NOTE: comment this out WITHOUT really deleting. May be of inspiration... // QWebElement NewTabPage::loadingPreview(int index, const KUrl &url) // { @@ -693,7 +723,7 @@ QWebElement NewTabPage::tabPreview(int winIndex, int tabIndex, const KUrl &url, setupTabPreview(prev, winIndex, tabIndex); prev.findFirst(QL1S(".remove")).setStyleProperty(QL1S("visibility"), QL1S("visible")); - prev.findFirst(QL1S(".modify")).setStyleProperty(QL1S("visibility"), QL1S("hidden")); + prev.findFirst(QL1S(".reload")).setStyleProperty(QL1S("visibility"), QL1S("hidden")); return prev; } @@ -723,25 +753,25 @@ QWebElement NewTabPage::closedTabPreview(int index, const KUrl &url, const QStri void NewTabPage::hideControls(QWebElement e) { e.findFirst(QL1S(".remove")).setStyleProperty(QL1S("visibility"), QL1S("hidden")); - e.findFirst(QL1S(".modify")).setStyleProperty(QL1S("visibility"), QL1S("hidden")); + e.findFirst(QL1S(".reload")).setStyleProperty(QL1S("visibility"), QL1S("hidden")); } void NewTabPage::showControls(QWebElement e) { e.findFirst(QL1S(".remove")).setStyleProperty(QL1S("visibility"), QL1S("visible")); - e.findFirst(QL1S(".modify")).setStyleProperty(QL1S("visibility"), QL1S("visible")); + e.findFirst(QL1S(".reload")).setStyleProperty(QL1S("visibility"), QL1S("visible")); } void NewTabPage::setupPreview(QWebElement e, int index) { e.findFirst(QL1S(".remove img")).setAttribute(QL1S("src"), QL1S("file:///") + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); - e.findFirst(QL1S(".remove")).setAttribute(QL1S("title"), QL1S("Remove favorite")); - e.findFirst(QL1S(".modify img")).setAttribute(QL1S("src"), QL1S("file:///") + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); - e.findFirst(QL1S(".modify")).setAttribute(QL1S("title"), QL1S("Set new favorite")); + e.findFirst(QL1S(".remove")).setAttribute(QL1S("title"), i18n("Remove favorite")); + e.findFirst(QL1S(".reload img")).setAttribute(QL1S("src"), QL1S("file:///") + KIconLoader::global()->iconPath("view-refresh", KIconLoader::DefaultState)); + e.findFirst(QL1S(".reload")).setAttribute(QL1S("title"), i18n("Set new favorite")); - e.findFirst(QL1S(".modify")).setAttribute(QL1S("href"), QL1S("about:preview/modify/") + QVariant(index).toString()); + e.findFirst(QL1S(".reload")).setAttribute(QL1S("href"), QL1S("about:preview/reload/") + QVariant(index).toString()); e.findFirst(QL1S(".remove")).setAttribute(QL1S("href"), QL1S("about:preview/remove/") + QVariant(index).toString()); e.setAttribute(QL1S("id"), QL1S("preview") + QVariant(index).toString()); diff --git a/src/newtabpage.h b/src/newtabpage.h index e2a86a70..84c9c03e 100644 --- a/src/newtabpage.h +++ b/src/newtabpage.h @@ -83,6 +83,7 @@ private: 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); /** |