diff --git a/.icons/old/README.md b/.icons/old/README.md new file mode 100644 index 00000000..2b36f24e --- /dev/null +++ b/.icons/old/README.md @@ -0,0 +1,7 @@ +See original, but somehow technically problematic SVG icon (created with Inkscape 0.48.4 r9939) uploaded by Coderus 2016-12-14 for Patchmanager 2 at [`patchmanager-icon.svg`](patchmanager-icon.svg). + +The [`patchmanager_200x200.png`](patchmanager_200x200.png) and [`patchmanager_86x86.png`](patchmanager_86x86.png) are exported versions (2014-01-22) of an older SVG by SfietKonstantin, which is presuambly lost; these PNG icons are renamed copies of their originals in [`src/share/`](../src/share/). + +For the icons in the [`social-media`](social-media) directory, the [`patchmanager_200x200.png`](social-media/patchmanager_200x200.png) was simply put on a larger, transparent canvas to create [`patchmanager_284x284.png`](social-media/patchmanager_284x284.png) (200 × √2 = 282,842712475, so the icon proper is fully visible when clipped circularly, as GitHub does it at multiple places) and [`patchmanager_480x240.png`](social-media/patchmanager_480x240.png) (2:1 "social media" format, see in GitHub's general settings page of a project). + +The original SVG of the [`icon-patchmanager_100x100.png`](icon-patchmanager_100x100.png) (with the patch in red hue) seems to be lost, too. diff --git a/src/plugin/icon-m-patchmanager.png b/.icons/old/icon-m-patchmanager.png similarity index 100% rename from src/plugin/icon-m-patchmanager.png rename to .icons/old/icon-m-patchmanager.png diff --git a/src/icons/svgs/icon-m-patchmanager2.svg b/.icons/old/icon-m-patchmanager2.svg similarity index 100% rename from src/icons/svgs/icon-m-patchmanager2.svg rename to .icons/old/icon-m-patchmanager2.svg diff --git a/.icons/icon-patchmanager_100x100.png b/.icons/old/icon-patchmanager_100x100.png similarity index 100% rename from .icons/icon-patchmanager_100x100.png rename to .icons/old/icon-patchmanager_100x100.png diff --git a/src/bin/dialog/patchmanager-icon.svg b/.icons/old/patchmanager-icon.svg similarity index 100% rename from src/bin/dialog/patchmanager-icon.svg rename to .icons/old/patchmanager-icon.svg diff --git a/.icons/patchmanager_200x200.png b/.icons/old/patchmanager_200x200.png similarity index 100% rename from .icons/patchmanager_200x200.png rename to .icons/old/patchmanager_200x200.png diff --git a/.icons/patchmanager_86x86.png b/.icons/old/patchmanager_86x86.png similarity index 100% rename from .icons/patchmanager_86x86.png rename to .icons/old/patchmanager_86x86.png diff --git a/.icons/social-media/patchmanager_284x284.png b/.icons/old/social-media/patchmanager_284x284.png similarity index 100% rename from .icons/social-media/patchmanager_284x284.png rename to .icons/old/social-media/patchmanager_284x284.png diff --git a/.icons/social-media/patchmanager_480x240.png b/.icons/old/social-media/patchmanager_480x240.png similarity index 100% rename from .icons/social-media/patchmanager_480x240.png rename to .icons/old/social-media/patchmanager_480x240.png diff --git a/.icons/patchmanager-menu-icon.svg b/.icons/patchmanager-menu-icon.svg new file mode 120000 index 00000000..3095c3d6 --- /dev/null +++ b/.icons/patchmanager-menu-icon.svg @@ -0,0 +1 @@ +../src/icons/icon-m-patchmanager.svg \ No newline at end of file diff --git a/.icons/patchmanager.svg b/.icons/patchmanager.svg new file mode 120000 index 00000000..02e1b18d --- /dev/null +++ b/.icons/patchmanager.svg @@ -0,0 +1 @@ +../src/icons/patchmanager-icon.svg \ No newline at end of file diff --git a/.icons/pngs/patchmanager_108x108.png b/.icons/pngs/patchmanager_108x108.png new file mode 100644 index 00000000..7233f981 Binary files /dev/null and b/.icons/pngs/patchmanager_108x108.png differ diff --git a/.icons/pngs/patchmanager_128x128.png b/.icons/pngs/patchmanager_128x128.png new file mode 100644 index 00000000..23b6f432 Binary files /dev/null and b/.icons/pngs/patchmanager_128x128.png differ diff --git a/.icons/pngs/patchmanager_172x172.png b/.icons/pngs/patchmanager_172x172.png new file mode 100644 index 00000000..25c9e458 Binary files /dev/null and b/.icons/pngs/patchmanager_172x172.png differ diff --git a/.icons/pngs/patchmanager_256x256.png b/.icons/pngs/patchmanager_256x256.png new file mode 100644 index 00000000..a79eaf21 Binary files /dev/null and b/.icons/pngs/patchmanager_256x256.png differ diff --git a/.icons/pngs/patchmanager_480x480.png b/.icons/pngs/patchmanager_480x480.png new file mode 100644 index 00000000..e687569d Binary files /dev/null and b/.icons/pngs/patchmanager_480x480.png differ diff --git a/.icons/pngs/patchmanager_560x560.png b/.icons/pngs/patchmanager_560x560.png new file mode 100644 index 00000000..3ef037f8 Binary files /dev/null and b/.icons/pngs/patchmanager_560x560.png differ diff --git a/.icons/pngs/patchmanager_86x86.png b/.icons/pngs/patchmanager_86x86.png new file mode 100644 index 00000000..43709505 Binary files /dev/null and b/.icons/pngs/patchmanager_86x86.png differ diff --git a/.icons/pngs/social-media/patchmanager_1280x640.png b/.icons/pngs/social-media/patchmanager_1280x640.png new file mode 100644 index 00000000..3b9e9966 Binary files /dev/null and b/.icons/pngs/social-media/patchmanager_1280x640.png differ diff --git a/.icons/pngs/social-media/patchmanager_1500x500.png b/.icons/pngs/social-media/patchmanager_1500x500.png new file mode 100644 index 00000000..6e9c8a83 Binary files /dev/null and b/.icons/pngs/social-media/patchmanager_1500x500.png differ diff --git a/.icons/pngs/social-media/patchmanager_792x792.png b/.icons/pngs/social-media/patchmanager_792x792.png new file mode 100644 index 00000000..31ae125b Binary files /dev/null and b/.icons/pngs/social-media/patchmanager_792x792.png differ diff --git a/.icons/pngs/social-media/patchmanager_960x640.png b/.icons/pngs/social-media/patchmanager_960x640.png new file mode 100644 index 00000000..3f81d84f Binary files /dev/null and b/.icons/pngs/social-media/patchmanager_960x640.png differ diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec index e68e839f..8673d591 100644 --- a/rpm/patchmanager.spec +++ b/rpm/patchmanager.spec @@ -288,15 +288,13 @@ exit 0 %{_datadir}/translations %{_datadir}/jolla-settings/pages/%{name} %{_datadir}/jolla-settings/entries/%{name}.json -%{_datadir}/%{name}/icons/icon-m-patchmanager.png - +%{_datadir}/icons/hicolor/scalable/apps/*.svg # On SailfishOS < 4.6: # /usr/share/themes/sailfish-default/meegotouch/zX.Y/icons/*.png # On SailfishOS >= 4.6: # /usr/share/themes/sailfish-default/silica/zX.Y/icons/*.png # /usr/share/themes/sailfish-default/silica/zX.Y/icons-monochrome/*.png %{_datadir}/themes/sailfish-default/*/z*/icons*/*.png -%{_datadir}/icons/hicolor/scalable/apps/*.svg %changelog * Thu Sep 9 1999 SailfishOS Patches - 99.99.99 diff --git a/src/bin/dialog/dialog.pro b/src/bin/dialog/dialog.pro index 04f8de5a..520fff5c 100644 --- a/src/bin/dialog/dialog.pro +++ b/src/bin/dialog/dialog.pro @@ -15,7 +15,7 @@ systemd.files = \ systemd.path = /usr/lib/systemd/user INSTALLS += systemd -icons.files = patchmanager-icon.svg +icons.files = ../../icons/patchmanager-icon.svg icons.path = /usr/share/patchmanager/data INSTALLS += icons diff --git a/src/icons/icon-m-patchmanager.svg b/src/icons/icon-m-patchmanager.svg new file mode 100644 index 00000000..9684d287 --- /dev/null +++ b/src/icons/icon-m-patchmanager.svg @@ -0,0 +1,89 @@ + +Patchmanager's "patch" outlineimage/svg+xmlPatchmanager's "patch" outlinehttps://codeberg.org/marbalf/Sailfish-icons/src/branch/main/other/general/patchmanagerJune 2025marbalf (MBF)BSD 3-Clause "New" or "Revised" LicenseOutline of the "patch" object in Patchmanager's iconPatchmanagericonolf (Olf0)olf (Olf0) + +_+ + diff --git a/src/icons/icons.pro b/src/icons/icons.pro index 40feb8c9..290f5595 100644 --- a/src/icons/icons.pro +++ b/src/icons/icons.pro @@ -7,5 +7,5 @@ CONFIG += sailfish-svg2png # also install SVG: svg.path = /usr/share/icons/hicolor/scalable/apps -svg.files = svgs/icon-m-patchmanager2.svg +svg.files = icon-m-patchmanager.svg INSTALLS += svg diff --git a/src/icons/patchmanager-icon.svg b/src/icons/patchmanager-icon.svg new file mode 100644 index 00000000..4bcf2b06 --- /dev/null +++ b/src/icons/patchmanager-icon.svg @@ -0,0 +1,192 @@ + +Patchmanager's app iconimage/svg+xmlPatchmanager's app iconmarbalf (MBF)olf (Olf0)Application icon for "Patchmanager for SailfishOS"June 2025https://codeberg.org/marbalf/Sailfish-icons/src/branch/main/other/general/patchmanagerBSD 3-Clause "New" or "Revised" LicensePatchmanagericonolf (Olf0) + + + + + + + + + + + + + + + +_+ + diff --git a/src/icons/svgs/icon-m-patchmanager.svg b/src/icons/svgs/icon-m-patchmanager.svg new file mode 120000 index 00000000..4b88b520 --- /dev/null +++ b/src/icons/svgs/icon-m-patchmanager.svg @@ -0,0 +1 @@ +../icon-m-patchmanager.svg \ No newline at end of file diff --git a/src/icons/svgs/icons-monochrome/icon-m-patchmanager.svg b/src/icons/svgs/icons-monochrome/icon-m-patchmanager.svg new file mode 120000 index 00000000..9b2fe347 --- /dev/null +++ b/src/icons/svgs/icons-monochrome/icon-m-patchmanager.svg @@ -0,0 +1 @@ +../../icon-m-patchmanager.svg \ No newline at end of file diff --git a/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg b/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg deleted file mode 100644 index f123437a..00000000 --- a/src/icons/svgs/icons-monochrome/icon-m-patchmanager2.svg +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/src/icons/svgs/icons/icon-m-patchmanager.svg b/src/icons/svgs/icons/icon-m-patchmanager.svg new file mode 120000 index 00000000..9b2fe347 --- /dev/null +++ b/src/icons/svgs/icons/icon-m-patchmanager.svg @@ -0,0 +1 @@ +../../icon-m-patchmanager.svg \ No newline at end of file diff --git a/src/icons/svgs/icons/icon-m-patchmanager2.svg b/src/icons/svgs/icons/icon-m-patchmanager2.svg deleted file mode 100644 index f123437a..00000000 --- a/src/icons/svgs/icons/icon-m-patchmanager2.svg +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro index 3ab2488b..a371efaa 100644 --- a/src/plugin/plugin.pro +++ b/src/plugin/plugin.pro @@ -6,7 +6,4 @@ qmlpages.files = patchmanager.qml plugin_entry.path = /usr/share/jolla-settings/entries plugin_entry.files = patchmanager.json -icon.path = /usr/share/patchmanager/icons/ -icon.files = icon-m-patchmanager.png - -INSTALLS += plugin_entry qmlpages icon +INSTALLS += plugin_entry qmlpages diff --git a/src/qml/AboutPage.qml b/src/qml/AboutPage.qml index 26d526f0..787bd56f 100644 --- a/src/qml/AboutPage.qml +++ b/src/qml/AboutPage.qml @@ -1,7 +1,7 @@ /* * Copyright (C) 2013 Lucien XU * Copyright (C) 2016 Andrey Kozhevnikov - * Copyright (c) 2021, Patchmanager for SailfishOS contributors: + * Copyright (c) 2021-2025, Patchmanager for SailfishOS contributors: * - olf "Olf0" * - Peter G. "nephros" * - Vlad G. "b100dian" @@ -63,7 +63,7 @@ Page { Image { anchors.horizontalCenter: parent.horizontalCenter - source: "/usr/share/patchmanager/data/patchmanager-big.png" + source: "/usr/share/patchmanager/data/patchmanager-icon.svg" } Column { diff --git a/src/qml/DevelopersPage.qml b/src/qml/DevelopersPage.qml index 279d51f9..6453f37e 100644 --- a/src/qml/DevelopersPage.qml +++ b/src/qml/DevelopersPage.qml @@ -1,7 +1,7 @@ /* * Copyright (C) 2013 Lucien XU * Copyright (C) 2016 Andrey Kozhevnikov - * Copyright (c) 2021, Patchmanager for SailfishOS contributors: + * Copyright (c) 2021-2025, Patchmanager for SailfishOS contributors: * - olf "Olf0" * - Peter G. "nephros" * - Vlad G. "b100dian" @@ -95,16 +95,16 @@ Page { name: "olf" nickname: "Olf0" description: "Maintainer" - socialmedia: "https://mastodon.social/@olf" - socialmedianame: "Mastodon" - website: "https://talk.maemo.org/member.php?u=72347" + socialmedia: "https://forum.sailfishos.org/u/olf/" + socialmedianame: "FSO" + website: "https://github.com/Olf0" } ListElement { icon: "/usr/share/patchmanager/data/morpog.jpeg" category: "Thanks to" name: "Stephan Beyerle" nickname: "Morpog" - description: "Icons master" + description: "Icon master" socialmedia: "https://twitter.com/Morpog" socialmedianame: "Twitter" website: "" @@ -114,11 +114,21 @@ Page { category: "Thanks to" name: "" nickname: "Ancelad" - description: "Icons master" + description: "Icon master" socialmedia: "https://twitter.com/iAncelad" socialmedianame: "Twitter" website: "" } + ListElement { + icon: "/usr/share/patchmanager/data/marbalf.png" + category: "Thanks to" + name: "" + nickname: "marbalf (MBF)" + description: "Icon master" + socialmedia: "https://forum.sailfishos.org/u/marbalf/" + socialmedianame: "FSO" + website: "https://codeberg.org/marbalf" + } ListElement { icon: "/usr/share/patchmanager/data/jakibaki.jpeg" category: "Thanks to" diff --git a/src/share/marbalf.png b/src/share/marbalf.png new file mode 100644 index 00000000..3e217e51 Binary files /dev/null and b/src/share/marbalf.png differ diff --git a/src/share/patchmanager-big.png b/src/share/patchmanager-big.png deleted file mode 100644 index ccbad4ac..00000000 Binary files a/src/share/patchmanager-big.png and /dev/null differ diff --git a/src/share/patchmanager.png b/src/share/patchmanager.png deleted file mode 100644 index 8d8af96d..00000000 Binary files a/src/share/patchmanager.png and /dev/null differ diff --git a/src/share/share.pro b/src/share/share.pro index 16287a47..646bb618 100644 --- a/src/share/share.pro +++ b/src/share/share.pro @@ -1,7 +1,7 @@ TEMPLATE = aux -OTHER_FILES = patchmanager.png \ - patchmanager-big.png \ +OTHER_FILES = \ + ../icons/patchmanager-icon.svg \ morpog.jpeg \ ancelad.jpg \ jakibaki.jpeg \