Skip to content

Commit 6a53c3e

Browse files
author
MarcoFalke
committed
Merge bitcoin-core#14: scripted-diff: rename movie folder to animation
80968cf scripted-diff: rename movie folder to animation (Peter Bushnell) Pull request description: Rename the movies directory and RES_MOVIES make variable to animation and RES_ANIMATION respectively. Movies is a bit of an unexpected term to be found. ACKs for top commit: MarcoFalke: ACK 80968cf hebasto: ACK 80968cf, tested on Linux Mint 20 (Qt 5.12.8). Tree-SHA512: 6bd31ce36e821f6a1bef8a7972086a2387d6258c48fc9df12d3ffdae07d0237036afbc2dec673384b78d9567b91d6e12eafa59fa2305aa79153dfd9b7c3a8655
2 parents 9a714c5 + 80968cf commit 6a53c3e

40 files changed

+41
-41
lines changed

‎src/Makefile.qt.include

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ if ENABLE_WALLET
276276
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
277277
endif # ENABLE_WALLET
278278

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

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

@@ -288,7 +288,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
288288
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
289289

290290
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
291-
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_MOVIES)
291+
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_ANIMATION)
292292
if TARGET_DARWIN
293293
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
294294
endif
@@ -359,7 +359,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
359359
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
360360
@rm $(@D)/temp_$(<F)
361361

362-
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_MOVIES)
362+
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_ANIMATION)
363363
@test -f $(RCC)
364364
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
365365
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@

‎src/qt/bitcoin.qrc

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -45,42 +45,42 @@
4545
<file alias="network_disabled">res/icons/network_disabled.png</file>
4646
<file alias="proxy">res/icons/proxy.png</file>
4747
</qresource>
48-
<qresource prefix="/movies">
49-
<file alias="spinner-000">res/movies/spinner-000.png</file>
50-
<file alias="spinner-001">res/movies/spinner-001.png</file>
51-
<file alias="spinner-002">res/movies/spinner-002.png</file>
52-
<file alias="spinner-003">res/movies/spinner-003.png</file>
53-
<file alias="spinner-004">res/movies/spinner-004.png</file>
54-
<file alias="spinner-005">res/movies/spinner-005.png</file>
55-
<file alias="spinner-006">res/movies/spinner-006.png</file>
56-
<file alias="spinner-007">res/movies/spinner-007.png</file>
57-
<file alias="spinner-008">res/movies/spinner-008.png</file>
58-
<file alias="spinner-009">res/movies/spinner-009.png</file>
59-
<file alias="spinner-010">res/movies/spinner-010.png</file>
60-
<file alias="spinner-011">res/movies/spinner-011.png</file>
61-
<file alias="spinner-012">res/movies/spinner-012.png</file>
62-
<file alias="spinner-013">res/movies/spinner-013.png</file>
63-
<file alias="spinner-014">res/movies/spinner-014.png</file>
64-
<file alias="spinner-015">res/movies/spinner-015.png</file>
65-
<file alias="spinner-016">res/movies/spinner-016.png</file>
66-
<file alias="spinner-017">res/movies/spinner-017.png</file>
67-
<file alias="spinner-018">res/movies/spinner-018.png</file>
68-
<file alias="spinner-019">res/movies/spinner-019.png</file>
69-
<file alias="spinner-020">res/movies/spinner-020.png</file>
70-
<file alias="spinner-021">res/movies/spinner-021.png</file>
71-
<file alias="spinner-022">res/movies/spinner-022.png</file>
72-
<file alias="spinner-023">res/movies/spinner-023.png</file>
73-
<file alias="spinner-024">res/movies/spinner-024.png</file>
74-
<file alias="spinner-025">res/movies/spinner-025.png</file>
75-
<file alias="spinner-026">res/movies/spinner-026.png</file>
76-
<file alias="spinner-027">res/movies/spinner-027.png</file>
77-
<file alias="spinner-028">res/movies/spinner-028.png</file>
78-
<file alias="spinner-029">res/movies/spinner-029.png</file>
79-
<file alias="spinner-030">res/movies/spinner-030.png</file>
80-
<file alias="spinner-031">res/movies/spinner-031.png</file>
81-
<file alias="spinner-032">res/movies/spinner-032.png</file>
82-
<file alias="spinner-033">res/movies/spinner-033.png</file>
83-
<file alias="spinner-034">res/movies/spinner-034.png</file>
84-
<file alias="spinner-035">res/movies/spinner-035.png</file>
48+
<qresource prefix="/animation">
49+
<file alias="spinner-000">res/animation/spinner-000.png</file>
50+
<file alias="spinner-001">res/animation/spinner-001.png</file>
51+
<file alias="spinner-002">res/animation/spinner-002.png</file>
52+
<file alias="spinner-003">res/animation/spinner-003.png</file>
53+
<file alias="spinner-004">res/animation/spinner-004.png</file>
54+
<file alias="spinner-005">res/animation/spinner-005.png</file>
55+
<file alias="spinner-006">res/animation/spinner-006.png</file>
56+
<file alias="spinner-007">res/animation/spinner-007.png</file>
57+
<file alias="spinner-008">res/animation/spinner-008.png</file>
58+
<file alias="spinner-009">res/animation/spinner-009.png</file>
59+
<file alias="spinner-010">res/animation/spinner-010.png</file>
60+
<file alias="spinner-011">res/animation/spinner-011.png</file>
61+
<file alias="spinner-012">res/animation/spinner-012.png</file>
62+
<file alias="spinner-013">res/animation/spinner-013.png</file>
63+
<file alias="spinner-014">res/animation/spinner-014.png</file>
64+
<file alias="spinner-015">res/animation/spinner-015.png</file>
65+
<file alias="spinner-016">res/animation/spinner-016.png</file>
66+
<file alias="spinner-017">res/animation/spinner-017.png</file>
67+
<file alias="spinner-018">res/animation/spinner-018.png</file>
68+
<file alias="spinner-019">res/animation/spinner-019.png</file>
69+
<file alias="spinner-020">res/animation/spinner-020.png</file>
70+
<file alias="spinner-021">res/animation/spinner-021.png</file>
71+
<file alias="spinner-022">res/animation/spinner-022.png</file>
72+
<file alias="spinner-023">res/animation/spinner-023.png</file>
73+
<file alias="spinner-024">res/animation/spinner-024.png</file>
74+
<file alias="spinner-025">res/animation/spinner-025.png</file>
75+
<file alias="spinner-026">res/animation/spinner-026.png</file>
76+
<file alias="spinner-027">res/animation/spinner-027.png</file>
77+
<file alias="spinner-028">res/animation/spinner-028.png</file>
78+
<file alias="spinner-029">res/animation/spinner-029.png</file>
79+
<file alias="spinner-030">res/animation/spinner-030.png</file>
80+
<file alias="spinner-031">res/animation/spinner-031.png</file>
81+
<file alias="spinner-032">res/animation/spinner-032.png</file>
82+
<file alias="spinner-033">res/animation/spinner-033.png</file>
83+
<file alias="spinner-034">res/animation/spinner-034.png</file>
84+
<file alias="spinner-035">res/animation/spinner-035.png</file>
8585
</qresource>
8686
</RCC>

‎src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
10401040
if(count != prevBlocks)
10411041
{
10421042
labelBlocksIcon->setPixmap(platformStyle->SingleColorIcon(QString(
1043-
":/movies/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')))
1043+
":/animation/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')))
10441044
.pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
10451045
spinnerFrame = (spinnerFrame + 1) % SPINNER_FRAMES;
10461046
}

‎src/qt/res/movies/makespinner.sh renamed to ‎src/qt/res/animation/makespinner.sh

File renamed without changes.

‎src/qt/res/movies/spinner-000.png renamed to ‎src/qt/res/animation/spinner-000.png

File renamed without changes.

‎src/qt/res/movies/spinner-001.png renamed to ‎src/qt/res/animation/spinner-001.png

File renamed without changes.

‎src/qt/res/movies/spinner-002.png renamed to ‎src/qt/res/animation/spinner-002.png

File renamed without changes.

‎src/qt/res/movies/spinner-003.png renamed to ‎src/qt/res/animation/spinner-003.png

File renamed without changes.

‎src/qt/res/movies/spinner-004.png renamed to ‎src/qt/res/animation/spinner-004.png

File renamed without changes.

‎src/qt/res/movies/spinner-005.png renamed to ‎src/qt/res/animation/spinner-005.png

File renamed without changes.

0 commit comments

Comments
 (0)