Check-in [edc282b52b]
Overview
Comment: | Resize logo together with toolbar buttons. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
edc282b52b6d5ebea8f36cc4da634e12 |
User & Date: | mario on 2015-05-14 00:05:48 |
Other Links: | manifest | tags |
Context
2015-05-14
| ||
18:39 | Add feature plugin icon. check-in: 1c2efe11f1 user: mario tags: trunk | |
00:05 | Resize logo together with toolbar buttons. check-in: edc282b52b user: mario tags: trunk | |
2015-05-13
| ||
19:00 | Make favicon redisplay work after google_find_homepage() and existing icons in cache. Shorter timeout/display for status label for google search. check-in: 56776a4e90 user: mario tags: trunk | |
Changes
Modified channels/__init__.py from [5f327fb17e] to [ef7bb71538].
︙ | ︙ | |||
402 403 404 405 406 407 408 | def postprocess_filter_homepage(self, row, channel): if not row.get("homepage"): url = self.rx_www_url.search(row.get("title", "")) if url: url = url.group(0).lower().replace(" ", "") url = (url if url.find("www.") == 0 else "www."+url) row["homepage"] = ahttp.fix_url(url) | < | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | def postprocess_filter_homepage(self, row, channel): if not row.get("homepage"): url = self.rx_www_url.search(row.get("title", "")) if url: url = url.group(0).lower().replace(" ", "") url = (url if url.find("www.") == 0 else "www."+url) row["homepage"] = ahttp.fix_url(url) return True # Finds differences in new/old streamlist, marks deleted with flag def deleted_streams(self, new, old): diff = [] new = [row.get("url","http://example.com/") for row in new] |
︙ | ︙ |
Modified st2.py from [4c26e084be] to [1e001a73a8].
︙ | ︙ | |||
89 90 91 92 93 94 95 | # constructor def __init__(self): # Load stylesheet, instantiate GtkBuilder in self, menu and logo hooks gui_startup(1/20.0), gtk.Builder.__init__(self) gui_startup(1/20.0), gtk.Builder.add_from_string(self, ui_xml) | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | # constructor def __init__(self): # Load stylesheet, instantiate GtkBuilder in self, menu and logo hooks gui_startup(1/20.0), gtk.Builder.__init__(self) gui_startup(1/20.0), gtk.Builder.add_from_string(self, ui_xml) gui_startup(3/20.0), self.logo_scale(1.0) # initialize built-in plugins self.channels = { "bookmarks": channels.bookmarks.bookmarks(parent=self), # this the remaining built-in channel } # dialogs that are connected to main self.features = { |
︙ | ︙ | |||
143 144 145 146 147 148 149 | "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)), | | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | "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), self.logo_scale(0.40)), "menu_toolbar_size_medium": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DND), self.logo_scale(0.75)), "menu_toolbar_size_large": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DIALOG), self.logo_scale(1.0)), "menu_notebook_pos_top": lambda w: self.notebook_channels.set_tab_pos(2), "menu_notebook_pos_left": lambda w: self.notebook_channels.set_tab_pos(0), "menu_notebook_pos_right": lambda w: self.notebook_channels.set_tab_pos(1), "menu_notebook_pos_bottom": lambda w: self.notebook_channels.set_tab_pos(3), # win_config "menu_properties": self.configwin.open, "config_cancel": self.configwin.hide, |
︙ | ︙ | |||
425 426 427 428 429 430 431 432 433 434 435 436 | else: self.features[name] = plugin_obj except Exception as e: log.INIT("load_plugin_channels: error initializing:", name, ", exception:") traceback.print_exc() # load application state (widget sizes, selections, etc.) def init_app_state(self): winlayout = conf.load("window") if (winlayout): | > > > > > > > > > > > | > > | | 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | else: self.features[name] = plugin_obj except Exception as e: log.INIT("load_plugin_channels: error initializing:", name, ", exception:") traceback.print_exc() # Redraw logo def logo_scale(self, r=1.0, map=None): pix = uikit.pixbuf(logo.png, decode=1, fmt="png") if map and map in (2,5,0): 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) # load application state (widget sizes, selections, etc.) def init_app_state(self): winlayout = conf.load("window") if (winlayout): try: uikit.app_restore(self, winlayout) self.logo_scale(map=winlayout["toolbar"]["icon_size"]) except Exception as e: log.APPSTATE_RESTORE(e) # may fail for disabled/reordered plugin channels # store window/widget states (sizes, selections, etc.) def save_app_state(self, widget): # gtk widget states widgetnames = ["win_streamtuner2", "toolbar", "notebook_channels", ] \ + [id+"_list" for id in self.channel_names] \ |
︙ | ︙ |
Modified uikit.py from [fe56c2beaf] to [b587b433a7].
︙ | ︙ | |||
418 419 420 421 422 423 424 | pos = len(uikit.idle_tasks) # Run callback right away if uikit.in_idle or conf.nothreads: log.UIKIT_RUN_NOW(name) callback(*args, **kwargs) # Spool them for Gtk idle handling else: | | | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 | pos = len(uikit.idle_tasks) # Run callback right away if uikit.in_idle or conf.nothreads: log.UIKIT_RUN_NOW(name) callback(*args, **kwargs) # Spool them for Gtk idle handling else: #log.UIKIT_SPOOL(name) uikit.idle_tasks.insert(pos, [lambda: callback(*args, **kwargs), name]) gobject.idle_add(uikit.idle_do) # Collect tasks to perform in gtk.main loop idle_tasks = [] in_idle = False |
︙ | ︙ |