aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Ferdinand <sa.ferdinand@gmail.com>2018-03-21 23:58:51 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-03-29 23:04:03 +0100
commit916c7acbb7f0bb658acd3ea050ea4b04581374e2 (patch)
treee52845d67e5c5d21729485146b8e948666040cd9
parent6e794e3c50a5063d79cfe47a69d36d8005568921 (diff)
downloadmonzero-gui-916c7acbb7f0bb658acd3ea050ea4b04581374e2.tar.gz
monzero-gui-916c7acbb7f0bb658acd3ea050ea4b04581374e2.tar.xz
monzero-gui-916c7acbb7f0bb658acd3ea050ea4b04581374e2.zip
Design polish work
-rw-r--r--main.qml1
-rw-r--r--pages/History.qml13
-rw-r--r--pages/Keys.qml1
3 files changed, 12 insertions, 3 deletions
diff --git a/main.qml b/main.qml
index 9cb3bc34..4d69d217 100644
--- a/main.qml
+++ b/main.qml
@@ -286,7 +286,6 @@ ApplicationWindow {
informationPopup.onCloseCallback = function() {
appWindow.close();
}
- return;
}
walletName = usefulName(wallet.path)
diff --git a/pages/History.qml b/pages/History.qml
index a1f3142a..f6fe8736 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -133,15 +133,24 @@ Rectangle {
spacing: 0
GridLayout {
- columns: (isMobile)? 1 : 2
+ property int column_width: {
+ if(!isMobile){
+ return (parent.width / 2) - 20;
+ } else {
+ return parent.width - 20;
+ }
+ }
+
+ columns: 2
Layout.fillWidth: true
- columnSpacing: 26 * scaleRatio
RowLayout {
visible: !isMobile
+ Layout.preferredWidth: parent.column_width
}
RowLayout {
+ Layout.preferredWidth: parent.column_width
LineEdit {
id: searchLine
fontSize: 14 * scaleRatio
diff --git a/pages/Keys.qml b/pages/Keys.qml
index 50928579..37ea3060 100644
--- a/pages/Keys.qml
+++ b/pages/Keys.qml
@@ -187,6 +187,7 @@ Rectangle {
Layout.fillWidth: true
font.bold: true
font.pixelSize: 16 * scaleRatio
+ color: Style.defaultFontColor
text: (viewOnlyQRCode.visible) ? qsTr("View Only Wallet") + translationManager.emptyString : qsTr("Spendable Wallet") + translationManager.emptyString
horizontalAlignment: Text.AlignHCenter
}