diff options
| author | Wade Brainerd <wadetb@gmail.com> | 2009-03-02 04:49:03 (GMT) |
|---|---|---|
| committer | Wade Brainerd <wadetb@gmail.com> | 2009-03-02 04:49:03 (GMT) |
| commit | 70e5ee0719e4f0b496c2e4a8bb6818f1bd4b9b14 (patch) | |
| tree | 451e1547279870d8207a87a9d7fa77ba200d4230 | |
| parent | 38667fa1b6dc733d44ce6dfc21a2d403b3f79579 (diff) | |
| parent | 5628f7aa302a1152a352497d3bb0734b3c9ae97a (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/terminal/mainline
Conflicts:
activity/activity.info
terminal.py
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | terminal.py | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,8 @@ +23 + +* Change default fontsize to 10 from 8 +* New translations + 21 * New translations diff --git a/activity/activity.info b/activity/activity.info index 9f42339..a8242fd 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Terminal -activity_version = 22 +activity_version = 24 service_name = org.laptop.Terminal exec = sugar-activity terminal.TerminalActivity icon = activity-terminal diff --git a/terminal.py b/terminal.py index 99dd1f2..cdaee02 100644 --- a/terminal.py +++ b/terminal.py @@ -355,10 +355,6 @@ class TerminalActivity(sugar.activity.activity.Activity): font = self._get_conf(conf, 'font', 'Monospace') vt.set_font(pango.FontDescription(font)) - fg_color = self._get_conf(conf, 'fg_color', '#000000') - bg_color = self._get_conf(conf, 'bg_color', '#FFFFFF') - vt.set_colors(gtk.gdk.color_parse(fg_color), gtk.gdk.color_parse(bg_color), []) - blink = self._get_conf(conf, 'cursor_blink', False) vt.set_cursor_blinks(blink) |