qml: nav

6 files changed, 182 insertions, 55 deletions

diff --git a/qml/PlaceThread.qml b/qml/PlaceThread.qml
index 2ec63fd..9e2df18 100644
--- a/qml/PlaceThread.qml
+++ b/qml/PlaceThread.qml
@@ -26,15 +26,14 @@ Rectangle {
         }
 
         Rectangle {
-            id: forumTitleRectangle
+            id: forumTitle
             color: "black"
             height: 50
             width: 500
             opacity: 0.9
             anchors.top: parent.top
-            anchors.topMargin: 20
+
             Text {
-                id: forumTitleText
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
                 anchors.leftMargin: 20
@@ -88,7 +87,7 @@ Rectangle {
 
         ListView {
             id: messageList
-            anchors.top: forumTitleRectangle.bottom
+            anchors.top: forumTitle.bottom
             anchors.topMargin: 30
             anchors.bottom: parent.bottom
             anchors.right: parent.right
diff --git a/qml/Prefs.qml b/qml/Prefs.qml
index f5f0e48..c7fa322 100644
--- a/qml/Prefs.qml
+++ b/qml/Prefs.qml
@@ -19,7 +19,7 @@ Rectangle {
 
         Image {
             id: imageBanner
-            source: "images/settings_dark.png"
+            source: "images/settings-black.png"
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.margins: 5
diff --git a/qml/SidePlaceList.qml b/qml/SidePlaceList.qml
index 358504a..2a24f2d 100644
--- a/qml/SidePlaceList.qml
+++ b/qml/SidePlaceList.qml
@@ -12,15 +12,17 @@ Rectangle {
     property int noTab: -1
     property int enterPlaceTab: 1
     property int createHomeTab: 2
+    property int threadTab: 4
     property int profileTab: 5
 
+    property int mainIndex: -1
     property int currentIndex: -1
 
     property var selectedPlace: null
 
-    onCurrentIndexChanged: {
-        console.log ("place list index changed:", currentIndex)
-        if (profileTab != currentIndex)
+    onMainIndexChanged: {
+        console.log ("place list: main index changed:", mainIndex)
+        if (profileTab != mainIndex && threadTab != mainIndex)
         {
             setPlaceIndex(-1)
         }
diff --git a/qml/SideThreadList.qml b/qml/SideThreadList.qml
index 9f4efbd..ba0fe5a 100644
--- a/qml/SideThreadList.qml
+++ b/qml/SideThreadList.qml
@@ -12,24 +12,50 @@ Rectangle {
     property int noTab: -1
     property int threadTab: 4
 
-    property int currentIndex: threadTab
+    property int mainIndex: -1
+    property int currentIndex: -1
 
     property var selectedThread: null
+    property var selectedPlace: null
 
-    onCurrentIndexChanged: {
-        console.log ("thread list index changed:", currentIndex)
-        if (threadTab != currentIndex)
+    onMainIndexChanged: {
+        console.log ("thread list: main index changed:", mainIndex)
+        if (threadTab != mainIndex)
         {
             threadList.currentIndex = -1
         }
     }
 
-    Rectangle { height: 10 }
 
     ColumnLayout {
         width: parent.width
         height: parent.height
 
+        Rectangle { height: 5 }
+
+        Rectangle {
+            id: newThreadButton
+            anchors.right: parent.right
+            width: parent.width - 8
+            height: 30
+            color: "black"
+
+            Image {
+                height: parent.height - 4
+                anchors.centerIn: parent
+                fillMode: Image.PreserveAspectFit
+                source: "images/add.png"
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    selectedThread = null
+                    currentIndex = threadTab
+                }
+            }
+        }
+
         ListModel {
             id: threadListModel
 
@@ -65,12 +91,12 @@ Rectangle {
             clip: true
 
             //model: threadListModel
-            model: App.models.places // FIXME
+            model: selectedPlace.threadListModel
             delegate: threadListDelegate
             focus: true
 
             onCurrentIndexChanged: {
-                selectedThread = model.get(currentIndex)
+                selectedThread = model.thread(currentIndex)
                 if (selectedThread)
                 {
                     root.currentIndex = threadTab
@@ -129,9 +155,9 @@ Rectangle {
                             onClicked: threadList.currentIndex = index
                         }
                     }
+
                     Rectangle {
                         id: indicator
-
                         radius: 35
                         color: "#EFC208"
                         anchors.left: threadItemInside.left
diff --git a/qml/ThreadList.qml b/qml/ThreadList.qml
index 83986d2..826e4a9 100644
--- a/qml/ThreadList.qml
+++ b/qml/ThreadList.qml
@@ -17,14 +17,6 @@ Rectangle {
 
     property var selectedThread: null
 
-    onCurrentIndexChanged: {
-        console.log ("thread list index changed:", currentIndex)
-        if (threadTab != currentIndex)
-        {
-            threadList.currentIndex = -1
-        }
-    }
-
     function setThreadIndex (idx) {
         threadList.currentIndex = idx
         selectedThread = threadList.model.get(idx)
@@ -43,12 +35,32 @@ Rectangle {
         source: "images/demo/ubuntu-wallpaper.jpg"
     }
 
-    Rectangle { height: 10 }
-
     ColumnLayout {
         width: parent.width
         height: parent.height
 
+        Rectangle {
+            id: title
+            color: "black"
+            height: 50
+            width: 500
+            opacity: 0.9
+
+            Text {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                anchors.leftMargin: 20
+
+                text: qsTr("Active topics")
+                wrapMode : Text.Wrap
+                elide : Text.ElideRight
+                color: "white"
+                //font.bold: true
+                font.pointSize: 22
+                font.family: bebasFont.name
+            }
+        }
+
         ListModel {
             id: threadListModel
 
diff --git a/qml/main.qml b/qml/main.qml
index 66a4da5..3d576ef 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -30,11 +30,11 @@ ApplicationWindow {
     property int profileTab: 5
     property int prefsTab: 6
 
-    property int placesTab: 0
+    property int leftPlacesTab: 0
 
-    property int rightTabIndex: noTab
-    property int nymsTab: 0
-    property int egosTab: 1
+    property int rightThreadsTab: 0
+    property int rightNymsTab: 1
+    property int rightEgosTab: 2
 
     property var selectedPlace: null
     property var selectedThread: null
@@ -68,6 +68,7 @@ ApplicationWindow {
                 spacing: 0
 
                 Rectangle {
+                    id: logoButton
                     width: parent.width
                     height: 60
                     color: threadListTab == main.currentIndex ? "white" : "transparent"
@@ -89,8 +90,6 @@ ApplicationWindow {
                         anchors.fill: parent
                         onClicked: {
                             main.currentIndex = threadListTab
-                            rightTabIndex = nymsTab
-                            nymsList.model = nymsModel
                         }
                     }
                 }
@@ -114,15 +113,6 @@ ApplicationWindow {
                             font.pointSize: 22
                             font.family: bebasFont.name
                         }
-
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                left.currentIndex = placesTab
-                                rightTabIndex = egosTab
-                                nymsList.model = App.models.egos
-                            }
-                        }
                     }
                 }
 
@@ -135,14 +125,14 @@ ApplicationWindow {
                     tabsVisible: false
                     frameVisible: false
 
-                    currentIndex: placesTab
+                    currentIndex: leftPlacesTab
 
                     onCurrentIndexChanged: {
                         console.log("left tabview index changed:", currentIndex)
 
                         switch (currentIndex)
                         {
-                            case placesTab:
+                            case leftPlacesTab:
                                 if (0 <= placeListTab.currentIndex)
                                 {
                                     main.currentIndex = placeListTab.currentIndex
@@ -160,6 +150,7 @@ ApplicationWindow {
                             id: placeList
                             anchors.fill: parent
                             width: 200 - 8
+                            mainIndex: main.currentIndex
 
                             onCurrentIndexChanged:
                             {
@@ -227,15 +218,7 @@ ApplicationWindow {
                 if (profileTab != currentIndex
                     && threadTab != currentIndex)
                 {
-                    placeListTab.currentIndex = noTab
-                }
-
-                if (profileTab != currentIndex
-                    && enterPlaceTab != currentIndex
-                    && createHomeTab != currentIndex
-                    && createEgoTab != currentIndex)
-                {
-                    rightTabIndex = noTab
+                        placeListTab.currentIndex = noTab
                 }
             }
 
@@ -255,7 +238,6 @@ ApplicationWindow {
                         if (selectedThread)
                         {
                             main.currentIndex = threadTab
-                            rightTabIndex = nymsTab
                         }
                     }
                 }
@@ -305,6 +287,7 @@ ApplicationWindow {
             width: 200
             Layout.fillHeight: true
             color: Settings.rightSideColor
+            visible: profileTab == main.currentIndex || threadTab == main.currentIndex
 
             ColumnLayout {
                 width: parent.width - 8
@@ -318,8 +301,113 @@ ApplicationWindow {
                 anchors.leftMargin: 0
                 anchors.rightMargin: 8
 
-                spacing: 10
+                spacing: 0
+
+                ColumnLayout {
+                    anchors.right: parent.right
+                    width: parent.width - 8
+                    spacing: 0
+
+                    Rectangle {
+                        height: 30
+                        width: parent.width
+                        color: right.currentIndex == rightThreadsTab ? "white" : "black"
+
+                        Text {
+                            text: qsTr("THREADS")
+                            color: right.currentIndex == rightThreadsTab ? "black" : "white"
+                            anchors.centerIn: parent
+                            font.pointSize: 22
+                            font.family: bebasFont.name
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: {
+                                right.currentIndex = rightThreadsTab
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        height: 30
+                        width: parent.width
+                        color: right.currentIndex == rightNymsTab ? "white" : "black"
+
+                        Text {
+                            text: qsTr("PARTICIPANTS")
+                            color: right.currentIndex == rightNymsTab ? "black" : "white"
+                            anchors.centerIn: parent
+                            font.pointSize: 22
+                            font.family: bebasFont.name
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: {
+                                right.currentIndex = rightNymsTab
+                            }
+                        }
+                    }
+                }
+
+                TabView {
+                    id: right
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+
+                    focus: true
+                    tabsVisible: false
+                    frameVisible: false
+
+                    currentIndex: rightThreadsTab
+
+                    onCurrentIndexChanged: {
+                        console.log("right tabview index changed:", currentIndex)
+
+                        switch (currentIndex)
+                        {
+                            case rightThreadsTab:
+                                if (0 <= sideThreadsTab.currentIndex)
+                                {
+                                    main.currentIndex = sideThreadsTab.currentIndex
+                                }
+                                break;
+                        }
+                    }
+
+                    Tab {
+                        id: sideThreadsTab
+                        active: true
+                        property int currentIndex: -1
+
+                        SideThreadList {
+                            id: sideThreads
+                            anchors.fill: parent
+                            width: 200 - 8
+
+                            mainIndex: main.currentIndex
+                            selectedPlace: selectedPlace
 
+                            onCurrentIndexChanged:
+                            {
+                                sideThreadsTab.currentIndex = currentIndex
+                                main.currentIndex = currentIndex
+                            }
+
+                            onSelectedThreadChanged:
+                            {
+                                console.log("selected thread changed:", selectedThread)
+                                root.selectedThread = selectedThread
+                                if (selectedThread)
+                                {
+                                    main.currentIndex = threadTab
+                                }
+                            }
+                        }
+                    }
+                }
+/* FIXME
                 ColumnLayout {
                     anchors.right: parent.right
                     width: parent.width - parent.anchors.rightMargin
@@ -525,7 +613,7 @@ ApplicationWindow {
                         }
                     }
                 }
-
+*/
             }
         }
     }