Merge pull request #359 from vkbo/fixes

Minor Fixes
This commit is contained in:
Veronica K. Berglyd Olsen
2020-07-02 21:25:35 +02:00
committed by GitHub
2 changed files with 3 additions and 4 deletions
+2 -3
View File
@@ -269,7 +269,7 @@ class NWProject():
for projItem in listdir(self.projPath):
logger.verbose("Project contains: %s" % projItem)
if projItem.startswith("data_"):
self._legacyDataFolder(projItem)
errList = self._legacyDataFolder(projItem, errList)
if errList:
self.makeAlert(errList, nwAlert.ERROR)
@@ -1165,10 +1165,9 @@ class NWProject():
# Legacy Data Structure Handlers
##
def _legacyDataFolder(self, theFolder):
def _legacyDataFolder(self, theFolder, errList):
"""Clean up legacy data folders.
"""
errList = []
theData = path.join(self.projPath, theFolder)
if not path.isdir(theData):
errList.append("Not a folder: %s" % theData)
+1 -1
View File
@@ -1364,7 +1364,7 @@ class GuiDocEditSearch(QFrame):
self.searchOpt.addAction(self.toggleWord)
self.toggleRegEx = QAction("RegEx Mode", self)
self.toggleRegEx.setToolTip("Use regular expressions")
self.toggleRegEx.setToolTip("Use regular expressions (requires Qt 5.3)")
self.toggleRegEx.setIcon(self.theTheme.getIcon("search_regex"))
self.toggleRegEx.setCheckable(True)
self.toggleRegEx.setChecked(self.isRegEx)