github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

screen-profiles (1.34-0ubuntu1) jaunty; urgency=low

Browse source 
Fixes for Bug #339186
* screen-profiles: remove welcome screen toggle support; collapsed into a
  tooltip on the status line
* windows/common: remove screen-profiles default window; now launched from
  tooltip
* profiles/profile.skel: add Menu:F9 tool tip to far right of window bar

 -- Dustin Kirkland <kirkland@ubuntu.com>Sat, 07 Mar 2009 08:49:22 -0600
This commit is contained in:
Dustin Kirkland 2009-03-07 08:49:35 -06:00
commit 3442c88de7
5 changed files with 54 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

11
debian/changelog vendored
View file

@ -1,8 +1,13 @@
screen-profiles (1.34) unreleased; urgency=low screen-profiles (1.34-0ubuntu1) jaunty; urgency=low
* Fixes for LP: #339186
* screen-profiles: remove welcome screen toggle support; collapsed into a
tooltip on the status line
* windows/common: remove screen-profiles default window; now launched from
tooltip
* profiles/profile.skel: add Menu:F9 tool tip to far right of window bar
-- Dustin Kirkland <kirkland@ubuntu.com> Sat, 07 Mar 2009 01:12:29 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Sat, 07 Mar 2009 08:49:22 -0600
screen-profiles (1.33-0ubuntu1) jaunty; urgency=low screen-profiles (1.33-0ubuntu1) jaunty; urgency=low

102
po/screen-profiles.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-28 11:55-0600\n" "POT-Creation-Date: 2009-03-07 08:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -16,151 +16,127 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: screen-profiles:72 #: screen-profiles:71
msgid "Remove screen by default at login" msgid "Remove screen by default at login"
msgstr "" msgstr ""
#: screen-profiles:74 #: screen-profiles:73
msgid "Install screen by default at login" msgid "Install screen by default at login"
msgstr "" msgstr ""
#: screen-profiles:76 #: screen-profiles:77
msgid "Launch Screen Profiles Configuration on startup"
msgstr ""
#: screen-profiles:78
msgid "Do not launch Screen Profiles Configuration on startup"
msgstr ""
#: screen-profiles:82
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: screen-profiles:83 #: screen-profiles:78
msgid "Change screen profile" msgid "Change screen profile"
msgstr "" msgstr ""
#: screen-profiles:84 #: screen-profiles:79
msgid "Change keybinding set" msgid "Change keybinding set"
msgstr "" msgstr ""
#: screen-profiles:85 #: screen-profiles:80
msgid "Change escape sequence" msgid "Change escape sequence"
msgstr "" msgstr ""
#: screen-profiles:86 #: screen-profiles:81
msgid "Create new window(s)" msgid "Create new window(s)"
msgstr "" msgstr ""
#: screen-profiles:87 #: screen-profiles:82
msgid "Manage default windows" msgid "Manage default windows"
msgstr "" msgstr ""
#: screen-profiles:90 screen-profiles:103 #: screen-profiles:84
msgid "Okay"
msgstr ""
#: screen-profiles:90
msgid "Exit" msgid "Exit"
msgstr "" msgstr ""
#: screen-profiles:92 screen-profiles:422 #: screen-profiles:86 screen-profiles:391
msgid " Screen Profiles Configuration" msgid " Screen Profiles Configuration Menu"
msgstr "" msgstr ""
#: screen-profiles:103 screen-profiles:139 screen-profiles:155 #: screen-profiles:97
#: screen-profiles:190 screen-profiles:279 screen-profiles:384 msgid "Okay"
msgstr ""
#: screen-profiles:97 screen-profiles:133 screen-profiles:149
#: screen-profiles:184 screen-profiles:274 screen-profiles:352
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: screen-profiles:121 screen-profiles:148 screen-profiles:162 #: screen-profiles:115 screen-profiles:142 screen-profiles:156
#: screen-profiles:315 screen-profiles:331 screen-profiles:339 #: screen-profiles:299 screen-profiles:307 screen-profiles:380
#: screen-profiles:411
msgid "Menu" msgid "Menu"
msgstr "" msgstr ""
#: screen-profiles:122 #: screen-profiles:116
msgid "Screen Profiles Help" msgid "Screen Profiles Help"
msgstr "" msgstr ""
#: screen-profiles:139 screen-profiles:155 #: screen-profiles:133 screen-profiles:149 screen-profiles:184
#: screen-profiles:274 screen-profiles:352
msgid "Apply" msgid "Apply"
msgstr "" msgstr ""
#: screen-profiles:141 #: screen-profiles:135
msgid "Which profile would you like to use?" msgid "Which profile would you like to use?"
msgstr "" msgstr ""
#: screen-profiles:147 screen-profiles:161 screen-profiles:338 #: screen-profiles:141 screen-profiles:155 screen-profiles:306
#: screen-profiles:409 #: screen-profiles:378
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: screen-profiles:156 #: screen-profiles:150
msgid "Which set of keybindings would you like to use?" msgid "Which set of keybindings would you like to use?"
msgstr "" msgstr ""
#: screen-profiles:170 #: screen-profiles:164
msgid "Title: " msgid "Title: "
msgstr "" msgstr ""
#: screen-profiles:172 #: screen-profiles:166
msgid "Command: " msgid "Command: "
msgstr "" msgstr ""
#: screen-profiles:174 #: screen-profiles:168
msgid "Presets: " msgid "Presets: "
msgstr "" msgstr ""
#: screen-profiles:188 #: screen-profiles:182
msgid "Add to default windows" msgid "Add to default windows"
msgstr "" msgstr ""
#: screen-profiles:190 #: screen-profiles:186
msgid "Create"
msgstr ""
#: screen-profiles:191
msgid "Create new window(s):" msgid "Create new window(s):"
msgstr "" msgstr ""
#: screen-profiles:271 #: screen-profiles:266
msgid "Windows:" msgid "Windows:"
msgstr "" msgstr ""
#: screen-profiles:279 screen-profiles:384 #: screen-profiles:276
msgid "Save"
msgstr ""
#: screen-profiles:281
msgid "Select window(s) to create by default:" msgid "Select window(s) to create by default:"
msgstr "" msgstr ""
#: screen-profiles:308 #: screen-profiles:296
msgid "Screen Profiles Configuration will be launched automatically."
msgstr ""
#: screen-profiles:312
msgid "Screen Profiles Configuration will be not launched automatically."
msgstr ""
#: screen-profiles:328
msgid "Screen will be launched automatically next time you login." msgid "Screen will be launched automatically next time you login."
msgstr "" msgstr ""
#: screen-profiles:336 #: screen-profiles:304
msgid "Screen will not be used next time you login." msgid "Screen will not be used next time you login."
msgstr "" msgstr ""
#: screen-profiles:383 #: screen-profiles:351
msgid "Escape key: ctrl-" msgid "Escape key: ctrl-"
msgstr "" msgstr ""
#: screen-profiles:385 #: screen-profiles:354
msgid "Change escape sequence:" msgid "Change escape sequence:"
msgstr "" msgstr ""
#: screen-profiles:423 #: screen-profiles:392
msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates" msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
msgstr "" msgstr ""

2
profiles/profile.skel
View file

@ -22,7 +22,7 @@
source /usr/share/screen-profiles/profiles/common source /usr/share/screen-profiles/profiles/common
# Window tabs, second to last line # Window tabs, second to last line
caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{=b Wk}%110`@%109`" caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{=b Wk}Menu:<F9>"
# Status string, last line # Status string, last line
hardstatus string '__LOGO__%{=b Wk} %100` %{= Wk} %= %{=b bW}%102`%{= Wk} %{=b rW}%101`%{= Wk} %{= Wg}%108`%{= Wk} %{= Yk}%106`%{= Wk} %{= Wk}%104`%{=b cW}%103`%{= Wk} %{=b gW}%105`,%107`%{= Wk} %Y-%m-%d %0c:%s' hardstatus string '__LOGO__%{=b Wk} %100` %{= Wk} %= %{=b bW}%102`%{= Wk} %{=b rW}%101`%{= Wk} %{= Wg}%108`%{= Wk} %{= Yk}%106`%{= Wk} %{= Wk}%104`%{=b cW}%103`%{= Wk} %{=b gW}%105`,%107`%{= Wk} %Y-%m-%d %0c:%s'

47
screen-profiles
View file

@ -30,7 +30,6 @@ HOME=os.getenv("HOME")
SHARE='/usr/share/screen-profiles' SHARE='/usr/share/screen-profiles'
DOC='/usr/share/doc/screen-profiles' DOC='/usr/share/doc/screen-profiles'
DEF_ESC="A" DEF_ESC="A"
WELCOME = "screen -t welcome 1 screen-profiles"
RELOAD = "If you are using the default set of keybindings, press\n<F5><enter> to activate these changes.\n\nOtherwise, exit this screen session and start a new one." RELOAD = "If you are using the default set of keybindings, press\n<F5><enter> to activate these changes.\n\nOtherwise, exit this screen session and start a new one."
gettext.bindtextdomain('screen-profiles', SHARE+'/po') gettext.bindtextdomain('screen-profiles', SHARE+'/po')
@ -67,18 +66,14 @@ def terminal_size(): ### decide on *some* terminal size
cr = (25, 80) cr = (25, 80)
return int(cr[1]-5), int(cr[0]-5) # reverse rows, cols return int(cr[1]-5), int(cr[0]-5) # reverse rows, cols
def menu(screen, size, isInstalled, welcome): def menu(screen, size, isInstalled):
if isInstalled: if isInstalled:
installtext=_("Remove screen by default at login") installtext=_("Remove screen by default at login")
else: else:
installtext=_("Install screen by default at login") installtext=_("Install screen by default at login")
if welcome:
welcometext=_("Launch Screen Profiles Configuration on startup")
else:
welcometext=_("Do not launch Screen Profiles Configuration on startup")
li = Listbox(height = 8, width = 60, returnExit = 1) li = Listbox(height = 7, width = 60, returnExit = 1)
li.append(_("Help"), 1) li.append(_("Help"), 1)
li.append(_("Change screen profile"), 2) li.append(_("Change screen profile"), 2)
li.append(_("Change keybinding set"), 3) li.append(_("Change keybinding set"), 3)
@ -86,10 +81,9 @@ def menu(screen, size, isInstalled, welcome):
li.append(_("Create new window(s)"), 5) li.append(_("Create new window(s)"), 5)
li.append(_("Manage default windows"), 6) li.append(_("Manage default windows"), 6)
li.append(installtext, 7) li.append(installtext, 7)
li.append(welcometext, 8)
bb = ButtonBar(screen, ((_("Exit"), )), compact = 1) bb = ButtonBar(screen, ((_("Exit"), )), compact = 1)
g = GridForm(screen, _(" Screen Profiles Configuration"), 1, 2) g = GridForm(screen, _(" Screen Profiles Configuration Menu"), 1, 2)
g.add(li, 0, 0, padding=(4,2,4,2)) g.add(li, 0, 0, padding=(4,2,4,2))
g.add(bb, 0, 1, padding=(1,1,0,0)) g.add(bb, 0, 1, padding=(1,1,0,0))
@ -295,33 +289,6 @@ def defaultwindows(screen, size):
return 100 return 100
def welcomeOn():
path=HOME+'/.screen-profiles/windows'
line = commands.getoutput("grep '^"+WELCOME+"' "+path)
if line == "":
return 1
else:
return 0
def togglewelcome(screen, size, welcome):
if welcome:
togglewelcomeon()
out = _("Screen Profiles Configuration will be launched automatically.")
rc = 101
else:
togglewelcomeoff()
out = _("Screen Profiles Configuration will be not launched automatically.")
rc = 100
button = messagebox(screen, 70, 2, "Message", out, \
buttons=((_("Menu"), )))
return rc
def togglewelcomeon():
commands.getoutput("sed -i -e 's/^#"+WELCOME+"/"+WELCOME+"/' "+HOME+'/.screen-profiles/windows')
def togglewelcomeoff():
commands.getoutput("sed -i -e 's/^"+WELCOME+"/#"+WELCOME+"/' "+HOME+'/.screen-profiles/windows')
def install(screen, size, isInstalled): def install(screen, size, isInstalled):
if not isInstalled: if not isInstalled:
out = commands.getoutput("bash /usr/share/screen-profiles/screen-launcher-install") out = commands.getoutput("bash /usr/share/screen-profiles/screen-launcher-install")
@ -421,18 +388,17 @@ def main():
size = terminal_size() size = terminal_size()
screen = SnackScreen() screen = SnackScreen()
screen.drawRootText(1,0,_(' Screen Profiles Configuration')) screen.drawRootText(1,0,_(' Screen Profiles Configuration Menu'))
screen.pushHelpLine(_('<Tab>/<Alt-Tab> between elements | <Return> Validates')) screen.pushHelpLine(_('<Tab>/<Alt-Tab> between elements | <Return> Validates'))
config = SafeConfigParser() config = SafeConfigParser()
isInstalled = (commands.getoutput('grep screen-launcher '+(HOME+'/.profile')) != "") isInstalled = (commands.getoutput('grep screen-launcher '+(HOME+'/.profile')) != "")
welcome = welcomeOn()
tag = 100 tag = 100
while tag > 0 : while tag > 0 :
tag = menu(screen, size, isInstalled, welcome) tag = menu(screen, size, isInstalled)
if tag == 1: if tag == 1:
tag = help(screen, size, config) tag = help(screen, size, config)
elif tag == 2: elif tag == 2:
@ -448,9 +414,6 @@ def main():
elif tag == 7: elif tag == 7:
tag = install(screen, size, isInstalled) tag = install(screen, size, isInstalled)
isInstalled=(tag == 100) isInstalled=(tag == 100)
elif tag == 8:
tag = togglewelcome(screen, size, welcome)
welcome=(tag == 100)
screen.finish() screen.finish()
sys.exit(0) sys.exit(0)

3
windows/common
View file

@ -1,3 +1,2 @@
# Default windows # Default windows
screen -t shell 2 motd+shell screen -t shell 0 motd+shell
screen -t welcome 1 screen-profiles