Skip to content

Commit 0eb0777

Browse files
committed
Merge #2969: [GUI] Update PIVX Shield Logos
50f8701 Build: Remove no longer used old splash images (Fuzzbawls) 3ed1974 GUI: Update PIVX Shield Logos (Fuzzbawls) Pull request description: Updates the various images/icons that use the PIVX Shield logo to the newer design. Also removes the unused (since v5.0) old splash images. Note: the animated "processing" images will be a separate PR. ACKs for top commit: 50f8701 Duddino: ACK 50f8701 Liquid369: tACK 50f8701 Tree-SHA512: 205262381ce8fc4a546095beff5a25ad127862d822af2fae99d8246aee5e392bd1f134284bf24f7ef956233403fe7283c968f60b3be6dfe72b26c976b74961f6
2 parents c6072b5 + 50f8701 commit 0eb0777

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3869
-1172
lines changed

build-aux/snap/snapcraft.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ parts:
124124
COPYCONF=0 # copy example config into users data folder, 1 = enabled
125125
JOBS=4 # 0 means off and make will run without -j
126126
PATCH=1 # 1 = enabled
127-
SPLASHPNGS=0 # patch pngs to differ visaully from those installed from self compilation or other source like deb
128127
FIXPPCBUILD=1 # if ppc builds fail due to failed qt, apps part will return error and build will fail, 1 = enabled
129128
EXTRALOG=0 # prints env and all installed files at the end of current script
130129
RUNTESTS=0 # run make check after post install part
@@ -173,20 +172,6 @@ parts:
173172
else
174173
echo "APPLY .patch files during compilation is disabled, skipping"
175174
fi
176-
if [ $SPLASHPNGS = 1 ]; then
177-
echo "replace splash screen with snapcrafts"
178-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/images/splash.png $SNAPCRAFT_PART_BUILD/src/qt/res/images/splash.png
179-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/images/splash_regtest.png $SNAPCRAFT_PART_BUILD/src/qt/res/images/splash_regtest.png
180-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/images/splash_testnet.png $SNAPCRAFT_PART_BUILD/src/qt/res/images/splash_testnet.png
181-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/icons/favicon.ico $SNAPCRAFT_PART_BUILD/share/pixmaps/favicon.ico
182-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/icons/favicon_testnet.ico $SNAPCRAFT_PART_BUILD/share/pixmaps/favicon_testnet.ico
183-
mv -f $SNAPCRAFT_PART_BUILD/contrib/snap/icons/favicon_regtest.ico $SNAPCRAFT_PART_BUILD/share/pixmaps/favicon_regtest.ico
184-
mv -f $SNAPCRAFT_PART_BUILD/build-aux/snap/local/desktop/${BINPREF}.png $SNAPCRAFT_PART_BUILD/src/qt/res/icons/${BINPREF}.png
185-
mv -f $SNAPCRAFT_PART_BUILD/build-aux/snap/local/desktop/${BINPREF}_testnet.png $SNAPCRAFT_PART_BUILD/src/qt/res/icons/${BINPREF}_testnet.png
186-
mv -f $SNAPCRAFT_PART_BUILD/build-aux/snap/local/desktop/${BINPREF}_regtest.png $SNAPCRAFT_PART_BUILD/src/qt/res/icons/${BINPREF}_regtest.png
187-
else
188-
echo "patch icons and images is disabled, skipping"
189-
fi
190175
if [ $DEPENDS = 1 ]; then
191176
echo "-----------------------------------------------"
192177
echo "+++++++++++++++++++++++++++++++++++++++++++++++"

share/pixmaps/favicon.ico

2.4 KB
Binary file not shown.

share/pixmaps/nsis-header.bmp

0 Bytes
Binary file not shown.

share/pixmaps/nsis-wizard.bmp

0 Bytes
Binary file not shown.

share/pixmaps/pivx.ico

-197 KB
Binary file not shown.

share/pixmaps/pivx1024.png

54.5 KB
Loading

share/pixmaps/pivx1024.xpm

Lines changed: 1210 additions & 0 deletions
Large diffs are not rendered by default.

share/pixmaps/pivx128.png

2.8 KB
Loading

share/pixmaps/pivx128.xpm

Lines changed: 327 additions & 254 deletions
Large diffs are not rendered by default.

share/pixmaps/pivx16.png

560 Bytes
Loading

0 commit comments

Comments
 (0)