doc/changelog.t2t

@@ -129,7 +129,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Reduce top and side margins for attribute table dialog
 - Remove the (hopefully) last SVN reference
 - More svn version removal
-- Added missing colour accessor/mutator/member from composerlegenditem header
+- Added missing color accessor/mutator/member from composerlegenditem header
 - Get rid of svn version stuff from release branch.
 - Other workaround for Qt#5114 (fixes #3250, #3028, #2598)
 - Try to make the histogram smoother
@@ -264,7 +264,7 @@ changed so we will just provide a bullet list of key new features here.
 
 - Support for icons of plugins in the plugin manager dialog.
 - Removed quickprint plugin - use easyprint plugin rather from plugin repo.
-- Removed ogr convertor plugin - use 'save as' context menu rather.
+- Removed ogr converter plugin - use 'save as' context menu rather.
 - 
 
 ==Printing==

src/app/attributetable/qgsattributetabledialog.cpp

@@ -806,6 +806,8 @@ void QgsAttributeTableDialog::updateExtent()
 
 void QgsAttributeTableDialog::viewWillShowContextMenu( QMenu* menu, QModelIndex atIndex )
 {
+  QModelIndex sourceIndex = mFilterModel->mapToSource( atIndex );
+
   if ( mLayer->actions()->size() != 0 )
   {
 
@@ -819,12 +821,12 @@ void QgsAttributeTableDialog::viewWillShowContextMenu( QMenu* menu, QModelIndex
       if ( !action.runable() )
         continue;
 
-      QgsAttributeTableAction *a = new QgsAttributeTableAction( action.name(), mView, mModel, i, atIndex );
+      QgsAttributeTableAction *a = new QgsAttributeTableAction( action.name(), mView, mModel, i, sourceIndex );
       menu->addAction( action.name(), a, SLOT( execute() ) );
     }
   }
 
-  QgsAttributeTableAction *a = new QgsAttributeTableAction( tr( "Open form" ), mView, mModel, -1, atIndex );
+  QgsAttributeTableAction *a = new QgsAttributeTableAction( tr( "Open form" ), mView, mModel, -1, sourceIndex );
   menu->addAction( tr( "Open form" ), a, SLOT( featureForm() ) );
 }
 

src/app/qgsrasterlayerproperties.cpp

@@ -320,10 +320,13 @@ void QgsRasterLayerProperties::populateColorMapTable( const QList<QgsColorRampSh
 }
 void QgsRasterLayerProperties::populateTransparencyTable()
 {
-  //Clear existsing color transparency list
+  QgsDebugMsg( "entering." );
+
+  //Clear existing color transparency list
   //NOTE: May want to just tableTransparency->clearContents() and fill back in after checking to be sure list and table are the same size
   QString myNumberFormatter;
-  if ( rbtnThreeBand->isChecked() && QgsRasterLayer::PalettedColor != mRasterLayer->drawingStyle() &&
+  if ( rbtnThreeBand->isChecked() &&
+       QgsRasterLayer::PalettedColor != mRasterLayer->drawingStyle() &&
        QgsRasterLayer::PalettedMultiBandColor != mRasterLayer->drawingStyle() )
   {
     for ( int myTableRunner = tableTransparency->rowCount() - 1; myTableRunner >= 0; myTableRunner-- )
@@ -356,7 +359,7 @@ void QgsRasterLayerProperties::populateTransparencyTable()
   }
   else
   {
-    //Clear existing single band or pallet values gransparency list
+    //Clear existing single band or palette values transparency list
     for ( int myTableRunner = tableTransparency->rowCount() - 1; myTableRunner >= 0; myTableRunner-- )
     {
       tableTransparency->removeRow( myTableRunner );
@@ -394,7 +397,7 @@ void QgsRasterLayerProperties::populateTransparencyTable()
   tableTransparency->resizeRowsToContents();
 }
 
-/** Set the message indicating if any min max values are estimates */
+// Set the message indicating if any min max values are estimates
 void QgsRasterLayerProperties::setMinimumMaximumEstimateWarning()
 {
   bool myEstimatedValues = false;
@@ -761,6 +764,7 @@ void QgsRasterLayerProperties::sync()
   }
 
   QgsDebugMsg( "populate transparency tab" );
+
   /*
    * Transparent Pixel Tab
    */

src/app/qgsrasterlayerproperties.h

@@ -149,11 +149,9 @@ class QgsRasterLayerProperties : public QDialog, private Ui::QgsRasterLayerPrope
     void toggleBuildPyramidsButton();
 
   signals:
-
     /** emitted when changes to layer were saved to update legend */
     void refreshLegend( QString layerID, bool expandItem );
 
-
   private:
     /** \brief  A constant that signals property not used */
     const QString TRSTRING_NOT_SET;

src/core/qgsmaprenderer.cpp

@@ -191,9 +191,9 @@ void QgsMapRenderer::adjustExtentToSize()
     dymax = mExtent.yMaximum() + whitespace;
   }
 
-  QgsDebugMsg( QString( "Map units per pixel (x,y) : %1, %2\n" ).arg( mapUnitsPerPixelX, 0, 'f', 8 ).arg( mapUnitsPerPixelY, 0, 'f', 8 ) );
-  QgsDebugMsg( QString( "Pixmap dimensions (x,y) : %1, %2\n" ).arg( myWidth, 0, 'f', 8 ).arg( myHeight, 0, 'f', 8 ) );
-  QgsDebugMsg( QString( "Extent dimensions (x,y) : %1, %2\n" ).arg( mExtent.width(), 0, 'f', 8 ).arg( mExtent.height(), 0, 'f', 8 ) );
+  QgsDebugMsg( QString( "Map units per pixel (x,y) : %1, %2" ).arg( mapUnitsPerPixelX, 0, 'f', 8 ).arg( mapUnitsPerPixelY, 0, 'f', 8 ) );
+  QgsDebugMsg( QString( "Pixmap dimensions (x,y) : %1, %2" ).arg( myWidth, 0, 'f', 8 ).arg( myHeight, 0, 'f', 8 ) );
+  QgsDebugMsg( QString( "Extent dimensions (x,y) : %1, %2" ).arg( mExtent.width(), 0, 'f', 8 ).arg( mExtent.height(), 0, 'f', 8 ) );
   QgsDebugMsg( mExtent.toString() );
 
   // update extent

src/gui/qgsexpressionbuilderwidget.cpp

@@ -71,7 +71,7 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
   registerItem( "Operators", "NOT", " NOT " );
 
 
-  // Load the fuctions from the QgsExpression class
+  // Load the functions from the QgsExpression class
   int count = QgsExpression::functionCount();
   for ( int i = 0; i < count; i++ )
   {

src/providers/wms/qgswmssourceselect.cpp

@@ -1041,6 +1041,8 @@ void QgsWMSSourceSelect::on_btnSearch_clicked()
   // disable Add WMS button
   btnAddWMS->setEnabled( false );
 
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+
   QSettings settings;
   QString mySearchUrl = settings.value( "/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss" ).toString();
   QUrl url( mySearchUrl.arg( leSearchTerm->text() ) );
@@ -1052,6 +1054,8 @@ void QgsWMSSourceSelect::on_btnSearch_clicked()
 
 void QgsWMSSourceSelect::searchFinished()
 {
+  QApplication::restoreOverrideCursor();
+
   QNetworkReply *r = qobject_cast<QNetworkReply *>( sender() );
   if ( !r )
     return;

src/ui/qgslabelingguibase.ui

@@ -593,7 +593,7 @@
                 <item>
                  <widget class="QPushButton" name="btnEngineSettings">
                   <property name="enabled">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </property>
                   <property name="text">
                    <string>Engine settings</string>