mirror of
https://github.com/gryf/wmdocklib.git
synced 2025-12-19 12:28:10 +01:00
1580293: initialization of pixmask - drawing areas
marginal corrections...
This commit is contained in:
@@ -172,7 +172,7 @@ def mainLoop(timeFmt, dateFmt, dayFmt, weekFmt):
|
||||
spacing = getVertSpacing(4, margin)
|
||||
if lastStrs[0] != timeStr:
|
||||
addTimeString(timeStr, timeX, margin-4)
|
||||
margin += 2
|
||||
margin += 3
|
||||
else:
|
||||
margin = 4
|
||||
spacing = getVertSpacing(4, margin)
|
||||
@@ -265,8 +265,8 @@ def main():
|
||||
font = clConfig.get('font', '6x8orig')
|
||||
|
||||
if clConfig.get('antialiased'):
|
||||
background = [((3,3),(60,18)),
|
||||
((3,21),(60,60))]
|
||||
background = [((3,3),(60,19)),
|
||||
((3,22),(60,60))]
|
||||
else:
|
||||
background = [((3,3),(60,60))]
|
||||
|
||||
@@ -279,8 +279,6 @@ def main():
|
||||
antialiased = clConfig.get('antialiased', False)
|
||||
|
||||
wmdocklib.openXwindow(sys.argv, width, height)
|
||||
if antialiased:
|
||||
wmdocklib.copyXPMArea(64+2*xOffset+1, 27, width - 2*xOffset, 17, xOffset, yOffset)
|
||||
mainLoop(timeFmt, dateFmt, dayFmt, weekFmt)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@@ -177,7 +177,7 @@ class PywmHDMon:
|
||||
self.addString(totalStr, width-yOffset*2-5*char_width-1, self.getY(line))
|
||||
elif mode == 'free':
|
||||
freeStr = bytesToStr(free).rjust(5)
|
||||
self.addString(freeStr, width-yOffset-5*char_width, self.getY(line))
|
||||
self.addString(freeStr, width-yOffset*2-5*char_width, self.getY(line))
|
||||
elif mode == 'bar':
|
||||
percentUsed = (float(total - free) / float(total)) * 100.0
|
||||
self.paintGraph(percentUsed, xStart, self.getY(line) + 2,
|
||||
@@ -408,7 +408,7 @@ def main():
|
||||
palette = {}
|
||||
palette[0] = clConfig.get('background', 'black')
|
||||
palette[2] = clConfig.get('textcolor', 'cyan3')
|
||||
palette[7] = clConfig.get('barfgcolor', 'cyan')
|
||||
palette[9] = clConfig.get('barfgcolor', 'cyan')
|
||||
palette[8] = clConfig.get('barbgcolor', 'cyan4')
|
||||
palette[5] = clConfig.get('activitycolor', 'cyan2')
|
||||
|
||||
@@ -467,66 +467,66 @@ def main():
|
||||
patterns = \
|
||||
['0000000000000000000000000000000000000000000000000000000000000000',
|
||||
'0000000000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700555002220055500555000000000000000000000000000000000000000',
|
||||
'0077700555002220055500555000000000000000000000000000000000000000',
|
||||
'0077700555002220055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550022200555000000000000000000000000000000000000000',
|
||||
'0077700555005550022200555000000000000000000000000000000000000000',
|
||||
'0077700555005550022200555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500555000000000000000000000000000000000000000',
|
||||
'0077700555005550055500222000000000000000000000000000000000000000',
|
||||
'0077700555005550055500222000000000000000000000000000000000000000',
|
||||
'0077700555005550055500222000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077700088888888888888888888888888888888888888888888888888888888',
|
||||
'0077700088888888888888888888888888888888888888888888888888888888',
|
||||
'0077700088888888888888888888888888888888888888888888888888888888',
|
||||
'0077700088888888888888888888888888888888888888888888888888888888',
|
||||
'0077700000000000000000000000000000000000000000000000000000000000',
|
||||
'0077777777777777777777777777777777777777777777777777777777777777',
|
||||
'0077777777777777777777777777777777777777777777777777777777777777',
|
||||
'0077777777777777777777777777777777777777777777777777777777777777',
|
||||
'0077777777777777777777777777777777777777777777777777777777777777',
|
||||
'0099900555002220055500555000000000000000000000000000000000000000',
|
||||
'0099900555002220055500555000000000000000000000000000000000000000',
|
||||
'0099900555002220055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550022200555000000000000000000000000000000000000000',
|
||||
'0099900555005550022200555000000000000000000000000000000000000000',
|
||||
'0099900555005550022200555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500555000000000000000000000000000000000000000',
|
||||
'0099900555005550055500222000000000000000000000000000000000000000',
|
||||
'0099900555005550055500222000000000000000000000000000000000000000',
|
||||
'0099900555005550055500222000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099900088888888888888888888888888888888888888888888888888888888',
|
||||
'0099900088888888888888888888888888888888888888888888888888888888',
|
||||
'0099900088888888888888888888888888888888888888888888888888888888',
|
||||
'0099900088888888888888888888888888888888888888888888888888888888',
|
||||
'0099900000000000000000000000000000000000000000000000000000000000',
|
||||
'0099999999999999999999999999999999999999999999999999999999999999',
|
||||
'0099999999999999999999999999999999999999999999999999999999999999',
|
||||
'0099999999999999999999999999999999999999999999999999999999999999',
|
||||
'0099999999999999999999999999999999999999999999999999999999999999',
|
||||
'0000000000000000000000000000000000000000000000000000000000000000',
|
||||
'0000000000000000000000000000000000000000000000000000000000000000',
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user