From 0d05a40cc89fbf9056af6fd2adc6685a6f376dc8 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Thu, 13 Aug 2015 14:46:45 -0300 Subject: [PATCH] edit button changes, color of selected blocks --- mix/qml/Block.qml | 26 +++++++++++++++++--------- mix/qml/Watchers.qml | 21 ++++++++++++--------- mix/qml/img/rightarrowcircle.png | Bin 0 -> 1647 bytes mix/res.qrc | 1 + 4 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 mix/qml/img/rightarrowcircle.png diff --git a/mix/qml/Block.qml b/mix/qml/Block.qml index e64c9a525..a533b7fd2 100644 --- a/mix/qml/Block.qml +++ b/mix/qml/Block.qml @@ -23,6 +23,11 @@ ColumnLayout property int blockIndex property variant scenario property string labelColor: "#414141" + + + property string selectedBlockColor: "#accbf2" + property string selectedBlockForeground: "#445e7f" + property int scenarioIndex signal txSelected(var txIndex) @@ -105,14 +110,15 @@ ColumnLayout } } - Label - { - text: qsTr("EDIT") - color: "#1397da" + Image { anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: 14 visible: number === -2 + source: "qrc:/qml/img/edit_combox.png" + height: 15 + fillMode: Image.PreserveAspectFit + MouseArea { anchors.fill: parent @@ -122,6 +128,7 @@ ColumnLayout projectModel.stateListModel.editState(scenarioIndex) } } + } } } @@ -237,11 +244,12 @@ ColumnLayout function select() { - rowContentTr.selected = true - rowContentTr.color = "#4F4F4F" - hash.color = "#EAB920" - func.color = "#EAB920" + rowContentTr.selected = true + rowContentTr.color = selectedBlockColor + hash.color = selectedBlockForeground + func.color = selectedBlockForeground txSelected(index) + } function deselect() @@ -345,7 +353,7 @@ ColumnLayout Image { id: debugImg - source: "qrc:/qml/img/rightarrow@2x.png" + source: "qrc:/qml/img/rightarrowcircle.png" width: debugActionWidth fillMode: Image.PreserveAspectFit anchors.horizontalCenter: parent.horizontalCenter diff --git a/mix/qml/Watchers.qml b/mix/qml/Watchers.qml index c7c6e8335..fc3c25bba 100644 --- a/mix/qml/Watchers.qml +++ b/mix/qml/Watchers.qml @@ -12,13 +12,16 @@ import "js/QEtherHelper.js" as QEtherHelper import "." Rectangle { - color: "#4F4F4F" + color: selectedBlockColor property variant tx property variant currentState property variant bc property var blockIndex property var txIndex + property string selectedBlockColor: "#accbf2" + property string selectedBlockForeground: "#445e7f" + function clear() { from.text = "" @@ -83,11 +86,11 @@ Rectangle { id: fromLabel text: qsTr("from") visible: false - color: "#EAB920" + color: selectedBlockForeground } Label { id: from - color: "#EAB920" + color: selectedBlockForeground elide: Text.ElideRight maximumLineCount: 1 clip: true @@ -97,11 +100,11 @@ Rectangle { id: toLabel text: qsTr("to") visible: false - color: "#EAB920" + color: selectedBlockForeground } Label { id: to - color: "#EAB920" + color: selectedBlockForeground elide: Text.ElideRight maximumLineCount: 1 clip: true @@ -109,7 +112,7 @@ Rectangle { } Label { id: value - color: "#EAB920" + color: selectedBlockForeground font.italic: true clip: true } @@ -118,9 +121,9 @@ Rectangle { Image { anchors.right: rowHeader.parent.right anchors.top: rowHeader.parent.top - anchors.topMargin: -3 - source: "qrc:/qml/img/edittransaction2.png" - height: 30 + anchors.topMargin: 5 + source: "qrc:/qml/img/edit_combox.png" + height: 15 fillMode: Image.PreserveAspectFit visible: from.text !== "" MouseArea diff --git a/mix/qml/img/rightarrowcircle.png b/mix/qml/img/rightarrowcircle.png new file mode 100644 index 0000000000000000000000000000000000000000..0e2259dfd9d2b75dd23eeac6a2385d5fb8d3f34e GIT binary patch literal 1647 zcmeAS@N?(olHy`uVBq!ia0vp^4nSDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49pstArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMU}mmhZmDNz zYHn^~uA^XNU}&muV61O!plf7oWny4uVx#~CNh+i#(Mch>H3D2mX`VkM*2oZxQ#zd*s+860W~8or6i znRy^VO|ULsUn|eN;*!L?eX5&W47rrWR(-#xAB7 zmZlaa#%4ecOs`9Ra%paAUI|QZ3PP_FPQ9Q6ky`+?*(J3ovn(~mttdZN0qk+BOx$j< zz-b;-ZwhX=SmM;H4|I$^D0-2i8zuxyLm(zR@d7#UsP7{&QP3_e}n?DfdQg`hEGiH)oa$uX}CP zzEjnufkS{%$$_PVK~RAS!clm)?|@{1+?R&3f+_X4SwuIm*fqXCV5`9t@`yQMhG%=G z*D>o4c6ow@+!@T~4(9vUH}XHw{=sYJASA<{Ie}5Ua&DIWL7s?QH%6_QvlmS5+|S6m zLAD@vlF+6HEULbZLB^afSj!Ix_PtC`&`#F0ms z&wX>$UDd*rynVC&YnCq`XYhYqv06RxnEN5Kyd3!Z?<>VUpITt)(9~CZ%Z;&W z=I_;w*@wL@Z1lgS;gFwWCbcKdyTXrCd-t5pahIo;_B&2i`u^mePuZrE$=S`fDstXP!Kd)D@Kc#38nBKW2dHoHIgp-@OduIJHnOx79_xlaM(Y(Da zrA%Emaa{u8>hqI7ZLgW+Z?J8<{%V#f7Ce{koNxF1r#ZP^a>5?5*=h2s(yS|dPczx4 zGf&&9DQ3B@AzWup2=lq~pFTGwZ}3U`6}UL7A~me2$Zqzu_6J&%<@p1JPZ*}ntc{2l znE9lBZJgs1?h5XA@5>!k)=i3#PcNRVx=~$Ceg6*D49>@YR9`I0usiZ&t!`J?&m|hi z3MUs%KYF!b2ivY6d$;NAdl&hzw4wOixlI)_S08%1BQGGX=gr~O8@boWZn3nE?_FDD t`tzb?!un%t@=((iFp)JJzWI;SfWhL7Y)MG4?io-O;OXk;vd$@?2>@klV#ELd literal 0 HcmV?d00001 diff --git a/mix/res.qrc b/mix/res.qrc index c868ff34b..6b6641d1c 100644 --- a/mix/res.qrc +++ b/mix/res.qrc @@ -86,6 +86,7 @@ qml/img/restoreicon@2x.png qml/img/rightarrow.png qml/img/rightarrow@2x.png + qml/img/rightarrowcircle.png qml/img/saveicon.png qml/img/saveicon@2x.png qml/img/sendtransactionicon.png