Index: gtk3.xml ================================================================== --- gtk3.xml +++ gtk3.xml @@ -2982,11 +2982,10 @@ False False stop gtk-cancel - False True Index: st2.py ================================================================== --- st2.py +++ st2.py @@ -154,11 +154,10 @@ # toolbar "on_play_clicked" : self.on_play_clicked, "on_record_clicked": self.on_record_clicked, "on_homepage_stream_clicked": self.on_homepage_stream_clicked, "on_reload_clicked": self.on_reload_clicked, - "on_stop_clicked": self.on_stop_clicked, #@TODO: button is long gone "on_homepage_channel_clicked" : self.on_homepage_channel_clicked, "double_click_channel_tab": self.on_homepage_channel_clicked, # menu "menu_toolbar_standard": lambda w: (self.toolbar.unset_style(), self.toolbar.unset_icon_size()), "menu_toolbar_style_icons": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_ICONS)), @@ -301,11 +300,11 @@ # Browse to channel homepage (double click on notebook tab) def on_homepage_channel_clicked(self, widget, event=2): if event == 2 or event.type == gtk.gdk._2BUTTON_PRESS: __print__(dbg.UI, "dblclick") url = self.channel().meta.get("url", "https://duckduckgo.com/?q=" + self.channel().module) - self.action.browser(self.channel().url) + self.action.browser(url) # Reload stream list in current channel-category def on_reload_clicked(self, widget=None, reload=1): __print__(dbg.UI, "reload", reload, self.current_channel, self.channels[self.current_channel], self.channel().current) category = self.channel().current @@ -317,16 +316,10 @@ def thread(self, target, *args): thread = Thread(target=target, args=args) thread.start() self.working.append(thread) - # Stop reload/update threads - def on_stop_clicked(self, widget): - __print__(dbg.ERR, "STOP is no longer available") - #while self.working: - #thread = self.working.pop() - #thread.stop() # Click in category list def on_category_clicked(self, widget, event, *more): category = self.channel().currentcat() __print__(dbg.UI, "on_category_clicked", category, self.current_channel) @@ -383,11 +376,10 @@ # shortcut to statusbar # (hacked to work from within threads, circumvents the statusbar msg pool actually) def status(self, text="", sbar_msg=[]): - __print__(dbg.ERR, "status(", text, ")") # init sbar_cid = self.get_widget("statusbar").get_context_id("messages") # remove text while ((not text) and (type(text)==str) and len(sbar_msg)): sbar_msg.pop()