Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some reformatting of error messages, mostly regarding line breaks.

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-05-28 22:48:37 +02:00
parent 6f5a30092e
commit d852a1a144
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/project.py
+2 -2
View File
@@ -113,7 +113,7 @@ class NWProject():
CUSTOM, and always have parent handle set to None.
"""
if not self.projTree.checkRootUnique(rootClass):
self.makeAlert("Duplicate root item detected!", nwAlert.ERROR)
self.makeAlert("Duplicate root item detected.", nwAlert.ERROR)
return None
newItem = NWItem(self)
newItem.setName(rootName)
@@ -995,7 +995,7 @@ class NWProject():
# Report status
if len(orphanFiles) > 0:
self.makeAlert(
"Found %d orphaned file(s) in project folder!" % len(orphanFiles),
"Found %d orphaned file(s) in project folder." % len(orphanFiles),
nwAlert.WARN
)
else:
nw/gui/dialogs/projectsettings.py
+3 -1
View File
@@ -362,7 +362,9 @@ class GuiProjectEditStatus(QWidget):
self.listBox.takeItem(iRow)
self.colChanged = True
else:
self.theParent.makeAlert("Cannot delete status item that is in use.",nwAlert.ERROR)
self.theParent.makeAlert(
"Cannot delete status item that is in use.", nwAlert.ERROR
)
return
def _saveItem(self):
nw/gui/elements/doctree.py
+2 -2
View File
@@ -396,7 +396,7 @@ class GuiDocTree(QTreeWidget):
trItemP.takeChild(tIndex)
del self.theProject.projTree[tHandle]
else:
self.makeAlert(["Cannot delete folder.","It is not empty."], nwAlert.ERROR)
self.makeAlert("Cannot delete folder. It is not empty.", nwAlert.ERROR)
return False
elif nwItemS.itemType == nwItemType.ROOT:
@@ -407,7 +407,7 @@ class GuiDocTree(QTreeWidget):
self.theParent.mainMenu.setAvailableRoot()
self.theProject.setProjectChanged(True)
else:
self.makeAlert(["Cannot delete root folder.","It is not empty."], nwAlert.ERROR)
self.makeAlert("Cannot delete root folder. It is not empty.", nwAlert.ERROR)
return False
return True
nw/gui/icons.py
+3 -1
View File
@@ -249,7 +249,9 @@ class GuiIcons:
try:
confParser.read_file(open(themeConf, mode="r", encoding="utf8"))
except Exception as e:
self.theParent.makeAlert(["Could not load theme config file.",str(e)],nwAlert.ERROR)
self.theParent.makeAlert(
["Could not load theme config file.",str(e)], nwAlert.ERROR
)
continue
themeName = ""
if confParser.has_section("Main"):
nw/gui/theme.py
+6 -2
View File
@@ -284,7 +284,9 @@ class GuiTheme:
try:
confParser.read_file(open(themeConf, mode="r", encoding="utf8"))
except Exception as e:
self.theParent.makeAlert(["Could not load theme config file.",str(e)],nwAlert.ERROR)
self.theParent.makeAlert(
["Could not load theme config file.",str(e)], nwAlert.ERROR
)
continue
themeName = ""
if confParser.has_section("Main"):
@@ -314,7 +316,9 @@ class GuiTheme:
try:
confParser.read_file(open(syntaxPath, mode="r", encoding="utf8"))
except Exception as e:
self.theParent.makeAlert(["Could not load syntax file.",str(e)],nwAlert.ERROR)
self.theParent.makeAlert(
["Could not load syntax file.",str(e)], nwAlert.ERROR
)
return []
syntaxName = ""
if confParser.has_section("Main"):
nw/guimain.py
+2 -2
View File
@@ -553,7 +553,7 @@ class GuiMain(QMainWindow):
if self.docEditor.theHandle is None:
self.makeAlert(
["Please open a document to import the text file into."],
"Please open a document to import the text file into.",
nwAlert.ERROR
)
return False
@@ -782,7 +782,7 @@ class GuiMain(QMainWindow):
0 = info, 1 = warning, and 2 = error.
"""
if isinstance(theMessage, list):
popMsg = " ".join(theMessage)
popMsg = "<br>".join(theMessage)
logMsg = theMessage
else:
popMsg = theMessage