diff --git a/dist/OBS_debian/debian.valentina.install b/dist/OBS_debian/debian.valentina.install index c2c52fea9..33bfb5ae4 100644 --- a/dist/OBS_debian/debian.valentina.install +++ b/dist/OBS_debian/debian.valentina.install @@ -5,5 +5,9 @@ usr/share/valentina/translations/* usr/share/valentina/tables/multisize/* usr/share/valentina/tables/templates/* usr/share/valentina/labels/* -usr/share/pixmaps/* +usr/share/icons/hicolor/48x48/apps/* +usr/share/icons/hicolor/64x64/apps/* +usr/share/icons/hicolor/128x128/apps/* +usr/share/icons/hicolor/256x256/apps/* +usr/share/icons/hicolor/512x512/apps/* usr/share/applications/* diff --git a/dist/debian/valentina.install b/dist/debian/valentina.install index c2c52fea9..33bfb5ae4 100644 --- a/dist/debian/valentina.install +++ b/dist/debian/valentina.install @@ -5,5 +5,9 @@ usr/share/valentina/translations/* usr/share/valentina/tables/multisize/* usr/share/valentina/tables/templates/* usr/share/valentina/labels/* -usr/share/pixmaps/* +usr/share/icons/hicolor/48x48/apps/* +usr/share/icons/hicolor/64x64/apps/* +usr/share/icons/hicolor/128x128/apps/* +usr/share/icons/hicolor/256x256/apps/* +usr/share/icons/hicolor/512x512/apps/* usr/share/applications/* diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index aacf9a8b9..6f5203610 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -177,7 +177,11 @@ fi %{_datadir}/mime/packages/%{name}.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/tape.desktop -%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/48x48/apps/* +%{_datadir}/icons/hicolor/64x64/apps/* +%{_datadir}/icons/hicolor/128x128/apps/* +%{_datadir}/icons/hicolor/256x256/apps/* +%{_datadir}/icons/hicolor/512x512/apps/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/diagrams.rcc %dir %{_datadir}/%{name}/translations diff --git a/share/icons/128x128/application-x-valentina-i-measurements.png b/share/icons/128x128/application-x-valentina-i-measurements.png new file mode 100644 index 000000000..6245d03d0 Binary files /dev/null and b/share/icons/128x128/application-x-valentina-i-measurements.png differ diff --git a/share/icons/128x128/application-x-valentina-pattern.png b/share/icons/128x128/application-x-valentina-pattern.png new file mode 100644 index 000000000..edbba7260 Binary files /dev/null and b/share/icons/128x128/application-x-valentina-pattern.png differ diff --git a/share/icons/128x128/application-x-valentina-s-measurements.png b/share/icons/128x128/application-x-valentina-s-measurements.png new file mode 100644 index 000000000..c7c3e6aa3 Binary files /dev/null and b/share/icons/128x128/application-x-valentina-s-measurements.png differ diff --git a/share/icons/128x128/tape.png b/share/icons/128x128/tape.png new file mode 100644 index 000000000..d0581cc51 Binary files /dev/null and b/share/icons/128x128/tape.png differ diff --git a/share/icons/128x128/valentina.png b/share/icons/128x128/valentina.png new file mode 100644 index 000000000..99d1a087c Binary files /dev/null and b/share/icons/128x128/valentina.png differ diff --git a/share/icons/256x256/application-x-valentina-i-measurements.png b/share/icons/256x256/application-x-valentina-i-measurements.png new file mode 100644 index 000000000..99331a90d Binary files /dev/null and b/share/icons/256x256/application-x-valentina-i-measurements.png differ diff --git a/share/icons/256x256/application-x-valentina-pattern.png b/share/icons/256x256/application-x-valentina-pattern.png new file mode 100644 index 000000000..8c1695ebc Binary files /dev/null and b/share/icons/256x256/application-x-valentina-pattern.png differ diff --git a/share/icons/256x256/application-x-valentina-s-measurements.png b/share/icons/256x256/application-x-valentina-s-measurements.png new file mode 100644 index 000000000..97f2ff016 Binary files /dev/null and b/share/icons/256x256/application-x-valentina-s-measurements.png differ diff --git a/share/icons/256x256/tape.png b/share/icons/256x256/tape.png new file mode 100644 index 000000000..7f9880ace Binary files /dev/null and b/share/icons/256x256/tape.png differ diff --git a/share/icons/256x256/valentina.png b/share/icons/256x256/valentina.png new file mode 100644 index 000000000..8acb54e52 Binary files /dev/null and b/share/icons/256x256/valentina.png differ diff --git a/share/icons/48x48/application-x-valentina-i-measurements.png b/share/icons/48x48/application-x-valentina-i-measurements.png new file mode 100644 index 000000000..6b61ec3f9 Binary files /dev/null and b/share/icons/48x48/application-x-valentina-i-measurements.png differ diff --git a/share/icons/48x48/application-x-valentina-pattern.png b/share/icons/48x48/application-x-valentina-pattern.png new file mode 100644 index 000000000..e27e24ef0 Binary files /dev/null and b/share/icons/48x48/application-x-valentina-pattern.png differ diff --git a/share/icons/48x48/application-x-valentina-s-measurements.png b/share/icons/48x48/application-x-valentina-s-measurements.png new file mode 100644 index 000000000..f6b0ca619 Binary files /dev/null and b/share/icons/48x48/application-x-valentina-s-measurements.png differ diff --git a/share/icons/48x48/tape.png b/share/icons/48x48/tape.png new file mode 100644 index 000000000..961c7c65c Binary files /dev/null and b/share/icons/48x48/tape.png differ diff --git a/share/icons/48x48/valentina.png b/share/icons/48x48/valentina.png new file mode 100644 index 000000000..a085b235f Binary files /dev/null and b/share/icons/48x48/valentina.png differ diff --git a/share/icons/512x512/application-x-valentina-i-measurements.png b/share/icons/512x512/application-x-valentina-i-measurements.png new file mode 100644 index 000000000..b22ebe5f1 Binary files /dev/null and b/share/icons/512x512/application-x-valentina-i-measurements.png differ diff --git a/share/icons/512x512/application-x-valentina-pattern.png b/share/icons/512x512/application-x-valentina-pattern.png new file mode 100644 index 000000000..2cb095447 Binary files /dev/null and b/share/icons/512x512/application-x-valentina-pattern.png differ diff --git a/share/icons/512x512/application-x-valentina-s-measurements.png b/share/icons/512x512/application-x-valentina-s-measurements.png new file mode 100644 index 000000000..08d0b4594 Binary files /dev/null and b/share/icons/512x512/application-x-valentina-s-measurements.png differ diff --git a/share/icons/512x512/tape.png b/share/icons/512x512/tape.png new file mode 100644 index 000000000..d803eacc4 Binary files /dev/null and b/share/icons/512x512/tape.png differ diff --git a/share/icons/512x512/valentina.png b/share/icons/512x512/valentina.png new file mode 100644 index 000000000..2ddcac093 Binary files /dev/null and b/share/icons/512x512/valentina.png differ diff --git a/dist/application-x-valentina-i-measurements.png b/share/icons/64x64/application-x-valentina-i-measurements.png similarity index 100% rename from dist/application-x-valentina-i-measurements.png rename to share/icons/64x64/application-x-valentina-i-measurements.png diff --git a/dist/application-x-valentina-pattern.png b/share/icons/64x64/application-x-valentina-pattern.png similarity index 100% rename from dist/application-x-valentina-pattern.png rename to share/icons/64x64/application-x-valentina-pattern.png diff --git a/dist/application-x-valentina-s-measurements.png b/share/icons/64x64/application-x-valentina-s-measurements.png similarity index 100% rename from dist/application-x-valentina-s-measurements.png rename to share/icons/64x64/application-x-valentina-s-measurements.png diff --git a/dist/tape.png b/share/icons/64x64/tape.png similarity index 100% rename from dist/tape.png rename to share/icons/64x64/tape.png diff --git a/dist/valentina.png b/share/icons/64x64/valentina.png similarity index 100% rename from dist/valentina.png rename to share/icons/64x64/valentina.png diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 536f5743f..9ea225410 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -163,13 +163,45 @@ unix{ desktop.files += ../../../dist/tape.desktop # logo - pixmaps.path = $$PREFIX/share/pixmaps/ - pixmaps.files += \ - ../../../dist/$${TARGET}.png \ - ../../../dist/tape.png \ - ../../../dist/application-x-valentina-pattern.png \ - ../../../dist/application-x-valentina-i-measurements.png \ - ../../../dist/application-x-valentina-s-measurements.png \ + hicolor_48.path = $$PREFIX/share/icons/hicolor/48x48/apps/ + hicolor_48.files += \ + ../../../share/icons/48x48/$${TARGET}.png \ + ../../../share/icons/48x48/tape.png \ + ../../../share/icons/48x48/application-x-valentina-pattern.png \ + ../../../share/icons/48x48/application-x-valentina-i-measurements.png \ + ../../../share/icons/48x48/application-x-valentina-s-measurements.png + + hicolor_64.path = $$PREFIX/share/icons/hicolor/64x64/apps/ + hicolor_64.files += \ + ../../../share/icons/64x64/$${TARGET}.png \ + ../../../share/icons/64x64/tape.png \ + ../../../share/icons/64x64/application-x-valentina-pattern.png \ + ../../../share/icons/64x64/application-x-valentina-i-measurements.png \ + ../../../share/icons/64x64/application-x-valentina-s-measurements.png + + hicolor_128.path = $$PREFIX/share/icons/hicolor/128x128/apps/ + hicolor_128.files += \ + ../../../share/icons/128x128/$${TARGET}.png \ + ../../../share/icons/128x128/tape.png \ + ../../../share/icons/128x128/application-x-valentina-pattern.png \ + ../../../share/icons/128x128/application-x-valentina-i-measurements.png \ + ../../../share/icons/128x128/application-x-valentina-s-measurements.png + + hicolor_256.path = $$PREFIX/share/icons/hicolor/256x256/apps/ + hicolor_256.files += \ + ../../../share/icons/256x256/$${TARGET}.png \ + ../../../share/icons/256x256/tape.png \ + ../../../share/icons/256x256/application-x-valentina-pattern.png \ + ../../../share/icons/256x256/application-x-valentina-i-measurements.png \ + ../../../share/icons/256x256/application-x-valentina-s-measurements.png + + hicolor_512.path = $$PREFIX/share/icons/hicolor/512x512/apps/ + hicolor_512.files += \ + ../../../share/icons/512x512/$${TARGET}.png \ + ../../../share/icons/512x512/tape.png \ + ../../../share/icons/512x512/application-x-valentina-pattern.png \ + ../../../share/icons/512x512/application-x-valentina-i-measurements.png \ + ../../../share/icons/512x512/application-x-valentina-s-measurements.png # Path to translation files after installation translations.path = $$PREFIX/share/$${TARGET}/translations/ @@ -191,7 +223,11 @@ unix{ target \ tape \ desktop \ - pixmaps \ + hicolor_48 \ + hicolor_64 \ + hicolor_128 \ + hicolor_256 \ + hicolor_512 \ translations \ multisize \ templates \