Index: channels/configwin.py ================================================================== --- channels/configwin.py +++ channels/configwin.py @@ -137,12 +137,15 @@ def add_plg(self, name, meta, add_): # add plugin load entry cb = gtk.CheckButton(name) cb.set_sensitive(not meta.get("priority") in ("core", "required", "builtin")) cb.get_children()[0].set_markup(self.plugin_text % (meta.get("title", name), meta.get("type", "plugin"), meta.get("category", "addon"), meta.get("version", "./."), meta.get("description", "no description"))) - cb.set_tooltip_text(re.sub("(?<=\S) *\n(?! *\n)", " ",meta.get("doc", "")).strip()) - add_( "config_plugins_"+name, cb, color=meta.get("color"), image=meta.get("png")) + doc = meta.get("doc", "").strip() + if ver < 3: + doc = re.sub("(?<=\S) *\n(?! *\n)", " ", doc) + cb.set_tooltip_text(doc) + add_( "config_plugins_"+name, cb, color=meta.get("color"), image=meta.get("png"), align=0) # default values are already in conf[] dict (now done in conf.add_plugin_defaults) for opt in meta["config"]: color = opt.get("color", None) # display checkbox @@ -160,11 +163,11 @@ # spacer add_( "filler_pl_"+name, gtk.HSeparator() ) # Wrap entries/checkboxes with extra label, background, images, etc. - def wrap_entry(self, id, w, label, color, image): + def wrap_entry(self, id, w, label, color, image, align=1): if id: self.widgets[id] = w if label: if type(w) is gtk.Entry: w.set_width_chars(11) @@ -173,23 +176,28 @@ pix = gtk.image_new_from_pixbuf(uikit.pixbuf(image)) if pix: w = uikit.hbox(w, pix, exr=False) if color: w = uikit.bg(w, color) + if align: + a = gtk.Alignment() + a.set_padding(0, 0, align, 0) + a.add(w) + w = a return w # Put config widgets into channels/features configwin notebooks - def add_channels(self, id=None, w=None, label=None, color=None, image=None): - self.plugin_options.pack_start(self.wrap_entry(id, w, label, color, image)) + def add_channels(self, id=None, w=None, label=None, color=None, image=None, align=20): + self.plugin_options.pack_start(self.wrap_entry(id, w, label, color, image, align)) # Separate tab for non-channel plugins - def add_features(self, id=None, w=None, label=None, color=None, image=None): - self.feature_options.pack_start(self.wrap_entry(id, w, label, color, image)) + def add_features(self, id=None, w=None, label=None, color=None, image=None, align=20): + self.feature_options.pack_start(self.wrap_entry(id, w, label, color, image, align)) # save config def save(self, widget): self.save_config(conf.__dict__, "config_") self.save_config(conf.plugins, "config_plugins_") [callback() for callback in self.hooks["config_save"]] conf.save(nice=1) self.hide() Index: channels/streamedit.py ================================================================== --- channels/streamedit.py +++ channels/streamedit.py @@ -22,11 +22,11 @@ class streamedit (AuxiliaryWindow): # show stream data editing dialog def open(self, mw): self.main.configwin.load_config(self.main.row(), "streamedit_") - self.win_streamedit.show() + self.win_streamedit.show_all() # copy widget contents to stream def save(self, w): self.main.configwin.save_config(self.main.row(), "streamedit_") self.main.channel().save() Index: gtk3.xml.gz ================================================================== --- gtk3.xml.gz +++ gtk3.xml.gz cannot compute difference between binary files Index: uikit.py ================================================================== --- uikit.py +++ uikit.py @@ -461,11 +461,11 @@ return w # Create GtkLabel @staticmethod - def label(text, size=400, markup=0): + def label(text, size=305, markup=0): label = gtk.Label(text) if markup: label.set_markup(text) #######label.set_property("visible", True) label.set_line_wrap(True) @@ -473,11 +473,11 @@ return label # Wrap two widgets in horizontal box @staticmethod def hbox(w1, w2, exr=True): - b = gtk.HBox(homogeneous=False, spacing=10) + b = gtk.HBox(homogeneous=False, spacing=5) ######b.set_property("visible", True) b.pack_start(w1, expand=not exr, fill=not exr) b.pack_start(w2, expand=exr, fill=exr) return b