Changeset b71e79590601d436af5201f690ba38fcf2f5126b

Timestamp:

06/12/08 01:23:53 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

48e43cb692421e90bb2294a6dc6d91df7633560c

Parents:

b68bc8adac4e5424fb75808d26c2e75e34a5e70b

git-committer:

Lincoln de Sousa <lincoln@…> (06/12/08 01:23:53)

Message:

changing the way of naming tabs, adding a context menu
to each tab with rename and close features (close is broken)

Files:

• ChangeLog (modified) (1 diff)
• data/guake.glade (modified) (2 diffs)
• src/guake.py (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2008-06-11  Lincoln de Sousa  <lincoln@minaslivre.org>
+
+        * data/guake.glade: Adding the tab-menu widget.
+
+        * src/guake.py: Code cleanup and comments added.
+
+        * src/guake.py (Guake): Adding a context menu to each tab with
+        rename and close options (close is broken for a while =).
+
 2008-06-11  Lincoln de Sousa  <lincoln@minaslivre.org>
 

data/guake.glade

@@ -160 +160 @@
           <widget class="GtkImage" id="menu-item-image1">
             <property name="stock">gtk-close</property>
-            <property name="icon-size">1</property>
+            <property name="icon_size">1</property>
           </widget>
         </child>
@@ -175 +175 @@
     </child>
   </widget>
+  <widget class="GtkMenu" id="tab-menu">
+    <property name="visible">True</property>
+    <child>
+      <widget class="GtkImageMenuItem" id="rename">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Rename</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_rename_activate"/>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image3">
+            <property name="visible">True</property>
+            <property name="stock">gtk-edit</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkImageMenuItem" id="close">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Close</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_close_activate"/>
+        <child internal-child="image">
+          <widget class="GtkImage" id="menu-item-image2">
+            <property name="visible">True</property>
+            <property name="stock">gtk-close</property>
+            <property name="icon_size">1</property>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

src/guake.py

@@ -434 +434 @@
         self.pid_list = []
 
+        # It's intended to know which tab was selected to
+        # close/rename. This attribute will be set in
+        # self.show_tab_menu
+        self.selected_tab = None
+
+        # holds the number of created tabs. This counter will not be
+        # reset to avoid problems of repeated tab names.
+        self.tab_counter = 0
+
         # holds visibility/fullscreen status =)
         self.visible = False
@@ -478 +487 @@
         if event.button == 3:
             context_menu.popup(None, None, None, 3, gtk.get_current_event_time())
+
+    def show_tab_menu(self, target, event):
+        if event.button == 3:
+            self.selected_tab = target
+            menu = self.get_widget('tab-menu')
+            menu.popup(None, None, None, 3, event.get_time())
+        self.set_terminal_focus()
 
     # -- methods exclusivelly called by dbus interface --
@@ -691 +707 @@
     def on_terminal_exited(self, term, widget):
         self.delete_tab(self.notebook.page_num(widget))
-    
+
+    def on_rename_activate(self, *args):
+        entry = gtk.Entry()
+        entry.set_text(self.selected_tab.get_label())
+
+        vbox = gtk.VBox()
+        vbox.pack_start(entry)
+        vbox.set_border_width(6)
+        vbox.show_all()
+
+        dialog = gtk.Dialog("Rename tab",
+                            self.window,
+                            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                            (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
+                             gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
+
+        dialog.set_size_request(300, -1)
+        dialog.vbox.pack_start(vbox)
+        dialog.set_border_width(4)
+        dialog.set_has_separator(False)
+        dialog.set_default_response(gtk.RESPONSE_ACCEPT)
+
+        response = dialog.run()
+        dialog.destroy()
+
+        if response == gtk.RESPONSE_ACCEPT:
+            self.selected_tab.set_label(entry.get_text())
+
+        self.set_terminal_focus()
+
+    def on_close_activate(self, *args):
+        self.on_context_close_tab_activate()
+
     # -- Context menu callbacks --
 
@@ -734 +782 @@
         parent = tabs and tabs[0] or None
 
-        bnt = gtk.RadioButton(group=parent,
-                              label=_('Terminal %s') % (last_added+1))
+        self.tab_counter += 1
+
+        label = _('Terminal %s') % self.tab_counter
+        bnt = gtk.RadioButton(group=parent, label=label)
+
+        bnt.set_tooltip_text(self.term_list[last_added].get_window_title())
+        bnt.set_property('can-focus', False)
+        bnt.set_property('draw-indicator', False)
+
+        bnt.connect('button-press-event', self.show_tab_menu)
         bnt.connect('clicked', lambda *x:
-                        self.notebook.set_current_page (len(tabs)))
-        bnt.set_property('draw-indicator', False)
+                        self.notebook.set_current_page (last_added))
         bnt.show()