diff --git a/MANIFEST b/MANIFEST index 62715e2..22dd552 100644 --- a/MANIFEST +++ b/MANIFEST @@ -16,7 +16,9 @@ wmdocklib/6x12.xpm wmdocklib/6x8.xpm wmdocklib/6x8orig.xpm wmdocklib/6x8slant.xpm +wmdocklib/7x12-41c.xpm wmdocklib/7x8zx.xpm +wmdocklib/8x12-41c.xpm wmdocklib/8x8.xpm wmdocklib/8x8zx.xpm wmdocklib/README diff --git a/wmdocklib/pywmhelpers.py b/wmdocklib/pywmhelpers.py index 9a71d81..1c051de 100644 --- a/wmdocklib/pywmhelpers.py +++ b/wmdocklib/pywmhelpers.py @@ -157,8 +157,6 @@ def initPixmap(background=None, palette=None, debug = 0): """builds and sets the pixmap of the program. - a wmdockapp has a 128x112 pixmap - the (width)x(height) upper left area is the work area in which we put what we want to be displayed. @@ -258,7 +256,6 @@ def initPixmap(background=None, colorName = fontdef[i+1][1:].split()[1] font_palette[colorChar] = colorName fontdef = fontdef[1 + int(fontdef[0].split(' ')[2]):] - fontdef = (fontdef + [' '*128]*48)[:48] import re m = re.match(r'.*([0-9]+)x([0-9]+).*', font_name)