summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bookmarks/bookmarkowner.cpp3
-rw-r--r--src/bookmarks/bookmarkprovider.cpp2
-rw-r--r--src/bookmarks/bookmarkstoolbar.cpp2
-rw-r--r--src/iconmanager.cpp111
-rw-r--r--src/iconmanager.h11
-rw-r--r--src/mainview.cpp5
-rw-r--r--src/notificationbar.cpp4
-rw-r--r--src/tests/findbar_test.cpp1
-rw-r--r--src/tests/mainview_test.cpp4
-rw-r--r--src/tests/networkaccessmanager_test.cpp4
-rw-r--r--src/tests/protocolhandler_test.cpp6
-rw-r--r--src/tests/tabbar_test.cpp4
-rw-r--r--src/tests/urlbar_test.cpp4
-rw-r--r--src/tests/walletbar_test.cpp4
-rw-r--r--src/tests/webpage_test.cpp5
-rw-r--r--src/tests/websnap_test.cpp5
-rw-r--r--src/tests/webtab_test.cpp5
-rw-r--r--src/tests/webview_test.cpp5
-rw-r--r--src/webpage.cpp8
-rw-r--r--src/webpage.h1
-rw-r--r--src/webview.cpp2
21 files changed, 104 insertions, 92 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index 8a05d646..e1b9a567 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -195,8 +195,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark)
else
parent = selected.parentGroup();
- newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()),
- Application::iconManager()->iconForUrl(currentUrl()).name());
+ newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()) );
parent.moveBookmark(newBk, selected);
}
else
diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp
index 7cd48825..3e2d2814 100644
--- a/src/bookmarks/bookmarkprovider.cpp
+++ b/src/bookmarks/bookmarkprovider.cpp
@@ -237,7 +237,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar)
{
KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this);
action->setIconText(action->iconText().replace('&', "&&"));
- action->setIcon(Application::iconManager()->iconForUrl(bookmark.url()));
+ action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) ));
connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered()));
toolBar->toolBar()->addAction(action);
toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar);
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 77bff7e6..4eff2e52 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -91,7 +91,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark)
else
{
KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this);
- action->setIcon(Application::iconManager()->iconForUrl(bookmark.url()));
+ action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) ));
connect(action, SIGNAL(hovered()), this, SLOT(actionHovered()));
return action;
}
diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index f8d1a6a4..c4b9751d 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -51,6 +51,7 @@
IconManager::IconManager(QObject *parent)
: QObject(parent)
{
+ _faviconsDir = KStandardDirs::locateLocal("cache" , "favicons/" , true);
}
@@ -84,19 +85,20 @@ KIcon IconManager::iconForUrl(const KUrl &url)
if (encodedUrl == QByteArray("about:downloads"))
return KIcon("download");
+ // TODO: return other mimetype icons
+ if(url.isLocalFile())
+ {
+ return KIcon("folder");
+ }
+
QString i = KMimeType::favIconForUrl(url);
- QString faviconDir = KStandardDirs::locateLocal("cache" , "" , true);
if(!i.isEmpty())
{
+ QString faviconDir = KStandardDirs::locateLocal("cache" , "" , true);
return KIcon(faviconDir + i);
}
+
kDebug() << "Icon NOT Found. returning text-html one";
-
- // TODO: return other mimetype icons
- if(url.isLocalFile())
- {
- return KIcon("folder");
- }
return KIcon("text-html");
}
@@ -121,13 +123,6 @@ void IconManager::provideIcon(QWebPage *page, const KUrl &url, bool notify)
return;
}
- QUrl u(url.url());
- QString rootUrlString = u.toString( QUrl::RemovePassword
- | QUrl::RemoveUserInfo
- | QUrl::RemovePath
- | QUrl::RemoveQuery
- | QUrl::StripTrailingSlash);
-
// check if icon exists
if(!KMimeType::favIconForUrl(url).isEmpty())
{
@@ -137,8 +132,11 @@ void IconManager::provideIcon(QWebPage *page, const KUrl &url, bool notify)
return;
}
- // find ico url
- KUrl iconUrl(rootUrlString + QL1S("/favicon.ico"));
+ // the simplest way..
+ const QString rootUrlString = url.scheme() + QL1S("://") + url.host();
+
+ // find favicon url
+ KUrl faviconUrl( rootUrlString + QL1S("/favicon.ico") );
QWebElement root = page->mainFrame()->documentElement();
QWebElement e = root.findFirst(QL1S("link[rel~=\"icon\"]"));
@@ -146,28 +144,28 @@ void IconManager::provideIcon(QWebPage *page, const KUrl &url, bool notify)
if(relUrlString.isEmpty())
{
e = root.findFirst(QL1S("link[rel~=\"shortcut icon\"]"));
- relUrlString = e.attribute(QL1S("href"));
+ relUrlString = e.attribute(QL1S("href"));
}
if(!relUrlString.isEmpty())
{
- iconUrl = relUrlString.startsWith("http")
- ? KUrl(relUrlString)
- : KUrl(rootUrlString + relUrlString) ;
+ faviconUrl = relUrlString.startsWith("http")
+ ? KUrl(relUrlString)
+ : KUrl(rootUrlString + QL1C('/') + relUrlString) ;
}
- kDebug() << "ICON URL: " << iconUrl;
+ kDebug() << "ICON URL: " << faviconUrl;
- QString faviconDir = KStandardDirs::locateLocal("cache" , "favicons/" , true);
-
- int r = rootUrlString.indexOf(':');
- KUrl destUrl(faviconDir + rootUrlString.mid(r+3) + ".png");
+ // dest url
+ KUrl destUrl(_faviconsDir + url.host() + QL1S(".png") );
kDebug() << "DEST URL: " << destUrl;
// download icon
- KIO::FileCopyJob *job = KIO::file_copy(iconUrl, destUrl, -1, KIO::HideProgressInfo);
+ KIO::FileCopyJob *job = KIO::file_copy(faviconUrl, destUrl, -1, KIO::HideProgressInfo);
if(notify)
- connect(job, SIGNAL(result(KJob*)), this, SIGNAL(iconChanged()));
+ connect(job, SIGNAL(result(KJob*)), this, SLOT(notifyLastStuffs(KJob *)));
+ else
+ connect(job, SIGNAL(result(KJob*)), this, SLOT(doLastStuffs(KJob *)));
}
@@ -179,11 +177,66 @@ void IconManager::downloadIconFromUrl(const KUrl &url)
void IconManager::clearIconCache()
{
- QString faviconDir = KStandardDirs::locateLocal("cache" , "favicons/" , true);
- QDir d(faviconDir);
+ QDir d(_faviconsDir);
QStringList favicons = d.entryList();
Q_FOREACH(const QString &fav, favicons)
{
d.remove(fav);
}
}
+
+
+void IconManager::doLastStuffs(KJob *j)
+{
+ if(j->error())
+ {
+ kDebug() << "FAVICON JOB ERROR";
+ return;
+ }
+
+ KIO::FileCopyJob *job = static_cast<KIO::FileCopyJob *>(j);
+ KUrl dest = job->destUrl();
+
+ QString s = dest.url().remove( QL1S("file://") );
+ QFile fav(s);
+ if(!fav.exists())
+ {
+ kDebug() << "FAVICON DOES NOT EXISTS";
+ fav.remove();
+ return;
+ }
+
+ if(fav.size() == 0)
+ {
+ kDebug() << "SIZE ZERO FAVICON";
+ fav.remove();
+ return;
+ }
+
+ QPixmap px;
+ if(!px.load(s))
+ {
+ kDebug() << "PIXMAP NOT LOADED";
+ return;
+ }
+
+ if(px.isNull())
+ {
+ kDebug() << "PIXMAP IS NULL";
+ fav.remove();
+ return;
+ }
+
+ px = px.scaled(16,16);
+ if(!px.save(s))
+ {
+ kDebug() << "PIXMAP NOT SAVED";
+ return;
+ }
+}
+
+void IconManager::notifyLastStuffs(KJob *j)
+{
+ doLastStuffs(j);
+ emit iconChanged();
+}
diff --git a/src/iconmanager.h b/src/iconmanager.h
index 9e451431..724d631a 100644
--- a/src/iconmanager.h
+++ b/src/iconmanager.h
@@ -54,9 +54,18 @@ public:
void downloadIconFromUrl(const KUrl &url);
void clearIconCache();
-
+
+private Q_SLOTS:
+ void doLastStuffs(KJob *);
+ void notifyLastStuffs(KJob *);
+
Q_SIGNALS:
void iconChanged();
+
+private:
+ bool existsIconForUrl(const KUrl &url);
+
+ QString _faviconsDir;
};
diff --git a/src/mainview.cpp b/src/mainview.cpp
index c9f46e5a..f020fb53 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -321,6 +321,7 @@ WebTab *MainView::newWebTab(bool focused)
connect(tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webViewLoadFinished(bool)));
connect(tab->view(), SIGNAL(titleChanged(const QString &)), this, SLOT(webViewTitleChanged(const QString &)));
connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &)));
+ connect(tab->view(), SIGNAL(iconChanged()), this, SLOT(webViewIconChanged()));
// connecting webPage signals with mainview
connect(tab->view()->page(), SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
@@ -631,6 +632,7 @@ void MainView::previousTab()
setCurrentIndex(next);
}
+
void MainView::openClosedTabs()
{
foreach (const HistoryItem &item, recentlyClosedTabs())
@@ -640,6 +642,7 @@ void MainView::openClosedTabs()
m_recentlyClosedTabs.clear();
}
+
void MainView::openClosedTab()
{
KAction *action = qobject_cast<KAction *>(sender());
@@ -654,6 +657,7 @@ void MainView::openClosedTab()
}
}
+
void MainView::switchToTab()
{
// uses the sender to determine the tab index
@@ -665,6 +669,7 @@ void MainView::switchToTab()
setCurrentIndex( index );
}
+
QLabel *MainView::animatedLoading(int index, bool addMovie)
{
if (index == -1)
diff --git a/src/notificationbar.cpp b/src/notificationbar.cpp
index 4325d73b..1ff29e92 100644
--- a/src/notificationbar.cpp
+++ b/src/notificationbar.cpp
@@ -22,14 +22,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ============================================================ */
+#include "notificationbar.h"
+
#include <QApplication>
#include <QColor>
#include <QGraphicsEffect>
#include <QPainter>
#include <QPropertyAnimation>
-#include "notificationbar.h"
-
class BlinkEffect : public QGraphicsEffect
{
diff --git a/src/tests/findbar_test.cpp b/src/tests/findbar_test.cpp
index c9555441..2e597a32 100644
--- a/src/tests/findbar_test.cpp
+++ b/src/tests/findbar_test.cpp
@@ -21,7 +21,6 @@
#include <qtest_kde.h>
-#include <QtGui>
#include <QtTest/QtTest>
#include "findbar.h"
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index d32eb58f..a747294c 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -27,10 +27,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-
#include "mainwindow.h"
#include "mainview.h"
#include "webview.h"
diff --git a/src/tests/networkaccessmanager_test.cpp b/src/tests/networkaccessmanager_test.cpp
index 28b05075..de7f69e9 100644
--- a/src/tests/networkaccessmanager_test.cpp
+++ b/src/tests/networkaccessmanager_test.cpp
@@ -21,10 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-
#include "networkaccessmanager.h"
diff --git a/src/tests/protocolhandler_test.cpp b/src/tests/protocolhandler_test.cpp
index dbf33684..cadff337 100644
--- a/src/tests/protocolhandler_test.cpp
+++ b/src/tests/protocolhandler_test.cpp
@@ -21,12 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-#include <QtNetwork>
-#include <QtWebKit>
-
#include "protocolhandler.h"
diff --git a/src/tests/tabbar_test.cpp b/src/tests/tabbar_test.cpp
index 6df38657..300c869f 100644
--- a/src/tests/tabbar_test.cpp
+++ b/src/tests/tabbar_test.cpp
@@ -20,10 +20,6 @@
#include <qtest_kde.h>
-#include <QtTest>
-#include <QtCore>
-#include <QtGui>
-
#include "mainwindow.h"
#include "mainview.h"
#include "tabbar.h"
diff --git a/src/tests/urlbar_test.cpp b/src/tests/urlbar_test.cpp
index fc7c1718..3775a875 100644
--- a/src/tests/urlbar_test.cpp
+++ b/src/tests/urlbar_test.cpp
@@ -21,10 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-
#include "webpage.h"
#include "webview.h"
#include "webtab.h"
diff --git a/src/tests/walletbar_test.cpp b/src/tests/walletbar_test.cpp
index d4036981..84ddcbcd 100644
--- a/src/tests/walletbar_test.cpp
+++ b/src/tests/walletbar_test.cpp
@@ -21,10 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-
#include "walletbar.h"
diff --git a/src/tests/webpage_test.cpp b/src/tests/webpage_test.cpp
index c06ce7a5..4856a039 100644
--- a/src/tests/webpage_test.cpp
+++ b/src/tests/webpage_test.cpp
@@ -21,11 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-#include <QtWebKit>
-
#include "webpage.h"
#include "webview.h"
#include "webtab.h"
diff --git a/src/tests/websnap_test.cpp b/src/tests/websnap_test.cpp
index 1bfb440d..80954887 100644
--- a/src/tests/websnap_test.cpp
+++ b/src/tests/websnap_test.cpp
@@ -21,11 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-#include <QtWebKit>
-
#include "websnap.h"
diff --git a/src/tests/webtab_test.cpp b/src/tests/webtab_test.cpp
index 0e5833b4..1d00f402 100644
--- a/src/tests/webtab_test.cpp
+++ b/src/tests/webtab_test.cpp
@@ -21,11 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-#include <QtWebKit>
-
#include "webpage.h"
#include "webview.h"
#include "webtab.h"
diff --git a/src/tests/webview_test.cpp b/src/tests/webview_test.cpp
index 7eb968c7..1794cc39 100644
--- a/src/tests/webview_test.cpp
+++ b/src/tests/webview_test.cpp
@@ -21,11 +21,6 @@
#include <qtest_kde.h>
-#include <QtCore>
-#include <QtGui>
-#include <QtTest>
-#include <QtWebKit>
-
#include "webview.h"
#include "webtab.h"
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 4c720767..07f961c5 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -208,7 +208,6 @@ WebPage::WebPage(QWidget *parent)
// ----- last stuffs
connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
- connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
// protocol handler signals
connect(&_protHandler, SIGNAL(downloadUrl(const KUrl &)), this, SLOT(downloadUrl(const KUrl &)));
@@ -472,15 +471,10 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
}
-void WebPage::loadStarted()
-{
- Application::iconManager()->provideIcon(this, _loadingUrl);
-}
-
-
void WebPage::loadFinished(bool ok)
{
Q_UNUSED(ok);
+ Application::iconManager()->provideIcon(this, _loadingUrl);
Application::adblockManager()->applyHidingRules(this);
diff --git a/src/webpage.h b/src/webpage.h
index ed5e2dde..5b79275a 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -75,7 +75,6 @@ private slots:
void handleUnsupportedContent(QNetworkReply *reply);
void manageNetworkErrors(QNetworkReply *reply);
void loadFinished(bool);
- void loadStarted();
void showSSLInfo(QPoint);
void updateImage(bool ok);
diff --git a/src/webview.cpp b/src/webview.cpp
index dfa08f96..8be744ad 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -427,7 +427,7 @@ void WebView::search()
KService::Ptr engine = KService::serviceByDesktopPath(a->data().toString());
KUrl urlSearch = KUrl(SearchEngine::buildQuery(engine, selectedText()));
- emit loadUrl(urlSearch, Rekonq::NewFocusedTab);
+ emit loadUrl(urlSearch, Rekonq::NewTab);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 10:09:54 +0000