Add new Falkon icon

KDE · Feb 23, 2018 · 86d3ebe · 86d3ebe
1 parent c6aefbb
commit 86d3ebe
Show file tree

Hide file tree

Showing 38 changed files with 163 additions and 77 deletions.
diff --git 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
@@ -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
diff --git a/linux/hicolor/128-apps-qupzilla.png b/linux/hicolor/128-apps-qupzilla.png
diff --git a/linux/hicolor/16-apps-falkon.png b/linux/hicolor/16-apps-falkon.png
diff --git a/linux/hicolor/16-apps-qupzilla.png b/linux/hicolor/16-apps-qupzilla.png
diff --git a/linux/hicolor/256-apps-falkon.png b/linux/hicolor/256-apps-falkon.png
diff --git a/linux/hicolor/256-apps-qupzilla.png b/linux/hicolor/256-apps-qupzilla.png
diff --git a/linux/hicolor/32-apps-falkon.png b/linux/hicolor/32-apps-falkon.png
diff --git a/linux/hicolor/32-apps-qupzilla.png b/linux/hicolor/32-apps-qupzilla.png
diff --git a/linux/hicolor/48-apps-falkon.png b/linux/hicolor/48-apps-falkon.png
diff --git a/linux/hicolor/48-apps-qupzilla.png b/linux/hicolor/48-apps-qupzilla.png
diff --git a/linux/hicolor/64-apps-falkon.png b/linux/hicolor/64-apps-falkon.png
diff --git a/linux/hicolor/64-apps-qupzilla.png b/linux/hicolor/64-apps-qupzilla.png
diff --git a/linux/hicolor/sc-apps-falkon.svg b/linux/hicolor/sc-apps-falkon.svg
diff --git a/linux/pixmaps/falkon.png b/linux/pixmaps/falkon.png
diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png
diff --git 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
@@ -1,7 +1,8 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/qupzilla.png</file>
-        <file>qupzilla.png</file>
+        <file>icons/falkon.svg</file>
+        <file>icons/falkon-black.svg</file>
+        <file>icons/falkon-white.svg</file>
         <file>icons/menu/history.svg</file>
         <file>icons/menu/history_entry.svg</file>
         <file>icons/menu/tab-new.svg</file>
@@ -31,7 +32,6 @@
         <file>icons/browsers/ie.png</file>
         <file>icons/browsers/ie@2x.png</file>
         <file>icons/browsers/html.svg</file>
-        <file>icons/exeicons/qupzilla-window.png</file>
         <file>icons/sites/duck.png</file>
         <file>icons/sites/google.png</file>
         <file>icons/sites/translate.png</file>

diff --git a/src/lib/data/icons/exeicons/falkon.icns b/src/lib/data/icons/exeicons/falkon.icns
diff --git a/src/lib/data/icons/exeicons/falkon.ico b/src/lib/data/icons/exeicons/falkon.ico
diff --git a/src/lib/data/icons/exeicons/page_os2.ico b/src/lib/data/icons/exeicons/page_os2.ico
diff --git a/src/lib/data/icons/exeicons/qupzilla-window.png b/src/lib/data/icons/exeicons/qupzilla-window.png
diff --git a/src/lib/data/icons/exeicons/qupzilla.icns b/src/lib/data/icons/exeicons/qupzilla.icns
diff --git a/src/lib/data/icons/exeicons/qupzilla.ico b/src/lib/data/icons/exeicons/qupzilla.ico
diff --git a/src/lib/data/icons/exeicons/qupzilla_os2.ico b/src/lib/data/icons/exeicons/qupzilla_os2.ico
diff --git a/src/lib/data/icons/falkon-black.svg b/src/lib/data/icons/falkon-black.svg
diff --git a/src/lib/data/icons/falkon-white.svg b/src/lib/data/icons/falkon-white.svg
diff --git a/src/lib/data/icons/falkon.svg b/src/lib/data/icons/falkon.svg
diff --git a/src/lib/data/icons/qupzilla.png b/src/lib/data/icons/qupzilla.png
diff --git a/src/lib/data/qupzilla.png b/src/lib/data/qupzilla.png