From d67071a7a488a638e580489305c0b9df4dd9b607 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Sun, 9 Oct 2016 02:23:57 +0300 Subject: [PATCH] Settings page: layout items vertically --- MiddlePanel.qml | 57 +++++++++++++++++++++++----------------------- pages/Settings.qml | 16 ++++++++----- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/MiddlePanel.qml b/MiddlePanel.qml index b60cb838..9160a359 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -38,14 +38,14 @@ Rectangle { property Item currentView property bool basicMode : false + property string balanceText + property string unlockedBalanceText + property Transfer transferView: Transfer { } property Receive receiveView: Receive { } property History historyView: History { } property Settings settingsView: Settings { } - property string balanceText - property string unlockedBalanceText - signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority) signal generatePaymentIdInvoked() @@ -64,31 +64,31 @@ Rectangle { } - -// states: [ -// State { -// name: "Dashboard" -// PropertyChanges { target: loader; source: "pages/Dashboard.qml" } -// }, State { -// name: "History" -// PropertyChanges { target: loader; source: "pages/History.qml" } -// }, State { -// name: "Transfer" -// PropertyChanges { target: loader; source: "pages/Transfer.qml" } -// }, State { -// name: "Receive" -// PropertyChanges { target: loader; source: "pages/Receive.qml" } -// }, State { -// name: "AddressBook" -// PropertyChanges { target: loader; source: "pages/AddressBook.qml" } -// }, State { -// name: "Settings" -// PropertyChanges { target: loader; source: "pages/Settings.qml" } -// }, State { -// name: "Mining" -// PropertyChanges { target: loader; source: "pages/Mining.qml" } -// } -// ] + // XXX: just for memo, to be removed + // states: [ + // State { + // name: "Dashboard" + // PropertyChanges { target: loader; source: "pages/Dashboard.qml" } + // }, State { + // name: "History" + // PropertyChanges { target: loader; source: "pages/History.qml" } + // }, State { + // name: "Transfer" + // PropertyChanges { target: loader; source: "pages/Transfer.qml" } + // }, State { + // name: "Receive" + // PropertyChanges { target: loader; source: "pages/Receive.qml" } + // }, State { + // name: "AddressBook" + // PropertyChanges { target: loader; source: "pages/AddressBook.qml" } + // }, State { + // name: "Settings" + // PropertyChanges { target: loader; source: "pages/Settings.qml" } + // }, State { + // name: "Mining" + // PropertyChanges { target: loader; source: "pages/Mining.qml" } + // } + // ] states: [ State { @@ -116,7 +116,6 @@ Rectangle { } ] - // color stripe at the top Row { id: styledRow diff --git a/pages/Settings.qml b/pages/Settings.qml index 0f73ae32..d46186af 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -1,21 +1,21 @@ // Copyright (c) 2014-2015, The Monero Project -// +// // All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without modification, are // permitted provided that the following conditions are met: -// +// // 1. Redistributions of source code must retain the above copyright notice, this list of // conditions and the following disclaimer. -// +// // 2. Redistributions in binary form must reproduce the above copyright notice, this list // of conditions and the following disclaimer in the documentation and/or other // materials provided with the distribution. -// +// // 3. Neither the name of the copyright holder nor the names of its contributors may be // used to endorse or promote products derived from this software without specific // prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL @@ -284,3 +284,7 @@ Rectangle { } + + + +