diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -30,7 +30,7 @@ pngcrush = 'pngcrush' git = 'git' -folders = ["src/qt/res/movies", "src/qt/res/icons", "share/pixmaps"] +folders = ["src/qt/res/animation", "src/qt/res/icons", "share/pixmaps"] basePath = subprocess.check_output( [git, 'rev-parse', '--show-toplevel'], universal_newlines=True, encoding='utf8').rstrip('\n') totalSaveBytes = 0 diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc --- 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 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1166,7 +1166,7 @@ if (count != prevBlocks) { labelBlocksIcon->setPixmap( platformStyle - ->SingleColorIcon(QString(":/movies/spinner-%1") + ->SingleColorIcon(QString(":/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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 rename from src/qt/res/movies/spinner-035.png rename to src/qt/res/animation/spinner-035.png