update .qgis to .qgis2 (to be updated on release and some more utf8 fixes

jef-n · jef-n · commit dbe0c9e9ec7d · 2013-04-07T23:14:37.000+02:00
(fixes #7537)
diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -30,9 +30,11 @@
 import os
 import code
 
+from qgis.core import QgsApplication
+
 _init_commands = ["from qgis.core import *", "import qgis.utils",
                   "from qgis.utils import iface"]
-_historyFile = os.path.join(str(QDir.homePath()),".qgis","console_history.txt")
+_historyFile = unicode( QgsApplication.qgisSettingsDirPath() + "console_history.txt" )
 
 class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
     def __init__(self, parent=None):
@@ -144,8 +146,6 @@ def commandConsole(self, command):
         self.setFocus()
 
     def setLexers(self):
-        from qgis.core import QgsApplication
-
         self.lexer = QsciLexerPython()
         settings = QSettings()
         loadFont = settings.value("pythonConsole/fontfamilytext", "Monospace").toString()
diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py
@@ -39,7 +39,7 @@
   # if the plugin is shipped with QGis catch the exception and
   # display an error message
   import os.path
-  qgisUserPluginPath = os.path.abspath( os.path.join( str( QgsApplication.qgisSettingsDirPath() ), "python") )
+  qgisUserPluginPath = os.path.abspath( os.path.join( unicode( QgsApplication.qgisSettingsDirPath() ), "python") )
   if not os.path.dirname(__file__).startswith( qgisUserPluginPath ):
     title = QCoreApplication.translate( "GdalTools", "Plugin error" )
     message = QCoreApplication.translate( "GdalTools", u'Unable to load %1 plugin. \nThe required "%2" module is missing. \nInstall it and try again.' )
diff --git a/python/plugins/sextante/otb/helper/generate_application_descriptors.py b/python/plugins/sextante/otb/helper/generate_application_descriptors.py
@@ -27,8 +27,9 @@
 
 import os, sys
 import otbApplication
+from qgis.core import QgsApplication
 
-outputpath= os.path.join( os.environ["HOME"], ".qgis/python/plugins/sextante/otb/description" )
+outputpath = unicode( QgsApplication.qgisSettingsDirPath() + "python/plugins/sextante/otb/description" )
 endl = os.linesep
 
 def convertendl(s):
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -276,7 +276,7 @@ int main( int argc, char *argv[] )
 #if defined(ANDROID)
   QgsDebugMsg( QString( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );
   //put all QGIS settings in the same place
-  configpath = QDir::homePath() + QString( "/.qgis/" );
+  configpath = QgsApplication::qgisSettingsPath();
   QgsDebugMsg( QString( "Android: configpath set to %1" ).arg( configpath ) );
 #elif defined(Q_WS_WIN)
   for ( int i = 1; i < argc; i++ )
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -84,7 +84,7 @@ void QgsApplication::init( QString customConfigPath )
 {
   if ( customConfigPath.isEmpty() )
   {
-    customConfigPath = QDir::homePath() + QString( "/.qgis2/" );
+    customConfigPath = QDir::homePath() + QString( "/.qgis%1/" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ );
   }
 
   qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -451,9 +451,9 @@ QString QgsPythonUtilsImpl::pluginsPath()
 QString QgsPythonUtilsImpl::homePythonPath()
 {
   QString settingsDir = QgsApplication::qgisSettingsDirPath();
-  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + "/.qgis" )
+  if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ ) )
   {
-    return "os.path.expanduser(\"~/.qgis/python\")";
+    return QString( "os.path.expanduser(\"~/.qgis%1/python\")" ).arg( 2 /* FIXME: QGis::QGIS_VERSION_INT / 10000 */ );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void QgsApplication::init( QString customConfigPath )`
`84`	`84`	`{`
`85`	`85`	`if ( customConfigPath.isEmpty() )`
`86`	`86`	`{`
`87`		`- customConfigPath = QDir::homePath() + QString( "/.qgis2/" );`
	`87`	`+ customConfigPath = QDir::homePath() + QString( "/.qgis%1/" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ );`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );`
Original file line number	Diff line number	Diff line change
`@@ -451,9 +451,9 @@ QString QgsPythonUtilsImpl::pluginsPath()`
`451`	`451`	`QString QgsPythonUtilsImpl::homePythonPath()`
`452`	`452`	`{`
`453`	`453`	`QString settingsDir = QgsApplication::qgisSettingsDirPath();`
`454`		`- if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + "/.qgis" )`
	`454`	`+ if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( 2 /* FIXME QGis::QGIS_VERSION_INT / 10000 */ ) )`
`455`	`455`	`{`
`456`		`- return "os.path.expanduser(\"~/.qgis/python\")";`
	`456`	`+ return QString( "os.path.expanduser(\"~/.qgis%1/python\")" ).arg( 2 /* FIXME: QGis::QGIS_VERSION_INT / 10000 */ );`
`457`	`457`	`}`
`458`	`458`	`else`
`459`	`459`	`{`