[QGIS Commit] r11384 - trunk/qgis/python/plugins/osm

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Aug 14 18:31:19 EDT 2009


Author: jef
Date: 2009-08-14 18:31:19 -0400 (Fri, 14 Aug 2009)
New Revision: 11384

Removed:
   trunk/qgis/python/plugins/osm/DlgAddRelation_ui.py
   trunk/qgis/python/plugins/osm/DlgDownloadOSM_ui.py
   trunk/qgis/python/plugins/osm/DlgImport_ui.py
   trunk/qgis/python/plugins/osm/DlgLoadOSM_ui.py
   trunk/qgis/python/plugins/osm/DlgSaveOSM_ui.py
   trunk/qgis/python/plugins/osm/DlgUploadOSM_ui.py
   trunk/qgis/python/plugins/osm/DockUndoRedo_ui.py
   trunk/qgis/python/plugins/osm/DockWidget_ui.py
   trunk/qgis/python/plugins/osm/Makefile
Modified:
   trunk/qgis/python/plugins/osm/CMakeLists.txt
Log:
fix missing python uis in osm plugin

Modified: trunk/qgis/python/plugins/osm/CMakeLists.txt
===================================================================
--- trunk/qgis/python/plugins/osm/CMakeLists.txt	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/CMakeLists.txt	2009-08-14 22:31:19 UTC (rev 11384)
@@ -3,11 +3,31 @@
 
 SET (OSM_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/osm)
 
+FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)
 
+MACRO(PYQT4_WRAP_UI outfiles)
+	FOREACH(it ${ARGN})
+		GET_FILENAME_COMPONENT(out ${it} NAME_WE)
+		SET(out ${CMAKE_CURRENT_BINARY_DIR}/${out}_ui.py)
+		ADD_CUSTOM_COMMAND(
+			COMMAND ${PYUIC4_PROGRAM} ${it} -o ${out}
+			DEPENDS ${it}
+			OUTPUT ${out}
+			)
+		SET(${outfiles} ${${outfiles}} ${out})
+	ENDFOREACH(it)
+ENDMACRO(PYQT_WRAP_UI)
+
+FILE (GLOB UI_FILES ui_files/*.ui)
+PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
+
+ADD_CUSTOM_TARGET(pyuis ALL DEPENDS ${PYUI_FILES})
+
 FILE (GLOB PYTHON_FILES *.py)
 FILE (GLOB MAPTOOLS_PYTHON_FILES map_tools/*.py)
 FILE (GLOB STYLE_FILES styles/*.style)
 
 INSTALL (FILES ${PYTHON_FILES} DESTINATION ${OSM_PLUGIN_DIR})
+INSTALL (FILES ${PYUI_FILES} DESTINATION ${OSM_PLUGIN_DIR})
 INSTALL (FILES ${MAPTOOLS_PYTHON_FILES} DESTINATION ${OSM_PLUGIN_DIR}/map_tools)
 INSTALL (FILES ${STYLE_FILES} DESTINATION ${OSM_PLUGIN_DIR}/styles)

Deleted: trunk/qgis/python/plugins/osm/DlgAddRelation_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgAddRelation_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgAddRelation_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,140 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgAddRelation.ui'
-#
-# Created: Tue Jul 14 14:44:27 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgAddRelation(object):
-    def setupUi(self, DlgAddRelation):
-        DlgAddRelation.setObjectName("DlgAddRelation")
-        DlgAddRelation.resize(620, 461)
-        DlgAddRelation.setModal(False)
-        self.vboxlayout = QtGui.QVBoxLayout(DlgAddRelation)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.label = QtGui.QLabel(DlgAddRelation)
-        self.label.setObjectName("label")
-        self.hboxlayout.addWidget(self.label)
-        spacerItem = QtGui.QSpacerItem(24, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem)
-        self.typeCombo = QtGui.QComboBox(DlgAddRelation)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.typeCombo.sizePolicy().hasHeightForWidth())
-        self.typeCombo.setSizePolicy(sizePolicy)
-        self.typeCombo.setMinimumSize(QtCore.QSize(164, 24))
-        self.typeCombo.setMaximumSize(QtCore.QSize(164, 16777215))
-        self.typeCombo.setEditable(True)
-        self.typeCombo.setObjectName("typeCombo")
-        self.hboxlayout.addWidget(self.typeCombo)
-        self.typeInfoButton = QtGui.QToolButton(DlgAddRelation)
-        self.typeInfoButton.setObjectName("typeInfoButton")
-        self.hboxlayout.addWidget(self.typeInfoButton)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem1)
-        self.vboxlayout.addLayout(self.hboxlayout)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
-        self.vboxlayout1 = QtGui.QVBoxLayout()
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.hboxlayout2 = QtGui.QHBoxLayout()
-        self.hboxlayout2.setObjectName("hboxlayout2")
-        self.label_2 = QtGui.QLabel(DlgAddRelation)
-        self.label_2.setObjectName("label_2")
-        self.hboxlayout2.addWidget(self.label_2)
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout2.addItem(spacerItem2)
-        self.loadStandardTagsButton = QtGui.QToolButton(DlgAddRelation)
-        self.loadStandardTagsButton.setObjectName("loadStandardTagsButton")
-        self.hboxlayout2.addWidget(self.loadStandardTagsButton)
-        self.removeTagButton = QtGui.QToolButton(DlgAddRelation)
-        self.removeTagButton.setObjectName("removeTagButton")
-        self.hboxlayout2.addWidget(self.removeTagButton)
-        self.vboxlayout1.addLayout(self.hboxlayout2)
-        self.relTagsTable = QtGui.QTableWidget(DlgAddRelation)
-        self.relTagsTable.setMinimumSize(QtCore.QSize(240, 0))
-        self.relTagsTable.setObjectName("relTagsTable")
-        self.relTagsTable.setColumnCount(0)
-        self.relTagsTable.setRowCount(0)
-        self.vboxlayout1.addWidget(self.relTagsTable)
-        self.hboxlayout1.addLayout(self.vboxlayout1)
-        self.vboxlayout2 = QtGui.QVBoxLayout()
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.hboxlayout3 = QtGui.QHBoxLayout()
-        self.hboxlayout3.setObjectName("hboxlayout3")
-        self.label_5 = QtGui.QLabel(DlgAddRelation)
-        self.label_5.setObjectName("label_5")
-        self.hboxlayout3.addWidget(self.label_5)
-        spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout3.addItem(spacerItem3)
-        self.chooseMemberButton = QtGui.QToolButton(DlgAddRelation)
-        self.chooseMemberButton.setCheckable(True)
-        self.chooseMemberButton.setObjectName("chooseMemberButton")
-        self.hboxlayout3.addWidget(self.chooseMemberButton)
-        self.removeMemberButton = QtGui.QToolButton(DlgAddRelation)
-        self.removeMemberButton.setObjectName("removeMemberButton")
-        self.hboxlayout3.addWidget(self.removeMemberButton)
-        self.vboxlayout2.addLayout(self.hboxlayout3)
-        self.relMembersTable = QtGui.QTableWidget(DlgAddRelation)
-        self.relMembersTable.setMinimumSize(QtCore.QSize(346, 0))
-        self.relMembersTable.setObjectName("relMembersTable")
-        self.relMembersTable.setColumnCount(0)
-        self.relMembersTable.setRowCount(0)
-        self.vboxlayout2.addWidget(self.relMembersTable)
-        self.tagInfoTextEdit = QtGui.QTextEdit(DlgAddRelation)
-        self.tagInfoTextEdit.setEnabled(False)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tagInfoTextEdit.sizePolicy().hasHeightForWidth())
-        self.tagInfoTextEdit.setSizePolicy(sizePolicy)
-        self.tagInfoTextEdit.setMaximumSize(QtCore.QSize(16777215, 140))
-        self.tagInfoTextEdit.setReadOnly(True)
-        self.tagInfoTextEdit.setObjectName("tagInfoTextEdit")
-        self.vboxlayout2.addWidget(self.tagInfoTextEdit)
-        self.hboxlayout1.addLayout(self.vboxlayout2)
-        self.vboxlayout.addLayout(self.hboxlayout1)
-        self.hboxlayout4 = QtGui.QHBoxLayout()
-        self.hboxlayout4.setObjectName("hboxlayout4")
-        spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout4.addItem(spacerItem4)
-        self.createRelButton = QtGui.QPushButton(DlgAddRelation)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.createRelButton.sizePolicy().hasHeightForWidth())
-        self.createRelButton.setSizePolicy(sizePolicy)
-        self.createRelButton.setMinimumSize(QtCore.QSize(0, 30))
-        self.createRelButton.setAutoDefault(False)
-        self.createRelButton.setObjectName("createRelButton")
-        self.hboxlayout4.addWidget(self.createRelButton)
-        self.stornoButton = QtGui.QPushButton(DlgAddRelation)
-        self.stornoButton.setMinimumSize(QtCore.QSize(0, 30))
-        self.stornoButton.setAutoDefault(False)
-        self.stornoButton.setObjectName("stornoButton")
-        self.hboxlayout4.addWidget(self.stornoButton)
-        self.vboxlayout.addLayout(self.hboxlayout4)
-
-        self.retranslateUi(DlgAddRelation)
-        QtCore.QMetaObject.connectSlotsByName(DlgAddRelation)
-
-    def retranslateUi(self, DlgAddRelation):
-        DlgAddRelation.setWindowTitle(QtGui.QApplication.translate("DlgAddRelation", "Create OSM relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgAddRelation", "Relation type:", None, QtGui.QApplication.UnicodeUTF8))
-        self.typeInfoButton.setText(QtGui.QApplication.translate("DlgAddRelation", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgAddRelation", "Properties", None, QtGui.QApplication.UnicodeUTF8))
-        self.loadStandardTagsButton.setText(QtGui.QApplication.translate("DlgAddRelation", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeTagButton.setText(QtGui.QApplication.translate("DlgAddRelation", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_5.setText(QtGui.QApplication.translate("DlgAddRelation", "Members", None, QtGui.QApplication.UnicodeUTF8))
-        self.chooseMemberButton.setText(QtGui.QApplication.translate("DlgAddRelation", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeMemberButton.setText(QtGui.QApplication.translate("DlgAddRelation", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.createRelButton.setText(QtGui.QApplication.translate("DlgAddRelation", "Create", None, QtGui.QApplication.UnicodeUTF8))
-        self.stornoButton.setText(QtGui.QApplication.translate("DlgAddRelation", "Storno", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DlgDownloadOSM_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgDownloadOSM_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgDownloadOSM_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,162 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgDownloadOSM.ui'
-#
-# Created: Fri Jul 10 15:27:30 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgDownloadOSM(object):
-    def setupUi(self, DlgDownloadOSM):
-        DlgDownloadOSM.setObjectName("DlgDownloadOSM")
-        DlgDownloadOSM.setWindowModality(QtCore.Qt.ApplicationModal)
-        DlgDownloadOSM.resize(595, 357)
-        DlgDownloadOSM.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
-        DlgDownloadOSM.setModal(True)
-        self.vboxlayout = QtGui.QVBoxLayout(DlgDownloadOSM)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.groupBox = QtGui.QGroupBox(DlgDownloadOSM)
-        self.groupBox.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.groupBox.setObjectName("groupBox")
-        self.vboxlayout1 = QtGui.QVBoxLayout(self.groupBox)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.gridlayout = QtGui.QGridLayout()
-        self.gridlayout.setObjectName("gridlayout")
-        self.label = QtGui.QLabel(self.groupBox)
-        self.label.setObjectName("label")
-        self.gridlayout.addWidget(self.label, 0, 1, 1, 1)
-        self.label_4 = QtGui.QLabel(self.groupBox)
-        self.label_4.setObjectName("label_4")
-        self.gridlayout.addWidget(self.label_4, 0, 2, 1, 1)
-        self.latFromLineEdit = QtGui.QLineEdit(self.groupBox)
-        self.latFromLineEdit.setEnabled(True)
-        self.latFromLineEdit.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.latFromLineEdit.setObjectName("latFromLineEdit")
-        self.gridlayout.addWidget(self.latFromLineEdit, 0, 3, 1, 1)
-        self.label_6 = QtGui.QLabel(self.groupBox)
-        self.label_6.setObjectName("label_6")
-        self.gridlayout.addWidget(self.label_6, 0, 4, 1, 1)
-        self.latToLineEdit = QtGui.QLineEdit(self.groupBox)
-        self.latToLineEdit.setEnabled(True)
-        self.latToLineEdit.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.latToLineEdit.setObjectName("latToLineEdit")
-        self.gridlayout.addWidget(self.latToLineEdit, 0, 5, 1, 1)
-        self.label_2 = QtGui.QLabel(self.groupBox)
-        self.label_2.setObjectName("label_2")
-        self.gridlayout.addWidget(self.label_2, 1, 1, 1, 1)
-        self.label_5 = QtGui.QLabel(self.groupBox)
-        self.label_5.setObjectName("label_5")
-        self.gridlayout.addWidget(self.label_5, 1, 2, 1, 1)
-        self.lonFromLineEdit = QtGui.QLineEdit(self.groupBox)
-        self.lonFromLineEdit.setEnabled(True)
-        self.lonFromLineEdit.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.lonFromLineEdit.setObjectName("lonFromLineEdit")
-        self.gridlayout.addWidget(self.lonFromLineEdit, 1, 3, 1, 1)
-        self.label_7 = QtGui.QLabel(self.groupBox)
-        self.label_7.setObjectName("label_7")
-        self.gridlayout.addWidget(self.label_7, 1, 4, 1, 1)
-        self.lonToLineEdit = QtGui.QLineEdit(self.groupBox)
-        self.lonToLineEdit.setEnabled(True)
-        self.lonToLineEdit.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.lonToLineEdit.setObjectName("lonToLineEdit")
-        self.gridlayout.addWidget(self.lonToLineEdit, 1, 5, 1, 1)
-        self.vboxlayout1.addLayout(self.gridlayout)
-        spacerItem = QtGui.QSpacerItem(20, 8, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.vboxlayout1.addItem(spacerItem)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem1)
-        self.extentInfoLabel = QtGui.QLabel(self.groupBox)
-        self.extentInfoLabel.setMargin(0)
-        self.extentInfoLabel.setObjectName("extentInfoLabel")
-        self.hboxlayout.addWidget(self.extentInfoLabel)
-        self.helpButton = QtGui.QToolButton(self.groupBox)
-        self.helpButton.setMaximumSize(QtCore.QSize(23, 23))
-        self.helpButton.setObjectName("helpButton")
-        self.hboxlayout.addWidget(self.helpButton)
-        self.vboxlayout1.addLayout(self.hboxlayout)
-        self.vboxlayout.addWidget(self.groupBox)
-        self.gridlayout1 = QtGui.QGridLayout()
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.label_9 = QtGui.QLabel(DlgDownloadOSM)
-        self.label_9.setObjectName("label_9")
-        self.gridlayout1.addWidget(self.label_9, 0, 0, 1, 2)
-        self.destdirLineEdit = QtGui.QLineEdit(DlgDownloadOSM)
-        self.destdirLineEdit.setEnabled(False)
-        self.destdirLineEdit.setObjectName("destdirLineEdit")
-        self.gridlayout1.addWidget(self.destdirLineEdit, 1, 0, 1, 1)
-        self.choosedirButton = QtGui.QPushButton(DlgDownloadOSM)
-        self.choosedirButton.setObjectName("choosedirButton")
-        self.gridlayout1.addWidget(self.choosedirButton, 1, 1, 1, 1)
-        self.vboxlayout.addLayout(self.gridlayout1)
-        self.autoLoadCheckBox = QtGui.QCheckBox(DlgDownloadOSM)
-        self.autoLoadCheckBox.setChecked(True)
-        self.autoLoadCheckBox.setObjectName("autoLoadCheckBox")
-        self.vboxlayout.addWidget(self.autoLoadCheckBox)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
-        spacerItem2 = QtGui.QSpacerItem(15, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout1.addItem(spacerItem2)
-        self.chkReplaceData = QtGui.QCheckBox(DlgDownloadOSM)
-        self.chkReplaceData.setChecked(False)
-        self.chkReplaceData.setObjectName("chkReplaceData")
-        self.hboxlayout1.addWidget(self.chkReplaceData)
-        self.vboxlayout.addLayout(self.hboxlayout1)
-        self.hboxlayout2 = QtGui.QHBoxLayout()
-        self.hboxlayout2.setSpacing(0)
-        self.hboxlayout2.setContentsMargins(-1, 0, -1, -1)
-        self.hboxlayout2.setObjectName("hboxlayout2")
-        spacerItem3 = QtGui.QSpacerItem(15, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout2.addItem(spacerItem3)
-        self.chkCustomRenderer = QtGui.QCheckBox(DlgDownloadOSM)
-        self.chkCustomRenderer.setChecked(True)
-        self.chkCustomRenderer.setObjectName("chkCustomRenderer")
-        self.hboxlayout2.addWidget(self.chkCustomRenderer)
-        spacerItem4 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout2.addItem(spacerItem4)
-        self.styleCombo = QtGui.QComboBox(DlgDownloadOSM)
-        self.styleCombo.setMinimumSize(QtCore.QSize(182, 0))
-        self.styleCombo.setMaximumSize(QtCore.QSize(182, 16777215))
-        self.styleCombo.setObjectName("styleCombo")
-        self.hboxlayout2.addWidget(self.styleCombo)
-        spacerItem5 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout2.addItem(spacerItem5)
-        self.vboxlayout.addLayout(self.hboxlayout2)
-        self.hboxlayout3 = QtGui.QHBoxLayout()
-        self.hboxlayout3.setObjectName("hboxlayout3")
-        spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout3.addItem(spacerItem6)
-        self.downloadButton = QtGui.QPushButton(DlgDownloadOSM)
-        self.downloadButton.setObjectName("downloadButton")
-        self.hboxlayout3.addWidget(self.downloadButton)
-        self.cancelButton = QtGui.QPushButton(DlgDownloadOSM)
-        self.cancelButton.setObjectName("cancelButton")
-        self.hboxlayout3.addWidget(self.cancelButton)
-        self.vboxlayout.addLayout(self.hboxlayout3)
-
-        self.retranslateUi(DlgDownloadOSM)
-        QtCore.QMetaObject.connectSlotsByName(DlgDownloadOSM)
-
-    def retranslateUi(self, DlgDownloadOSM):
-        DlgDownloadOSM.setWindowTitle(QtGui.QApplication.translate("DlgDownloadOSM", "Download OSM data", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtGui.QApplication.translate("DlgDownloadOSM", "Extent", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Latitude:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_4.setText(QtGui.QApplication.translate("DlgDownloadOSM", "   From", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_6.setText(QtGui.QApplication.translate("DlgDownloadOSM", "To", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Longitude:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_5.setText(QtGui.QApplication.translate("DlgDownloadOSM", "   From", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_7.setText(QtGui.QApplication.translate("DlgDownloadOSM", "To", None, QtGui.QApplication.UnicodeUTF8))
-        self.extentInfoLabel.setText(QtGui.QApplication.translate("DlgDownloadOSM", "<nothing>", None, QtGui.QApplication.UnicodeUTF8))
-        self.helpButton.setText(QtGui.QApplication.translate("DlgDownloadOSM", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_9.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Download to:", None, QtGui.QApplication.UnicodeUTF8))
-        self.choosedirButton.setText(QtGui.QApplication.translate("DlgDownloadOSM", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.autoLoadCheckBox.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Open data automatically after download", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkReplaceData.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Replace current data (current layer will be removed)", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkCustomRenderer.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Use custom renderer", None, QtGui.QApplication.UnicodeUTF8))
-        self.downloadButton.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Download", None, QtGui.QApplication.UnicodeUTF8))
-        self.cancelButton.setText(QtGui.QApplication.translate("DlgDownloadOSM", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DlgImport_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgImport_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgImport_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgImport.ui'
-#
-# Created: Tue Jul 14 14:44:27 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgImport(object):
-    def setupUi(self, DlgImport):
-        DlgImport.setObjectName("DlgImport")
-        DlgImport.setWindowModality(QtCore.Qt.ApplicationModal)
-        DlgImport.resize(248, 228)
-        DlgImport.setModal(True)
-        self.vboxlayout = QtGui.QVBoxLayout(DlgImport)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.label = QtGui.QLabel(DlgImport)
-        self.label.setWordWrap(True)
-        self.label.setObjectName("label")
-        self.vboxlayout.addWidget(self.label)
-        spacerItem = QtGui.QSpacerItem(20, 29, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.vboxlayout.addItem(spacerItem)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.label_2 = QtGui.QLabel(DlgImport)
-        self.label_2.setObjectName("label_2")
-        self.hboxlayout.addWidget(self.label_2)
-        self.cboLayer = QtGui.QComboBox(DlgImport)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.cboLayer.sizePolicy().hasHeightForWidth())
-        self.cboLayer.setSizePolicy(sizePolicy)
-        self.cboLayer.setObjectName("cboLayer")
-        self.hboxlayout.addWidget(self.cboLayer)
-        self.vboxlayout.addLayout(self.hboxlayout)
-        self.chkOnlySelection = QtGui.QCheckBox(DlgImport)
-        self.chkOnlySelection.setObjectName("chkOnlySelection")
-        self.vboxlayout.addWidget(self.chkOnlySelection)
-        spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.vboxlayout.addItem(spacerItem1)
-        self.buttonBox = QtGui.QDialogButtonBox(DlgImport)
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.NoButton|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.vboxlayout.addWidget(self.buttonBox)
-
-        self.retranslateUi(DlgImport)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), DlgImport.reject)
-        QtCore.QMetaObject.connectSlotsByName(DlgImport)
-        DlgImport.setTabOrder(self.cboLayer, self.chkOnlySelection)
-        DlgImport.setTabOrder(self.chkOnlySelection, self.buttonBox)
-
-    def retranslateUi(self, DlgImport):
-        DlgImport.setWindowTitle(QtGui.QApplication.translate("DlgImport", "Import data to OSM", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgImport", "In this dialog you can import a layer loaded in QGIS into active OSM data.", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgImport", "Layer", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkOnlySelection.setText(QtGui.QApplication.translate("DlgImport", "Import only current selection", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DlgLoadOSM_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgLoadOSM_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgLoadOSM_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgLoadOSM.ui'
-#
-# Created: Wed Jul 22 12:16:56 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgLoadOSM(object):
-    def setupUi(self, DlgLoadOSM):
-        DlgLoadOSM.setObjectName("DlgLoadOSM")
-        DlgLoadOSM.setWindowModality(QtCore.Qt.ApplicationModal)
-        DlgLoadOSM.resize(508, 309)
-        DlgLoadOSM.setModal(True)
-        self.gridlayout = QtGui.QGridLayout(DlgLoadOSM)
-        self.gridlayout.setObjectName("gridlayout")
-        self.gridlayout1 = QtGui.QGridLayout()
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.label = QtGui.QLabel(DlgLoadOSM)
-        self.label.setIndent(-1)
-        self.label.setObjectName("label")
-        self.gridlayout1.addWidget(self.label, 0, 0, 1, 2)
-        self.OSMFileEdit = QtGui.QLineEdit(DlgLoadOSM)
-        self.OSMFileEdit.setObjectName("OSMFileEdit")
-        self.gridlayout1.addWidget(self.OSMFileEdit, 1, 0, 1, 1)
-        self.browseOSMButton = QtGui.QPushButton(DlgLoadOSM)
-        self.browseOSMButton.setObjectName("browseOSMButton")
-        self.gridlayout1.addWidget(self.browseOSMButton, 1, 1, 1, 1)
-        self.gridlayout.addLayout(self.gridlayout1, 0, 0, 1, 2)
-        self.label_2 = QtGui.QLabel(DlgLoadOSM)
-        self.label_2.setObjectName("label_2")
-        self.gridlayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.lstTags = QtGui.QListWidget(DlgLoadOSM)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.lstTags.sizePolicy().hasHeightForWidth())
-        self.lstTags.setSizePolicy(sizePolicy)
-        self.lstTags.setObjectName("lstTags")
-        self.hboxlayout.addWidget(self.lstTags)
-        self.gridlayout.addLayout(self.hboxlayout, 2, 0, 1, 2)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
-        self.chkCustomRenderer = QtGui.QCheckBox(DlgLoadOSM)
-        self.chkCustomRenderer.setChecked(True)
-        self.chkCustomRenderer.setObjectName("chkCustomRenderer")
-        self.hboxlayout1.addWidget(self.chkCustomRenderer)
-        self.styleCombo = QtGui.QComboBox(DlgLoadOSM)
-        self.styleCombo.setMinimumSize(QtCore.QSize(182, 0))
-        self.styleCombo.setMaximumSize(QtCore.QSize(182, 16777215))
-        self.styleCombo.setObjectName("styleCombo")
-        self.hboxlayout1.addWidget(self.styleCombo)
-        self.gridlayout.addLayout(self.hboxlayout1, 4, 0, 1, 1)
-        self.buttonBox = QtGui.QDialogButtonBox(DlgLoadOSM)
-        self.buttonBox.setMaximumSize(QtCore.QSize(110, 16777215))
-        self.buttonBox.setBaseSize(QtCore.QSize(110, 0))
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridlayout.addWidget(self.buttonBox, 4, 1, 1, 1)
-        self.chkReplaceData = QtGui.QCheckBox(DlgLoadOSM)
-        self.chkReplaceData.setChecked(False)
-        self.chkReplaceData.setObjectName("chkReplaceData")
-        self.gridlayout.addWidget(self.chkReplaceData, 3, 0, 1, 1)
-
-        self.retranslateUi(DlgLoadOSM)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), DlgLoadOSM.reject)
-        QtCore.QMetaObject.connectSlotsByName(DlgLoadOSM)
-        DlgLoadOSM.setTabOrder(self.OSMFileEdit, self.browseOSMButton)
-        DlgLoadOSM.setTabOrder(self.browseOSMButton, self.lstTags)
-        DlgLoadOSM.setTabOrder(self.lstTags, self.chkCustomRenderer)
-        DlgLoadOSM.setTabOrder(self.chkCustomRenderer, self.buttonBox)
-
-    def retranslateUi(self, DlgLoadOSM):
-        DlgLoadOSM.setWindowTitle(QtGui.QApplication.translate("DlgLoadOSM", "Load OSM", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgLoadOSM", "OpenStreetMap file to load:", None, QtGui.QApplication.UnicodeUTF8))
-        self.browseOSMButton.setText(QtGui.QApplication.translate("DlgLoadOSM", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgLoadOSM", "Add columns for tags:", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkCustomRenderer.setText(QtGui.QApplication.translate("DlgLoadOSM", "Use custom renderer", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkReplaceData.setText(QtGui.QApplication.translate("DlgLoadOSM", "Replace current data (current layers will be removed)", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DlgSaveOSM_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgSaveOSM_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgSaveOSM_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgSaveOSM.ui'
-#
-# Created: Tue Jul 14 14:44:25 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgSaveOSM(object):
-    def setupUi(self, DlgSaveOSM):
-        DlgSaveOSM.setObjectName("DlgSaveOSM")
-        DlgSaveOSM.setWindowModality(QtCore.Qt.ApplicationModal)
-        DlgSaveOSM.resize(370, 206)
-        DlgSaveOSM.setModal(True)
-        self.vboxlayout = QtGui.QVBoxLayout(DlgSaveOSM)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.gridlayout = QtGui.QGridLayout()
-        self.gridlayout.setObjectName("gridlayout")
-        self.label = QtGui.QLabel(DlgSaveOSM)
-        self.label.setIndent(-1)
-        self.label.setObjectName("label")
-        self.gridlayout.addWidget(self.label, 0, 0, 1, 2)
-        self.OSMFileEdit = QtGui.QLineEdit(DlgSaveOSM)
-        self.OSMFileEdit.setObjectName("OSMFileEdit")
-        self.gridlayout.addWidget(self.OSMFileEdit, 1, 0, 1, 1)
-        self.browseOSMButton = QtGui.QPushButton(DlgSaveOSM)
-        self.browseOSMButton.setMaximumSize(QtCore.QSize(50, 16777215))
-        self.browseOSMButton.setObjectName("browseOSMButton")
-        self.gridlayout.addWidget(self.browseOSMButton, 1, 1, 1, 1)
-        self.vboxlayout.addLayout(self.gridlayout)
-        self.label_2 = QtGui.QLabel(DlgSaveOSM)
-        self.label_2.setObjectName("label_2")
-        self.vboxlayout.addWidget(self.label_2)
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setContentsMargins(15, -1, 0, 10)
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.vboxlayout1 = QtGui.QVBoxLayout()
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.chkPoints = QtGui.QCheckBox(DlgSaveOSM)
-        self.chkPoints.setChecked(True)
-        self.chkPoints.setObjectName("chkPoints")
-        self.vboxlayout1.addWidget(self.chkPoints)
-        self.chkLines = QtGui.QCheckBox(DlgSaveOSM)
-        self.chkLines.setChecked(True)
-        self.chkLines.setObjectName("chkLines")
-        self.vboxlayout1.addWidget(self.chkLines)
-        self.chkPolygons = QtGui.QCheckBox(DlgSaveOSM)
-        self.chkPolygons.setChecked(True)
-        self.chkPolygons.setObjectName("chkPolygons")
-        self.vboxlayout1.addWidget(self.chkPolygons)
-        self.hboxlayout.addLayout(self.vboxlayout1)
-        self.vboxlayout2 = QtGui.QVBoxLayout()
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.chkRelations = QtGui.QCheckBox(DlgSaveOSM)
-        self.chkRelations.setChecked(True)
-        self.chkRelations.setObjectName("chkRelations")
-        self.vboxlayout2.addWidget(self.chkRelations)
-        self.chkTags = QtGui.QCheckBox(DlgSaveOSM)
-        self.chkTags.setChecked(True)
-        self.chkTags.setObjectName("chkTags")
-        self.vboxlayout2.addWidget(self.chkTags)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.vboxlayout2.addItem(spacerItem)
-        self.hboxlayout.addLayout(self.vboxlayout2)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem1)
-        self.vboxlayout3 = QtGui.QVBoxLayout()
-        self.vboxlayout3.setObjectName("vboxlayout3")
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.vboxlayout3.addItem(spacerItem2)
-        self.buttonBox = QtGui.QDialogButtonBox(DlgSaveOSM)
-        self.buttonBox.setMaximumSize(QtCore.QSize(110, 16777215))
-        self.buttonBox.setBaseSize(QtCore.QSize(110, 0))
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.NoButton|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName("buttonBox")
-        self.vboxlayout3.addWidget(self.buttonBox)
-        self.hboxlayout.addLayout(self.vboxlayout3)
-        self.vboxlayout.addLayout(self.hboxlayout)
-
-        self.retranslateUi(DlgSaveOSM)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), DlgSaveOSM.reject)
-        QtCore.QMetaObject.connectSlotsByName(DlgSaveOSM)
-        DlgSaveOSM.setTabOrder(self.OSMFileEdit, self.browseOSMButton)
-
-    def retranslateUi(self, DlgSaveOSM):
-        DlgSaveOSM.setWindowTitle(QtGui.QApplication.translate("DlgSaveOSM", "Save OSM", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgSaveOSM", "Where to save:", None, QtGui.QApplication.UnicodeUTF8))
-        self.browseOSMButton.setText(QtGui.QApplication.translate("DlgSaveOSM", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgSaveOSM", "Features to save:", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkPoints.setText(QtGui.QApplication.translate("DlgSaveOSM", "Points", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkLines.setText(QtGui.QApplication.translate("DlgSaveOSM", "Lines", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkPolygons.setText(QtGui.QApplication.translate("DlgSaveOSM", "Polygons", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkRelations.setText(QtGui.QApplication.translate("DlgSaveOSM", "Relations", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkTags.setText(QtGui.QApplication.translate("DlgSaveOSM", "Tags", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DlgUploadOSM_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DlgUploadOSM_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DlgUploadOSM_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DlgUploadOSM.ui'
-#
-# Created: Tue Jul 14 14:44:26 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DlgUploadOSM(object):
-    def setupUi(self, DlgUploadOSM):
-        DlgUploadOSM.setObjectName("DlgUploadOSM")
-        DlgUploadOSM.setWindowModality(QtCore.Qt.ApplicationModal)
-        DlgUploadOSM.resize(373, 468)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(DlgUploadOSM.sizePolicy().hasHeightForWidth())
-        DlgUploadOSM.setSizePolicy(sizePolicy)
-        DlgUploadOSM.setModal(True)
-        self.vboxlayout = QtGui.QVBoxLayout(DlgUploadOSM)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.groupBox = QtGui.QGroupBox(DlgUploadOSM)
-        self.groupBox.setObjectName("groupBox")
-        self.vboxlayout1 = QtGui.QVBoxLayout(self.groupBox)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.uploadChangesTable = QtGui.QTreeWidget(self.groupBox)
-        self.uploadChangesTable.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.uploadChangesTable.sizePolicy().hasHeightForWidth())
-        self.uploadChangesTable.setSizePolicy(sizePolicy)
-        self.uploadChangesTable.setMinimumSize(QtCore.QSize(330, 90))
-        self.uploadChangesTable.setMaximumSize(QtCore.QSize(330, 90))
-        self.uploadChangesTable.setAutoFillBackground(False)
-        self.uploadChangesTable.setTextElideMode(QtCore.Qt.ElideLeft)
-        self.uploadChangesTable.setRootIsDecorated(False)
-        self.uploadChangesTable.setItemsExpandable(False)
-        self.uploadChangesTable.setColumnCount(5)
-        self.uploadChangesTable.setObjectName("uploadChangesTable")
-        self.vboxlayout1.addWidget(self.uploadChangesTable)
-        self.label_4 = QtGui.QLabel(self.groupBox)
-        self.label_4.setObjectName("label_4")
-        self.vboxlayout1.addWidget(self.label_4)
-        self.commentTextEdit = QtGui.QTextEdit(self.groupBox)
-        self.commentTextEdit.setEnabled(True)
-        self.commentTextEdit.setMaximumSize(QtCore.QSize(16777215, 85))
-        self.commentTextEdit.setObjectName("commentTextEdit")
-        self.vboxlayout1.addWidget(self.commentTextEdit)
-        self.vboxlayout.addWidget(self.groupBox)
-        self.accountGroupBox = QtGui.QGroupBox(DlgUploadOSM)
-        self.accountGroupBox.setEnabled(True)
-        self.accountGroupBox.setObjectName("accountGroupBox")
-        self.vboxlayout2 = QtGui.QVBoxLayout(self.accountGroupBox)
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.gridlayout = QtGui.QGridLayout()
-        self.gridlayout.setObjectName("gridlayout")
-        self.label = QtGui.QLabel(self.accountGroupBox)
-        self.label.setObjectName("label")
-        self.gridlayout.addWidget(self.label, 0, 0, 1, 1)
-        self.userLineEdit = QtGui.QLineEdit(self.accountGroupBox)
-        self.userLineEdit.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.userLineEdit.sizePolicy().hasHeightForWidth())
-        self.userLineEdit.setSizePolicy(sizePolicy)
-        self.userLineEdit.setObjectName("userLineEdit")
-        self.gridlayout.addWidget(self.userLineEdit, 0, 1, 1, 1)
-        self.label_2 = QtGui.QLabel(self.accountGroupBox)
-        self.label_2.setObjectName("label_2")
-        self.gridlayout.addWidget(self.label_2, 1, 0, 1, 1)
-        self.passwdLineEdit = QtGui.QLineEdit(self.accountGroupBox)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.passwdLineEdit.sizePolicy().hasHeightForWidth())
-        self.passwdLineEdit.setSizePolicy(sizePolicy)
-        self.passwdLineEdit.setObjectName("passwdLineEdit")
-        self.gridlayout.addWidget(self.passwdLineEdit, 1, 1, 1, 1)
-        self.chkShowPasswd = QtGui.QCheckBox(self.accountGroupBox)
-        self.chkShowPasswd.setObjectName("chkShowPasswd")
-        self.gridlayout.addWidget(self.chkShowPasswd, 2, 1, 1, 1)
-        self.chkSavePasswd = QtGui.QCheckBox(self.accountGroupBox)
-        self.chkSavePasswd.setObjectName("chkSavePasswd")
-        self.gridlayout.addWidget(self.chkSavePasswd, 3, 1, 1, 1)
-        self.vboxlayout2.addLayout(self.gridlayout)
-        self.vboxlayout.addWidget(self.accountGroupBox)
-        self.buttonBox = QtGui.QDialogButtonBox(DlgUploadOSM)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
-        self.buttonBox.setObjectName("buttonBox")
-        self.vboxlayout.addWidget(self.buttonBox)
-
-        self.retranslateUi(DlgUploadOSM)
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), DlgUploadOSM.reject)
-        QtCore.QMetaObject.connectSlotsByName(DlgUploadOSM)
-        DlgUploadOSM.setTabOrder(self.userLineEdit, self.passwdLineEdit)
-        DlgUploadOSM.setTabOrder(self.passwdLineEdit, self.chkShowPasswd)
-        DlgUploadOSM.setTabOrder(self.chkShowPasswd, self.buttonBox)
-
-    def retranslateUi(self, DlgUploadOSM):
-        DlgUploadOSM.setWindowTitle(QtGui.QApplication.translate("DlgUploadOSM", "Upload OSM data", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox.setTitle(QtGui.QApplication.translate("DlgUploadOSM", "Ready for upload", None, QtGui.QApplication.UnicodeUTF8))
-        self.uploadChangesTable.headerItem().setText(0, QtGui.QApplication.translate("DlgUploadOSM", "1", None, QtGui.QApplication.UnicodeUTF8))
-        self.uploadChangesTable.headerItem().setText(1, QtGui.QApplication.translate("DlgUploadOSM", "2", None, QtGui.QApplication.UnicodeUTF8))
-        self.uploadChangesTable.headerItem().setText(2, QtGui.QApplication.translate("DlgUploadOSM", "3", None, QtGui.QApplication.UnicodeUTF8))
-        self.uploadChangesTable.headerItem().setText(3, QtGui.QApplication.translate("DlgUploadOSM", "4", None, QtGui.QApplication.UnicodeUTF8))
-        self.uploadChangesTable.headerItem().setText(4, QtGui.QApplication.translate("DlgUploadOSM", "5", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_4.setText(QtGui.QApplication.translate("DlgUploadOSM", "Comment on your changes:", None, QtGui.QApplication.UnicodeUTF8))
-        self.accountGroupBox.setTitle(QtGui.QApplication.translate("DlgUploadOSM", "OSM account", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("DlgUploadOSM", "Username:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("DlgUploadOSM", "Password:", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkShowPasswd.setText(QtGui.QApplication.translate("DlgUploadOSM", "Show password", None, QtGui.QApplication.UnicodeUTF8))
-        self.chkSavePasswd.setText(QtGui.QApplication.translate("DlgUploadOSM", "Save password", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DockUndoRedo_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DockUndoRedo_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DockUndoRedo_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DockUndoRedo.ui'
-#
-# Created: Wed Jul 29 12:14:34 2009
-#      by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_OsmUndoRedoDockWidget(object):
-    def setupUi(self, OsmUndoRedoDockWidget):
-        OsmUndoRedoDockWidget.setObjectName("OsmUndoRedoDockWidget")
-        OsmUndoRedoDockWidget.resize(227, 374)
-        OsmUndoRedoDockWidget.setAllowedAreas(QtCore.Qt.AllDockWidgetAreas)
-        self.dockWidgetContents = QtGui.QWidget()
-        self.dockWidgetContents.setObjectName("dockWidgetContents")
-        self.vboxlayout = QtGui.QVBoxLayout(self.dockWidgetContents)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.clearButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.clearButton.setObjectName("clearButton")
-        self.hboxlayout.addWidget(self.clearButton)
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout.addItem(spacerItem)
-        self.undoButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.undoButton.setEnabled(False)
-        self.undoButton.setObjectName("undoButton")
-        self.hboxlayout.addWidget(self.undoButton)
-        self.redoButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.redoButton.setEnabled(False)
-        self.redoButton.setObjectName("redoButton")
-        self.hboxlayout.addWidget(self.redoButton)
-        self.vboxlayout.addLayout(self.hboxlayout)
-        self.actionList = QtGui.QListWidget(self.dockWidgetContents)
-        self.actionList.setObjectName("actionList")
-        self.vboxlayout.addWidget(self.actionList)
-        OsmUndoRedoDockWidget.setWidget(self.dockWidgetContents)
-
-        self.retranslateUi(OsmUndoRedoDockWidget)
-        QtCore.QMetaObject.connectSlotsByName(OsmUndoRedoDockWidget)
-
-    def retranslateUi(self, OsmUndoRedoDockWidget):
-        OsmUndoRedoDockWidget.setWindowTitle(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "OSM Edit History", None, QtGui.QApplication.UnicodeUTF8))
-        self.clearButton.setToolTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Clear all", None, QtGui.QApplication.UnicodeUTF8))
-        self.clearButton.setStatusTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Clear all", None, QtGui.QApplication.UnicodeUTF8))
-        self.clearButton.setWhatsThis(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Clear all", None, QtGui.QApplication.UnicodeUTF8))
-        self.clearButton.setText(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setToolTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setStatusTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setWhatsThis(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setText(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setToolTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setStatusTip(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setWhatsThis(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setText(QtGui.QApplication.translate("OsmUndoRedoDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/DockWidget_ui.py
===================================================================
--- trunk/qgis/python/plugins/osm/DockWidget_ui.py	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/DockWidget_ui.py	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,290 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_files/DockWidget.ui'
-#
-# Created: Fri Aug 14 16:16:51 2009
-#      by: PyQt4 UI code generator 4.5.2
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_OsmDockWidget(object):
-    def setupUi(self, OsmDockWidget):
-        OsmDockWidget.setObjectName("OsmDockWidget")
-        OsmDockWidget.setWindowModality(QtCore.Qt.NonModal)
-        OsmDockWidget.setEnabled(True)
-        OsmDockWidget.resize(265, 736)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(OsmDockWidget.sizePolicy().hasHeightForWidth())
-        OsmDockWidget.setSizePolicy(sizePolicy)
-        OsmDockWidget.setMinimumSize(QtCore.QSize(261, 357))
-        OsmDockWidget.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.dockWidgetContents = QtGui.QWidget()
-        self.dockWidgetContents.setGeometry(QtCore.QRect(0, 21, 265, 715))
-        self.dockWidgetContents.setObjectName("dockWidgetContents")
-        self.vboxlayout = QtGui.QVBoxLayout(self.dockWidgetContents)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setSpacing(1)
-        self.hboxlayout.setContentsMargins(-1, -1, 0, -1)
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.dummyButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.dummyButton.setMinimumSize(QtCore.QSize(1, 25))
-        self.dummyButton.setMaximumSize(QtCore.QSize(1, 27))
-        self.dummyButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.dummyButton.setCheckable(True)
-        self.dummyButton.setObjectName("dummyButton")
-        self.hboxlayout.addWidget(self.dummyButton)
-        self.identifyButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.identifyButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.identifyButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.identifyButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.identifyButton.setCheckable(True)
-        self.identifyButton.setObjectName("identifyButton")
-        self.hboxlayout.addWidget(self.identifyButton)
-        self.moveButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.moveButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.moveButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.moveButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.moveButton.setCheckable(True)
-        self.moveButton.setObjectName("moveButton")
-        self.hboxlayout.addWidget(self.moveButton)
-        self.createPointButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.createPointButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.createPointButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.createPointButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.createPointButton.setCheckable(True)
-        self.createPointButton.setObjectName("createPointButton")
-        self.hboxlayout.addWidget(self.createPointButton)
-        self.createLineButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.createLineButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.createLineButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.createLineButton.setCheckable(True)
-        self.createLineButton.setObjectName("createLineButton")
-        self.hboxlayout.addWidget(self.createLineButton)
-        self.createPolygonButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.createPolygonButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.createPolygonButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.createPolygonButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.createPolygonButton.setCheckable(True)
-        self.createPolygonButton.setObjectName("createPolygonButton")
-        self.hboxlayout.addWidget(self.createPolygonButton)
-        self.createRelationButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.createRelationButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.createRelationButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.createRelationButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.createRelationButton.setCheckable(True)
-        self.createRelationButton.setObjectName("createRelationButton")
-        self.hboxlayout.addWidget(self.createRelationButton)
-        self.undoButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.undoButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.undoButton.setObjectName("undoButton")
-        self.hboxlayout.addWidget(self.undoButton)
-        self.redoButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.redoButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.redoButton.setObjectName("redoButton")
-        self.hboxlayout.addWidget(self.redoButton)
-        self.urDetailsButton = QtGui.QToolButton(self.dockWidgetContents)
-        self.urDetailsButton.setMaximumSize(QtCore.QSize(25, 26))
-        self.urDetailsButton.setCheckable(True)
-        self.urDetailsButton.setObjectName("urDetailsButton")
-        self.hboxlayout.addWidget(self.urDetailsButton)
-        self.vboxlayout.addLayout(self.hboxlayout)
-        self.featInfoBox = QtGui.QGroupBox(self.dockWidgetContents)
-        self.featInfoBox.setEnabled(True)
-        self.featInfoBox.setMinimumSize(QtCore.QSize(0, 95))
-        self.featInfoBox.setMaximumSize(QtCore.QSize(16777215, 95))
-        self.featInfoBox.setObjectName("featInfoBox")
-        self.vboxlayout1 = QtGui.QVBoxLayout(self.featInfoBox)
-        self.vboxlayout1.setSpacing(0)
-        self.vboxlayout1.setContentsMargins(18, 4, 3, 6)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.gridlayout = QtGui.QGridLayout()
-        self.gridlayout.setSpacing(0)
-        self.gridlayout.setObjectName("gridlayout")
-        self.label = QtGui.QLabel(self.featInfoBox)
-        self.label.setObjectName("label")
-        self.gridlayout.addWidget(self.label, 0, 0, 1, 1)
-        self.label_4 = QtGui.QLabel(self.featInfoBox)
-        self.label_4.setObjectName("label_4")
-        self.gridlayout.addWidget(self.label_4, 1, 0, 1, 1)
-        self.label_5 = QtGui.QLabel(self.featInfoBox)
-        self.label_5.setObjectName("label_5")
-        self.gridlayout.addWidget(self.label_5, 2, 0, 1, 1)
-        self.typeIdLabel = QtGui.QLabel(self.featInfoBox)
-        self.typeIdLabel.setObjectName("typeIdLabel")
-        self.gridlayout.addWidget(self.typeIdLabel, 0, 1, 1, 1)
-        self.createdLabel = QtGui.QLabel(self.featInfoBox)
-        self.createdLabel.setObjectName("createdLabel")
-        self.gridlayout.addWidget(self.createdLabel, 1, 1, 1, 1)
-        self.userLabel = QtGui.QLabel(self.featInfoBox)
-        self.userLabel.setObjectName("userLabel")
-        self.gridlayout.addWidget(self.userLabel, 2, 1, 1, 1)
-        self.removeButton = QtGui.QToolButton(self.featInfoBox)
-        self.removeButton.setMaximumSize(QtCore.QSize(25, 25))
-        self.removeButton.setObjectName("removeButton")
-        self.gridlayout.addWidget(self.removeButton, 2, 2, 1, 1)
-        self.vboxlayout1.addLayout(self.gridlayout)
-        self.vboxlayout.addWidget(self.featInfoBox)
-        self.propRelBox = QtGui.QTabWidget(self.dockWidgetContents)
-        self.propRelBox.setMinimumSize(QtCore.QSize(0, 175))
-        self.propRelBox.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.propRelBox.setTabPosition(QtGui.QTabWidget.North)
-        self.propRelBox.setTabShape(QtGui.QTabWidget.Rounded)
-        self.propRelBox.setObjectName("propRelBox")
-        self.Properties = QtGui.QWidget()
-        self.Properties.setGeometry(QtCore.QRect(0, 0, 243, 534))
-        self.Properties.setObjectName("Properties")
-        self.vboxlayout2 = QtGui.QVBoxLayout(self.Properties)
-        self.vboxlayout2.setObjectName("vboxlayout2")
-        self.tagTable = QtGui.QTableWidget(self.Properties)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tagTable.sizePolicy().hasHeightForWidth())
-        self.tagTable.setSizePolicy(sizePolicy)
-        self.tagTable.setMinimumSize(QtCore.QSize(205, 100))
-        self.tagTable.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.tagTable.setFrameShape(QtGui.QFrame.Box)
-        self.tagTable.setObjectName("tagTable")
-        self.tagTable.setColumnCount(0)
-        self.tagTable.setRowCount(0)
-        self.vboxlayout2.addWidget(self.tagTable)
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout1.addItem(spacerItem)
-        self.deleteTagsButton = QtGui.QToolButton(self.Properties)
-        self.deleteTagsButton.setObjectName("deleteTagsButton")
-        self.hboxlayout1.addWidget(self.deleteTagsButton)
-        self.vboxlayout2.addLayout(self.hboxlayout1)
-        self.propRelBox.addTab(self.Properties, "")
-        self.Relations = QtGui.QWidget()
-        self.Relations.setGeometry(QtCore.QRect(0, 0, 243, 534))
-        self.Relations.setObjectName("Relations")
-        self.vboxlayout3 = QtGui.QVBoxLayout(self.Relations)
-        self.vboxlayout3.setObjectName("vboxlayout3")
-        self.hboxlayout2 = QtGui.QHBoxLayout()
-        self.hboxlayout2.setObjectName("hboxlayout2")
-        self.relListWidget = QtGui.QListWidget(self.Relations)
-        self.relListWidget.setEnabled(False)
-        self.relListWidget.setMinimumSize(QtCore.QSize(0, 60))
-        self.relListWidget.setMaximumSize(QtCore.QSize(16777215, 104))
-        self.relListWidget.setFrameShape(QtGui.QFrame.Box)
-        self.relListWidget.setObjectName("relListWidget")
-        self.hboxlayout2.addWidget(self.relListWidget)
-        self.vboxlayout4 = QtGui.QVBoxLayout()
-        self.vboxlayout4.setObjectName("vboxlayout4")
-        self.addRelationButton = QtGui.QToolButton(self.Relations)
-        self.addRelationButton.setObjectName("addRelationButton")
-        self.vboxlayout4.addWidget(self.addRelationButton)
-        self.editRelationButton = QtGui.QToolButton(self.Relations)
-        self.editRelationButton.setObjectName("editRelationButton")
-        self.vboxlayout4.addWidget(self.editRelationButton)
-        self.removeRelationButton = QtGui.QToolButton(self.Relations)
-        self.removeRelationButton.setObjectName("removeRelationButton")
-        self.vboxlayout4.addWidget(self.removeRelationButton)
-        spacerItem1 = QtGui.QSpacerItem(26, 0, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
-        self.vboxlayout4.addItem(spacerItem1)
-        self.hboxlayout2.addLayout(self.vboxlayout4)
-        self.vboxlayout3.addLayout(self.hboxlayout2)
-        self.label_2 = QtGui.QLabel(self.Relations)
-        self.label_2.setObjectName("label_2")
-        self.vboxlayout3.addWidget(self.label_2)
-        self.relTagsTree = QtGui.QTreeWidget(self.Relations)
-        self.relTagsTree.setEnabled(False)
-        self.relTagsTree.setMinimumSize(QtCore.QSize(0, 115))
-        self.relTagsTree.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.relTagsTree.setProperty("cursor", QtCore.QVariant(QtCore.Qt.ForbiddenCursor))
-        self.relTagsTree.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
-        self.relTagsTree.setFrameShape(QtGui.QFrame.Box)
-        self.relTagsTree.setFrameShadow(QtGui.QFrame.Sunken)
-        self.relTagsTree.setIndentation(0)
-        self.relTagsTree.setRootIsDecorated(False)
-        self.relTagsTree.setItemsExpandable(False)
-        self.relTagsTree.setColumnCount(1)
-        self.relTagsTree.setObjectName("relTagsTree")
-        self.vboxlayout3.addWidget(self.relTagsTree)
-        self.label_3 = QtGui.QLabel(self.Relations)
-        self.label_3.setObjectName("label_3")
-        self.vboxlayout3.addWidget(self.label_3)
-        self.relMembersList = QtGui.QListWidget(self.Relations)
-        self.relMembersList.setEnabled(False)
-        self.relMembersList.setMinimumSize(QtCore.QSize(0, 115))
-        self.relMembersList.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.relMembersList.setFrameShape(QtGui.QFrame.Box)
-        self.relMembersList.setObjectName("relMembersList")
-        self.vboxlayout3.addWidget(self.relMembersList)
-        self.propRelBox.addTab(self.Relations, "")
-        self.vboxlayout.addWidget(self.propRelBox)
-        OsmDockWidget.setWidget(self.dockWidgetContents)
-
-        self.retranslateUi(OsmDockWidget)
-        self.propRelBox.setCurrentIndex(1)
-        QtCore.QMetaObject.connectSlotsByName(OsmDockWidget)
-
-    def retranslateUi(self, OsmDockWidget):
-        OsmDockWidget.setWindowTitle(QtGui.QApplication.translate("OsmDockWidget", "OSM Feature", None, QtGui.QApplication.UnicodeUTF8))
-        self.dummyButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.identifyButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Identify object", None, QtGui.QApplication.UnicodeUTF8))
-        self.identifyButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Identify object", None, QtGui.QApplication.UnicodeUTF8))
-        self.identifyButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Identify object", None, QtGui.QApplication.UnicodeUTF8))
-        self.identifyButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.moveButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Move object", None, QtGui.QApplication.UnicodeUTF8))
-        self.moveButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.createPointButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Create point", None, QtGui.QApplication.UnicodeUTF8))
-        self.createPointButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.createLineButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Create line", None, QtGui.QApplication.UnicodeUTF8))
-        self.createLineButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.createPolygonButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Create polygon", None, QtGui.QApplication.UnicodeUTF8))
-        self.createPolygonButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.createRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Create relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.createRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Undo", None, QtGui.QApplication.UnicodeUTF8))
-        self.undoButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Redo", None, QtGui.QApplication.UnicodeUTF8))
-        self.redoButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.urDetailsButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Show/Hide OSM Edit History", None, QtGui.QApplication.UnicodeUTF8))
-        self.urDetailsButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Show/Hide OSM Edit History", None, QtGui.QApplication.UnicodeUTF8))
-        self.urDetailsButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Show/Hide OSM Edit History", None, QtGui.QApplication.UnicodeUTF8))
-        self.urDetailsButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.featInfoBox.setTitle(QtGui.QApplication.translate("OsmDockWidget", "Feature:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("OsmDockWidget", "TYPE, ID:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_4.setText(QtGui.QApplication.translate("OsmDockWidget", "CREATED:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_5.setText(QtGui.QApplication.translate("OsmDockWidget", "USER:", None, QtGui.QApplication.UnicodeUTF8))
-        self.typeIdLabel.setText(QtGui.QApplication.translate("OsmDockWidget", "unknown", None, QtGui.QApplication.UnicodeUTF8))
-        self.createdLabel.setText(QtGui.QApplication.translate("OsmDockWidget", "unknown", None, QtGui.QApplication.UnicodeUTF8))
-        self.userLabel.setText(QtGui.QApplication.translate("OsmDockWidget", "unknown", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Remove feature", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Remove feature", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Remove feature", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.deleteTagsButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Remove selected tags", None, QtGui.QApplication.UnicodeUTF8))
-        self.deleteTagsButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Remove selected tags", None, QtGui.QApplication.UnicodeUTF8))
-        self.deleteTagsButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Remove selected tags", None, QtGui.QApplication.UnicodeUTF8))
-        self.deleteTagsButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.propRelBox.setTabText(self.propRelBox.indexOf(self.Properties), QtGui.QApplication.translate("OsmDockWidget", "Properties", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Add relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Add relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Add relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Edit relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Edit relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Edit relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Remove relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Remove relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Remove relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "...", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("OsmDockWidget", "Relation tags:", None, QtGui.QApplication.UnicodeUTF8))
-        self.relTagsTree.headerItem().setText(0, QtGui.QApplication.translate("OsmDockWidget", "1", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_3.setText(QtGui.QApplication.translate("OsmDockWidget", "Relation members:", None, QtGui.QApplication.UnicodeUTF8))
-        self.propRelBox.setTabText(self.propRelBox.indexOf(self.Relations), QtGui.QApplication.translate("OsmDockWidget", "Relations", None, QtGui.QApplication.UnicodeUTF8))
-

Deleted: trunk/qgis/python/plugins/osm/Makefile
===================================================================
--- trunk/qgis/python/plugins/osm/Makefile	2009-08-14 19:32:26 UTC (rev 11383)
+++ trunk/qgis/python/plugins/osm/Makefile	2009-08-14 22:31:19 UTC (rev 11384)
@@ -1,37 +0,0 @@
-
-GEN_FILES = OsmLoadDlg_ui.py OsmSaveDlg_ui.py OsmDownloadDlg_ui.py OsmUploadDlg_ui.py OsmFeatureDW_ui.py OsmAddRelationDlg_ui.py OsmUndoRedoDW_ui.py OsmImportDlg_ui.py resources.py
-
-all: $(GEN_FILES)
-
-OsmLoadDlg_ui.py: ui_files/OsmLoadDlg.ui
-	pyuic4 -o OsmLoadDlg_ui.py ui_files/OsmLoadDlg.ui
-
-OsmSaveDlg_ui.py: ui_files/OsmSaveDlg.ui
-	pyuic4 -o OsmSaveDlg_ui.py ui_files/OsmSaveDlg.ui
-
-OsmDownloadDlg_ui.py: ui_files/OsmDownloadDlg.ui
-	pyuic4 -o OsmDownloadDlg_ui.py ui_files/OsmDownloadDlg.ui
-
-OsmUploadDlg_ui.py: ui_files/OsmUploadDlg.ui
-	pyuic4 -o OsmUploadDlg_ui.py ui_files/OsmUploadDlg.ui
-
-OsmFeatureDW_ui.py: ui_files/OsmFeatureDW.ui
-	pyuic4 -o OsmFeatureDW_ui.py ui_files/OsmFeatureDW.ui
-
-OsmAddRelationDlg_ui.py: ui_files/OsmAddRelationDlg.ui
-	pyuic4 -o OsmAddRelationDlg_ui.py ui_files/OsmAddRelationDlg.ui
-
-OsmUndoRedoDW_ui.py: ui_files/OsmUndoRedoDW.ui
-	pyuic4 -o OsmUndoRedoDW_ui.py ui_files/OsmUndoRedoDW.ui
-
-OsmImportDlg_ui.py: ui_files/OsmImportDlg.ui
-	pyuic4 -o OsmImportDlg_ui.py ui_files/OsmImportDlg.ui
-
-resources.py: resources.qrc
-	pyrcc4 -o resources.py resources.qrc
-
-clean:
-	rm -f $(GEN_FILES) *.pyc
-
-package:
-	cd .. && rm -f osm_plugin.zip && zip -r osm_plugin.zip osm_plugin -x \*.svn-base -x \*.pyc



More information about the QGIS-commit mailing list