Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-02 16:47:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Settings page: layout items vertically

Browse Source
This commit is contained in:
Ilya Kitaev
2016-10-09 02:23:57 +03:00
parent 4f4cc9c8e8
commit d67071a7a4
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
MiddlePanel.qml
View File

@@ -38,14 +38,14 @@ Rectangle {
property Item currentView property Item currentView
property bool basicMode : false property bool basicMode : false
property string balanceText
property string unlockedBalanceText
property Transfer transferView: Transfer { } property Transfer transferView: Transfer { }
property Receive receiveView: Receive { } property Receive receiveView: Receive { }
property History historyView: History { } property History historyView: History { }
property Settings settingsView: Settings { } property Settings settingsView: Settings { }
property string balanceText
property string unlockedBalanceText
signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority) signal paymentClicked(string address, string paymentId, double amount, int mixinCount, int priority)
signal generatePaymentIdInvoked() signal generatePaymentIdInvoked()
@@ -64,31 +64,31 @@ Rectangle {
} }
// XXX: just for memo, to be removed
// states: [ // states: [
// State { // State {
// name: "Dashboard" // name: "Dashboard"
// PropertyChanges { target: loader; source: "pages/Dashboard.qml" } // PropertyChanges { target: loader; source: "pages/Dashboard.qml" }
// }, State { // }, State {
// name: "History" // name: "History"
// PropertyChanges { target: loader; source: "pages/History.qml" } // PropertyChanges { target: loader; source: "pages/History.qml" }
// }, State { // }, State {
// name: "Transfer" // name: "Transfer"
// PropertyChanges { target: loader; source: "pages/Transfer.qml" } // PropertyChanges { target: loader; source: "pages/Transfer.qml" }
// }, State { // }, State {
// name: "Receive" // name: "Receive"
// PropertyChanges { target: loader; source: "pages/Receive.qml" } // PropertyChanges { target: loader; source: "pages/Receive.qml" }
// }, State { // }, State {
// name: "AddressBook" // name: "AddressBook"
// PropertyChanges { target: loader; source: "pages/AddressBook.qml" } // PropertyChanges { target: loader; source: "pages/AddressBook.qml" }
// }, State { // }, State {
// name: "Settings" // name: "Settings"
// PropertyChanges { target: loader; source: "pages/Settings.qml" } // PropertyChanges { target: loader; source: "pages/Settings.qml" }
// }, State { // }, State {
// name: "Mining" // name: "Mining"
// PropertyChanges { target: loader; source: "pages/Mining.qml" } // PropertyChanges { target: loader; source: "pages/Mining.qml" }
// } // }
// ] // ]
states: [ states: [
State { State {
@@ -116,7 +116,6 @@ Rectangle {
} }
] ]
// color stripe at the top // color stripe at the top
Row { Row {
id: styledRow id: styledRow

16
pages/Settings.qml
View File

@@ -1,21 +1,21 @@
// Copyright (c) 2014-2015, The Monero Project // Copyright (c) 2014-2015, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without modification, are // Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met: // permitted provided that the following conditions are met:
// //
// 1. Redistributions of source code must retain the above copyright notice, this list of // 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer. // conditions and the following disclaimer.
// //
// 2. Redistributions in binary form must reproduce the above copyright notice, this list // 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 // of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution. // materials provided with the distribution.
// //
// 3. Neither the name of the copyright holder nor the names of its contributors may be // 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 // used to endorse or promote products derived from this software without specific
// prior written permission. // prior written permission.
// //
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY // 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 // 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 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -284,3 +284,7 @@ Rectangle {
} }