Add optional close buttons for tabs

sem-ver: feature Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
Guake · Jan 11, 2019 · e0dba67 · e0dba67
1 parent 805de1e
commit e0dba67
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 5 deletions.
diff --git a/data/org.guake.gschema.xml b/data/org.guake.gschema.xml
@@ -241,6 +241,11 @@
             <summary>Prefer Dark Theme for GTK</summary>
             <description>Prefer the dark theme version of the theme if available</description>
         </key>
+        <key name="tab-close-buttons" type="b">
+            <default>false</default>
+            <summary>Show close buttons for tabs</summary>
+            <description>Show close buttons next to tab titles</description>
+        </key>
     </schema>
     <schema id="guake.style" path="/apps/guake/style/">
         <key name="cursor-blink-mode" type="i">

diff --git a/data/prefs.glade b/data/prefs.glade
@@ -343,6 +343,21 @@
                                             <property name="top_attach">2</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="tab-close-buttons">
+                                            <property name="label" translatable="yes">Show close buttons for tabs</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="halign">start</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">0</property>
+                                            <property name="top_attach">4</property>
+                                          </packing>
+                                        </child>
                                         <child>
                                           <placeholder/>
                                         </child>

diff --git a/guake/boxes.py b/guake/boxes.py
@@ -6,6 +6,7 @@
 gi.require_version('Vte', '2.91')  # vte-0.42
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gdk
+from gi.repository import Gio
 from gi.repository import Gtk
 from gi.repository import Vte
 
@@ -328,13 +329,23 @@ def remove_dead_child(self, child):
 
 class TabLabelEventBox(Gtk.EventBox):
 
-    def __init__(self, notebook, text):
+    def __init__(self, notebook, text, settings):
         super().__init__()
         self.notebook = notebook
-        self.label = Gtk.Label(text)
-        self.add(self.label)
+        self.box = Gtk.Box(Gtk.Orientation.HORIZONTAL, 0, visible=True)
+        self.label = Gtk.Label(text, visible=True)
+        self.close_button = Gtk.Button(
+            image=Gtk.Image.new_from_icon_name("window-close", Gtk.IconSize.MENU),
+            relief=Gtk.ReliefStyle.NONE
+        )
+        self.close_button.connect('clicked', self.on_close)
+        settings.general.bind(
+            'tab-close-buttons', self.close_button, 'visible', Gio.SettingsBindFlags.GET
+        )
+        self.box.pack_start(self.label, True, True, 0)
+        self.box.pack_end(self.close_button, False, False, 0)
+        self.add(self.box)
         self.connect("button-press-event", self.on_button_press, self.label)
-        self.label.show()
 
     def set_text(self, text):
         self.label.set_text(text)

diff --git a/guake/notebook.py b/guake/notebook.py
@@ -250,7 +250,7 @@ def rename_page(self, page_index, new_text, user_set=False):
             if isinstance(old_label, TabLabelEventBox):
                 old_label.set_text(new_text)
             else:
-                label = TabLabelEventBox(self, new_text)
+                label = TabLabelEventBox(self, new_text, self.guake.settings)
                 label.add_events(Gdk.EventMask.SCROLL_MASK)
                 label.connect('scroll-event', self.scroll_callback.on_scroll)
 

diff --git a/guake/prefs.py b/guake/prefs.py
@@ -32,6 +32,7 @@
 from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gdk
+from gi.repository import Gio
 from gi.repository import Gtk
 from gi.repository import Keybinder
 from gi.repository import Pango
@@ -772,6 +773,11 @@ class fake_guake():
 
         self.demo_terminal.pid = pid
 
+        self.settings.general.bind(
+            'tab-close-buttons', self.get_widget('tab-close-buttons'), 'active',
+            Gio.SettingsBindFlags.DEFAULT
+        )
+
         self.populate_shell_combo()
         self.populate_keys_tree()
         self.populate_display_n()

diff --git a/releasenotes/notes/tab-close-buttons-1dfe8cb1049ee4dc.yaml b/releasenotes/notes/tab-close-buttons-1dfe8cb1049ee4dc.yaml
@@ -0,0 +1,2 @@
+features:
+  - Optional close buttons for tabs (disabled by default)