changed qt widget names

diff --git a/Ui_Qt.py b/Ui_Qt.py
index 5f7ccb0..96c3155 100644 (file)
--- a/Ui_Qt.py
+++ b/Ui_Qt.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'pyWienerLinien.ui'
 #
-# Created: Tue Feb 15 13:11:11 2011
+# Created: Fri Feb 18 20:11:09 2011
 #      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -30,12 +30,12 @@ class Ui_MainWindow(object):
         self.btnSearch.setSizePolicy(sizePolicy)
         self.btnSearch.setObjectName("btnSearch")
         self.gridLayout_3.addWidget(self.btnSearch, 5, 1, 1, 1)
-        self.comboTarget = QtGui.QComboBox(self.centralwidget)
-        self.comboTarget.setObjectName("comboTarget")
-        self.comboTarget.addItem("")
-        self.comboTarget.addItem("")
-        self.comboTarget.addItem("")
-        self.gridLayout_3.addWidget(self.comboTarget, 3, 1, 1, 1)
+        self.comboDestination = QtGui.QComboBox(self.centralwidget)
+        self.comboDestination.setObjectName("comboDestination")
+        self.comboDestination.addItem("")
+        self.comboDestination.addItem("")
+        self.comboDestination.addItem("")
+        self.gridLayout_3.addWidget(self.comboDestination, 3, 1, 1, 1)
         self.label = QtGui.QLabel(self.centralwidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
@@ -52,22 +52,22 @@ class Ui_MainWindow(object):
         self.label_2.setSizePolicy(sizePolicy)
         self.label_2.setObjectName("label_2")
         self.gridLayout_3.addWidget(self.label_2, 3, 0, 2, 1)
-        self.editStart = QtGui.QComboBox(self.centralwidget)
-        self.editStart.setEditable(True)
-        self.editStart.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.editStart.setObjectName("editStart")
-        self.gridLayout_3.addWidget(self.editStart, 2, 1, 1, 1)
-        self.editTarget = QtGui.QComboBox(self.centralwidget)
-        self.editTarget.setEditable(True)
-        self.editTarget.setInsertPolicy(QtGui.QComboBox.NoInsert)
-        self.editTarget.setObjectName("editTarget")
-        self.gridLayout_3.addWidget(self.editTarget, 4, 1, 1, 1)
-        self.comboStart = QtGui.QComboBox(self.centralwidget)
-        self.comboStart.setObjectName("comboStart")
-        self.comboStart.addItem("")
-        self.comboStart.addItem("")
-        self.comboStart.addItem("")
-        self.gridLayout_3.addWidget(self.comboStart, 1, 1, 1, 1)
+        self.editOrigin = QtGui.QComboBox(self.centralwidget)
+        self.editOrigin.setEditable(True)
+        self.editOrigin.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.editOrigin.setObjectName("editOrigin")
+        self.gridLayout_3.addWidget(self.editOrigin, 2, 1, 1, 1)
+        self.editDestination = QtGui.QComboBox(self.centralwidget)
+        self.editDestination.setEditable(True)
+        self.editDestination.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.editDestination.setObjectName("editDestination")
+        self.gridLayout_3.addWidget(self.editDestination, 4, 1, 1, 1)
+        self.comboOrigin = QtGui.QComboBox(self.centralwidget)
+        self.comboOrigin.setObjectName("comboOrigin")
+        self.comboOrigin.addItem("")
+        self.comboOrigin.addItem("")
+        self.comboOrigin.addItem("")
+        self.gridLayout_3.addWidget(self.comboOrigin, 1, 1, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 25))
@@ -84,16 +84,16 @@ class Ui_MainWindow(object):
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
-        MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
+        MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "pyWienerLinien", None, QtGui.QApplication.UnicodeUTF8))
         self.btnSearch.setText(QtGui.QApplication.translate("MainWindow", "Search", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboTarget.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboTarget.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboTarget.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboDestination.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboDestination.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboDestination.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
         self.label.setText(QtGui.QApplication.translate("MainWindow", "Start", None, QtGui.QApplication.UnicodeUTF8))
         self.label_2.setText(QtGui.QApplication.translate("MainWindow", "Ziel", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboStart.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboStart.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboStart.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboOrigin.setItemText(0, QtGui.QApplication.translate("MainWindow", "Haltestelle", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboOrigin.setItemText(1, QtGui.QApplication.translate("MainWindow", "Adresse", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboOrigin.setItemText(2, QtGui.QApplication.translate("MainWindow", "POI", None, QtGui.QApplication.UnicodeUTF8))
         self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
         self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
 

diff --git a/pyWienerLinien.py b/pyWienerLinien.py
index 36a59e6..0602427 100644 (file)
--- a/pyWienerLinien.py
+++ b/pyWienerLinien.py
@@ -20,14 +20,14 @@ class WienerLinienQt(QtGui.QMainWindow, Ui_MainWindow):
         self.connect(self.btnSearch, QtCore.SIGNAL("clicked()"), self.search)
 
     def search(self):
-        start = self.editStart.currentText()
-        target = self.editTarget.currentText()
-        if not start and target:
+        origin = self.editOrigin.currentText()
+        destination = self.editDestination.currentText()
+        if not origin and destination:
             self.btnSearch.setText("Search - Missing input")
         else:
-            s = Search(start, target, \
-                       origin_type=self.types[self.comboStart.currentIndex()], \
-                       destination_type=self.types[self.comboTarget.currentIndex()])
+            s = Search(origin, destination, \
+                       origin_type=self.types[self.comboOrigin.currentIndex()], \
+                       destination_type=self.types[self.comboDestination.currentIndex()])
             try:
                 s.open_browser()
             except webbrowser.Error:

diff --git a/pyWienerLinien.ui b/pyWienerLinien.ui
index c4914b4..703a3b4 100644 (file)
--- a/pyWienerLinien.ui
+++ b/pyWienerLinien.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>pyWienerLinien</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <property name="sizePolicy">
@@ -35,7 +35,7 @@
      </widget>
     </item>
     <item row="3" column="1">
-     <widget class="QComboBox" name="comboTarget">
+     <widget class="QComboBox" name="comboDestination">
       <item>
        <property name="text">
         <string>Haltestelle</string>
@@ -80,7 +80,7 @@
      </widget>
     </item>
     <item row="2" column="1">
-     <widget class="QComboBox" name="editStart">
+     <widget class="QComboBox" name="editOrigin">
       <property name="editable">
        <bool>true</bool>
       </property>
@@ -90,7 +90,7 @@
      </widget>
     </item>
     <item row="4" column="1">
-     <widget class="QComboBox" name="editTarget">
+     <widget class="QComboBox" name="editDestination">
       <property name="editable">
        <bool>true</bool>
       </property>
@@ -100,7 +100,7 @@
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QComboBox" name="comboStart">
+     <widget class="QComboBox" name="comboOrigin">
       <item>
        <property name="text">
         <string>Haltestelle</string>