diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 5f018d0459..3eba064311 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -57,7 +57,42 @@ res/images/shadow.png - res/movies/update_spinner.mng + 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 locale/bitcoin_en.qm diff --git a/src/qt/bitcoin.qrc.autosave b/src/qt/bitcoin.qrc.autosave new file mode 100644 index 0000000000..56ef52aa77 --- /dev/null +++ b/src/qt/bitcoin.qrc.autosave @@ -0,0 +1,185 @@ + + + res/icons/address-book.png + res/icons/quit.png + res/icons/send.png + res/icons/connect0.png + res/icons/connect1.png + res/icons/connect2.png + res/icons/connect3.png + res/icons/connect4.png + res/icons/transaction0.png + res/icons/transaction2.png + res/icons/clock1.png + res/icons/clock2.png + res/icons/clock3.png + res/icons/clock4.png + res/icons/clock5.png + res/icons/configure.png + res/icons/receive.png + res/icons/editpaste.png + res/icons/editcopy.png + res/icons/add.png + res/icons/edit.png + res/icons/history.png + res/icons/overview.png + res/icons/export.png + res/icons/synced.png + res/icons/remove.png + res/icons/tx_mined.png + res/icons/tx_input.png + res/icons/tx_output.png + res/icons/tx_inout.png + res/icons/lock_closed.png + res/icons/lock_open.png + res/icons/mining.png + res/icons/key.png + res/icons/filesave.png + res/icons/qrcode.png + res/icons/debugwindow.png + res/icons/overview_checked.png + res/icons/address-book_checked.png + res/icons/console.png + res/icons/console_checked.png + res/icons/history_checked.png + res/icons/receive_checked.png + res/icons/send_checked.png + res/icons/magi.png + res/icons/magi-toolbar.png + res/icons/magi-testnet.png + res/icons/magi-testnet-toolbar.png + res/icons/about.png + res/icons/about_qt.png + + + res/images/about.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 + + + locale/bitcoin_en.qm + locale/bitcoin_ru.qm + locale/bitcoin_af_ZA.qm + locale/bitcoin_ar.qm + locale/bitcoin_be_BY.qm + locale/bitcoin_bg.qm + locale/bitcoin_bg_BG.qm + locale/bitcoin_bs.qm + locale/bitcoin_ca.qm + locale/bitcoin_ca_ES.qm + locale/bitcoin_ca@valencia.qm + locale/bitcoin_cs.qm + locale/bitcoin_cs_CZ.qm + locale/bitcoin_cy.qm + locale/bitcoin_da.qm + locale/bitcoin_de.qm + locale/bitcoin_el.qm + locale/bitcoin_el_GR.qm + locale/bitcoin_en_GB.qm + locale/bitcoin_eo.qm + locale/bitcoin_es.qm + locale/bitcoin_es_CL.qm + locale/bitcoin_es_DO.qm + locale/bitcoin_es_ES.qm + locale/bitcoin_es_MX.qm + locale/bitcoin_es_UY.qm + locale/bitcoin_es_VE.qm + locale/bitcoin_et.qm + locale/bitcoin_eu_ES.qm + locale/bitcoin_fa.qm + locale/bitcoin_fa_IR.qm + locale/bitcoin_fi.qm + locale/bitcoin_fr.qm + locale/bitcoin_fr_CA.qm + locale/bitcoin_fr_FR.qm + locale/bitcoin_gl.qm + locale/bitcoin_he.qm + locale/bitcoin_hi_IN.qm + locale/bitcoin_hr.qm + locale/bitcoin_hu.qm + locale/bitcoin_id_ID.qm + locale/bitcoin_it.qm + locale/bitcoin_ja.qm + locale/bitcoin_ka.qm + locale/bitcoin_kk_KZ.qm + locale/bitcoin_ko_KR.qm + locale/bitcoin_ky.qm + locale/bitcoin_la.qm + locale/bitcoin_lt.qm + locale/bitcoin_lv_LV.qm + locale/bitcoin_mk_MK.qm + locale/bitcoin_mn.qm + locale/bitcoin_ms_MY.qm + locale/bitcoin_nb.qm + locale/bitcoin_nl.qm + locale/bitcoin_pam.qm + locale/bitcoin_pl.qm + locale/bitcoin_pt_BR.qm + locale/bitcoin_pt_PT.qm + locale/bitcoin_ro_RO.qm + locale/bitcoin_ru_RU.qm + locale/bitcoin_sk.qm + locale/bitcoin_sl_SI.qm + locale/bitcoin_sq.qm + locale/bitcoin_sr.qm + locale/bitcoin_sv.qm + locale/bitcoin_th_TH.qm + locale/bitcoin_tr.qm + locale/bitcoin_tr_TR.qm + locale/bitcoin_uk.qm + locale/bitcoin_ur_PK.qm + locale/bitcoin_uz@Cyrl.qm + locale/bitcoin_vi.qm + locale/bitcoin_vi_VN.qm + locale/bitcoin_zh.qm + locale/bitcoin_zh_CN.qm + locale/bitcoin_zh_TW.qm + + + res/fonts/Roboto-Regular.ttf + res/fonts/Oswald-Regular.ttf + res/fonts/RobotoCondensed-Regular.ttf + + + res/styles/magi.qss + res/styles/magi-qt5.2.qss + res/styles/magi-osx.qss + + diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 6f2ba4d29c..ae7bdc6dc7 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -89,7 +89,8 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): trayIcon(0), notificator(0), consolePage(0), - rpcConsole(0) + rpcConsole(0), + spinnerFrame(0) { restoreWindowGeometry(); setWindowTitle(tr("Coin Magi") + " - " + tr("Wallet")); @@ -184,10 +185,11 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): labelConnectionsIcon->setObjectName("labelConnectionsIcon"); labelBlocksIcon->setObjectName("labelBlocksIcon"); labelMintingIcon->setObjectName("labelMintingIcon"); -// labelEncryptionIcon->setStyleSheet("#labelEncryptionIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); -// labelConnectionsIcon->setStyleSheet("#labelConnectionsIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); -// labelBlocksIcon->setStyleSheet("#labelBlocksIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); -// labelMintingIcon->setStyleSheet("#labelMintingIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); + + labelEncryptionIcon->setStyleSheet("#labelEncryptionIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); + labelConnectionsIcon->setStyleSheet("#labelConnectionsIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); + labelBlocksIcon->setStyleSheet("#labelBlocksIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); + labelMintingIcon->setStyleSheet("#labelMintingIcon QToolTip {color:#cecece;background-color:#333333;border:0px;}"); // Set minting pixmap labelMintingIcon->setPixmap(QIcon(":/icons/minting").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE)); @@ -708,10 +710,13 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) } else { - tooltip = tr("Catching up...") + QString("
") + tooltip; - labelBlocksIcon->setMovie(syncIconMovie); - syncIconMovie->start(); + tooltip = tr("Catching up...") + QString("
") + tooltip; +// labelBlocksIcon->setMovie(syncIconMovie); +// syncIconMovie->start(); + QString qstr_ = QString(":/movies/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')); + labelBlocksIcon->setPixmap(QIcon(qstr_).pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE)); + spinnerFrame = (spinnerFrame + 1) % SPINNER_FRAMES; overviewPage->showOutOfSyncWarning(true); } diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index b56efa4271..84302b2914 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -120,6 +120,8 @@ class BitcoinGUI : public QMainWindow void setIcons(unsigned nth, bool fUnChecked=true); void setIconsChecked(); + int spinnerFrame; + /** Create the main UI actions. */ void createActions(); /** Create the menu bar and sub-menus. */ diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 7b29b41c9e..82865d0f5f 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -49,9 +49,12 @@ const struct { {NULL, NULL} }; +/* Number of frames in spinner animation */ +#define SPINNER_FRAMES 36 + #define QAPP_ORG_NAME "CoinMagi" #define QAPP_ORG_DOMAIN "coinmagi.org" -#define QAPP_APP_NAME_DEFAULT "Magi-Qt" -#define QAPP_APP_NAME_TESTNET "Magi-Qt-testnet" +#define QAPP_APP_NAME_DEFAULT "m-wallet" +#define QAPP_APP_NAME_TESTNET "m-wallet-testnet" #endif // GUICONSTANTS_H diff --git a/src/qt/res/icons/.directory b/src/qt/res/icons/.directory new file mode 100644 index 0000000000..d8dfdc236e --- /dev/null +++ b/src/qt/res/icons/.directory @@ -0,0 +1,5 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2017,1,13,21,15,46 +Version=3 +ViewMode=1 diff --git a/src/qt/res/icons/about.png b/src/qt/res/icons/about.png index 1fc73e9e1c..87196f8989 100644 Binary files a/src/qt/res/icons/about.png and b/src/qt/res/icons/about.png differ diff --git a/src/qt/res/icons/about_qt.png b/src/qt/res/icons/about_qt.png index a16f39f6de..ae81dae0ab 100644 Binary files a/src/qt/res/icons/about_qt.png and b/src/qt/res/icons/about_qt.png differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png index 7f8bf790e5..969d8576f6 100644 Binary files a/src/qt/res/icons/debugwindow.png and b/src/qt/res/icons/debugwindow.png differ diff --git a/src/qt/res/icons/magi-testnet.png b/src/qt/res/icons/magi-testnet.png index 04dd8e03c2..87196f8989 100644 Binary files a/src/qt/res/icons/magi-testnet.png and b/src/qt/res/icons/magi-testnet.png differ diff --git a/src/qt/res/icons/magi-toolbar.png b/src/qt/res/icons/magi-toolbar.png index 5ee9b1c5d7..4fec7446a5 100644 Binary files a/src/qt/res/icons/magi-toolbar.png and b/src/qt/res/icons/magi-toolbar.png differ diff --git a/src/qt/res/icons/magi.icns b/src/qt/res/icons/magi.icns index 27f23ec470..8335f72e02 100644 Binary files a/src/qt/res/icons/magi.icns and b/src/qt/res/icons/magi.icns differ diff --git a/src/qt/res/icons/magi.ico b/src/qt/res/icons/magi.ico index 329ebad6d9..af3064f79e 100644 Binary files a/src/qt/res/icons/magi.ico and b/src/qt/res/icons/magi.ico differ diff --git a/src/qt/res/icons/magi.png b/src/qt/res/icons/magi.png index bb23165c74..f29c82f7a9 100644 Binary files a/src/qt/res/icons/magi.png and b/src/qt/res/icons/magi.png differ diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png index b9cdb12a18..08c2729b23 100644 Binary files a/src/qt/res/icons/tx_inout.png and b/src/qt/res/icons/tx_inout.png differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png index a17264565a..80f2e3f0a2 100644 Binary files a/src/qt/res/icons/tx_input.png and b/src/qt/res/icons/tx_input.png differ diff --git a/src/qt/res/icons/tx_mined.png b/src/qt/res/icons/tx_mined.png index 8c5511fc39..c925e8eba4 100644 Binary files a/src/qt/res/icons/tx_mined.png and b/src/qt/res/icons/tx_mined.png differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png index bdbce5feb7..496ddb285a 100644 Binary files a/src/qt/res/icons/tx_output.png and b/src/qt/res/icons/tx_output.png differ diff --git a/src/qt/res/movies/spinner-000.png b/src/qt/res/movies/spinner-000.png new file mode 100644 index 0000000000..2c64e3252f Binary files /dev/null and b/src/qt/res/movies/spinner-000.png differ diff --git a/src/qt/res/movies/spinner-001.png b/src/qt/res/movies/spinner-001.png new file mode 100644 index 0000000000..4b9ac79406 Binary files /dev/null and b/src/qt/res/movies/spinner-001.png differ diff --git a/src/qt/res/movies/spinner-002.png b/src/qt/res/movies/spinner-002.png new file mode 100644 index 0000000000..887b2a6f1e Binary files /dev/null and b/src/qt/res/movies/spinner-002.png differ diff --git a/src/qt/res/movies/spinner-003.png b/src/qt/res/movies/spinner-003.png new file mode 100644 index 0000000000..4e1e1f3d0e Binary files /dev/null and b/src/qt/res/movies/spinner-003.png differ diff --git a/src/qt/res/movies/spinner-004.png b/src/qt/res/movies/spinner-004.png new file mode 100644 index 0000000000..79c20b002e Binary files /dev/null and b/src/qt/res/movies/spinner-004.png differ diff --git a/src/qt/res/movies/spinner-005.png b/src/qt/res/movies/spinner-005.png new file mode 100644 index 0000000000..0bddaf456c Binary files /dev/null and b/src/qt/res/movies/spinner-005.png differ diff --git a/src/qt/res/movies/spinner-006.png b/src/qt/res/movies/spinner-006.png new file mode 100644 index 0000000000..a9b222dbca Binary files /dev/null and b/src/qt/res/movies/spinner-006.png differ diff --git a/src/qt/res/movies/spinner-007.png b/src/qt/res/movies/spinner-007.png new file mode 100644 index 0000000000..293ca4418d Binary files /dev/null and b/src/qt/res/movies/spinner-007.png differ diff --git a/src/qt/res/movies/spinner-008.png b/src/qt/res/movies/spinner-008.png new file mode 100644 index 0000000000..1df84fb0b2 Binary files /dev/null and b/src/qt/res/movies/spinner-008.png differ diff --git a/src/qt/res/movies/spinner-009.png b/src/qt/res/movies/spinner-009.png new file mode 100644 index 0000000000..08e210ba07 Binary files /dev/null and b/src/qt/res/movies/spinner-009.png differ diff --git a/src/qt/res/movies/spinner-010.png b/src/qt/res/movies/spinner-010.png new file mode 100644 index 0000000000..0920f90b90 Binary files /dev/null and b/src/qt/res/movies/spinner-010.png differ diff --git a/src/qt/res/movies/spinner-011.png b/src/qt/res/movies/spinner-011.png new file mode 100644 index 0000000000..a47ec17086 Binary files /dev/null and b/src/qt/res/movies/spinner-011.png differ diff --git a/src/qt/res/movies/spinner-012.png b/src/qt/res/movies/spinner-012.png new file mode 100644 index 0000000000..4544f24cd8 Binary files /dev/null and b/src/qt/res/movies/spinner-012.png differ diff --git a/src/qt/res/movies/spinner-013.png b/src/qt/res/movies/spinner-013.png new file mode 100644 index 0000000000..e9ff6de5d5 Binary files /dev/null and b/src/qt/res/movies/spinner-013.png differ diff --git a/src/qt/res/movies/spinner-014.png b/src/qt/res/movies/spinner-014.png new file mode 100644 index 0000000000..c0225682a4 Binary files /dev/null and b/src/qt/res/movies/spinner-014.png differ diff --git a/src/qt/res/movies/spinner-015.png b/src/qt/res/movies/spinner-015.png new file mode 100644 index 0000000000..79c772eccc Binary files /dev/null and b/src/qt/res/movies/spinner-015.png differ diff --git a/src/qt/res/movies/spinner-016.png b/src/qt/res/movies/spinner-016.png new file mode 100644 index 0000000000..d20e2332ca Binary files /dev/null and b/src/qt/res/movies/spinner-016.png differ diff --git a/src/qt/res/movies/spinner-017.png b/src/qt/res/movies/spinner-017.png new file mode 100644 index 0000000000..44edbdd5d1 Binary files /dev/null and b/src/qt/res/movies/spinner-017.png differ diff --git a/src/qt/res/movies/spinner-018.png b/src/qt/res/movies/spinner-018.png new file mode 100644 index 0000000000..8abdf077e6 Binary files /dev/null and b/src/qt/res/movies/spinner-018.png differ diff --git a/src/qt/res/movies/spinner-019.png b/src/qt/res/movies/spinner-019.png new file mode 100644 index 0000000000..4fd0292ece Binary files /dev/null and b/src/qt/res/movies/spinner-019.png differ diff --git a/src/qt/res/movies/spinner-020.png b/src/qt/res/movies/spinner-020.png new file mode 100644 index 0000000000..99a3f2fe4a Binary files /dev/null and b/src/qt/res/movies/spinner-020.png differ diff --git a/src/qt/res/movies/spinner-021.png b/src/qt/res/movies/spinner-021.png new file mode 100644 index 0000000000..eeb866ffdf Binary files /dev/null and b/src/qt/res/movies/spinner-021.png differ diff --git a/src/qt/res/movies/spinner-022.png b/src/qt/res/movies/spinner-022.png new file mode 100644 index 0000000000..5c8e2c5e1d Binary files /dev/null and b/src/qt/res/movies/spinner-022.png differ diff --git a/src/qt/res/movies/spinner-023.png b/src/qt/res/movies/spinner-023.png new file mode 100644 index 0000000000..d723ee30d4 Binary files /dev/null and b/src/qt/res/movies/spinner-023.png differ diff --git a/src/qt/res/movies/spinner-024.png b/src/qt/res/movies/spinner-024.png new file mode 100644 index 0000000000..dc634584d5 Binary files /dev/null and b/src/qt/res/movies/spinner-024.png differ diff --git a/src/qt/res/movies/spinner-025.png b/src/qt/res/movies/spinner-025.png new file mode 100644 index 0000000000..b5e91c69e1 Binary files /dev/null and b/src/qt/res/movies/spinner-025.png differ diff --git a/src/qt/res/movies/spinner-026.png b/src/qt/res/movies/spinner-026.png new file mode 100644 index 0000000000..94b50d4e11 Binary files /dev/null and b/src/qt/res/movies/spinner-026.png differ diff --git a/src/qt/res/movies/spinner-027.png b/src/qt/res/movies/spinner-027.png new file mode 100644 index 0000000000..4ede32657c Binary files /dev/null and b/src/qt/res/movies/spinner-027.png differ diff --git a/src/qt/res/movies/spinner-028.png b/src/qt/res/movies/spinner-028.png new file mode 100644 index 0000000000..391fbbec5d Binary files /dev/null and b/src/qt/res/movies/spinner-028.png differ diff --git a/src/qt/res/movies/spinner-029.png b/src/qt/res/movies/spinner-029.png new file mode 100644 index 0000000000..d78d8060eb Binary files /dev/null and b/src/qt/res/movies/spinner-029.png differ diff --git a/src/qt/res/movies/spinner-030.png b/src/qt/res/movies/spinner-030.png new file mode 100644 index 0000000000..94c454ee2d Binary files /dev/null and b/src/qt/res/movies/spinner-030.png differ diff --git a/src/qt/res/movies/spinner-031.png b/src/qt/res/movies/spinner-031.png new file mode 100644 index 0000000000..874ca1f26f Binary files /dev/null and b/src/qt/res/movies/spinner-031.png differ diff --git a/src/qt/res/movies/spinner-032.png b/src/qt/res/movies/spinner-032.png new file mode 100644 index 0000000000..99a6f96f2f Binary files /dev/null and b/src/qt/res/movies/spinner-032.png differ diff --git a/src/qt/res/movies/spinner-033.png b/src/qt/res/movies/spinner-033.png new file mode 100644 index 0000000000..7d9c074be6 Binary files /dev/null and b/src/qt/res/movies/spinner-033.png differ diff --git a/src/qt/res/movies/spinner-034.png b/src/qt/res/movies/spinner-034.png new file mode 100644 index 0000000000..9b3ee1ba4a Binary files /dev/null and b/src/qt/res/movies/spinner-034.png differ diff --git a/src/qt/res/movies/spinner-035.png b/src/qt/res/movies/spinner-035.png new file mode 100644 index 0000000000..fc0b288bd7 Binary files /dev/null and b/src/qt/res/movies/spinner-035.png differ diff --git a/src/qt/res/movies/update_spinner.mng b/src/qt/res/movies/update_spinner.mng deleted file mode 100644 index 7df3baac6f..0000000000 Binary files a/src/qt/res/movies/update_spinner.mng and /dev/null differ