From 7142be07b69a802d225adf735e0165b0ea887212 Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 12 Jun 2015 17:45:18 -0700 Subject: [PATCH] New address bar layout with back and forward buttons --- .../resources/images/address-bar.001.svg | 81 ++++++++++++++++++ interface/resources/images/darkgreyarrow.png | Bin 0 -> 369 bytes interface/resources/images/lightgreyarrow.png | Bin 0 -> 369 bytes interface/resources/images/lightgreyarrow.svg | 14 ++- interface/resources/images/sepline.png | Bin 0 -> 127 bytes interface/resources/qml/AddressBarDialog.qml | 54 +++++++++--- 6 files changed, 134 insertions(+), 15 deletions(-) create mode 100644 interface/resources/images/address-bar.001.svg create mode 100644 interface/resources/images/darkgreyarrow.png create mode 100644 interface/resources/images/lightgreyarrow.png create mode 100644 interface/resources/images/sepline.png diff --git a/interface/resources/images/address-bar.001.svg b/interface/resources/images/address-bar.001.svg new file mode 100644 index 0000000000..7734b95be5 --- /dev/null +++ b/interface/resources/images/address-bar.001.svg @@ -0,0 +1,81 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/interface/resources/images/darkgreyarrow.png b/interface/resources/images/darkgreyarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..4c9a8a2bbf69185a4a64bce1da6460ba0996b57a GIT binary patch literal 369 zcmV-%0gnEOP)#J37rGx zfCU5K0F*EXn*jn2z`>A!gh|+IazDrdr7hPcmkYG{a=qSbFG(VdizKWliWIIVL7;~F zz%mj7mJGa_ZzTYH!IkTO>IBS0)x-4v90dY1-mc!7rvP9LH^S1rHOjMGO#bqtwd7GQ zqYKap3SiDa?Yb*E0JeO>sZZXOO>RaVA=N=PxrNp++2j^Flud5IP|ly%>AG%ziE>G^ z{94IKldkKYaCg{O49egM?gpEqyisSWVOOSzx`L}jp$vX=Iu7qIf$Mn|gRb&yz(bT?YD?ay+nz0Xi}X@b^0xL?KLG{+pmtFIQSBgb P00000NkvXXu0mjfAz_+$ literal 0 HcmV?d00001 diff --git a/interface/resources/images/lightgreyarrow.png b/interface/resources/images/lightgreyarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1e221f3c73af148b0cde671a1d14ffdf9d43d75f GIT binary patch literal 369 zcmV-%0gnEOP)%^Hu`8V`qj`n;EIrpw7JNlQCp83a5T3eZtj_~t zrD7I4wj)DAr`U0xZ>a76s-r1fv6B%QU#+){ERVC^5>WL;y<XA9r8U7y*M$)1X#ML@Un$<^*$3PU?JUszyK(FG zOM=x~pRP9e$8qUVKYYf - -2015-06-12 18:23ZCanvas 1 Navi Bar + + + + + + + + + diff --git a/interface/resources/images/sepline.png b/interface/resources/images/sepline.png new file mode 100644 index 0000000000000000000000000000000000000000..959fcee72f740ca4de861595bf835dacad79b9fe GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0y~yU|?ooU@+uhV_;yApCv5Gz`!6`;u=vBoS#-wo>-L1 z;Fyx1l&avFo0y&&l$w}QS$HzlhJk@W(bL5-q~cc6ojsMG>)13B7?ao~+B+FJdy3pF fuRLd9kzml|VXm>1eSCv~fq}u()z4*}Q$iB}btNK7 literal 0 HcmV?d00001 diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 5cac0da223..1ddce9b04d 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -39,12 +39,13 @@ DialogContainer { Image { id: backgroundImage - source: "../images/address-bar.svg" + source: "../images/address-bar.001.svg" width: 576 * root.scale height: 80 * root.scale property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area property int inputAreaStep: (height - inputAreaHeight) / 2 + /* Image { id: arrowContainer @@ -57,21 +58,50 @@ DialogContainer { topMargin: parent.inputAreaStep + hifi.layout.spacing bottomMargin: parent.inputAreaStep + hifi.layout.spacing } + }*/ + + Image { + id: darkGreyArrowBack + + source: "../images/darkgreyarrow.png" + + anchors { + fill: parent + leftMargin: parent.height + hifi.layout.spacing * 2 + rightMargin: parent.height + hifi.layout.spacing * 60 + topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing + bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing + } } - //Image { - // id: darkGreyArrowBack + Image { + id: seperator - // source: "../images/darkgreyarrow.svg" + source: "../images/sepline.png" - //anchors { - // fill: parent - // leftMargin: parent.height + hifi.layout.spacing * 4 - // rightMargin: parent.height + hifi.layout.spacing * 55 - // topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing - // bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing - //} - //} + anchors { + fill: parent + leftMargin: parent.height + hifi.layout.spacing * 7 + rightMargin: parent.height + hifi.layout.spacing * 57 + topMargin: parent.inputAreaStep + hifi.layout.spacing + bottomMargin: parent.inputAreaStep + hifi.layout.spacing + } + } + + + Image { + id: lightGreyArrowForward + + source: "../images/lightgreyarrow.png" + + anchors { + fill: parent + leftMargin: parent.height + hifi.layout.spacing * 10 + rightMargin: parent.height + hifi.layout.spacing * 52 + topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing + bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing + } + } TextInput { id: addressLine