mainview: account combo box visible from settings menu
Change-Id: I8eafea9d1cf07a11a8780f8d2f3495480b2360ed
diff --git a/src/settingsview/components/LeftPanelView.qml b/src/settingsview/components/LeftPanelView.qml
index f11fe23..e1e0a13 100644
--- a/src/settingsview/components/LeftPanelView.qml
+++ b/src/settingsview/components/LeftPanelView.qml
@@ -23,11 +23,13 @@
import QtQuick.Controls.Universal 2.12
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14
+import net.jami.Models 1.0
import "../../commoncomponents"
+import "../../mainview/components"
-ScrollView{
- id: leftPanelView
+Rectangle {
+ id: leftPanelRect
property int contentViewportWidth: 200
property int contentViewPortHeight: 768
@@ -45,6 +47,7 @@
anchors.fill: parent
clip: true
+ color: JamiTheme.backgroundColor
ColumnLayout {
spacing: 0
@@ -52,83 +55,6 @@
width: contentViewportWidth
height: contentViewPortHeight
- Item {
- Layout.fillWidth: true
- Layout.maximumHeight: 13
- Layout.preferredHeight: 13
- Layout.minimumHeight: 13
- }
-
- RowLayout {
- Layout.fillWidth: true
- Layout.maximumHeight: 20
- Layout.preferredHeight: 20
- Layout.minimumHeight: 20
-
- Layout.rightMargin: 14
-
- Item {
- Layout.fillHeight: true
-
- Layout.maximumWidth: 20
- Layout.preferredWidth: 20
- Layout.minimumWidth: 20
- }
-
- Label {
- Layout.maximumWidth: 57
- Layout.preferredWidth: 57
- Layout.minimumWidth: 57
-
- Layout.maximumHeight: 30
- Layout.preferredHeight: 30
- Layout.minimumHeight: 30
-
- text: qsTr("Settings")
- font.pointSize: 12
- font.kerning: true
-
- horizontalAlignment: Text.AlignLeft
- verticalAlignment: Text.AlignVCenter
- }
-
- Item {
- Layout.fillWidth: true
- Layout.fillHeight: true
- }
-
- HoverableRadiusButton {
- id: btnExitSettings
- Layout.maximumWidth: 30
- Layout.preferredWidth: 30
- Layout.minimumWidth: 30
-
- Layout.maximumHeight: 30
- Layout.preferredHeight: 30
- Layout.minimumHeight: 30
-
- buttonImageHeight: height
- buttonImageWidth: height
- backgroundColor: "transparent"
-
- radius: height / 2
-
- icon.source: "qrc:/images/icons/round-close-24px.svg"
- icon.height: 24
- icon.width: 24
-
- onClicked: {
- btnExitClicked()
- }
- }
- }
- Item {
- Layout.fillWidth: true
- Layout.maximumHeight: 13
- Layout.preferredHeight: 13
- Layout.minimumHeight: 13
- }
-
IconButton {
id: accountSettingsButton
@@ -186,6 +112,5 @@
Layout.fillHeight: true
}
}
-
}