Index: channels/__init__.py ================================================================== --- channels/__init__.py +++ channels/__init__.py @@ -11,10 +11,11 @@ # pack: # bookmarks.py configwin.py streamedit.py history.py search.py links.py # icast.py internet_radio.py itunes.py jamendo.py live365.py global_key.py # modarchive.py myoggradio.py punkcast.py radiobrowser.py radiotray.py # shoutcast.py surfmusik.py timer.py tunein.py xiph.py youtube.py +# exportcat.py useragentswitcher.py # config: - # priority: core # # # Just exports GenericChannel and ChannelPlugin. @@ -157,13 +158,14 @@ for row in self.datamap: for x in range(2, len(row)): self.rowmap.append(row[x][0]) # load default category - if (self.current): - self.load(self.current) - else: + #if (self.current): + # self.load(self.current) + #else: + if True: uikit.columns(self.gtk_list, self.datamap, []) # add to main menu uikit.add_menu([parent.channelmenuitems], self.meta["title"], lambda w: parent.channel_switch_by_name(self.module) or 1) @@ -648,5 +650,6 @@ pass def __getattr__(self, name): return lambda *x: None def status(self, *x): pass + Index: channels/bookmarks.py ================================================================== --- channels/bookmarks.py +++ channels/bookmarks.py @@ -71,12 +71,12 @@ else: return self.streams.get(cat, []) # streams are already loaded at instantiation - def first_show(self): - pass + #def first_show(self): + # pass # all entries just come from "bookmarks.json" def cache(self): # stream list Index: uikit.py ================================================================== --- uikit.py +++ uikit.py @@ -44,20 +44,22 @@ pygtk.enable() pygtk.enable_gtk(version='3.0') from gi.repository import Gtk as gtk from gi.repository import GObject as gobject from gi.repository import GdkPixbuf - empty_pixbuf = GdkPixbuf.Pixbuf.new_from_data(b"\0\0\0\0", GdkPixbuf.Colorspace.RGB, True, 8, 1, 1, 4, None, None) + #empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 16, 16)#, 4, None, None) + empty_pixbuf = GdkPixbuf.Pixbuf.new_from_data(b"\xFF\xFF\xFF\xFF", GdkPixbuf.Colorspace.RGB, True, 8, 1, 1, 4, None, None) __print__(dbg.STAT, gtk) __print__(dbg.STAT, gobject) else: import pygtk import gtk import gobject GdkPixbuf = gtk.gdk empty_pixbuf = GdkPixbuf.Pixbuf(gtk.gdk.COLORSPACE_RGB,True,8,16,16) - empty_pixbuf.fill(0xFFFFFFFF) + #print empty_pixbuf.get_has_alpha() + #empty_pixbuf.fill(0xFFFFFFFF) # prepare gtkbuilder data ui_xml = get_data("gtk3.xml.gz", decode=True, gz=True) #or get_data("gtk3.xml", decode=True) if ver == 2: ui_xml = ui_xml.replace('version="3.0"', 'version="2.16"')