[QGIS Commit] r15195 - in trunk/qgis: images images/themes/default src/app src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Feb 18 08:28:33 EST 2011 

Author: timlinux
Date: 2011-02-18 05:28:33 -0800 (Fri, 18 Feb 2011)
New Revision: 15195

Added:
   trunk/qgis/images/themes/default/mActionHelpSponsors.png
   trunk/qgis/src/app/qgssponsors.cpp
   trunk/qgis/src/app/qgssponsors.h
   trunk/qgis/src/ui/qgssponsorsbase.ui
Modified:
   trunk/qgis/images/images.qrc
   trunk/qgis/src/app/CMakeLists.txt
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgsabout.cpp
   trunk/qgis/src/ui/qgsabout.ui
Log:
Added dedicated dialog for the sponsors. No longer parse sponsors from sponsors text file, just edit the html in the dialog directly.

Modified: trunk/qgis/images/images.qrc
===================================================================
--- trunk/qgis/images/images.qrc	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/images/images.qrc	2011-02-18 13:28:33 UTC (rev 15195)
@@ -1,88 +1,9 @@
 <RCC>
   <qresource prefix="/images" >
+    <file>icons/qgis-icon-16x16.png</file>
+    <file>icons/qgis-icon-60x60.png</file>
+    <file>north_arrows/gpsarrow2.svg</file>
     <file>north_arrows/gpsarrow.svg</file>
-    <file>north_arrows/gpsarrow2.svg</file>
-    <file>themes/default/mActionAddArrow.png</file>
-    <file>themes/default/mActionLocalHistogramStretch.png</file>
-    <file>themes/newgis/mActionAddGPSLayer.png</file>
-    <file>themes/newgis/mActionAddImage.png</file>
-    <file>themes/newgis/mActionAddIsland.png</file>
-    <file>themes/newgis/mActionAddLayer.png</file>
-    <file>themes/newgis/mActionAddLegend.png</file>
-    <file>themes/newgis/mActionAddMap.png</file>
-    <file>themes/newgis/mActionAddOgrLayer.png</file>
-    <file>themes/newgis/mActionAddRasterLayer.png</file>
-    <file>themes/newgis/mActionAddRing.png</file>
-    <file>themes/newgis/mActionAddSpatiaLiteLayer.png</file>
-    <file>themes/newgis/mActionAddVertex.png</file>
-    <file>themes/newgis/mActionAddWfsLayer.png</file>
-    <file>themes/newgis/mActionAddWmsLayer.png</file>
-    <file>themes/newgis/mActionCaptureLine.png</file>
-    <file>themes/newgis/mActionCapturePoint.png</file>
-    <file>themes/newgis/mActionCapturePolygon.png</file>
-    <file>themes/newgis/mActionComposerManager.png</file>
-    <file>themes/newgis/mActionDeletePart.png</file>
-    <file>themes/newgis/mActionDeleteRing.png</file>
-    <file>themes/newgis/mActionDeleteSelected.png</file>
-    <file>themes/newgis/mActionDeleteVertex.png</file>
-    <file>themes/newgis/mActionDeselectAll.png</file>
-    <file>themes/newgis/mActionDraw.png</file>
-    <file>themes/newgis/mActionEditCopy.png</file>
-    <file>themes/newgis/mActionEditCut.png</file>
-    <file>themes/newgis/mActionEditPaste.png</file>
-    <file>themes/newgis/mActionFileNew.png</file>
-    <file>themes/newgis/mActionFileOpen.png</file>
-    <file>themes/newgis/mActionFilePrint.png</file>
-    <file>themes/newgis/mActionFileSave.png</file>
-    <file>themes/newgis/mActionFileSaveAs.png</file>
-    <file>themes/newgis/mActionGroupItems.png</file>
-    <file>themes/newgis/mActionHelpContents.png</file>
-    <file>themes/newgis/mActionHideAllLayers.png</file>
-    <file>themes/newgis/mActionIdentify.png</file>
-    <file>themes/newgis/mActionInOverview.png</file>
-    <file>themes/newgis/mActionLabel.png</file>
-    <file>themes/newgis/mActionMapTips.png</file>
-    <file>themes/newgis/mActionMeasure.png</file>
-    <file>themes/newgis/mActionMeasureArea.png</file>
-    <file>themes/newgis/mActionMergeFeatures.png</file>
-    <file>themes/newgis/mActionMergeFeatureAttributes.png</file>
-    <file>themes/newgis/mActionMoveFeature.png</file>
-    <file>themes/newgis/mActionMoveItemContent.png</file>
-    <file>themes/newgis/mActionMoveVertex.png</file>
-    <file>themes/newgis/mActionNewBookmark.png</file>
-    <file>themes/newgis/mActionNewVectorLayer.png</file>
-    <file>themes/newgis/mActionNodeTool.png</file>
-    <file>themes/newgis/mActionOpenTable.png</file>
-    <file>themes/newgis/mActionPan.png</file>
-    <file>themes/newgis/mActionRedo.png</file>
-    <file>themes/newgis/mActionRemoveLayer.png</file>
-    <file>themes/newgis/mActionReshape.png</file>
-    <file>themes/newgis/mActionSaveAsPDF.png</file>
-    <file>themes/newgis/mActionSaveAsSVG.png</file>
-    <file>themes/newgis/mActionSaveMapAsImage.png</file>
-    <file>themes/newgis/mActionScaleBar.png</file>
-    <file>themes/newgis/mActionSelect.png</file>
-    <file>themes/newgis/mActionSelectPan.png</file>
-    <file>themes/newgis/mActionShowAllLayers.png</file>
-    <file>themes/newgis/mActionShowBookmarks.png</file>
-    <file>themes/newgis/mActionSimplify.png</file>
-    <file>themes/newgis/mActionSplitFeatures.png</file>
-    <file>themes/newgis/mActionToggleEditing.png</file>
-    <file>themes/newgis/mActionUndo.png</file>
-    <file>themes/newgis/mActionUngroupItems.png</file>
-    <file>themes/newgis/mActionUnselectAttributes.png</file>
-    <file>themes/newgis/mActionZoomFullExtent.png</file>
-    <file>themes/newgis/mActionZoomIn.png</file>
-    <file>themes/newgis/mActionZoomLast.png</file>
-    <file>themes/newgis/mActionZoomNext.png</file>
-    <file>themes/newgis/mActionZoomOut.png</file>
-    <file>themes/newgis/mActionZoomToLayer.png</file>
-    <file>themes/newgis/mActionZoomToSelected.png</file>
-    <file>themes/newgis/mIconEditable.png</file>
-    <file>themes/newgis/mIconLineLayer.png</file>
-    <file>themes/newgis/mIconPointLayer.png</file>
-    <file>themes/newgis/mIconPolygonLayer.png</file>
-    <file>themes/newgis/mIconTableLayer.png</file>
     <file>themes/default/cap_flat.png</file>
     <file>themes/default/cap_round.png</file>
     <file>themes/default/cap_square.png</file>
@@ -90,14 +11,14 @@
     <file>themes/default/extents.png</file>
     <file>themes/default/favourites.png</file>
     <file>themes/default/geographic.png</file>
-    <file>themes/default/transformed.png</file>
-    <file>themes/default/user.png</file>
+    <file>themes/default/gpsicons/barchart.svg</file>
+    <file>themes/default/gpsicons/polarchart.svg</file>
     <file>themes/default/join_bevel.png</file>
     <file>themes/default/join_miter.png</file>
     <file>themes/default/join_round.png</file>
     <file>themes/default/join_style.svg</file>
-    <file>themes/default/mAction.png</file>
     <file>themes/default/mActionAddAllToOverview.png</file>
+    <file>themes/default/mActionAddArrow.png</file>
     <file>themes/default/mActionAddBasicShape.png</file>
     <file>themes/default/mActionAddImage.png</file>
     <file>themes/default/mActionAddIsland.png</file>
@@ -111,13 +32,13 @@
     <file>themes/default/mActionAddSpatiaLiteLayer.png</file>
     <file>themes/default/mActionAddVertex.png</file>
     <file>themes/default/mActionAddWmsLayer.png</file>
-    <file>themes/default/mActionAnnotation.png</file>
     <file>themes/default/mActionAlignBottom.png</file>
     <file>themes/default/mActionAlignHCenter.png</file>
     <file>themes/default/mActionAlignLeft.png</file>
     <file>themes/default/mActionAlignRight.png</file>
     <file>themes/default/mActionAlignTop.png</file>
     <file>themes/default/mActionAlignVCenter.png</file>
+    <file>themes/default/mActionAnnotation.png</file>
     <file>themes/default/mActionArrowDown.png</file>
     <file>themes/default/mActionArrowUp.png</file>
     <file>themes/default/mActionCalculateField.png</file>
@@ -147,8 +68,8 @@
     <file>themes/default/mActionFileNew.png</file>
     <file>themes/default/mActionFileOpen.png</file>
     <file>themes/default/mActionFilePrint.png</file>
+    <file>themes/default/mActionFileSaveAs.png</file>
     <file>themes/default/mActionFileSave.png</file>
-    <file>themes/default/mActionFileSaveAs.png</file>
     <file>themes/default/mActionFileSmall.png</file>
     <file>themes/default/mActionFolder.png</file>
     <file>themes/default/mActionFormAnnotation.png</file>
@@ -156,24 +77,26 @@
     <file>themes/default/mActionGroupItems.png</file>
     <file>themes/default/mActionHelpAbout.png</file>
     <file>themes/default/mActionHelpContents.png</file>
+    <file>themes/default/mActionHelpSponsors.png</file>
     <file>themes/default/mActionHideAllLayers.png</file>
     <file>themes/default/mActionIdentify.png</file>
     <file>themes/default/mActionInOverview.png</file>
     <file>themes/default/mActionInvertSelection.png</file>
+    <file>themes/default/mActionLabeling.png</file>
     <file>themes/default/mActionLabel.png</file>
-    <file>themes/default/mActionLabeling.png</file>
+    <file>themes/default/mActionLocalHistogramStretch.png</file>
     <file>themes/default/mActionLowerItems.png</file>
     <file>themes/default/mActionMapTips.png</file>
-    <file>themes/default/mActionMeasure.png</file>
     <file>themes/default/mActionMeasureAngle.png</file>
     <file>themes/default/mActionMeasureArea.png</file>
+    <file>themes/default/mActionMeasure.png</file>
+    <file>themes/default/mActionMergeFeatureAttributes.png</file>
     <file>themes/default/mActionMergeFeatures.png</file>
-    <file>themes/default/mActionMergeFeatureAttributes.png</file>
     <file>themes/default/mActionMoveFeature.png</file>
-    <file>themes/default/mActionMoveLabel.png</file>
     <file>themes/default/mActionMoveItemContent.png</file>
     <file>themes/default/mActionMoveItemsToBottom.png</file>
     <file>themes/default/mActionMoveItemsToTop.png</file>
+    <file>themes/default/mActionMoveLabel.png</file>
     <file>themes/default/mActionMoveVertex.png</file>
     <file>themes/default/mActionNewAttribute.png</file>
     <file>themes/default/mActionNewBookmark.png</file>
@@ -184,29 +107,31 @@
     <file>themes/default/mActionOpenTable.png</file>
     <file>themes/default/mActionOptions.png</file>
     <file>themes/default/mActionPan.png</file>
+    <file>themes/default/mAction.png</file>
     <file>themes/default/mActionProjectProperties.png</file>
     <file>themes/default/mActionPropertyItem.png</file>
     <file>themes/default/mActionQgisHomePage.png</file>
     <file>themes/default/mActionRaiseItems.png</file>
     <file>themes/default/mActionRedo.png</file>
-    <file>themes/default/mActionRemove.png</file>
     <file>themes/default/mActionRemoveAllFromOverview.png</file>
     <file>themes/default/mActionRemoveLayer.png</file>
+    <file>themes/default/mActionRemove.png</file>
     <file>themes/default/mActionRemoveSelectedFeature.png</file>
     <file>themes/default/mActionReshape.png</file>
     <file>themes/default/mActionRotateLabel.png</file>
     <file>themes/default/mActionRotatePointSymbols.png</file>
     <file>themes/default/mActionSaveAsPDF.png</file>
     <file>themes/default/mActionSaveAsSVG.png</file>
+    <file>themes/default/mActionSaveEdits.png</file>
     <file>themes/default/mActionSaveMapAsImage.png</file>
     <file>themes/default/mActionScaleBar.png</file>
+    <file>themes/default/mActionSelectedToTop.png</file>
+    <file>themes/default/mActionSelectFreehand.png</file>
+    <file>themes/default/mActionSelectPan.png</file>
     <file>themes/default/mActionSelect.png</file>
-    <file>themes/default/mActionSelectRectangle.png</file>
-    <file>themes/default/mActionSelectFreehand.png</file>
     <file>themes/default/mActionSelectPolygon.png</file>
     <file>themes/default/mActionSelectRadius.png</file>
-    <file>themes/default/mActionSelectedToTop.png</file>
-    <file>themes/default/mActionSelectPan.png</file>
+    <file>themes/default/mActionSelectRectangle.png</file>
     <file>themes/default/mActionShowAllLayers.png</file>
     <file>themes/default/mActionShowBookmarks.png</file>
     <file>themes/default/mActionShowPluginManager.png</file>
@@ -236,7 +161,6 @@
     <file>themes/default/mIconNext.png</file>
     <file>themes/default/mIconNoPyramid.png</file>
     <file>themes/default/mIconPointLayer.png</file>
-    <file>themes/default/mIconTableLayer.png</file>
     <file>themes/default/mIconPolygonLayer.png</file>
     <file>themes/default/mIconPrevious.png</file>
     <file>themes/default/mIconProjectionDisabled.png</file>
@@ -245,23 +169,11 @@
     <file>themes/default/mIconProperties.png</file>
     <file>themes/default/mIconPyramid.png</file>
     <file>themes/default/mIconSymbology.png</file>
+    <file>themes/default/mIconTableLayer.png</file>
     <file>themes/default/mIconUnknownLayerType.png</file>
     <file>themes/default/mIconWaitingForLayerType.png</file>
     <file>themes/default/mMapserverExport.png</file>
     <file>themes/default/plugin.png</file>
-    <file>themes/default/rendererCategorizedSymbol.png</file>
-    <file>themes/default/rendererGraduatedSymbol.png</file>
-    <file>themes/default/rendererSingleSymbol.png</file>
-    <file>themes/default/symbologyAdd.png</file>
-    <file>themes/default/symbologyDown.png</file>
-    <file>themes/default/symbologyEdit.png</file>
-    <file>themes/default/symbologyLock.png</file>
-    <file>themes/default/symbologyRemove.png</file>
-    <file>themes/default/symbologyUp.png</file>
-    <file>themes/default/tracking.png</file>
-    <file>themes/default/qgis.xpm</file>
-    <file>themes/default/gpsicons/barchart.svg</file>
-    <file>themes/default/gpsicons/polarchart.svg</file>
     <file>themes/default/propertyicons/action.png</file>
     <file>themes/default/propertyicons/attributes.png</file>
     <file>themes/default/propertyicons/colormap.png</file>
@@ -281,12 +193,23 @@
     <file>themes/default/propertyicons/rendering.png</file>
     <file>themes/default/propertyicons/symbology.png</file>
     <file>themes/default/propertyicons/transparency.png</file>
+    <file>themes/default/qgis.xpm</file>
+    <file>themes/default/rendererCategorizedSymbol.png</file>
+    <file>themes/default/rendererGraduatedSymbol.png</file>
+    <file>themes/default/rendererSingleSymbol.png</file>
     <file>themes/default/styleicons/color.png</file>
+    <file>themes/default/styleicons/style-line.png</file>
     <file>themes/default/styleicons/style-point.png</file>
-    <file>themes/default/styleicons/style-line.png</file>
     <file>themes/default/styleicons/style-polygon.png</file>
-    <file>icons/qgis-icon-16x16.png</file>
-    <file>icons/qgis-icon-60x60.png</file>
+    <file>themes/default/symbologyAdd.png</file>
+    <file>themes/default/symbologyDown.png</file>
+    <file>themes/default/symbologyEdit.png</file>
+    <file>themes/default/symbologyLock.png</file>
+    <file>themes/default/symbologyRemove.png</file>
+    <file>themes/default/symbologyUp.png</file>
+    <file>themes/default/tracking.png</file>
+    <file>themes/default/transformed.png</file>
+    <file>themes/default/user.png</file>
     <file>themes/gis/mActionAddArrow.png</file>
     <file>themes/gis/mActionAddBasicShape.png</file>
     <file>themes/gis/mActionAddGPSLayer.png</file>
@@ -328,8 +251,8 @@
     <file>themes/gis/mActionFileNew.png</file>
     <file>themes/gis/mActionFileOpen.png</file>
     <file>themes/gis/mActionFilePrint.png</file>
+    <file>themes/gis/mActionFileSaveAs.png</file>
     <file>themes/gis/mActionFileSave.png</file>
-    <file>themes/gis/mActionFileSaveAs.png</file>
     <file>themes/gis/mActionFormAnnotation.png</file>
     <file>themes/gis/mActionGroupItems.png</file>
     <file>themes/gis/mActionHelpContents.png</file>
@@ -340,11 +263,11 @@
     <file>themes/gis/mActionLabel.png</file>
     <file>themes/gis/mActionLowerItems.png</file>
     <file>themes/gis/mActionMapTips.png</file>
-    <file>themes/gis/mActionMeasure.png</file>
     <file>themes/gis/mActionMeasureAngle.png</file>
     <file>themes/gis/mActionMeasureArea.png</file>
+    <file>themes/gis/mActionMeasure.png</file>
+    <file>themes/gis/mActionMergeFeatureAttributes.png</file>
     <file>themes/gis/mActionMergeFeatures.png</file>
-    <file>themes/gis/mActionMergeFeatureAttributes.png</file>
     <file>themes/gis/mActionMoveFeature.png</file>
     <file>themes/gis/mActionMoveItemContent.png</file>
     <file>themes/gis/mActionMoveItemsToBottom.png</file>
@@ -365,9 +288,9 @@
     <file>themes/gis/mActionSaveAsSVG.png</file>
     <file>themes/gis/mActionSaveMapAsImage.png</file>
     <file>themes/gis/mActionScaleBar.png</file>
-    <file>themes/gis/mActionSelect.png</file>
     <file>themes/gis/mActionSelectedToTop.png</file>
     <file>themes/gis/mActionSelectPan.png</file>
+    <file>themes/gis/mActionSelect.png</file>
     <file>themes/gis/mActionShowAllLayers.png</file>
     <file>themes/gis/mActionShowBookmarks.png</file>
     <file>themes/gis/mActionSimplify.png</file>
@@ -384,20 +307,98 @@
     <file>themes/gis/mActionZoomOut.png</file>
     <file>themes/gis/mActionZoomToLayer.png</file>
     <file>themes/gis/mActionZoomToSelected.png</file>
+    <file>themes/gis/plugins/coordinate_capture/coordinate_capture.png</file>
     <file>themes/gis/plugins/copyright_label.png</file>
     <file>themes/gis/plugins/delimited_text.png</file>
     <file>themes/gis/plugins/dxf2shp_converter.png</file>
-    <file>themes/gis/plugins/mGeorefRun.png</file>
     <file>themes/gis/plugins/gps_importer.png</file>
     <file>themes/gis/plugins/interpolation.png</file>
     <file>themes/gis/plugins/mapserver_export.png</file>
+    <file>themes/gis/plugins/mGeorefRun.png</file>
     <file>themes/gis/plugins/north_arrow.png</file>
     <file>themes/gis/plugins/ogr_converter.png</file>
     <file>themes/gis/plugins/quick_print.png</file>
     <file>themes/gis/plugins/scale_bar.png</file>
     <file>themes/gis/plugins/spit.png</file>
     <file>themes/gis/plugins/wfs.png</file>
-    <file>themes/gis/plugins/coordinate_capture/coordinate_capture.png</file>
-    <file>themes/default/mActionSaveEdits.png</file>
+    <file>themes/newgis/mActionAddGPSLayer.png</file>
+    <file>themes/newgis/mActionAddImage.png</file>
+    <file>themes/newgis/mActionAddIsland.png</file>
+    <file>themes/newgis/mActionAddLayer.png</file>
+    <file>themes/newgis/mActionAddLegend.png</file>
+    <file>themes/newgis/mActionAddMap.png</file>
+    <file>themes/newgis/mActionAddOgrLayer.png</file>
+    <file>themes/newgis/mActionAddRasterLayer.png</file>
+    <file>themes/newgis/mActionAddRing.png</file>
+    <file>themes/newgis/mActionAddSpatiaLiteLayer.png</file>
+    <file>themes/newgis/mActionAddVertex.png</file>
+    <file>themes/newgis/mActionAddWfsLayer.png</file>
+    <file>themes/newgis/mActionAddWmsLayer.png</file>
+    <file>themes/newgis/mActionCaptureLine.png</file>
+    <file>themes/newgis/mActionCapturePoint.png</file>
+    <file>themes/newgis/mActionCapturePolygon.png</file>
+    <file>themes/newgis/mActionComposerManager.png</file>
+    <file>themes/newgis/mActionDeletePart.png</file>
+    <file>themes/newgis/mActionDeleteRing.png</file>
+    <file>themes/newgis/mActionDeleteSelected.png</file>
+    <file>themes/newgis/mActionDeleteVertex.png</file>
+    <file>themes/newgis/mActionDeselectAll.png</file>
+    <file>themes/newgis/mActionDraw.png</file>
+    <file>themes/newgis/mActionEditCopy.png</file>
+    <file>themes/newgis/mActionEditCut.png</file>
+    <file>themes/newgis/mActionEditPaste.png</file>
+    <file>themes/newgis/mActionFileNew.png</file>
+    <file>themes/newgis/mActionFileOpen.png</file>
+    <file>themes/newgis/mActionFilePrint.png</file>
+    <file>themes/newgis/mActionFileSaveAs.png</file>
+    <file>themes/newgis/mActionFileSave.png</file>
+    <file>themes/newgis/mActionGroupItems.png</file>
+    <file>themes/newgis/mActionHelpContents.png</file>
+    <file>themes/newgis/mActionHideAllLayers.png</file>
+    <file>themes/newgis/mActionIdentify.png</file>
+    <file>themes/newgis/mActionInOverview.png</file>
+    <file>themes/newgis/mActionLabel.png</file>
+    <file>themes/newgis/mActionMapTips.png</file>
+    <file>themes/newgis/mActionMeasureArea.png</file>
+    <file>themes/newgis/mActionMeasure.png</file>
+    <file>themes/newgis/mActionMergeFeatureAttributes.png</file>
+    <file>themes/newgis/mActionMergeFeatures.png</file>
+    <file>themes/newgis/mActionMoveFeature.png</file>
+    <file>themes/newgis/mActionMoveItemContent.png</file>
+    <file>themes/newgis/mActionMoveVertex.png</file>
+    <file>themes/newgis/mActionNewBookmark.png</file>
+    <file>themes/newgis/mActionNewVectorLayer.png</file>
+    <file>themes/newgis/mActionNodeTool.png</file>
+    <file>themes/newgis/mActionOpenTable.png</file>
+    <file>themes/newgis/mActionPan.png</file>
+    <file>themes/newgis/mActionRedo.png</file>
+    <file>themes/newgis/mActionRemoveLayer.png</file>
+    <file>themes/newgis/mActionReshape.png</file>
+    <file>themes/newgis/mActionSaveAsPDF.png</file>
+    <file>themes/newgis/mActionSaveAsSVG.png</file>
+    <file>themes/newgis/mActionSaveMapAsImage.png</file>
+    <file>themes/newgis/mActionScaleBar.png</file>
+    <file>themes/newgis/mActionSelectPan.png</file>
+    <file>themes/newgis/mActionSelect.png</file>
+    <file>themes/newgis/mActionShowAllLayers.png</file>
+    <file>themes/newgis/mActionShowBookmarks.png</file>
+    <file>themes/newgis/mActionSimplify.png</file>
+    <file>themes/newgis/mActionSplitFeatures.png</file>
+    <file>themes/newgis/mActionToggleEditing.png</file>
+    <file>themes/newgis/mActionUndo.png</file>
+    <file>themes/newgis/mActionUngroupItems.png</file>
+    <file>themes/newgis/mActionUnselectAttributes.png</file>
+    <file>themes/newgis/mActionZoomFullExtent.png</file>
+    <file>themes/newgis/mActionZoomIn.png</file>
+    <file>themes/newgis/mActionZoomLast.png</file>
+    <file>themes/newgis/mActionZoomNext.png</file>
+    <file>themes/newgis/mActionZoomOut.png</file>
+    <file>themes/newgis/mActionZoomToLayer.png</file>
+    <file>themes/newgis/mActionZoomToSelected.png</file>
+    <file>themes/newgis/mIconEditable.png</file>
+    <file>themes/newgis/mIconLineLayer.png</file>
+    <file>themes/newgis/mIconPointLayer.png</file>
+    <file>themes/newgis/mIconPolygonLayer.png</file>
+    <file>themes/newgis/mIconTableLayer.png</file>
   </qresource>
 </RCC>

Added: trunk/qgis/images/themes/default/mActionHelpSponsors.png
===================================================================
--- trunk/qgis/images/themes/default/mActionHelpSponsors.png	                        (rev 0)
+++ trunk/qgis/images/themes/default/mActionHelpSponsors.png	2011-02-18 13:28:33 UTC (rev 15195)
@@ -0,0 +1,29 @@
+‰PNG
+
+   
+IHDR   0   /   ¥‚IÉ   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs     šœ   tIMEÛ
+<ÅÌ‚   tEXtComment Created with GIMPW  °IDAThÞ½šyŒ]çyÞßrÎ=w™¹w83.3s%SIIR–W@!dl at F`ÀÎEŒ(eAс‹¦µa§HÚJŠVJäÂ"W^d;–âER¬Å”¸ˆ¢¸h†3Î~÷{Îù¶þq.YÑ‘b7VrY0œû<ß÷|ßû¼Ï{ïÁ+„p¸/învØBˆ\6Ìg€…Ï!ξï-~Ðã!„O ñÞßá¬Á˜Û^&¤m‚M!¼Ô]òt©BÇDQŒÒú„âqàKRÊõ1!„ð{>™÷{Q>ÿ#B{l
+ÎOá'ÞE ¤ÄMP	V×Èêû¨ŒOS«$Fkýy)å
+!šÿ¬B¿éá3ÙòÅñ|ñÇøõAxۣܵß!!h‰P² <XË@Ö0}èí736ÖXãøa¥Ôßs!„R<búí‡z'Ÿ‚öä‚`"‚(ã‚ÀGàC@J¢”B)QÐòB ðçÆK6g3µû õÑÑÇ¢(ú¸”2{Oxï÷Ä—{oüðˆ{úŽ{l€@À‹‚€à	
+ÐB€(¾!‡+ï½/Àƒ÷¼#¸@ðžV4FùèƒÌLï|9I’+¥.ü\¼÷·xžê¾ü7»ÝâBÎ,àÀ‹k
+)òx at J¤”Áyœó8çðμï‹Epžà<Þ:z¢„¸í_³ïæC—FGGÔZŸù'ðÞïðÎ=Óyî¯ø•9\æÉ]ÀŠ€
+´H!
+°B $R!¤ ApçÎY¼óÅ—w8ë¾ BÁZA«ÝÇ~÷ßqø\£Ñ¸Ok}åÝpÊwÕ½v~ðØ¿<G>p¤Æ‘{q`¼¿þšL„ !a¨!„” x‹óþ'À»á½ÇAPªT¢ßlqᥓmnà_x‚/½x Ùl>úí€~§?:ï?ÛyîßçWæÈÓbå
+_ÀCi}¼xû.B#´Á8œ§ ê‡àÃ‡€Ô*NØ\ºBke›T1²mÉ	:Mßy”WutßææægÇÆÆ>õ3ð!<пtò·ÝÒ9ÌP6&øBóB ´º¾Ž@J…Œ"€·ŸåxëðB€T ¢á¡-v# íÅEÚkëÈ("JÊèRgJGØÜbÒœÈd¬}ëqÎ5Æ~»×ë=]­VŸþ©l·õé쵯â†+oCÀ	G †Wb Ò‘i‚3t.^ ï¶ÐIB@à¼Àä9Y–ᝧ¶u'•ÉÉB:Î1:µ
+‡ÀRœóXçðÆS‹cÒno2„sŒ®Íqú[O2Þ¨øÇ	ø>Ñzþ+GICp‡Vk‰Tj(‰kZÞÀ
+:èR™Ñ]{I&¦I•à=&ÐYºÂúÜ%6.ϱzyŽ‘­Û©NLà£T®’v{Xë	Æ"i¿Æ‚Í	RQyóG¼vòΣkkkŸ˜˜˜øÒ»âtuá·ü•SXëà@¥%RUmT’ͳ'qiTݳŸÚì>‚6×è­¯¶Û”[ßw/yfX¾p•K—ÈҔ˧Ïà¬Ç[G1>Ï	Y&'8Gð’Ï™ûþ7™¿|ù·ÞõrÞ?˜ŸþV|Œ-ê>P¬´T!‡à*Šh?C°9JGT&§H&¶‘®¯‘uÚØ<ÇågƒN›àõé]8ãBÐkw¹ôãW©Œ5Hª5¦f§QJQNbì`€7iQàB(j‚É+§yýÔÉ[WVV|Gƺ¸µx[¬¼g¨q­@r}õ¥Òô–æqiEÈHSÞ1KÖna­Á9W+pάÃd9q¹Š,ÅÄÕò~JuË’J•R¥L¿Ù¥>ZE0½Þ°.x|QX)—OŸ`éêՏ¼ãÈοðKÂq]6AxÔÛe3\}ðV¯ â)@WjÀRü°ÒŠëÒ9œ÷x ÇÔÞÌŸ<ER«—ZM´ŽÈº„µ`
+ΚB:¡0ƒÞ{<!bî4ßšû¥°ιûýò™H‚)n¼ç¯Ù­È6W‘J#• xе
 :&•õxïqÞÖÁ:‚<ÌŸ:Eit„¸\¦½Ùfåòò~ŒÁg)Îä뮯¾MDB2åÚ\<¾6??ÿL~oð²ð8P&!Dáó@y	i‚÷XïѵQL–âŒÅšk -Þ×%B ã˜¹S§©4Æ(•+t6Û¬-.a³œÞê:Z‚wà‡ÃuŠˆ()I’ƒÅ‹¬¯¯ß{ƒ„¬Éo/š	ÂãH¥©mÛA\o ”"ïuY»tž4K)‰„à=>HâÆ8#£
+„”¤6—OŸÆeR7Uœ$ÌŸ<ÍÈÖ)ÆwîàêÜ‹o]ïQÖÒZÛ`´–06³ƒm÷£ã­µUN>ûÞX”DZ!". Úk¬­­Ý~Ó^ÛW\9ˆ ÛßC©VCxÎb«FÆ·ðÝ“¯¢[=*J²óðQ¶¾ÿNBÚEKµVa|Çvžyòë„´O£>ÊêÜeÆf¦¹ù_ýõ­S¸g¿Ç÷¾ý=IL9úÍ&ûŽÿÛDX‡Ä39³½‡oåÑÏ~•çŒ–$JJ"!‘Y}7J¨»ºS¨¡í^ŸÞä\<ùò_þ˜ÿô™/Ð^]Áw[ì?v/g¯lКٻîÁz<ýÕoðÉOþ{μvŠ¼µÉ¡#·sz~™Ó¯œàž_ÿîþå_¤:6FÞm²Ñnsi½K«—a¬¥:VgúðmØÁ€ÿñgñÑßøwœ{ã¦×ç¾_ý7œ_mÑ3ž #„”$86›­7¦WÇC@B at HXøñ‹œ}å¹!M3—VðÖ)ÅÙ¥MâÉíØ4Åö;<ñõgYmvù«'ž&xÇÔ–Q.Ì]a#üðkßâ©Çžàâé×qý.nŸ¥nJ/78ïÙw÷ØAJ{³ÉÿyæG4ùåo€ÌLO±î`u`1(„Ö(Ý^¯~ã5ê]L èa…@j‰2–ɱ:JkœµìÚ³›Xyžúöslv3T¹Œ39ÎÂZ³ÃÌä»·nA&U¼éQ©Uif–n/euy÷훁°ë<¹uØaƒ365‰³–,Íèf†£&J—Á!“
+k½œ©qˆ"… ò,‹o „Ì	”®õæJD1ÑÐ4ê¦n¹ZcŒ…sgyêÛ?`r´†‚à-¸¢+š¬W™™Gx‹©5¹µôZ]j2P-•J!ÁrJ|Q3$°µ–0U¯!¢a^HºÖa½ ‰|~ƒ„¼®´Š§	¤Š]ˆ´`úö»©Óo5ùŸü/*¥˜ÉZ‰`>iEµR!oµJ#£˜nfè÷Ø4¥,!Öâxíœ	p>Ðëô¯×™(R”K#•
+H…P’î +úíaã”#QJµn´å±EEc"A
+d³õŽc”FGxýÕ“ü‡OŽÅÕ&UØQ¯Ð[]-ú_	µj…Õ¥ejQB> ä^yùíÕ5lš¢­ç µŽ,3ä¹ÁXš_@)EµRFÉ 5ŒÏî$ø"YZÝD)	C\)‚r’,Þ !U;w^Gà½dëwƒØ^—›vïàþàß"”Âåù¯Ê¥³or¤Ù¢\á~çã\zkÛnݏŽ¿þú÷€í8tçA¦gg¨oŸ"Ï‘[÷ñ÷ãø^Ÿç¿ö]߼Ƞ×'IJüÅç‡Å«:|ÎXýÊ·ÑJQ)Eh­ÁÑ󒝵Úùv@Ç¥Wƒ.Î…EîsƒÏSÜ CÖiÑëtèuût»}7{´3ÇcÿíÏiw:”"́ÝÛ1™å•Soñø×~Àî];ØV¯±ÿÐ~&vŒÇ
+o,[Çë?v{ozMë)7FùÊŸþOúƒŒ$IØ·gÓïóìßý=O|ãûl©•«U‰cxÚ¢D£Ñxõ†ˆâÒóYPh)qÆâ¬ãÔwžæµ¼tvŽå6!xJQD,:í2]¯¢Cà‘?þ›]6Û=dR&Ë-QðlKªÜ4±…ÿþðf35l èG毂‘HqÓÌ$.¤5üÙgÿœU=ãég9ƒAÎh9avë¶6jDZb2G×þ•Jå»ó?úf7Y>U³ÞÅÁܾe”#fèö3Ü0ÇRÑ^˜§¦ ª%éÉdÀ‹@cK`5%ÙZÑLTcúI‰Ì¼ìÚ>Žît A’DÚ?CI
+âj™÷•«Tz}C^Iˆ&õZ¶Æ(£Õ2ÏÍŒ­3ÛºøÀ¾ûì´œ¾ýÉlç‘’L5F-'Xc‡ß#•f01ÂÕsç
+ó—&“ˆr(3»cƒ¶†’’h	##Uƒ”H¢^‡™jŒŠ4{÷ïbjj“YT\&–’Jm„¡ˆ•’$å‘V8 Mû\hŽÍîzòûúèÈãW*Sŝ%¼÷ˆ ‘’È$"DºÈ~´¦ßncœaÛ®],]||@ZG`³ÅÄD›{pI9!„€ÛëQ‹5³{¦™Ý=M§Ó'*•*BhMIéëéžTEl‚ÇGžçÈÑqvïÞýø;vd#µÚSbúÖ“Ù _XaïJ—+ $ƒn—Í…:ËkÄI™©™fo>H\J
+gé=­åelšRIJÄ¥i”.<" „bϾ]̼o'½nŠÐqQ7´FiM¤$±VÄ‘&Š4Al g2ž½Üc÷Þ}'xà§Þ5•˜˜½éoœžúâH… Àt×6J!´"H‰ŒÕÑQ¬1(­Ù{ËMl,,²¹´BÖïsñÌ› Šž"Í-yn at I|€HÆ&ÆHSCP
+d^jzÛª]ü¿
+ã«ÝÝò8‡Þÿþ/üÔlôìÉ/¶þîÑ£‘VD‘Â	‰’´×£yu…‰é4WÖÈ:]„5hˆc7†öf‹~/ÅZs=É›Ÿ[BKÐZ±cfšÉÙBEÄå2JŠâ‚Ð…	B;Gj&íñä¹&î:þÒÃ?|×O
+¶¶íÚýûËÓG¾™¿ù<‘–„àÁ3Ô¥&*ŸÜ`Ó¬<ÇxKÞóåJ™ÊH<Ö;òÜ .-¢£©›Í[÷îFJXš›Çô8|;2Ö×sVŠ\*7//4Ñ“»8zôèïÿLán£^zïÑãŸëV&HÓ“[ò,'ëgxë(Wk¤.>ËÆàýµ„Ùa¥ßÐiwi·;ô:ýÂ+ź0rJcœ§ßÅ16ˉãˆj})H‰	c=™É¸ºÑâM3Â/Ü{ìsúЇžþ™ÓééééOíúà‡ŸÙp%Ò,'Ërò<Çæ†8ŽÈû]Bžœ!xW¸I†1x<!€RÅ$I	kÐBG,/\A)‰ËRʵ
+QRÂȽ#³ŽÍh·[üíUÁ±cÇžùØÇ>ö©ÿïx}vzçGgxèÜZZf3è“u»d­&¶Ó#X3R#¥0LüÌ5ÉI%iLM€(k¤
+KqáÄI’J™‰™il€Ô9Ö“f)ëMžœ·Üy×ÝçŽ?þÑò„¦ÝnßræõןzóoÙ=²~™8Ž‘Îã­aþ–@±ü?ðZë"‹JDI™+WÉúR´,šý±SLíÝËÆú:ƒ,ÚŒK«M^ØÐÜqôîKüà¼çž{Îü\3²v»½÷Ü›ç¿|â«y¤|áeÅ°))8?ïëB^
+Á˨TÈFE$µQJI	“§ q­Š.'¬¯®1ôI³§¯¶9çƸ÷Ø=/?~üÃGŽ¹ðžL)»ÝnéòÂÂ#¯¼ðÜCËßùk&L›H+$‚b2¾è'âH£t„Œ"„.ÖH¡A+¤V©ðR`ÅäŪ_mõxv%0µkÇŽ{ìèÑ£?xðà{3¥|ûkqqñ7_?wî3¯ÿð™ñþ™—鮐”JJ+"¥Ð‘&Ö	¡¢á€CãÊaT¹Í™keœïK²Ú$·:´~øðá‡ï¿ÿþ÷~Nü’j\½zõ÷Ν¿ðÉ3'_:§þžro2ŽŠ–ÄZSŠ#”TH)@(Âpþ=ðž®,§·lBe|7íßgn¾ùæÏïß¿ÿ8ðÏ;©û«ÙlŽoll|baqñ#óo½uÇââ"+ËWI×–Qyå>L¤B“ë2q¥J£Ñ`ëÔÓÓÓ'fggß¹sç—öìÙó/÷Y‰wz­­­l·Û÷µZ­»Z­Ö-nw×`n1ÖÄòHGår2_«ÕÎÔëõëõú3{öìyO>­òÊ×hÝ¥:"Ž    IEND®B`‚
\ No newline at end of file

Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/src/app/CMakeLists.txt	2011-02-18 13:28:33 UTC (rev 15195)
@@ -3,6 +3,7 @@
   qgisapp.cpp
   qgisappinterface.cpp
   qgsabout.cpp
+  qgssponsors.cpp
   qgsaddattrdialog.cpp
   qgsaddjoindialog.cpp
   qgsannotationwidget.cpp
@@ -143,6 +144,7 @@
   qgisapp.h
   qgisappinterface.h
   qgsabout.h
+  qgssponsors.h
   qgsaddattrdialog.h
   qgsdisplayangle.h
   qgsaddjoindialog.h

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-02-18 13:28:33 UTC (rev 15195)
@@ -93,12 +93,15 @@
 //
 // QGIS Specific Includes
 //
+
 #include "qgisapp.h"
 #include "qgisappinterface.h"
 #include "qgis.h"
 #include "qgisplugin.h"
 #include "qgsabout.h"
 #include "qgsapplication.h"
+#include "qgsattributeaction.h"
+#include "qgsattributetabledialog.h"
 #include "qgsbookmarkitem.h"
 #include "qgsbookmarks.h"
 #include "qgsclipboard.h"
@@ -106,16 +109,17 @@
 #include "qgscomposermanager.h"
 #include "qgsconfigureshortcutsdialog.h"
 #include "qgscoordinatetransform.h"
+#include "qgscredentialdialog.h"
 #include "qgscursors.h"
 #include "qgscustomprojectiondialog.h"
 #include "qgsencodingfiledialog.h"
 #include "qgsexception.h"
 #include "qgsfeature.h"
 #include "qgsformannotationitem.h"
+#include "qgsgenericprojectionselector.h"
+#include "qgsgpsinformationwidget.h"
+#include "qgshelpviewer.h"
 #include "qgslabelinggui.h"
-#include "qgsnewvectorlayerdialog.h"
-#include "qgshelpviewer.h"
-#include "qgsgenericprojectionselector.h"
 #include "qgslegend.h"
 #include "qgslegendlayer.h"
 #include "qgslogger.h"
@@ -127,6 +131,7 @@
 #include "qgsmaptip.h"
 #include "qgsmergeattributesdialog.h"
 #include "qgsmessageviewer.h"
+#include "qgsnewvectorlayerdialog.h"
 #include "qgsoptions.h"
 #include "qgspastetransformations.h"
 #include "qgspluginitem.h"
@@ -136,34 +141,30 @@
 #include "qgspluginmetadata.h"
 #include "qgspluginregistry.h"
 #include "qgspoint.h"
+#include "qgsprojectbadlayerguihandler.h"
 #include "qgsproject.h"
-#include "qgsprojectbadlayerguihandler.h"
 #include "qgsprojectproperties.h"
 #include "qgsproviderregistry.h"
+#include "qgsquerybuilder.h"
 #include "qgsrastercalcdialog.h"
 #include "qgsrasterlayer.h"
 #include "qgsrasterlayerproperties.h"
-#include "qgsvectorlayerproperties.h"
 #include "qgsrectangle.h"
 #include "qgsrenderer.h"
+#include "qgsshortcutsmanager.h"
+#include "qgssnappingdialog.h"
+#include "qgssponsors.h"
 #include "qgstextannotationitem.h"
-#include "qgswmssourceselect.h"
-#include "qgsshortcutsmanager.h"
+#include "qgstilescalewidget.h"
 #include "qgsundowidget.h"
 #include "qgsvectordataprovider.h"
+#include "qgsvectorfilewriter.h"
 #include "qgsvectorlayer.h"
+#include "qgsvectorlayerproperties.h"
+#include "qgswmssourceselect.h"
 #include "ogr/qgsogrsublayersdialog.h"
 #include "ogr/qgsopenvectorlayerdialog.h"
 #include "ogr/qgsvectorlayersaveasdialog.h"
-#include "qgsattributetabledialog.h"
-#include "qgsvectorfilewriter.h"
-#include "qgscredentialdialog.h"
-#include "qgstilescalewidget.h"
-#include "qgsquerybuilder.h"
-#include "qgsattributeaction.h"
-#include "qgsgpsinformationwidget.h"
-#include "qgssnappingdialog.h"
-
 //
 // Gdal/Ogr includes
 //
@@ -1246,6 +1247,11 @@
   mActionAbout->setMenuRole( QAction::AboutRole ); // put in application menu on Mac OS X
   connect( mActionAbout, SIGNAL( triggered() ), this, SLOT( about() ) );
 
+  mActionSponsors = new QAction( getThemeIcon( "mActionHelpSponsors.png" ), tr( "QGIS Sponsors!" ), this );
+  shortcuts->registerAction( mActionSponsors );
+  mActionSponsors->setStatusTip( tr( "QGIS Sponsors" ) );
+  connect( mActionSponsors, SIGNAL( triggered() ), this, SLOT( sponsors() ) );
+
   mActionMoveLabel = new QAction( getThemeIcon( "mActionMoveLabel.png" ), tr( "Move Label" ), this );
   mActionMoveLabel->setStatusTip( tr( "Move labels interactively" ) );
   connect( mActionMoveLabel, SIGNAL( triggered() ), this, SLOT( moveLabel() ) );
@@ -1662,6 +1668,7 @@
   mActionHelpSeparator2 = mHelpMenu->addSeparator();
 
   mHelpMenu->addAction( mActionAbout );
+  mHelpMenu->addAction( mActionSponsors );
 }
 
 void QgisApp::createToolBars()
@@ -2087,6 +2094,7 @@
   mActionLocalHistogramStretch->setIcon( getThemeIcon( "/mActionLocalHistogramStretch.png" ) );
   mActionQgisHomePage->setIcon( getThemeIcon( "/mActionQgisHomePage.png" ) );
   mActionAbout->setIcon( getThemeIcon( "/mActionHelpAbout.png" ) );
+  mActionSponsors->setIcon( getThemeIcon( "/mActionHelpSponsors.png" ) );
   mActionDraw->setIcon( getThemeIcon( "/mActionDraw.png" ) );
   mActionToggleEditing->setIcon( getThemeIcon( "/mActionToggleEditing.png" ) );
   mActionSaveEdits->setIcon( getThemeIcon( "/mActionSaveEdits.png" ) );
@@ -2611,6 +2619,13 @@
 
 }
 ///////////// END OF GUI SETUP ROUTINES ///////////////
+void QgisApp::sponsors()
+{
+  QgsSponsors * sponsors = new QgsSponsors();
+  sponsors->show();
+  sponsors->raise();
+  sponsors->activateWindow();
+}
 
 void QgisApp::about()
 {

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/src/app/qgisapp.h	2011-02-18 13:28:33 UTC (rev 15195)
@@ -327,6 +327,7 @@
     QAction *actionCheckQgisVersion() { return mActionCheckQgisVersion; }
     QAction *actionHelpSeparator2() { return mActionHelpSeparator2; }
     QAction *actionAbout() { return mActionAbout; }
+    QAction *actionSponsors() { return mActionSponsors; }
 
     //! Menus
     QMenu *fileMenu() { return mFileMenu; }
@@ -467,6 +468,8 @@
 #endif
 
   private slots:
+    //! QGis Sponsors
+    void sponsors();
     //! About QGis
     void about();
     //! Add a raster layer to the map (will prompt user for file name using dlg )
@@ -1016,6 +1019,7 @@
     QAction *mActionCheckQgisVersion;
     QAction *mActionHelpSeparator2;
     QAction *mActionAbout;
+    QAction *mActionSponsors;
 
     QAction *mActionLocalHistogramStretch;
 

Modified: trunk/qgis/src/app/qgsabout.cpp
===================================================================
--- trunk/qgis/src/app/qgsabout.cpp	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/src/app/qgsabout.cpp	2011-02-18 13:28:33 UTC (rev 15195)
@@ -116,59 +116,7 @@
   }
 
 
-  // read the SPONSORS file and populate the text widget
-  QFile sponsorFile( QgsApplication::sponsorsFilePath() );
-#ifdef QGISDEBUG
-  printf( "Reading sponsors file %s.............................................\n",
-          sponsorFile.fileName().toLocal8Bit().constData() );
-#endif
-  if ( sponsorFile.open( QIODevice::ReadOnly ) )
-  {
-    QString sponsorHTML = ""
-                          + tr( "<p>QGIS sponsorship programme:"
-                                "contribute to QGIS development</p>" )
-                          + "<hr>"
-                          "<table width='100%'>"
-                          "<tr><th>" + tr( "Name" ) + "</th>"
-                          "<th>" + tr( "Website" ) + "</th></tr>";
-    QString website;
-    QTextStream sponsorStream( &sponsorFile );
-    // Always use UTF-8
-    sponsorStream.setCodec( "UTF-8" );
-    QString sline;
-    while ( !sponsorStream.atEnd() )
-    {
-      sline = sponsorStream.readLine(); // line of text excluding '\n'
-      //ignore the line if it starts with a hash....
-      if ( sline.left( 1 ) == "#" ) continue;
-      QStringList myTokens = sline.split( "|", QString::SkipEmptyParts );
-      if ( myTokens.size() == 0 )
-      {
-        continue;
-      }
-      else if ( myTokens.size() > 1 )
-      {
-        website = "<a href=\"" + myTokens[1].remove( ' ' ) + "\">" + myTokens[1] + "</a>";
-      }
-      else
-      {
-        website = "&nbsp;";
-      }
-      sponsorHTML += "<tr>";
-      sponsorHTML += "<td>" + myTokens[0] + "</td><td>" + website + "</td>";
-      // close the row
-      sponsorHTML += "</tr>";
-    }
-    sponsorHTML += "</table>";
 
-    QString myStyle = QgsApplication::reportStyleSheet();
-    txtSponsors->clear();
-    txtSponsors->document()->setDefaultStyleSheet( myStyle );
-    txtSponsors->setHtml( sponsorHTML );
-    QgsDebugMsg( QString( "sponsorHTML:%1" ).arg( sponsorHTML.toAscii().constData() ) );
-    QgsDebugMsg( QString( "txtSponsors:%1" ).arg( txtSponsors->toHtml().toAscii().constData() ) );
-  }
-
   // read the DONORS file and populate the text widget
   QFile donorsFile( QgsApplication::donorsFilePath() );
 #ifdef QGISDEBUG

Added: trunk/qgis/src/app/qgssponsors.cpp
===================================================================
--- trunk/qgis/src/app/qgssponsors.cpp	                        (rev 0)
+++ trunk/qgis/src/app/qgssponsors.cpp	2011-02-18 13:28:33 UTC (rev 15195)
@@ -0,0 +1,47 @@
+/***************************************************************************
+                          qgssponsors.cpp  -  description
+                             -------------------
+    begin                : Sat Aug 10 2002
+    copyright            : (C) 2002 by Gary E.Sherman
+    email                : sherman at mrcc.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+/* $Id$ */
+
+#include "qgssponsors.h"
+#include "qgsapplication.h"
+#include <QFile>
+#include <QTextStream>
+
+#ifdef Q_OS_MACX
+QgsSponsors::QgsSponsors()
+    : QDialog( NULL, Qt::WindowSystemMenuHint )  // Modeless dialog with close button only
+#else
+QgsSponsors::QgsSponsors()
+    : QDialog( NULL )  // Normal dialog in non Mac-OS
+#endif
+{
+  setupUi( this );
+  init();
+}
+
+QgsSponsors::~QgsSponsors()
+{
+}
+
+void QgsSponsors::init()
+{
+
+  // set the 60x60 icon pixmap
+  QPixmap icon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" );
+  qgisIcon->setPixmap( icon );
+
+}

Added: trunk/qgis/src/app/qgssponsors.h
===================================================================
--- trunk/qgis/src/app/qgssponsors.h	                        (rev 0)
+++ trunk/qgis/src/app/qgssponsors.h	2011-02-18 13:28:33 UTC (rev 15195)
@@ -0,0 +1,36 @@
+/***************************************************************************
+                          qgssponsors.h  -  description
+                             -------------------
+    begin                : Sat Aug 10 2002
+    copyright            : (C) 2002 by Gary E.Sherman
+    email                : sherman at mrcc.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+/* $Id:$ */
+#ifndef QGSSPONSORS_H
+#define QGSSPONSORS_H
+
+#include "ui_qgssponsorsbase.h"
+
+class QgsSponsors : public QDialog, private Ui::QgsSponsorsBase
+{
+    Q_OBJECT
+  public:
+    QgsSponsors();
+    ~QgsSponsors();
+
+  private:
+    void init();
+
+  private slots:
+};
+
+#endif

Modified: trunk/qgis/src/ui/qgsabout.ui
===================================================================
--- trunk/qgis/src/ui/qgsabout.ui	2011-02-18 11:30:19 UTC (rev 15194)
+++ trunk/qgis/src/ui/qgsabout.ui	2011-02-18 13:28:33 UTC (rev 15195)
@@ -17,6 +17,13 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout">
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
@@ -38,7 +45,7 @@
             </size>
            </property>
            <property name="pixmap">
-            <pixmap>:/images/icons/qgis-icon-60x60.png</pixmap>
+            <pixmap resource="../../images/images.qrc">:/images/icons/qgis-icon-60x60.png</pixmap>
            </property>
            <property name="scaledContents">
             <bool>false</bool>
@@ -222,23 +229,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
-      <attribute name="title">
-       <string>Sponsors</string>
-      </attribute>
-      <layout class="QGridLayout">
-       <item row="0" column="0">
-        <widget class="QTextBrowser" name="txtSponsors">
-         <property name="openExternalLinks">
-          <bool>true</bool>
-         </property>
-         <property name="openLinks">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
        <string>Donors</string>
@@ -258,13 +248,6 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
@@ -274,7 +257,6 @@
   <tabstop>btnQgisUser</tabstop>
   <tabstop>txtProviders</tabstop>
   <tabstop>lstDevelopers</tabstop>
-  <tabstop>txtSponsors</tabstop>
   <tabstop>txtTranslators</tabstop>
   <tabstop>buttonBox</tabstop>
   <tabstop>txtDonors</tabstop>

Added: trunk/qgis/src/ui/qgssponsorsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgssponsorsbase.ui	                        (rev 0)
+++ trunk/qgis/src/ui/qgssponsorsbase.ui	2011-02-18 13:28:33 UTC (rev 15195)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QgsSponsorsBase</class>
+ <widget class="QDialog" name="QgsSponsorsBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>461</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>QGIS Sponsors</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="qgisIcon">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QTextBrowser" name="txtSponsors">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="html">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;We work really hard to make this nice software for you. See all the cool features it has? Get a warm fuzzy feeling when you use it? Quantum GIS is a labour of love by a dedicated team of developers. We want you to copy &amp;amp; share it and put it in the hands of as many people as possible. If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project.  Please see the &lt;a href=&quot;http://qgis.org/en/sponsorship.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;QGIS Sponsorship Web Page&lt;/span&gt;&lt;/a&gt; for more details. In the list below you can see the fine people and co
 mpanies that are helping us financially - a great big 'thank you' to you all!&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;2010 Sponsors&lt;/span&gt;&lt;/p&gt;
+&lt;hr /&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;table border=&quot;0&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;&quot; width=&quot;100%&quot; cellspacing=&quot;2&quot; cellpadding=&quot;0&quot;&gt;
+&lt;tr&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;BRONZE SPONSORS&lt;/span&gt;&lt;/p&gt;&lt;/td&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; &lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Studio Associato Gfosservices&lt;/p&gt;&lt;/td&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.gfosservices.com&quot;&gt;&lt;span style=&quot; font-family:'arial,sans-serif'; font-size:small; text-decoration: underline; color:#729fcf;&quot;&gt;http://www.gfosservices.com&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;NEXTGIS&lt;/p&gt;&lt;/td&gt;
+&lt;td&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://nextgis.org&quot;&gt;&lt;span style=&quot; font-family:'arial,sans-serif'; font-size:small; text-decoration: underline; color:#729fcf;&quot;&gt;http://nextgis.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QgsSponsorsBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QgsSponsorsBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

More information about the QGIS-commit mailing list