qml: ego & place model

3 files changed, 14 insertions, 5 deletions

diff --git a/qml/SidePlaceList.qml b/qml/SidePlaceList.qml
index 0574231..a47ae38 100644
--- a/qml/SidePlaceList.qml
+++ b/qml/SidePlaceList.qml
@@ -187,7 +187,7 @@ Rectangle {
 
                         Image {
                             id: threadMiniImage
-                            source: image ? image : ""
+                            source: "images/demo/gnunet.png" // FIXME
                             fillMode: Image.PreserveAspectCrop
                             height: 60
                             width: 160
diff --git a/qml/main.qml b/qml/main.qml
index 79730ce..83cec0c 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -108,6 +108,7 @@ Window {
                             onClicked: {
                                 left.currentIndex = placesTab
                                 rightTabIndex = egosTab
+                                nymsList.model = App.models.egos
                             }
                         }
                     }
@@ -129,7 +130,8 @@ Window {
                             anchors.fill: parent
                             onClicked: {
                                 left.currentIndex = topicsTab
-                                rightTabIndex = noTab
+                                rightTabIndex = nymsTab
+                                nymsList.model = nymsModel
                             }
                         }
                     }
@@ -246,6 +248,8 @@ Window {
                 }
 
                 if (profileTab != currentIndex
+                    && enterPlaceTab != currentIndex
+                    && createHomeTab != currentIndex
                     && createEgoTab != currentIndex)
                 {
                     rightTabIndex = noTab
@@ -453,7 +457,7 @@ Window {
 
                                 Image {
                                     id: nymImage
-                                    source: image
+                                    source: image || "images/demo/doll.jpg"
                                     fillMode: Image.PreserveAspectCrop
                                     height: 110
                                     width: 160
diff --git a/src/model/models.h b/src/model/models.h
index 0f17073..8a54727 100644
--- a/src/model/models.h
+++ b/src/model/models.h
@@ -29,8 +29,13 @@
 class Models:public QObject
 {
   Q_OBJECT;
-  Q_PROPERTY (PlaceListModel * places READ places NOTIFY placesChanged);
-  Q_PROPERTY (EgoListModel * egos READ egos NOTIFY egosChanged);
+  Q_PROPERTY (PlaceListModel *places
+              READ places
+              NOTIFY placesChanged);
+
+  Q_PROPERTY (EgoListModel *egos
+              READ egos
+              NOTIFY egosChanged);
 
 
  public: