diff --git a/dist/win/i-measurements.ico b/dist/win/i-measurements.ico index 0932989b9..6b776dfb9 100644 Binary files a/dist/win/i-measurements.ico and b/dist/win/i-measurements.ico differ diff --git a/dist/win/k-measurements.ico b/dist/win/k-measurements.ico index 5a3d2c639..68cb7f8c4 100644 Binary files a/dist/win/k-measurements.ico and b/dist/win/k-measurements.ico differ diff --git a/dist/win/layout.ico b/dist/win/layout.ico index 3888c30e0..f7508d839 100644 Binary files a/dist/win/layout.ico and b/dist/win/layout.ico differ diff --git a/dist/win/pattern.ico b/dist/win/pattern.ico index fdfa5dbba..186a3dbf8 100644 Binary files a/dist/win/pattern.ico and b/dist/win/pattern.ico differ diff --git a/dist/win/s-measurements.ico b/dist/win/s-measurements.ico index 1f9f73528..42ca1a328 100644 Binary files a/dist/win/s-measurements.ico and b/dist/win/s-measurements.ico differ diff --git a/dist/win/valentina-project.assets/i-measurements.iconset/icon_128x128.png b/dist/win/valentina-project.assets/i-measurements.iconset/icon_128x128.png new file mode 100644 index 000000000..7684622d7 Binary files /dev/null and b/dist/win/valentina-project.assets/i-measurements.iconset/icon_128x128.png differ diff --git a/dist/win/valentina-project.assets/i-measurements.iconset/icon_16x16.png b/dist/win/valentina-project.assets/i-measurements.iconset/icon_16x16.png new file mode 100644 index 000000000..7c1cfa03f Binary files /dev/null and b/dist/win/valentina-project.assets/i-measurements.iconset/icon_16x16.png differ diff --git a/dist/win/valentina-project.assets/i-measurements.iconset/icon_256x256.png b/dist/win/valentina-project.assets/i-measurements.iconset/icon_256x256.png new file mode 100644 index 000000000..f83646fda Binary files /dev/null and b/dist/win/valentina-project.assets/i-measurements.iconset/icon_256x256.png differ diff --git a/dist/win/valentina-project.assets/i-measurements.iconset/icon_32x32.png b/dist/win/valentina-project.assets/i-measurements.iconset/icon_32x32.png new file mode 100644 index 000000000..8b94ca9b6 Binary files /dev/null and b/dist/win/valentina-project.assets/i-measurements.iconset/icon_32x32.png differ diff --git a/dist/win/valentina-project.assets/i-measurements.iconset/icon_512x512.png b/dist/win/valentina-project.assets/i-measurements.iconset/icon_512x512.png new file mode 100644 index 000000000..b22ebe5f1 Binary files /dev/null and b/dist/win/valentina-project.assets/i-measurements.iconset/icon_512x512.png differ diff --git a/dist/win/valentina-project.assets/k-measurements.iconset/icon_128x128.png b/dist/win/valentina-project.assets/k-measurements.iconset/icon_128x128.png new file mode 100644 index 000000000..005169078 Binary files /dev/null and b/dist/win/valentina-project.assets/k-measurements.iconset/icon_128x128.png differ diff --git a/dist/win/valentina-project.assets/k-measurements.iconset/icon_16x16.png b/dist/win/valentina-project.assets/k-measurements.iconset/icon_16x16.png new file mode 100644 index 000000000..0f20a1d71 Binary files /dev/null and b/dist/win/valentina-project.assets/k-measurements.iconset/icon_16x16.png differ diff --git a/dist/win/valentina-project.assets/k-measurements.iconset/icon_256x256.png b/dist/win/valentina-project.assets/k-measurements.iconset/icon_256x256.png new file mode 100644 index 000000000..2a9efb2cf Binary files /dev/null and b/dist/win/valentina-project.assets/k-measurements.iconset/icon_256x256.png differ diff --git a/dist/win/valentina-project.assets/k-measurements.iconset/icon_32x32.png b/dist/win/valentina-project.assets/k-measurements.iconset/icon_32x32.png new file mode 100644 index 000000000..218ed2cc7 Binary files /dev/null and b/dist/win/valentina-project.assets/k-measurements.iconset/icon_32x32.png differ diff --git a/dist/win/valentina-project.assets/k-measurements.iconset/icon_512x512.png b/dist/win/valentina-project.assets/k-measurements.iconset/icon_512x512.png new file mode 100644 index 000000000..9ca5c5d31 Binary files /dev/null and b/dist/win/valentina-project.assets/k-measurements.iconset/icon_512x512.png differ diff --git a/dist/win/valentina-project.assets/layout.iconset/icon_128x128.png b/dist/win/valentina-project.assets/layout.iconset/icon_128x128.png new file mode 100644 index 000000000..e424b5bb4 Binary files /dev/null and b/dist/win/valentina-project.assets/layout.iconset/icon_128x128.png differ diff --git a/dist/win/valentina-project.assets/layout.iconset/icon_16x16.png b/dist/win/valentina-project.assets/layout.iconset/icon_16x16.png new file mode 100644 index 000000000..a8fa98d1f Binary files /dev/null and b/dist/win/valentina-project.assets/layout.iconset/icon_16x16.png differ diff --git a/dist/win/valentina-project.assets/layout.iconset/icon_256x256.png b/dist/win/valentina-project.assets/layout.iconset/icon_256x256.png new file mode 100644 index 000000000..c71a5c413 Binary files /dev/null and b/dist/win/valentina-project.assets/layout.iconset/icon_256x256.png differ diff --git a/dist/win/valentina-project.assets/layout.iconset/icon_32x32.png b/dist/win/valentina-project.assets/layout.iconset/icon_32x32.png new file mode 100644 index 000000000..dddd7a48d Binary files /dev/null and b/dist/win/valentina-project.assets/layout.iconset/icon_32x32.png differ diff --git a/dist/win/valentina-project.assets/layout.iconset/icon_512x512.png b/dist/win/valentina-project.assets/layout.iconset/icon_512x512.png new file mode 100644 index 000000000..9f370f115 Binary files /dev/null and b/dist/win/valentina-project.assets/layout.iconset/icon_512x512.png differ diff --git a/dist/win/valentina-project.assets/pattern.iconset/icon_128x128.png b/dist/win/valentina-project.assets/pattern.iconset/icon_128x128.png new file mode 100644 index 000000000..bcb61b684 Binary files /dev/null and b/dist/win/valentina-project.assets/pattern.iconset/icon_128x128.png differ diff --git a/dist/win/valentina-project.assets/pattern.iconset/icon_16x16.png b/dist/win/valentina-project.assets/pattern.iconset/icon_16x16.png new file mode 100644 index 000000000..25dd9268f Binary files /dev/null and b/dist/win/valentina-project.assets/pattern.iconset/icon_16x16.png differ diff --git a/dist/win/valentina-project.assets/pattern.iconset/icon_256x256.png b/dist/win/valentina-project.assets/pattern.iconset/icon_256x256.png new file mode 100644 index 000000000..2f943933c Binary files /dev/null and b/dist/win/valentina-project.assets/pattern.iconset/icon_256x256.png differ diff --git a/dist/win/valentina-project.assets/pattern.iconset/icon_32x32.png b/dist/win/valentina-project.assets/pattern.iconset/icon_32x32.png new file mode 100644 index 000000000..9fdd08777 Binary files /dev/null and b/dist/win/valentina-project.assets/pattern.iconset/icon_32x32.png differ diff --git a/dist/win/valentina-project.assets/pattern.iconset/icon_512x512.png b/dist/win/valentina-project.assets/pattern.iconset/icon_512x512.png new file mode 100644 index 000000000..7f6b66365 Binary files /dev/null and b/dist/win/valentina-project.assets/pattern.iconset/icon_512x512.png differ diff --git a/dist/win/valentina-project.assets/s-measurements.iconset/icon_128x128.png b/dist/win/valentina-project.assets/s-measurements.iconset/icon_128x128.png new file mode 100644 index 000000000..142aa7526 Binary files /dev/null and b/dist/win/valentina-project.assets/s-measurements.iconset/icon_128x128.png differ diff --git a/dist/win/valentina-project.assets/s-measurements.iconset/icon_16x16.png b/dist/win/valentina-project.assets/s-measurements.iconset/icon_16x16.png new file mode 100644 index 000000000..5dc37f402 Binary files /dev/null and b/dist/win/valentina-project.assets/s-measurements.iconset/icon_16x16.png differ diff --git a/dist/win/valentina-project.assets/s-measurements.iconset/icon_256x256.png b/dist/win/valentina-project.assets/s-measurements.iconset/icon_256x256.png new file mode 100644 index 000000000..a6df4e718 Binary files /dev/null and b/dist/win/valentina-project.assets/s-measurements.iconset/icon_256x256.png differ diff --git a/dist/win/valentina-project.assets/s-measurements.iconset/icon_32x32.png b/dist/win/valentina-project.assets/s-measurements.iconset/icon_32x32.png new file mode 100644 index 000000000..f0517d16d Binary files /dev/null and b/dist/win/valentina-project.assets/s-measurements.iconset/icon_32x32.png differ diff --git a/dist/win/valentina-project.assets/s-measurements.iconset/icon_512x512.png b/dist/win/valentina-project.assets/s-measurements.iconset/icon_512x512.png new file mode 100644 index 000000000..08d0b4594 Binary files /dev/null and b/dist/win/valentina-project.assets/s-measurements.iconset/icon_512x512.png differ diff --git a/scripts/win_ico.sh b/scripts/win_ico.sh new file mode 100755 index 000000000..cf17fa18f --- /dev/null +++ b/scripts/win_ico.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# Requires icoutils package +# Run inside the scripts directory + +declare -a apps=("valentina" "tape" "puzzle") + +for app in "${apps[@]}"; do + iconset="../src/app/${app}/share/resources/${app}.iconset" + + icotool --create "--output=../src/app/${app}/share/resources/${app}.ico" \ + --icon ${iconset}/icon_16x16.png \ + ${iconset}/icon_32x32.png \ + ${iconset}/icon_128x128.png \ + -r ${iconset}/icon_256x256.png \ + -r ${iconset}/icon_512x512.png +done + +declare -a mimetypes=("i-measurements" "k-measurements" "layout" "pattern" "s-measurements") + +for mimetype in "${mimetypes[@]}"; do + iconset="../dist/win/valentina-project.assets/${mimetype}.iconset" + + icotool --create "--output=../dist/win/${mimetype}.ico" \ + --icon ${iconset}/icon_16x16.png \ + ${iconset}/icon_32x32.png \ + ${iconset}/icon_128x128.png \ + -r ${iconset}/icon_256x256.png \ + -r ${iconset}/icon_512x512.png +done diff --git a/src/app/puzzle/share/resources/puzzle.ico b/src/app/puzzle/share/resources/puzzle.ico new file mode 100644 index 000000000..bd671e5b1 Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.ico differ diff --git a/src/app/puzzle/share/resources/puzzle.iconset/icon_128x128.png b/src/app/puzzle/share/resources/puzzle.iconset/icon_128x128.png new file mode 100644 index 000000000..792756780 Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.iconset/icon_128x128.png differ diff --git a/src/app/puzzle/share/resources/puzzle.iconset/icon_16x16.png b/src/app/puzzle/share/resources/puzzle.iconset/icon_16x16.png new file mode 100644 index 000000000..74a185f61 Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.iconset/icon_16x16.png differ diff --git a/src/app/puzzle/share/resources/puzzle.iconset/icon_256x256.png b/src/app/puzzle/share/resources/puzzle.iconset/icon_256x256.png new file mode 100644 index 000000000..44a150391 Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.iconset/icon_256x256.png differ diff --git a/src/app/puzzle/share/resources/puzzle.iconset/icon_32x32.png b/src/app/puzzle/share/resources/puzzle.iconset/icon_32x32.png new file mode 100644 index 000000000..1dc43b2ce Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.iconset/icon_32x32.png differ diff --git a/src/app/puzzle/share/resources/puzzle.iconset/icon_512x512.png b/src/app/puzzle/share/resources/puzzle.iconset/icon_512x512.png new file mode 100644 index 000000000..79189754e Binary files /dev/null and b/src/app/puzzle/share/resources/puzzle.iconset/icon_512x512.png differ diff --git a/src/app/puzzle/share/resources/puzzle.rc b/src/app/puzzle/share/resources/puzzle.rc index a46516318..cb9a658b4 100644 --- a/src/app/puzzle/share/resources/puzzle.rc +++ b/src/app/puzzle/share/resources/puzzle.rc @@ -1,4 +1,4 @@ -IDI_ICON1 ICON DISCARDABLE "puzzleicon/64x64/logo.ico" +IDI_ICON1 ICON DISCARDABLE "puzzle.ico" #include #include "../../version.h" diff --git a/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico b/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico deleted file mode 100644 index ea851eaa3..000000000 Binary files a/src/app/puzzle/share/resources/puzzleicon/64x64/logo.ico and /dev/null differ diff --git a/src/app/tape/share/resources/tape.ico b/src/app/tape/share/resources/tape.ico new file mode 100644 index 000000000..614ea2682 Binary files /dev/null and b/src/app/tape/share/resources/tape.ico differ diff --git a/src/app/tape/share/resources/tape.iconset/icon_128x128.png b/src/app/tape/share/resources/tape.iconset/icon_128x128.png new file mode 100644 index 000000000..cb66fec4c Binary files /dev/null and b/src/app/tape/share/resources/tape.iconset/icon_128x128.png differ diff --git a/src/app/tape/share/resources/tape.iconset/icon_16x16.png b/src/app/tape/share/resources/tape.iconset/icon_16x16.png new file mode 100644 index 000000000..a94215e21 Binary files /dev/null and b/src/app/tape/share/resources/tape.iconset/icon_16x16.png differ diff --git a/src/app/tape/share/resources/tape.iconset/icon_256x256.png b/src/app/tape/share/resources/tape.iconset/icon_256x256.png new file mode 100644 index 000000000..b2ce062dc Binary files /dev/null and b/src/app/tape/share/resources/tape.iconset/icon_256x256.png differ diff --git a/src/app/tape/share/resources/tape.iconset/icon_32x32.png b/src/app/tape/share/resources/tape.iconset/icon_32x32.png new file mode 100644 index 000000000..b5c847426 Binary files /dev/null and b/src/app/tape/share/resources/tape.iconset/icon_32x32.png differ diff --git a/src/app/tape/share/resources/tape.iconset/icon_512x512.png b/src/app/tape/share/resources/tape.iconset/icon_512x512.png new file mode 100644 index 000000000..88d3aab27 Binary files /dev/null and b/src/app/tape/share/resources/tape.iconset/icon_512x512.png differ diff --git a/src/app/tape/share/resources/tape.rc b/src/app/tape/share/resources/tape.rc index 33b3d4931..bbfadc3b3 100644 --- a/src/app/tape/share/resources/tape.rc +++ b/src/app/tape/share/resources/tape.rc @@ -1,4 +1,4 @@ -IDI_ICON1 ICON DISCARDABLE "tapeicon/64x64/logo.ico" +IDI_ICON1 ICON DISCARDABLE "tape.ico" #include #include "../../version.h" diff --git a/src/app/tape/share/resources/tapeicon/64x64/logo.ico b/src/app/tape/share/resources/tapeicon/64x64/logo.ico deleted file mode 100644 index 979a0bba7..000000000 Binary files a/src/app/tape/share/resources/tapeicon/64x64/logo.ico and /dev/null differ diff --git a/src/app/valentina/share/resources/valentina.ico b/src/app/valentina/share/resources/valentina.ico new file mode 100644 index 000000000..c92d3c327 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.ico differ diff --git a/src/app/valentina/share/resources/valentina.iconset/icon_128x128.png b/src/app/valentina/share/resources/valentina.iconset/icon_128x128.png new file mode 100644 index 000000000..904772877 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.iconset/icon_128x128.png differ diff --git a/src/app/valentina/share/resources/valentina.iconset/icon_16x16.png b/src/app/valentina/share/resources/valentina.iconset/icon_16x16.png new file mode 100644 index 000000000..9e45db787 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.iconset/icon_16x16.png differ diff --git a/src/app/valentina/share/resources/valentina.iconset/icon_256x256.png b/src/app/valentina/share/resources/valentina.iconset/icon_256x256.png new file mode 100644 index 000000000..9560d3819 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.iconset/icon_256x256.png differ diff --git a/src/app/valentina/share/resources/valentina.iconset/icon_32x32.png b/src/app/valentina/share/resources/valentina.iconset/icon_32x32.png new file mode 100644 index 000000000..b0e77ab65 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.iconset/icon_32x32.png differ diff --git a/src/app/valentina/share/resources/valentina.iconset/icon_512x512.png b/src/app/valentina/share/resources/valentina.iconset/icon_512x512.png new file mode 100644 index 000000000..794569d29 Binary files /dev/null and b/src/app/valentina/share/resources/valentina.iconset/icon_512x512.png differ diff --git a/src/app/valentina/share/resources/valentina.rc b/src/app/valentina/share/resources/valentina.rc index 7478ef28e..fe27f83f1 100644 --- a/src/app/valentina/share/resources/valentina.rc +++ b/src/app/valentina/share/resources/valentina.rc @@ -1,4 +1,4 @@ -IDI_ICON1 ICON DISCARDABLE "../../../../libs/vmisc/share/resources/icon/64x64/icon64x64.ico" +IDI_ICON1 ICON DISCARDABLE "valentina.ico" #include #include "../../version.h" diff --git a/src/libs/vmisc/share/resources/icon/64x64/icon64x64.ico b/src/libs/vmisc/share/resources/icon/64x64/icon64x64.ico deleted file mode 100644 index 4296c60d9..000000000 Binary files a/src/libs/vmisc/share/resources/icon/64x64/icon64x64.ico and /dev/null differ