From 1878630b591b039fadb6f88e15340d04f4af3ed1 Mon Sep 17 00:00:00 2001
From: Alexandre Van de Sande <alex.vandesande@ethdev.com>
Date: Mon, 16 Feb 2015 14:34:47 +0100
Subject: [PATCH] Solved Issue #318 and added states to back button
---
cmd/mist/assets/backButtonDisabled.png | Bin 0 -> 634 bytes
cmd/mist/assets/backButtonDisabled@2x.png | Bin 0 -> 1458 bytes
cmd/mist/assets/backButtonHover.png | Bin 0 -> 657 bytes
cmd/mist/assets/backButtonHover@2x.png | Bin 0 -> 1517 bytes
cmd/mist/assets/qml/main.qml | 2 +-
cmd/mist/assets/qml/views/browser.qml | 39 +++++++++++-----------
6 files changed, 21 insertions(+), 20 deletions(-)
create mode 100644 cmd/mist/assets/backButtonDisabled.png
create mode 100644 cmd/mist/assets/backButtonDisabled@2x.png
create mode 100644 cmd/mist/assets/backButtonHover.png
create mode 100644 cmd/mist/assets/backButtonHover@2x.png
diff --git a/cmd/mist/assets/backButtonDisabled.png b/cmd/mist/assets/backButtonDisabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..42874787022eef2eaff8fb67735513c7b7273742
GIT binary patch
literal 634
zcmV-=0)_pFP)<h;3K|Lk000e1NJLTq000yK0015c1^@s6ED}Cz00001b5ch_0Itp)
z=>Px%G)Y83R7ef&l+Q~WK@`V#X4jaN7@Nj)?WPeH%-WvBLl1?v(0`$ao&=$%;-TQx
zgT#9;Jr{cr5<;-rqUb>>l)x6mm`#5m8k6FRMQM?egVaN^{SLSw?v5FI6MQhdnK$qI
z$=i94NYb^ndx3hT@(4MEmq&RQLGh|>KSTUetx|arbkAbKz?yA8q=d{6Le^UQ`)_$b
zZs}(QfSCY&#`<$-aIm0+LhrC&Kbzz2+g4cJ*hoOU3_<huz`#6UTiBO9z<GZm(6TI5
zrgQ<H(U(Z2@|~*s1Ash!pm`qTow>kFCPTHZuAD^3{T@xrMq)7sqAXy4J@KV{-L_w2
zMBGEi$-1sPfu)N80xLul#!=ZzeB$D*RB9U_)`Xw`1qAFV#IKZ&j-sAUmjGGDnKeSl
z{1p;11|_|rX*GBYur(plX_9Xaj~k5#zxMVPTFs_%;=03khlW^Zh0Rx?+TEQ_^!Mk`
zgjPtBmcA5=F<}}KeL%!!)kvfoPbPEN8<A*q{(GSSwwU>Vc(Y?jv(b3m>FMod(8poZ
zoEF0cSBQxrM*!q+>UtedFo*L9x<4fX^;PJJ0CBK?-)9(KL*ei$&XYUk@~C&u^IRYk
z0P+p)W70G&S(evvezRlSPk1mEzYxe004c(i@VB)>WO)~Yx$RQv9=i*&w!l--B2|=4
z-7r27N)IGOi3Y(~%s1G)M9gI;?w(^Y*fc8t9h56tA^Y?b0N5Bcuo(Q>uF4Di17(ku
U7^JihtN;K207*qoM6N<$f+Jcd2><{9
literal 0
HcmV?d00001
diff --git a/cmd/mist/assets/backButtonDisabled@2x.png b/cmd/mist/assets/backButtonDisabled@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eaa6daa5e2bbf73f7f34e9d34efeaaa719981e5
GIT binary patch
literal 1458
zcmV;j1x@;iP)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00001b5ch_0Itp)
z=>Px)Y)M2xRA>e5m`!XOMHI*P!;WJ+aa}tfj_ovY<Cuat1py@#2_z5_UqV8FR3UMo
z2M%zc7sM?R2aw=^5C>2t1c+3{xM`ENX#+(T0z{g)SsR*?C{7Brq=Blc07IM)d-%Wg
zPUHiMch|c}NPg1no42z&@3(Jf-p;HbG^7!MMg$rW_<u)WDVu#JpUWLer_&BIPa>MR
zN$))iigK?cNfU6=BrrCyUMM`dXWza*_1;g{nR+Tc4i;u+ZjnXt7_M!i>zOEqWrxFX
zKx_e=otg^Ck~A)eqF;R&#+J*);zRv=_x_>U1`d`3=5jf2vml%TLl1EvWPb&s(bs*!
z;IaX(txKh?ngx|)GAXw(_6eW{wC*+oU0o@_1!3=JjH$2Nh$~A0Z%ZWJ5k>J~4gj!G
zUwiwHn%xR*cnn$wxR}kp47lexoTs(*vtT50L9=P>4WoUHx9ioG0OqsVr{VlH?zGA6
zp6rapzSV4kA~?engzm3<k}TzN_b@^D5PhkyPj)&lM*8|br_LcIlqBGORV@>Tx*|9?
zJ$(~=9tW9=e2bFwbGW~MOpv6q#&Qa9i(1{3G95vDzB(kvPQz<}JOku<S1dN-a5(rl
z`x577Oi@+cWGaH0OvWQJb^=r}6;2TT?%1^}<??!e*ZTeraOo;PrmKb{I5adQ1)R>q
z@OX#nm9dgP5;^MGv13J}xCA|_)$3O3z&6qgRwr*Gaxe0Gkn2W}PQKUd-=N<|^oqQ_
zUTx?VBi9|QhC{A9TLnj}6iO$S!O_F%e#MKq+!F}*8$2RTmunii?i<ZshdvBAJ_h+^
zb!%M_#M0?5z<msF>h+StF^6<Ap?Rm2@+si1)=l#-9n_3q{`~nk^4l2h#UcfSl5`~!
zkB>rA5+)f3+(M;l{jp{QMOpp;0Bzhg#@uN~QxhL&U!yI<+w9P_0R`b8mg}qB`Hhv8
z2g~KM4EqA$&hqniX<cdN^8EaP&9$}nu%1&N$l2U{E}BT(4M6^y?c%Ep`t5oLQ~)qL
zy?#Gm00<k!;+@EcuWomrRc$q2F&sUP;%)Elo^-dgOmWAUIImzO^BlMB(s}?Xolu?=
zLcP6bkpHqA2GM<YNl_l)wjH`AAja7*a6E#-kYiZ5uWwwE<t2han*-a)6jnC3l5L07
z1SF>bnS)XjGm`X1c=zsOI7i=IYV%>HjbF@Uy2!R#bODl6fJ{Q2qq@`WE_C+vq;Rr8
zHUPU_PUlJ5a*}PO=mylBo`IgHy4&Zw77T@sqPj^oAP2DJJVIMfvaJ$BfQTZtA3_R6
z-GtMYlD3u{2JMdwBoc3N+X`(6kQ@SH1Bw=`>dJ+-mbC1mHWEn`U%;~LrHWPm(J&yn
z1SE~UVHEY7Ov^5OU8bpx1nqC;6@~I=-C_!myaIw|aS}!S+=b)u3H-gH*-j!MlEaIN
za(l%ze>4q9E&)mT@Fdk~`31-^Xv&+^=)uVoKPXDCYMVUN1xP*tsX%>2bu7bHL$Mgm
zY;}BMW_P;q8%|LaKed~Yx&g^4Aisc8H%{1k-e`+PX{M{6N9db<qBw%BsuOj?VhNz;
z^*HoTRBsIguJ}7TDxXK#c!2w`RXs#)M#VBfK+t44f^wZ8c7{Up*elbYhl((^XEvQ~
z;ig`VVPdV&`Vl=IK=Dw|%lZ8M>#M8Rt`-XW2L}hYR_4^EM=S><r-1B+dKQH?Wn!sR
zx+Kf;M~E{2sf5$|#Ijdh?G7N9VbdRe`ZO}Y^+G>}VpwbeBnm*zLecEz(uT+y{zuJk
zwoL=-QIw}pYVN^pgV?TPfZ;bHvt_Jr=eN<;h(IF(jR-U%@E=9sA0t?4q9Ts}%>V!Z
M07*qoM6N<$f;hmh*8l(j
literal 0
HcmV?d00001
diff --git a/cmd/mist/assets/backButtonHover.png b/cmd/mist/assets/backButtonHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c5226f5a2b59ee83e8bc95ec5a062521892f792
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000yK0015c1^@s6ED}Cz00001b5ch_0Itp)
z=>Px%OG!jQR7eeDU>F62LLkE5-xjEb5tlk<ToTyCBYl0t7#SJ2>Zz;0x_tBI8Ek5p
zunA%l0~%(-z{IqOi<|r0``^FkVN(MVW5FeXEFSLVrN+R_ype;0<7MBpX$*Y){60XJ
zu0>V@V-qwm)YDUxnT>5bGc)u5maeW>K*P=gHE)6$fKKD}a;T*xCkq?fW(Gz^$+Fto
zyHc{U_kjkK0$ukT-5?krpMgv)Vq(jHnoUzPGcW4s>%RwTDgg37!!(mbNBR3tj0y<&
zzjXfm<NyEvKLo^@#2A3pg}}5{2=r#2k(t@)sDuPinyUu7>^d<9VyFrC^9usH>~DEN
z!G(YS{+$B4EEGc#9svv&GBYw}0o5~wMMtv(U9|*=SL4x-A%&5JZd|?UH>Iy{<=3xY
z|9<)URd@B~&7hbi8eq6kT}#Uim_%;<`St5J3lr0}C~t2;qD=!T#4r#jRxK+pf2W|b
z@+Q!`ivL+z*N19rvk_}3hJipsJ_0ot7@3%Sib+g7&+z}h9gC{!T(S)WX#^Vj7)X_R
z`uY8Ja&<io4Ct6hfB!~e48?FEOcT)1i$Hc`N_IAbhPL*3Aipls&o3S(kBi2LWpstW
zbeQn>@87KAtSs)=uU@JC`S;I#)uv7R(bd8D1Puf!1R7cmOh$qEX=%dWzkU_?`{$3<
z%B@?m<{X?}hS><EJGi;IkGJ&nyk%!+f5XVa!iOeLIv40lZXjL`%#M43v;r;@h;<<-
r=Dz|B0To{_fiyQR14qRNVF&;K>x8o-W#e=A00000NkvXXu0mjfb?Yrw
literal 0
HcmV?d00001
diff --git a/cmd/mist/assets/backButtonHover@2x.png b/cmd/mist/assets/backButtonHover@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..406601ebc562a63c6a1480b8589b1ebda9855a02
GIT binary patch
literal 1517
zcmV<J1rqv+P)<h;3K|Lk000e1NJLTq001Ze002A)1^@s66uJ1|00001b5ch_0Itp)
z=>Px)r%6OXRA>e5n14)LRTRhDzP7gAO34OJ$_P`LZb)#0ZDMdxM(7fLz2edg&@3TN
zgQF8fyM+<?F_OwMGc<8VW6b6sPEj`<AY}eZ6JuhgCdN1=%mL!G{91%<fGd>e_mp?D
zWMOGv`x^I0PjcV6=biiR`Sjd(@4L4OMO300h-M&~frw^68PVR+c|~dIlM1CW*E2o+
ztlRBgkQy(dfaNxu1p&^XXazwyHzNr4uCA_YQXo}Q8cS(w=lN8XAbdh_^c=K#etsTG
zny95U53aSnu<#y@QrU~vvGfG8_xBC2x3I6T?`m*8+-xN~pw((!q0wqTLx^Mw!>LrW
z&pDl^w`65`luF47RLDBScJQp$>pQ`fL2!_Tn)>=-z-6I+44E|e?@GAHnn4ZEzm6GO
z#Nt=%*>mxc?CcrQj)#_<LfJA{$@2#RSIyw^3JL~_%gU~c_5^ethM2*!W&yP<faN^D
zTTm!oX3-u>PaoX7Z{M_N6BNOXGrtrqIpw!@4!G^;<O=}YMLu(4;-9XLjxmi!17-y+
z%=PenN4`)btas2}TKXV@e+oc9oY7<&d&%XR5aEdDNH}oRLCAn*R_onZ>-x~gD(Xn9
z)lN0LT%$2DF+Q>(?*Q)XQZ@8zNPs0JB?cYGbtCM(6k4TH%^hrRzMNn-dqtE!z`Z5b
z!&0FDs*D_W3Q@O-k$u&*wL=?HQ|CncN9Z=O9=4J^iz|5kRYc`kWP4@hKz2?JTRsMH
z--+x=-nFp)Zq<?iv2~&uxu12Cvt!4A&2DFF-6ZbQa>8uZEG!-L5Lei2yD(divS=96
zp=TTpw${<`68tFh%cT)Buv8QmKdR)oukoeOQR_8k^X2xAj#129TI*=mz6iK)$tSl2
z%plgf6o7RxxRplZc#F$5F2WJd(MZ8j=K%q+)|~`g95p7XJ#b($#$;k^-MfH0v*d})
zHSi?y`RXx_Yza}kcj82n*XyNMgFbJ^BZGCb*MNYhdV0=3ym@m29-;S5F+4bEY;SF)
zopKA=krpmc0BkbXK9-y7L_5uI7cQ8n{gsJ{Ri`^U)xY%je--HYaQy)@hycwfvAfF4
z$F^H6V=N%XxB;iOr<ffn9SmRxg8xeZPdgkV_obx#!C;hv@Fo`T0%k`-2L!}K_!WVh
zP!>6kQygk-om?Fk=OGyQ)F>bCE-FeRI}#EQkb(lj4fPt;^#;RYlgl-x)9L;p8_pP&
zTHX8j&YcN<TjonpfJ+?8_n|+edR%<`{Gr2#|Dq$M=u6V+^*watBwJ1i8c+;+4Eh_Y
z-@ktSoWtoHMwRVcGU5z|59~O4l3y;71c;$tMBql0egfE*l{JH-<?mD%rI@qXXgemG
zNCKp&fTS7yJc@tG!O`-XB|rZn`AE>A0|zPc%Oa8iDJmeZK-Hr7_kMe8YNj@(r45mf
zM5R=|g6)}Y$qMfp)OPE3A@G%<Z9fgEn!e8sb#)1&9#5jby&%l`78fm@-QC~c?)hNu
zhm=9qF*11`^>(sp`$fyo3Zs$!MW8eraG2`G*JhpH4)GEeAjJe^7t~3rn_^>qO>J!+
zwOZ}}lM=o)7@}T`Hf=6KlCS|ODnQ<V`kd-(lap_}(AYSFd;TLR05=*0;Y?;`riT1d
zMHWCYXe;zjR8QZuX|}4m`V!tz{}v6uAn$>sq_@R(l9X(K$k;q0)3$7c2=cAg>qR_2
zKy|+e!Uns=vXYs>YS{oOARwoq>QJW0exj=CYR1;BmpHZh?85kX-bZe?<RfWV%M3v*
zCm7ju+^6?a>+|^t{0GeF{m|?zv)p6L-jg+hECN7&M!f|^pe-8UwxHgKB3U8=NECql
z5{k0OWF0cAXT}|)0o8zV1jYX!;vECVKmf*}MC4s(F`_z}foKMz8Hi@!f6Tyt(OPuo
TI$X5q00000NkvXXu0mjfzx3i{
literal 0
HcmV?d00001
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index c9505806c..1272f8761 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -485,7 +485,7 @@ ApplicationWindow {
label.visible = !on
buttonLabel.visible = on
}
-
+
width: 192
height: 55
color: "#00000000"
diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml
index a6f4e3d92..3a35c2a65 100644
--- a/cmd/mist/assets/qml/views/browser.qml
+++ b/cmd/mist/assets/qml/views/browser.qml
@@ -129,9 +129,9 @@ Rectangle {
Button {
id: back
-
- onClicked: {
- webview.goBack()
+ z: 30
+ onClicked: {
+ webview.goBack()
}
anchors {
@@ -140,21 +140,23 @@ Rectangle {
}
style: ButtonStyle {
- background: Image {
- source: "../../backButton.png"
- width: 20
- height: 30
- }
+ background: Image {
+ source: (webview.canGoBack) ?
+ (control.hovered ? "../../backButtonHover.png" : "../../backButton.png") :
+ "../../backButtonDisabled.png"
+ width: 20
+ height: 30
+ }
}
}
Rectangle {
- id: appInfoPane
- height: 28
- color: "#FFFFFF"
- radius: 6
-
- MouseArea {
+ id: appInfoPane
+ height: 28
+ color: "#FFFFFF"
+ radius: 6
+ z:2
+ MouseArea {
anchors.fill: parent
z: 10
hoverEnabled: true
@@ -247,7 +249,7 @@ Rectangle {
}
}
- z:2
+
}
Rectangle {
@@ -256,6 +258,7 @@ Rectangle {
height: 30
color: "#BDB6B6"
radius: 6
+ z:1
anchors {
left: back.right
@@ -264,19 +267,17 @@ Rectangle {
rightMargin:10
top: parent.top
topMargin: 23
- }
-
- z:1
+ }
}
Rectangle {
id: navBarBackground
anchors.fill: parent
+ z:-1
gradient: Gradient {
GradientStop { position: 0.0; color: "#F6F1F2" }
GradientStop { position: 1.0; color: "#DED5D5" }
}
- z:-1
}
states: [
--
GitLab