Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · May 22, 2011 · 5fea5a8
2 parents ffed1d7 + 9784cd7
commit 5fea5a8
Show file tree

Hide file tree

Showing 143 changed files with 7,811 additions and 787 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -13,6 +13,8 @@
         <file>themes/default/geographic.png</file>
         <file>themes/default/gpsicons/barchart.svg</file>
         <file>themes/default/gpsicons/polarchart.svg</file>
+        <file>themes/default/grass_location.png</file>
+        <file>themes/default/grass_mapset.png</file>
         <file>themes/default/join_bevel.png</file>
         <file>themes/default/join_miter.png</file>
         <file>themes/default/join_round.png</file>
@@ -178,6 +180,8 @@
         <file>themes/default/mIconTableLayer.png</file>
         <file>themes/default/mIconUnknownLayerType.png</file>
         <file>themes/default/mIconWaitingForLayerType.png</file>
+        <file>themes/default/mIconWms.png</file>
+        <file>themes/default/mIconWmsLayer.png</file>
         <file>themes/default/mMapserverExport.png</file>
         <file>themes/default/plugin.png</file>
         <file>themes/default/propertyicons/action.png</file>

diff --git a/images/themes/default/customization/calendarwidget.png b/images/themes/default/customization/calendarwidget.png
diff --git a/images/themes/default/customization/checkbox.png b/images/themes/default/customization/checkbox.png
diff --git a/images/themes/default/customization/columnview.png b/images/themes/default/customization/columnview.png
diff --git a/images/themes/default/customization/combobox.png b/images/themes/default/customization/combobox.png
diff --git a/images/themes/default/customization/commandlinkbutton.png b/images/themes/default/customization/commandlinkbutton.png
diff --git a/images/themes/default/customization/dateedit.png b/images/themes/default/customization/dateedit.png
diff --git a/images/themes/default/customization/datetimeedit.png b/images/themes/default/customization/datetimeedit.png
diff --git a/images/themes/default/customization/dial.png b/images/themes/default/customization/dial.png
diff --git a/images/themes/default/customization/dialogbuttonbox.png b/images/themes/default/customization/dialogbuttonbox.png
diff --git a/images/themes/default/customization/dockwidget.png b/images/themes/default/customization/dockwidget.png
diff --git a/images/themes/default/customization/doublespinbox.png b/images/themes/default/customization/doublespinbox.png
diff --git a/images/themes/default/customization/fontcombobox.png b/images/themes/default/customization/fontcombobox.png
diff --git a/images/themes/default/customization/frame.png b/images/themes/default/customization/frame.png
diff --git a/images/themes/default/customization/graphicsview.png b/images/themes/default/customization/graphicsview.png
diff --git a/images/themes/default/customization/groupbox.png b/images/themes/default/customization/groupbox.png
diff --git a/images/themes/default/customization/groupboxcollapsible.png b/images/themes/default/customization/groupboxcollapsible.png
diff --git a/images/themes/default/customization/hscrollbar.png b/images/themes/default/customization/hscrollbar.png
diff --git a/images/themes/default/customization/hslider.png b/images/themes/default/customization/hslider.png
diff --git a/images/themes/default/customization/hsplit.png b/images/themes/default/customization/hsplit.png
diff --git a/images/themes/default/customization/label.png b/images/themes/default/customization/label.png
diff --git a/images/themes/default/customization/lcdnumber.png b/images/themes/default/customization/lcdnumber.png
diff --git a/images/themes/default/customization/line.png b/images/themes/default/customization/line.png
diff --git a/images/themes/default/customization/lineedit.png b/images/themes/default/customization/lineedit.png
diff --git a/images/themes/default/customization/listbox.png b/images/themes/default/customization/listbox.png
diff --git a/images/themes/default/customization/listview.png b/images/themes/default/customization/listview.png
diff --git a/images/themes/default/customization/mdiarea.png b/images/themes/default/customization/mdiarea.png
diff --git a/images/themes/default/customization/plaintextedit.png b/images/themes/default/customization/plaintextedit.png
diff --git a/images/themes/default/customization/progress.png b/images/themes/default/customization/progress.png
diff --git a/images/themes/default/customization/pushbutton.png b/images/themes/default/customization/pushbutton.png
diff --git a/images/themes/default/customization/radiobutton.png b/images/themes/default/customization/radiobutton.png
diff --git a/images/themes/default/customization/scrollarea.png b/images/themes/default/customization/scrollarea.png
diff --git a/images/themes/default/customization/spacer.png b/images/themes/default/customization/spacer.png
diff --git a/images/themes/default/customization/spinbox.png b/images/themes/default/customization/spinbox.png
diff --git a/images/themes/default/customization/tabbar.png b/images/themes/default/customization/tabbar.png
diff --git a/images/themes/default/customization/table.png b/images/themes/default/customization/table.png
diff --git a/images/themes/default/customization/tabwidget.png b/images/themes/default/customization/tabwidget.png
diff --git a/images/themes/default/customization/textedit.png b/images/themes/default/customization/textedit.png
diff --git a/images/themes/default/customization/timeedit.png b/images/themes/default/customization/timeedit.png
diff --git a/images/themes/default/customization/toolbox.png b/images/themes/default/customization/toolbox.png