[pyqgis-console] fixes import warning

This commit is contained in:
Salvatore Larosa 2013-05-02 00:14:36 +02:00
parent 8e6e287279
commit ee4fc4e1a6
10 changed files with 7 additions and 7 deletions

View File

@ -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 File

@ -38,7 +38,7 @@ class HelpDialog(QDialog, Ui_Help):
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 @@ class HelpDialog(QDialog, Ui_Help):
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 File

@ -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 File

@ -1,4 +1,4 @@
You can contribute at translate this help by creating an file *.properties and name it in
You can contribute to translate this help by creating a file *.properties and name it in
<your_locale_name>.properties
To get your locale name type the following lines in console: