Check-in [9a4aa0b793]
Overview
| Comment: | Moved add_plugin_defaults from main into GenericChannel constructor. Check for percentage>=0 in progress indicator of statusbar. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9a4aa0b793543675564ca75bf3886e47 |
| User & Date: | mario on 2015-04-01 15:47:36 |
| Other Links: | manifest | tags |
Context
|
2015-04-01
| ||
| 15:49 | Trim down plugin comment. check-in: c8c55c79da user: mario tags: trunk | |
| 15:47 | Moved add_plugin_defaults from main into GenericChannel constructor. Check for percentage>=0 in progress indicator of statusbar. check-in: 9a4aa0b793 user: mario tags: trunk | |
| 15:45 | Split extension_main and extension_context menus. Fix pixmap icon back. check-in: 04f454a7a3 user: mario tags: trunk | |
Changes
Modified channels/__init__.py from [d3c6459236] to [ed3951c050].
| ︙ | |||
130 131 132 133 134 135 136 137 138 139 140 141 142 143 | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | + + + |
self.gtk_list = None
self.gtk_cat = None
self.module = self.__class__.__name__
self.meta = plugin_meta(None, inspect.getcomments(inspect.getmodule(self)))
self.config = self.meta.get("config", [])
self.title = self.meta.get("title", self.module)
# add default options values to config.conf.* dict
conf.add_plugin_defaults(self.meta["config"], self.module)
# only if streamtuner2 is run in graphical mode
if (parent):
self.cache()
self.gui(parent)
pass
|
| ︙ | |||
193 194 195 196 197 198 199 | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | - + |
# load default category
if (self.current):
self.load(self.current)
else:
uikit.columns(self.gtk_list, self.datamap, [])
# add to main menu
|
| ︙ | |||
584 585 586 587 588 589 590 | 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | - + |
# try to initialize superclass now, before adding to channel tabs
GenericChannel.gui(self, parent)
# add notebook tab
|
| ︙ |
Modified st2.py from [15304419e8] to [e68343b5e8].
| ︙ | |||
94 95 96 97 98 99 100 | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | - - + |
# constructor
def __init__(self):
# Load stylesheet, instantiate GtkBuilder in self, menu and logo hooks
gui_startup(0/20.0), uikit.load_theme(conf.get("theme"))
gui_startup(1/20.0), gtk.Builder.__init__(self)
gui_startup(1/20.0), gtk.Builder.add_from_string(self, ui_xml)
|
| ︙ | |||
209 210 211 212 213 214 215 | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | - - + + |
"streamedit_save": self.streamedit.save,
"streamedit_new": self.streamedit.new,
"streamedit_cancel": self.streamedit.cancel,
}, **self.add_signals))
# actually display main window
self.win_streamtuner2.show_all()
|
| ︙ | |||
389 390 391 392 393 394 395 | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | - + |
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
if (type(text)==float):
|
| ︙ | |||
424 425 426 427 428 429 430 | 423 424 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 | - + - - - + - - + - - - |
# load plugin
try:
plugin = __import__("channels."+module, globals(), None, [""])
#print [name for name,c in inspect.getmembers(plugin) if inspect.isclass(c)]
plugin_class = plugin.__dict__[module]
plugin_obj = plugin_class(parent=self)
|
| ︙ |