[QGIS Commit] r15204 - in trunk/qgis/src/app: . composer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Feb 18 21:33:57 EST 2011
Author: gsherman
Date: 2011-02-18 18:33:57 -0800 (Fri, 18 Feb 2011)
New Revision: 15204
Modified:
trunk/qgis/src/app/composer/qgscomposer.cpp
trunk/qgis/src/app/composer/qgscomposer.h
trunk/qgis/src/app/qgisapp.cpp
Log:
Fixed composer icon sizes
Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp 2011-02-18 19:23:27 UTC (rev 15203)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp 2011-02-19 02:33:57 UTC (rev 15204)
@@ -78,6 +78,10 @@
setupTheme();
QObject::connect( mButtonBox, SIGNAL( rejected() ), this, SLOT( close() ) );
+ QSettings settings;
+ int size = settings.value( "/IconSize", 24 ).toInt();
+ setIconSize(QSize(size,size));
+
QToolButton* orderingToolButton = new QToolButton( this );
orderingToolButton->setPopupMode( QToolButton::InstantPopup );
orderingToolButton->setAutoRaise( true );
@@ -296,6 +300,19 @@
mActionAlignBottom->setIcon( QgisApp::getThemeIcon( "/mActionAlignBottom.png" ) );
}
+void QgsComposer::setIconSizes( int size )
+{
+ //Set the icon size of for all the toolbars created in the future.
+ setIconSize(QSize(size,size));
+
+ //Change all current icon sizes.
+ QList<QToolBar *> toolbars = findChildren<QToolBar *>();
+ foreach(QToolBar * toolbar, toolbars)
+ {
+ toolbar->setIconSize(QSize(size,size));
+ }
+}
+
void QgsComposer::connectSlots()
{
connect( mView, SIGNAL( selectedItemChanged( QgsComposerItem* ) ), this, SLOT( showItemOptions( QgsComposerItem* ) ) );
Modified: trunk/qgis/src/app/composer/qgscomposer.h
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.h 2011-02-18 19:23:27 UTC (rev 15203)
+++ trunk/qgis/src/app/composer/qgscomposer.h 2011-02-19 02:33:57 UTC (rev 15204)
@@ -58,6 +58,8 @@
//! Set the pixmap / icons on the toolbar buttons
void setupTheme();
+ void setIconSizes( int size );
+
//! Open and show, set defaults if first time
void open();
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2011-02-18 19:23:27 UTC (rev 15203)
+++ trunk/qgis/src/app/qgisapp.cpp 2011-02-19 02:33:57 UTC (rev 15204)
@@ -420,7 +420,6 @@
mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas );
mUndoWidget->setObjectName( "Undo" );
- //Set the icon size for all the toolbars.
createActions();
createActionGroups();
createMenus();
@@ -2050,12 +2049,18 @@
//Set the icon size of for all the toolbars created in the future.
setIconSize( QSize( size, size ) );
- //Change all current icon sizes.
- QList<QToolBar *> toolbars = findChildren<QToolBar *>();
- foreach( QToolBar * toolbar, toolbars )
- {
- toolbar->setIconSize( QSize( size, size ) );
- }
+ //Change all current icon sizes.
+ QList<QToolBar *> toolbars = findChildren<QToolBar *>();
+ foreach( QToolBar * toolbar, toolbars )
+ {
+ toolbar->setIconSize( QSize( size, size ) );
+ }
+
+ QSet<QgsComposer*>::iterator composerIt = mPrintComposers.begin();
+ for ( ; composerIt != mPrintComposers.end(); ++composerIt )
+ {
+ ( *composerIt )->setIconSizes(size);
+ }
}
void QgisApp::setTheme( QString theThemeName )
More information about the QGIS-commit
mailing list