handle composer window differently (partly reverts a30eb37)

qgis · Jan 26, 2012 · e39e766 · e39e766
1 parent 6afdd35
commit e39e766
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -69,12 +69,21 @@
 #include <QPaintEngine>
 
 
-QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow( qgis ), mTitle( title ), mUndoView( 0 )
+QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
+    : QMainWindow()
+    , mTitle( title )
+    , mUndoView( 0 )
 {
   setupUi( this );
   setWindowTitle( mTitle );
   setupTheme();
-  QObject::connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
+  connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
+
+  QSettings settings;
+  int size = settings.value( "/IconSize", QGIS_ICON_SIZE ).toInt();
+  setIconSize( QSize( size, size ) );
+
+  setFontSize( settings.value( "/fontPointSize", QGIS_DEFAULT_FONTSIZE ).toInt() );
 
   QToolButton* orderingToolButton = new QToolButton( this );
   orderingToolButton->setPopupMode( QToolButton::InstantPopup );
@@ -309,6 +318,11 @@ void QgsComposer::setIconSizes( int size )
   }
 }
 
+void QgsComposer::setFontSize( int fontSize )
+{
+  setStyleSheet( QString( "font-size: %1pt; " ).arg( fontSize ) );
+}
+
 void QgsComposer::connectSlots()
 {
   connect( mView, SIGNAL( selectedItemChanged( QgsComposerItem* ) ), this, SLOT( showItemOptions( QgsComposerItem* ) ) );

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -57,6 +57,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     void setupTheme();
 
     void setIconSizes( int size );
+    void setFontSize( int size );
 
     //! Open and show, set defaults if first time
     void open();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1026,6 +1026,11 @@ void QgisApp::createActionGroups()
 void QgisApp::setFontSize( int fontSize )
 {
   setStyleSheet( QString( "font-size: %1pt; " ).arg( fontSize ) );
+
+  foreach( QgsComposer *c, mPrintComposers )
+  {
+    c->setFontSize( fontSize );
+  }
 }
 
 void QgisApp::createMenus()
@@ -1403,10 +1408,9 @@ void QgisApp::setIconSizes( int size )
     toolbar->setIconSize( QSize( size, size ) );
   }
 
-  QSet<QgsComposer*>::iterator composerIt = mPrintComposers.begin();
-  for ( ; composerIt != mPrintComposers.end(); ++composerIt )
+  foreach( QgsComposer *c, mPrintComposers )
   {
-    ( *composerIt )->setIconSizes( size );
+    c->setIconSizes( size );
   }
 }