diff --git a/Window.py b/Window.py index d41904d..9ce3b90 100755 --- a/Window.py +++ b/Window.py @@ -8,6 +8,9 @@ class Window(object): self.conf = conf self.count = 0 self.connection = None + self.fgcolor = ''.join(map(lambda x: '%02x' % int(0xFF * x), + self.conf['fgcolor'])) + self.font_sz = 1024 * self.conf['font_size'] if not 'width' in self.conf: self.conf['width'] = 32 @@ -36,16 +39,16 @@ class Window(object): self.label = gtk.Label('-') - v = gtk.Viewport() - v.set_shadow_type(gtk.SHADOW_OUT) - v.add(self.label) - v.connect('button-release-event', self.button_release) - v.set_events(gtk.gdk.BUTTON_RELEASE_MASK) - v.modify_bg(gtk.STATE_NORMAL, + self.viewport = gtk.Viewport() + self.viewport.set_shadow_type(gtk.SHADOW_OUT) + self.viewport.add(self.label) + self.viewport.connect('button-release-event', self.button_release) + self.viewport.set_events(gtk.gdk.BUTTON_RELEASE_MASK) + self.viewport.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(*map(lambda x: int(65535 * x), self.conf['bgcolor']))) - self.window.add(v) + self.window.add(self.viewport) self.connect() @@ -95,13 +98,10 @@ class Window(object): if self.connection is None: self.label.set_text('-') else: - fgcolor = ''.join(map(lambda x: '%02x' % int(0xFF * x), - self.conf['fgcolor'])) - sz = 1024 * self.conf['font_size'] self.label.set_markup( ('%d' - % (fgcolor, sz, self.count))) + % (self.fgcolor, self.font_sz, self.count))) def destroy_event(self): self.disconnect()