Check-in [5692e6ae5d]
Overview
Comment: | Removed remains of [stop] button handling. Fixed url param in homepage channel callback. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5692e6ae5d4ab6d97794e4b7d9afcc49 |
User & Date: | mario on 2015-04-04 01:44:26 |
Other Links: | manifest | tags |
Context
2015-04-04
| ||
01:45 | Removed module_list() ordering, which is now handled by uikit.appstate. Documented plugin_meta() options, split out plugin_meta_extract() code. check-in: 7127c48419 user: mario tags: trunk | |
01:44 | Removed remains of [stop] button handling. Fixed url param in homepage channel callback. check-in: 5692e6ae5d user: mario tags: trunk | |
2015-04-03
| ||
20:46 | Removed Gtk `theme` configuration options. (Didn't work anymore.) -- Addendum: If anyone has been using this, please drop me a line; it could become a plugin now.. check-in: ad852f14fe user: mario tags: trunk | |
Changes
Modified gtk3.xml from [51c9fcecae] to [3be7b6b7e5].
︙ | ︙ | |||
2980 2981 2982 2983 2984 2985 2986 | </child> <child> <object class="GtkToolButton" id="stop"> <property name="can_focus">False</property> <property name="visible_horizontal">False</property> <property name="label" translatable="yes">stop</property> <property name="stock_id">gtk-cancel</property> | < | 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 | </child> <child> <object class="GtkToolButton" id="stop"> <property name="can_focus">False</property> <property name="visible_horizontal">False</property> <property name="label" translatable="yes">stop</property> <property name="stock_id">gtk-cancel</property> </object> <packing> <property name="expand">False</property> <property name="homogeneous">True</property> </packing> </child> </object> |
︙ | ︙ |
Modified st2.py from [f58549c2df] to [fe8224f3c5].
︙ | ︙ | |||
152 153 154 155 156 157 158 | "on_notebook_channels_switch_page": self.channel_switch, # channel notebook tab changed "station_context_menu": lambda tv,ev: self.station_context_menu(tv,ev), # 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, | < | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 | "on_notebook_channels_switch_page": self.channel_switch, # channel notebook tab changed "station_context_menu": lambda tv,ev: self.station_context_menu(tv,ev), # 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_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)), "menu_toolbar_style_both": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_BOTH)), "menu_toolbar_size_small": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_SMALL_TOOLBAR)), |
︙ | ︙ | |||
299 300 301 302 303 304 305 | else: self.status("No homepage URL present.") # 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) | | < < < < < < | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | else: self.status("No homepage URL present.") # 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(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 self.thread( lambda: ( self.channel().load(category,reload), reload and self.bookmarks.heuristic_update(self.current_channel,category) ) ) # Thread a function, add to worker pool (for utilizing stop button) def thread(self, target, *args): thread = Thread(target=target, args=args) thread.start() self.working.append(thread) # 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) self.on_reload_clicked(None, reload=0) pass |
︙ | ︙ | |||
381 382 383 384 385 386 387 | # shortcut to statusbar # (hacked to work from within threads, circumvents the statusbar msg pool actually) def status(self, text="", sbar_msg=[]): | < | 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | # shortcut to statusbar # (hacked to work from within threads, circumvents the statusbar msg pool actually) def status(self, text="", sbar_msg=[]): # 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() uikit.do(lambda:self.statusbar.pop(sbar_cid)) # progressbar |
︙ | ︙ |