Fixes for Bug #333189

Add a reload key, <ctrl-a> ~
This commit is contained in:
Dustin Kirkland 2009-02-23 11:06:33 -06:00
commit 0f7a0f5f3b
5 changed files with 16 additions and 18 deletions

View file

@ -70,14 +70,14 @@ fi
# If apt-check binary exists, use it
if [ -x /usr/lib/update-notifier/apt-check ]; then
u=`/usr/lib/update-notifier/apt-check 2>&1 | tail -n 1 | sed "s/;/ /"`
echo $u > $mycache
echo "$u" > $mycache
print_updates $u
fi
# If apt-get exists, use it
if [ -x /usr/bin/apt-get ]; then
u=`/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst`
echo $u > $mycache
echo "$u" > $mycache
print_updates $u
fi

7
debian/changelog vendored
View file

@ -1,8 +1,11 @@
screen-profiles (1.27) UNRELEASED; urgency=low
*
Fix for LP: #333189:
* keybindings/common: add profile reload shortcut, "ctrl-a ~"
* screen-profiles: updated messages to point to ^a ~
* po/*: updated for the new message
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 19 Feb 2009 19:25:50 -0600
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 23 Feb 2009 10:04:43 -0600
screen-profiles (1.26-0ubuntu1) jaunty; urgency=low

View file

@ -45,3 +45,6 @@ bindkey -k k9 screen -t help 0 screen-profiles # F9 | Configuration
# F11 | 'fullscreen' in gnome-terminal
bindkey -k F2 lockscreen # F12 | Lock this terminal
# Hot-reload profile
register r "^a:source ~/.screenrc-profile"
bind ~ process r

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-09 15:07-0600\n"
"POT-Creation-Date: 2009-02-23 11:05-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -89,18 +89,14 @@ msgstr ""
msgid "Message"
msgstr ""
#: screen-profiles:143
msgid "Restart screen to apply the new profile"
#: screen-profiles:143 screen-profiles:160 screen-profiles:390
msgid "Use '<ctrl-a> ~ <enter>' to enable your changes."
msgstr ""
#: screen-profiles:155
msgid "Which set of keybindings would you like to use?"
msgstr ""
#: screen-profiles:160
msgid "Restart screen to apply the new keybindings"
msgstr ""
#: screen-profiles:171
msgid "Title: "
msgstr ""
@ -153,10 +149,6 @@ msgstr ""
msgid "Change escape sequence:"
msgstr ""
#: screen-profiles:390
msgid "Restart screen to enact your changes."
msgstr ""
#: screen-profiles:403
msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
msgstr ""

View file

@ -140,7 +140,7 @@ def profile(screen, size):
if bb.buttonPressed(g.runOnce()) != "cancel":
commands.getoutput('select-screen-profile --set %s' % li.current())
button = messagebox(screen, 60, 2, _("Message"), _("Restart screen to apply the new profile"), \
button = messagebox(screen, 60, 2, _("Message"), _("Use '<ctrl-a> ~ <enter>' to enable your changes."), \
buttons=((_("Okay"),"okay"), (_("Exit"), "exit")) )
if button == "exit":
return 0
@ -157,7 +157,7 @@ def keybindings(screen, size):
g.add(bb, 0, 1, padding=(1,1,0,0))
if bb.buttonPressed(g.runOnce()) != "cancel":
switch_keybindings(li.current())
button = messagebox(screen, 60, 2, _("Message"), _("Restart screen to apply the new keybindings"), \
button = messagebox(screen, 60, 2, _("Message"), _("Use '<ctrl-a> ~ <enter>' to enable your changes."), \
buttons=((_("Okay"),"okay"), (_("Exit"), "exit")) )
if button == "exit":
return 0
@ -387,7 +387,7 @@ def chgesc(screen, size):
if bb.buttonPressed(which) != "cancel":
setesckey(esc.value())
button = messagebox(screen, 60, 2, _("Message"), \
_("Restart screen to enact your changes."), \
_("Use '<ctrl-a> ~ <enter>' to enable your changes."), \
buttons=((_("Okay"),"okay"), (_("Exit"), "exit")) )
if button == "exit":
return 0