From a9c5e1836538d074f4365c67388e292a92ca34f8 Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sat, 1 Apr 2023 21:44:28 +0200 Subject: [PATCH 1/2] Remove more unused settings and update the docs accordingly Removed settings: scroll_background, focus_on_close, cycle_term_tab, ignore_hosts. --- doc/terminator.1 | 8 ++------ doc/terminator.adoc | 6 +----- terminatorlib/config.py | 4 ---- terminatorlib/prefseditor.py | 5 ----- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/doc/terminator.1 b/doc/terminator.1 index 4d3591fe..a224b530 100644 --- a/doc/terminator.1 +++ b/doc/terminator.1 @@ -2,12 +2,12 @@ .\" Title: terminator .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.18 -.\" Date: 2023-03-30 +.\" Date: 2023-04-01 .\" Manual: Manual for Terminator .\" Source: Terminator .\" Language: English .\" -.TH "TERMINATOR" "1" "2023-03-30" "Terminator" "Manual for Terminator" +.TH "TERMINATOR" "1" "2023-04-01" "Terminator" "Manual for Terminator" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -264,16 +264,12 @@ Move to previous tab. .RS 4 Move to the \fIn\fPext terminal within the same tab. .br -If \fBcycle_term_tab\fP is \fBFalse\fP, cycle within the same tab will be -disabled. .RE .sp \fBCtrl+Shift+P\fP or \fBCtrl+Shift+Tab\fP .RS 4 Move to the \fIp\fPrevious terminal within the same tab. .br -If \fBcycle_term_tab\fP is \fBFalse\fP, cycle within the same tab will be -disabled. .RE .SS "Organisation" .sp diff --git a/doc/terminator.adoc b/doc/terminator.adoc index 806c3649..92408f13 100644 --- a/doc/terminator.adoc +++ b/doc/terminator.adoc @@ -2,7 +2,7 @@ :doctype: manpage :manmanual: Manual for Terminator :mansource: Terminator -:revdate: 2023-03-30 +:revdate: 2023-04-01 :docdate: {revdate} == NAME @@ -167,13 +167,9 @@ Move to previous tab. *Ctrl+Shift+N* or *Ctrl+Tab*:: Move to the __n__ext terminal within the same tab. + -If *cycle_term_tab* is *False*, cycle within the same tab will be -disabled. *Ctrl+Shift+P* or *Ctrl+Shift+Tab*:: Move to the __p__revious terminal within the same tab. + -If *cycle_term_tab* is *False*, cycle within the same tab will be -disabled. === Organisation The following items relate to arranging and resizing terminals. diff --git a/terminatorlib/config.py b/terminatorlib/config.py index fbca71af..42780afe 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -232,7 +232,6 @@ DEFAULTS = { 'foreground_color' : '#aaaaaa', 'show_titlebar' : True, 'scrollbar_position' : "right", - 'scroll_background' : True, 'scroll_on_keystroke' : True, 'scroll_on_output' : False, 'scrollback_lines' : 500, @@ -252,14 +251,11 @@ DEFAULTS = { 'bold_is_bright' : False, 'cell_height' : 1.0, 'cell_width' : 1.0, - 'focus_on_close' : 'auto', 'force_no_bell' : False, - 'cycle_term_tab' : True, 'copy_on_selection' : False, 'split_to_group' : False, 'autoclean_groups' : True, 'http_proxy' : '', - 'ignore_hosts' : ['localhost','127.0.0.0/8','*.local'], # Titlebar 'title_hide_sizetext' : False, 'title_transmit_fg_color' : '#ffffff', diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index f805c8c6..ddf49694 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -958,11 +958,6 @@ class PrefsEditor: self.config['login_shell'] = widget.get_active() self.config.save() - def on_scroll_background_checkbutton_toggled(self, widget): - """Scroll background setting changed""" - self.config['scroll_background'] = widget.get_active() - self.config.save() - def on_scroll_on_keystroke_checkbutton_toggled(self, widget): """Scroll on keystrong setting changed""" self.config['scroll_on_keystroke'] = widget.get_active() From 0570307ecb9fcd3b60e5f1ea58268ffeb4d26f2b Mon Sep 17 00:00:00 2001 From: Vulcalien Date: Sun, 2 Apr 2023 17:26:24 +0200 Subject: [PATCH 2/2] Remove unused 'color_scheme' setting The color scheme in use is determined by checking the 'foreground_color' and 'background_color' settings. --- terminatorlib/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 42780afe..415533f7 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -220,7 +220,6 @@ DEFAULTS = { 'background_image_align_vert' : 'middle', 'backspace_binding' : 'ascii-del', 'delete_binding' : 'escape-sequence', - 'color_scheme' : 'grey_on_black', 'cursor_blink' : True, 'cursor_shape' : 'block', 'cursor_fg_color' : '',