iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for issue #122

Browse Source
This commit is contained in:
Ace 2020-06-07 15:57:38 +02:00
parent e01728bcd8
commit 03a184775c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inkycal/config/layout.py
View File

@ -37,6 +37,8 @@ class Layout:
self.display_size = display_dimensions[model] self.display_size = display_dimensions[model]
if 'colour' in model: if 'colour' in model:
self.supports_colour = True self.supports_colour = True
else:
self.supports_colour = False
elif width and height: elif width and height:
self.display_height = width self.display_height = width

4
inkycal/config/settings_parser.py
View File

@ -40,10 +40,10 @@ class Settings:
os.chdir(folder) os.chdir(folder)
if os.path.exists('settings.jsonc'): if os.path.exists('settings.jsonc'):
with open("settings.jsonc") as jsonc_file: with open("settings.jsonc") as jsonc_file:
#minify in order to remove comments # minify in order to remove comments
minified = jsmin(jsonc_file.read()) minified = jsmin(jsonc_file.read())
#remove known invalid json (comma followed by closing accolades) # remove known invalid json (comma followed by closing accolades)
minified = minified.replace(",}","}") minified = minified.replace(",}","}")
settings = json.loads(minified) settings = json.loads(minified)
self._settings = settings self._settings = settings