Don't copy default themes to user folder

NathanW2 · NathanW2 · commit 08d27630ea99 · 2017-12-19T10:53:15.000+10:00
It's just wasting space in the profile folder, and now with profiles you
will get extra copies which you don't need.  Also makes it hard for us
to update "core" themes if they are in the users profile folder.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -432,7 +432,17 @@ QString QgsApplication::defaultThemePath()
 }
 QString QgsApplication::activeThemePath()
 {
-  return userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";
+  QString usersThemes = userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";
+  QDir dir( usersThemes );
+  if ( dir.exists() )
+  {
+    return usersThemes;
+  }
+  else
+  {
+    QString defaultThemes = defaultThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";
+    return defaultThemes;
+  }
 }
 
 QString QgsApplication::appIconPath()
@@ -630,7 +640,7 @@ void QgsApplication::setUITheme( const QString &themeName )
 
 QHash<QString, QString> QgsApplication::uiThemes()
 {
-  QStringList paths = QStringList() << userThemesFolder();
+  QStringList paths = QStringList() << userThemesFolder() << defaultThemesFolder();
   QHash<QString, QString> mapping;
   mapping.insert( QStringLiteral( "default" ), QLatin1String( "" ) );
   Q_FOREACH ( const QString &path, paths )
@@ -1298,7 +1308,6 @@ bool QgsApplication::createThemeFolder()
     myDir.mkpath( folder );
   }
 
-  copyPath( defaultThemesFolder(), userThemesFolder() );
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,17 @@ QString QgsApplication::defaultThemePath()`
`432`	`432`	`}`
`433`	`433`	`QString QgsApplication::activeThemePath()`
`434`	`434`	`{`
`435`		`- return userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";`
	`435`	`+ QString usersThemes = userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";`
	`436`	`+ QDir dir( usersThemes );`
	`437`	`+ if ( dir.exists() )`
	`438`	`+ {`
	`439`	`+ return usersThemes;`
	`440`	`+ }`
	`441`	`+ else`
	`442`	`+ {`
	`443`	`+ QString defaultThemes = defaultThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";`
	`444`	`+ return defaultThemes;`
	`445`	`+ }`
`436`	`446`	`}`
`437`	`447`
`438`	`448`	`QString QgsApplication::appIconPath()`
`@@ -630,7 +640,7 @@ void QgsApplication::setUITheme( const QString &themeName )`
`630`	`640`
`631`	`641`	`QHash<QString, QString> QgsApplication::uiThemes()`
`632`	`642`	`{`
`633`		`- QStringList paths = QStringList() << userThemesFolder();`
	`643`	`+ QStringList paths = QStringList() << userThemesFolder() << defaultThemesFolder();`
`634`	`644`	`QHash<QString, QString> mapping;`
`635`	`645`	`mapping.insert( QStringLiteral( "default" ), QLatin1String( "" ) );`
`636`	`646`	`Q_FOREACH ( const QString &path, paths )`
`@@ -1298,7 +1308,6 @@ bool QgsApplication::createThemeFolder()`
`1298`	`1308`	`myDir.mkpath( folder );`
`1299`	`1309`	`}`
`1300`	`1310`
`1301`		`- copyPath( defaultThemesFolder(), userThemesFolder() );`
`1302`	`1311`	`return true;`
`1303`	`1312`	`}`
`1304`	`1313`