From 8cd467bea2a77529db99efa5830ecd71ca03692c Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 20 Jun 2014 14:22:13 +0200 Subject: [PATCH] generate context_help and function_help in the same order --- python/plugins/processing/modeler/ModelerDialog.py | 4 ++-- resources/context_help/CMakeLists.txt | 2 ++ resources/function_help/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py index bfdcca56820..5e4ef9f9764 100644 --- a/python/plugins/processing/modeler/ModelerDialog.py +++ b/python/plugins/processing/modeler/ModelerDialog.py @@ -335,8 +335,8 @@ class ModelerDialog(QDialog, Ui_DlgModeler): self.hasChanged = False except WrongModelException, e: QMessageBox.critical(self, self.tr('Could not open model'), - self.tr('The selected model could not be loaded.\n\ - Wrong line: %s') % e.msg) + self.tr('The selected model could not be loaded.\n' + 'Wrong line: %s') % e.msg) def repaintModel(self): self.scene = ModelerScene() diff --git a/resources/context_help/CMakeLists.txt b/resources/context_help/CMakeLists.txt index 55364e69173..9006e6444da 100644 --- a/resources/context_help/CMakeLists.txt +++ b/resources/context_help/CMakeLists.txt @@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgscontexthelp_texts.cpp") FILE(WRITE ${HELP_OUTPUT} "#include \"qgscontexthelp.h\"\n#include \n\nQHash QgsContextHelp::gContextHelpTexts;\n\nvoid QgsContextHelp::init()\n{\n if( !gContextHelpTexts.isEmpty() )\n return;\n") +LIST(SORT HELP_FILES) + FOREACH(HELP_FILE ${HELP_FILES}) STRING(REGEX REPLACE "^.*/([^/]+)$" "\\1" CONTEXT ${HELP_FILE}) diff --git a/resources/function_help/CMakeLists.txt b/resources/function_help/CMakeLists.txt index 51ad2dc7e74..2e47bcfd5f7 100644 --- a/resources/function_help/CMakeLists.txt +++ b/resources/function_help/CMakeLists.txt @@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgsexpression_texts.cpp") FILE(WRITE ${HELP_OUTPUT} "#include \"qgsexpression.h\"\n#include \n\nQHash QgsExpression::gFunctionHelpTexts;\n\nvoid QgsExpression::initFunctionHelp()\n{\n if( !gFunctionHelpTexts.isEmpty() )\n return;\n") +LIST(SORT HELP_FILES) + FOREACH(HELP_FILE ${HELP_FILES}) STRING(REGEX REPLACE "^.*/([^/]+)$" "\\1" FN ${HELP_FILE})