Revert "Merge pull request #36 from waldner/master"

This reverts commit 6c56f32eeb, reversing
changes made to 904676057e.

terminatorlib/config.py

@@ -111,7 +111,6 @@ DEFAULTS = {
             '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 @@ DEFAULTS = {
             'resize_down'      : '<Shift><Control>Down',
             'resize_left'      : '<Shift><Control>Left',
             'resize_right'     : '<Shift><Control>Right',
-            'resize_up_fast'   : '<Shift>Up',
-            'resize_down_fast' : '<Shift>Down',
-            'resize_left_fast' : '<Shift>Left',
-            'resize_right_fast': '<Shift>Right',
             'move_tab_right'   : '<Shift><Control>Page_Down',
             'move_tab_left'    : '<Shift><Control>Page_Up',
             'toggle_zoom'      : '<Shift><Control>x',

terminatorlib/container.py

@@ -130,7 +130,7 @@ class Container(object):
         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')
 

terminatorlib/notebook.py

@@ -376,7 +376,7 @@ class Notebook(Container, Gtk.Notebook):
             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')
 

terminatorlib/paned.py

@@ -30,7 +30,7 @@ class Paned(Container):
         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 @@ class Paned(Container):
             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'):
-                if self.maker.isinstance(widget, 'Terminal'):
+                fontheight = widget.vte.get_char_height()
-                    fontheight = widget.vte.get_char_height()
-                else:
-                    fontheight = 10
             else:
-                fontheight = self.config['fast_resize_step']
+                fontheight = 10
 
             if keyname == 'up':
                 self.set_position(position - fontheight)
@@ -347,13 +344,10 @@ class Paned(Container):
             # This is a key we can handle
             position = self.get_position()
 
-            if not fast:
+            if self.maker.isinstance(widget, 'Terminal'):
-                if self.maker.isinstance(widget, 'Terminal'):
+                fontwidth = widget.vte.get_char_width()
-                    fontwidth = widget.vte.get_char_width()
-                else:
-                    fontwidth = 10
             else:
-                fontwidth = self.config['fast_resize_step']
+                fontwidth = 10
 
             if keyname == 'left':
                 self.set_position(position - fontwidth)
@@ -361,7 +355,7 @@ class Paned(Container):
                 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"""

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'),

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 @@ class Terminal(Gtk.VBox):
         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)
+        self.emit('resize-term', 'right')
-
-    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)
 
     def key_move_tab_right(self):
         self.emit('move-tab', 'right')