From 8343d45f3dfd631a3f5ac4213918f285930eb446 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Thu, 17 Dec 2009 18:22:23 +0100 Subject: Re-implemented previews in homepage without using plugins. Not finished yet : Little things that change: -nice buttons appearing on hover -transitions on hover TODO: -when a preview is empty or when loading, it is very ugly -for now there's no way to choose the page you want to preview -port "closed Tabs" to this new architecture -totally remove PreviewImage classes -eventually, specific contextmenu for previews --- src/data/home.html | 76 +++++++++++++++++---- src/rekonqpage/newtabpage.cpp | 155 ++++++++++++++++++++++++++++++++++-------- src/rekonqpage/newtabpage.h | 19 ++++-- src/webpage.cpp | 10 +++ src/webpage.h | 3 + src/websnap.cpp | 52 +++++++++++++- src/websnap.h | 14 +++- 7 files changed, 277 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/src/data/home.html b/src/data/home.html index 9d8f390f..8db3d894 100644 --- a/src/data/home.html +++ b/src/data/home.html @@ -54,6 +54,10 @@ margin-top: 0.5em; a{ color: #3F7AB7; text-decoration: none; +-webkit-transition-property: color; +-webkit-transition-duration: 0.5s; +-webkit-transition-timing-function: ease; + } a:hover{ color: black; @@ -118,18 +122,61 @@ margin-top: -5%; /* Thumbnail class */ .thumbnail { -text-align: center; display: inline-block; -width:25%; -margin-top: 7%; -min-width:250px; -min-height:192px; +width:25%; margin-top: 7%; +min-width:250px; min-height:192px; +} + +.preview { +display: block; +width: 200px; +height: 150px; +padding: 14px 16px; +background: url(%2/bg.png) no-repeat; +-webkit-background-size: 100% 100%; +-webkit-background-clip: padding; +} +.thumbnail:hover .preview , .thumbnail:hover .button img { +opacity: 0.8; +} + +.button img, .preview { +-webkit-transition-property: opacity; +-webkit-transition-duration: 0.8s; +-webkit-transition-timing-function: ease-in-out; +} + +.button img { +display: inline-block; +width: 16px; +height: 16px; +opacity: 0; } -.thumbnail object{ +.remove { + float: right; +} +.modify { + float: left; +} + +.title { +display: block; +width: 200px; +height: 15px; +padding: 0 14px; text-align: center; -width:228px; -height:192px; +} + +.thumbnail a { +text-align:center; +} +.thumbnail a:hover { +color:#3F7AB7; +} + +.thumbnail span { + } /* -------------------------------------------------------- */ @@ -162,11 +209,14 @@ margin-bottom: 0.5em;
- - - - - + + +
+ + + +
+

diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index 66f74b86..4299c8bb 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -46,6 +46,7 @@ // Qt Includes #include +#include NewTabPage::NewTabPage(QWebFrame *frame) @@ -72,6 +73,16 @@ NewTabPage::~NewTabPage() void NewTabPage::generate(const KUrl &url) { + if(KUrl("about:preview").isParentOf(url)) + { + if(url.directory() == QString("preview/remove")) + { + removePreview(url.fileName().toInt()); + return; + } + } + + QWebPage *page = m_root.webFrame()->page(); page->mainFrame()->setHtml(m_html); @@ -80,26 +91,26 @@ void NewTabPage::generate(const KUrl &url) browsingMenu(url); QString title; - if(url == KUrl("about:closedTabs")) + if(url == KUrl("about:home") || url == KUrl("about:favorites")) + { + favoritesPage(); + title = i18n("Favorites"); + } + else if(url == KUrl("about:closedTabs")) { closedTabsPage(); title = i18n("Closed Tabs"); } - if(url == KUrl("about:history")) + else if(url == KUrl("about:history")) { historyPage(); title = i18n("History"); } - if(url == KUrl("about:bookmarks")) + else if(url == KUrl("about:bookmarks")) { bookmarksPage(); title = i18n("Bookmarks"); } - if(url == KUrl("about:home") || url == KUrl("about:favorites")) - { - favoritesPage(); - title = i18n("Favorites"); - } m_root.document().findFirst("title").setPlainText(title); } @@ -114,34 +125,111 @@ void NewTabPage::favoritesPage() for(int i=0; i<8; ++i) { - QWebElement speed = markup(".thumbnail"); - speed.findFirst("object").setAttribute("data" , urls.at(i)); - speed.findFirst("param[name=title]").setAttribute("value", names.at(i)); - speed.findFirst("param[name=index]").setAttribute("value", QString::number(i)); - speed.findFirst("param[name=isFavorite]").setAttribute("value", "true"); + QWebElement speed; + + if(urls.at(i).isEmpty()) + speed = emptyPreview(); + else if(!QFile::exists(WebSnap::fileForUrl(urls.at(i)).toLocalFile())) + speed = loadingPreview(i, urls.at(i)); + else + speed = validPreview(i, urls.at(i), names.at(i)); + + speed.setAttribute("id", "preview" + QVariant(i).toString()); m_root.appendInside(speed); } } -// FIXME : port to new PreviewImage API to use... -/*QString NewTabPage::lastVisitedPage() +QWebElement NewTabPage::emptyPreview() { - QString last; - QList history = Application::historyManager()->history(); - for (int i = 0; i < 8 && i < history.size(); ++i) - { - HistoryItem it = history.at(i); - last += "
"; - last += ""; - last += ""; - last += "
"; - last += "" + it.title + "
"; - } + QWebElement prev = markup(".thumbnail"); + + prev.findFirst("img").setAttribute("src" , QString("file:///") + + KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop)); + prev.findFirst("span").appendInside(i18n("Set a Preview...")); + + return prev; +} + + +QWebElement NewTabPage::loadingPreview(int index, KUrl url) +{ + QWebElement prev = markup(".thumbnail"); + + prev.findFirst("img").setAttribute("src" , + QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); + prev.findFirst("span").appendInside(i18n("Loading Preview...")); + WebSnap *snap = new WebSnap(url); + snap->SetData(QVariant(index)); + connect(snap, SIGNAL(finished()), SLOT(snapFinished())); + + return prev; +} + +QWebElement NewTabPage::validPreview(int index, KUrl url, QString title) +{ + QWebElement prev = markup(".thumbnail"); + KUrl previewPath = WebSnap::fileForUrl(url); + QString iString = QVariant(index).toString(); + + prev.findFirst(".preview").setAttribute("src" , previewPath.toMimeDataString()); + prev.findFirst("a").setAttribute("href", url.toMimeDataString()); + prev.findFirst("span > a").setAttribute("href", url.toMimeDataString()); + prev.findFirst("span").appendInside(checkTitle(title)); + + prev.findFirst(".modify img").setAttribute("src", QString("file:///") + + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); + prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString )); + + prev.findFirst(".remove img").setAttribute("src", QString("file:///") + + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); + prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString )); + + return prev; +} - return last; -}*/ +void NewTabPage::snapFinished() +{ + WebSnap *snap = qobject_cast(sender()); + QWebElement thumb = m_root.findFirst("#preview" + snap->data().toString()); + thumb.findFirst("img").setAttribute("src", WebSnap::fileForUrl(snap->snapUrl()).toMimeDataString()); + thumb.findFirst("p").setPlainText(snap->snapTitle()); + + // Save the new config + QStringList names = ReKonfig::previewNames(); + QStringList urls = ReKonfig::previewUrls(); + + // stripTrailingSlash to be sure to get the same string for same address + urls.replace(snap->data().toInt(), snap->snapUrl().toString(QUrl::StripTrailingSlash)); + names.replace(snap->data().toInt() , snap->snapTitle()); + + ReKonfig::setPreviewNames(names); + ReKonfig::setPreviewUrls(urls); + + ReKonfig::self()->writeConfig(); +} + + +void NewTabPage::removePreview(int index) +{ + QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); + + + QStringList names = ReKonfig::previewNames(); + QStringList urls = ReKonfig::previewUrls(); + + urls.replace(index, QString("")); + names.replace(index, QString("")); + + ReKonfig::setPreviewNames(names); + ReKonfig::setPreviewUrls(urls); + + // sync file data + ReKonfig::self()->writeConfig(); + + prev.replace(emptyPreview()); +} void NewTabPage::browsingMenu(const KUrl ¤tUrl) @@ -278,3 +366,14 @@ void NewTabPage::closedTabsPage() m_root.appendInside(closed); } } + + +QString NewTabPage::checkTitle(QString title) +{ + if(title.length() > 23) + { + title.truncate(20); + title += "..."; + } + return title; +} diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 003aa84e..84880a10 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -28,9 +28,6 @@ #define REKONQ_NEW_TAB_PAGE -// rekonq Includes -#include - // KDE Includes #include @@ -41,11 +38,12 @@ // Forward Includes class KBookmark; +class WebPage; -class NewTabPage +class NewTabPage : public QObject { - +Q_OBJECT public: NewTabPage(QWebFrame *frame); ~NewTabPage(); @@ -56,12 +54,19 @@ public: * new tab page */ void generate(const KUrl &url = KUrl("about:home")); + +protected slots: + void snapFinished(); + void removePreview(int index); protected: // these are the function to build the new tab page void browsingMenu(const KUrl ¤tUrl); void favoritesPage(); - //QString lastVisitedPage(); + QWebElement emptyPreview(); + QWebElement loadingPreview(int index, KUrl url); + QWebElement validPreview(int index, KUrl url, QString title); + void historyPage(); void bookmarksPage(); void closedTabsPage(); @@ -77,6 +82,8 @@ private: { return m_root.document().findFirst("#models > " + selector).clone(); } + + QString checkTitle(QString title); QString m_html; diff --git a/src/webpage.cpp b/src/webpage.cpp index b2bedffc..59df13e7 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -72,6 +72,7 @@ WebPage::WebPage(QObject *parent) : KWebPage(parent, KWalletIntegration) + , m_newTabPage(0) { setForwardUnsupportedContent(true); @@ -114,10 +115,19 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r if(risp == KMessageBox::Cancel) return false; } + + if (request.url().scheme() == QLatin1String("about")) + { + if(m_newTabPage == 0) + m_newTabPage = new NewTabPage(frame); + m_newTabPage->generate(request.url()); + return false; + } if (frame && m_protHandler.preHandling( request, frame )) { return false; + } m_requestedUrl = request.url(); diff --git a/src/webpage.h b/src/webpage.h index 9169ad60..5671b5d9 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -32,8 +32,10 @@ #define WEBPAGE_H + // Local Includes #include "protocolhandler.h" +#include "newtabpage.h" // KDE Includes #include @@ -76,6 +78,7 @@ private: QUrl m_requestedUrl; ProtocolHandler m_protHandler; + NewTabPage *m_newTabPage; }; #endif diff --git a/src/websnap.cpp b/src/websnap.cpp index 7dcbb836..e5db7c4e 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -115,16 +115,62 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) } +KUrl WebSnap::fileForUrl(KUrl url) +{ + QString filePath = + KStandardDirs::locateLocal("cache", QString("thumbs/") + WebSnap::guessNameFromUrl(url) + ".png", true); + return KUrl(filePath); +} + + +void WebSnap::SetData(QVariant data) +{ + m_data = data; +} + +QVariant& WebSnap::data() +{ + return m_data; +} + + + +QString WebSnap::guessNameFromUrl(QUrl url) +{ + QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash ); + + // TODO learn Regular Expressions :) + // and implement something better here.. + name.remove('/'); + name.remove('&'); + name.remove('.'); + name.remove('-'); + name.remove('_'); + name.remove('?'); + name.remove('='); + name.remove('+'); + + return name; +} + + void WebSnap::saveResult(bool ok) { // crude error-checking if (!ok) { kDebug() << "Error loading site.."; - return; + m_snapTitle = "Error..."; + m_image = QPixmap(); } - - m_image = renderPreview(m_page, WIDTH, HEIGHT); + else + { + m_image = renderPreview(m_page, WIDTH, HEIGHT); + } + + m_image.save(fileForUrl(m_url).toLocalFile()); + kDebug() << "finished"; + emit finished(); } diff --git a/src/websnap.h b/src/websnap.h index 6c5b4af9..04fded57 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -51,18 +51,26 @@ public: WebSnap(const QUrl &url); ~WebSnap(); - QPixmap previewImage(); + QPixmap previewImage(); // TODO : remove + static QPixmap renderPreview(const QWebPage &page, int w, int h); + static KUrl fileForUrl(KUrl url); + + static QString guessNameFromUrl(QUrl url); + QString snapTitle(); QUrl snapUrl(); + + void SetData(QVariant data); + QVariant& data(); signals: void finished(); private slots: void load(); - void saveResult(bool ok); + void saveResult(bool ok = true); private: QWebPage m_page; @@ -70,6 +78,8 @@ private: QUrl m_url; QString m_snapTitle; + + QVariant m_data; }; #endif // WEB_SNAP_H -- cgit v1.2.1 From f1f7e2011c3f245cd1987b0f09b72c2f7dea283f Mon Sep 17 00:00:00 2001 From: matgic78 Date: Fri, 18 Dec 2009 15:58:48 +0100 Subject: Various changes: - improve appearance of empty/loading previews - port closedTabs to new system - remove PreviewImage files TODO : dialog to choose preview --- src/CMakeLists.txt | 1 - src/data/home.html | 22 +-- src/previewimage.cpp | 430 ------------------------------------------ src/previewimage.h | 101 ---------- src/rekonqpage/newtabpage.cpp | 84 ++++++--- src/rekonqpage/newtabpage.h | 9 +- src/webpluginfactory.cpp | 28 +-- 7 files changed, 79 insertions(+), 596 deletions(-) delete mode 100644 src/previewimage.cpp delete mode 100644 src/previewimage.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0a3fbd8..2295e9e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,6 @@ SET( rekonq_KDEINIT_SRCS findbar.cpp mainview.cpp mainwindow.cpp - previewimage.cpp sessionmanager.cpp tabbar.cpp webpage.cpp diff --git a/src/data/home.html b/src/data/home.html index 8db3d894..103c559d 100644 --- a/src/data/home.html +++ b/src/data/home.html @@ -127,10 +127,12 @@ width:25%; margin-top: 7%; min-width:250px; min-height:192px; } +.preview img { +} .preview { -display: block; -width: 200px; -height: 150px; +display: table-cell; +vertical-align: middle; +width: 200px; height: 150px; padding: 14px 16px; background: url(%2/bg.png) no-repeat; -webkit-background-size: 100% 100%; @@ -154,10 +156,10 @@ opacity: 0; } .remove { - float: right; +float: right; } .modify { - float: left; +float: left; } .title { @@ -171,14 +173,10 @@ text-align: center; .thumbnail a { text-align:center; } -.thumbnail a:hover { +.thumbnail a:hover, span { color:#3F7AB7; } -.thumbnail span { - -} - /* -------------------------------------------------------- */ /* Bookmarks page*/ @@ -210,7 +208,9 @@ margin-bottom: 0.5em;
- +
+ +
diff --git a/src/previewimage.cpp b/src/previewimage.cpp deleted file mode 100644 index 9c8bb194..00000000 --- a/src/previewimage.cpp +++ /dev/null @@ -1,430 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2009 by Andrea Diamantini -* -* -* 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 . -* -* ============================================================ */ - - -// Self Includes -#include "previewimage.h" -#include "previewimage.moc" - -// Local Includes -#include "historymanager.h" -#include "rekonq.h" -#include "mainwindow.h" -#include "mainview.h" - -// KDE Includes -#include -#include -#include -#include -#include -#include - -// Qt Includes -#include -#include -#include -#include -#include -#include - - -PreviewImage::PreviewImage(const QUrl &url, const QString &title, int index, bool isFavorite) - : QWidget() - , ws(0) - , loadingSnapshot(false) - , m_url(url) - , m_title(title) - , m_isFavorite(isFavorite) - , m_index(index) - , m_button(0) - , m_imageLabel(new QLabel) - , m_textLabel(new QLabel) - , m_backgroundLabel(new QLabel) - , m_previewLabel(new QLabel) -{ - - int borderTop = 14; - int borderRight = 16; - int borderBottom = 14; - int borderLeft = 16; - - int previewWidth = 200; - int previewHeight = 150; - - int urlHeight = 18; - - m_size = QSize(borderLeft+previewWidth+borderRight, borderTop+previewHeight+borderBottom+urlHeight); - - setFixedSize(m_size); - m_previewLabel->setFixedSize(m_size); - - m_backgroundLabel->setPixmap(renderBackground(previewWidth,previewHeight, borderTop, borderBottom, borderLeft, borderRight)); - - m_previewLabel->setAlignment(Qt::AlignCenter); - m_backgroundLabel->setAlignment(Qt::AlignCenter); - m_imageLabel->setAlignment(Qt::AlignCenter); - m_textLabel->setAlignment(Qt::AlignCenter); - - m_previewLabel->setLayout(new QVBoxLayout); - m_previewLabel->layout()->setMargin(0); - m_previewLabel->layout()->addWidget(m_backgroundLabel); - m_previewLabel->layout()->addWidget(m_textLabel); - m_previewLabel->setCursor(Qt::PointingHandCursor); - - m_backgroundLabel->setLayout(new QVBoxLayout); - m_backgroundLabel->layout()->addWidget(m_imageLabel); - - setLayout(new QHBoxLayout); - layout()->setMargin(0); - layout()->setAlignment(Qt::AlignCenter); - layout()->addWidget(m_previewLabel); - - connect(this, SIGNAL(loadUrl(const KUrl &, const Rekonq::OpenType &)), - Application::instance(), SLOT(loadUrl(const KUrl &, const Rekonq::OpenType &))); - - loadUrlPreview(url); -} - - -PreviewImage::~PreviewImage() -{ - delete ws; - delete m_textLabel; - delete m_imageLabel; - delete m_backgroundLabel; - delete m_previewLabel; -} - - -QPixmap PreviewImage::renderBackground(int w, int h, int t, int b, int l, int r) -{ - QImage backImage(KStandardDirs::locate("appdata", "pics/bg.png")); - QImage resultImage(QSize(w + l + r, h + t + b), QImage::Format_ARGB32_Premultiplied); - - if (!backImage.isNull()) - { - int sw = backImage.width() - l - r; - int sh = backImage.height() - t - b; - QPainter pt(&resultImage); - pt.setCompositionMode(QPainter::CompositionMode_Source); - pt.fillRect(resultImage.rect(), Qt::transparent); - pt.drawImage(QRect(0, 0, l, t), backImage, QRect(0, 0, l, t)); - pt.drawImage(QRect(l, 0, w, t), backImage, QRect(l, 0, sw, t)); - pt.drawImage(QRect(l + w, 0, r, t), backImage, QRect(l + sw, 0, r, t)); - pt.drawImage(QRect(0, t, l, h), backImage, QRect(0, t, l, sh)); - pt.drawImage(QRect(l, t, w, h), backImage, QRect(l, t, sw, sh)); - pt.drawImage(QRect(l + w, t, r, h), backImage, QRect(l + sw, t, r, sh)); - pt.drawImage(QRect(0, t + h, l , b), backImage, QRect(0, t + sh, l , b)); - pt.drawImage(QRect(l, t + h, w, b), backImage, QRect(l, t + sh, sw, b)); - pt.drawImage(QRect(l + w, t + h, w, b), backImage, QRect(l + sw, t + sh, sw, b)); - pt.end(); - } - - return QPixmap::fromImage(resultImage); -} - - -void PreviewImage::loadUrlPreview(const QUrl& url) -{ - m_url = url; - - if(url.isEmpty()) - { - showEmptyPreview(); - return; - } - - m_previewLabel->setFixedSize(m_size); //unhide - - m_savePath = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(m_url) + ".png", true); - - if(QFile::exists(m_savePath)) - { - m_pixmap.load(m_savePath); - m_imageLabel->setPixmap(m_pixmap); - checkTitle(); - m_textLabel->setText(m_title); - } - else - { - loadingSnapshot = true; - ws = new WebSnap( url ); - connect(ws, SIGNAL(finished()), this, SLOT(snapFinished())); - - QString path = KStandardDirs::locate("appdata", "pics/busywidget.gif"); - - // load an animation waiting for site preview - QMovie *movie = new QMovie(path, QByteArray(), this); - movie->setSpeed(50); - m_imageLabel->setMovie(movie); - movie->start(); - m_textLabel->setText( i18n("Loading preview...") ); - setCursor(Qt::BusyCursor); - } -} - - -void PreviewImage::snapFinished() -{ - loadingSnapshot = false; - QMovie *m = m_imageLabel->movie(); - delete m; - m_imageLabel->setMovie(0); - - m_pixmap = ws->previewImage(); - m_imageLabel->setPixmap(m_pixmap); - checkTitle(); - m_textLabel->setText(m_title); - - setCursor(Qt::PointingHandCursor); - - m_pixmap.save(m_savePath); - - if(m_index > -1) - { - // Update title - QStringList names = ReKonfig::previewNames(); - // update url (for added thumbs) - QStringList urls = ReKonfig::previewUrls(); - - // stripTrailingSlash to be sure to get the same string for same address - urls.replace(m_index, ws->snapUrl().toString(QUrl::StripTrailingSlash)); - names.replace(m_index, ws->snapTitle()); - - ReKonfig::setPreviewNames(names); - ReKonfig::setPreviewUrls(urls); - - ReKonfig::self()->writeConfig(); - } -} - - -void PreviewImage::showEmptyPreview() -{ - if(!m_isFavorite) - return; - - m_imageLabel->clear(); - m_textLabel->clear(); - - m_previewLabel->setFixedSize(0,0); //hide - - - m_button = new QToolButton(); - m_button->setDefaultAction(historyMenu()); - m_button->setPopupMode(QToolButton::InstantPopup); - m_button->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - m_button->setText(i18n("Add Preview")); - m_button->setAutoRaise(true); - m_button->setIconSize(QSize(48, 48)); - layout()->addWidget(m_button); -} - - -void PreviewImage::mouseDoubleClickEvent(QMouseEvent *event) -{ - kDebug() << "no double click over here, thanks :D"; - Q_UNUSED(event); -} - - -void PreviewImage::mouseMoveEvent(QMouseEvent *event) -{ - kDebug() << "moving mouse over preview image"; - Q_UNUSED(event) -} - - -void PreviewImage::mousePressEvent(QMouseEvent *event) -{ - if(event->button() == Qt::LeftButton) - { - emit loadUrl(m_url, Rekonq::CurrentTab); - return; - } - else if(event->button() == Qt::MidButton) - { - emit loadUrl(m_url, Rekonq::SettingOpenTab); - return; - } - - QWidget::mousePressEvent(event); -} - - -void PreviewImage::mouseReleaseEvent(QMouseEvent *event) -{ - kDebug() << "NO000... don't leave your finger from the button!!"; - Q_UNUSED(event) -} - - -void PreviewImage::contextMenuEvent(QContextMenuEvent* event) -{ - if(!m_isFavorite) - return; - - if(loadingSnapshot) - return; - - KMenu menu(this); - KAction *a; - - if(!m_url.isEmpty()) - { - a = new KAction(KIcon("edit-delete"), i18n("Remove Thumbnail"), this); - connect(a, SIGNAL(triggered(bool)), this, SLOT(removeMe())); - menu.addAction(a); - - a = new KAction(KIcon("view-refresh"), i18n("Refresh Thumbnail"), &menu); - connect(a, SIGNAL(triggered(bool)), this, SLOT(refreshPreview())); - menu.addAction(a); - } - menu.addAction(historyMenu()); - - menu.exec(mapToGlobal(event->pos())); -} - - -KActionMenu* PreviewImage::historyMenu() -{ - KActionMenu *histMenu = new KActionMenu(KIcon("insert-image"), i18n("Set Page to Preview"), this); - QList history = Application::historyManager()->history(); - - if(history.isEmpty()) - { - KAction *a = new KAction(i18n("History is Empty"), this); - a->setEnabled(false); - histMenu->addAction(a); - return histMenu; - } - - int maxItems = 15; - for (int i = 0; i < maxItems && i < history.size() ; ++i) - { - HistoryItem it = history.at(i); - KAction *a = new KAction(Application::icon(it.url), it.title, this); - QStringList urlData; - urlData << it.url << it.title; - a->setData(urlData); - connect(a, SIGNAL(triggered(bool)), this, SLOT(setUrlFromAction())); - histMenu->addAction(a); - } - - return histMenu; -} - - -void PreviewImage::removeMe() -{ - QStringList names = ReKonfig::previewNames(); - QStringList urls = ReKonfig::previewUrls(); - - int index = urls.indexOf(QRegExp(m_url.toString(QUrl::StripTrailingSlash), Qt::CaseSensitive, QRegExp::FixedString)); - - urls.replace(index, QString("")); - names.replace(index, QString("")); - - ReKonfig::setPreviewNames(names); - ReKonfig::setPreviewUrls(urls); - - // sync file data - ReKonfig::self()->writeConfig(); - - showEmptyPreview(); - - m_url = ""; -} - - -void PreviewImage::setUrlFromAction() -{ - KAction *a = qobject_cast(sender()); - QStringList urlData = a->data().toStringList(); - - m_url = KUrl(urlData.at(0)); - m_title = urlData.at(1); - checkTitle(); - - if(m_button) - { - m_imageLabel->layout()->deleteLater(); - m_button->menu()->deleteLater(); - m_button->deleteLater(); - } - loadUrlPreview(m_url); - - // Update title - QStringList names = ReKonfig::previewNames(); - // update url (for added thumbs) - QStringList urls = ReKonfig::previewUrls(); - - // stripTrailingSlash to be sure to get the same string for same address - urls.replace(m_index, m_url.toString(QUrl::StripTrailingSlash)); - names.replace(m_index, m_title); - - ReKonfig::setPreviewNames(names); - ReKonfig::setPreviewUrls(urls); - - ReKonfig::self()->writeConfig(); -} - - -void PreviewImage::refreshPreview() -{ - QString path = KStandardDirs::locateLocal("cache", QString("thumbs/") + guessNameFromUrl(m_url) + ".png", true); - QFile::remove(path); - loadUrlPreview(m_url); -} - - -QString PreviewImage::guessNameFromUrl(QUrl url) -{ - QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash ); - - // TODO learn Regular Expressions :) - // and implement something better here.. - name.remove('/'); - name.remove('&'); - name.remove('.'); - name.remove('-'); - name.remove('_'); - name.remove('?'); - name.remove('='); - name.remove('+'); - - return name; -} - - -void PreviewImage::checkTitle() -{ - if(m_title.length() > 23) - { - m_title.truncate(20); - m_title += "..."; - } -} diff --git a/src/previewimage.h b/src/previewimage.h deleted file mode 100644 index 4dd8df3b..00000000 --- a/src/previewimage.h +++ /dev/null @@ -1,101 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* Copyright (C) 2009 by Andrea Diamantini -* -* -* 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 . -* -* ============================================================ */ - - -#ifndef PREVIEW_IMAGE_H -#define PREVIEW_IMAGE_H - -// Local Includes -#include "websnap.h" -#include "application.h" - -// KDE Includes -#include - -// Qt Includes -#include -#include -#include -#include -#include -#include - - -class PreviewImage : public QWidget -{ - Q_OBJECT - -public: - PreviewImage(const QUrl &url, const QString &title, int index, bool isFavorite); - ~PreviewImage(); - - QString guessNameFromUrl(QUrl url); - -public slots: - void snapFinished(); - void removeMe(); - void setUrlFromAction(); - void refreshPreview(); - -signals: - void loadUrl(const KUrl &, const Rekonq::OpenType &); - -protected: - void contextMenuEvent(QContextMenuEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - - void loadUrlPreview(const QUrl &url); - KActionMenu *historyMenu(); - void showEmptyPreview(); - -private: - void checkTitle(); - QPixmap renderBackground(int w, int h, int t, int b, int l, int r); - - QPixmap m_pixmap; - WebSnap *ws; - - QString m_savePath; - bool loadingSnapshot; - - QUrl m_url; - QString m_title; - bool m_isFavorite; - int m_index; - - QToolButton *m_button; - - QLabel *m_imageLabel; - QLabel *m_textLabel; - QLabel *m_backgroundLabel; - QLabel *m_previewLabel; - - QSize m_size; -}; - -#endif // PREVIEW_IMAGE_H diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index 4299c8bb..a587502c 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -80,6 +80,10 @@ void NewTabPage::generate(const KUrl &url) removePreview(url.fileName().toInt()); return; } + if(url.directory() == QString("preview/modify")) + { + return; + } } @@ -125,28 +129,31 @@ void NewTabPage::favoritesPage() for(int i=0; i<8; ++i) { - QWebElement speed; + KUrl url = urls.at(i); + QWebElement prev; - if(urls.at(i).isEmpty()) - speed = emptyPreview(); - else if(!QFile::exists(WebSnap::fileForUrl(urls.at(i)).toLocalFile())) - speed = loadingPreview(i, urls.at(i)); + if(url.isEmpty()) + prev = emptyPreview(i); + else if(!QFile::exists(WebSnap::fileForUrl(url).toLocalFile())) + prev = loadingPreview(i, url); else - speed = validPreview(i, urls.at(i), names.at(i)); + prev = validPreview(i, url, names.at(i)); - speed.setAttribute("id", "preview" + QVariant(i).toString()); - m_root.appendInside(speed); + prev.setAttribute("id", "preview" + QVariant(i).toString()); + m_root.appendInside(prev); } } -QWebElement NewTabPage::emptyPreview() +QWebElement NewTabPage::emptyPreview(int index) { QWebElement prev = markup(".thumbnail"); - prev.findFirst("img").setAttribute("src" , QString("file:///") + + prev.findFirst(".preview img").setAttribute("src" , QString("file:///") + KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop)); prev.findFirst("span").appendInside(i18n("Set a Preview...")); + prev.findFirst("a").setAttribute("href", QString("about:/preview/modify/" + QVariant(index).toString())); + hideControls(prev); return prev; } @@ -156,9 +163,11 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url) { QWebElement prev = markup(".thumbnail"); - prev.findFirst("img").setAttribute("src" , - QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); + prev.findFirst(".preview img").setAttribute("src" , + QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); prev.findFirst("span").appendInside(i18n("Loading Preview...")); + showControls(prev); + WebSnap *snap = new WebSnap(url); snap->SetData(QVariant(index)); connect(snap, SIGNAL(finished()), SLOT(snapFinished())); @@ -172,29 +181,43 @@ QWebElement NewTabPage::validPreview(int index, KUrl url, QString title) KUrl previewPath = WebSnap::fileForUrl(url); QString iString = QVariant(index).toString(); - prev.findFirst(".preview").setAttribute("src" , previewPath.toMimeDataString()); + prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString()); prev.findFirst("a").setAttribute("href", url.toMimeDataString()); - prev.findFirst("span > a").setAttribute("href", url.toMimeDataString()); + prev.findFirst("span a").setAttribute("href", url.toMimeDataString()); prev.findFirst("span").appendInside(checkTitle(title)); prev.findFirst(".modify img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString )); prev.findFirst(".remove img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString )); + showControls(prev); + + return prev; } +void NewTabPage::hideControls(QWebElement e) +{ + e.findFirst(".remove").setStyleProperty("visibility", "hidden"); + e.findFirst(".modify").setStyleProperty("visibility", "hidden"); +} +void NewTabPage::showControls(QWebElement e) +{ + e.findFirst(".remove").setStyleProperty("visibility", "visible"); + e.findFirst(".modify").setStyleProperty("visibility", "visible"); +} + + void NewTabPage::snapFinished() { WebSnap *snap = qobject_cast(sender()); - QWebElement thumb = m_root.findFirst("#preview" + snap->data().toString()); - thumb.findFirst("img").setAttribute("src", WebSnap::fileForUrl(snap->snapUrl()).toMimeDataString()); - thumb.findFirst("p").setPlainText(snap->snapTitle()); + QWebElement prev = m_root.findFirst("#preview" + snap->data().toString()); + prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle())); // Save the new config QStringList names = ReKonfig::previewNames(); @@ -228,7 +251,7 @@ void NewTabPage::removePreview(int index) // sync file data ReKonfig::self()->writeConfig(); - prev.replace(emptyPreview()); + prev.replace(emptyPreview(index)); } @@ -357,13 +380,22 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent) void NewTabPage::closedTabsPage() { QList links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs(); - - foreach(const HistoryItem &item, links) + + for(int i=0; i < links.count(); ++i) { - QWebElement closed = markup(".thumbnail"); - closed.findFirst("object").setAttribute("data" , item.url); - closed.findFirst("param[name=title]").setAttribute("value", item.title); - m_root.appendInside(closed); + HistoryItem item = links.at(i); + QWebElement prev; + + if(item.url.isEmpty()) + continue; + else if(!QFile::exists(WebSnap::fileForUrl(item.url).toLocalFile())) + prev = loadingPreview(i, item.url); + else + prev = validPreview(i, item.url, item.title); + + prev.setAttribute("id", "preview" + QVariant(i).toString()); + hideControls(prev); + m_root.appendInside(prev); } } diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 84880a10..9ac743ea 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -63,10 +63,17 @@ protected: // these are the function to build the new tab page void browsingMenu(const KUrl ¤tUrl); void favoritesPage(); - QWebElement emptyPreview(); + QWebElement emptyPreview(int index); QWebElement loadingPreview(int index, KUrl url); QWebElement validPreview(int index, KUrl url, QString title); + /** This function takes a QwebElement with the .thumbnail structure. + It hides the "remove" and "modify" buttons-> + */ + void hideControls(QWebElement e); + void showControls(QWebElement e); + + void historyPage(); void bookmarksPage(); void closedTabsPage(); diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp index aec4e18d..ac18fece 100644 --- a/src/webpluginfactory.cpp +++ b/src/webpluginfactory.cpp @@ -32,7 +32,6 @@ #include "rekonq.h" #include "application.h" #include "mainwindow.h" -#include "previewimage.h" #include "clicktoflash.h" // KDE Includes @@ -65,27 +64,7 @@ QObject *WebPluginFactory::create(const QString &mimeType, const QStringList &argumentValues) const { kDebug() << "loading mimeType: " << mimeType; - - if(mimeType == QString("application/image-preview") ) - { - QString title; - int number = -1; - bool isFavorite = false; - - int i; - i = argumentNames.indexOf( QString("title") ); - if(i > -1) - title = argumentValues.at(i); - i = argumentNames.indexOf( QString("isFavorite") ); - if(i > -1) - isFavorite = true; - i = argumentNames.indexOf( QString("index") ); - if(i > -1) - number = argumentValues.at(i).toInt(); - - return new PreviewImage(url, title, number, isFavorite); - } - + if(ReKonfig::pluginsEnabled() == 0) // plugins are enabled { kDebug() << "No plugins found for" << mimeType << ". Falling back to QtWebKit ones..."; @@ -112,10 +91,7 @@ QList WebPluginFactory::plugins() const { QList plugins = KWebPluginFactory::plugins(); - QWebPluginFactory::Plugin p; - p.name = "application/image-preview"; - p.description = "plugin for embedding Web snapped images"; - plugins.append(p); + KWebPluginFactory::Plugin p; p.name = "application/x-shockwave-flash"; p.description = "Plugin for flash animations"; -- cgit v1.2.1 From 18b87086d1a0e472662f3883962b60dbe57e215f Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sat, 26 Dec 2009 13:00:53 +0100 Subject: First expermimental implementation of a new way of choosing a preview --- src/CMakeLists.txt | 1 + src/rekonqpage/newtabpage.cpp | 57 +++++++++++---- src/rekonqpage/newtabpage.h | 2 + src/rekonqpage/previewchooser.cpp | 143 ++++++++++++++++++++++++++++++++++++++ src/rekonqpage/previewchooser.h | 70 +++++++++++++++++++ src/websnap.cpp | 2 +- 6 files changed, 262 insertions(+), 13 deletions(-) create mode 100644 src/rekonqpage/previewchooser.cpp create mode 100644 src/rekonqpage/previewchooser.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2295e9e0..2ad18a02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,6 +31,7 @@ SET( rekonq_KDEINIT_SRCS history/historypanel.cpp #---------------------------------------- rekonqpage/newtabpage.cpp + rekonqpage/previewchooser.cpp #---------------------------------------- settings/settingsdialog.cpp #---------------------------------------- diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index a587502c..c91af2dc 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -36,6 +36,7 @@ #include "application.h" #include "mainwindow.h" #include "mainview.h" +#include "previewchooser.h" // KDE Includes #include @@ -43,6 +44,7 @@ #include #include #include +#include // Qt Includes #include @@ -82,6 +84,9 @@ void NewTabPage::generate(const KUrl &url) } if(url.directory() == QString("preview/modify")) { + PreviewChooser *pc = new PreviewChooser(url.fileName().toInt()); + connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl))); + pc->show(); return; } } @@ -139,7 +144,8 @@ void NewTabPage::favoritesPage() else prev = validPreview(i, url, names.at(i)); - prev.setAttribute("id", "preview" + QVariant(i).toString()); + setupPreview(prev, i); + m_root.appendInside(prev); } } @@ -152,7 +158,9 @@ QWebElement NewTabPage::emptyPreview(int index) prev.findFirst(".preview img").setAttribute("src" , QString("file:///") + KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop)); prev.findFirst("span").appendInside(i18n("Set a Preview...")); - prev.findFirst("a").setAttribute("href", QString("about:/preview/modify/" + QVariant(index).toString())); + prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString())); + + setupPreview(prev, index); hideControls(prev); return prev; @@ -166,6 +174,8 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url) prev.findFirst(".preview img").setAttribute("src" , QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); prev.findFirst("span").appendInside(i18n("Loading Preview...")); + + setupPreview(prev, index); showControls(prev); WebSnap *snap = new WebSnap(url); @@ -184,19 +194,11 @@ QWebElement NewTabPage::validPreview(int index, KUrl url, QString title) prev.findFirst(".preview img").setAttribute("src" , previewPath.toMimeDataString()); prev.findFirst("a").setAttribute("href", url.toMimeDataString()); prev.findFirst("span a").setAttribute("href", url.toMimeDataString()); - prev.findFirst("span").appendInside(checkTitle(title)); - - prev.findFirst(".modify img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); - prev.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + iString )); - - prev.findFirst(".remove img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); - prev.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + iString )); + prev.findFirst("span").setPlainText(checkTitle(title)); + setupPreview(prev, index); showControls(prev); - return prev; } @@ -212,6 +214,19 @@ void NewTabPage::showControls(QWebElement e) e.findFirst(".modify").setStyleProperty("visibility", "visible"); } +void NewTabPage::setupPreview(QWebElement e, int index) +{ + e.findFirst(".remove img").setAttribute("src", QString("file:///") + + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); + e.findFirst(".modify img").setAttribute("src", QString("file:///") + + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); + + e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString())); + e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString())); + + e.setAttribute("id", "preview" + QVariant(index).toString()); +} + void NewTabPage::snapFinished() { @@ -255,6 +270,24 @@ void NewTabPage::removePreview(int index) } +void NewTabPage::setPreview(int index, KUrl url) +{ + if(url.isEmpty()) + return; + + QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); + + QStringList urls = ReKonfig::previewUrls(); + urls.replace(index, url.toMimeDataString()); + ReKonfig::setPreviewUrls(urls); + ReKonfig::self()->writeConfig(); + + prev.replace(loadingPreview(index, url)); + + +} + + void NewTabPage::browsingMenu(const KUrl ¤tUrl) { QList navItems; diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 9ac743ea..973028b3 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -58,6 +58,7 @@ public: protected slots: void snapFinished(); void removePreview(int index); + void setPreview(int index, KUrl url); protected: // these are the function to build the new tab page void browsingMenu(const KUrl ¤tUrl); @@ -72,6 +73,7 @@ protected: // these are the function to build the new tab page */ void hideControls(QWebElement e); void showControls(QWebElement e); + void setupPreview(QWebElement e, int index); void historyPage(); diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp new file mode 100644 index 00000000..a7c86d12 --- /dev/null +++ b/src/rekonqpage/previewchooser.cpp @@ -0,0 +1,143 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +// Self Includes +#include "previewchooser.h" + +// Local Includes +#include "rekonq.h" +#include +#include +#include + +// Qt Includes +#include +#include + +// KDE Includes +#include +#include + + +PreviewChooser::PreviewChooser(int previewIndex) + : KDialog(0) + , m_treeView(new QTreeView) + , m_model(new QStandardItemModel) + , m_previewIndex(previewIndex) +{ + setMinimumSize(350, 100); + setWindowTitle(i18n("Set Page to preview")); + setModal(true); + + setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok); + setDefaultButton(KDialog::Ok); + connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode))); + + m_treeView->setUniformRowHeights(true); + m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows); + m_treeView->setTextElideMode(Qt::ElideRight); + m_treeView->setHeaderHidden(true); + m_treeView->setIndentation(0); + + QWidget *mainWidget = new QWidget(this); + + // add url bar + QHBoxLayout *urlLayout = new QHBoxLayout; + urlLayout->setContentsMargins(5, 0, 0, 0); + QLabel *searchLabel = new QLabel(i18n("adress:")); + urlLayout->addWidget(searchLabel); + m_line = new KLineEdit; + connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged())); + urlLayout->addWidget(m_line); + + // setup view + QVBoxLayout *vBoxLayout = new QVBoxLayout; + vBoxLayout->setContentsMargins(0, 0, 0, 0); + vBoxLayout->addLayout(urlLayout); + vBoxLayout->addWidget(m_treeView); + mainWidget->setLayout(vBoxLayout); + setMainWidget(mainWidget); + + refreshModel(); + connect(Application::instance()->mainWindow()->mainView(), SIGNAL(tabsChanged()), SLOT(refreshModel())); + + m_treeView->setModel(m_model); + + connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex))); +} + + +PreviewChooser::~PreviewChooser() +{ + delete m_model; +} + + + +void PreviewChooser::refreshModel() +{ + m_model->clear(); + MainView *mv = Application::instance()->mainWindow()->mainView(); + for(int i=0; i < mv->count(); ++i) + { + WebView *view = qobject_cast(mv->webView(i)); + + if(view->url().scheme() == "about:") + continue; + + QStandardItem *it = new QStandardItem(view->icon(), view->title()); + it->setData(QVariant(view->url()), Qt::ToolTipRole); + m_model->insertRow(i, it); + } +} + +void PreviewChooser::setUrl(QModelIndex i) +{ + if(!i.data().canConvert(QVariant::String)) + return; + + m_line->setText(i.data(Qt::ToolTipRole).toString()); +} + + +void PreviewChooser::buttonClicked(KDialog::ButtonCode code) +{ + if(code == KDialog::Apply || code == KDialog::Ok) + { + emit urlChoosed(m_previewIndex, KUrl(m_line->text())); + enableButtonApply(false); + } + + if(code == KDialog::Cancel || code == KDialog::Ok) + { + close(); + deleteLater(); + } +} + + +void PreviewChooser::urlChanged() +{ + enableButtonApply(true); +} + diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h new file mode 100644 index 00000000..79766fdc --- /dev/null +++ b/src/rekonqpage/previewchooser.h @@ -0,0 +1,70 @@ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ + + +#ifndef PREVIEWCHOOSER_H +#define PREVIEWCHOOSER_H + + +// Local Includes +#include "application.h" + +// KDE Includes +#include +#include + +// Qt Includes +#include +#include +#include + +// Forward Declarations +class KUrl; + + +class PreviewChooser : public KDialog +{ +Q_OBJECT + +public: + explicit PreviewChooser(int previewIndex); + virtual ~PreviewChooser(); + +signals: + void urlChoosed(int, const KUrl &); + +public slots: + void refreshModel(); + void setUrl(QModelIndex i); + void buttonClicked(KDialog::ButtonCode code); + void urlChanged(); + +private: + QTreeView *m_treeView; + QStandardItemModel *m_model; + + KLineEdit *m_line; + + int m_previewIndex; +}; + +#endif // PREVIEWCHOOSER_H diff --git a/src/websnap.cpp b/src/websnap.cpp index e5db7c4e..0d72ef3a 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -167,7 +167,7 @@ void WebSnap::saveResult(bool ok) { m_image = renderPreview(m_page, WIDTH, HEIGHT); } - + QFile::remove(fileForUrl(m_url).toLocalFile()); m_image.save(fileForUrl(m_url).toLocalFile()); kDebug() << "finished"; -- cgit v1.2.1 From e5d1f43e3c58bef6da3ea5a725a57872ddb74f27 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Mon, 28 Dec 2009 14:26:20 +0100 Subject: Fix compilation after rebasing --- src/rekonqpage/previewchooser.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp index a7c86d12..fde36563 100644 --- a/src/rekonqpage/previewchooser.cpp +++ b/src/rekonqpage/previewchooser.cpp @@ -29,6 +29,7 @@ #include #include #include +#include // Qt Includes #include @@ -100,7 +101,7 @@ void PreviewChooser::refreshModel() MainView *mv = Application::instance()->mainWindow()->mainView(); for(int i=0; i < mv->count(); ++i) { - WebView *view = qobject_cast(mv->webView(i)); + WebView *view = qobject_cast(mv->webTab(i)->view()); if(view->url().scheme() == "about:") continue; -- cgit v1.2.1 From e3215b1316fa0459d4238bf5cb3c60b0bff90f73 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Thu, 31 Dec 2009 10:53:51 +0100 Subject: little changes --- src/rekonqpage/newtabpage.cpp | 4 +++- src/rekonqpage/previewchooser.cpp | 17 +++++++++++++---- src/rekonqpage/previewchooser.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index c91af2dc..c8b2e916 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -84,7 +84,9 @@ void NewTabPage::generate(const KUrl &url) } if(url.directory() == QString("preview/modify")) { - PreviewChooser *pc = new PreviewChooser(url.fileName().toInt()); + int index = url.fileName().toInt(); + QString url = m_root.findFirst("#preview" + QVariant(index).toString() + " > a").attribute("href"); + PreviewChooser *pc = new PreviewChooser(index, url); connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl))); pc->show(); return; diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp index fde36563..eeea9f99 100644 --- a/src/rekonqpage/previewchooser.cpp +++ b/src/rekonqpage/previewchooser.cpp @@ -40,7 +40,7 @@ #include -PreviewChooser::PreviewChooser(int previewIndex) +PreviewChooser::PreviewChooser(int previewIndex, QString url) : KDialog(0) , m_treeView(new QTreeView) , m_model(new QStandardItemModel) @@ -70,6 +70,15 @@ PreviewChooser::PreviewChooser(int previewIndex) m_line = new KLineEdit; connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged())); urlLayout->addWidget(m_line); + + if(url.isEmpty() || url.startsWith("about:")) + m_line->setText(QString("http://")); + else + { + m_line->setText(url); + m_line->setSelection(8, m_line->text().size()); + } + // setup view QVBoxLayout *vBoxLayout = new QVBoxLayout; @@ -103,10 +112,10 @@ void PreviewChooser::refreshModel() { WebView *view = qobject_cast(mv->webTab(i)->view()); - if(view->url().scheme() == "about:") + if(view->url().scheme() == "about") continue; - QStandardItem *it = new QStandardItem(view->icon(), view->title()); + QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title()); it->setData(QVariant(view->url()), Qt::ToolTipRole); m_model->insertRow(i, it); } @@ -123,7 +132,7 @@ void PreviewChooser::setUrl(QModelIndex i) void PreviewChooser::buttonClicked(KDialog::ButtonCode code) { - if(code == KDialog::Apply || code == KDialog::Ok) + if(code == KDialog::Apply || (code == KDialog::Ok && isButtonEnabled(KDialog::Apply))) { emit urlChoosed(m_previewIndex, KUrl(m_line->text())); enableButtonApply(false); diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h index 79766fdc..3eae71db 100644 --- a/src/rekonqpage/previewchooser.h +++ b/src/rekonqpage/previewchooser.h @@ -46,7 +46,7 @@ class PreviewChooser : public KDialog Q_OBJECT public: - explicit PreviewChooser(int previewIndex); + explicit PreviewChooser(int previewIndex, QString url); virtual ~PreviewChooser(); signals: -- cgit v1.2.1 From 8b26d07972db5a2953e64f61bf86e2e31959a32f Mon Sep 17 00:00:00 2001 From: matgic78 Date: Thu, 31 Dec 2009 11:07:24 +0100 Subject: fix bug : closed Tabs replaced favorites when loaded --- src/rekonqpage/newtabpage.cpp | 9 ++++++++- src/rekonqpage/newtabpage.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index c8b2e916..78928bca 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -53,6 +53,7 @@ NewTabPage::NewTabPage(QWebFrame *frame) : m_root(frame->documentElement()) + , m_url(KUrl()) { QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html"); @@ -73,7 +74,7 @@ NewTabPage::~NewTabPage() } -void NewTabPage::generate(const KUrl &url) +void NewTabPage::generate(KUrl url) { if(KUrl("about:preview").isParentOf(url)) { @@ -106,6 +107,7 @@ void NewTabPage::generate(const KUrl &url) { favoritesPage(); title = i18n("Favorites"); + url = KUrl("about:favorites"); } else if(url == KUrl("about:closedTabs")) { @@ -123,6 +125,8 @@ void NewTabPage::generate(const KUrl &url) title = i18n("Bookmarks"); } + m_url = url; + m_root.document().findFirst("title").setPlainText(title); } @@ -236,6 +240,9 @@ void NewTabPage::snapFinished() QWebElement prev = m_root.findFirst("#preview" + snap->data().toString()); prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle())); + if(m_url != KUrl("about:favorites")) + return; + // Save the new config QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 973028b3..cdc3cb31 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -53,7 +53,7 @@ public: * about: url and loads the corresponding part of the * new tab page */ - void generate(const KUrl &url = KUrl("about:home")); + void generate(KUrl url = KUrl("about:home")); protected slots: void snapFinished(); @@ -97,6 +97,8 @@ private: QString m_html; QWebElement m_root; + + KUrl m_url; }; #endif // REKONQ_NEW_TAB_PAGE -- cgit v1.2.1 From 0c98fe6a475ec8003590db31eb6c9ab471a4b388 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Mon, 4 Jan 2010 18:22:50 +0100 Subject: tmp commit --- src/rekonqpage/previewchooser.cpp | 40 +++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp index eeea9f99..79bdb068 100644 --- a/src/rekonqpage/previewchooser.cpp +++ b/src/rekonqpage/previewchooser.cpp @@ -51,7 +51,7 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url) setModal(true); setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok); - setDefaultButton(KDialog::Ok); + //setDefaultButton(KDialog::Ok); connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode))); m_treeView->setUniformRowHeights(true); @@ -68,18 +68,7 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url) QLabel *searchLabel = new QLabel(i18n("adress:")); urlLayout->addWidget(searchLabel); m_line = new KLineEdit; - connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged())); - urlLayout->addWidget(m_line); - if(url.isEmpty() || url.startsWith("about:")) - m_line->setText(QString("http://")); - else - { - m_line->setText(url); - m_line->setSelection(8, m_line->text().size()); - } - - // setup view QVBoxLayout *vBoxLayout = new QVBoxLayout; vBoxLayout->setContentsMargins(0, 0, 0, 0); @@ -94,6 +83,21 @@ PreviewChooser::PreviewChooser(int previewIndex, QString url) m_treeView->setModel(m_model); connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex))); + + connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged())); + urlLayout->addWidget(m_line); + + if(url.isEmpty() || url.startsWith("about:")) + m_line->setText(QString("http://")); + else + { + m_line->setText(url); + m_line->setSelection(8, m_line->text().size()); + } + + enableButtonApply(false); + setFocusProxy(mainWidget); + mainWidget->setFocusProxy(m_line); } @@ -112,12 +116,12 @@ void PreviewChooser::refreshModel() { WebView *view = qobject_cast(mv->webTab(i)->view()); - if(view->url().scheme() == "about") - continue; - - QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title()); - it->setData(QVariant(view->url()), Qt::ToolTipRole); - m_model->insertRow(i, it); + if(view->url().scheme() != "about") + { + QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title()); + it->setData(QVariant(view->url()), Qt::ToolTipRole); + m_model->appendRow(it); + } } } -- cgit v1.2.1 From 544094302a51b919b1eea86b313ec10d47533a08 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Fri, 15 Jan 2010 17:20:51 +0100 Subject: A new approach for choosing previews : a bar appears, then you browse to the page you want to preview, and then you click a button --- src/CMakeLists.txt | 2 +- src/mainwindow.cpp | 5 ++ src/mainwindow.h | 8 +- src/protocolhandler.cpp | 33 +------ src/rekonqpage/newtabpage.cpp | 36 +++++--- src/rekonqpage/newtabpage.h | 11 ++- src/rekonqpage/previewchooser.cpp | 157 ---------------------------------- src/rekonqpage/previewchooser.h | 70 --------------- src/rekonqpage/previewselectorbar.cpp | 138 ++++++++++++++++++++++++++++++ src/rekonqpage/previewselectorbar.h | 60 +++++++++++++ src/webpage.cpp | 16 ++-- src/webpage.h | 2 + src/websnap.cpp | 11 ++- src/websnap.h | 7 +- 14 files changed, 268 insertions(+), 288 deletions(-) delete mode 100644 src/rekonqpage/previewchooser.cpp delete mode 100644 src/rekonqpage/previewchooser.h create mode 100644 src/rekonqpage/previewselectorbar.cpp create mode 100644 src/rekonqpage/previewselectorbar.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2ad18a02..00cfbf77 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,7 +31,7 @@ SET( rekonq_KDEINIT_SRCS history/historypanel.cpp #---------------------------------------- rekonqpage/newtabpage.cpp - rekonqpage/previewchooser.cpp + rekonqpage/previewselectorbar.cpp #---------------------------------------- settings/settingsdialog.cpp #---------------------------------------- diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ffc9f508..e11f6d19 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -98,6 +98,7 @@ MainWindow::MainWindow() : KMainWindow() , m_view( new MainView(this) ) , m_findBar( new FindBar(this) ) + , m_previewSelectorBar( new PreviewSelectorBar(this) ) , m_historyPanel(0) , m_bookmarksPanel(0) , m_webInspectorPanel(0) @@ -122,6 +123,7 @@ MainWindow::MainWindow() QVBoxLayout *layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_view); + layout->addWidget(m_previewSelectorBar); layout->addWidget(m_findBar); centralWidget->setLayout(layout); @@ -617,6 +619,9 @@ void MainWindow::updateActions() QAction *historyForwardAction = actionByName(KStandardAction::name(KStandardAction::Forward)); historyForwardAction->setEnabled(currentTab()->view()->history()->canGoForward()); + + if(m_previewSelectorBar->isVisible()) + m_previewSelectorBar->setPage(currentTab()->page()); } diff --git a/src/mainwindow.h b/src/mainwindow.h index 7083591d..3a828afe 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,4 +1,5 @@ -/* ============================================================ + +class PreviewSelectorBar;/* ============================================================ * * This file is a part of the rekonq project * @@ -32,6 +33,7 @@ // Local Includes #include "application.h" +#include "previewselectorbar.h" // KDE Includes #include @@ -152,7 +154,9 @@ private slots: private: MainView *m_view; FindBar *m_findBar; - + + PreviewSelectorBar *m_previewSelectorBar; + HistoryPanel *m_historyPanel; BookmarksPanel *m_bookmarksPanel; WebInspectorPanel *m_webInspectorPanel; diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index c90afd19..a9339cfa 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -108,36 +108,9 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra // "about" handling if ( _url.protocol() == QLatin1String("about") ) { - if( _url == KUrl("about:home") ) - { - switch(ReKonfig::newTabStartPage()) - { - case 0: // favorites - _url = KUrl("about:favorites"); - break; - case 1: // closed tabs - _url = KUrl("about:closedTabs"); - break; - case 2: // history - _url = KUrl("about:history"); - break; - case 3: // bookmarks - _url = KUrl("about:bookmarks"); - break; - default: // unuseful - break; - } - } - if( _url == KUrl("about:closedTabs") - || _url == KUrl("about:history") - || _url == KUrl("about:bookmarks") - || _url == KUrl("about:favorites") - ) - { - NewTabPage p(frame); - p.generate(_url); - return true; - } + NewTabPage p(frame); + p.generate(_url); + return true; } return false; diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index 78928bca..b075c186 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -36,7 +36,8 @@ #include "application.h" #include "mainwindow.h" #include "mainview.h" -#include "previewchooser.h" +#include "websnap.h" +#include "previewselectorbar.h" // KDE Includes #include @@ -48,7 +49,6 @@ // Qt Includes #include -#include NewTabPage::NewTabPage(QWebFrame *frame) @@ -86,10 +86,8 @@ void NewTabPage::generate(KUrl url) if(url.directory() == QString("preview/modify")) { int index = url.fileName().toInt(); - QString url = m_root.findFirst("#preview" + QVariant(index).toString() + " > a").attribute("href"); - PreviewChooser *pc = new PreviewChooser(index, url); - connect(pc, SIGNAL(urlChoosed(int,KUrl)), SLOT(setPreview(int,KUrl))); - pc->show(); + Application::instance()->mainWindow()->findChild() + ->enable(index, qobject_cast< WebPage* >(m_root.webFrame()->page())); return; } } @@ -260,9 +258,6 @@ void NewTabPage::snapFinished() void NewTabPage::removePreview(int index) { - QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); - - QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); @@ -272,9 +267,9 @@ void NewTabPage::removePreview(int index) ReKonfig::setPreviewNames(names); ReKonfig::setPreviewUrls(urls); - // sync file data ReKonfig::self()->writeConfig(); + QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); prev.replace(emptyPreview(index)); } @@ -285,18 +280,33 @@ void NewTabPage::setPreview(int index, KUrl url) return; QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); + prev.replace(loadingPreview(index, url)); + +} + + +void NewTabPage::setPreview(int index, WebPage* page) +{ + KUrl url = page->mainFrame()->url(); + WebSnap::savePreview(WebSnap::renderPreview(*page), url); + + QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); + urls.replace(index, url.toMimeDataString()); + names.replace(index, page->mainFrame()->title()); + + ReKonfig::setPreviewNames(names); ReKonfig::setPreviewUrls(urls); + ReKonfig::self()->writeConfig(); - - prev.replace(loadingPreview(index, url)); - + setPreview(index, url); } + void NewTabPage::browsingMenu(const KUrl ¤tUrl) { QList navItems; diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index cdc3cb31..742d9209 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -55,10 +55,19 @@ public: */ void generate(KUrl url = KUrl("about:home")); -protected slots: +public slots: void snapFinished(); void removePreview(int index); + + /** + Used for recently closed tabs + */ void setPreview(int index, KUrl url); + + /** + Used for favorites + */ + void setPreview(int index, WebPage *page); protected: // these are the function to build the new tab page void browsingMenu(const KUrl ¤tUrl); diff --git a/src/rekonqpage/previewchooser.cpp b/src/rekonqpage/previewchooser.cpp deleted file mode 100644 index 79bdb068..00000000 --- a/src/rekonqpage/previewchooser.cpp +++ /dev/null @@ -1,157 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License or (at your option) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* ============================================================ */ - - -// Self Includes -#include "previewchooser.h" - -// Local Includes -#include "rekonq.h" -#include -#include -#include -#include - -// Qt Includes -#include -#include - -// KDE Includes -#include -#include - - -PreviewChooser::PreviewChooser(int previewIndex, QString url) - : KDialog(0) - , m_treeView(new QTreeView) - , m_model(new QStandardItemModel) - , m_previewIndex(previewIndex) -{ - setMinimumSize(350, 100); - setWindowTitle(i18n("Set Page to preview")); - setModal(true); - - setButtons(KDialog::Cancel | KDialog::Apply | KDialog::Ok); - //setDefaultButton(KDialog::Ok); - connect(this, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(buttonClicked(KDialog::ButtonCode))); - - m_treeView->setUniformRowHeights(true); - m_treeView->setSelectionBehavior(QAbstractItemView::SelectRows); - m_treeView->setTextElideMode(Qt::ElideRight); - m_treeView->setHeaderHidden(true); - m_treeView->setIndentation(0); - - QWidget *mainWidget = new QWidget(this); - - // add url bar - QHBoxLayout *urlLayout = new QHBoxLayout; - urlLayout->setContentsMargins(5, 0, 0, 0); - QLabel *searchLabel = new QLabel(i18n("adress:")); - urlLayout->addWidget(searchLabel); - m_line = new KLineEdit; - - // setup view - QVBoxLayout *vBoxLayout = new QVBoxLayout; - vBoxLayout->setContentsMargins(0, 0, 0, 0); - vBoxLayout->addLayout(urlLayout); - vBoxLayout->addWidget(m_treeView); - mainWidget->setLayout(vBoxLayout); - setMainWidget(mainWidget); - - refreshModel(); - connect(Application::instance()->mainWindow()->mainView(), SIGNAL(tabsChanged()), SLOT(refreshModel())); - - m_treeView->setModel(m_model); - - connect(m_treeView, SIGNAL(activated(QModelIndex)), SLOT(setUrl(QModelIndex))); - - connect(m_line, SIGNAL(textChanged(QString)), SLOT(urlChanged())); - urlLayout->addWidget(m_line); - - if(url.isEmpty() || url.startsWith("about:")) - m_line->setText(QString("http://")); - else - { - m_line->setText(url); - m_line->setSelection(8, m_line->text().size()); - } - - enableButtonApply(false); - setFocusProxy(mainWidget); - mainWidget->setFocusProxy(m_line); -} - - -PreviewChooser::~PreviewChooser() -{ - delete m_model; -} - - - -void PreviewChooser::refreshModel() -{ - m_model->clear(); - MainView *mv = Application::instance()->mainWindow()->mainView(); - for(int i=0; i < mv->count(); ++i) - { - WebView *view = qobject_cast(mv->webTab(i)->view()); - - if(view->url().scheme() != "about") - { - QStandardItem *it = new QStandardItem(Application::icon(view->url()), view->title()); - it->setData(QVariant(view->url()), Qt::ToolTipRole); - m_model->appendRow(it); - } - } -} - -void PreviewChooser::setUrl(QModelIndex i) -{ - if(!i.data().canConvert(QVariant::String)) - return; - - m_line->setText(i.data(Qt::ToolTipRole).toString()); -} - - -void PreviewChooser::buttonClicked(KDialog::ButtonCode code) -{ - if(code == KDialog::Apply || (code == KDialog::Ok && isButtonEnabled(KDialog::Apply))) - { - emit urlChoosed(m_previewIndex, KUrl(m_line->text())); - enableButtonApply(false); - } - - if(code == KDialog::Cancel || code == KDialog::Ok) - { - close(); - deleteLater(); - } -} - - -void PreviewChooser::urlChanged() -{ - enableButtonApply(true); -} - diff --git a/src/rekonqpage/previewchooser.h b/src/rekonqpage/previewchooser.h deleted file mode 100644 index 3eae71db..00000000 --- a/src/rekonqpage/previewchooser.h +++ /dev/null @@ -1,70 +0,0 @@ -/* ============================================================ -* -* This file is a part of the rekonq project -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License or (at your option) version 3 or any later version -* accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy -* defined in Section 14 of version 3 of the license. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* ============================================================ */ - - -#ifndef PREVIEWCHOOSER_H -#define PREVIEWCHOOSER_H - - -// Local Includes -#include "application.h" - -// KDE Includes -#include -#include - -// Qt Includes -#include -#include -#include - -// Forward Declarations -class KUrl; - - -class PreviewChooser : public KDialog -{ -Q_OBJECT - -public: - explicit PreviewChooser(int previewIndex, QString url); - virtual ~PreviewChooser(); - -signals: - void urlChoosed(int, const KUrl &); - -public slots: - void refreshModel(); - void setUrl(QModelIndex i); - void buttonClicked(KDialog::ButtonCode code); - void urlChanged(); - -private: - QTreeView *m_treeView; - QStandardItemModel *m_model; - - KLineEdit *m_line; - - int m_previewIndex; -}; - -#endif // PREVIEWCHOOSER_H diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp new file mode 100644 index 00000000..04e7f0ac --- /dev/null +++ b/src/rekonqpage/previewselectorbar.cpp @@ -0,0 +1,138 @@ +/* + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +*/ + + +// Auto Includes +#include "previewselectorbar.h" + +// KDE Includes +#include +#include + +// Qt Includes +#include +#include +#include + + +PreviewSelectorBar::PreviewSelectorBar(QWidget* parent) + : QWidget(parent) + , m_button(0) + , m_label(0) + , m_page(0) +{ + hide(); +} + + +void PreviewSelectorBar::setup() +{ + if(m_button != 0) + return; + + m_label = new QLabel(i18n("Please go to the page you want to preview"), this); + m_label->setWordWrap(true); + + QToolButton *closeButton = new QToolButton(this); + closeButton->setAutoRaise(true); + closeButton->setIcon(KIcon("dialog-close")); + connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide())); + + m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this); + connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked())); + + // layout + QHBoxLayout *layout = new QHBoxLayout(this); + layout->addWidget(closeButton); + layout->addStretch(); + layout->addWidget(m_label); + layout->addWidget(m_button); + + setLayout(layout); +} + + +void PreviewSelectorBar::setPage(WebPage* page) +{ + m_page = page; + verifyUrl(); +} + + +void PreviewSelectorBar::verifyUrl() +{ + if(m_page->mainFrame()->url().scheme() != "about") + { + m_button->setEnabled(true); + m_button->setToolTip(""); + } + else + { + m_button->setEnabled(false); + m_button->setToolTip(i18n("You can't set this page as preview")); + } +} + + +void PreviewSelectorBar::enable(int previewIndex, WebPage* page) +{ + if(m_page != 0) + disconnect(m_page, 0, this, 0); + + + setup(); + m_previewIndex = previewIndex; + m_page = page; + + verifyUrl(); + + show(); + + connect(page, SIGNAL(loadStarted()), SLOT(loadProgress())); + connect(page, SIGNAL(loadProgress(int)), SLOT(loadProgress())); + connect(page, SIGNAL(loadFinished(bool)), SLOT(loadFinished())); + connect(page->mainFrame(), SIGNAL(urlChanged(QUrl)), SLOT(verifyUrl())); +} + + +void PreviewSelectorBar::loadProgress() +{ + m_button->setEnabled(false); + m_button->setToolTip(i18n("Page is loading...")); +} + + + +void PreviewSelectorBar::loadFinished() +{ + m_button->setEnabled(true); + m_button->setToolTip(""); + + verifyUrl(); +} + + +void PreviewSelectorBar::clicked() +{ + m_page->newTabPage()->setPreview(m_previewIndex, m_page); + m_page->mainFrame()->load(KUrl("about:favorites")); + hide(); +} + + diff --git a/src/rekonqpage/previewselectorbar.h b/src/rekonqpage/previewselectorbar.h new file mode 100644 index 00000000..aa011fe4 --- /dev/null +++ b/src/rekonqpage/previewselectorbar.h @@ -0,0 +1,60 @@ +/* + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +*/ + +#ifndef PREVIEWSELECTORBAR_H +#define PREVIEWSELECTORBAR_H + +// Local Includes +#include "webpage.h" + +// Qt Includes +#include +#include +#include + +class PreviewSelectorBar : public QWidget +{ + Q_OBJECT + + public: + PreviewSelectorBar(QWidget *parent = 0); + + void setPage(WebPage *page); + + public slots: + void enable(int previewIndex, WebPage *page); + void clicked(); + + void loadProgress(); + void loadFinished(); + + void verifyUrl(); + + private: + void setup(); + + QPushButton *m_button; + QLabel *m_label; + + int m_previewIndex; + WebPage *m_page; + +}; + +#endif // PREVIEWSELECTORBAR_H diff --git a/src/webpage.cpp b/src/webpage.cpp index 59df13e7..340e9805 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -72,7 +72,7 @@ WebPage::WebPage(QObject *parent) : KWebPage(parent, KWalletIntegration) - , m_newTabPage(0) + , m_newTabPage(new NewTabPage(mainFrame() )) { setForwardUnsupportedContent(true); @@ -104,6 +104,12 @@ WebPage::~WebPage() } +NewTabPage* WebPage::newTabPage() +{ + return m_newTabPage; +} + + bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) { // advise users on resubmitting data @@ -115,14 +121,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r if(risp == KMessageBox::Cancel) return false; } - - if (request.url().scheme() == QLatin1String("about")) - { - if(m_newTabPage == 0) - m_newTabPage = new NewTabPage(frame); - m_newTabPage->generate(request.url()); - return false; - } if (frame && m_protHandler.preHandling( request, frame )) { diff --git a/src/webpage.h b/src/webpage.h index 5671b5d9..da91ea5c 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -55,6 +55,8 @@ class WebPage : public KWebPage public: explicit WebPage(QObject *parent = 0); ~WebPage(); + + NewTabPage *newTabPage(); public slots: void manageNetworkErrors(QNetworkReply *reply); diff --git a/src/websnap.cpp b/src/websnap.cpp index 0d72ef3a..ff4746ca 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -42,10 +42,6 @@ #include -#define WIDTH 200 -#define HEIGHT 150 - - WebSnap::WebSnap(const QUrl &url) : QObject() { @@ -115,6 +111,13 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) } +void WebSnap::savePreview(QPixmap pm, KUrl url) +{ + QFile::remove(fileForUrl(url).toLocalFile()); + pm.save(fileForUrl(url).toLocalFile()); +} + + KUrl WebSnap::fileForUrl(KUrl url) { QString filePath = diff --git a/src/websnap.h b/src/websnap.h index 04fded57..b8ada30f 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -37,6 +37,9 @@ #include #include +#define WIDTH 200 +#define HEIGHT 150 + /** * This class renders a site producing an image based @@ -53,12 +56,14 @@ public: QPixmap previewImage(); // TODO : remove - static QPixmap renderPreview(const QWebPage &page, int w, int h); + static QPixmap renderPreview(const QWebPage &page, int w = WIDTH, int h = HEIGHT); static KUrl fileForUrl(KUrl url); static QString guessNameFromUrl(QUrl url); + static void savePreview(QPixmap pm, KUrl url); + QString snapTitle(); QUrl snapUrl(); -- cgit v1.2.1 From 50d6ee1e340c35261b0445c1a2c793fb07da4854 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 17 Jan 2010 19:06:27 +0100 Subject: bugfixing... --- src/rekonqpage/newtabpage.cpp | 56 ++++------------------------------- src/rekonqpage/newtabpage.h | 14 ++------- src/rekonqpage/previewselectorbar.cpp | 22 +++++++++++++- src/websnap.cpp | 4 ++- 4 files changed, 31 insertions(+), 65 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index b075c186..f2609c19 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -26,6 +26,7 @@ // Self Includes #include "newtabpage.h" +#include "newtabpage.moc" // Auto Includes #include "rekonq.h" @@ -183,8 +184,9 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url) showControls(prev); WebSnap *snap = new WebSnap(url); + bool test = connect(snap, SIGNAL(finished()), this, SLOT(snapFinished())); + kDebug() << test; snap->SetData(QVariant(index)); - connect(snap, SIGNAL(finished()), SLOT(snapFinished())); return prev; } @@ -233,26 +235,11 @@ void NewTabPage::setupPreview(QWebElement e, int index) void NewTabPage::snapFinished() -{ +{ + kDebug() << "called"; WebSnap *snap = qobject_cast(sender()); QWebElement prev = m_root.findFirst("#preview" + snap->data().toString()); prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle())); - - if(m_url != KUrl("about:favorites")) - return; - - // Save the new config - QStringList names = ReKonfig::previewNames(); - QStringList urls = ReKonfig::previewUrls(); - - // stripTrailingSlash to be sure to get the same string for same address - urls.replace(snap->data().toInt(), snap->snapUrl().toString(QUrl::StripTrailingSlash)); - names.replace(snap->data().toInt() , snap->snapTitle()); - - ReKonfig::setPreviewNames(names); - ReKonfig::setPreviewUrls(urls); - - ReKonfig::self()->writeConfig(); } @@ -274,39 +261,6 @@ void NewTabPage::removePreview(int index) } -void NewTabPage::setPreview(int index, KUrl url) -{ - if(url.isEmpty()) - return; - - QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); - prev.replace(loadingPreview(index, url)); - -} - - -void NewTabPage::setPreview(int index, WebPage* page) -{ - KUrl url = page->mainFrame()->url(); - - WebSnap::savePreview(WebSnap::renderPreview(*page), url); - - QStringList names = ReKonfig::previewNames(); - QStringList urls = ReKonfig::previewUrls(); - - urls.replace(index, url.toMimeDataString()); - names.replace(index, page->mainFrame()->title()); - - ReKonfig::setPreviewNames(names); - ReKonfig::setPreviewUrls(urls); - - ReKonfig::self()->writeConfig(); - - setPreview(index, url); -} - - - void NewTabPage::browsingMenu(const KUrl ¤tUrl) { QList navItems; diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 742d9209..1057c7cc 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -32,8 +32,8 @@ #include // Qt Includes -#include -#include +#include +#include #include // Forward Includes @@ -58,16 +58,6 @@ public: public slots: void snapFinished(); void removePreview(int index); - - /** - Used for recently closed tabs - */ - void setPreview(int index, KUrl url); - - /** - Used for favorites - */ - void setPreview(int index, WebPage *page); protected: // these are the function to build the new tab page void browsingMenu(const KUrl ¤tUrl); diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp index 04e7f0ac..bbdce9d4 100644 --- a/src/rekonqpage/previewselectorbar.cpp +++ b/src/rekonqpage/previewselectorbar.cpp @@ -21,6 +21,10 @@ // Auto Includes #include "previewselectorbar.h" +// Local Include +#include "rekonq.h" +#include "websnap.h" + // KDE Includes #include #include @@ -130,8 +134,24 @@ void PreviewSelectorBar::loadFinished() void PreviewSelectorBar::clicked() { - m_page->newTabPage()->setPreview(m_previewIndex, m_page); + KUrl url = m_page->mainFrame()->url(); + + WebSnap::savePreview(WebSnap::renderPreview(*m_page), url); + + QStringList names = ReKonfig::previewNames(); + QStringList urls = ReKonfig::previewUrls(); + + urls.replace(m_previewIndex, url.toMimeDataString()); + names.replace(m_previewIndex, m_page->mainFrame()->title()); + + ReKonfig::setPreviewNames(names); + ReKonfig::setPreviewUrls(urls); + + ReKonfig::self()->writeConfig(); + + m_page->mainFrame()->load(KUrl("about:favorites")); + hide(); } diff --git a/src/websnap.cpp b/src/websnap.cpp index ff4746ca..fde7bd94 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -108,6 +108,8 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); return QPixmap::fromImage(pageImage); + + kDebug() << w << h; } @@ -172,8 +174,8 @@ void WebSnap::saveResult(bool ok) } QFile::remove(fileForUrl(m_url).toLocalFile()); m_image.save(fileForUrl(m_url).toLocalFile()); - kDebug() << "finished"; + kDebug() << "finished"; emit finished(); } -- cgit v1.2.1 From d7b37b950bb9ac396914d937df44891e02a64811 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Fri, 29 Jan 2010 19:55:08 +0100 Subject: bugfix : previews were sometimes saved using the good size --- src/rekonqpage/previewselectorbar.cpp | 2 +- src/websnap.cpp | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp index bbdce9d4..00950526 100644 --- a/src/rekonqpage/previewselectorbar.cpp +++ b/src/rekonqpage/previewselectorbar.cpp @@ -135,7 +135,7 @@ void PreviewSelectorBar::loadFinished() void PreviewSelectorBar::clicked() { KUrl url = m_page->mainFrame()->url(); - + WebSnap::savePreview(WebSnap::renderPreview(*m_page), url); QStringList names = ReKonfig::previewNames(); diff --git a/src/websnap.cpp b/src/websnap.cpp index fde7bd94..983da716 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -80,17 +80,10 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) // find the best size QSize size; - if (page.viewportSize().width() && page.viewportSize().height()) - { - size = page.viewportSize(); - } - else - { - int width = page.mainFrame()->contentsSize().width(); - if (width < 640) width = 640; - size = QSize(width,width*((0.0+h)/w)); - page.setViewportSize(size); - } + int width = page.mainFrame()->contentsSize().width(); + if (width < 640) width = 640; + size = QSize(width,width*((0.0+h)/w)); + page.setViewportSize(size); // create the page image QImage pageImage = QImage(size, QImage::Format_ARGB32_Premultiplied); @@ -108,13 +101,12 @@ QPixmap WebSnap::renderPreview(const QWebPage &page,int w, int h) page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded); return QPixmap::fromImage(pageImage); - - kDebug() << w << h; } void WebSnap::savePreview(QPixmap pm, KUrl url) { + kDebug() << "saving preview"; QFile::remove(fileForUrl(url).toLocalFile()); pm.save(fileForUrl(url).toLocalFile()); } -- cgit v1.2.1 From 40a13302af46792cb139d59d7f66e12b46644392 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 31 Jan 2010 11:28:31 +0100 Subject: Last bugs : layout fixes and empty urlbar when going back to homepage --- src/rekonqpage/previewselectorbar.cpp | 4 +++- src/urlbar/urlbar.cpp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp index 00950526..e7800f09 100644 --- a/src/rekonqpage/previewselectorbar.cpp +++ b/src/rekonqpage/previewselectorbar.cpp @@ -59,15 +59,17 @@ void PreviewSelectorBar::setup() connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide())); m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this); + m_button->setMaximumWidth(250); connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked())); // layout QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(closeButton); - layout->addStretch(); layout->addWidget(m_label); layout->addWidget(m_button); + layout->setContentsMargins(2, 0, 2, 0); + setLayout(layout); } diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index adeba6ae..4d9765a2 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -148,7 +148,6 @@ void UrlBar::setUrl(const QUrl& url) m_currentUrl = KUrl(url); updateUrl(); } - } -- cgit v1.2.1 From dd2b45b7592bdefd14665c13cec2b7db6728d800 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 31 Jan 2010 15:53:29 +0100 Subject: Add tooltips to buttons --- src/rekonqpage/newtabpage.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index f2609c19..8a1ca89f 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -224,8 +224,10 @@ void NewTabPage::setupPreview(QWebElement e, int index) { e.findFirst(".remove img").setAttribute("src", QString("file:///") + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); + e.findFirst(".remove").setAttribute("title", "Remove favorite"); e.findFirst(".modify img").setAttribute("src", QString("file:///") + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); + e.findFirst(".modify").setAttribute("title", "Set new favorite"); e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString())); e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString())); -- cgit v1.2.1 From b9b292845f2953396fc088c551b31f79eddd3caa Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sun, 31 Jan 2010 15:57:24 +0100 Subject: Changed strings following pano's recommandations --- src/rekonqpage/previewselectorbar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/rekonqpage/previewselectorbar.cpp b/src/rekonqpage/previewselectorbar.cpp index e7800f09..5f3956d7 100644 --- a/src/rekonqpage/previewselectorbar.cpp +++ b/src/rekonqpage/previewselectorbar.cpp @@ -50,7 +50,7 @@ void PreviewSelectorBar::setup() if(m_button != 0) return; - m_label = new QLabel(i18n("Please go to the page you want to preview"), this); + m_label = new QLabel(i18n("Please open up the webpage you want to add as favorite"), this); m_label->setWordWrap(true); QToolButton *closeButton = new QToolButton(this); @@ -58,7 +58,7 @@ void PreviewSelectorBar::setup() closeButton->setIcon(KIcon("dialog-close")); connect(closeButton, SIGNAL(clicked(bool)), SLOT(hide())); - m_button = new QPushButton(KIcon("insert-image"), i18n("Set to this page"), this); + m_button = new QPushButton(KIcon("insert-image"), i18n("Set to This Page"), this); m_button->setMaximumWidth(250); connect(m_button, SIGNAL(clicked(bool)), SLOT(clicked())); @@ -91,7 +91,7 @@ void PreviewSelectorBar::verifyUrl() else { m_button->setEnabled(false); - m_button->setToolTip(i18n("You can't set this page as preview")); + m_button->setToolTip(i18n("You can not add this webpage as favorite")); } } -- cgit v1.2.1 From 1c1f1edd697aca0bf96d8d61c40e45166b5f1d02 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Wed, 3 Feb 2010 14:51:38 +0100 Subject: Remove m_newtabPage. That was not used anywhere ! --- src/webpage.cpp | 7 ------- src/webpage.h | 3 --- 2 files changed, 10 deletions(-) (limited to 'src') diff --git a/src/webpage.cpp b/src/webpage.cpp index 340e9805..f2ea412d 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -72,7 +72,6 @@ WebPage::WebPage(QObject *parent) : KWebPage(parent, KWalletIntegration) - , m_newTabPage(new NewTabPage(mainFrame() )) { setForwardUnsupportedContent(true); @@ -104,12 +103,6 @@ WebPage::~WebPage() } -NewTabPage* WebPage::newTabPage() -{ - return m_newTabPage; -} - - bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) { // advise users on resubmitting data diff --git a/src/webpage.h b/src/webpage.h index da91ea5c..c8ecc89a 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -55,8 +55,6 @@ class WebPage : public KWebPage public: explicit WebPage(QObject *parent = 0); ~WebPage(); - - NewTabPage *newTabPage(); public slots: void manageNetworkErrors(QNetworkReply *reply); @@ -80,7 +78,6 @@ private: QUrl m_requestedUrl; ProtocolHandler m_protHandler; - NewTabPage *m_newTabPage; }; #endif -- cgit v1.2.1 From 697d05328acd76de7a73145056ef22c8083f3ca4 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Thu, 4 Feb 2010 17:29:13 +0100 Subject: Do not try to load homepage if url is not valid --- src/rekonqpage/newtabpage.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index 8a1ca89f..49f4e837 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -93,6 +93,14 @@ void NewTabPage::generate(KUrl url) } } + if( url != KUrl("about:home") + && url != KUrl("about:favorites") + && url != KUrl("about:closedTabs") + && url != KUrl("about:history") + && url != KUrl("about:bookmarks") + ) + return; + QWebPage *page = m_root.webFrame()->page(); page->mainFrame()->setHtml(m_html); -- cgit v1.2.1 From 6f3b61c0462b08d3c2a34ac1923470a3690233ee Mon Sep 17 00:00:00 2001 From: matgic78 Date: Sat, 6 Feb 2010 11:19:18 +0100 Subject: Fix loading previews : when load finished, result wasn't shown --- src/data/home.html | 4 ++-- src/rekonqpage/newtabpage.cpp | 47 +++++++++++++++++++++++++++++++------------ src/rekonqpage/newtabpage.h | 2 +- src/websnap.cpp | 27 +++++++++++-------------- src/websnap.h | 11 +++------- 5 files changed, 52 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/data/home.html b/src/data/home.html index 103c559d..51b9ceec 100644 --- a/src/data/home.html +++ b/src/data/home.html @@ -66,7 +66,7 @@ color: black; /* ------------------------------------------------------- */ /* page sections */ -#container { +#rekonq-newtabpage { width: 100%; } @@ -191,7 +191,7 @@ margin-bottom: 0.5em; -
+
diff --git a/src/rekonqpage/newtabpage.cpp b/src/rekonqpage/newtabpage.cpp index 49f4e837..19f1686f 100644 --- a/src/rekonqpage/newtabpage.cpp +++ b/src/rekonqpage/newtabpage.cpp @@ -76,7 +76,7 @@ NewTabPage::~NewTabPage() void NewTabPage::generate(KUrl url) -{ +{ if(KUrl("about:preview").isParentOf(url)) { if(url.directory() == QString("preview/remove")) @@ -140,10 +140,10 @@ void NewTabPage::generate(KUrl url) void NewTabPage::favoritesPage() { + m_root.addClass("favorites"); + QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); - - m_root.addClass("favorites"); for(int i=0; i<8; ++i) { @@ -187,14 +187,12 @@ QWebElement NewTabPage::loadingPreview(int index, KUrl url) prev.findFirst(".preview img").setAttribute("src" , QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); prev.findFirst("span").appendInside(i18n("Loading Preview...")); + prev.findFirst("a").setAttribute("href", url.toMimeDataString()); setupPreview(prev, index); showControls(prev); - WebSnap *snap = new WebSnap(url); - bool test = connect(snap, SIGNAL(finished()), this, SLOT(snapFinished())); - kDebug() << test; - snap->SetData(QVariant(index)); + new WebSnap(url, m_root.webFrame()->page(), index); return prev; } @@ -244,12 +242,29 @@ void NewTabPage::setupPreview(QWebElement e, int index) } -void NewTabPage::snapFinished() -{ - kDebug() << "called"; - WebSnap *snap = qobject_cast(sender()); - QWebElement prev = m_root.findFirst("#preview" + snap->data().toString()); - prev.replace(validPreview(snap->data().toInt(), snap->snapUrl(), snap->snapTitle())); +void NewTabPage::snapFinished(int index, KUrl url, QString title) +{ + // do not try to modify the page if it isn't the newTabPage + if(m_root.document().findAll("#rekonq-newtabpage").count() == 0) + return; + + QWebElement prev = m_root.findFirst("#preview" + QVariant(index).toString()); + QWebElement newPrev = validPreview(index, url, title); + + if(m_root.findAll(".closedTabs").count() != 0) + hideControls(newPrev); + + prev.replace(newPrev); + + // update title + if(m_root.findAll(".favorites").count() != 0) + { + QStringList names = ReKonfig::previewNames(); + names.replace(index, title); + ReKonfig::setPreviewNames(names); + + ReKonfig::self()->writeConfig(); + } } @@ -319,6 +334,8 @@ void NewTabPage::browsingMenu(const KUrl ¤tUrl) void NewTabPage::historyPage() { + m_root.addClass("history"); + HistoryTreeModel *model = Application::historyManager()->historyTreeModel(); int i = 0; @@ -349,6 +366,8 @@ void NewTabPage::historyPage() void NewTabPage::bookmarksPage() { + m_root.addClass("bookmarks"); + KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup(); if (bookGroup.isNull()) { @@ -395,6 +414,8 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent) void NewTabPage::closedTabsPage() { + m_root.addClass("closedTabs"); + QList links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs(); for(int i=0; i < links.count(); ++i) diff --git a/src/rekonqpage/newtabpage.h b/src/rekonqpage/newtabpage.h index 1057c7cc..9d41946e 100644 --- a/src/rekonqpage/newtabpage.h +++ b/src/rekonqpage/newtabpage.h @@ -56,7 +56,7 @@ public: void generate(KUrl url = KUrl("about:home")); public slots: - void snapFinished(); + void snapFinished(int index, KUrl url, QString title); void removePreview(int index); protected: // these are the function to build the new tab page diff --git a/src/websnap.cpp b/src/websnap.cpp index 983da716..11b70e9e 100644 --- a/src/websnap.cpp +++ b/src/websnap.cpp @@ -29,6 +29,9 @@ #include "websnap.h" #include "websnap.moc" +// Local Includes +#include "newtabpage.h" + // KDE Includes #include #include @@ -42,10 +45,12 @@ #include -WebSnap::WebSnap(const QUrl &url) +WebSnap::WebSnap(const QUrl& url, QWebPage* originatingPage, int previewIndex) : QObject() { m_url = url; + m_originatingPage = originatingPage; + m_previewIndex = previewIndex; // this to not register websnap history m_page.settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, true); @@ -120,18 +125,6 @@ KUrl WebSnap::fileForUrl(KUrl url) } -void WebSnap::SetData(QVariant data) -{ - m_data = data; -} - -QVariant& WebSnap::data() -{ - return m_data; -} - - - QString WebSnap::guessNameFromUrl(QUrl url) { QString name = url.toString( QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::StripTrailingSlash ); @@ -163,12 +156,16 @@ void WebSnap::saveResult(bool ok) else { m_image = renderPreview(m_page, WIDTH, HEIGHT); + m_snapTitle = m_page.mainFrame()->title(); } QFile::remove(fileForUrl(m_url).toLocalFile()); m_image.save(fileForUrl(m_url).toLocalFile()); - kDebug() << "finished"; - emit finished(); + //m_originatingPage->mainFrame()->load(KUrl("about:preview/replace/" + QVariant(m_previewIndex).toString())); + NewTabPage p(m_originatingPage->mainFrame()); + p.snapFinished(m_previewIndex, m_url, m_snapTitle); + + deleteLater(); } diff --git a/src/websnap.h b/src/websnap.h index b8ada30f..e15c2dcf 100644 --- a/src/websnap.h +++ b/src/websnap.h @@ -51,7 +51,7 @@ class WebSnap : public QObject Q_OBJECT public: - WebSnap(const QUrl &url); + WebSnap(const QUrl &url, QWebPage *originatingPage, int previewIndex); ~WebSnap(); QPixmap previewImage(); // TODO : remove @@ -66,12 +66,6 @@ public: QString snapTitle(); QUrl snapUrl(); - - void SetData(QVariant data); - QVariant& data(); - -signals: - void finished(); private slots: void load(); @@ -84,7 +78,8 @@ private: QUrl m_url; QString m_snapTitle; - QVariant m_data; + QWebPage *m_originatingPage; + int m_previewIndex; }; #endif // WEB_SNAP_H -- cgit v1.2.1