tyler.durden/Chicago95
1
0
Fork 0
mirror of https://github.com/grassmunk/Chicago95.git synced 2025-07-27 23:54:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to pluslib identified through testing

Browse Source
This commit is contained in:
Grassmunk 2020-05-29 17:17:57 -07:00
parent 5cf995ff93
commit 4c41ca35c4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plus/pluslib.py
View File

@ -320,7 +320,7 @@ class ChicagoPlus:
self.new_theme_folder = self.installdir + "/" + self.theme_name + "_Chicago95/" self.new_theme_folder = self.installdir + "/" + self.theme_name + "_Chicago95/"
else: else:
self.new_theme_folder = self.installdir + self.theme_name + "_Chicago95/" self.new_theme_folder = self.installdir + self.theme_name + "_Chicago95/"
self.logger.debug("Path to theme: {}, theme file name: {}".format(self.path_to_theme, self.theme_file_name))
if "Program Files/Plus!/Themes/".lower() in self.path_to_theme.lower(): if "Program Files/Plus!/Themes/".lower() in self.path_to_theme.lower():
paths = self.splitall(self.path_to_theme) paths = self.splitall(self.path_to_theme)
@ -806,7 +806,7 @@ class ChicagoPlus:
self.iconmetrics['lfFont'] = { self.iconmetrics['lfFont'] = {
"desc:" : "Font used to display icons", "desc:" : "Font used to display icons",
"lfHeight" : int.from_bytes(x[16:20],"little"), "lfHeight" : int.from_bytes(x[16:20],"little", signed=True),
"lfWidth" : int.from_bytes(x[20:24],"little"), "lfWidth" : int.from_bytes(x[20:24],"little"),
"lfEscapement" : int.from_bytes(x[24:28],"little"), "lfEscapement" : int.from_bytes(x[24:28],"little"),
"lfOrientation" : int.from_bytes(x[28:32],"little"), "lfOrientation" : int.from_bytes(x[28:32],"little"),
@ -1918,6 +1918,9 @@ class ChicagoPlus:
group_type = { 3: 'RT_ICON', 14 :'RT_GROUP_ICON' } group_type = { 3: 'RT_ICON', 14 :'RT_GROUP_ICON' }
ICONS = [] ICONS = []
if not dll_file_path:
return False
f = open(dll_file_path,'rb') f = open(dll_file_path,'rb')
dll_file = f.read() dll_file = f.read()
f.close() f.close()
@ -1986,7 +1989,7 @@ class ChicagoPlus:
try: try:
name = RESOURCENAMES[GRPICONDIRENTRY['rnID']] name = RESOURCENAMES[GRPICONDIRENTRY['rnID']]
except (KeyError, IndexError): except (KeyError, IndexError):
name = dll_file name = os.path.splitext(dll_file_path.split("/")[-1])[0]
pass pass
idReserved = struct.unpack('<H',dll_bytes[GRPICONDIRENTRY['rnOffset']+0:GRPICONDIRENTRY['rnOffset']+2])[0] idReserved = struct.unpack('<H',dll_bytes[GRPICONDIRENTRY['rnOffset']+0:GRPICONDIRENTRY['rnOffset']+2])[0]
idType = struct.unpack('<H',dll_bytes[GRPICONDIRENTRY['rnOffset']+2:GRPICONDIRENTRY['rnOffset']+4])[0] idType = struct.unpack('<H',dll_bytes[GRPICONDIRENTRY['rnOffset']+2:GRPICONDIRENTRY['rnOffset']+4])[0]