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

Author: etiennesky

images/images.qrc

@@ -210,6 +210,8 @@
     <file>themes/default/mIconWarn.png</file>
     <file>themes/default/mIconZoom.png</file>
     <file>themes/default/mIconZip.png</file>
+    <file>themes/default/mIconCollapse.png</file>
+    <file>themes/default/mIconExpand.png</file>
     <file>themes/default/mMapserverExport.png</file>
     <file>themes/default/plugin.png</file>
     <file>themes/default/propertyicons/action.png</file>

images/themes/default/mIconCollapse.png

@@ -43,4 +43,5 @@ public:
     void deleteFrames();
 
     int nFrames() const;
+    QgsComposerFrame* frame( int i );
 };

images/themes/default/mIconExpand.png

@@ -27,6 +27,7 @@
 #include "qgsproject.h"
 
 #include "qgsrasterformatsaveoptionswidget.h"
+#include "qgsrasterpyramidsoptionswidget.h"
 #include "qgsdialog.h"
 
 #include <QInputDialog>
@@ -1118,15 +1119,26 @@ void QgsOptions::editGdalDriver( const QString& driverName )
   QLabel *label = new QLabel( title, &dlg );
   label->setAlignment( Qt::AlignHCenter );
   layout->addWidget( label );
-  QgsRasterFormatSaveOptionsWidget* optionsWidget =
-    new QgsRasterFormatSaveOptionsWidget( &dlg, driverName,
-                                          QgsRasterFormatSaveOptionsWidget::Full, "gdal" );
-  layout->addWidget( optionsWidget );
 
-  if ( dlg.exec() == QDialog::Accepted )
+  if ( driverName == "_pyramids" )
   {
-    optionsWidget->apply();
+    QgsRasterPyramidsOptionsWidget* optionsWidget =
+      new QgsRasterPyramidsOptionsWidget( &dlg, "gdal" );
+    layout->addWidget( optionsWidget );
+    dlg.resize( 400, 400 );
+    if ( dlg.exec() == QDialog::Accepted )
+      optionsWidget->apply();
   }
+  else
+  {
+    QgsRasterFormatSaveOptionsWidget* optionsWidget =
+      new QgsRasterFormatSaveOptionsWidget( &dlg, driverName,
+                                            QgsRasterFormatSaveOptionsWidget::Full, "gdal" );
+    layout->addWidget( optionsWidget );
+    if ( dlg.exec() == QDialog::Accepted )
+      optionsWidget->apply();
+  }
+
 }
 
 // Return state of the visibility flag for newly added layers. If

python/core/qgscomposermultiframe.sip

@@ -238,6 +238,15 @@ void QgsComposerMultiFrame::deleteFrames()
   mResizeMode = bkResizeMode;
 }
 
+QgsComposerFrame* QgsComposerMultiFrame::frame( int i )
+{
+  if ( i >= mFrameItems.size() )
+  {
+    return 0;
+  }
+  return mFrameItems.at( i );
+}
+
 bool QgsComposerMultiFrame::_writeXML( QDomElement& elem, QDomDocument& doc, bool ignoreFrames ) const
 {
   elem.setAttribute( "resizeMode", mResizeMode );

src/app/qgsoptions.cpp

@@ -70,6 +70,7 @@ class CORE_EXPORT QgsComposerMultiFrame: public QObject
     void deleteFrames();
 
     int nFrames() const { return mFrameItems.size(); }
+    QgsComposerFrame* frame( int i );
 
   protected:
     QgsComposition* mComposition;

src/core/composer/qgscomposermultiframe.cpp

@@ -525,8 +525,11 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
       return false;
     }
 
-    /** Set no data value on created dataset */
-    virtual bool setNoDataValue( int, double ) { return false; }
+    /** Set no data value on created dataset
+     *  @param bandNo band number
+     *  @param noDataValue no data value
+     */
+    virtual bool setNoDataValue( int bandNo, double noDataValue ) { Q_UNUSED( bandNo ); Q_UNUSED( noDataValue ); return false; }
 
     /**Returns the formats supported by create()*/
     virtual QStringList createFormats() const { return QStringList(); }

src/core/composer/qgscomposermultiframe.h

@@ -110,7 +110,7 @@ int QgsRasterTransparency::alphaValue( double theValue, int theGlobalTransparenc
 
   //Search through the transparency list looking for a match
   bool myTransparentPixelFound = false;
-  TransparentSingleValuePixel myTransparentPixel = {0, 100};
+  TransparentSingleValuePixel myTransparentPixel = {0, 0, 100};
   for ( int myListRunner = 0; myListRunner < mTransparentSingleValuePixelList.count(); myListRunner++ )
   {
     myTransparentPixel = mTransparentSingleValuePixelList[myListRunner];

src/core/qgsrasterdataprovider.h

@@ -83,6 +83,7 @@ qgsprojectionselector.cpp
 qgsquickprint.cpp
 qgsrasterlayersaveasdialog.cpp
 qgsrasterformatsaveoptionswidget.cpp
+qgsrasterpyramidsoptionswidget.cpp
 qgsrubberband.cpp
 qgsscalecombobox.cpp
 qgstextannotationitem.cpp
@@ -93,6 +94,7 @@ qgsexpressionbuilderwidget.cpp
 qgsexpressionbuilderdialog.cpp
 qgsexpressionhighlighter.cpp
 qgsquerybuilder.cpp
+qgscollapsiblegroupbox.cpp
 )
 
 IF (WITH_TOUCH)
@@ -168,6 +170,7 @@ qgsprojectionselector.h
 qgsquickprint.h
 qgsrasterlayersaveasdialog.h
 qgsrasterformatsaveoptionswidget.h
+qgsrasterpyramidsoptionswidget.h
 qgsludialog.h
 qgsprojectbadlayerguihandler.h
 qgslonglongvalidator.h
@@ -176,6 +179,7 @@ qgsscalecombobox.h
 qgsexpressionbuilderwidget.h
 qgsexpressionhighlighter.h
 qgsquerybuilder.h
+qgscollapsiblegroupbox.h
 )
 
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
@@ -213,6 +217,7 @@ qgsfieldvalidator.h
 qgsexpressionbuilderwidget.h
 qgsexpressionbuilderdialog.h
 qgsexpressionhighlighter.h
+qgscollapsiblegroupbox.h
 
 attributetable/qgsattributetablemodel.h
 attributetable/qgsattributetablememorymodel.h