summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/kube/contents/ui/MailView.qml16
-rw-r--r--framework/qml/StatusBar.qml8
2 files changed, 12 insertions, 12 deletions
diff --git a/components/kube/contents/ui/MailView.qml b/components/kube/contents/ui/MailView.qml
index da96bd28..23d09b1f 100644
--- a/components/kube/contents/ui/MailView.qml
+++ b/components/kube/contents/ui/MailView.qml
@@ -57,26 +57,25 @@ SplitView {
57 anchors { 57 anchors {
58 top: newMailButton.bottom 58 top: newMailButton.bottom
59 topMargin: Kube.Units.largeSpacing 59 topMargin: Kube.Units.largeSpacing
60 bottom: statusBar.top 60 bottom: statusBarContainer.top
61 left: newMailButton.left 61 left: newMailButton.left
62 right: parent.right 62 right: parent.right
63 } 63 }
64 } 64 }
65 65
66 Item { 66 Item {
67 id: statusBar 67 id: statusBarContainer
68 anchors { 68 anchors {
69 topMargin: Kube.Units.smallSpacing 69 topMargin: Kube.Units.smallSpacing
70 bottom: parent.bottom 70 bottom: parent.bottom
71 left: parent.left 71 left: parent.left
72 right: parent.right 72 right: parent.right
73 } 73 }
74 visible: false 74 height: childrenRect.height
75
76 height: Kube.Units.gridUnit * 2
77 75
78 Rectangle { 76 Rectangle {
79 id: border 77 id: border
78 visible: statusBar.visible
80 anchors { 79 anchors {
81 right: parent.right 80 right: parent.right
82 left: parent.left 81 left: parent.left
@@ -87,12 +86,13 @@ SplitView {
87 opacity: 0.3 86 opacity: 0.3
88 } 87 }
89 Kube.StatusBar { 88 Kube.StatusBar {
89 id: statusBar
90 accountId: accountFolderview.currentAccount 90 accountId: accountFolderview.currentAccount
91 height: Kube.Units.gridUnit * 2
91 anchors { 92 anchors {
92 top: border.bottom 93 top: border.bottom
93 left: statusBar.left 94 left: statusBarContainer.left
94 right: statusBar.right 95 right: statusBarContainer.right
95 bottom: statusBar.bottom
96 } 96 }
97 } 97 }
98 } 98 }
diff --git a/framework/qml/StatusBar.qml b/framework/qml/StatusBar.qml
index ea2b4db5..35ef46a8 100644
--- a/framework/qml/StatusBar.qml
+++ b/framework/qml/StatusBar.qml
@@ -25,6 +25,7 @@ Item {
25 property string currentFolderName: "" 25 property string currentFolderName: ""
26 property string currentFolderId: "" 26 property string currentFolderId: ""
27 property string errorText: "Error" 27 property string errorText: "Error"
28 visible: false
28 29
29 onCurrentFolderIdChanged: root.currentFolderName = "" 30 onCurrentFolderIdChanged: root.currentFolderName = ""
30 Kube.FolderListModel { 31 Kube.FolderListModel {
@@ -45,23 +46,22 @@ Item {
45 Kube.Label { 46 Kube.Label {
46 id: statusText 47 id: statusText
47 anchors.horizontalCenter: parent.horizontalCenter 48 anchors.horizontalCenter: parent.horizontalCenter
48 visible: false
49 color: Kube.Colors.highlightedTextColor 49 color: Kube.Colors.highlightedTextColor
50 states: [ 50 states: [
51 State { 51 State {
52 name: "disconnected"; when: model.status == Kube.AccountsModel.OfflineStatus 52 name: "disconnected"; when: model.status == Kube.AccountsModel.OfflineStatus
53 PropertyChanges { target: statusBar; visible: true } 53 PropertyChanges { target: root; visible: true }
54 PropertyChanges { target: statusText; text: "Disconnected"; visible: true } 54 PropertyChanges { target: statusText; text: "Disconnected"; visible: true }
55 }, 55 },
56 State { 56 State {
57 name: "busy"; when: model.status == Kube.AccountsModel.BusyStatus 57 name: "busy"; when: model.status == Kube.AccountsModel.BusyStatus
58 PropertyChanges { target: statusBar; visible: true } 58 PropertyChanges { target: root; visible: true }
59 PropertyChanges { target: statusText; text: root.currentFolderName.length > 0 ? "Synchronizing " + root.currentFolderName: "Synchronizing..."; visible: true } 59 PropertyChanges { target: statusText; text: root.currentFolderName.length > 0 ? "Synchronizing " + root.currentFolderName: "Synchronizing..."; visible: true }
60 PropertyChanges { target: progressBar; visible: true } 60 PropertyChanges { target: progressBar; visible: true }
61 }, 61 },
62 State { 62 State {
63 name: "error"; when: model.status == Kube.AccountsModel.ErrorStatus 63 name: "error"; when: model.status == Kube.AccountsModel.ErrorStatus
64 PropertyChanges { target: statusBar; visible: true } 64 PropertyChanges { target: root; visible: true }
65 PropertyChanges { target: statusText; text: root.errorText; visible: true } 65 PropertyChanges { target: statusText; text: root.errorText; visible: true }
66 } 66 }
67 ] 67 ]