@@ -32,11 +32,11 @@ # collections. Commercial and sign-up services are not an objective. # standard modules import sys -import os, subprocess +import os import re from copy import copy import inspect import traceback from threading import Thread @@ -197,11 +197,10 @@ # actually display main window if conf.window_title: self.update_title() self.win_streamtuner2.show_all() gui_startup(100.0) - self.specbuttons_load() #-- Shortcut for glade.get_widget() # Allows access to widgets as direct attributes instead of using .get_widget() # Also looks in self.channels[] for the named channel plugins @@ -446,40 +445,10 @@ r = { 2: 0.45, 5: 0.75, 0: 1.0 }[map] if r != 1.0: pix = pix.scale_simple(int(321*r), int(115*r), gtk.gdk.INTERP_BILINEAR) self.img_logo.set_from_pixbuf(pix) - # Extra buttons - def specbuttons_load(self): - x = 0 - for btn,cmd in conf.specbuttons.items(): - log.IN(btn, cmd) - i = gtk.Image() - if (btn.find("gtk-") == 0): - i.set_from_stock(btn, gtk.ICON_SIZE_SMALL_TOOLBAR) - else: - path = None - if os.path.exists(btn): - path = btn - else: - f = subprocess.Popen(["locate", "/usr/share/[pi]*s/*%s*.*" % btn], stdout=subprocess.PIPE) - path, err = f.communicate() - path = path.split("\n")[0] - log.DATA(path) - if path: - i.set_from_file(path) - b = gtk.Button() - b.set_image(i) - b.connect("clicked", lambda x0, cmd=cmd, *x: action.run(cmd) ) - self.specbuttons.attach( - b, - int(x / 2), int(x/2)+1, x%2, (x%2)+1, - gtk.SHRINK, gtk.SHRINK, 0, 0 - ) - x = x + 1 - self.specbuttons.show_all() - # load application state (widget sizes, selections, etc.) def init_app_state(self): winlayout = conf.load("window") if (winlayout): try: