From b5ad7eb585459b400f72ea4a647ada2e955a05ef Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Fri, 10 Feb 2017 17:28:01 +0100
Subject: [PATCH] feat(ui/views/App/Settings/SettingsWindow): fill tab bar

---
 .../ui/views/App/Settings/SettingsWindow.qml  | 74 +++++++++++--------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
index 270e132a3..3dda6e11d 100644
--- a/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
+++ b/linphone-desktop/ui/views/App/Settings/SettingsWindow.qml
@@ -3,12 +3,15 @@ import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 
 import Common 1.0
+import Common.Styles 1.0
 
 import App.Styles 1.0
 
 // =============================================================================
 
 ApplicationWindow {
+  id: window
+
   height: SettingsWindowStyle.height
   width: SettingsWindowStyle.width
 
@@ -29,39 +32,49 @@ ApplicationWindow {
     // Navigation bar.
     // -------------------------------------------------------------------------
 
-    TabBar {
-      id: navigationBar
-
+    RowLayout {
       Layout.fillWidth: true
+      spacing: 0
 
-      TabButton {
-        text: qsTr('sipAccountsTab')
-        width: implicitWidth
+      TabBar {
+        id: tabBar
+
+        TabButton {
+          text: qsTr('sipAccountsTab')
+          width: implicitWidth
+        }
+
+        TabButton {
+          text: qsTr('audioTab')
+          width: implicitWidth
+        }
+
+        TabButton {
+          text: qsTr('videoTab')
+          width: implicitWidth
+        }
+
+        TabButton {
+          text: qsTr('callsAndChatTab')
+          width: implicitWidth
+        }
+
+        TabButton {
+          text: qsTr('networkTab')
+          width: implicitWidth
+        }
+
+        TabButton {
+          text: qsTr('uiTab')
+          width: implicitWidth
+        }
       }
 
-      TabButton {
-        text: qsTr('audioTab')
-        width: implicitWidth
-      }
+      Rectangle {
+        Layout.fillWidth: true
+        Layout.preferredHeight: TabButtonStyle.text.height
 
-      TabButton {
-        text: qsTr('videoTab')
-        width: implicitWidth
-      }
-
-      TabButton {
-        text: qsTr('callsAndChatTab')
-        width: implicitWidth
-      }
-
-      TabButton {
-        text: qsTr('networkTab')
-        width: implicitWidth
-      }
-
-      TabButton {
-        text: qsTr('uiTab')
-        width: implicitWidth
+        color: TabButtonStyle.backgroundColor.normal
       }
     }
 
@@ -72,7 +85,8 @@ ApplicationWindow {
     StackLayout {
       Layout.fillHeight: true
       Layout.fillWidth: true
-      currentIndex: navigationBar.currentIndex
+
+      currentIndex: tabBar.currentIndex
 
       SettingsSipAccounts {}
       SettingsAudio {}
@@ -92,6 +106,8 @@ ApplicationWindow {
       Layout.rightMargin: SettingsWindowStyle.validButton.rightMargin
 
       text: qsTr('validButton')
+
+      onClicked: window.hide()
     }
   }
 }