Skip to content

Commit

Permalink
generate context_help and function_help in the same order
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 20, 2014
1 parent 8cccdc5 commit 8cd467b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/modeler/ModelerDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ def openModel(self):
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()
Expand Down
2 changes: 2 additions & 0 deletions resources/context_help/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgscontexthelp_texts.cpp")

FILE(WRITE ${HELP_OUTPUT} "#include \"qgscontexthelp.h\"\n#include <QCoreApplication>\n\nQHash<QString, QString> 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})

Expand Down
2 changes: 2 additions & 0 deletions resources/function_help/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgsexpression_texts.cpp")

FILE(WRITE ${HELP_OUTPUT} "#include \"qgsexpression.h\"\n#include <QCoreApplication>\n\nQHash<QString, QString> 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})

Expand Down

0 comments on commit 8cd467b

Please sign in to comment.