Add PNG app icons. https://redmine.stoutner.com/issues/992

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 3f656fcc5866d8d56be0918987d81b9a592aea2d..1f54e4ac293df349defd3317dc766272da72b523 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -18,6 +18,5 @@
 # Create the documentation.
 kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR privacybrowser)
 
-# Install loading.gif.
+# Install extra graphic files (the automatic installer doesn't pick up .gif files).
 install(FILES loading.gif DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en/privacybrowser)
-install(FILES privacy-browser.png DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en/privacybrowser)

diff --git a/doc/index.docbook b/doc/index.docbook
index 4628bdce043a20cbec56b678c7b191b3eefe4508..c2896e29c34eb34b21e31b870f744ca5338b22ad 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -145,7 +145,7 @@
     <para>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="privacybrowser.png" format="PNG"/>
+          <imagedata fileref="privacybrowser-window.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase>Screenshot</phrase>
@@ -1304,10 +1304,10 @@
       <para>
         <inlinemediaobject>
           <imageobject>
-            <imagedata fileref="privacy-browser.png" format="PNG"/>
+            <imagedata fileref="privacybrowser.png" format="PNG"/>
           </imageobject>
           <textobject>
-            <phrase>JavaScript</phrase>
+            <phrase>Privacy Browser</phrase>
           </textobject>
         </inlinemediaobject>
 
@@ -1320,6 +1320,15 @@
           </textobject>
         </inlinemediaobject>
 
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="privacybrowser-monochrome.png" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase>Privacy Browser Monochrome</phrase>
+          </textobject>
+        </inlinemediaobject>
+
         are derived from <filename>security</filename> and <filename>language</filename>, which are part of the <ulink url="https://fonts.google.com/icons">Android Material icon set</ulink>
         and are released under the <ulink url="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</ulink>. Modifications copyright 2016-2017,2021-2023 Soren Stoutner.
         The resulting images are released under the <ulink url="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</ulink>.

diff --git a/doc/loading.gif b/doc/loading.gif
new file mode 100644 (file)
index 0000000..b2dd625
Binary files /dev/null and b/doc/loading.gif differ

diff --git a/doc/privacybrowser-monochrome.png b/doc/privacybrowser-monochrome.png
new file mode 100644 (file)
index 0000000..6042a59
Binary files /dev/null and b/doc/privacybrowser-monochrome.png differ

diff --git a/doc/privacybrowser-window.png b/doc/privacybrowser-window.png
new file mode 100644 (file)
index 0000000..dce0281
Binary files /dev/null and b/doc/privacybrowser-window.png differ

diff --git a/doc/privacybrowser.png b/doc/privacybrowser.png
index dce02815092ec257a9f8b80ed63e18da8f6d6a14..100693c25b10616d8215836c0d1c09695f76526d 100644 (file)
Binary files a/doc/privacybrowser.png and b/doc/privacybrowser.png differ

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c4459c36044d6744c1582be20be4e1c99130f9a0..4b909529f6d6e2bf90fa02f1e5700fbd3a37cab2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,11 +85,24 @@ install(TARGETS privacybrowser ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 # Install Privacy Browser according to the instructions in the desktop file, specifying the permissions.
 install(PROGRAMS com.stoutner.privacybrowser.desktop DESTINATION ${KDE_INSTALL_APPDIR} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
-# Install Privacy Browser's metadata file.
+# Install the metadata file.
 install(FILES com.stoutner.privacybrowser.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
-# Install Privacy Browser's notifyrc file.
+# Install the notifyrc file.
 install(FILES privacybrowser.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 
-# Install Privacy Browser's icon.
+# Install the standard icons.
 ecm_install_icons(ICONS icons/sc-apps-privacybrowser.svg DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/16-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/22-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/24-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/32-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/48-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/64-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/128-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/256-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/512-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+ecm_install_icons(ICONS icons/1024-apps-privacybrowser.png DESTINATION ${KDE_INSTALL_ICONDIR})
+
+# Install the symbolic icon (used by Gnome).
+install(FILES icons/privacybrowser-symbolic.svg DESTINATION /usr/share/icons/hicolor/symbolic/apps/)

diff --git a/src/icons/1024-apps-privacybrowser.png b/src/icons/1024-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..5744367
Binary files /dev/null and b/src/icons/1024-apps-privacybrowser.png differ

diff --git a/src/icons/128-apps-privacybrowser.png b/src/icons/128-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..718d27a
Binary files /dev/null and b/src/icons/128-apps-privacybrowser.png differ

diff --git a/src/icons/16-apps-privacybrowser.png b/src/icons/16-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..108198e
Binary files /dev/null and b/src/icons/16-apps-privacybrowser.png differ

diff --git a/src/icons/22-apps-privacybrowser.png b/src/icons/22-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..100693c
Binary files /dev/null and b/src/icons/22-apps-privacybrowser.png differ

diff --git a/src/icons/24-apps-privacybrowser.png b/src/icons/24-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..7c5ffe0
Binary files /dev/null and b/src/icons/24-apps-privacybrowser.png differ

diff --git a/src/icons/256-apps-privacybrowser.png b/src/icons/256-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..cd7fca3
Binary files /dev/null and b/src/icons/256-apps-privacybrowser.png differ

diff --git a/src/icons/32-apps-privacybrowser.png b/src/icons/32-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..974f192
Binary files /dev/null and b/src/icons/32-apps-privacybrowser.png differ

diff --git a/src/icons/48-apps-privacybrowser.png b/src/icons/48-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..595c90e
Binary files /dev/null and b/src/icons/48-apps-privacybrowser.png differ

diff --git a/src/icons/512-apps-privacybrowser.png b/src/icons/512-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..0c3c0d6
Binary files /dev/null and b/src/icons/512-apps-privacybrowser.png differ

diff --git a/src/icons/64-apps-privacybrowser.png b/src/icons/64-apps-privacybrowser.png
new file mode 100644 (file)
index 0000000..c9316c4
Binary files /dev/null and b/src/icons/64-apps-privacybrowser.png differ

diff --git a/src/icons/loading.gif b/src/icons/loading.gif
new file mode 100644 (file)
index 0000000..132f217
Binary files /dev/null and b/src/icons/loading.gif differ

diff --git a/src/icons/privacybrowser-symbolic.svg b/src/icons/privacybrowser-symbolic.svg
new file mode 100644 (file)
index 0000000..099237d
--- /dev/null
+++ b/src/icons/privacybrowser-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 119.99999 119.99999" >
+
+    <path
+        style="fill:#000000"
+        d="M 59.999994,0 10.909089,21.818179 V 54.54545 c 0,30.272691 20.945481,58.58183 49.090905,65.45454 C 88.14542,113.12728 109.0909,84.818141 109.0909,54.54545 V 21.818179 Z m -0.03735,22.600527 c 20.681907,0 37.436804,16.754959 37.436804,37.399467 0,20.644505 -16.754897,37.399469 -37.436804,37.399469 -20.644505,0 -37.362132,-16.754964 -37.362132,-37.399469 0,-20.644508 16.717627,-37.399467 37.362132,-37.399467 z m 0.03735,7.629496 c -3.104155,4.487939 -5.535086,9.461971 -7.143266,14.810099 h 14.286531 c -1.608175,-5.348128 -4.03911,-10.32216 -7.143265,-14.810099 z m -9.686433,1.496031 c -6.881499,2.356163 -12.603766,7.105754 -16.194117,13.314068 h 11.033115 c 1.196783,-4.674937 2.917037,-9.16273 5.161002,-13.314068 z m 19.372866,0 c 2.243969,4.151338 3.964654,8.639131 5.161429,13.314068 H 85.880544 C 82.290198,38.869206 76.567931,34.082217 69.686427,31.726054 Z M 31.052711,52.520275 c -0.598392,2.393566 -0.972463,4.899158 -0.972463,7.479719 0,2.580565 0.37407,5.086584 0.972463,7.48015 h 12.641154 c -0.299194,-2.468364 -0.523567,-4.936987 -0.523567,-7.48015 0,-2.543159 0.224368,-5.011355 0.523567,-7.479719 z m 20.195979,0 c -0.336573,2.430962 -0.598669,4.93656 -0.598669,7.479719 0,2.543163 0.262101,5.011786 0.598669,7.48015 h 17.503039 c 0.336618,-2.468364 0.598239,-4.936987 0.598239,-7.48015 0,-2.543159 -0.261625,-5.048757 -0.598239,-7.479719 z m 25.057436,0 c 0.299197,2.468364 0.523566,4.93656 0.523566,7.479719 0,2.543163 -0.224373,5.011786 -0.523566,7.48015 h 12.641153 c 0.598393,-2.393566 0.97246,-4.899585 0.97246,-7.48015 0,-2.580561 -0.374072,-5.086153 -0.97246,-7.479719 z M 34.119444,74.959868 c 3.590351,6.208304 9.312618,10.957903 16.194117,13.314069 C 48.069596,84.122594 46.349342,79.6348 45.152559,74.959868 Z m 18.737284,0 c 1.60818,5.34812 4.039111,10.322162 7.143266,14.810095 3.104155,-4.487933 5.53509,-9.461975 7.143265,-14.810095 z m 21.991128,0 c -1.196775,4.674932 -2.91746,9.162726 -5.161429,13.314069 6.881504,-2.356166 12.603771,-7.143162 16.194117,-13.314069 z" />
+</svg>
+
+<!--
+  Copyright 2016-2017,2021-2023 Soren Stoutner <soren@stoutner.com>.
+
+  This file is derived from `security` and `language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.  <https://fonts.google.com/icons>
+
+  This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc>.
+
+  Privacy Browser PC 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.
+
+  Privacy Browser PC 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 Privacy Browser PC.  If not, see <http://www.gnu.org/licenses/>.
+
+  This copyright notice is moved to the bottom of the file to make Gnome's SVG parser happy.-->

diff --git a/src/icons/sc-apps-privacybrowser.svg b/src/icons/sc-apps-privacybrowser.svg
index d799bd8fb1b6bba2512fe52598e0c1e005d27468..a9b4e7ea8c78342f59970506e286961ac87a463d 100644 (file)
--- a/src/icons/sc-apps-privacybrowser.svg
+++ b/src/icons/sc-apps-privacybrowser.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <!--
-  Copyright © 2016-2017,2021-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017,2021-2023 Soren Stoutner <soren@stoutner.com>.
 
   This file is derived from `security` and `language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.  <https://fonts.google.com/icons>