Skip to content
Permalink
Browse files

Merge pull request #5579 from DelazJ/logmessages

Clarify where and what Log Messages is
  • Loading branch information
m-kuhn committed Nov 20, 2017
2 parents c9b8ddc + 9481067 commit 06bae21d51ff337c9380ea879e0c31e1c3fb8990
@@ -78,16 +78,16 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True):
layer.loadNamedStyle(style)
details.project.addMapLayer(context.temporaryLayerStore().takeMapLayer(layer))
except Exception:
QgsMessageLog.logMessage("Error loading result layer:\n" + traceback.format_exc(), 'Processing', QgsMessageLog.CRITICAL)
QgsMessageLog.logMessage(QCoreApplication.translate('Postprocessing', "Error loading result layer:") + "\n" + traceback.format_exc(), 'Processing', QgsMessageLog.CRITICAL)
wrongLayers.append(str(l))
i += 1

feedback.setProgress(100)

if wrongLayers:
msg = "The following layers were not correctly generated.<ul>"
msg += "".join(["<li>%s</li>" % lay for lay in wrongLayers]) + "</ul>"
msg += "You can check the log messages to find more information about the execution of the algorithm"
msg = QCoreApplication.translate('Postprocessing', "The following layers were not correctly generated.")
msg += "<ul>" + "".join(["<li>%s</li>" % lay for lay in wrongLayers]) + "</ul>"
msg += QCoreApplication.translate('Postprocessing', "You can check the 'Log Messages Panel' in QGIS main window to find more information about the execution of the algorithm.")
feedback.reportError(msg)

return len(wrongLayers) == 0
@@ -287,8 +287,8 @@ def closeEvent(self, evt):

if self.hasChanged:
ret = QMessageBox.question(
self, self.tr('Save?'),
self.tr('There are unsaved changes in this model, do you want to keep those?'),
self, self.tr('Save Model?'),
self.tr('There are unsaved changes in this model. Do you want to keep those?'),
QMessageBox.Save | QMessageBox.Cancel | QMessageBox.Discard, QMessageBox.Cancel)

if ret == QMessageBox.Save:
@@ -114,7 +114,7 @@ def closeEvent(self, event):
super(ModelerParameterDefinitionDialog, self).closeEvent(event)

def setupUi(self):
self.setWindowTitle(self.tr('Parameter definition'))
self.setWindowTitle(self.tr('Parameter Definition'))
self.setMinimumWidth(300)

self.verticalLayout = QVBoxLayout(self)
@@ -161,8 +161,8 @@ def load(fileName, name=None, crs=None, style=None, isRaster=False):
else:
if prjSetting:
settings.setValue('/Projections/defaultBehavior', prjSetting)
raise RuntimeError('Could not load layer: ' + str(fileName) +
'\nCheck the processing framework log to look for errors')
raise RuntimeError(QCoreApplication.translate('dataobject',
'Could not load layer: {0}\nCheck the processing framework log to look for errors.').format(fileName))
else:
qgslayer = QgsVectorLayer(fileName, name, 'ogr')
if qgslayer.isValid():
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Help editor</string>
<string>Help Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
@@ -10341,7 +10341,7 @@ bool QgisApp::saveDirty()
// old code: mProjectIsDirtyFlag = true;

// prompt user to save
answer = QMessageBox::information( this, tr( "Save?" ),
answer = QMessageBox::information( this, tr( "Save Project?" ),
tr( "Do you want to save the current project? %1" )
.arg( whyDirty ),
QMessageBox::Save | QMessageBox::Cancel | QMessageBox::Discard,
@@ -10378,7 +10378,7 @@ bool QgisApp::checkTasksDependOnProject()

if ( !activeTaskDescriptions.isEmpty() )
{
QMessageBox::warning( this, tr( "Active tasks" ),
QMessageBox::warning( this, tr( "Active Tasks" ),
tr( "The following tasks are currently running which depend on layers in this project:\n\n%1\n\nPlease cancel these tasks and retry." ).arg( activeTaskDescriptions.toList().join( QStringLiteral( "\n" ) ) ) );
return true;
}

0 comments on commit 06bae21

Please sign in to comment.
You can’t perform that action at this time.