Merge bitcoin-core/gui#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

contrib/devtools/optimize-pngs.py

@@ -27,7 +27,7 @@ def content_hash(filename):
 pngcrush = 'pngcrush'
 git = 'git'
 folders = [
-    "src/qt/res/movies",
+    "src/qt/res/animation",
     "src/qt/res/icons",
     "src/qt/res/images",
     "share/pixmaps"

src/Makefile.qt.include

@@ -350,7 +350,7 @@ RES_FONTS = \
   qt/res/fonts/Montserrat/Montserrat-Thin.otf \
   qt/res/fonts/Montserrat/Montserrat-ThinItalic.otf
 
-RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
+RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
 
 BITCOIN_RC = qt/res/dash-qt-res.rc
 
@@ -362,7 +362,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_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES)
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_ANIMATION)
 if TARGET_DARWIN
   qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
 endif
@@ -435,7 +435,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash_locale --format-version 1 $(@D)/temp_$(<F) > $@
 	@rm $(@D)/temp_$(<F)
 
-$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES)
+$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_ANIMATION)
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash --format-version 1 $< > $@
 

src/qt/bitcoingui.cpp

@@ -273,7 +273,7 @@ void BitcoinGUI::startSpinner()
         static std::vector<std::unique_ptr<QPixmap>>::iterator itFrame;
         while (vecFrames.size() < SPINNER_FRAMES) {
             QString&& strFrame = QString("spinner-%1").arg(vecFrames.size(), 3, 10, QChar('0'));
-            QPixmap&& frame = getIcon(strFrame, GUIUtil::ThemedColor::ORANGE, MOVIES_PATH).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE);
+            QPixmap&& frame = getIcon(strFrame, GUIUtil::ThemedColor::ORANGE, ":animation/").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE);
             itFrame = vecFrames.insert(vecFrames.end(), std::make_unique<QPixmap>(frame));
         }
         assert(vecFrames.size() == SPINNER_FRAMES);

src/qt/dash.qrc

@@ -106,96 +106,96 @@
         <file alias="radio_checked_disabled_light">res/images/radio_checked_disabled_light.png</file>
         <file alias="splash">res/images/splash.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>
-        <file alias="spinner-036">res/movies/spinner-036.png</file>
-        <file alias="spinner-037">res/movies/spinner-037.png</file>
-        <file alias="spinner-038">res/movies/spinner-038.png</file>
-        <file alias="spinner-039">res/movies/spinner-039.png</file>
-        <file alias="spinner-040">res/movies/spinner-040.png</file>
-        <file alias="spinner-041">res/movies/spinner-041.png</file>
-        <file alias="spinner-042">res/movies/spinner-042.png</file>
-        <file alias="spinner-043">res/movies/spinner-043.png</file>
-        <file alias="spinner-044">res/movies/spinner-044.png</file>
-        <file alias="spinner-045">res/movies/spinner-045.png</file>
-        <file alias="spinner-046">res/movies/spinner-046.png</file>
-        <file alias="spinner-047">res/movies/spinner-047.png</file>
-        <file alias="spinner-048">res/movies/spinner-048.png</file>
-        <file alias="spinner-049">res/movies/spinner-049.png</file>
-        <file alias="spinner-050">res/movies/spinner-050.png</file>
-        <file alias="spinner-051">res/movies/spinner-051.png</file>
-        <file alias="spinner-052">res/movies/spinner-052.png</file>
-        <file alias="spinner-053">res/movies/spinner-053.png</file>
-        <file alias="spinner-054">res/movies/spinner-054.png</file>
-        <file alias="spinner-055">res/movies/spinner-055.png</file>
-        <file alias="spinner-056">res/movies/spinner-056.png</file>
-        <file alias="spinner-057">res/movies/spinner-057.png</file>
-        <file alias="spinner-058">res/movies/spinner-058.png</file>
-        <file alias="spinner-059">res/movies/spinner-059.png</file>
-        <file alias="spinner-060">res/movies/spinner-060.png</file>
-        <file alias="spinner-061">res/movies/spinner-061.png</file>
-        <file alias="spinner-062">res/movies/spinner-062.png</file>
-        <file alias="spinner-063">res/movies/spinner-063.png</file>
-        <file alias="spinner-064">res/movies/spinner-064.png</file>
-        <file alias="spinner-065">res/movies/spinner-065.png</file>
-        <file alias="spinner-066">res/movies/spinner-066.png</file>
-        <file alias="spinner-067">res/movies/spinner-067.png</file>
-        <file alias="spinner-068">res/movies/spinner-068.png</file>
-        <file alias="spinner-069">res/movies/spinner-069.png</file>
-        <file alias="spinner-070">res/movies/spinner-070.png</file>
-        <file alias="spinner-071">res/movies/spinner-071.png</file>
-        <file alias="spinner-072">res/movies/spinner-072.png</file>
-        <file alias="spinner-073">res/movies/spinner-073.png</file>
-        <file alias="spinner-074">res/movies/spinner-074.png</file>
-        <file alias="spinner-075">res/movies/spinner-075.png</file>
-        <file alias="spinner-076">res/movies/spinner-076.png</file>
-        <file alias="spinner-077">res/movies/spinner-077.png</file>
-        <file alias="spinner-078">res/movies/spinner-078.png</file>
-        <file alias="spinner-079">res/movies/spinner-079.png</file>
-        <file alias="spinner-080">res/movies/spinner-080.png</file>
-        <file alias="spinner-081">res/movies/spinner-081.png</file>
-        <file alias="spinner-082">res/movies/spinner-082.png</file>
-        <file alias="spinner-083">res/movies/spinner-083.png</file>
-        <file alias="spinner-084">res/movies/spinner-084.png</file>
-        <file alias="spinner-085">res/movies/spinner-085.png</file>
-        <file alias="spinner-086">res/movies/spinner-086.png</file>
-        <file alias="spinner-087">res/movies/spinner-087.png</file>
-        <file alias="spinner-088">res/movies/spinner-088.png</file>
-        <file alias="spinner-089">res/movies/spinner-089.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>
+        <file alias="spinner-036">res/animation/spinner-036.png</file>
+        <file alias="spinner-037">res/animation/spinner-037.png</file>
+        <file alias="spinner-038">res/animation/spinner-038.png</file>
+        <file alias="spinner-039">res/animation/spinner-039.png</file>
+        <file alias="spinner-040">res/animation/spinner-040.png</file>
+        <file alias="spinner-041">res/animation/spinner-041.png</file>
+        <file alias="spinner-042">res/animation/spinner-042.png</file>
+        <file alias="spinner-043">res/animation/spinner-043.png</file>
+        <file alias="spinner-044">res/animation/spinner-044.png</file>
+        <file alias="spinner-045">res/animation/spinner-045.png</file>
+        <file alias="spinner-046">res/animation/spinner-046.png</file>
+        <file alias="spinner-047">res/animation/spinner-047.png</file>
+        <file alias="spinner-048">res/animation/spinner-048.png</file>
+        <file alias="spinner-049">res/animation/spinner-049.png</file>
+        <file alias="spinner-050">res/animation/spinner-050.png</file>
+        <file alias="spinner-051">res/animation/spinner-051.png</file>
+        <file alias="spinner-052">res/animation/spinner-052.png</file>
+        <file alias="spinner-053">res/animation/spinner-053.png</file>
+        <file alias="spinner-054">res/animation/spinner-054.png</file>
+        <file alias="spinner-055">res/animation/spinner-055.png</file>
+        <file alias="spinner-056">res/animation/spinner-056.png</file>
+        <file alias="spinner-057">res/animation/spinner-057.png</file>
+        <file alias="spinner-058">res/animation/spinner-058.png</file>
+        <file alias="spinner-059">res/animation/spinner-059.png</file>
+        <file alias="spinner-060">res/animation/spinner-060.png</file>
+        <file alias="spinner-061">res/animation/spinner-061.png</file>
+        <file alias="spinner-062">res/animation/spinner-062.png</file>
+        <file alias="spinner-063">res/animation/spinner-063.png</file>
+        <file alias="spinner-064">res/animation/spinner-064.png</file>
+        <file alias="spinner-065">res/animation/spinner-065.png</file>
+        <file alias="spinner-066">res/animation/spinner-066.png</file>
+        <file alias="spinner-067">res/animation/spinner-067.png</file>
+        <file alias="spinner-068">res/animation/spinner-068.png</file>
+        <file alias="spinner-069">res/animation/spinner-069.png</file>
+        <file alias="spinner-070">res/animation/spinner-070.png</file>
+        <file alias="spinner-071">res/animation/spinner-071.png</file>
+        <file alias="spinner-072">res/animation/spinner-072.png</file>
+        <file alias="spinner-073">res/animation/spinner-073.png</file>
+        <file alias="spinner-074">res/animation/spinner-074.png</file>
+        <file alias="spinner-075">res/animation/spinner-075.png</file>
+        <file alias="spinner-076">res/animation/spinner-076.png</file>
+        <file alias="spinner-077">res/animation/spinner-077.png</file>
+        <file alias="spinner-078">res/animation/spinner-078.png</file>
+        <file alias="spinner-079">res/animation/spinner-079.png</file>
+        <file alias="spinner-080">res/animation/spinner-080.png</file>
+        <file alias="spinner-081">res/animation/spinner-081.png</file>
+        <file alias="spinner-082">res/animation/spinner-082.png</file>
+        <file alias="spinner-083">res/animation/spinner-083.png</file>
+        <file alias="spinner-084">res/animation/spinner-084.png</file>
+        <file alias="spinner-085">res/animation/spinner-085.png</file>
+        <file alias="spinner-086">res/animation/spinner-086.png</file>
+        <file alias="spinner-087">res/animation/spinner-087.png</file>
+        <file alias="spinner-088">res/animation/spinner-088.png</file>
+        <file alias="spinner-089">res/animation/spinner-089.png</file>
     </qresource>
 </RCC>

src/qt/guiconstants.h

@@ -26,8 +26,6 @@ static const bool DEFAULT_SPLASHSCREEN = true;
 #define RGB_HALF 0x7f7f7f
 /** Path to the icon resource folder */
 #define ICONS_PATH ":icons/"
-/** Path to the movies resource folder */
-#define MOVIES_PATH ":movies/"
 
 /* Tooltips longer than this (in characters) are converted into rich text,
    so that they can be word-wrapped.