From e2f6eae47df0d620d4af847e709fc4dc72252b08 Mon Sep 17 00:00:00 2001 From: felixrojauro Date: Wed, 25 Nov 2015 15:43:16 +0100 Subject: [PATCH] Sleep changed to cross-platform sleep; send/receive.png icons changed --- src/init.cpp | 2 +- .../qml/QmlGUIBannerControl.qml | 12 ++++++------ src/qt/res/icons/receive-red.png | Bin 0 -> 268 bytes src/qt/res/icons/receive.png | Bin 310 -> 260 bytes src/qt/res/icons/send-red.png | Bin 0 -> 267 bytes src/qt/res/icons/send.png | Bin 314 -> 238 bytes 6 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/qt/res/icons/receive-red.png create mode 100644 src/qt/res/icons/send-red.png diff --git a/src/init.cpp b/src/init.cpp index 847157a..69d930d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -78,7 +78,7 @@ volatile bool fRequestShutdown = false; void StartShutdown() { - Sleep(1000); + boost::this_thread::sleep_for( boost::chrono::seconds( 1 ) ); fRequestShutdown = true; } bool ShutdownRequested() diff --git a/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml b/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml index 5458ba3..5d94ade 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml @@ -16,7 +16,7 @@ GUIBannerControl { id: id_leftArrowImage - source: "qrc:/icons/res/icons/adverts_arrow_left.png" + source: "qrc:/icons/advertsArrowLeft" anchors.centerIn: id_leftArrow } @@ -31,13 +31,13 @@ GUIBannerControl onEntered: { - id_leftArrowImage.source = "qrc:/icons/res/icons/adverts_arrow_left_hover.png" + id_leftArrowImage.source = "qrc:/icons/advertsArrowLeftHover" id_bannerListView.m_PathView.decrementCurrentIndex() id_animationTimer.restart() } onExited: { - id_leftArrowImage.source = "qrc:/icons/res/icons/adverts_arrow_left.png" + id_leftArrowImage.source = "qrc:/icons/advertsArrowLeft" id_animationTimer.stop() } onClicked: @@ -114,7 +114,7 @@ GUIBannerControl Image { id: id_rightArrowImage - source: "qrc:/icons/res/icons/adverts_arrow_right.png" + source: "qrc:/icons/advertsArrowRight" anchors.centerIn: id_rightArrow } @@ -130,13 +130,13 @@ GUIBannerControl onEntered: { - id_rightArrowImage.source = "qrc:/icons/res/icons/adverts_arrow_right_hover.png" + id_rightArrowImage.source = "qrc:/icons/advertsArrowRightHover" id_bannerListView.m_PathView.incrementCurrentIndex() id_animationTimer.restart() } onExited: { - id_rightArrowImage.source = "qrc:/icons/res/icons/adverts_arrow_right.png" + id_rightArrowImage.source = "qrc:/icons/advertsArrowRight" id_animationTimer.stop() } onClicked: diff --git a/src/qt/res/icons/receive-red.png b/src/qt/res/icons/receive-red.png new file mode 100644 index 0000000000000000000000000000000000000000..085e045e7f17d5f027ea07a21a7a5ef3d6ecb6f5 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%NBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%t@Cto45_%46r-klzJbk-!O&jlzr4U^hL80#7=)SC9=Ja? zR?I%Iv{OOC!k5kBN~S`w!@?ro4pUBvI?)b$r{( zJaZG%Q-e|yQz{EjrrH1%E%S7745_%4^ymM7duFL03`hQW{Hb?1!*ryewI{+Pk)z>? zV(|=#6AaADPcpPy@rv*>F+Y-;a7`t_LW9NL=_b2_*<)vUS}5tIk)$ zm?SzuO`uOPDA>v(Zs9D43SCCt+YK`WV<&3}>_4*bp{{`Up({$+Ob;1kW*wSvbs><| znjtl9(dvWCJQ+IV9ZhZ6k{pvv8aHrXk=MKNgprAd!GBtHy8hATLZFKoJYD@<);T3K F0RURUTFw9f literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA3y|d6q_!SNF(rAsyD%`U>Qy!Z@;D1TB8wRq zxP?KOkzv*x36Nk}fnz$52J2;5yz1b6ASc<=#W6(Ua&m$K@1OKv=Ue=v9@QWJfAas; zLhXQm|6lw+{{PyEBoDTK;>jOU64Db=3;wO|iQRwnzx01FxclEBCTz;T|DXTg|Ihh9 zvOx2}|NSrizx$u{_gjukSjf!4a3)Tx*_Ji)1<*Rx64!{5l*E!$tK_0oAjM#0 zU}&mqXrOCs5MpR%WnyY&XrgUkXk}pV#*fznMMG|WN@iLmRD+?ek!gsbk(B{ZgC#`6 TvYpYoKn)C@u6{1-oD!M<42f<> diff --git a/src/qt/res/icons/send-red.png b/src/qt/res/icons/send-red.png new file mode 100644 index 0000000000000000000000000000000000000000..4ddb335ec4b8f51f710c0cdb0450ab7c0cdf6685 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%NBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%t@U(q45_%46r-klzJb+(@uQYPAHyTt7n6J(?N$j^)$mr5vN&94Hj~~I$Rxx3o?aRA4&4uI9Q@E?Z`6DC5|%fYKjW; zxR3Oln3dFE(ZOi{f#s3O47E&!c}E;%Ua%&KPFNOsqe+zg0h=o`_k;i?r;qju|2R_j zvt?d#nPkH7=yQb0ONNi7F&|49+kLNdF6C%SNHDEEqI9g|3?qjDLz$`Q{`=Qgz5+U& N!PC{xWt~$(695g*T{8dx literal 0 HcmV?d00001 diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index 9f192f8ef4da885b232f697074a34f3265bda379..e791d2dd839e0e302db97626b7d8f4c740c737c7 100644 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%NBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%P4IMa45_%4^yB}3duFjWEJyMiZm`a_G2>-&`18V^#fB}( zG08;tM?cpzp-Unk}YS^7c2_j`Wdco_{WjD-;KYBS!P+b((2|GHmx81N7dX?_=K4y k6B0~oRi3CfFfcPbdT?Qtrquy4pxYQcUHx3vIVCg!02<;|&Hw-a literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA3y|d6q_!SNF(rAsyD%`U>Qy!Z@;D1TB8wRq zxP?KOkzv*x36Nk}fnz$52J2;5yz1b6ASd0^#W6(Ua&p1~qaW|T+~=Ra<