Skip to content

Commit

Permalink
Merge 6a53c3e into merged_master (Bitcoin PR bitcoin-core/gui#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
apoelstra committed Nov 26, 2020
2 parents 6d69f4d + 6a53c3e commit f93efd3
Show file tree
Hide file tree
Showing 40 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ if ENABLE_WALLET
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
endif # ENABLE_WALLET

RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)

BITCOIN_RC = qt/res/bitcoin-qt-res.rc

Expand All @@ -283,7 +283,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)

qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_MOVIES)
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_ANIMATION)
if TARGET_DARWIN
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
endif
Expand Down Expand Up @@ -357,7 +357,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
$(QT_QRC_BUILD): $(QT_QRC)
$(SED) -e 's:\(res\/\(icons\|movies\)/\):$(abs_srcdir)/qt/\1:' <"$<" >"$@"

$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_MOVIES)
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_ANIMATION)
@test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
Expand Down
74 changes: 37 additions & 37 deletions src/qt/bitcoin.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,42 +45,42 @@
<file alias="network_disabled">res/icons/network_disabled.png</file>
<file alias="proxy">res/icons/proxy.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
<file alias="spinner-001">res/movies/spinner-001.png</file>
<file alias="spinner-002">res/movies/spinner-002.png</file>
<file alias="spinner-003">res/movies/spinner-003.png</file>
<file alias="spinner-004">res/movies/spinner-004.png</file>
<file alias="spinner-005">res/movies/spinner-005.png</file>
<file alias="spinner-006">res/movies/spinner-006.png</file>
<file alias="spinner-007">res/movies/spinner-007.png</file>
<file alias="spinner-008">res/movies/spinner-008.png</file>
<file alias="spinner-009">res/movies/spinner-009.png</file>
<file alias="spinner-010">res/movies/spinner-010.png</file>
<file alias="spinner-011">res/movies/spinner-011.png</file>
<file alias="spinner-012">res/movies/spinner-012.png</file>
<file alias="spinner-013">res/movies/spinner-013.png</file>
<file alias="spinner-014">res/movies/spinner-014.png</file>
<file alias="spinner-015">res/movies/spinner-015.png</file>
<file alias="spinner-016">res/movies/spinner-016.png</file>
<file alias="spinner-017">res/movies/spinner-017.png</file>
<file alias="spinner-018">res/movies/spinner-018.png</file>
<file alias="spinner-019">res/movies/spinner-019.png</file>
<file alias="spinner-020">res/movies/spinner-020.png</file>
<file alias="spinner-021">res/movies/spinner-021.png</file>
<file alias="spinner-022">res/movies/spinner-022.png</file>
<file alias="spinner-023">res/movies/spinner-023.png</file>
<file alias="spinner-024">res/movies/spinner-024.png</file>
<file alias="spinner-025">res/movies/spinner-025.png</file>
<file alias="spinner-026">res/movies/spinner-026.png</file>
<file alias="spinner-027">res/movies/spinner-027.png</file>
<file alias="spinner-028">res/movies/spinner-028.png</file>
<file alias="spinner-029">res/movies/spinner-029.png</file>
<file alias="spinner-030">res/movies/spinner-030.png</file>
<file alias="spinner-031">res/movies/spinner-031.png</file>
<file alias="spinner-032">res/movies/spinner-032.png</file>
<file alias="spinner-033">res/movies/spinner-033.png</file>
<file alias="spinner-034">res/movies/spinner-034.png</file>
<file alias="spinner-035">res/movies/spinner-035.png</file>
<qresource prefix="/animation">
<file alias="spinner-000">res/animation/spinner-000.png</file>
<file alias="spinner-001">res/animation/spinner-001.png</file>
<file alias="spinner-002">res/animation/spinner-002.png</file>
<file alias="spinner-003">res/animation/spinner-003.png</file>
<file alias="spinner-004">res/animation/spinner-004.png</file>
<file alias="spinner-005">res/animation/spinner-005.png</file>
<file alias="spinner-006">res/animation/spinner-006.png</file>
<file alias="spinner-007">res/animation/spinner-007.png</file>
<file alias="spinner-008">res/animation/spinner-008.png</file>
<file alias="spinner-009">res/animation/spinner-009.png</file>
<file alias="spinner-010">res/animation/spinner-010.png</file>
<file alias="spinner-011">res/animation/spinner-011.png</file>
<file alias="spinner-012">res/animation/spinner-012.png</file>
<file alias="spinner-013">res/animation/spinner-013.png</file>
<file alias="spinner-014">res/animation/spinner-014.png</file>
<file alias="spinner-015">res/animation/spinner-015.png</file>
<file alias="spinner-016">res/animation/spinner-016.png</file>
<file alias="spinner-017">res/animation/spinner-017.png</file>
<file alias="spinner-018">res/animation/spinner-018.png</file>
<file alias="spinner-019">res/animation/spinner-019.png</file>
<file alias="spinner-020">res/animation/spinner-020.png</file>
<file alias="spinner-021">res/animation/spinner-021.png</file>
<file alias="spinner-022">res/animation/spinner-022.png</file>
<file alias="spinner-023">res/animation/spinner-023.png</file>
<file alias="spinner-024">res/animation/spinner-024.png</file>
<file alias="spinner-025">res/animation/spinner-025.png</file>
<file alias="spinner-026">res/animation/spinner-026.png</file>
<file alias="spinner-027">res/animation/spinner-027.png</file>
<file alias="spinner-028">res/animation/spinner-028.png</file>
<file alias="spinner-029">res/animation/spinner-029.png</file>
<file alias="spinner-030">res/animation/spinner-030.png</file>
<file alias="spinner-031">res/animation/spinner-031.png</file>
<file alias="spinner-032">res/animation/spinner-032.png</file>
<file alias="spinner-033">res/animation/spinner-033.png</file>
<file alias="spinner-034">res/animation/spinner-034.png</file>
<file alias="spinner-035">res/animation/spinner-035.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
if(count != prevBlocks)
{
labelBlocksIcon->setPixmap(platformStyle->SingleColorIcon(QString(
":/movies/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')))
":/animation/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')))
.pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
spinnerFrame = (spinnerFrame + 1) % SPINNER_FRAMES;
}
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit f93efd3

Please sign in to comment.