removed wildcard qt import

comment menuitem
removed unused test.qml

diff --git a/gotovienna-qml b/gotovienna-qml
index 6a94bcf..e1779e6 100755 (executable)
--- a/gotovienna-qml
+++ b/gotovienna-qml
@@ -7,9 +7,9 @@ __version__ = '1.0'
 __website__ = 'https://github.com/kelvan/gotoVienna/'
 __license__ = 'GNU General Public License v3 or later'
 
-from PySide.QtCore import *
-from PySide.QtGui import *
-from PySide.QtDeclarative import *
+from PySide.QtCore import QAbstractListModel, QModelIndex, QObject, Slot, Signal
+from PySide.QtGui import QApplication
+from PySide.QtDeclarative import QDeclarativeView
 
 from gotovienna.utils import *
 from gotovienna.realtime import *

diff --git a/qml/main.qml b/qml/main.qml
index 40a2234..6ee49de 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -26,11 +26,11 @@ PageStackWindow {
         }
     }
 
-    Menu {
+    /*Menu {
         id: menu
         visualParent: pageStack
         MenuLayout {
             MenuItem { text: "Test"; onClicked: pageStack.push(Qt.resolvedUrl("test.qml")) }
         }
-    }
+    }*/
 }

diff --git a/qml/test.qml b/qml/test.qml
deleted file mode 100644 (file)
index f2fbe6e..0000000
--- a/qml/test.qml
+++ /dev/null
@@ -1,194 +0,0 @@
-import QtQuick 1.1
-import com.nokia.meego 1.0
-import com.nokia.extras 1.0
-import "UIConstants.js" as UIConstants
-import "ExtrasConstants.js" as ExtrasConstants
-
-Page {
-    tools: commonTools
-
-    Component {
-         id: departureDelegate
-
-         Item {
-             width: parent.width
-             height: 80
-
-             BorderImage {
-                 anchors.fill: parent
-                 visible: mouseArea.pressed
-                 source: theme.inverted ? 'image://theme/meegotouch-list-inverted-background-pressed-vertical-center': 'image://theme/meegotouch-list-background-pressed-vertical-center'
-             }
-
-             Item {
-                 anchors.fill: parent
-                 anchors.margins: UIConstants.DEFAULT_MARGIN
-
-                 Row {
-                     Text {
-                         id: l
-                         text: line // <----
-                         anchors.verticalCenter: parent.verticalCenter
-                         width: 70
-                         font.pixelSize: UIConstants.FONT_XLARGE
-                         font.bold: true
-                         font.family: ExtrasConstants.FONT_FAMILY_LIGHT
-                         color: !theme.inverted ? UIConstants.COLOR_FOREGROUND : UIConstants.COLOR_INVERTED_FOREGROUND
-                     }
-
-                     Column {
-                         anchors.verticalCenter: parent.verticalCenter
-
-                         Text {
-                             id: s
-                             text: station // <----
-                             width: 75
-                             font.pixelSize: UIConstants.FONT_LARGE
-                             font.family: ExtrasConstants.FONT_FAMILY_LIGHT
-                             color: !theme.inverted ? UIConstants.COLOR_FOREGROUND : UIConstants.COLOR_INVERTED_FOREGROUND
-                         }
-
-                         Text {
-                             id: d
-                             text: destination // <----
-                             color: !theme.inverted ? UIConstants.COLOR_SECONDARY_FOREGROUND : UIConstants.COLOR_INVERTED_SECONDARY_FOREGROUND
-                             font.family: ExtrasConstants.FONT_FAMILY_LIGHT
-                             font.pixelSize: UIConstants.FONT_LSMALL
-                         }
-                     }
-                 }
-             }
-
-             Column {
-                 anchors.right: parent.right
-                 anchors.verticalCenter: parent.verticalCenter
-                 Text {
-                     id: dep
-                     // FIXME strange int float transformation appears
-                     text: departure
-                     anchors.right: parent.right
-                     anchors.rightMargin: UIConstants.DEFAULT_MARGIN
-                     font.bold: true
-                     font.pixelSize: UIConstants.FONT_XLARGE
-                     font.family: ExtrasConstants.FONT_FAMILY_LIGHT
-                     color: !theme.inverted ? UIConstants.COLOR_FOREGROUND : UIConstants.COLOR_INVERTED_FOREGROUND
-                 }
-             }
-
-             MouseArea {
-                 id: mouseArea
-                 anchors.fill: parent
-                 onClicked: {
-                     console.debug("clicked: " + l.text)
-                 }
-             }
-         }
-     }
-
-     ListView {
-         id: list
-         width: parent.width; height: parent.height
-
-         model: ListModel {
-            ListElement {
-                line: "N60"
-                station: "Schottentor"
-                destination: "Maurer Hauptplatz"
-                departure: 5
-            }
-            ListElement {
-                line: "N38"
-                station: "Schottentor"
-                destination: "Grinzing"
-                departure: 7
-            }
-            ListElement {
-                line: "N25"
-                station: "Schottentor"
-                destination: "Großfeldsiedlung"
-                departure: 8
-            }
-            ListElement {
-                line: "N41"
-                station: "Schottentor"
-                destination: "Pötzleinsdorf"
-                departure: 12
-            }
-            ListElement {
-                line: "N43"
-                station: "Schottentor"
-                destination: "Neuwaldegg"
-                departure: 12
-            }
-            ListElement {
-                line: "N66"
-                station: "Schottentor"
-                destination: "Liesing S"
-                departure: 20
-            }
-            ListElement {
-                line: "N38"
-                station: "Schottentor"
-                destination: "Grinzing"
-                departure: 22
-            }
-            ListElement {
-                line: "N25"
-                station: "Schottentor"
-                destination: "Großfeldsiedlung"
-                departure: 35
-            }
-            ListElement {
-                line: "N60"
-                station: "Schottentor"
-                destination: "Maurer Hauptplatz"
-                departure: 35
-            }
-            ListElement {
-                line: "N38"
-                station: "Schottentor"
-                destination: "Grinzing"
-                departure: 37
-            }
-            ListElement {
-                line: "N41"
-                station: "Schottentor"
-                destination: "Pötzleinsdorf"
-                departure: "03:12"
-            }
-            ListElement {
-                line: "N43"
-                station: "Schottentor"
-                destination: "Neuwaldegg"
-                departure: 42
-            }
-            ListElement {
-                line: "N66"
-                station: "Schottentor"
-                destination: "Liesing S"
-                departure: 50
-            }
-            ListElement {
-                line: "N38"
-                station: "Schottentor"
-                destination: "Grinzing"
-                departure: 52
-            }
-         }
-         delegate: departureDelegate
-     }
-
-     ScrollDecorator {
-         id: scrolldecorator
-         flickableItem: list
-         platformStyle: ScrollDecoratorStyle {}
-     }
-
-     BusyIndicator {
-         id: busyIndicator
-         visible: true
-         running: true
-         platformStyle: BusyIndicatorStyle { size: 'large' }
-         anchors.centerIn: parent
-     }
-}