[QGIS Commit] r13495 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-15 14:46:37 -0400 (Sat, 15 May 2010)
New Revision: 13495

Modified:
   trunk/qgis/src/app/qgswmssourceselect.cpp
Log:
improve image format selecting in wms selection dialog

Modified: trunk/qgis/src/app/qgswmssourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgswmssourceselect.cpp	2010-05-15 16:15:59 UTC (rev 13494)
+++ trunk/qgis/src/app/qgswmssourceselect.cpp	2010-05-15 18:46:37 UTC (rev 13495)
@@ -96,6 +96,9 @@
     mFormats << "image/png8";    // used by geoserver
     mLabels << "PNG8";
 
+    mFormats << "png";    // used by french IGN geoportail
+    mLabels << "PNG";
+  
     mFormats << "pngt";    // used by french IGN geoportail
     mLabels << "PNGT";
   }
@@ -128,12 +131,14 @@
 
     QRadioButton *btn = new QRadioButton( mLabels[i] );
     btn->setToolTip( mFormats[i] );
+    btn->setHidden( true );
     mImageFormatGroup->addButton( btn, i );
     layout->addWidget( btn );
   }
 
   // default to first encoding
   mImageFormatGroup->button( 0 )->setChecked( true );
+  btnGrpImageEncoding->setDisabled( true );
 
   layout->addStretch();
   btnGrpImageEncoding->setLayout( layout );
@@ -291,7 +296,7 @@
 
   foreach( QAbstractButton *b, mImageFormatGroup->buttons() )
   {
-    b->setEnabled( false );
+    b->setHidden( true );
   }
 
   foreach( QString encoding, wmsProvider->supportedImageEncodings() )
@@ -303,9 +308,11 @@
       continue;
     }
 
-    mImageFormatGroup->button( id )->setEnabled( true );
+    mImageFormatGroup->button( id )->setVisible( true );
   }
 
+  btnGrpImageEncoding->setEnabled( true );
+
   QMap<int, QgsNumericSortTreeWidgetItem *> items;
   QMap<int, int> layerParents;
   QMap<int, QStringList> layerParentNames;