From 8d27c58daea090eb2951ed555169ecf4518a59f7 Mon Sep 17 00:00:00 2001 From: Matt Rose Date: Tue, 22 Dec 2020 21:15:12 -0500 Subject: [PATCH 1/2] add note aboug moving config file out of the way --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ff35415f..1d682594 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,7 +7,11 @@ assignees: '' --- -Please fill out as many of these fields as you can +Please try moving the terminator config out of the way to see if that solves the +problem. If it does, and you still want to open the bug, then please attach the +config file to the issue + +Fill out as many of these fields as you can **Describe the bug** A clear and concise description of what the bug is. From 427c65f2ccb8d2808918b8d146885f6eb0f4d281 Mon Sep 17 00:00:00 2001 From: Matt Rose Date: Sun, 27 Dec 2020 13:29:30 -0500 Subject: [PATCH 2/2] Revert "Merge pull request #36 from waldner/master" This reverts commit 6c56f32eeb4306371842bc1aba17b1b677ec0352, reversing changes made to 904676057e29f2d6953de834c78a8b80e579032f. --- terminatorlib/config.py | 5 ----- terminatorlib/container.py | 2 +- terminatorlib/notebook.py | 2 +- terminatorlib/paned.py | 24 +++++++++--------------- terminatorlib/prefseditor.py | 4 ---- terminatorlib/terminal.py | 22 +++++----------------- 6 files changed, 16 insertions(+), 43 deletions(-) diff --git a/terminatorlib/config.py b/terminatorlib/config.py index ec7a2a2e..3e069e21 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -111,7 +111,6 @@ 'title_inactive_fg_color' : '#000000', 'title_inactive_bg_color' : '#c0bebf', 'inactive_color_offset': 0.8, - 'fast_resize_step': 50, 'enabled_plugins' : ['LaunchpadBugURLHandler', 'LaunchpadCodeURLHandler', 'APTURLHandler'], @@ -160,10 +159,6 @@ 'resize_down' : 'Down', 'resize_left' : 'Left', 'resize_right' : 'Right', - 'resize_up_fast' : 'Up', - 'resize_down_fast' : 'Down', - 'resize_left_fast' : 'Left', - 'resize_right_fast': 'Right', 'move_tab_right' : 'Page_Down', 'move_tab_left' : 'Page_Up', 'toggle_zoom' : 'x', diff --git a/terminatorlib/container.py b/terminatorlib/container.py index 2b0fa33e..2afbe913 100644 --- a/terminatorlib/container.py +++ b/terminatorlib/container.py @@ -130,7 +130,7 @@ def closeterm(self, widget): self.terminator.group_hoover() return(True) - def resizeterm(self, widget, keyname, fast = False): + def resizeterm(self, widget, keyname): """Handle a keyboard event requesting a terminal resize""" raise NotImplementedError('resizeterm') diff --git a/terminatorlib/notebook.py b/terminatorlib/notebook.py index 38917faf..52e70b9e 100644 --- a/terminatorlib/notebook.py +++ b/terminatorlib/notebook.py @@ -376,7 +376,7 @@ def closetab(self, widget, label): err('Notebook::closetab: child is unknown type %s' % child) return - def resizeterm(self, widget, keyname, fast = False): + def resizeterm(self, widget, keyname): """Handle a keyboard event requesting a terminal resize""" raise NotImplementedError('resizeterm') diff --git a/terminatorlib/paned.py b/terminatorlib/paned.py index cb0e4a1c..f13b2cbd 100644 --- a/terminatorlib/paned.py +++ b/terminatorlib/paned.py @@ -30,7 +30,7 @@ def __init__(self): self.signals.append({'name': 'resize-term', 'flags': GObject.SignalFlags.RUN_LAST, 'return_type': None, - 'param_types': (GObject.TYPE_STRING, GObject.TYPE_BOOLEAN)}) + 'param_types': (GObject.TYPE_STRING,)}) # pylint: disable-msg=W0613 @@ -325,19 +325,16 @@ def hoover(self): parent.replace(self, child) del(self) - def resizeterm(self, widget, keyname, fast = False): + def resizeterm(self, widget, keyname): """Handle a keyboard event requesting a terminal resize""" if keyname in ['up', 'down'] and isinstance(self, Gtk.VPaned): # This is a key we can handle position = self.get_position() - if not fast: - if self.maker.isinstance(widget, 'Terminal'): - fontheight = widget.vte.get_char_height() - else: - fontheight = 10 + if self.maker.isinstance(widget, 'Terminal'): + fontheight = widget.vte.get_char_height() else: - fontheight = self.config['fast_resize_step'] + fontheight = 10 if keyname == 'up': self.set_position(position - fontheight) @@ -347,13 +344,10 @@ def resizeterm(self, widget, keyname, fast = False): # This is a key we can handle position = self.get_position() - if not fast: - if self.maker.isinstance(widget, 'Terminal'): - fontwidth = widget.vte.get_char_width() - else: - fontwidth = 10 + if self.maker.isinstance(widget, 'Terminal'): + fontwidth = widget.vte.get_char_width() else: - fontwidth = self.config['fast_resize_step'] + fontwidth = 10 if keyname == 'left': self.set_position(position - fontwidth) @@ -361,7 +355,7 @@ def resizeterm(self, widget, keyname, fast = False): self.set_position(position + fontwidth) else: # This is not a key we can handle - self.emit('resize-term', keyname, fast) + self.emit('resize-term', keyname) def create_layout(self, layout): """Apply layout configuration""" diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index 5e455f5a..136eb440 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -134,10 +134,6 @@ class PrefsEditor: 'resize_down' : _('Resize the terminal down'), 'resize_left' : _('Resize the terminal left'), 'resize_right' : _('Resize the terminal right'), - 'resize_up_fast' : _('Resize the terminal up (faster)'), - 'resize_down_fast' : _('Resize the terminal down (faster)'), - 'resize_left_fast' : _('Resize the terminal left (faster)'), - 'resize_right_fast': _('Resize the terminal right (faster)'), 'move_tab_right' : _('Move the tab right'), 'move_tab_left' : _('Move the tab left'), 'toggle_zoom' : _('Maximize terminal'), diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index d25fbc9b..42de222a 100644 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -87,7 +87,7 @@ class Terminal(Gtk.VBox): 'maximise': (GObject.SignalFlags.RUN_LAST, None, ()), 'unzoom': (GObject.SignalFlags.RUN_LAST, None, ()), 'resize-term': (GObject.SignalFlags.RUN_LAST, None, - (GObject.TYPE_STRING, GObject.TYPE_BOOLEAN)), + (GObject.TYPE_STRING,)), 'navigate': (GObject.SignalFlags.RUN_LAST, None, (GObject.TYPE_STRING,)), 'tab-change': (GObject.SignalFlags.RUN_LAST, None, @@ -1820,28 +1820,16 @@ def key_close_term(self): self.close() def key_resize_up(self): - self.emit('resize-term', 'up', False) + self.emit('resize-term', 'up') def key_resize_down(self): - self.emit('resize-term', 'down', False) + self.emit('resize-term', 'down') def key_resize_left(self): - self.emit('resize-term', 'left', False) + self.emit('resize-term', 'left') def key_resize_right(self): - self.emit('resize-term', 'right', False) - - def key_resize_up_fast(self): - self.emit('resize-term', 'up', True) - - def key_resize_down_fast(self): - self.emit('resize-term', 'down', True) - - def key_resize_left_fast(self): - self.emit('resize-term', 'left', True) - - def key_resize_right_fast(self): - self.emit('resize-term', 'right', True) + self.emit('resize-term', 'right') def key_move_tab_right(self): self.emit('move-tab', 'right')