[pyqgis-console] fixes import warning

qgis · May 1, 2013 · ee4fc4e · ee4fc4e
1 parent 8e6e287
commit ee4fc4e
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/python/console/CMakeLists.txt b/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)

diff --git a/python/console/console_help.py b/python/console/console_help.py
@@ -38,15 +38,15 @@ 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:
             lang = i[0:5]
             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
 

diff --git a/python/console/console_help/CMakeLists.txt → python/console/help/CMakeLists.txt b/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)
diff --git a/python/console/console_help/help.htm → python/console/help/help.htm b/python/console/console_help/help.htm → python/console/help/help.htm
diff --git a/python/console/console_help/i18n/README → python/console/help/i18n/README b/python/console/console_help/i18n/README → python/console/help/i18n/README
@@ -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:
 

diff --git a/...onsole/console_help/i18n/de_DE.properties → python/console/help/i18n/de_DE.properties b/...onsole/console_help/i18n/de_DE.properties → python/console/help/i18n/de_DE.properties
diff --git a/...onsole/console_help/i18n/en_US.properties → python/console/help/i18n/en_US.properties b/...onsole/console_help/i18n/en_US.properties → python/console/help/i18n/en_US.properties
diff --git a/...onsole/console_help/i18n/it_IT.properties → python/console/help/i18n/it_IT.properties b/...onsole/console_help/i18n/it_IT.properties → python/console/help/i18n/it_IT.properties
diff --git a/...onsole/console_help/i18n/ru_RU.properties → python/console/help/i18n/ru_RU.properties b/...onsole/console_help/i18n/ru_RU.properties → python/console/help/i18n/ru_RU.properties
diff --git a/python/console/console_help/js/encoding.js → python/console/help/js/encoding.js b/python/console/console_help/js/encoding.js → python/console/help/js/encoding.js