Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix import warning in pyqgis console #447

Closed
wants to merge 2 commits into from

3 participants

@slarosa
Collaborator

I renamed "console_help" directory to "help" one in order to avoid import warning on console startup.

@brushtyler brushtyler was assigned
@timlinux
Owner

@slarosa Can you go ahead and apply this if the patch is still valid?

@slarosa
Collaborator

applied manually in ee4fc4e

@slarosa slarosa closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 28, 2013
  1. @slarosa
Commits on Mar 14, 2013
  1. @slarosa

    delete console_help directory

    slarosa authored
This page is out of date. Refresh to see the latest.
View
2  python/console/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(console_help)
+ADD_SUBDIRECTORY(help)
SET (QGIS_CONSOLE_DIR ${QGIS_DATA_DIR}/python/console)
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
View
4 python/console/console_help.py
@@ -38,7 +38,7 @@ def __init__(self, parent):
self.setMaximumSize(530, 300)
qgisDataDir = QgsApplication.pkgDataPath()
- listFile = os.listdir(qgisDataDir + "/python/console/console_help/i18n")
+ listFile = os.listdir(qgisDataDir + "/python/console/help/i18n")
localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString()
locale = "en_US"
for i in listFile:
@@ -46,7 +46,7 @@ def __init__(self, parent):
if localeFullName in (lang[0:2], lang):
locale = lang
- filename = qgisDataDir + "/python/console/console_help/help.htm? \
+ filename = qgisDataDir + "/python/console/help/help.htm? \
lang=" + locale \
+ "&pkgDir=" + qgisDataDir
View
6 python/console/console_help/CMakeLists.txt → python/console/help/CMakeLists.txt
@@ -2,6 +2,6 @@ FILE(GLOB HTML_FILES *.htm)
FILE(GLOB I18N_FILES i18n/*.properties)
FILE(GLOB JS_FILES js/*.js)
-INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help)
-INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/i18n)
-INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/js)
+INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help)
+INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help/i18n)
+INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/help/js)
View
0  python/console/console_help/help.htm → python/console/help/help.htm
File renamed without changes
View
0  python/console/console_help/i18n/README → python/console/help/i18n/README
File renamed without changes
View
0  ...onsole/console_help/i18n/de_DE.properties → python/console/help/i18n/de_DE.properties
File renamed without changes
View
0  ...onsole/console_help/i18n/en_US.properties → python/console/help/i18n/en_US.properties
File renamed without changes
View
0  ...onsole/console_help/i18n/it_IT.properties → python/console/help/i18n/it_IT.properties
File renamed without changes
View
0  ...onsole/console_help/i18n/ru_RU.properties → python/console/help/i18n/ru_RU.properties
File renamed without changes
View
0  python/console/console_help/js/encoding.js → python/console/help/js/encoding.js
File renamed without changes
Something went wrong with that request. Please try again.