List.qml -> ListBase.qml, changed RoutingView to use ListBase

diff --git a/src/qmlui/FriendsView.qml b/src/qmlui/FriendsView.qml
index dc8aae6..4b73e47 100644 (file)
--- a/src/qmlui/FriendsView.qml
+++ b/src/qmlui/FriendsView.qml
@@ -1,6 +1,6 @@
 import Qt 4.7
 
-List {
+ListBase {
     model: friendModel
     delegate: DelegateBase {
         id: delegate

diff --git a/src/qmlui/List.qml b/src/qmlui/List.qml
deleted file mode 100644 (file)
index bf1a59a..0000000
--- a/src/qmlui/List.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-import Qt 4.7
-
-ListView {
-    anchors.fill: parent
-    anchors.margins: 5
-    spacing: 5
-    focus: true
-}
-//    Component {
-//        id: friendListDelegate_
-
-//        Rectangle {
-//            id: listItem
-//            width: parent.width
-//            height: col.height + 8
-////            color: listItem.ListView.isCurrentItem ? "red" : "lightsteelblue"
-//            color: "lightsteelblue"
-//            radius: 10
-//            border { color: "black"; width: 2 }
-//            clip: true
-
-//            MouseArea {
-//                anchors.fill: parent
-//                onClicked: listItem.state == 'expanded' ? listItem.state = '' : listItem.state = 'expanded'
-//            }
-
-//            Image {
-//                id: image
-//                source: imageUrl
-//                anchors.top: parent.top
-//                anchors.topMargin: 5
-//                anchors.left: parent.left
-//                anchors.leftMargin: 7
-//            }
-
-//            Column {
-//                id: col
-//                x: image.x + image.width + 7
-//                width: parent.width - x - 7
-//                y: 3
-//                Text { text: '<b>' + name + '</b> ' }
-//                Text {
-//                    id: msg;
-//                    text: message;
-//                    font.pixelSize: 16;
-//                    clip: true;
-//                    elide: Text.ElideRight
-//                    anchors.left: parent.left;
-//                    anchors.right: parent.right}
-//                }
-
-//            states: [
-//                State {
-//                    name: "expanded"
-//                    PropertyChanges {
-//                        target: msg
-//                        wrapMode: Text.Wrap
-//                        elide: Text.ElideNone
-//                    }
-//                }
-//            ]
-
-//            transitions: [
-//                Transition {
-//                    from: ""
-//                    to: "expanded"
-//                    NumberAnimation { properties: "height"; duration: 100 }
-//                    reversible: true
-//                }
-//            ]
-//        }
-//    }
-

diff --git a/src/qmlui/ListBase.qml b/src/qmlui/ListBase.qml
new file mode 100644 (file)
index 0000000..10b8763
--- /dev/null
+++ b/src/qmlui/ListBase.qml
@@ -0,0 +1,9 @@
+import Qt 4.7
+
+ListView {
+    anchors.fill: parent
+    anchors.margins: 5
+    spacing: 5
+    focus: true
+    clip: true
+}

diff --git a/src/qmlui/RoutingView.qml b/src/qmlui/RoutingView.qml
index 66c5f70..ee3e953 100644 (file)
--- a/src/qmlui/RoutingView.qml
+++ b/src/qmlui/RoutingView.qml
@@ -35,19 +35,15 @@ import Qt 4.7
                 }
             }
         }
-
-        ListView {
+        Item {
             anchors { left: parent.left; right: parent.right; top: routeTo.bottom; bottom: parent.bottom }
-
-            anchors.margins: 5
-            spacing: 5
-
-            model: routingModel
-            delegate: RoutingDelegate {}
-            focus: true
-            clip: true
+            ListBase {
+                model: routingModel
+                delegate: RoutingDelegate {}
+            }
         }
 
+
 //        states: [
 //            State {
 //                name: "potrait"

diff --git a/src/qmlui/res.qrc b/src/qmlui/res.qrc
index 3d4fe00..d37f106 100644 (file)
--- a/src/qmlui/res.qrc
+++ b/src/qmlui/res.qrc
@@ -12,7 +12,6 @@
         <file>res/friends/jussi.jpg</file>
         <file>res/friends/katri.jpg</file>
         <file>res/friends/pekka.jpg</file>
-        <file>List.qml</file>
         <file>Map.qml</file>
         <file>res/gps_position.png</file>
         <file>res/gps_position_dir.png</file>
@@ -30,5 +29,6 @@
         <file>ProfileView.qml</file>
         <file>RoutingView.qml</file>
         <file>LocationsView.qml</file>
+        <file>ListBase.qml</file>
     </qresource>
 </RCC>

diff --git a/src/src.pro b/src/src.pro
index 1ba5631..f2eece5 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -192,7 +192,7 @@ OTHER_FILES += qmlui/Main.qml \
     qmlui/Button.qml \
     qmlui/Map.qml \
     qmlui/PanelContents.qml \
-    qmlui/List.qml \
+    qmlui/ListBase.qml \
     qmlui/RoutingView.qml \
     qmlui/RoutingDelegate.qml \
     qmlui/DelegateBase.qml \