diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 468568d2..4f882de6 100755 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -162,7 +162,7 @@ DEFAULTS = { 'color_scheme' : 'grey_on_black', 'cursor_blink' : True, 'cursor_shape' : 'block', - 'cursor_color' : '', + 'cursor_color' : '#aaaaaaaaaaaa', 'emulation' : 'xterm', 'font' : 'Mono 10', 'foreground_color' : '#aaaaaaaaaaaa', diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade index 13e4fa75..e37c9f6c 100644 --- a/terminatorlib/preferences.glade +++ b/terminatorlib/preferences.glade @@ -821,7 +821,7 @@ - Visual terminal _bell + Visual terminal bell True True False @@ -836,7 +836,7 @@ - Audible terminal _bell + Audible terminal bell True True False @@ -851,7 +851,7 @@ - WM_URGENT terminal _bell + Window manager bell True True False @@ -864,46 +864,6 @@ 5 - - - True - 12 - - - True - Cursor _shape: - True - cursor-shape-combobox - - - False - False - 0 - - - - - True - CursorShapeListStore - 0 - - - - 0 - - - - - False - 1 - - - - - False - 6 - - True @@ -936,6 +896,134 @@ False + 6 + + + + + True + vertical + 6 + + + True + 0 + <b>Cursor</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + vertical + + + True + 12 + + + True + Cursor _shape: + True + cursor-shape-combobox + + + False + False + 0 + + + + + True + CursorShapeListStore + 0 + + + + 0 + + + + + False + 1 + + + + + False + 0 + + + + + Cursor blink + True + True + False + True + + + False + False + 1 + + + + + True + 6 + + + True + Cursor colour: + + + False + False + 0 + + + + + True + True + True + #000000000000 + + + False + False + 1 + + + + + 2 + + + + + + + False + 1 + + + + + False + False 7 diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index 080a0b04..f6744ff8 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -318,6 +318,9 @@ class PrefsEditor: # WM_URGENT terminal bell widget = guiget('urgent-bell-checkbutton') widget.set_active(self.config['urgent_bell']) + # Word chars + widget = guiget('word-chars-entry') + widget.set_text(self.config['word_chars']) # Cursor shape widget = guiget('cursor-shape-combobox') if self.config['cursor_shape'] == 'underline': @@ -327,9 +330,12 @@ class PrefsEditor: else: active = 0 widget.set_active(active) - # Word chars - widget = guiget('word-chars-entry') - widget.set_text(self.config['word_chars']) + # Cursor blink + widget = guiget('cursor_blink') + widget.set_active(self.config['cursor_blink']) + # Cursor colour + widget = guiget('cursor_color') + widget.set_color(gtk.gdk.Color(self.config['cursor_color'])) ## Command tab # Login shell @@ -480,6 +486,9 @@ class PrefsEditor: # Urgent Bell widget = guiget('urgent-bell-checkbutton') self.config['urgent_bell'] = widget.get_active() + # Word chars + widget = guiget('word-chars-entry') + self.config['word_chars'] = widget.get_text() # Cursor Shape widget = guiget('cursor-shape-combobox') selected = widget.get_active() @@ -490,9 +499,12 @@ class PrefsEditor: elif selected == 2: value = 'ibeam' self.config['cursor_shape'] = value - # Word chars - widget = guiget('word-chars-entry') - self.config['word_chars'] = widget.get_text() + # Cursor Blink + widget = guiget('cursor_blink') + self.config['cursor_blink'] = widget.get_active() + # Cursor Colour + widget = guiget('cursor_color') + self.config['cursor_color'] = widget.get_color().to_string() ## Command tab # Login shell