Check-in [417fcfdbd5]
Overview
Comment: | Rename `_add` to `_pack`. Support opt= parameter to allow said `pack_*` function to operate on option flags (e.g. `category:` to target widget). |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
417fcfdbd539bcf627e91bf4d9c9792a |
User & Date: | mario on 2017-02-21 23:21:33 |
Other Links: | manifest | tags |
Context
2017-02-21
| ||
23:22 | Add notebook tabs for recordflags plugin. Instead of filtering them, distribute options into notebook tabs "_cfg", "_extra", or "_verbose". check-in: cbec1b81a6 user: mario tags: trunk | |
23:21 | Rename `_add` to `_pack`. Support opt= parameter to allow said `pack_*` function to operate on option flags (e.g. `category:` to target widget). check-in: 417fcfdbd5 user: mario tags: trunk | |
22:06 | Fix verbose/extra merging, `-d` option for directory. check-in: f5b2e2a1e9 user: mario tags: trunk | |
Changes
Modified channels/configwin.py from [7398b09535] to [860639b8e3].
︙ | ︙ | |||
114 115 116 117 118 119 120 | # iterate over channel and feature plugins def add_plugins(self): ls = all_plugin_meta() for name,meta in sorted(ls.items(), key=lambda e: e[1]["type"]+e[1]["title"].lower(), reverse=False): if not name in conf.plugins: conf.plugins[name] = False conf.add_plugin_defaults(meta, name) | | | | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | # iterate over channel and feature plugins def add_plugins(self): ls = all_plugin_meta() for name,meta in sorted(ls.items(), key=lambda e: e[1]["type"]+e[1]["title"].lower(), reverse=False): if not name in conf.plugins: conf.plugins[name] = False conf.add_plugin_defaults(meta, name) pack_ = self.pack_channels if meta.get("type") == "channel" else self.pack_features self.add_plg(name, meta, pack_) pass # Description text plugin_text = "<span size='larger' weight='heavy'>{title}</span> "\ + "<span style='italic' foreground='slate blue'>({type}/{category})</span> "\ + "<span weight='bold' foreground='#777777'>{version}</span>\n"\ + "<span size='smaller' stretch='ultraexpanded'>{description}</span>" # Add [x] plugin setting, and its configuration definitions, set defaults from conf.* def add_plg(self, name, meta, pack_, prefix_="config_"): # Plugin enable button cb = gtk.CheckButton(name) cb.set_sensitive(not meta.get("priority") in ("core", "required", "builtin")) cb.get_children()[0].set_markup(self.plugin_text.format(**meta)) cb.set_tooltip_text(self._tooltip(meta)) pack_("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) type = opt.get("type", "str") desc = opt.get("description", "./.") |
︙ | ︙ | |||
169 170 171 172 173 174 175 | cb = gtk.SpinButton() cb.set_adjustment(adj) cb.set_digits(0) # ListView elif opt["type"] in ("list", "table", "array", "dict"): cb, ls = uikit.config_treeview(opt, opt.get("columns", "Key,Value").split(",")) | | | | | | | | | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | cb = gtk.SpinButton() cb.set_adjustment(adj) cb.set_digits(0) # ListView elif opt["type"] in ("list", "table", "array", "dict"): cb, ls = uikit.config_treeview(opt, opt.get("columns", "Key,Value").split(",")) pack_("cfgui_tv", cb, "", None, opt=opt) self.widgets["config_" + opt["name"]] = ls pack_({}, uikit.label("<small>%s</small>" % desc, markup=True, size=455)) continue # text field else: cb = gtk.Entry() pack_( prefix_+opt["name"], cb, desc, color, opt=opt ) # spacer between plugins pack_( None, gtk.HSeparator() ) # Reformat `doc` linebreaks for gtk.tooltip def _tooltip(self, meta): doc = meta.get("doc", "").strip() if ver < 3: doc = re.sub("(?<=\S) *\n(?! *\n)", " ", doc) return doc # Put config widgets into channels/features configwin notebooks def pack_channels(self, id=None, w=None, label=None, color=None, image=None, align=20, opt={}): self.plugin_options.pack_start(uikit.wrap(self.widgets, id, w, label, color, image, align, label_markup=1)) # Separate tab for non-channel plugins def pack_features(self, id=None, w=None, label=None, color=None, image=None, align=20, opt={}): self.feature_options.pack_start(uikit.wrap(self.widgets, id, w, label, color, image, align, label_markup=1)) # 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() |