History redesign

monero-project · Mar 19, 2019 · 836bf02 · 836bf02
1 parent 287e379
commit 836bf02
Show file tree

Hide file tree

Showing 11 changed files with 1,486 additions and 1,113 deletions.
diff --git a/LeftPanel.qml b/LeftPanel.qml
@@ -464,7 +464,7 @@ Rectangle {
                 id: historyButton
                 anchors.left: parent.left
                 anchors.right: parent.right
-                text: qsTr("History") + translationManager.emptyString
+                text: qsTr("Transactions") + translationManager.emptyString
                 symbol: qsTr("H") + translationManager.emptyString
                 dotColor: "#6B0072"
                 onClicked: {

diff --git a/MiddlePanel.qml b/MiddlePanel.qml
@@ -118,8 +118,7 @@ Rectangle {
             State {
                 name: "History"
                 PropertyChanges { target: root; currentView: historyView }
-                PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null }
-                PropertyChanges { target: mainFlickable; contentHeight: historyView.tableHeight + 220 * scaleRatio }
+                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100 * scaleRatio}
             }, State {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
@@ -186,7 +185,13 @@ Rectangle {
 
     ColumnLayout {
         anchors.fill: parent
-        anchors.margins: currentView !== merchantView ? 20 * scaleRatio : 0
+        anchors.margins: {
+            if(currentView === merchantView || currentView === historyView)
+                return 0;
+
+            return 20 * scaleRatio;
+        }
+
         anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 * scaleRatio : 0
         spacing: 0