qgis · Nov 13, 2012
diff --git a/‎src/app/composer/qgscomposerlegendwidget.cpp
Lines changed: 14 additions & 1 deletion b/‎src/app/composer/qgscomposerlegendwidget.cpp
Lines changed: 14 additions & 1 deletion
diff --git a/‎src/app/composer/qgscomposerlegendwidget.h
Lines changed: 1 addition & 0 deletions b/‎src/app/composer/qgscomposerlegendwidget.h
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/core/composer/qgscomposeritemcommand.h
Lines changed: 1 addition & 0 deletions b/‎src/core/composer/qgscomposeritemcommand.h
Lines changed: 1 addition & 0 deletions
@@ -87,6 +87,7 @@ void QgsComposerLegendWidget::setGuiElements()
 
   blockAllSignals( true );
   mTitleLineEdit->setText( mLegend->title() );
+  mColumnCountSpinBox->setValue( mLegend->columnCount() );
   mSymbolWidthSpinBox->setValue( mLegend->symbolWidth() );
   mSymbolHeightSpinBox->setValue( mLegend->symbolHeight() );
   mGroupSpaceSpinBox->setValue( mLegend->groupSpace() );
@@ -109,7 +110,6 @@ void QgsComposerLegendWidget::setGuiElements()
   {
     mMapComboBox->setCurrentIndex( mMapComboBox->findData( -1 ) );
   }
-
   blockAllSignals( false );
 }
 
@@ -137,6 +137,18 @@ void QgsComposerLegendWidget::on_mTitleLineEdit_textChanged( const QString& text
   }
 }
 
+void QgsComposerLegendWidget::on_mColumnCountSpinBox_valueChanged( int c )
+{
+  if ( mLegend )
+  {
+    mLegend->beginCommand( tr( "Legend column count" ), QgsComposerMergeCommand::LegendColumnCount );
+    mLegend->setColumnCount( c );
+    mLegend->adjustBoxSize();
+    mLegend->update();
+    mLegend->endCommand();
+  }
+}
+
 void QgsComposerLegendWidget::on_mSymbolWidthSpinBox_valueChanged( double d )
 {
   if ( mLegend )
@@ -718,6 +730,7 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mItemTreeView->blockSignals( b );
   mCheckBoxAutoUpdate->blockSignals( b );
   mMapComboBox->blockSignals( b );
+  mColumnCountSpinBox->blockSignals( b );
   mSymbolWidthSpinBox->blockSignals( b );
   mSymbolHeightSpinBox->blockSignals( b );
   mGroupSpaceSpinBox->blockSignals( b );
 
@@ -41,6 +41,7 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
 
     void on_mWrapCharLineEdit_textChanged( const QString& text );
     void on_mTitleLineEdit_textChanged( const QString& text );
+    void on_mColumnCountSpinBox_valueChanged( int c );
     void on_mSymbolWidthSpinBox_valueChanged( double d );
     void on_mSymbolHeightSpinBox_valueChanged( double d );
     void on_mGroupSpaceSpinBox_valueChanged( double d );
 
@@ -80,6 +80,7 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
       ComposerMapAnnotationDistance,
       //composer legend
       ComposerLegendText,
+      LegendColumnCount,
       LegendSymbolWidth,
       LegendSymbolHeight,
       LegendGroupSpace,