Merge with trunk

This commit is contained in:
Iain Lane 2008-09-08 20:02:08 +01:00
commit 6c763fae39
7 changed files with 110 additions and 10 deletions

2
debian/control vendored
View File

@ -5,7 +5,7 @@ Priority: optional
Maintainer: Terminator Developers <gnome-terminator@lists.launchpad.net> Maintainer: Terminator Developers <gnome-terminator@lists.launchpad.net>
Build-Depends: debhelper (>= 5.0.62), python, cdbs (>=0.4.49) Build-Depends: debhelper (>= 5.0.62), python, cdbs (>=0.4.49)
Build-Depends-Indep: python-central (>= 0.5.6) Build-Depends-Indep: python-central (>= 0.5.6)
Standards-Version: 3.7.3 Standards-Version: 3.8.0
Vcs-Bzr: http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk Vcs-Bzr: http://bazaar.launchpad.net/~gnome-terminator/terminator/trunk
Vcs-Browser: http://code.launchpad.net/~gnome-terminator/terminator/trunk Vcs-Browser: http://code.launchpad.net/~gnome-terminator/terminator/trunk
Homepage: http://www.tenshu.net/terminator/ Homepage: http://www.tenshu.net/terminator/

View File

@ -0,0 +1,27 @@
diff -Nur -x '*.orig' -x '*~' terminator-0.10/terminatorlib/configfile.py terminator-0.10.new/terminatorlib/configfile.py
--- terminator-0.10/terminatorlib/configfile.py 2008-08-28 09:17:49.000000000 -0500
+++ terminator-0.10.new/terminatorlib/configfile.py 2008-09-06 15:07:54.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
import re
from terminatorlib.config import dbg, debug
diff -Nur -x '*.orig' -x '*~' terminator-0.10/terminatorlib/debugserver.py terminator-0.10.new/terminatorlib/debugserver.py
--- terminator-0.10/terminatorlib/debugserver.py 2008-08-28 09:17:49.000000000 -0500
+++ terminator-0.10.new/terminatorlib/debugserver.py 2008-09-06 15:07:34.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
#
# Copyright (c) 2008, Thomas Hurst <tom@hur.st>
#
diff -Nur -x '*.orig' -x '*~' terminator-0.10/terminatorlib/freebsd.py terminator-0.10.new/terminatorlib/freebsd.py
--- terminator-0.10/terminatorlib/freebsd.py 2008-08-28 09:17:49.000000000 -0500
+++ terminator-0.10.new/terminatorlib/freebsd.py 2008-09-06 15:07:45.000000000 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
#
# Copyright (c) 2008, Thomas Hurst <tom@hur.st>
#

1
debian/pycompat vendored Normal file
View File

@ -0,0 +1 @@
2

1
debian/rules vendored
View File

@ -4,6 +4,7 @@ DEB_PYTHON_SYSTEM = pycentral
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_INSTALL_CHANGELOGS_ALL := ChangeLog DEB_INSTALL_CHANGELOGS_ALL := ChangeLog

2
debian/watch vendored
View File

@ -1,2 +1,2 @@
version=3 version=3
https://launchpad.net/terminator/+download http://launchpad.net/terminator/.*/terminator_(.+)\.tar\.gz http://launchpad.net/terminator/+download .*/terminator_(.+)\.tar\.gz

View File

@ -66,7 +66,7 @@ Default value: \fBascii\-del\fR
.TP .TP
.B delete_binding .B delete_binding
Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key. Sets what code the delete key generates. Possible values are "ascii-del" for the ASCII DEL character, "control-h" for Control-H (AKA the ASCII BS character), "escape-sequence" for the escape sequence typically bound to backspace or delete. "escape-sequence" is normally considered the correct setting for the Delete key.
Default value: \fBdelete\-sequence\fR Default value: \fBescape\-sequence\fR
.TP .TP
.B cursor_blink \fR(boolean) .B cursor_blink \fR(boolean)
Controls if the cursor blinks. Controls if the cursor blinks.

View File

@ -6,8 +6,10 @@ from terminatorlib.version import APP_NAME, APP_VERSION
import gtk import gtk
class ProfileEditor: class ProfileEditor:
appearance = ['titlebars', 'titletips', 'allow_bold', 'silent_bell', 'background_color', 'background_darkness', 'background_type', 'background_image', 'cursor_blink', 'font', 'foreground_color', 'scrollbar_position', 'scroll_background', 'palette', 'use_system_font', 'use_theme_colors', 'force_no_bell', 'enable_real_transparency'] appearance = ['titlebars', 'titletips', 'allow_bold', 'silent_bell', 'background_darkness', 'background_type', 'background_image', 'cursor_blink', 'font', 'scrollbar_position', 'scroll_background', 'use_system_font', 'use_theme_colors', 'force_no_bell', 'enable_real_transparency']
behaviour = ['delete_binding', 'emulation', 'scroll_on_keystroke', 'scroll_on_output', 'scrollback_lines', 'focus'] colours = ['foreground_color','background_color', 'palette']
behaviour = ['backspace_binding', 'delete_binding', 'emulation', 'scroll_on_keystroke', 'scroll_on_output', 'scrollback_lines', 'focus', 'focus_on_close', 'exit_action', 'word_chars', 'mouse_autohide', 'use_custom_command', 'custom_command', 'http_proxy', 'encoding']
globals = ['fullscreen', 'maximise', 'borderless', 'handle_size', 'cycle_term_tab', 'close_button_on_tab', 'copy_on_selection', 'extreme_tabs', 'try_posix_regexp']
data = {'titlebars': ['Show titlebars', 'This places a bar above each terminal which displays its title.'], data = {'titlebars': ['Show titlebars', 'This places a bar above each terminal which displays its title.'],
'titletips': ['Show title tooltips', 'This adds a tooltip to each terminal which contains its title'], 'titletips': ['Show title tooltips', 'This adds a tooltip to each terminal which contains its title'],
'allow_bold': ['Allow bold text', 'Controls whether or not the terminals will honour requests for bold text'], 'allow_bold': ['Allow bold text', 'Controls whether or not the terminals will honour requests for bold text'],
@ -19,11 +21,30 @@ class ProfileEditor:
self.notebook = gtk.Notebook() self.notebook = gtk.Notebook()
self.window.add (self.notebook) self.window.add (self.notebook)
self.notebook.append_page (self.auto_add (gtk.Table (), self.globals), gtk.Label ("Global Settings"))
self.notebook.append_page (self.auto_add (gtk.Table (), Defaults['keybindings']), gtk.Label ("Keybindings"))
self.notebook.append_page (self.auto_add (gtk.Table (), self.appearance), gtk.Label ("Appearance")) self.notebook.append_page (self.auto_add (gtk.Table (), self.appearance), gtk.Label ("Appearance"))
self.notebook.append_page (self.auto_add (gtk.Table (), self.colours), gtk.Label ("Colours"))
self.notebook.append_page (self.auto_add (gtk.Table (), self.behaviour), gtk.Label ("Behaviour")) self.notebook.append_page (self.auto_add (gtk.Table (), self.behaviour), gtk.Label ("Behaviour"))
self.window.show_all () self.window.show_all ()
def source_get_type (self, key):
if Defaults.has_key (key):
return Defaults[key].__class__.__name__
elif Defaults['keybindings'].has_key (key):
return Defaults['keybindings'][key].__class__.__name__
else:
raise KeyError
def source_get_value (self, key):
if Defaults.has_key (key):
return Defaults[key]
elif Defaults['keybindings'].has_key (key):
return Defaults['keybindings'][key]
else:
raise KeyError
def auto_add (self, table, list): def auto_add (self, table, list):
row = 0 row = 0
for key in list: for key in list:
@ -34,14 +55,11 @@ class ProfileEditor:
label_text = key.replace ('_', ' ').capitalize () label_text = key.replace ('_', ' ').capitalize ()
label = gtk.Label (label_text) label = gtk.Label (label_text)
type = Defaults[key].__class__.__name__ type = self.source_get_type (key)
value = Defaults[key] value = self.source_get_value (key)
widget = None widget = None
if key == 'font': if key == 'font':
#widget = gtk.FontSelection()
#widget.set_preview_text("Terminator: The robot future of terminals")
#widget.set_font_name(value)
widget = gtk.FontButton(value) widget = gtk.FontButton(value)
elif key == 'scrollback_lines': elif key == 'scrollback_lines':
# estimated byte size per line according to g-t: # estimated byte size per line according to g-t:
@ -57,11 +75,64 @@ class ProfileEditor:
widget.append_text ('right') widget.append_text ('right')
widget.append_text ('disabled') widget.append_text ('disabled')
widget.set_active (0) widget.set_active (0)
elif key == 'backspace_binding':
widget = gtk.combo_box_new_text()
widget.append_text ('ascii-del')
widget.append_text ('control-h')
widget.append_text ('escape-sequence')
widget.set_active (0)
elif key == 'delete_binding':
widget = gtk.combo_box_new_text()
widget.append_text ('ascii-del')
widget.append_text ('control-h')
widget.append_text ('escape-sequence')
widget.set_active (2)
elif key == 'focus': elif key == 'focus':
widget = gtk.combo_box_new_text() widget = gtk.combo_box_new_text()
widget.append_text ('click') widget.append_text ('click')
widget.append_text ('sloppy') widget.append_text ('sloppy')
widget.set_active (0) widget.set_active (0)
elif key == 'background_type':
widget = gtk.combo_box_new_text()
widget.append_text ('solid')
widget.append_text ('image')
widget.append_text ('transparent')
widget.set_active (0)
elif key == 'background_darkness':
widget = gtk.HScale ()
widget.set_digits (1)
widget.set_draw_value (True)
widget.set_value_pos (gtk.POS_LEFT)
widget.set_range (0, 1)
widget.set_value (value)
elif key == 'handle_size':
widget = gtk.HScale ()
widget.set_digits (0)
widget.set_draw_value (True)
widget.set_value_pos (gtk.POS_LEFT)
widget.set_range (-1, 5)
widget.set_value (value)
elif key == 'foreground_color':
widget = gtk.ColorButton (gtk.gdk.color_parse (value))
elif key == 'background_color':
widget = gtk.ColorButton (gtk.gdk.color_parse (value))
elif key == 'palette':
colours = value.split (':')
numcolours = len (colours)
widget = gtk.Table (2, numcolours / 2)
x = 0
y = 0
for thing in colours:
if x == numcolours / 2:
y += 1
x = 0
widget.attach (gtk.ColorButton (gtk.gdk.color_parse (thing)), x, x + 1, y, y + 1)
x += 1
elif key == 'background_image':
widget = gtk.FileChooserButton('Select a File')
filter = gtk.FileFilter()
filter.add_mime_type ('image/*')
widget.add_filter (filter)
else: else:
if type == "bool": if type == "bool":
widget = gtk.CheckButton () widget = gtk.CheckButton ()