Update of OSM plugin from Lukas Berka:

new osm icons git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11377 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 14, 2009 · 9327027 · 9327027
1 parent 2662182
commit 9327027
Show file tree

Hide file tree

Showing 15 changed files with 1,213 additions and 1,200 deletions.
diff --git a/python/plugins/osm/DockWidget.py b/python/plugins/osm/DockWidget.py
@@ -58,6 +58,10 @@ def __init__(self, plugin):
         self.deleteTagsButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_remove.png"))
         self.undoButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_undo.png"))
         self.redoButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_redo.png"))
+        self.addRelationButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_addRelation.png"))
+        self.removeRelationButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_removeRelation.png"))
+        self.editRelationButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_editRelation.png"))
+        self.urDetailsButton.setIcon(QIcon(":/plugins/osm_plugin/images/osm_urDetails.png"))
 
         # initializing group of edit buttons
         self.toolButtons=QButtonGroup(self)
@@ -1715,7 +1719,9 @@ def __urDetailsChecked(self):
 
         if self.urDetailsButton.isChecked():
             self.plugin.undoredo.show()
+            self.urDetailsButton.setToolTip("Hide OSM Edit History")
         else:
             self.plugin.undoredo.hide()
+            self.urDetailsButton.setToolTip("Show OSM Edit History")
 
 
diff --git a/python/plugins/osm/DockWidget_ui.py b/python/plugins/osm/DockWidget_ui.py
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'ui_files/DockWidget.ui'
 #
-# Created: Thu Aug  6 16:37:44 2009
-#      by: PyQt4 UI code generator 4.4.4
+# 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!
 
@@ -14,7 +14,7 @@ def setupUi(self, OsmDockWidget):
         OsmDockWidget.setObjectName("OsmDockWidget")
         OsmDockWidget.setWindowModality(QtCore.Qt.NonModal)
         OsmDockWidget.setEnabled(True)
-        OsmDockWidget.resize(265, 776)
+        OsmDockWidget.resize(265, 736)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -23,6 +23,7 @@ def setupUi(self, OsmDockWidget):
         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")
@@ -135,6 +136,7 @@ def setupUi(self, OsmDockWidget):
         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")
@@ -161,6 +163,7 @@ def setupUi(self, OsmDockWidget):
         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")
@@ -175,22 +178,13 @@ def setupUi(self, OsmDockWidget):
         self.hboxlayout2.addWidget(self.relListWidget)
         self.vboxlayout4 = QtGui.QVBoxLayout()
         self.vboxlayout4.setObjectName("vboxlayout4")
-        self.addRelationButton = QtGui.QPushButton(self.Relations)
-        self.addRelationButton.setEnabled(False)
-        self.addRelationButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.addRelationButton.setMaximumSize(QtCore.QSize(26, 25))
+        self.addRelationButton = QtGui.QToolButton(self.Relations)
         self.addRelationButton.setObjectName("addRelationButton")
         self.vboxlayout4.addWidget(self.addRelationButton)
-        self.editRelationButton = QtGui.QPushButton(self.Relations)
-        self.editRelationButton.setEnabled(False)
-        self.editRelationButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.editRelationButton.setMaximumSize(QtCore.QSize(26, 25))
+        self.editRelationButton = QtGui.QToolButton(self.Relations)
         self.editRelationButton.setObjectName("editRelationButton")
         self.vboxlayout4.addWidget(self.editRelationButton)
-        self.removeRelationButton = QtGui.QPushButton(self.Relations)
-        self.removeRelationButton.setEnabled(False)
-        self.removeRelationButton.setMinimumSize(QtCore.QSize(26, 25))
-        self.removeRelationButton.setMaximumSize(QtCore.QSize(26, 25))
+        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)
@@ -268,21 +262,27 @@ def retranslateUi(self, OsmDockWidget):
         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 new relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Add new relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Add new relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.addRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "A", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Edit selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Edit selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Edit selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.editRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "E", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setToolTip(QtGui.QApplication.translate("OsmDockWidget", "Remove selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setStatusTip(QtGui.QApplication.translate("OsmDockWidget", "Remove selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setWhatsThis(QtGui.QApplication.translate("OsmDockWidget", "Remove selected relation", None, QtGui.QApplication.UnicodeUTF8))
-        self.removeRelationButton.setText(QtGui.QApplication.translate("OsmDockWidget", "R", 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))

diff --git a/python/plugins/osm/images/osm_addRelation.png b/python/plugins/osm/images/osm_addRelation.png
diff --git a/python/plugins/osm/images/osm_createLine.png b/python/plugins/osm/images/osm_createLine.png
diff --git a/python/plugins/osm/images/osm_createPoint.png b/python/plugins/osm/images/osm_createPoint.png
diff --git a/python/plugins/osm/images/osm_createPolygon.png b/python/plugins/osm/images/osm_createPolygon.png
diff --git a/python/plugins/osm/images/osm_createRelation.png b/python/plugins/osm/images/osm_createRelation.png
diff --git a/python/plugins/osm/images/osm_editRelation.png b/python/plugins/osm/images/osm_editRelation.png
diff --git a/python/plugins/osm/images/osm_redo.png b/python/plugins/osm/images/osm_redo.png
diff --git a/python/plugins/osm/images/osm_removeRelation.png b/python/plugins/osm/images/osm_removeRelation.png
diff --git a/python/plugins/osm/images/osm_undo.png b/python/plugins/osm/images/osm_undo.png
diff --git a/python/plugins/osm/images/osm_urDetails.png b/python/plugins/osm/images/osm_urDetails.png