Skip to content

Commit c8248ff

Browse files
author
timlinux
committed
Predifine icon size as a var instead of redecllaring each time
git-svn-id: http://svn.osgeo.org/qgis/trunk@7957 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 51410b5 commit c8248ff

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/app/qgisapp.cpp

+9-7
Original file line numberDiff line numberDiff line change
@@ -951,14 +951,16 @@ void QgisApp::createMenus()
951951

952952
void QgisApp::createToolBars()
953953
{
954+
QSize myIconSize ( 24,24 );
955+
//QSize myIconSize ( 32,32 ); //large icons
954956
// Note: we need to set each object name to ensure that
955957
// qmainwindow::saveState and qmainwindow::restoreState
956958
// work properly
957959

958960
//
959961
// File Toolbar
960962
mFileToolBar = addToolBar(tr("File"));
961-
mFileToolBar->setIconSize(QSize(24,24));
963+
mFileToolBar->setIconSize(myIconSize);
962964
mFileToolBar->setObjectName("FileToolBar");
963965
mFileToolBar->addAction(mActionFileNew);
964966
mFileToolBar->addAction(mActionFileNew);
@@ -969,7 +971,7 @@ void QgisApp::createToolBars()
969971
//
970972
// Layer Toolbar
971973
mLayerToolBar = addToolBar(tr("Manage Layers"));
972-
mLayerToolBar->setIconSize(QSize(24,24));
974+
mLayerToolBar->setIconSize(myIconSize);
973975
mLayerToolBar->setObjectName("LayerToolBar");
974976
mLayerToolBar->addAction(mActionAddNonDbLayer);
975977
mLayerToolBar->addAction(mActionAddRasterLayer);
@@ -987,14 +989,14 @@ void QgisApp::createToolBars()
987989
//
988990
// Help Toolbar
989991
mHelpToolBar = addToolBar(tr("Help"));
990-
mHelpToolBar->setIconSize(QSize(24,24));
992+
mHelpToolBar->setIconSize(myIconSize);
991993
mHelpToolBar->setObjectName("Help");
992994
mHelpToolBar->addAction(mActionHelpContents);
993995
mHelpToolBar->addAction(QWhatsThis::createAction());
994996
//
995997
// Digitizing Toolbar
996998
mDigitizeToolBar = addToolBar(tr("Digitizing"));
997-
mDigitizeToolBar->setIconSize(QSize(24,24));
999+
mDigitizeToolBar->setIconSize(myIconSize);
9981000
mDigitizeToolBar->setObjectName("Digitizing");
9991001
mDigitizeToolBar->addAction(mActionToggleEditing);
10001002
mDigitizeToolBar->addAction(mActionCapturePoint);
@@ -1014,7 +1016,7 @@ void QgisApp::createToolBars()
10141016
//
10151017
// Map Navigation Toolbar
10161018
mMapNavToolBar = addToolBar(tr("Map Navigation"));
1017-
mMapNavToolBar->setIconSize(QSize(24,24));
1019+
mMapNavToolBar->setIconSize(myIconSize);
10181020
mMapNavToolBar->setObjectName("Map Navigation");
10191021
mMapNavToolBar->addAction(mActionPan);
10201022
mMapNavToolBar->addAction(mActionZoomIn);
@@ -1027,7 +1029,7 @@ void QgisApp::createToolBars()
10271029
//
10281030
// Attributes Toolbar
10291031
mAttributesToolBar = addToolBar(tr("Attributes"));
1030-
mAttributesToolBar->setIconSize(QSize(24,24));
1032+
mAttributesToolBar->setIconSize(myIconSize);
10311033
mAttributesToolBar->setObjectName("Attributes");
10321034
mAttributesToolBar->addAction(mActionIdentify);
10331035
mAttributesToolBar->addAction(mActionSelect);
@@ -1039,7 +1041,7 @@ void QgisApp::createToolBars()
10391041
//
10401042
// Plugins Toolbar
10411043
mPluginToolBar = addToolBar(tr("Plugins"));
1042-
mPluginToolBar->setIconSize(QSize(24,24));
1044+
mPluginToolBar->setIconSize(myIconSize);
10431045
mPluginToolBar->setObjectName("Plugins");
10441046

10451047
//Add the menu for toolbar visibility here

0 commit comments

Comments
 (0)