diff options
Diffstat (limited to 'csndsugui.py')
| -rwxr-xr-x | csndsugui.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/csndsugui.py b/csndsugui.py index c196629..f606a8b 100755 --- a/csndsugui.py +++ b/csndsugui.py @@ -65,11 +65,7 @@ class BasicGUI: mult = width * .00132 elif release.find("SoaS release 2 ") != -1: mult = width * .00085 -<<<<<<< HEAD elif release.find("Fedora release ") != -1: -======= - elif release.find("SoaS release 3 ") != -1: ->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a mult = width * .00119 font.set_size(int(font_size * mult)) widget.modify_font(font) @@ -148,8 +144,8 @@ class BasicGUI: i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0x8000,0x8000,0x8000, 2)) else: i[2] = 1 - i[0].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0xFFFF,0,0, 1)) - i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0xFFFF,0,0, 2)) + i[0].modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0,0x7700,0, 1)) + i[0].modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0,0x7700,0, 2)) self.set_channel(i[1], i[2]) def button_setvalue(self, widget, value): |