Update and reorganise themes (#893)
* Drop the subfolders for GUI themes * Remove bundled font support * Add safe file read function * Allow loading themes from multiple locations * Clean up unused variables * Clean up icons class * Merge icon theme icons * Update icon theme class * Remove guiDark config setting * Fix tests * Fix handling of default theme * Update icon readmes * Add test for getGuiItem common function
This commit is contained in:
committed by
GitHub
parent
be3376272e
commit
15ec1496c5
+6
-1
@@ -25,7 +25,7 @@ import shutil
|
||||
from PyQt5.QtWidgets import qApp
|
||||
|
||||
|
||||
def cmpFiles(fileOne, fileTwo, ignoreLines=None):
|
||||
def cmpFiles(fileOne, fileTwo, ignoreLines=None, ignoreStart=None):
|
||||
"""Compare two files, but optionally ignore lines given by a list.
|
||||
"""
|
||||
if ignoreLines is None:
|
||||
@@ -59,6 +59,11 @@ def cmpFiles(fileOne, fileTwo, ignoreLines=None):
|
||||
print("Ignoring line %d" % (n+1))
|
||||
continue
|
||||
|
||||
if ignoreStart is not None:
|
||||
if lnOne.startswith(ignoreStart):
|
||||
print("Ignoring line %d" % (n+1))
|
||||
continue
|
||||
|
||||
if lnOne != lnTwo:
|
||||
print("Diff on line %d:" % (n+1))
|
||||
print(" << '%s'" % lnOne)
|
||||
|
||||
Reference in New Issue
Block a user