From 4b8dc1e43575fa988b080eb11794e9be37f5f83b Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Sat, 13 Jan 2024 05:45:25 +0700 Subject: [PATCH] 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 | 2 +- src/Makefile.qt.include | 6 +- src/qt/bitcoingui.cpp | 2 +- src/qt/dash.qrc | 182 +++++++++--------- src/qt/guiconstants.h | 2 - .../res/{movies => animation}/makespinner.sh | 0 .../res/{movies => animation}/spinner-000.png | Bin .../res/{movies => animation}/spinner-001.png | Bin .../res/{movies => animation}/spinner-002.png | Bin .../res/{movies => animation}/spinner-003.png | Bin .../res/{movies => animation}/spinner-004.png | Bin .../res/{movies => animation}/spinner-005.png | Bin .../res/{movies => animation}/spinner-006.png | Bin .../res/{movies => animation}/spinner-007.png | Bin .../res/{movies => animation}/spinner-008.png | Bin .../res/{movies => animation}/spinner-009.png | Bin .../res/{movies => animation}/spinner-010.png | Bin .../res/{movies => animation}/spinner-011.png | Bin .../res/{movies => animation}/spinner-012.png | Bin .../res/{movies => animation}/spinner-013.png | Bin .../res/{movies => animation}/spinner-014.png | Bin .../res/{movies => animation}/spinner-015.png | Bin .../res/{movies => animation}/spinner-016.png | Bin .../res/{movies => animation}/spinner-017.png | Bin .../res/{movies => animation}/spinner-018.png | Bin .../res/{movies => animation}/spinner-019.png | Bin .../res/{movies => animation}/spinner-020.png | Bin .../res/{movies => animation}/spinner-021.png | Bin .../res/{movies => animation}/spinner-022.png | Bin .../res/{movies => animation}/spinner-023.png | Bin .../res/{movies => animation}/spinner-024.png | Bin .../res/{movies => animation}/spinner-025.png | Bin .../res/{movies => animation}/spinner-026.png | Bin .../res/{movies => animation}/spinner-027.png | Bin .../res/{movies => animation}/spinner-028.png | Bin .../res/{movies => animation}/spinner-029.png | Bin .../res/{movies => animation}/spinner-030.png | Bin .../res/{movies => animation}/spinner-031.png | Bin .../res/{movies => animation}/spinner-032.png | Bin .../res/{movies => animation}/spinner-033.png | Bin .../res/{movies => animation}/spinner-034.png | Bin .../res/{movies => animation}/spinner-035.png | Bin .../res/{movies => animation}/spinner-036.png | Bin .../res/{movies => animation}/spinner-037.png | Bin .../res/{movies => animation}/spinner-038.png | Bin .../res/{movies => animation}/spinner-039.png | Bin .../res/{movies => animation}/spinner-040.png | Bin .../res/{movies => animation}/spinner-041.png | Bin .../res/{movies => animation}/spinner-042.png | Bin .../res/{movies => animation}/spinner-043.png | Bin .../res/{movies => animation}/spinner-044.png | Bin .../res/{movies => animation}/spinner-045.png | Bin .../res/{movies => animation}/spinner-046.png | Bin .../res/{movies => animation}/spinner-047.png | Bin .../res/{movies => animation}/spinner-048.png | Bin .../res/{movies => animation}/spinner-049.png | Bin .../res/{movies => animation}/spinner-050.png | Bin .../res/{movies => animation}/spinner-051.png | Bin .../res/{movies => animation}/spinner-052.png | Bin .../res/{movies => animation}/spinner-053.png | Bin .../res/{movies => animation}/spinner-054.png | Bin .../res/{movies => animation}/spinner-055.png | Bin .../res/{movies => animation}/spinner-056.png | Bin .../res/{movies => animation}/spinner-057.png | Bin .../res/{movies => animation}/spinner-058.png | Bin .../res/{movies => animation}/spinner-059.png | Bin .../res/{movies => animation}/spinner-060.png | Bin .../res/{movies => animation}/spinner-061.png | Bin .../res/{movies => animation}/spinner-062.png | Bin .../res/{movies => animation}/spinner-063.png | Bin .../res/{movies => animation}/spinner-064.png | Bin .../res/{movies => animation}/spinner-065.png | Bin .../res/{movies => animation}/spinner-066.png | Bin .../res/{movies => animation}/spinner-067.png | Bin .../res/{movies => animation}/spinner-068.png | Bin .../res/{movies => animation}/spinner-069.png | Bin .../res/{movies => animation}/spinner-070.png | Bin .../res/{movies => animation}/spinner-071.png | Bin .../res/{movies => animation}/spinner-072.png | Bin .../res/{movies => animation}/spinner-073.png | Bin .../res/{movies => animation}/spinner-074.png | Bin .../res/{movies => animation}/spinner-075.png | Bin .../res/{movies => animation}/spinner-076.png | Bin .../res/{movies => animation}/spinner-077.png | Bin .../res/{movies => animation}/spinner-078.png | Bin .../res/{movies => animation}/spinner-079.png | Bin .../res/{movies => animation}/spinner-080.png | Bin .../res/{movies => animation}/spinner-081.png | Bin .../res/{movies => animation}/spinner-082.png | Bin .../res/{movies => animation}/spinner-083.png | Bin .../res/{movies => animation}/spinner-084.png | Bin .../res/{movies => animation}/spinner-085.png | Bin .../res/{movies => animation}/spinner-086.png | Bin .../res/{movies => animation}/spinner-087.png | Bin .../res/{movies => animation}/spinner-088.png | Bin .../res/{movies => animation}/spinner-089.png | Bin 96 files changed, 96 insertions(+), 98 deletions(-) rename src/qt/res/{movies => animation}/makespinner.sh (100%) rename src/qt/res/{movies => animation}/spinner-000.png (100%) rename src/qt/res/{movies => animation}/spinner-001.png (100%) rename src/qt/res/{movies => animation}/spinner-002.png (100%) rename src/qt/res/{movies => animation}/spinner-003.png (100%) rename src/qt/res/{movies => animation}/spinner-004.png (100%) rename src/qt/res/{movies => animation}/spinner-005.png (100%) rename src/qt/res/{movies => animation}/spinner-006.png (100%) rename src/qt/res/{movies => animation}/spinner-007.png (100%) rename src/qt/res/{movies => animation}/spinner-008.png (100%) rename src/qt/res/{movies => animation}/spinner-009.png (100%) rename src/qt/res/{movies => animation}/spinner-010.png (100%) rename src/qt/res/{movies => animation}/spinner-011.png (100%) rename src/qt/res/{movies => animation}/spinner-012.png (100%) rename src/qt/res/{movies => animation}/spinner-013.png (100%) rename src/qt/res/{movies => animation}/spinner-014.png (100%) rename src/qt/res/{movies => animation}/spinner-015.png (100%) rename src/qt/res/{movies => animation}/spinner-016.png (100%) rename src/qt/res/{movies => animation}/spinner-017.png (100%) rename src/qt/res/{movies => animation}/spinner-018.png (100%) rename src/qt/res/{movies => animation}/spinner-019.png (100%) rename src/qt/res/{movies => animation}/spinner-020.png (100%) rename src/qt/res/{movies => animation}/spinner-021.png (100%) rename src/qt/res/{movies => animation}/spinner-022.png (100%) rename src/qt/res/{movies => animation}/spinner-023.png (100%) rename src/qt/res/{movies => animation}/spinner-024.png (100%) rename src/qt/res/{movies => animation}/spinner-025.png (100%) rename src/qt/res/{movies => animation}/spinner-026.png (100%) rename src/qt/res/{movies => animation}/spinner-027.png (100%) rename src/qt/res/{movies => animation}/spinner-028.png (100%) rename src/qt/res/{movies => animation}/spinner-029.png (100%) rename src/qt/res/{movies => animation}/spinner-030.png (100%) rename src/qt/res/{movies => animation}/spinner-031.png (100%) rename src/qt/res/{movies => animation}/spinner-032.png (100%) rename src/qt/res/{movies => animation}/spinner-033.png (100%) rename src/qt/res/{movies => animation}/spinner-034.png (100%) rename src/qt/res/{movies => animation}/spinner-035.png (100%) rename src/qt/res/{movies => animation}/spinner-036.png (100%) rename src/qt/res/{movies => animation}/spinner-037.png (100%) rename src/qt/res/{movies => animation}/spinner-038.png (100%) rename src/qt/res/{movies => animation}/spinner-039.png (100%) rename src/qt/res/{movies => animation}/spinner-040.png (100%) rename src/qt/res/{movies => animation}/spinner-041.png (100%) rename src/qt/res/{movies => animation}/spinner-042.png (100%) rename src/qt/res/{movies => animation}/spinner-043.png (100%) rename src/qt/res/{movies => animation}/spinner-044.png (100%) rename src/qt/res/{movies => animation}/spinner-045.png (100%) rename src/qt/res/{movies => animation}/spinner-046.png (100%) rename src/qt/res/{movies => animation}/spinner-047.png (100%) rename src/qt/res/{movies => animation}/spinner-048.png (100%) rename src/qt/res/{movies => animation}/spinner-049.png (100%) rename src/qt/res/{movies => animation}/spinner-050.png (100%) rename src/qt/res/{movies => animation}/spinner-051.png (100%) rename src/qt/res/{movies => animation}/spinner-052.png (100%) rename src/qt/res/{movies => animation}/spinner-053.png (100%) rename src/qt/res/{movies => animation}/spinner-054.png (100%) rename src/qt/res/{movies => animation}/spinner-055.png (100%) rename src/qt/res/{movies => animation}/spinner-056.png (100%) rename src/qt/res/{movies => animation}/spinner-057.png (100%) rename src/qt/res/{movies => animation}/spinner-058.png (100%) rename src/qt/res/{movies => animation}/spinner-059.png (100%) rename src/qt/res/{movies => animation}/spinner-060.png (100%) rename src/qt/res/{movies => animation}/spinner-061.png (100%) rename src/qt/res/{movies => animation}/spinner-062.png (100%) rename src/qt/res/{movies => animation}/spinner-063.png (100%) rename src/qt/res/{movies => animation}/spinner-064.png (100%) rename src/qt/res/{movies => animation}/spinner-065.png (100%) rename src/qt/res/{movies => animation}/spinner-066.png (100%) rename src/qt/res/{movies => animation}/spinner-067.png (100%) rename src/qt/res/{movies => animation}/spinner-068.png (100%) rename src/qt/res/{movies => animation}/spinner-069.png (100%) rename src/qt/res/{movies => animation}/spinner-070.png (100%) rename src/qt/res/{movies => animation}/spinner-071.png (100%) rename src/qt/res/{movies => animation}/spinner-072.png (100%) rename src/qt/res/{movies => animation}/spinner-073.png (100%) rename src/qt/res/{movies => animation}/spinner-074.png (100%) rename src/qt/res/{movies => animation}/spinner-075.png (100%) rename src/qt/res/{movies => animation}/spinner-076.png (100%) rename src/qt/res/{movies => animation}/spinner-077.png (100%) rename src/qt/res/{movies => animation}/spinner-078.png (100%) rename src/qt/res/{movies => animation}/spinner-079.png (100%) rename src/qt/res/{movies => animation}/spinner-080.png (100%) rename src/qt/res/{movies => animation}/spinner-081.png (100%) rename src/qt/res/{movies => animation}/spinner-082.png (100%) rename src/qt/res/{movies => animation}/spinner-083.png (100%) rename src/qt/res/{movies => animation}/spinner-084.png (100%) rename src/qt/res/{movies => animation}/spinner-085.png (100%) rename src/qt/res/{movies => animation}/spinner-086.png (100%) rename src/qt/res/{movies => animation}/spinner-087.png (100%) rename src/qt/res/{movies => animation}/spinner-088.png (100%) rename src/qt/res/{movies => animation}/spinner-089.png (100%) diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index 93df69cda1..ad8c65dba9 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/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" diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 893d49c559..c5cc54dd73 100644 --- a/src/Makefile.qt.include +++ b/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_$( $@ @rm $(@D)/temp_$( $@ diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3f353dfb95..4543c1a3a1 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -273,7 +273,7 @@ void BitcoinGUI::startSpinner() static std::vector>::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(frame)); } assert(vecFrames.size() == SPINNER_FRAMES); diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc index e7ed9c068a..8ba59831cf 100644 --- a/src/qt/dash.qrc +++ b/src/qt/dash.qrc @@ -106,96 +106,96 @@ res/images/radio_checked_disabled_light.png res/images/splash.png - - res/movies/spinner-000.png - res/movies/spinner-001.png - res/movies/spinner-002.png - res/movies/spinner-003.png - res/movies/spinner-004.png - res/movies/spinner-005.png - res/movies/spinner-006.png - res/movies/spinner-007.png - res/movies/spinner-008.png - res/movies/spinner-009.png - res/movies/spinner-010.png - res/movies/spinner-011.png - res/movies/spinner-012.png - res/movies/spinner-013.png - res/movies/spinner-014.png - res/movies/spinner-015.png - res/movies/spinner-016.png - res/movies/spinner-017.png - res/movies/spinner-018.png - res/movies/spinner-019.png - res/movies/spinner-020.png - res/movies/spinner-021.png - res/movies/spinner-022.png - res/movies/spinner-023.png - res/movies/spinner-024.png - res/movies/spinner-025.png - res/movies/spinner-026.png - res/movies/spinner-027.png - res/movies/spinner-028.png - res/movies/spinner-029.png - res/movies/spinner-030.png - res/movies/spinner-031.png - res/movies/spinner-032.png - res/movies/spinner-033.png - res/movies/spinner-034.png - res/movies/spinner-035.png - res/movies/spinner-036.png - res/movies/spinner-037.png - res/movies/spinner-038.png - res/movies/spinner-039.png - res/movies/spinner-040.png - res/movies/spinner-041.png - res/movies/spinner-042.png - res/movies/spinner-043.png - res/movies/spinner-044.png - res/movies/spinner-045.png - res/movies/spinner-046.png - res/movies/spinner-047.png - res/movies/spinner-048.png - res/movies/spinner-049.png - res/movies/spinner-050.png - res/movies/spinner-051.png - res/movies/spinner-052.png - res/movies/spinner-053.png - res/movies/spinner-054.png - res/movies/spinner-055.png - res/movies/spinner-056.png - res/movies/spinner-057.png - res/movies/spinner-058.png - res/movies/spinner-059.png - res/movies/spinner-060.png - res/movies/spinner-061.png - res/movies/spinner-062.png - res/movies/spinner-063.png - res/movies/spinner-064.png - res/movies/spinner-065.png - res/movies/spinner-066.png - res/movies/spinner-067.png - res/movies/spinner-068.png - res/movies/spinner-069.png - res/movies/spinner-070.png - res/movies/spinner-071.png - res/movies/spinner-072.png - res/movies/spinner-073.png - res/movies/spinner-074.png - res/movies/spinner-075.png - res/movies/spinner-076.png - res/movies/spinner-077.png - res/movies/spinner-078.png - res/movies/spinner-079.png - res/movies/spinner-080.png - res/movies/spinner-081.png - res/movies/spinner-082.png - res/movies/spinner-083.png - res/movies/spinner-084.png - res/movies/spinner-085.png - res/movies/spinner-086.png - res/movies/spinner-087.png - res/movies/spinner-088.png - res/movies/spinner-089.png + + res/animation/spinner-000.png + res/animation/spinner-001.png + res/animation/spinner-002.png + res/animation/spinner-003.png + res/animation/spinner-004.png + res/animation/spinner-005.png + res/animation/spinner-006.png + res/animation/spinner-007.png + res/animation/spinner-008.png + res/animation/spinner-009.png + res/animation/spinner-010.png + res/animation/spinner-011.png + res/animation/spinner-012.png + res/animation/spinner-013.png + res/animation/spinner-014.png + res/animation/spinner-015.png + res/animation/spinner-016.png + res/animation/spinner-017.png + res/animation/spinner-018.png + res/animation/spinner-019.png + res/animation/spinner-020.png + res/animation/spinner-021.png + res/animation/spinner-022.png + res/animation/spinner-023.png + res/animation/spinner-024.png + res/animation/spinner-025.png + res/animation/spinner-026.png + res/animation/spinner-027.png + res/animation/spinner-028.png + res/animation/spinner-029.png + res/animation/spinner-030.png + res/animation/spinner-031.png + res/animation/spinner-032.png + res/animation/spinner-033.png + res/animation/spinner-034.png + res/animation/spinner-035.png + res/animation/spinner-036.png + res/animation/spinner-037.png + res/animation/spinner-038.png + res/animation/spinner-039.png + res/animation/spinner-040.png + res/animation/spinner-041.png + res/animation/spinner-042.png + res/animation/spinner-043.png + res/animation/spinner-044.png + res/animation/spinner-045.png + res/animation/spinner-046.png + res/animation/spinner-047.png + res/animation/spinner-048.png + res/animation/spinner-049.png + res/animation/spinner-050.png + res/animation/spinner-051.png + res/animation/spinner-052.png + res/animation/spinner-053.png + res/animation/spinner-054.png + res/animation/spinner-055.png + res/animation/spinner-056.png + res/animation/spinner-057.png + res/animation/spinner-058.png + res/animation/spinner-059.png + res/animation/spinner-060.png + res/animation/spinner-061.png + res/animation/spinner-062.png + res/animation/spinner-063.png + res/animation/spinner-064.png + res/animation/spinner-065.png + res/animation/spinner-066.png + res/animation/spinner-067.png + res/animation/spinner-068.png + res/animation/spinner-069.png + res/animation/spinner-070.png + res/animation/spinner-071.png + res/animation/spinner-072.png + res/animation/spinner-073.png + res/animation/spinner-074.png + res/animation/spinner-075.png + res/animation/spinner-076.png + res/animation/spinner-077.png + res/animation/spinner-078.png + res/animation/spinner-079.png + res/animation/spinner-080.png + res/animation/spinner-081.png + res/animation/spinner-082.png + res/animation/spinner-083.png + res/animation/spinner-084.png + res/animation/spinner-085.png + res/animation/spinner-086.png + res/animation/spinner-087.png + res/animation/spinner-088.png + res/animation/spinner-089.png diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 30eca416bc..25c3f76b95 100644 --- a/src/qt/guiconstants.h +++ b/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. diff --git a/src/qt/res/movies/makespinner.sh b/src/qt/res/animation/makespinner.sh similarity index 100% rename from src/qt/res/movies/makespinner.sh rename to src/qt/res/animation/makespinner.sh diff --git a/src/qt/res/movies/spinner-000.png b/src/qt/res/animation/spinner-000.png similarity index 100% rename from src/qt/res/movies/spinner-000.png rename to src/qt/res/animation/spinner-000.png diff --git a/src/qt/res/movies/spinner-001.png b/src/qt/res/animation/spinner-001.png similarity index 100% rename from src/qt/res/movies/spinner-001.png rename to src/qt/res/animation/spinner-001.png diff --git a/src/qt/res/movies/spinner-002.png b/src/qt/res/animation/spinner-002.png similarity index 100% rename from src/qt/res/movies/spinner-002.png rename to src/qt/res/animation/spinner-002.png diff --git a/src/qt/res/movies/spinner-003.png b/src/qt/res/animation/spinner-003.png similarity index 100% rename from src/qt/res/movies/spinner-003.png rename to src/qt/res/animation/spinner-003.png diff --git a/src/qt/res/movies/spinner-004.png b/src/qt/res/animation/spinner-004.png similarity index 100% rename from src/qt/res/movies/spinner-004.png rename to src/qt/res/animation/spinner-004.png diff --git a/src/qt/res/movies/spinner-005.png b/src/qt/res/animation/spinner-005.png similarity index 100% rename from src/qt/res/movies/spinner-005.png rename to src/qt/res/animation/spinner-005.png diff --git a/src/qt/res/movies/spinner-006.png b/src/qt/res/animation/spinner-006.png similarity index 100% rename from src/qt/res/movies/spinner-006.png rename to src/qt/res/animation/spinner-006.png diff --git a/src/qt/res/movies/spinner-007.png b/src/qt/res/animation/spinner-007.png similarity index 100% rename from src/qt/res/movies/spinner-007.png rename to src/qt/res/animation/spinner-007.png diff --git a/src/qt/res/movies/spinner-008.png b/src/qt/res/animation/spinner-008.png similarity index 100% rename from src/qt/res/movies/spinner-008.png rename to src/qt/res/animation/spinner-008.png diff --git a/src/qt/res/movies/spinner-009.png b/src/qt/res/animation/spinner-009.png similarity index 100% rename from src/qt/res/movies/spinner-009.png rename to src/qt/res/animation/spinner-009.png diff --git a/src/qt/res/movies/spinner-010.png b/src/qt/res/animation/spinner-010.png similarity index 100% rename from src/qt/res/movies/spinner-010.png rename to src/qt/res/animation/spinner-010.png diff --git a/src/qt/res/movies/spinner-011.png b/src/qt/res/animation/spinner-011.png similarity index 100% rename from src/qt/res/movies/spinner-011.png rename to src/qt/res/animation/spinner-011.png diff --git a/src/qt/res/movies/spinner-012.png b/src/qt/res/animation/spinner-012.png similarity index 100% rename from src/qt/res/movies/spinner-012.png rename to src/qt/res/animation/spinner-012.png diff --git a/src/qt/res/movies/spinner-013.png b/src/qt/res/animation/spinner-013.png similarity index 100% rename from src/qt/res/movies/spinner-013.png rename to src/qt/res/animation/spinner-013.png diff --git a/src/qt/res/movies/spinner-014.png b/src/qt/res/animation/spinner-014.png similarity index 100% rename from src/qt/res/movies/spinner-014.png rename to src/qt/res/animation/spinner-014.png diff --git a/src/qt/res/movies/spinner-015.png b/src/qt/res/animation/spinner-015.png similarity index 100% rename from src/qt/res/movies/spinner-015.png rename to src/qt/res/animation/spinner-015.png diff --git a/src/qt/res/movies/spinner-016.png b/src/qt/res/animation/spinner-016.png similarity index 100% rename from src/qt/res/movies/spinner-016.png rename to src/qt/res/animation/spinner-016.png diff --git a/src/qt/res/movies/spinner-017.png b/src/qt/res/animation/spinner-017.png similarity index 100% rename from src/qt/res/movies/spinner-017.png rename to src/qt/res/animation/spinner-017.png diff --git a/src/qt/res/movies/spinner-018.png b/src/qt/res/animation/spinner-018.png similarity index 100% rename from src/qt/res/movies/spinner-018.png rename to src/qt/res/animation/spinner-018.png diff --git a/src/qt/res/movies/spinner-019.png b/src/qt/res/animation/spinner-019.png similarity index 100% rename from src/qt/res/movies/spinner-019.png rename to src/qt/res/animation/spinner-019.png diff --git a/src/qt/res/movies/spinner-020.png b/src/qt/res/animation/spinner-020.png similarity index 100% rename from src/qt/res/movies/spinner-020.png rename to src/qt/res/animation/spinner-020.png diff --git a/src/qt/res/movies/spinner-021.png b/src/qt/res/animation/spinner-021.png similarity index 100% rename from src/qt/res/movies/spinner-021.png rename to src/qt/res/animation/spinner-021.png diff --git a/src/qt/res/movies/spinner-022.png b/src/qt/res/animation/spinner-022.png similarity index 100% rename from src/qt/res/movies/spinner-022.png rename to src/qt/res/animation/spinner-022.png diff --git a/src/qt/res/movies/spinner-023.png b/src/qt/res/animation/spinner-023.png similarity index 100% rename from src/qt/res/movies/spinner-023.png rename to src/qt/res/animation/spinner-023.png diff --git a/src/qt/res/movies/spinner-024.png b/src/qt/res/animation/spinner-024.png similarity index 100% rename from src/qt/res/movies/spinner-024.png rename to src/qt/res/animation/spinner-024.png diff --git a/src/qt/res/movies/spinner-025.png b/src/qt/res/animation/spinner-025.png similarity index 100% rename from src/qt/res/movies/spinner-025.png rename to src/qt/res/animation/spinner-025.png diff --git a/src/qt/res/movies/spinner-026.png b/src/qt/res/animation/spinner-026.png similarity index 100% rename from src/qt/res/movies/spinner-026.png rename to src/qt/res/animation/spinner-026.png diff --git a/src/qt/res/movies/spinner-027.png b/src/qt/res/animation/spinner-027.png similarity index 100% rename from src/qt/res/movies/spinner-027.png rename to src/qt/res/animation/spinner-027.png diff --git a/src/qt/res/movies/spinner-028.png b/src/qt/res/animation/spinner-028.png similarity index 100% rename from src/qt/res/movies/spinner-028.png rename to src/qt/res/animation/spinner-028.png diff --git a/src/qt/res/movies/spinner-029.png b/src/qt/res/animation/spinner-029.png similarity index 100% rename from src/qt/res/movies/spinner-029.png rename to src/qt/res/animation/spinner-029.png diff --git a/src/qt/res/movies/spinner-030.png b/src/qt/res/animation/spinner-030.png similarity index 100% rename from src/qt/res/movies/spinner-030.png rename to src/qt/res/animation/spinner-030.png diff --git a/src/qt/res/movies/spinner-031.png b/src/qt/res/animation/spinner-031.png similarity index 100% rename from src/qt/res/movies/spinner-031.png rename to src/qt/res/animation/spinner-031.png diff --git a/src/qt/res/movies/spinner-032.png b/src/qt/res/animation/spinner-032.png similarity index 100% rename from src/qt/res/movies/spinner-032.png rename to src/qt/res/animation/spinner-032.png diff --git a/src/qt/res/movies/spinner-033.png b/src/qt/res/animation/spinner-033.png similarity index 100% rename from src/qt/res/movies/spinner-033.png rename to src/qt/res/animation/spinner-033.png diff --git a/src/qt/res/movies/spinner-034.png b/src/qt/res/animation/spinner-034.png similarity index 100% rename from src/qt/res/movies/spinner-034.png rename to src/qt/res/animation/spinner-034.png diff --git a/src/qt/res/movies/spinner-035.png b/src/qt/res/animation/spinner-035.png similarity index 100% rename from src/qt/res/movies/spinner-035.png rename to src/qt/res/animation/spinner-035.png diff --git a/src/qt/res/movies/spinner-036.png b/src/qt/res/animation/spinner-036.png similarity index 100% rename from src/qt/res/movies/spinner-036.png rename to src/qt/res/animation/spinner-036.png diff --git a/src/qt/res/movies/spinner-037.png b/src/qt/res/animation/spinner-037.png similarity index 100% rename from src/qt/res/movies/spinner-037.png rename to src/qt/res/animation/spinner-037.png diff --git a/src/qt/res/movies/spinner-038.png b/src/qt/res/animation/spinner-038.png similarity index 100% rename from src/qt/res/movies/spinner-038.png rename to src/qt/res/animation/spinner-038.png diff --git a/src/qt/res/movies/spinner-039.png b/src/qt/res/animation/spinner-039.png similarity index 100% rename from src/qt/res/movies/spinner-039.png rename to src/qt/res/animation/spinner-039.png diff --git a/src/qt/res/movies/spinner-040.png b/src/qt/res/animation/spinner-040.png similarity index 100% rename from src/qt/res/movies/spinner-040.png rename to src/qt/res/animation/spinner-040.png diff --git a/src/qt/res/movies/spinner-041.png b/src/qt/res/animation/spinner-041.png similarity index 100% rename from src/qt/res/movies/spinner-041.png rename to src/qt/res/animation/spinner-041.png diff --git a/src/qt/res/movies/spinner-042.png b/src/qt/res/animation/spinner-042.png similarity index 100% rename from src/qt/res/movies/spinner-042.png rename to src/qt/res/animation/spinner-042.png diff --git a/src/qt/res/movies/spinner-043.png b/src/qt/res/animation/spinner-043.png similarity index 100% rename from src/qt/res/movies/spinner-043.png rename to src/qt/res/animation/spinner-043.png diff --git a/src/qt/res/movies/spinner-044.png b/src/qt/res/animation/spinner-044.png similarity index 100% rename from src/qt/res/movies/spinner-044.png rename to src/qt/res/animation/spinner-044.png diff --git a/src/qt/res/movies/spinner-045.png b/src/qt/res/animation/spinner-045.png similarity index 100% rename from src/qt/res/movies/spinner-045.png rename to src/qt/res/animation/spinner-045.png diff --git a/src/qt/res/movies/spinner-046.png b/src/qt/res/animation/spinner-046.png similarity index 100% rename from src/qt/res/movies/spinner-046.png rename to src/qt/res/animation/spinner-046.png diff --git a/src/qt/res/movies/spinner-047.png b/src/qt/res/animation/spinner-047.png similarity index 100% rename from src/qt/res/movies/spinner-047.png rename to src/qt/res/animation/spinner-047.png diff --git a/src/qt/res/movies/spinner-048.png b/src/qt/res/animation/spinner-048.png similarity index 100% rename from src/qt/res/movies/spinner-048.png rename to src/qt/res/animation/spinner-048.png diff --git a/src/qt/res/movies/spinner-049.png b/src/qt/res/animation/spinner-049.png similarity index 100% rename from src/qt/res/movies/spinner-049.png rename to src/qt/res/animation/spinner-049.png diff --git a/src/qt/res/movies/spinner-050.png b/src/qt/res/animation/spinner-050.png similarity index 100% rename from src/qt/res/movies/spinner-050.png rename to src/qt/res/animation/spinner-050.png diff --git a/src/qt/res/movies/spinner-051.png b/src/qt/res/animation/spinner-051.png similarity index 100% rename from src/qt/res/movies/spinner-051.png rename to src/qt/res/animation/spinner-051.png diff --git a/src/qt/res/movies/spinner-052.png b/src/qt/res/animation/spinner-052.png similarity index 100% rename from src/qt/res/movies/spinner-052.png rename to src/qt/res/animation/spinner-052.png diff --git a/src/qt/res/movies/spinner-053.png b/src/qt/res/animation/spinner-053.png similarity index 100% rename from src/qt/res/movies/spinner-053.png rename to src/qt/res/animation/spinner-053.png diff --git a/src/qt/res/movies/spinner-054.png b/src/qt/res/animation/spinner-054.png similarity index 100% rename from src/qt/res/movies/spinner-054.png rename to src/qt/res/animation/spinner-054.png diff --git a/src/qt/res/movies/spinner-055.png b/src/qt/res/animation/spinner-055.png similarity index 100% rename from src/qt/res/movies/spinner-055.png rename to src/qt/res/animation/spinner-055.png diff --git a/src/qt/res/movies/spinner-056.png b/src/qt/res/animation/spinner-056.png similarity index 100% rename from src/qt/res/movies/spinner-056.png rename to src/qt/res/animation/spinner-056.png diff --git a/src/qt/res/movies/spinner-057.png b/src/qt/res/animation/spinner-057.png similarity index 100% rename from src/qt/res/movies/spinner-057.png rename to src/qt/res/animation/spinner-057.png diff --git a/src/qt/res/movies/spinner-058.png b/src/qt/res/animation/spinner-058.png similarity index 100% rename from src/qt/res/movies/spinner-058.png rename to src/qt/res/animation/spinner-058.png diff --git a/src/qt/res/movies/spinner-059.png b/src/qt/res/animation/spinner-059.png similarity index 100% rename from src/qt/res/movies/spinner-059.png rename to src/qt/res/animation/spinner-059.png diff --git a/src/qt/res/movies/spinner-060.png b/src/qt/res/animation/spinner-060.png similarity index 100% rename from src/qt/res/movies/spinner-060.png rename to src/qt/res/animation/spinner-060.png diff --git a/src/qt/res/movies/spinner-061.png b/src/qt/res/animation/spinner-061.png similarity index 100% rename from src/qt/res/movies/spinner-061.png rename to src/qt/res/animation/spinner-061.png diff --git a/src/qt/res/movies/spinner-062.png b/src/qt/res/animation/spinner-062.png similarity index 100% rename from src/qt/res/movies/spinner-062.png rename to src/qt/res/animation/spinner-062.png diff --git a/src/qt/res/movies/spinner-063.png b/src/qt/res/animation/spinner-063.png similarity index 100% rename from src/qt/res/movies/spinner-063.png rename to src/qt/res/animation/spinner-063.png diff --git a/src/qt/res/movies/spinner-064.png b/src/qt/res/animation/spinner-064.png similarity index 100% rename from src/qt/res/movies/spinner-064.png rename to src/qt/res/animation/spinner-064.png diff --git a/src/qt/res/movies/spinner-065.png b/src/qt/res/animation/spinner-065.png similarity index 100% rename from src/qt/res/movies/spinner-065.png rename to src/qt/res/animation/spinner-065.png diff --git a/src/qt/res/movies/spinner-066.png b/src/qt/res/animation/spinner-066.png similarity index 100% rename from src/qt/res/movies/spinner-066.png rename to src/qt/res/animation/spinner-066.png diff --git a/src/qt/res/movies/spinner-067.png b/src/qt/res/animation/spinner-067.png similarity index 100% rename from src/qt/res/movies/spinner-067.png rename to src/qt/res/animation/spinner-067.png diff --git a/src/qt/res/movies/spinner-068.png b/src/qt/res/animation/spinner-068.png similarity index 100% rename from src/qt/res/movies/spinner-068.png rename to src/qt/res/animation/spinner-068.png diff --git a/src/qt/res/movies/spinner-069.png b/src/qt/res/animation/spinner-069.png similarity index 100% rename from src/qt/res/movies/spinner-069.png rename to src/qt/res/animation/spinner-069.png diff --git a/src/qt/res/movies/spinner-070.png b/src/qt/res/animation/spinner-070.png similarity index 100% rename from src/qt/res/movies/spinner-070.png rename to src/qt/res/animation/spinner-070.png diff --git a/src/qt/res/movies/spinner-071.png b/src/qt/res/animation/spinner-071.png similarity index 100% rename from src/qt/res/movies/spinner-071.png rename to src/qt/res/animation/spinner-071.png diff --git a/src/qt/res/movies/spinner-072.png b/src/qt/res/animation/spinner-072.png similarity index 100% rename from src/qt/res/movies/spinner-072.png rename to src/qt/res/animation/spinner-072.png diff --git a/src/qt/res/movies/spinner-073.png b/src/qt/res/animation/spinner-073.png similarity index 100% rename from src/qt/res/movies/spinner-073.png rename to src/qt/res/animation/spinner-073.png diff --git a/src/qt/res/movies/spinner-074.png b/src/qt/res/animation/spinner-074.png similarity index 100% rename from src/qt/res/movies/spinner-074.png rename to src/qt/res/animation/spinner-074.png diff --git a/src/qt/res/movies/spinner-075.png b/src/qt/res/animation/spinner-075.png similarity index 100% rename from src/qt/res/movies/spinner-075.png rename to src/qt/res/animation/spinner-075.png diff --git a/src/qt/res/movies/spinner-076.png b/src/qt/res/animation/spinner-076.png similarity index 100% rename from src/qt/res/movies/spinner-076.png rename to src/qt/res/animation/spinner-076.png diff --git a/src/qt/res/movies/spinner-077.png b/src/qt/res/animation/spinner-077.png similarity index 100% rename from src/qt/res/movies/spinner-077.png rename to src/qt/res/animation/spinner-077.png diff --git a/src/qt/res/movies/spinner-078.png b/src/qt/res/animation/spinner-078.png similarity index 100% rename from src/qt/res/movies/spinner-078.png rename to src/qt/res/animation/spinner-078.png diff --git a/src/qt/res/movies/spinner-079.png b/src/qt/res/animation/spinner-079.png similarity index 100% rename from src/qt/res/movies/spinner-079.png rename to src/qt/res/animation/spinner-079.png diff --git a/src/qt/res/movies/spinner-080.png b/src/qt/res/animation/spinner-080.png similarity index 100% rename from src/qt/res/movies/spinner-080.png rename to src/qt/res/animation/spinner-080.png diff --git a/src/qt/res/movies/spinner-081.png b/src/qt/res/animation/spinner-081.png similarity index 100% rename from src/qt/res/movies/spinner-081.png rename to src/qt/res/animation/spinner-081.png diff --git a/src/qt/res/movies/spinner-082.png b/src/qt/res/animation/spinner-082.png similarity index 100% rename from src/qt/res/movies/spinner-082.png rename to src/qt/res/animation/spinner-082.png diff --git a/src/qt/res/movies/spinner-083.png b/src/qt/res/animation/spinner-083.png similarity index 100% rename from src/qt/res/movies/spinner-083.png rename to src/qt/res/animation/spinner-083.png diff --git a/src/qt/res/movies/spinner-084.png b/src/qt/res/animation/spinner-084.png similarity index 100% rename from src/qt/res/movies/spinner-084.png rename to src/qt/res/animation/spinner-084.png diff --git a/src/qt/res/movies/spinner-085.png b/src/qt/res/animation/spinner-085.png similarity index 100% rename from src/qt/res/movies/spinner-085.png rename to src/qt/res/animation/spinner-085.png diff --git a/src/qt/res/movies/spinner-086.png b/src/qt/res/animation/spinner-086.png similarity index 100% rename from src/qt/res/movies/spinner-086.png rename to src/qt/res/animation/spinner-086.png diff --git a/src/qt/res/movies/spinner-087.png b/src/qt/res/animation/spinner-087.png similarity index 100% rename from src/qt/res/movies/spinner-087.png rename to src/qt/res/animation/spinner-087.png diff --git a/src/qt/res/movies/spinner-088.png b/src/qt/res/animation/spinner-088.png similarity index 100% rename from src/qt/res/movies/spinner-088.png rename to src/qt/res/animation/spinner-088.png diff --git a/src/qt/res/movies/spinner-089.png b/src/qt/res/animation/spinner-089.png similarity index 100% rename from src/qt/res/movies/spinner-089.png rename to src/qt/res/animation/spinner-089.png