diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index e5c19e5af..848053e84 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -276,7 +276,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 @@ -288,7 +288,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 @@ -359,7 +359,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ @rm $(@D)/temp_$( $@ diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 037b23e4b..711545980 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -45,42 +45,42 @@ res/icons/network_disabled.png res/icons/proxy.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/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 diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 5d6efeeed..ebcc04a5e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1040,7 +1040,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; } 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