diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop
index 7703c1c9a..40db9a66a 100644
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@@ -21,7 +21,7 @@ Name[uk]=Falkon
Name[x-test]=xxFalkonxx
Name[zh_CN]=Falkon
Type=Application
-Icon=qupzilla
+Icon=falkon
Categories=Network;WebBrowser;
Comment=A fast and secure web browser
Comment[ar]=متصفّح وبّ سريع وآمن
diff --git a/linux/build-appimage.sh b/linux/build-appimage.sh
index 32fa2e775..308dcdf0f 100755
--- a/linux/build-appimage.sh
+++ b/linux/build-appimage.sh
@@ -281,8 +281,8 @@ for LNKS in {libssl.so,libssl.so.10,libssl.so.1.0.0} ; do
done
cp ../linux/applications/org.kde.falkon.desktop bundle_build_dir
-cp ../linux/pixmaps/qupzilla.png bundle_build_dir
-ln -s qupzilla.png bundle_build_dir/.DirIcon
+cp ../linux/pixmaps/falkon.png bundle_build_dir
+ln -s falkon.png bundle_build_dir/.DirIcon
pushd bundle_build_dir
mv bin/falkon ./ && rm -fr bin
diff --git a/linux/hicolor/128-apps-falkon.png b/linux/hicolor/128-apps-falkon.png
new file mode 100644
index 000000000..289f78ca0
Binary files /dev/null and b/linux/hicolor/128-apps-falkon.png differ
diff --git a/linux/hicolor/128-apps-qupzilla.png b/linux/hicolor/128-apps-qupzilla.png
deleted file mode 100644
index ba314bd26..000000000
Binary files a/linux/hicolor/128-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/16-apps-falkon.png b/linux/hicolor/16-apps-falkon.png
new file mode 100644
index 000000000..56e772fca
Binary files /dev/null and b/linux/hicolor/16-apps-falkon.png differ
diff --git a/linux/hicolor/16-apps-qupzilla.png b/linux/hicolor/16-apps-qupzilla.png
deleted file mode 100644
index b1eabd717..000000000
Binary files a/linux/hicolor/16-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/256-apps-falkon.png b/linux/hicolor/256-apps-falkon.png
new file mode 100644
index 000000000..d813f28a7
Binary files /dev/null and b/linux/hicolor/256-apps-falkon.png differ
diff --git a/linux/hicolor/256-apps-qupzilla.png b/linux/hicolor/256-apps-qupzilla.png
deleted file mode 100644
index 972e12e16..000000000
Binary files a/linux/hicolor/256-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/32-apps-falkon.png b/linux/hicolor/32-apps-falkon.png
new file mode 100644
index 000000000..0b20e3c1e
Binary files /dev/null and b/linux/hicolor/32-apps-falkon.png differ
diff --git a/linux/hicolor/32-apps-qupzilla.png b/linux/hicolor/32-apps-qupzilla.png
deleted file mode 100644
index 19ee069d5..000000000
Binary files a/linux/hicolor/32-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/48-apps-falkon.png b/linux/hicolor/48-apps-falkon.png
new file mode 100644
index 000000000..4baab2dad
Binary files /dev/null and b/linux/hicolor/48-apps-falkon.png differ
diff --git a/linux/hicolor/48-apps-qupzilla.png b/linux/hicolor/48-apps-qupzilla.png
deleted file mode 100644
index b4112bd8e..000000000
Binary files a/linux/hicolor/48-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/64-apps-falkon.png b/linux/hicolor/64-apps-falkon.png
new file mode 100644
index 000000000..8fb0438f9
Binary files /dev/null and b/linux/hicolor/64-apps-falkon.png differ
diff --git a/linux/hicolor/64-apps-qupzilla.png b/linux/hicolor/64-apps-qupzilla.png
deleted file mode 100644
index eb6e667b1..000000000
Binary files a/linux/hicolor/64-apps-qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/sc-apps-falkon.svg b/linux/hicolor/sc-apps-falkon.svg
new file mode 100644
index 000000000..dade22c96
--- /dev/null
+++ b/linux/hicolor/sc-apps-falkon.svg
@@ -0,0 +1,50 @@
+
+
\ No newline at end of file
diff --git a/linux/pixmaps/falkon.png b/linux/pixmaps/falkon.png
new file mode 100644
index 000000000..289f78ca0
Binary files /dev/null and b/linux/pixmaps/falkon.png differ
diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png
deleted file mode 100644
index b4112bd8e..000000000
Binary files a/linux/pixmaps/qupzilla.png and /dev/null differ
diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index 7a1229406..f3c7befb1 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -112,7 +112,7 @@ MainApplication::MainApplication(int &argc, char** argv)
setApplicationName(QLatin1String("falkon"));
setOrganizationDomain(QLatin1String("org.kde"));
- setWindowIcon(QIcon::fromTheme(QSL("qupzilla"), QIcon(QSL(":icons/exeicons/qupzilla-window.png"))));
+ setWindowIcon(QIcon::fromTheme(QSL("falkon"), QIcon(QSL(":icons/falkon.svg"))));
setDesktopFileName(QSL("org.kde.falkon"));
#ifdef GIT_REVISION
@@ -1240,8 +1240,8 @@ void MainApplication::createJumpList()
void MainApplication::initPulseSupport()
{
qputenv("PULSE_PROP_OVERRIDE_application.name", "Falkon");
- qputenv("PULSE_PROP_OVERRIDE_application.icon_name", "qupzilla");
- qputenv("PULSE_PROP_OVERRIDE_media.icon_name", "qupzilla");
+ qputenv("PULSE_PROP_OVERRIDE_application.icon_name", "falkon");
+ qputenv("PULSE_PROP_OVERRIDE_media.icon_name", "falkon");
}
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc
index a8cfb60e4..3b45571ac 100644
--- a/src/lib/data/icons.qrc
+++ b/src/lib/data/icons.qrc
@@ -1,7 +1,8 @@
- icons/qupzilla.png
- qupzilla.png
+ icons/falkon.svg
+ icons/falkon-black.svg
+ icons/falkon-white.svg
icons/menu/history.svg
icons/menu/history_entry.svg
icons/menu/tab-new.svg
@@ -31,7 +32,6 @@
icons/browsers/ie.png
icons/browsers/ie@2x.png
icons/browsers/html.svg
- icons/exeicons/qupzilla-window.png
icons/sites/duck.png
icons/sites/google.png
icons/sites/translate.png
diff --git a/src/lib/data/icons/exeicons/falkon.icns b/src/lib/data/icons/exeicons/falkon.icns
new file mode 100644
index 000000000..f8d0a0bf0
Binary files /dev/null and b/src/lib/data/icons/exeicons/falkon.icns differ
diff --git a/src/lib/data/icons/exeicons/falkon.ico b/src/lib/data/icons/exeicons/falkon.ico
new file mode 100644
index 000000000..9a23bedbf
Binary files /dev/null and b/src/lib/data/icons/exeicons/falkon.ico differ
diff --git a/src/lib/data/icons/exeicons/page_os2.ico b/src/lib/data/icons/exeicons/page_os2.ico
deleted file mode 100644
index e722bd26b..000000000
Binary files a/src/lib/data/icons/exeicons/page_os2.ico and /dev/null differ
diff --git a/src/lib/data/icons/exeicons/qupzilla-window.png b/src/lib/data/icons/exeicons/qupzilla-window.png
deleted file mode 100644
index 972e12e16..000000000
Binary files a/src/lib/data/icons/exeicons/qupzilla-window.png and /dev/null differ
diff --git a/src/lib/data/icons/exeicons/qupzilla.icns b/src/lib/data/icons/exeicons/qupzilla.icns
deleted file mode 100644
index 38d2fbb3f..000000000
Binary files a/src/lib/data/icons/exeicons/qupzilla.icns and /dev/null differ
diff --git a/src/lib/data/icons/exeicons/qupzilla.ico b/src/lib/data/icons/exeicons/qupzilla.ico
deleted file mode 100644
index a39038915..000000000
Binary files a/src/lib/data/icons/exeicons/qupzilla.ico and /dev/null differ
diff --git a/src/lib/data/icons/exeicons/qupzilla_os2.ico b/src/lib/data/icons/exeicons/qupzilla_os2.ico
deleted file mode 100644
index ebf7f25a3..000000000
Binary files a/src/lib/data/icons/exeicons/qupzilla_os2.ico and /dev/null differ
diff --git a/src/lib/data/icons/falkon-black.svg b/src/lib/data/icons/falkon-black.svg
new file mode 100644
index 000000000..05c204c5a
--- /dev/null
+++ b/src/lib/data/icons/falkon-black.svg
@@ -0,0 +1,23 @@
+
+
\ No newline at end of file
diff --git a/src/lib/data/icons/falkon-white.svg b/src/lib/data/icons/falkon-white.svg
new file mode 100644
index 000000000..18d02ff87
--- /dev/null
+++ b/src/lib/data/icons/falkon-white.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/src/lib/data/icons/falkon.svg b/src/lib/data/icons/falkon.svg
new file mode 100644
index 000000000..389e14ef7
--- /dev/null
+++ b/src/lib/data/icons/falkon.svg
@@ -0,0 +1,50 @@
+
+
\ No newline at end of file
diff --git a/src/lib/data/icons/qupzilla.png b/src/lib/data/icons/qupzilla.png
deleted file mode 100644
index 7d4bb9d77..000000000
Binary files a/src/lib/data/icons/qupzilla.png and /dev/null differ
diff --git a/src/lib/data/qupzilla.png b/src/lib/data/qupzilla.png
deleted file mode 100644
index b4112bd8e..000000000
Binary files a/src/lib/data/qupzilla.png and /dev/null differ
diff --git a/src/lib/data/qupzilla.svg b/src/lib/data/qupzilla.svg
deleted file mode 100644
index cabfc608d..000000000
--- a/src/lib/data/qupzilla.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp
index 28f55cc52..9e3f61567 100644
--- a/src/lib/navigation/navigationbar.cpp
+++ b/src/lib/navigation/navigationbar.cpp
@@ -54,7 +54,7 @@ static QString titleForUrl(QString title, const QUrl &url)
static QIcon iconForPage(const QUrl &url, const QIcon &sIcon)
{
QIcon icon;
- icon.addPixmap(url.scheme() == QL1S("falkon") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16) : IconProvider::iconForUrl(url).pixmap(16));
+ icon.addPixmap(IconProvider::iconForUrl(url).pixmap(16));
icon.addPixmap(sIcon.pixmap(16), QIcon::Active);
return icon;
}
diff --git a/src/lib/other/updater.cpp b/src/lib/other/updater.cpp
index 05dca1109..1711c2409 100644
--- a/src/lib/other/updater.cpp
+++ b/src/lib/other/updater.cpp
@@ -148,7 +148,7 @@ void Updater::downCompleted()
Version updated(html);
if (current.isValid && updated.isValid && current < updated) {
- mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of Falkon is ready to download."));
+ mApp->desktopNotifications()->showNotification(QIcon(":icons/falkon.svg").pixmap(48), tr("Update available"), tr("New version of Falkon is ready to download."));
}
}
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 029db3e77..6dd343e14 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -20,7 +20,7 @@ if (APPLE)
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/main/Info.plist)
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.falkon")
set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Falkon")
- install(FILES lib/data/icons/exeicons/qupzilla.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+ install(FILES lib/data/icons/exeicons/falkon.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
#install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/locale DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/plugins DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
@@ -37,15 +37,16 @@ if (UNIX AND NOT APPLE)
install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
- install(FILES ../../linux/pixmaps/qupzilla.png DESTINATION ${KDE_INSTALL_DATADIR}/pixmaps)
+ install(FILES ../../linux/pixmaps/falkon.png DESTINATION ${KDE_INSTALL_DATADIR}/pixmaps)
ecm_install_icons(ICONS
- ../../linux/hicolor/16-apps-qupzilla.png
- ../../linux/hicolor/32-apps-qupzilla.png
- ../../linux/hicolor/48-apps-qupzilla.png
- ../../linux/hicolor/64-apps-qupzilla.png
- ../../linux/hicolor/128-apps-qupzilla.png
- ../../linux/hicolor/256-apps-qupzilla.png
+ ../../linux/hicolor/16-apps-falkon.png
+ ../../linux/hicolor/32-apps-falkon.png
+ ../../linux/hicolor/48-apps-falkon.png
+ ../../linux/hicolor/64-apps-falkon.png
+ ../../linux/hicolor/128-apps-falkon.png
+ ../../linux/hicolor/256-apps-falkon.png
+ ../../linux/hicolor/sc-apps-falkon.svg
DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
install(FILES ../../linux/completion/falkon DESTINATION ${KDE_INSTALL_DATADIR}/bash-completion/completions)
diff --git a/src/main/appicon.rc b/src/main/appicon.rc
index 1d24ee833..6080721d9 100644
--- a/src/main/appicon.rc
+++ b/src/main/appicon.rc
@@ -1,6 +1,6 @@
#include "winver.h"
-IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
+IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\falkon.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
VS_VERSION_INFO VERSIONINFO
diff --git a/src/main/appicon_os2.rc b/src/main/appicon_os2.rc
deleted file mode 100644
index e4eb108e3..000000000
--- a/src/main/appicon_os2.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-ICON 1 "../lib/data/icons/exeicons/qupzilla_os2.ico"
-ICON 2 "../lib/data/icons/exeicons/page_os2.ico"
diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp
index 11ab6290c..fade84e55 100644
--- a/src/plugins/TestPlugin/testplugin.cpp
+++ b/src/plugins/TestPlugin/testplugin.cpp
@@ -124,7 +124,7 @@ void TestPlugin::showSettings(QWidget* parent)
m_settings.data()->setAttribute(Qt::WA_DeleteOnClose);
m_settings.data()->setWindowTitle(tr("Example Plugin Settings"));
- m_settings.data()->setWindowIcon(QIcon(":qupzilla.png"));
+ m_settings.data()->setWindowIcon(QIcon(":icons/falkon.svg"));
connect(closeButton, SIGNAL(clicked()), m_settings.data(), SLOT(close()));
}