Merged and fixed up Nick's changes, details in the changelog

This commit is contained in:
Dustin Kirkland 2008-12-17 21:50:17 -06:00
commit 00df1d7a36
13 changed files with 155 additions and 91 deletions

15
debian/changelog vendored
View file

@ -1,4 +1,19 @@
screen-profiles (1.1) UNRELEASED; urgency=low
[ Nicolas Barcet ]
* Key binding framework basis
* Added some sensible key bindings
* First pot and translation to french
[ Dustin Kirkland ]
* created keybindings directory, moved keybindings there
* removed po4a directory, in favor of Nick's po directory
* changed 'less' to /usr/bin/sensible-pager, depend on debianutils
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 17 Dec 2008 21:50:01 -0600
screen-profiles (1.0) UNRELEASED; urgency=low
[ Dustin Kirkland ]
* Initial upload (LP: #308789)
- ubuntu, debian, redhat, fedora profiles

2
debian/control vendored
View file

@ -9,7 +9,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/screen-profiles/main
Package: screen-profiles
Architecture: all
Depends: debconf (>= 0.5) | debconf-2.0, screen, gettext-base
Depends: debconf (>= 0.5) | debconf-2.0, screen, gettext-base, debianutils
Recommends: update-notifier-common
Description: a set of useful profiles and a profile-switcher for GNU screen
screen-profiles includes a set of profiles for the GNU screen window manager.

1
debian/dirs vendored
View file

@ -1,4 +1,5 @@
usr/bin
usr/share/screen-profiles
usr/share/screen-profiles/bin
usr/share/screen-profiles/keybindings
usr/share/screen-profiles/profiles

1
debian/docs vendored
View file

@ -1 +1,2 @@
README
doc/help.txt

1
debian/install vendored
View file

@ -6,4 +6,5 @@ bin/updates-available usr/share/screen-profiles/bin
profiles/common usr/share/screen-profiles/profiles
profiles/debian.screenrc usr/share/screen-profiles/profiles
profiles/ubuntu.screenrc usr/share/screen-profiles/profiles
keybindings/common usr/share/screen-profiles/keybindings
select-screen-profile usr/bin

View file

@ -1,29 +1,24 @@
Screen key bindings, page 1 of 1.
Command key: ^A Literal ^A: a
********************************************
** Welcome to the screen powered terminal **
********************************************
The main benefits of the screen program is that your session can have
multiple windows and keep context between multiple logins. You will also
notice the task bar at the bottom that informs you of various system
status, update waiting to be applied and which window you are currently
running on.
break ^B b license , removebuf =
clear C lockscreen ^X x reset Z
colon : log H screen ^C c
copy ^[ [ login L select '
detach ^D d meta a silence _
digraph ^V monitor M split S
displays * next ^@ ^N sp n suspend ^Z z
dumptermcap . number N time ^T t
fit F only Q title A
flow ^F f other ^A vbell ^G
focus ^I pow_break B version v
hardcopy h pow_detach D width W
help ? prev ^H ^P p ^? windows ^W w
history { } quit \ wrap ^R r
info i readbuf < writebuf >
kill K k redisplay ^L l xoff ^S s
lastmsg ^M m remove X xon ^Q q
A complete help on the screen program can be obtained using the 'man screen'
command. Note that our implementation remaps the escape prefix to ctrl-G
instead of the standard ctrl-A.
paste . ^] windowlist " select - -
select 0 0 select 1 1 select 2 2
select 3 3 select 4 4 select 5 5
select 6 6 select 7 7 select 8 8
select 9 9 login on I login off O
paste . ] split -v | focus up :kB:
Some usefull mappings (where C- means ctrl):
-------------------------------------------------------------------
shift-tab Goto next window | F1 Basic help (this)
C-pgup Goto previous window | F2 Advanced help
C-pgdown Goto next window | F4 Create new window
C-shift-del Detach and logout | F6 Close current window
-------------------------------------------------------------------
Note that these bindings have been tested for xterm type terminal such as
gnome-terminal, but may need some adjustments elsewhere.

45
keybindings/common Normal file
View file

@ -0,0 +1,45 @@
###############################################################################
# GNU Screen common keybindings
# This configuration profile is intended to be a common header of useful
# keybindings, included by other profiles.
#
# Copyright (C) 2008 Nick Barcet <nick.barcet@canonical.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###############################################################################
# This file defines Key bindings
# bindkey commands should be followed by a comment that will be used in the
# help file (one day). The command should be formated as:
# <keys> | explanation
escape ^Gg
# Maps for next and previous windows
bindkey "\033[Z" next # Shift-tab | Next window
bindkey ^[[6;5~ prev # C-pgup | Previous window
bindkey ^[[5;5~ next # C-pgdn | Pext window
# Maps to create and remove windows
register n "^g^c ^gA"
bindkey -k k4 process n # F4 | Create new window
bindkey -k k6 kill # F6 | Close window
# Maps for help
bindkey -k k1 screen -t help 0 less /usr/share/doc/screen-profiles/help.txt # F1 | Basic help (this)
bindkey -k k2 help # F2 | Advanced help
# power detach
register x "^g^d D"
bindkey ^[[3;6~ process x # C-shift-del | Detach and logout

33
po/fr.po Normal file
View file

@ -0,0 +1,33 @@
# GNU Screen Profiles
# Copyright (C) 2008 Dustin Kirkland
# This file is distributed under the same license as the GNU Screen Profiles package.
# Nicolas Barcet <nicolas.barcet@ubuntu.com>, 2008.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-12-17 23:42+0100\n"
"PO-Revision-Date: 2008-12-17 23:42+0100\n"
"Last-Translator: Nicolas Barcet <nicolas.barcet@ubuntu.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: select-screen-profile:9 select-screen-profile:16
msgid "Error:"
msgstr "Erreur:"
#: select-screen-profile:9 select-screen-profile:16
msgid "exists, but is not a symlink"
msgstr "existe, mais n'est pas un lien symbolique"
#: select-screen-profile:30
msgid "recommended"
msgstr "recommandé"
#: select-screen-profile:41 select-screen-profile:43
msgid "Choose"
msgstr "Choisir"

33
po/screen-profiles.pot Normal file
View file

@ -0,0 +1,33 @@
# GNU Screen Profiles
# Copyright (C) 2008 Dustin Kirkland
# This file is distributed under the same license as the GNU Screen Profiles package.
# Nicolas Barcet <nicolas.barcet@ubuntu.com>, 2008.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-12-17 23:42+0100\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: select-screen-profile.sh:9 select-screen-profile.sh:16
msgid "Error:"
msgstr ""
#: select-screen-profile.sh:9 select-screen-profile.sh:16
msgid "exists, but is not a symlink"
msgstr ""
#: select-screen-profile.sh:30
msgid "recommended"
msgstr ""
#: select-screen-profile.sh:41 select-screen-profile.sh:43
msgid "Choose"
msgstr ""

View file

@ -1,37 +0,0 @@
# screen-profiles translations
# Copyright (C) 2008 Canonical, Ltd.
# This file is distributed under the same license as the screen-profiles package.
# Dustin Kirkland <kirkland@canonical.com>, 2008.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: screen-profiles 1.0\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/screen-profiles\n"
"POT-Creation-Date: 2008-12-16 17:21-0600\n"
"PO-Revision-Date: 2008-12-16 17:22-6\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: select-screen-profile:12
msgid "Error:"
msgstr ""
#: select-screen-profile:12
msgid " file exists, but is not a symlink"
msgstr ""
#: select-screen-profile:19
msgid "Select a screen profile: "
msgstr ""
#: select-screen-profile:26
msgid "recommended"
msgstr ""
#: select-screen-profile:37 select-screen-profile:39
msgid "Choose: "
msgstr ""

View file

@ -1,17 +0,0 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2008-12-16 17:27-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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING"

View file

@ -1,2 +0,0 @@
# location of input files
[po4a_paths] po/screen-utils.pot

View file

@ -34,13 +34,9 @@ hardstatus alwayslastline
termcapinfo xterm ti@:te@
defscrollback 10000
# Keybindings
# Map shift-tab to go to next window
bindkey "\033[Z" next
# Ctrl+PgUp and Ctrl+PgDn to change windows
bindkey ^[[5;5~ prev
bindkey ^[[6;5~ next
# Prompt for window title on "ctrl-a c"
register n "^a^c ^aA"
bind c process n
# Default windows
screen -t bash 1
screen -t welcome 0 /usr/bin/sensible-pager /usr/share/doc/screen-profiles/help.txt
# Default keybindings
source /usr/share/screen-profiles/keybindings/common