Skip to content
Permalink
Browse files

update configuration settings to qgis3

  • Loading branch information
jef-n committed Oct 6, 2016
1 parent c6436f8 commit d9349e5bbb8cbdc5f6785fb3f2872c6629f2e90a
File renamed without changes.
@@ -7,7 +7,7 @@
<key>CFBundleName</key>
<string>QGIS</string>
<key>CFBundleIdentifier</key>
<string>org.qgis.qgis2</string>
<string>org.qgis.qgis3</string>
<key>CFBundleExecutable</key>
<string>${QGIS_APP_NAME}</string>
<key>CFBundlePackageType</key>
@@ -7,7 +7,7 @@
<key>CFBundleName</key>
<string>QGIS Browser</string>
<key>CFBundleIdentifier</key>
<string>org.qgis.qgis2_browser</string>
<string>org.qgis.qgis3_browser</string>
<key>CFBundleExecutable</key>
<string>QGIS Browser</string>
<key>CFBundlePackageType</key>
@@ -7,22 +7,22 @@
# Please don't remove this header. #
################################################################################

WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "coordinatecaptureplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "diagramoverlay" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "dxf2shpconverterplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "evis" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "georefplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "globeplugin" "false"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "gpsimporterplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "grassplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "heatmapplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "interpolationplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "offlineeditingplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "oracleplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "rasterterrainplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "roadgraphplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "spatialqueryplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "topolplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\Plugins" "zonalstatisticsplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "coordinatecaptureplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "diagramoverlay" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "dxf2shpconverterplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "evis" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "georefplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "globeplugin" "false"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "gpsimporterplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "grassplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "heatmapplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "interpolationplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "offlineeditingplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "oracleplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "rasterterrainplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "roadgraphplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "spatialqueryplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "topolplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "zonalstatisticsplugin" "true"

############################### reg2nsis end #################################
@@ -7,8 +7,8 @@
# Please don't remove this header. #
################################################################################

WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\PythonPlugins" "GdalTools" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\PythonPlugins" "db_manager" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS2\PythonPlugins" "processing" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\PythonPlugins" "GdalTools" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\PythonPlugins" "db_manager" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\PythonPlugins" "processing" "true"

############################### reg2nsis end #################################
@@ -44,7 +44,7 @@ class QgsAuthManager : QObject
/** Standard message for when QCA's qca-ossl plugin is missing and system is disabled */
const QString disabledMessage() const;

/** The standard authentication database file in ~/.qgis2/ or defined location
/** The standard authentication database file in ~/.qgis3/ or defined location
* @see QgsApplication::qgisAuthDbFilePath
*/
const QString authenticationDbPath() const;
@@ -124,7 +124,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
static void setUITheme( const QString &themeName );

/**
* @brief All themes found in ~/.qgis2/themes folder.
* @brief All themes found in ~/.qgis3/themes folder.
* The path is to the root folder for the theme
* @note Valid theme folders must contain a style.qss file.
* @return A hash of theme name and theme path. Valid theme folders contain style.qss
@@ -49,7 +49,7 @@
home=BASEDIR,
plugin=path(BASEDIR),
ui=path(BASEDIR) / 'plugin' / PLUGIN_NAME / 'ui',
install=path('%s/.qgis2/python/plugins/MetaSearch' % USERDIR),
install=path('%s/.qgis3/python/plugins/MetaSearch' % USERDIR),
ext_libs=path('plugin/MetaSearch/ext-libs'),
tmp=path(path('%s/MetaSearch-dist' % USERDIR)),
version=VERSION
@@ -86,7 +86,7 @@ def clean():
def install():
"""install plugin into user QGIS environment"""

plugins_dir = path(USERDIR) / '.qgis2/python/plugins'
plugins_dir = path(USERDIR) / '.qgis3/python/plugins'

if os.path.exists(options.base.install):
if os.path.islink(options.base.install):
@@ -19,7 +19,7 @@ export LD_LIBRARY_PATH=/path/to/OTB/install/lib/:$LD_LIBRARY_PATH
Set QGIS environment
---------------------
export QGIS_PREFIX_PATH=/path/to/QGIS/install
export PYTHONPATH=:/usr/share/qgis/python/plugins:~/.qgis2/python/plugins:$PYTHONPATH
export PYTHONPATH=:/usr/share/qgis/python/plugins:~/.qgis3/python/plugins:$PYTHONPATH
# Set LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$QGIS_PREFIX_PATH/lib/:$LD_LIBRARY_PATH
# Add maintenance folder to python path
@@ -52,7 +52,7 @@ uncomment code, check syntax, share the code via codepad.org and much more).
<li>Open PyQGIS Cookbook by typing <label>_pyqgis</label>.</li>
<br>
<li>Save and clear the command history accessing from context menu of input pane.
The history will be saved into the file ~/.qgis2/console_history.txt</li>
The history will be saved into the file ~/.qgis3/console_history.txt</li>
<br>
</ul>
</td>
@@ -32,7 +32,7 @@ def chunks(l, n):

QCoreApplication.setOrganizationName("QGIS")
QCoreApplication.setOrganizationDomain("qgis.org")
QCoreApplication.setApplicationName("QGIS2")
QCoreApplication.setApplicationName("QGIS3")

s = QSettings()

@@ -167,7 +167,7 @@ ELSE(NOT APPLE)
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_analysis
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_analysis
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_ANALYSIS_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
@@ -61,7 +61,7 @@ ELSE(NOT APPLE)
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_networkanalysis
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_networkanalysis
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_NETWORK_ANALYSIS_HDRS};${QGIS_NETWORK_ANALYSIS_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
@@ -51,7 +51,7 @@ int main( int argc, char ** argv )
// Set up the QSettings environment must be done after qapp is created
QCoreApplication::setOrganizationName( "QGIS" );
QCoreApplication::setOrganizationDomain( "qgis.org" );
QCoreApplication::setApplicationName( "QGIS2" );
QCoreApplication::setApplicationName( "QGIS3" );

#ifdef Q_OS_MACX
// If the GDAL plugins are bundled with the application and GDAL_DRIVER_PATH
@@ -917,7 +917,7 @@ ELSE(NOT APPLE)
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_core
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_core
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_CORE_HDRS};${QGIS_CORE_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
@@ -90,7 +90,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
/** Standard message for when QCA's qca-ossl plugin is missing and system is disabled */
const QString disabledMessage() const;

/** The standard authentication database file in ~/.qgis2/ or defined location
/** The standard authentication database file in ~/.qgis3/ or defined location
* @see QgsApplication::qgisAuthDbFilePath
*/
const QString authenticationDbPath() const { return mAuthDbPath; }
@@ -83,7 +83,7 @@ QString QgsApplication::sPlatformName = "desktop";

const char* QgsApplication::QGIS_ORGANIZATION_NAME = "QGIS";
const char* QgsApplication::QGIS_ORGANIZATION_DOMAIN = "qgis.org";
const char* QgsApplication::QGIS_APPLICATION_NAME = "QGIS2";
const char* QgsApplication::QGIS_APPLICATION_NAME = "QGIS3";

/*!
\class QgsApplication
@@ -116,10 +116,7 @@ void QgsApplication::init( QString customConfigPath )
}
else
{
// TODO Switch to this for release.
//customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( Qgis::QGIS_VERSION_INT / 10000 );
// Use qgis-dev for dev versions of QGIS to avoid mixing 2 and 3 API plugins.
customConfigPath = QString( "%1/.qgis%2/" ).arg( QDir::homePath() ).arg( "-dev" );
customConfigPath = QString( "%1/.qgis3/" ).arg( QDir::homePath() );
}
}

@@ -87,7 +87,7 @@ class CORE_EXPORT QgsApplication : public QApplication
static void setUITheme( const QString &themeName );

/**
* @brief All themes found in ~/.qgis2/themes folder.
* @brief All themes found in ~/.qgis3/themes folder.
* The path is to the root folder for the theme
* @note Valid theme folders must contain a style.qss file.
* @return A hash of theme name and theme path. Valid theme folders contain style.qss
@@ -832,7 +832,7 @@ ELSE(NOT APPLE)
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_gui
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_gui
BUILD_WITH_INSTALL_RPATH TRUE
PUBLIC_HEADER "${QGIS_GUI_HDRS};${QGIS_GUI_MOC_HDRS}"
LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}"
@@ -33,7 +33,7 @@ int main( int argc, char ** argv )
// Set up the QSettings environment must be done after qapp is created
QCoreApplication::setOrganizationName( "QGIS" );
QCoreApplication::setOrganizationDomain( "qgis.org" );
QCoreApplication::setApplicationName( "QGIS2" );
QCoreApplication::setApplicationName( "QGIS3" );

QString myTranslationCode = "";

@@ -93,7 +93,7 @@ MACRO(ADD_GRASSLIB GRASS_BUILD_VERSION)
FRAMEWORK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}"
MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/framework.info.plist.in"
MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${COMPLETE_VERSION}
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis2_grass
MACOSX_FRAMEWORK_IDENTIFIER org.qgis.qgis3_grass
COMPILE_FLAGS "-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\" \"-DGRASS_LIB_EXPORT=${DLLEXPORT}\" \"-DGRASS_EXPORT=${DLLIMPORT}\" ${GRASS_OFF_T_SIZE_DEF}"
)

@@ -28,7 +28,7 @@ email : wonder.sk at gmail dot com
* This class contains routines for local caching of listing of layers, so the add Oracle
* layer dialog does not need to discover the tables every time the user wants to add a layer.
*
* The cached entries are stored in SQLite database in QGIS user directory (usually ~/.qgis2).
* The cached entries are stored in SQLite database in QGIS user directory (usually ~/.qgis3).
* The database can be used for other data sources, too. Each saved connection's list is stored
* in one table "oracle_xyz" (where xyz is the name of the connection). There is one meta table
* "meta_oracle" which has a list of cached connections and the combination of flags used for
@@ -595,9 +595,9 @@ QString QgsPythonUtilsImpl::pluginsPath()
QString QgsPythonUtilsImpl::homePythonPath()
{
QString settingsDir = QgsApplication::qgisSettingsDirPath();
if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis%1" ).arg( Qgis::QGIS_VERSION_INT / 10000 ) )
if ( QDir::cleanPath( settingsDir ) == QDir::homePath() + QString( "/.qgis3" ) )
{
return QString( "b\"%1/.qgis%2/python\".decode('utf-8')" ).arg( QDir::homePath() ).arg( Qgis::QGIS_VERSION_INT / 10000 );
return QString( "b\"%1/.qgis3/python\".decode('utf-8')" ).arg( QDir::homePath() );
}
else
{
@@ -364,7 +364,7 @@ bool QgsServer::init( )
QgsApplication::createDB(); //init qgis.db (e.g. necessary for user crs)

// Instantiate authentication system
// creates or uses qgis-auth.db in ~/.qgis2/ or directory defined by QGIS_AUTH_DB_DIR_PATH env variable
// creates or uses qgis-auth.db in ~/.qgis3/ or directory defined by QGIS_AUTH_DB_DIR_PATH env variable
// set the master password as first line of file defined by QGIS_AUTH_PASSWORD_FILE env variable
// (QGIS_AUTH_PASSWORD_FILE variable removed from environment after accessing)
QgsAuthManager::instance()->init( QgsApplication::pluginPath() );
@@ -394,7 +394,7 @@ int main( int argc, char *argv[] )
// Set up the QSettings environment must be done after qapp is created
QgsApplication::setOrganizationName( "QGIS" );
QgsApplication::setOrganizationDomain( "qgis.org" );
QgsApplication::setApplicationName( "QGIS2" );
QgsApplication::setApplicationName( "QGIS3" );

QgsProviderRegistry::instance( QgsApplication::pluginPath() );

@@ -101,7 +101,7 @@ def testOptionsPath(self):
subdir = 'QGIS' # Linux
if sys.platform[:3] == 'dar': # Mac
subdir = 'qgis.org'
ini = os.path.join(subdir, 'QGIS2.ini')
ini = os.path.join(subdir, 'QGIS.ini')
for p in ['test_opts', 'test opts', 'test_optsé€']:
self.doTestStartup(option="--optionspath",
testDir=os.path.join(self.TMP_DIR, p),

0 comments on commit d9349e5

Please sign in to comment.
You can’t perform that action at this time.