From 1cb9ebbe83df549b125f33cd2ca2767547c6039a Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 9 Nov 2011 15:32:32 -0600 Subject: [PATCH] remove background/foreground color selection; once, this was a primary feature of byobu :-) It's not really any more; it's trivial to change these in ~/.byobu/color now --- debian/changelog | 3 +++ usr/bin/byobu-config | 48 +++++++++----------------------------------- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 581cbc37..748ae818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,9 @@ byobu (4.47) unreleased; urgency=low - deprecate the keybinding set selection from the config menu - no additional keybindg sets ever showed up, so this option is not worth having + - remove background/foreground color selection; once, this was a + primary feature of byobu :-) It's not really any more; it's + trivial to change these in ~/.byobu/color now -- Dustin Kirkland Tue, 08 Nov 2011 19:16:15 -0600 diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config index daed6da8..15129c79 100755 --- a/usr/bin/byobu-config +++ b/usr/bin/byobu-config @@ -98,13 +98,11 @@ def menu(snackScreen, size, isInstalled): li = Listbox(height = 9, width = 60, returnExit = 1) li.append(_("Help -- Quick Start Guide"), 1) - li.append(_("Change Byobu's background color"), 2) - li.append(_("Change Byobu's foreground color"), 3) - li.append(_("Toggle status notifications"), 4) - li.append(_("Change escape sequence"), 5) - li.append(_("Create new windows"), 6) - li.append(_("Manage default windows"), 7) - li.append(installtext, 8) + li.append(_("Toggle status notifications"), 2) + li.append(_("Change escape sequence"), 3) + li.append(_("Create new windows"), 4) + li.append(_("Manage default windows"), 5) + li.append(installtext, 6) bb = ButtonBar(snackScreen, (("Exit", "exit", ESC),), compact=1) g = GridForm(snackScreen, _(" Byobu Configuration Menu"), 1, 2) @@ -145,30 +143,6 @@ def help(snackScreen, size, config): return 100 -def select_color(snackScreen, size, layer): - li = Listbox(height = 8, width = 60, scroll = 1, returnExit = 1) - - for choice in commands.getoutput('byobu-select-profile -l').splitlines(): - li.append(choice, choice) - - bb = ButtonBar(snackScreen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact = 1) - - if layer == "foreground": - g = GridForm(snackScreen, _("Choose a foreground color:"), 1, 2) - else: - g = GridForm(snackScreen, _("Choose a background color:"), 1, 2) - - g.add(li, 0, 0, padding=(4,2,4,2)) - g.add(bb, 0, 1, padding=(1,1,0,0)) - - if bb.buttonPressed(g.runOnce()) != "cancel": - if layer == "foreground": - commands.getoutput('byobu-select-profile --foreground %s' % li.current()) - else: - commands.getoutput('byobu-select-profile --background %s' % li.current()) - reload_required() - return 100 - def newwindow(snackScreen, size): title=Entry(8, text="shell", returnExit=1) titlel=Label(_("Title: ")) @@ -516,18 +490,14 @@ def main(): if tag == 1: tag = help(snackScreen, size, config) elif tag == 2: - tag = select_color(snackScreen, size, "background") - elif tag == 3: - tag = select_color(snackScreen, size, "foreground") - elif tag == 4: tag = togglestatus(snackScreen, size) - elif tag == 5: + elif tag == 3: tag = chgesc(snackScreen, size) - elif tag == 6: + elif tag == 4: tag = newwindow(snackScreen, size) - elif tag == 7: + elif tag == 5: tag = defaultwindows(snackScreen, size) - elif tag == 8: + elif tag == 6: tag = install(snackScreen, size, isInstalled) isInstalled = autolaunch()