src/app/composer/qgscomposer.cpp

@@ -473,6 +473,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mGeneralDock, mComposition );
   connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
   connect( this, SIGNAL( printAsRasterChanged( bool ) ), compositionWidget, SLOT( setPrintAsRasterCheckBox( bool ) ) );
+  connect( compositionWidget, SIGNAL( pageOrientationChanged( QString ) ), this, SLOT( setPrinterPageOrientation( QString ) ) );
   mGeneralDock->setWidget( compositionWidget );
 
   //undo widget
@@ -514,6 +515,9 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   connect( atlasMap, SIGNAL( toggled( bool ) ), this, SLOT( toggleAtlasControls( bool ) ) );
   connect( atlasMap, SIGNAL( coverageLayerChanged( QgsVectorLayer* ) ), this, SLOT( updateAtlasMapLayerAction( QgsVectorLayer * ) ) );
 
+  //default printer page setup
+  setPrinterPageDefaults();
+
   // Create size grip (needed by Mac OS X for QMainWindow if QStatusBar is not visible)
   //should not be needed now that composer has a status bar?
 #if 0
@@ -2599,6 +2603,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
   QgsCompositionWidget* compositionWidget = new QgsCompositionWidget( mGeneralDock, mComposition );
   QObject::connect( mComposition, SIGNAL( paperSizeChanged() ), compositionWidget, SLOT( displayCompositionWidthHeight() ) );
   QObject::connect( this, SIGNAL( printAsRasterChanged( bool ) ), compositionWidget, SLOT( setPrintAsRasterCheckBox( bool ) ) );
+  QObject::connect( compositionWidget, SIGNAL( pageOrientationChanged( QString ) ), this, SLOT( setPrinterPageOrientation( QString ) ) );
   mGeneralDock->setWidget( compositionWidget );
 
   //read and restore all the items
@@ -2672,6 +2677,9 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
   connect( atlasMap, SIGNAL( coverageLayerChanged( QgsVectorLayer* ) ), this, SLOT( updateAtlasMapLayerAction( QgsVectorLayer * ) ) );
   updateAtlasMapLayerAction( atlasMap->enabled() );
 
+  //default printer page setup
+  setPrinterPageDefaults();
+
   setSelectionTool();
 }
 
@@ -3137,6 +3145,34 @@ void QgsComposer::updateAtlasMapLayerAction( QgsVectorLayer *coverageLayer )
   }
 }
 
+void QgsComposer::setPrinterPageOrientation( QString orientation )
+{
+  if ( orientation == tr( "Landscape" ) )
+  {
+    mPrinter.setOrientation( QPrinter::Landscape );
+  }
+  else
+  {
+    mPrinter.setOrientation( QPrinter::Portrait );
+  }
+}
+
+void QgsComposer::setPrinterPageDefaults()
+{
+  double paperWidth = mComposition->paperWidth();
+  double paperHeight = mComposition->paperHeight();
+
+  //set printer page orientation
+  if ( paperWidth > paperHeight )
+  {
+    mPrinter.setOrientation( QPrinter::Landscape );
+  }
+  else
+  {
+    mPrinter.setOrientation( QPrinter::Portrait );
+  }
+}
+
 void QgsComposer::updateAtlasMapLayerAction( bool atlasEnabled )
 {
   if ( mAtlasFeatureAction )

src/app/composer/qgscomposer.h

@@ -479,6 +479,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Updates the "set as atlas feature" map layer action, removing it if atlas is disabled
     void updateAtlasMapLayerAction( bool atlasEnabled );
 
+    //! Set default settings for printer page settings based on composition paper size
+    void setPrinterPageDefaults();
+
     /**Composer title*/
     QString mTitle;
 
@@ -557,6 +560,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     QgsMapLayerAction* mAtlasFeatureAction;
 
+
   signals:
     void printAsRasterChanged( bool state );
 
@@ -592,6 +596,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     //! Updates the "set as atlas feature" map layer action when atlas coverage layer changes
     void updateAtlasMapLayerAction( QgsVectorLayer* coverageLayer );
+
+    //! Sets the printer page orientation when the page orientation changes
+    void setPrinterPageOrientation( QString orientation );
+
 };
 
 #endif

src/app/composer/qgscomposeritemwidget.cpp

@@ -335,7 +335,6 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mFrameGroupBox->blockSignals( true );
   mBackgroundGroupBox->blockSignals( true );
   mItemIdLineEdit->blockSignals( true );
-  mItemUuidLineEdit->blockSignals( true );
   mBlendModeCombo->blockSignals( true );
   mTransparencySlider->blockSignals( true );
   mTransparencySpnBx->blockSignals( true );
@@ -351,7 +350,6 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mFrameColorButton->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
   mOutlineWidthSpinBox->setValue( mItem->pen().widthF() );
   mItemIdLineEdit->setText( mItem->id() );
-  mItemUuidLineEdit->setText( mItem->uuid() );
   mFrameGroupBox->setChecked( mItem->hasFrame() );
   mBackgroundGroupBox->setChecked( mItem->hasBackground() );
   mBlendModeCombo->setBlendMode( mItem->blendMode() );
@@ -365,7 +363,6 @@ void QgsComposerItemWidget::setValuesForGuiElements()
   mFrameGroupBox->blockSignals( false );
   mBackgroundGroupBox->blockSignals( false );
   mItemIdLineEdit->blockSignals( false );
-  mItemUuidLineEdit->blockSignals( false );
   mBlendModeCombo->blockSignals( false );
   mTransparencySlider->blockSignals( false );
   mTransparencySpnBx->blockSignals( false );

src/app/composer/qgscompositionwidget.cpp

@@ -243,8 +243,11 @@ void QgsCompositionWidget::adjustOrientation()
     setSize( mPaperWidthDoubleSpinBox, height );
     setSize( mPaperHeightDoubleSpinBox, width );
   }
+
   mPaperWidthDoubleSpinBox->setEnabled( lineEditsEnabled );
   mPaperHeightDoubleSpinBox->setEnabled( lineEditsEnabled );
+
+  emit pageOrientationChanged( mPaperOrientationComboBox->currentText() );
 }
 
 void QgsCompositionWidget::setSize( QDoubleSpinBox *spin, double v )

src/app/composer/qgscompositionwidget.h

@@ -65,6 +65,10 @@ class QgsCompositionWidget: public QWidget, private Ui::QgsCompositionWidgetBase
     /**Sets Print as raster checkbox value*/
     void setPrintAsRasterCheckBox( bool state );
 
+  signals:
+    /**Is emitted when page orientation changes*/
+    void pageOrientationChanged( QString orientation );
+
   private slots:
     /* when a new map is added */
     void onComposerMapAdded( QgsComposerMap* );

src/gui/qgisgui.cpp

@@ -166,7 +166,7 @@ namespace QgisGui
 #endif
 
     // Add the file type suffix to the fileName if required
-    if ( !ext.isNull() && !outputFileName.endsWith( "." + ext ) )
+    if ( !ext.isNull() && !outputFileName.toLower().endsWith( "." + ext.toLower() ) )
     {
       outputFileName += "." + ext;
     }

src/ui/qgscomposeritemwidgetbase.ui

@@ -342,30 +342,16 @@
       <property name="labelAlignment">
        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
       </property>
-      <item row="1" column="0">
-       <widget class="QLabel" name="mItemUuidLabel">
-        <property name="text">
-         <string>Uuid (read-only)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="mItemUuidLineEdit">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="mItemIdLineEdit"/>
-      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="mItemIdLabel">
         <property name="text">
          <string>Id</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="mItemIdLineEdit"/>
+      </item>
      </layout>
     </widget>
    </item>