mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-05-12 19:20:42 +02:00
Merge 7483 via svg_icon-28+knots
This commit is contained in:
Luke Dashjr
commit
5b18d9e534
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -105,7 +105,7 @@ jobs:
|
||||
run: |
|
||||
# A workaround for "The `brew link` step did not complete successfully" error.
|
||||
brew install --quiet python@3 || brew link --overwrite python@3
|
||||
brew install --quiet automake libtool pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode
|
||||
brew install --quiet automake libtool pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode imagemagick libicns librsvg
|
||||
|
||||
- name: Set Ccache directory
|
||||
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
|
||||
|
||||
18
Makefile.am
18
Makefile.am
@ -37,7 +37,7 @@ OSX_APP=Bitcoin-Qt.app
|
||||
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
|
||||
OSX_ZIP = $(OSX_VOLNAME).zip
|
||||
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
||||
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
|
||||
OSX_INSTALLER_ICONS=src/qt/res/rendered_icons/bitcoin.icns
|
||||
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
|
||||
|
||||
DIST_CONTRIB = \
|
||||
@ -57,9 +57,9 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
|
||||
$(top_srcdir)/contrib/devtools/security-check.py \
|
||||
$(top_srcdir)/contrib/devtools/utils.py
|
||||
|
||||
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
|
||||
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
|
||||
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
|
||||
WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
|
||||
src/qt/res/rendered_icons/nsis-header.bmp \
|
||||
src/qt/res/rendered_icons/nsis-wizard.bmp \
|
||||
$(top_srcdir)/doc/README_windows.txt
|
||||
|
||||
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_INSTALLER_ICONS) \
|
||||
@ -70,11 +70,14 @@ COVERAGE_INFO = $(COV_TOOL_WRAPPER) baseline.info \
|
||||
baseline_filtered.info functional_test.info functional_test_filtered.info \
|
||||
test_bitcoin_coverage.info test_bitcoin.info fuzz.info fuzz_filtered.info fuzz_coverage.info
|
||||
|
||||
src/qt/res/rendered_icons/%: FORCE
|
||||
$(MAKE) -C src $(patsubst src/%,%,$@)
|
||||
|
||||
dist-hook:
|
||||
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
|
||||
|
||||
if TARGET_WINDOWS
|
||||
$(BITCOIN_WIN_INSTALLER): all-recursive
|
||||
$(BITCOIN_WIN_INSTALLER): all-recursive $(WINDOWS_PACKAGING)
|
||||
$(MKDIR_P) $(top_builddir)/release
|
||||
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
|
||||
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
|
||||
@ -314,6 +317,8 @@ EXTRA_DIST += \
|
||||
test/util/data/txreplacesingleinput.hex \
|
||||
test/util/rpcauth-test.py
|
||||
|
||||
EXTRA_DIST += src/qt/res/rendered_icons/bitcoin_testnet.ico
|
||||
|
||||
CLEANFILES = $(OSX_ZIP) $(BITCOIN_WIN_INSTALLER)
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = --enable-man
|
||||
@ -330,6 +335,9 @@ docs:
|
||||
@echo "error: doxygen not found"
|
||||
endif
|
||||
|
||||
src_files: $(DISTFILES)
|
||||
@true
|
||||
|
||||
clean-docs:
|
||||
rm -rf doc/doxygen
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
|
||||
# The folder for previous release binaries.
|
||||
# This folder exists only on the ci guest, and on the ci host as a volume.
|
||||
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases}
|
||||
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake}
|
||||
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison e2fsprogs cmake icnsutils librsvg2-bin imagemagick}
|
||||
export GOAL=${GOAL:-install}
|
||||
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}
|
||||
export CI_RETRY_EXE=${CI_RETRY_EXE:-"retry --"}
|
||||
|
||||
@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
|
||||
export HOST=i686-pc-linux-gnu
|
||||
export CONTAINER_NAME=ci_i686_centos
|
||||
export CI_IMAGE_NAME_TAG="quay.io/centos/amd64:stream9"
|
||||
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux e2fsprogs cmake"
|
||||
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux e2fsprogs cmake libicns-utils librsvg2-tools ImageMagick"
|
||||
export PIP_PACKAGES="pyzmq"
|
||||
export GOAL="install"
|
||||
export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
|
||||
|
||||
@ -11,7 +11,7 @@ export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
|
||||
export CONTAINER_NAME=ci_macos_cross
|
||||
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
|
||||
export HOST=x86_64-apple-darwin
|
||||
export PACKAGES="clang lld llvm zip"
|
||||
export PACKAGES="clang lld llvm zip icnsutils imagemagick librsvg2-bin"
|
||||
export XCODE_VERSION=15.0
|
||||
export XCODE_BUILD_ID=15A240d
|
||||
export RUN_UNIT_TESTS=false
|
||||
|
||||
25
configure.ac
25
configure.ac
@ -663,6 +663,17 @@ AC_ARG_WITH([daemon],
|
||||
[build_bitcoind=$withval],
|
||||
[build_bitcoind=yes])
|
||||
|
||||
can_render_icons=yes
|
||||
AC_PATH_PROGS([RSVG_CONVERT],[rsvg-convert rsvg],no)
|
||||
AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[magick convert],no)
|
||||
AC_PATH_PROGS([PNG2ICNS],[png2icns],no)
|
||||
|
||||
if test x$RSVG_CONVERT = xno; then
|
||||
can_render_icons='rsvg-convert'
|
||||
elif test x$IMAGEMAGICK_CONVERT = xno; then
|
||||
can_render_icons='ImageMagick'
|
||||
fi
|
||||
|
||||
case $host in
|
||||
*mingw*)
|
||||
TARGET_OS=windows
|
||||
@ -718,8 +729,15 @@ case $host in
|
||||
dnl Avoid the use of aligned vector instructions when building for Windows.
|
||||
dnl See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412.
|
||||
AX_CHECK_COMPILE_FLAG([-Wa,-muse-unaligned-vector-move], [CORE_CXXFLAGS="$CORE_CXXFLAGS -Wa,-muse-unaligned-vector-move"], [], [$CXXFLAG_WERROR])
|
||||
|
||||
AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
|
||||
AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [magick convert],convert)
|
||||
;;
|
||||
*darwin*)
|
||||
if test x$PNG2ICNS = xno; then
|
||||
can_render_icons='png2icns'
|
||||
fi
|
||||
|
||||
TARGET_OS=darwin
|
||||
if test $cross_compiling != "yes"; then
|
||||
BUILD_OS=darwin
|
||||
@ -1395,6 +1413,13 @@ else
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([CAN_RENDER_ICONS], [test "$can_render_icons" = "yes"])
|
||||
if test "$can_render_icons" != "yes"; then
|
||||
if test "$bitcoin_enable_qt" != "no" && test ! -f "${srcdir}/src/qt/res/rendered_icons/bitcoin.ico"; then
|
||||
AC_MSG_ERROR([Couldn't find ${can_render_icons} (required to build GUI from git)])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$enable_fuzz_binary" = "yes"; then
|
||||
AC_MSG_CHECKING([whether main function is needed for fuzz binary])
|
||||
TEMP_LDFLAGS="$LDFLAGS"
|
||||
|
||||
@ -24,6 +24,7 @@ cd "${DISTNAME}"
|
||||
|
||||
./autogen.sh
|
||||
./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
|
||||
make src_files
|
||||
make distclean
|
||||
|
||||
cd ..
|
||||
|
||||
@ -10,6 +10,9 @@
|
||||
(gnu packages file)
|
||||
(gnu packages gawk)
|
||||
(gnu packages gcc)
|
||||
(gnu packages gnome)
|
||||
(gnu packages image)
|
||||
(gnu packages imagemagick)
|
||||
((gnu packages installers) #:select (nsis-x86_64))
|
||||
((gnu packages linux) #:select (linux-libre-headers-6.1 util-linux))
|
||||
(gnu packages llvm)
|
||||
@ -22,6 +25,7 @@
|
||||
((gnu packages tls) #:select (openssl))
|
||||
((gnu packages version-control) #:select (git-minimal))
|
||||
(guix build-system cmake)
|
||||
(guix build-system font)
|
||||
(guix build-system gnu)
|
||||
(guix build-system python)
|
||||
(guix build-system pyproject)
|
||||
@ -163,6 +167,25 @@ chain for " target " development."))
|
||||
(home-page (package-home-page pthreads-xgcc))
|
||||
(license (package-license pthreads-xgcc)))))
|
||||
|
||||
(define-public font-tuffy
|
||||
(package
|
||||
(name "font-tuffy")
|
||||
(version "20120614")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "http://tulrich.com/fonts/")
|
||||
(synopsis "The Tuffy Truetype Font Family")
|
||||
(description
|
||||
"Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
|
||||
(license license:public-domain)))
|
||||
|
||||
;; While LIEF is packaged in Guix, we maintain our own package,
|
||||
;; to simplify building, and more easily apply updates.
|
||||
;; Moreover, the Guix's package uses cmake, which caused build
|
||||
@ -531,6 +554,9 @@ inspecting signatures in Mach-O binaries.")
|
||||
autoconf-2.71
|
||||
automake
|
||||
pkg-config
|
||||
imagemagick
|
||||
libicns
|
||||
librsvg-2.40
|
||||
;; Scripting
|
||||
python-minimal ;; (3.10)
|
||||
;; Git
|
||||
@ -539,7 +565,7 @@ inspecting signatures in Mach-O binaries.")
|
||||
python-lief)
|
||||
(let ((target (getenv "HOST")))
|
||||
(cond ((string-suffix? "-mingw32" target)
|
||||
(list zip
|
||||
(list font-tuffy zip
|
||||
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
|
||||
nsis-x86_64
|
||||
nss-certs
|
||||
|
||||
@ -7,8 +7,11 @@ Some notes on how to build Bitcoin Core in Unix.
|
||||
To Build
|
||||
---------------------
|
||||
|
||||
If you are building from git directly, you need to run `./autogen.sh` before
|
||||
the first time you build. This is not required if you downloaded the source
|
||||
code from the website.
|
||||
|
||||
```bash
|
||||
./autogen.sh
|
||||
./configure
|
||||
make # use "-j N" for N parallel jobs
|
||||
make install # optional
|
||||
@ -87,6 +90,10 @@ Additionally, to support Wayland protocol for modern desktop environments:
|
||||
|
||||
sudo apt install qtwayland5
|
||||
|
||||
If you are building directly from git (instead of the official source code release), you will also need:
|
||||
|
||||
sudo apt install librsvg2-bin imagemagick
|
||||
|
||||
libqrencode (optional) can be installed with:
|
||||
|
||||
sudo apt-get install libqrencode-dev
|
||||
@ -144,6 +151,10 @@ Additionally, to support Wayland protocol for modern desktop environments:
|
||||
|
||||
sudo dnf install qt5-qtwayland
|
||||
|
||||
If you are building directly from git (instead of the official source code release), you will also need:
|
||||
|
||||
sudo dnf install librsvg2-tools ImageMagick
|
||||
|
||||
libqrencode (optional) can be installed with:
|
||||
|
||||
sudo dnf install qrencode-devel
|
||||
@ -202,8 +213,8 @@ Setup and Build Example: Arch Linux
|
||||
-----------------------------------
|
||||
This example lists the steps necessary to setup and build a command line only distribution of the latest changes on Arch Linux:
|
||||
|
||||
pacman --sync --needed autoconf automake boost gcc git libevent libtool make pkgconf python sqlite
|
||||
git clone https://github.com/bitcoin/bitcoin.git
|
||||
pacman --sync --needed autoconf automake boost gcc git libevent libtool make pkgconf python sqlite librsvg imagemagick
|
||||
git clone https://github.com/bitcoinknots/bitcoin.git
|
||||
cd bitcoin/
|
||||
./autogen.sh
|
||||
./configure
|
||||
|
||||
@ -15,11 +15,11 @@ Unicode true
|
||||
!define URL @PACKAGE_URL@
|
||||
|
||||
# MUI Symbol Definitions
|
||||
!define MUI_ICON "@abs_top_srcdir@/share/pixmaps/bitcoin.ico"
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
|
||||
!define MUI_ICON "@abs_top_srcdir@/src/qt/res/rendered_icons/bitcoin.ico"
|
||||
!define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
|
||||
!define MUI_HEADERIMAGE
|
||||
!define MUI_HEADERIMAGE_RIGHT
|
||||
!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
|
||||
!define MUI_HEADERIMAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-header.bmp"
|
||||
!define MUI_FINISHPAGE_NOAUTOCLOSE
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
|
||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
|
||||
@ -28,7 +28,7 @@ Unicode true
|
||||
!define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe"
|
||||
!define MUI_FINISHPAGE_RUN_PARAMETERS $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@
|
||||
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
|
||||
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
|
||||
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
|
||||
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
|
||||
|
||||
# Included files
|
||||
|
||||
@ -1158,6 +1158,52 @@ endif
|
||||
echo "};"; \
|
||||
} > "$@.new" && mv -f "$@.new" "$@"
|
||||
|
||||
# Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball
|
||||
|
||||
RES_RENDERED_ICON_SRC = \
|
||||
qt/res/src/bitcoin.svg \
|
||||
qt/res/src/nsis-header.svg
|
||||
|
||||
RES_RENDERED_ICONS = \
|
||||
qt/res/rendered_icons/bitcoin.ico \
|
||||
qt/res/rendered_icons/bitcoin_testnet.ico \
|
||||
qt/res/rendered_icons/bitcoin1024.png
|
||||
|
||||
RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
|
||||
$(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
|
||||
qt/res/rendered_icons/bitcoin.icns \
|
||||
qt/res/rendered_icons/nsis-wizard.bmp
|
||||
|
||||
EXTRA_DIST += $(RES_RENDERED_ICON_SRC) $(RES_ALL_RENDERED_ICONS)
|
||||
|
||||
if CAN_RENDER_ICONS
|
||||
|
||||
qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
|
||||
@$(MKDIR_P) $(@D)
|
||||
$(AM_V_GEN) $(RSVG_CONVERT) -f png -d $* -p $* < $< > $@
|
||||
|
||||
# NOTE: ImageMagick will never convert transparent PNGs to 8-bit ICOs, but GIF is fine
|
||||
qt/res/rendered_icons/bitcoin%d8.gif: qt/res/rendered_icons/bitcoin%.png
|
||||
$(AM_V_GEN) $(IMAGEMAGICK_CONVERT) $^ -colors 256 -channel A -threshold '50%' $@
|
||||
|
||||
qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 512 1024 32 16)
|
||||
$(AM_V_GEN) $(PNG2ICNS) $@ $^
|
||||
|
||||
qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16)
|
||||
$(AM_V_GEN) $(IMAGEMAGICK_CONVERT) $^ $@
|
||||
|
||||
qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
|
||||
$(AM_V_GEN) $(IMAGEMAGICK_CONVERT) $^ -modulate 100,87,9 $@
|
||||
|
||||
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
|
||||
$(AM_V_GEN) $(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
|
||||
|
||||
qt/res/rendered_icons/nsis-header.bmp: qt/res/src/nsis-header.svg
|
||||
$(AM_V_GEN) sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 57 -p 57 | $(IMAGEMAGICK_CONVERT) - -background white -alpha remove BMP3:$@
|
||||
|
||||
endif
|
||||
|
||||
|
||||
if EMBEDDED_LEVELDB
|
||||
include Makefile.crc32c.include
|
||||
include Makefile.leveldb.include
|
||||
|
||||
@ -107,6 +107,7 @@ QT_MOC = \
|
||||
|
||||
QT_QRC_CPP = qt/qrc_bitcoin.cpp
|
||||
QT_QRC = qt/bitcoin.qrc
|
||||
QT_QRC_BUILD = qt/qrc_bitcoin_build.qrc
|
||||
QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
|
||||
QT_QRC_LOCALE = qt/bitcoin_locale.qrc
|
||||
|
||||
@ -181,12 +182,9 @@ BITCOIN_QT_H = \
|
||||
QT_RES_FONTS = \
|
||||
qt/res/fonts/RobotoMono-Bold.ttf
|
||||
|
||||
QT_RES_ICONS = \
|
||||
QT_RES_ICONS = $(RES_RENDERED_ICONS) \
|
||||
qt/res/icons/add.png \
|
||||
qt/res/icons/address-book.png \
|
||||
qt/res/icons/bitcoin.ico \
|
||||
qt/res/icons/bitcoin_testnet.ico \
|
||||
qt/res/icons/bitcoin.png \
|
||||
qt/res/icons/chevron.png \
|
||||
qt/res/icons/clock1.png \
|
||||
qt/res/icons/clock2.png \
|
||||
@ -307,6 +305,8 @@ QT_RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
|
||||
|
||||
BITCOIN_QT_RC = qt/res/bitcoin-qt-res.rc
|
||||
|
||||
$(BITCOIN_RC): qt/res/rendered_icons/bitcoin.ico qt/res/rendered_icons/bitcoin_testnet.ico
|
||||
|
||||
BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER
|
||||
|
||||
qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
|
||||
@ -394,11 +394,14 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
|
||||
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale --format-version 1 $(@D)/temp_$(<F) > $@
|
||||
@rm $(@D)/temp_$(<F)
|
||||
|
||||
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
|
||||
$(QT_QRC_BUILD): $(QT_QRC)
|
||||
$(SED) -e 's:\(res\/\(icons\|animation\|fonts\)/\):$(abs_srcdir)/qt/\1:' <"$<" >"$@"
|
||||
|
||||
$(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
|
||||
@test -f $(RCC) || (echo "rcc $(RCC) not found, but is required for generating qrc cpp files"; exit 1)
|
||||
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
|
||||
|
||||
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc
|
||||
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD)
|
||||
|
||||
CLEANFILES += $(CLEAN_QT)
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource prefix="/icons">
|
||||
<file alias="bitcoin">res/icons/bitcoin.png</file>
|
||||
<file alias="bitcoin">res/rendered_icons/bitcoin1024.png</file>
|
||||
<file alias="address-book">res/icons/address-book.png</file>
|
||||
<file alias="send">res/icons/send.png</file>
|
||||
<file alias="connect_0">res/icons/connect0.png</file>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico"
|
||||
IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico"
|
||||
IDI_ICON1 ICON DISCARDABLE "rendered_icons/bitcoin.ico"
|
||||
IDI_ICON2 ICON DISCARDABLE "rendered_icons/bitcoin_testnet.ico"
|
||||
|
||||
#include <windows.h> // needed for VERSIONINFO
|
||||
#include "../../clientversion.h" // holds the needed client version information
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1"
|
||||
id="svg2" sodipodi:docname="bitcoin-logo-noshadow.svg" inkscape:version="0.48.2 r9819" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1024px" height="1024px"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1in" height="1in"
|
||||
viewBox="-34 -34 580 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
|
||||
|
||||
<!-- nice shadow with alpha 0.35 -->
|
||||
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.5 KiB |
39
src/qt/res/src/nsis-header.svg
Normal file
39
src/qt/res/src/nsis-header.svg
Normal file
@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!-- Designer: Jonas Schnelli
|
||||
License: MIT
|
||||
-->
|
||||
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1"
|
||||
id="svg2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="2.632in" height="1in"
|
||||
viewBox="-34 -34 1526 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
|
||||
|
||||
<style type="text/css"><![CDATA[
|
||||
text {
|
||||
font-family: "Tuffy";
|
||||
font-size: 210px;
|
||||
fill: black;
|
||||
text-anchor: left;
|
||||
}
|
||||
]]></style>
|
||||
<g transform="scale(0.54, 0.54) translate(-25, 230)">
|
||||
<path fill="black" d="M254.647,174.6l-13.983,56.08c15.855,3.951,64.735,20.071,72.656-11.656
|
||||
C321.568,185.928,270.503,178.552,254.647,174.6z"/>
|
||||
|
||||
<path fill="black" d="M233.608,258.984l-15.425,61.832c19.04,4.729,77.769,23.584,86.448-11.296
|
||||
C313.703,273.144,252.647,263.736,233.608,258.984z"/>
|
||||
|
||||
<path fill="black" d="M317.871,7.656c-137.12-34.192-276.024,49.28-310.2,186.44
|
||||
c-34.208,137.136,49.256,276.048,186.36,310.24c137.16,34.199,276.063-49.265,310.256-186.408
|
||||
C538.479,180.776,455.023,41.848,317.871,7.656z M368.807,219.528c-3.688,24.936-17.512,37.008-35.864,41.24
|
||||
c25.2,13.12,38.024,33.239,25.809,68.12c-15.16,43.319-51.176,46.976-99.072,37.912l-11.624,46.584l-28.088-7l11.472-45.96
|
||||
c-7.279-1.809-14.72-3.729-22.384-5.809l-11.512,46.177l-28.056-7l11.624-46.673c-6.561-1.68-13.225-3.464-20.024-5.168
|
||||
l-36.552-9.111l13.943-32.152c0,0,20.696,5.504,20.416,5.096c7.952,1.969,11.48-3.216,12.872-6.672l18.368-73.64l0.048-0.2
|
||||
l13.104-52.568c0.344-5.968-1.712-13.496-13.088-16.336c0.439-0.296-20.4-5.072-20.4-5.072l7.472-30l38.736,9.673l-0.032,0.144
|
||||
c5.824,1.448,11.824,2.824,17.937,4.216L245.423,89.2l28.072,7l-11.28,45.224c7.536,1.721,15.12,3.456,22.504,5.297l11.2-44.929
|
||||
l28.088,7l-11.504,46.145C347.967,167.152,373.904,185.464,368.807,219.528z"/>
|
||||
</g>
|
||||
<text x="320" y="336">PACKAGE_NAME</text>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
Loading…
Reference in New Issue
Block a user