Merge linuxero

Gui/CompanyConf.qml

@@ -0,0 +1,17 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+
+Item
+{
+    property string name: "company"
+    anchors.fill: parent
+
+    Label
+    {
+        text: qsTr("Das Unternehmen")
+        anchors.centerIn: parent
+        font.pixelSize: 57
+        font.bold: true
+    }
+}

Gui/ObjectAddOnContactPerson.qml

@@ -231,6 +231,25 @@ GridLayout
         }
     }
 
+    Component
+    {
+        id: highlight
+        Rectangle
+        {
+            width: 230; height: 15
+            color: "lightsteelblue"; radius: 5
+            y: contactView.currentItem.y
+            Behavior on y
+            {
+                SpringAnimation
+                {
+                    spring: 3
+                    damping: 0.2
+                }
+            }
+        }
+    }
+
     Rectangle
     {
         id: mainRect
@@ -242,6 +261,7 @@ GridLayout
         ListView
         {
             id: contactView
+
             implicitHeight: parent.height
             implicitWidth: parent.width
             model: contactModel
@@ -249,10 +269,13 @@ GridLayout
             highlight: Rectangle { color: "grey"}
             highlightFollowsCurrentItem: false
 
+
             onActiveFocusChanged: if(!focus) currentIndex = -1
             delegate: Item
+
             {
                 width: contactView.width
+
                 height: 15
                 MouseArea
                 {
@@ -264,6 +287,7 @@ GridLayout
                     }
                 }
 
+
                 Row
                 {
                     //spacing: 9
@@ -297,6 +321,8 @@ GridLayout
                     }
                 }
             }
+
+
         }
     }
 }

Gui/PyqcrmConf.qml

@@ -0,0 +1,95 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item
+{
+    anchors.fill: parent
+    TabBar
+    {
+        id: bar
+        width: parent.width
+        TabButton
+        {
+            text: qsTr("Benutzer")
+        }
+        TabButton
+        {
+            text: qsTr("Datenbank")
+        }
+        TabButton
+        {
+            text: qsTr("Das Unternehmen")
+        }
+    }
+
+    StackLayout
+    {
+        id: confContainer
+        anchors.fill: parent
+        currentIndex: bar.currentIndex
+        Item
+        {
+            id: userTab
+            UsersPage
+            {
+                id: usersPage
+                anchors.fill: parent
+            }
+        }
+        Item
+        {
+            id: dbTab
+            DbConfiguration
+            {
+                id: dbConf
+                anchors.fill: parent
+            }
+        }
+        Item
+        {
+            id: companyTab
+            CompanyConf
+            {
+                id: companyConf
+                anchors.fill: parent
+            }
+        }
+    }
+
+    RowLayout
+    {
+        width: parent.width
+        anchors.bottom: parent.bottom
+        Item
+        {
+            Layout.fillWidth: true
+        }
+
+        Button
+        {
+            text: qsTr("Ablehnen")
+            onClicked: appLoader.source = "Dashboard.qml"
+        }
+
+        Button
+        {
+            text: qsTr("Speichern")
+            onClicked:
+            {
+                switch (confContainer.currentIndex)
+                {
+                    case 1:
+                        console.log("Need to update DB paramenters")
+                        break
+
+                    case 2:
+                        console.log("Need to update company's info.")
+                        break
+                    default:
+                        console.log("Need to handle users")
+                }
+            }
+        }
+    }
+}

Gui/TopBar.qml

@@ -178,8 +178,15 @@ RowLayout
                 id: mainMenu
                 MenuItem
                 {
-                    text: qsTr("Benutzer-Verwaltung")
-                    onTriggered: appLoader.source = "UsersPage.qml"
+                    //text: qsTr("Benutzer-Verwaltung")
+                    //onTriggered: appLoader.source = "UsersPage.qml"
+                    text: qsTr("Einstellungen")
+                    onTriggered:
+                    {
+                        // TODO: Check if logged-in user is admin first!!
+
+                        appLoader.source = "PyqcrmConf.qml"
+                    }
                 }
                 MenuSeparator {}
                 MenuItem { text: qsTr("Als PDF exportieren") }

Gui/UsersPage.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls
 
 Item
 {
+    property string name: "users"
     anchors.fill: parent
 
     Label

enc_key_backup.txt

@@ -0,0 +1 @@
+Lj30yFOP7hJmY5Cub1Go8fJz0UE+Zyo9cEqNxfY23Sc=

qml.qrc

@@ -42,5 +42,7 @@
         <file>Gui/CustomerDetailsView.qml</file>
         <file>Gui/ReadMe.qml</file>
         <file>Gui/UsersPage.qml</file>
+        <file>Gui/PyqcrmConf.qml</file>
+        <file>Gui/CompanyConf.qml</file>
     </qresource>
 </RCC>