From a4663a3f5b712d37848f3b008faf775e1691db95 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Thu, 5 Mar 2015 16:37:29 -0300 Subject: [PATCH] added images for buttons --- cmd/mist/assets/qml/main.qml | 103 +++++++++++------- .../window-control/window-close-hover.png | Bin 0 -> 434 bytes .../window-control/window-close-hover@2x.png | Bin 0 -> 877 bytes .../assets/window-control/window-close.png | Bin 0 -> 448 bytes .../assets/window-control/window-close@2x.png | Bin 0 -> 894 bytes .../window-control/window-minimize-hover.png | Bin 0 -> 368 bytes .../window-minimize-hover@2x.png | Bin 0 -> 699 bytes .../assets/window-control/window-minimize.png | Bin 0 -> 378 bytes .../window-control/window-minimize@2x.png | Bin 0 -> 706 bytes .../window-control/window-zoom-hover.png | Bin 0 -> 357 bytes .../window-control/window-zoom-hover@2x.png | Bin 0 -> 712 bytes .../assets/window-control/window-zoom.png | Bin 0 -> 368 bytes .../assets/window-control/window-zoom@2x.png | Bin 0 -> 720 bytes 13 files changed, 64 insertions(+), 39 deletions(-) create mode 100644 cmd/mist/assets/window-control/window-close-hover.png create mode 100644 cmd/mist/assets/window-control/window-close-hover@2x.png create mode 100644 cmd/mist/assets/window-control/window-close.png create mode 100644 cmd/mist/assets/window-control/window-close@2x.png create mode 100644 cmd/mist/assets/window-control/window-minimize-hover.png create mode 100644 cmd/mist/assets/window-control/window-minimize-hover@2x.png create mode 100644 cmd/mist/assets/window-control/window-minimize.png create mode 100644 cmd/mist/assets/window-control/window-minimize@2x.png create mode 100644 cmd/mist/assets/window-control/window-zoom-hover.png create mode 100644 cmd/mist/assets/window-control/window-zoom-hover@2x.png create mode 100644 cmd/mist/assets/window-control/window-zoom.png create mode 100644 cmd/mist/assets/window-control/window-zoom@2x.png diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index 18174e4c71..8042e90a3e 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -14,7 +14,7 @@ ApplicationWindow { id: root flags: Qt.FramelessWindowHint | Qt.Window - //flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint + //flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMinimizeButtonHint // Use this to make the window frameless. But then you'll need to do move and resize by hand color: "transparent" @@ -794,9 +794,6 @@ ApplicationWindow { anchors.left: parent.left anchors.right: parent.right spacing: 3 - - - /************************/ /* Semafor Buttons */ @@ -810,49 +807,77 @@ ApplicationWindow { right: parent.right leftMargin: 8 bottomMargin: 8 + topMargin: 0 } + height: 37 spacing: 6 - + Rectangle { - color: 'red' - width: 11 - height: 11 - radius: 7 - MouseArea { - anchors.fill: parent - onClicked: { - console.log("stop"); - //gui.stop(); + color: "transparent" + anchors.fill: parent + } + + Rectangle { + color: 'transparent' + width: 13 + height: 20 + + Image { + height: 13 + width: 13 + source: toolbarCloseButton.containsMouse ? "../window-control/window-close.png" : "../window-control/window-close-hover.png" + anchors.centerIn: parent + + MouseArea { + id: toolbarCloseButton + anchors.fill: parent + hoverEnabled: true + onClicked: Qt.quit() //gui.stop(); } - } + } + } + Rectangle { + color: 'transparent' + width: 13 + height: 20 + + Image { + height: 13 + width: 13 + source: toolbarminimizeButton.containsMouse ? "../window-control/window-minimize.png" : "../window-control/window-minimize-hover.png" + anchors.centerIn: parent + + MouseArea { + id: toolbarminimizeButton + anchors.fill: parent + hoverEnabled: true + onClicked: Qt.quit() //gui.stop(); + } + } + } + + Rectangle { + color: 'transparent' + width: 13 + height: 20 + + Image { + height: 13 + width: 13 + source: toolbarzoomButton.containsMouse ? "../window-control/window-zoom.png" : "../window-control/window-zoom-hover.png" + anchors.centerIn: parent + + MouseArea { + id: toolbarzoomButton + anchors.fill: parent + hoverEnabled: true + onClicked: Qt.quit() //gui.stop(); + } + } } - Rectangle { - color: 'yellow' - width: 11 - height: 11 - radius: 7 - MouseArea { - anchors.fill: parent - onClicked: { - console.log("minimize window"); - } - } - } - Rectangle { - color: 'green' - width: 11 - height: 11 - radius: 7 - MouseArea { - anchors.fill: parent - onClicked: { - console.log("maximize window"); - } - } - } } diff --git a/cmd/mist/assets/window-control/window-close-hover.png b/cmd/mist/assets/window-control/window-close-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..f3a0455b040a0f0bc65cda0f3137d2c8595cb5a6 GIT binary patch literal 434 zcmV;j0ZsmiP)Px$Y)M2xR45glQe95MKp6bGl-+_A8W4zxCPt6I0n``c4U8x82%f}v1K-qppfM5D zpa?~Z^k>_;v$DnqAB^*|Upw>d?l-d*{lMe>!?Bd{nT+F3mZglbLS}P5ux)<2vAuO+ zq!x-^uO}RfUB*$g=T<#S2#4$|CJNNmSLV9AvokPTUrdeVKu(-A3RPx&CrLy>R7efImRoMqKoo|LXA(O}NzMcum{8r zDkL6&2T)K`QPHTVxtd&TXKdzoG}gqi(-w&yDe~={|MO(d#Rgqqr$E<#uWHI8HN#9 zx%^j$g2&Bf(@_u{mq49%d*5-qPp&&F%P1;tZc(wcMT~JhX64-X1=+&^*`onb5Rhr+ z`j(Y_RBJSjm2(8bO0pv80Kzz@>a7}?R!;d{>gYN%I{)1vUx*OqaigYI#*_m7E(O`C z?OquI9lRJ~@uJXzrqT~V*m&#-{w}P9XBPXQoUU?2EHt16O=u%N1R=Yy@z|62-zC$U z@LOk|ObXqg0WD}k8_(EDyZsC)jO@b3>jpsY?3etVrozTD0nR%oG`5F&Xs88EXrmSx z3I7E=kiyB?WzgJn6Jdai`rRdfx_}lmVJLWpipK@&ByO_msj^e2Ox9e1>5$Dzl{Si{ zczC1mYDYnqWkAlmyW4VP(0( zjp!DW8?9eQ4^mF#o-q&4(7VA8g7_f-=)y@BhakHa33B^Fn9>A;5od2hkZkqn!n&d2Rh`5)egQ-3FIG0{ zo$H~Y7RCn*gE8#h$KSqpQNhJhnM&pDr2tj&Np%88?8B(nrIM^AG*e|mS;+RVFT1$a z+rM{rJIp#vMhq>?6SR8W07!$t4=G%}xw8a;2DG3FZTLm==x6K4=h<}f0B?m>|F0cf z%;$6_dmm;}E?@Yv*Szx(ps0>8elZ#00LS>s;CzuGMnRwjO%)TZ2sf@}lq>SJe4Hp4 zj{p60ONZecgAp?etsY%iHDUb&61BM7XuOZd>eqh(SfTy;BLB4M00000NkvXXu0mjf DgU6dE literal 0 HcmV?d00001 diff --git a/cmd/mist/assets/window-control/window-close.png b/cmd/mist/assets/window-control/window-close.png new file mode 100644 index 0000000000000000000000000000000000000000..39ecae905c0990685e912e4d057f6c719b31204f GIT binary patch literal 448 zcmV;x0YCnUP)Px$dPzhjx!RHx3n-#Y>I*?g8YE$CHjNtOZtSqB>ID(z@i?4 z9(pJXQ$xrLsF_waIu~b}edAbDk2rU6|ap!eE!WJNh^bURy_OvYrS zO6f6c+xA8{IthTx3sBuU2rLJ%;T#2t_7Xns9^{ zNhNBUM>*BA_&iZq7B7=XYUg@irq86*QrGS0000Px&I7vi7R7efImfcR&KorMMXO^}LE+1ml1wj_w=mi+WsCXga!VurVXHcI-eFon_ zjTfjFN=%F*5O9%2N!V!QYggE|yKSBSm}$DD-31dl$)@e>Isad0=A1dzsD*8;u1>q2 z|Il^ao32~Wc&^um5XM=J^Hha%KFgW*sBd`qMKdWa>CcU|^?Q!B|JZTtlSw||aa}jI zbhG_I-_XF*@VL4^04fv;hC$kU+p3QEzOQMFQM$c@(&-LL={kv7$XGEusyhx_!}C~f+n=_CtEKT?;?efUD)`r0r2+q4840ZlL#xWe4$q_ zpVPP1ui;Rs1x;w978$wTeRv>+aqfQ2EWW7p{X@P%l2pb3Tm)idxwF~(UOtgy5g%p?gC)&zs8vrAR{VPMOP z^U|#u1P)3QjG&I<0O2vrtnb`lFofr`{r$mns~fRrtOh5XUCj)8qGke!%E)G^uQb6B zMVzVtfCDngq8mSXXPQoAI_Y<%EYm*;rZmA2AU+EKPT@Fk01G>-3|vE_;%hZvQ-(zjy_pppMXf(HYUS;2515 zoLd=U6a-q(R58JfFmNobT#=9E<3z!5{qLV!VHobw7}2wueL$iX2XeV*(b(|w9~Jid U-kf4GI{*Lx07*qoM6N<$f?hDEH~;_u literal 0 HcmV?d00001 diff --git a/cmd/mist/assets/window-control/window-minimize-hover.png b/cmd/mist/assets/window-control/window-minimize-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..97a7a4cb0b2dd035325e867e955626ee97db5b24 GIT binary patch literal 368 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