move the iconsize setting into the qgis group, part 2

nirvn · nirvn · commit fa120b5309a6 · 2018-01-16T13:22:29.000+07:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -137,7 +137,7 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
     initializeRegistry();
   }
   QgsSettings settings;
-  int size = settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ).toInt();
+  int size = settings.value( QStringLiteral( "/qgis/iconSize" ), QGIS_ICON_SIZE ).toInt();
   setIconSize( QSize( size, size ) );
   setStyleSheet( QgisApp::instance()->styleSheet() );
 
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1094,9 +1094,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   }
 
   // Set icon size of toolbars
-  if ( settings.contains( QStringLiteral( "IconSize" ) ) )
+  if ( settings.contains( QStringLiteral( "/qgis/iconSize" ) ) )
   {
-    int size = settings.value( QStringLiteral( "IconSize" ) ).toInt();
+    int size = settings.value( QStringLiteral( "/qgis/iconSize" ) ).toInt();
     if ( size < 16 )
       size = QGIS_ICON_SIZE;
     setIconSizes( size );
@@ -1105,7 +1105,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   {
     // first run, guess a good icon size
     int size = chooseReasonableDefaultIconSize();
-    settings.setValue( QStringLiteral( "IconSize" ), size );
+    settings.setValue( QStringLiteral( "/qgis/iconSize" ), size );
     setIconSizes( size );
   }
 
@@ -9967,7 +9967,7 @@ QgsMapLayer *QgisApp::activeLayer()
 QSize QgisApp::iconSize( bool dockedToolbar ) const
 {
   QgsSettings s;
-  int size = s.value( QStringLiteral( "/IconSize" ), 32 ).toInt();
+  int size = s.value( QStringLiteral( "/qgis/iconSize" ), 32 ).toInt();
 
   if ( dockedToolbar )
   {
diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp
@@ -84,7 +84,7 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()
 
   settings.endGroup(); // "qgis/stylesheet"
 
-  opts.insert( QStringLiteral( "iconSize" ), settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ) );
+  opts.insert( QStringLiteral( "iconSize" ), settings.value( QStringLiteral( "/qgis/iconSize" ), QGIS_ICON_SIZE ) );
 
   return opts;
 }
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -123,7 +123,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr
 
   QgsSettings settings;
 
-  int size = settings.value( QStringLiteral( "IconSize" ), 16 ).toInt();
+  int size = settings.value( QStringLiteral( "/qgis/iconSize" ), 16 ).toInt();
   if ( size > 32 )
   {
     size -= 16;
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -335,7 +335,7 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
   else
     QgisApp::instance()->panelMenu()->addAction( mDock->toggleViewAction() );
 
-  int size = mySettings.value( QStringLiteral( "IconSize" ), 16 ).toInt();
+  int size = mySettings.value( QStringLiteral( "/qgis/iconSize" ), 16 ).toInt();
   if ( size > 32 )
   {
     size -= 16;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla`
`137`	`137`	`initializeRegistry();`
`138`	`138`	`}`
`139`	`139`	`QgsSettings settings;`
`140`		`- int size = settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ).toInt();`
	`140`	`+ int size = settings.value( QStringLiteral( "/qgis/iconSize" ), QGIS_ICON_SIZE ).toInt();`
`141`	`141`	`setIconSize( QSize( size, size ) );`
`142`	`142`	`setStyleSheet( QgisApp::instance()->styleSheet() );`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -1094,9 +1094,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`	`1096`	`// Set icon size of toolbars`
`1097`		`- if ( settings.contains( QStringLiteral( "IconSize" ) ) )`
	`1097`	`+ if ( settings.contains( QStringLiteral( "/qgis/iconSize" ) ) )`
`1098`	`1098`	`{`
`1099`		`- int size = settings.value( QStringLiteral( "IconSize" ) ).toInt();`
	`1099`	`+ int size = settings.value( QStringLiteral( "/qgis/iconSize" ) ).toInt();`
`1100`	`1100`	`if ( size < 16 )`
`1101`	`1101`	`size = QGIS_ICON_SIZE;`
`1102`	`1102`	`setIconSizes( size );`
`@@ -1105,7 +1105,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh`
`1105`	`1105`	`{`
`1106`	`1106`	`// first run, guess a good icon size`
`1107`	`1107`	`int size = chooseReasonableDefaultIconSize();`
`1108`		`- settings.setValue( QStringLiteral( "IconSize" ), size );`
	`1108`	`+ settings.setValue( QStringLiteral( "/qgis/iconSize" ), size );`
`1109`	`1109`	`setIconSizes( size );`
`1110`	`1110`	`}`
`1111`	`1111`
`@@ -9967,7 +9967,7 @@ QgsMapLayer *QgisApp::activeLayer()`
`9967`	`9967`	`QSize QgisApp::iconSize( bool dockedToolbar ) const`
`9968`	`9968`	`{`
`9969`	`9969`	`QgsSettings s;`
`9970`		`- int size = s.value( QStringLiteral( "/IconSize" ), 32 ).toInt();`
	`9970`	`+ int size = s.value( QStringLiteral( "/qgis/iconSize" ), 32 ).toInt();`
`9971`	`9971`
`9972`	`9972`	`if ( dockedToolbar )`
`9973`	`9973`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()`
`84`	`84`
`85`	`85`	`settings.endGroup(); // "qgis/stylesheet"`
`86`	`86`
`87`		`- opts.insert( QStringLiteral( "iconSize" ), settings.value( QStringLiteral( "IconSize" ), QGIS_ICON_SIZE ) );`
	`87`	`+ opts.insert( QStringLiteral( "iconSize" ), settings.value( QStringLiteral( "/qgis/iconSize" ), QGIS_ICON_SIZE ) );`
`88`	`88`
`89`	`89`	`return opts;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr`
`123`	`123`
`124`	`124`	`QgsSettings settings;`
`125`	`125`
`126`		`- int size = settings.value( QStringLiteral( "IconSize" ), 16 ).toInt();`
	`126`	`+ int size = settings.value( QStringLiteral( "/qgis/iconSize" ), 16 ).toInt();`
`127`	`127`	`if ( size > 32 )`
`128`	`128`	`{`
`129`	`129`	`size -= 16;`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge`
`335`	`335`	`else`
`336`	`336`	`QgisApp::instance()->panelMenu()->addAction( mDock->toggleViewAction() );`
`337`	`337`
`338`		`- int size = mySettings.value( QStringLiteral( "IconSize" ), 16 ).toInt();`
	`338`	`+ int size = mySettings.value( QStringLiteral( "/qgis/iconSize" ), 16 ).toInt();`
`339`	`339`	`if ( size > 32 )`
`340`	`340`	`{`
`341`	`341`	`size -= 16;`