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

volaya · volaya · commit d97d4a6596a2 · 2012-11-06T08:49:29.000+01:00
diff --git a/python/plugins/sextante/CMakeLists.txt b/python/plugins/sextante/CMakeLists.txt
@@ -18,6 +18,7 @@ ADD_SUBDIRECTORY(pymorph)
 ADD_SUBDIRECTORY(r)
 ADD_SUBDIRECTORY(saga)
 ADD_SUBDIRECTORY(script)
+ADD_SUBDIRECTORY(servertools)
 ADD_SUBDIRECTORY(taudem)
 #ADD_SUBDIRECTORY(tests)
 
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -267,6 +267,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mPanelMenu->addAction( mUndoDock->toggleViewAction() );
   mAtlasDock = new QDockWidget( tr( "Atlas generation" ), this );
   mAtlasDock->setObjectName( "AtlasDock" );
+  mPanelMenu->addAction( mAtlasDock->toggleViewAction() );
 
   mGeneralDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
   mItemDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -2158,6 +2158,8 @@ void QgsLegend::removePixmapHeightValue( int height )
 
 void QgsLegend::handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint )
 {
+  Q_UNUSED( editor );
+  Q_UNUSED( hint );
   QgsLegendItem *item = dynamic_cast<QgsLegendItem *>( currentItem() );
   if ( item )
   {
diff --git a/src/app/qgspluginmanager.cpp b/src/app/qgspluginmanager.cpp
@@ -211,8 +211,10 @@ void QgsPluginManager::getPythonPluginDescriptions()
     myData.setRenderAsWidget( false );
     myData.setChecked( false ); //start off assuming false
 
-    if ( iconName == "__error__" or iconName.isEmpty() )
+    if ( iconName == "__error__" || iconName.isEmpty() )
+    {
       myData.setIcon( QPixmap( QgsApplication::defaultThemePath() + "/plugin.png" ) );
+    }
     else
     {
       bool relative = QFileInfo( iconName ).isRelative();
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -44,7 +44,7 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
 
   mCloseBtn = new QToolButton( this );
   mCloseBtn->setToolTip( tr( "Close" ) );
-  mCloseBtn->setStyleSheet( "background-color: rgba(255, 255, 255, 0);" );
+  mCloseBtn->setStyleSheet( "QToolButton {background-color: rgba(255, 255, 255, 0);}" );
   mCloseBtn->setCursor( Qt::PointingHandCursor );
   mCloseBtn->setIcon( QgsApplication::getThemeIcon( "/mIconClose.png" ) );
   connect( mCloseBtn, SIGNAL( clicked() ), this, SLOT( popWidget() ) );

Original file line number	Diff line number	Diff line change
`@@ -2158,6 +2158,8 @@ void QgsLegend::removePixmapHeightValue( int height )`
`2158`	`2158`
`2159`	`2159`	`void QgsLegend::handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint )`
`2160`	`2160`	`{`
	`2161`	`+ Q_UNUSED( editor );`
	`2162`	`+ Q_UNUSED( hint );`
`2161`	`2163`	`QgsLegendItem item = dynamic_cast<QgsLegendItem >( currentItem() );`
`2162`	`2164`	`if ( item )`
`2163`	`2165`	`{`