Changeset 38142c77f3dc358917b2a802d6e5c0620bfa67f7

Timestamp:

06/11/08 16:15:52 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

5d1bd3021693e54e7d206613f99797ed5d29b05d

Parents:

99518efdf730844e6adc35309b321332710a2460

git-committer:

Lincoln de Sousa <lincoln@…> (06/11/08 16:15:52)

Message:

Finishing initial tab issues, like close, now the child process is
being killed with SIGKILL. Terminal focus on tab click was fixed
too. last_pos attribute and its setter were removed.

Files:

• src/guake.py (modified) (10 diffs)

src/guake.py

@@ -32 +32 @@
 
 import os
+import signal
 import sys
 import warnings
@@ -62 +63 @@
 )
 
-
 class AboutDialog(SimpleGladeApp):
     def __init__(self):
@@ -73 +73 @@
 
         # images
-        ipath = common.pixmapfile('guake.png')
+        ipath = common.pixmapfile('guake-notification.png')
         img = gtk.gdk.pixbuf_new_from_file(ipath)
         ad.set_property('logo', img)
@@ -95 +95 @@
 
         # images
-        ipath = common.pixmapfile('guake.png')
+        ipath = common.pixmapfile('guake-notification.png')
         self.get_widget('image_logo').set_from_file(ipath)
         ipath = common.pixmapfile('tabdown.svg')
@@ -425 +425 @@
 
         self.accel_group = gtk.AccelGroup()
-        self.last_pos = -1
         self.term_list = []
+        self.pid_list = []
 
         self.animation_speed = 30
@@ -694 +694 @@
         self.term_list[current_pos].paste_clipboard()
 
+    def on_context_close_tab_activate(self, *args):
+        current_pos = self.notebook.get_current_page()
+        pid = self.pid_list.pop(current_pos)
+        os.kill(pid, signal.SIGKILL)
+
     def on_context_close_activate(self, widget):
         gtk.main_quit()
-
-    def on_close_button_close_clicked(self, widget, index):
-        self.term_list[index].fork_command("bash", "exit")
-        self.set_terminal_focus()
 
     # -- tab related functions --
@@ -710 +711 @@
         # TODO: make new terminal opens in the same dir of the already in use.
         shell_name = self.client.get_string(GCONF_PATH+'general/default_shell')
-        self.term_list[last_added].fork_command(shell_name or "bash",
-                directory=os.path.expanduser('~'))
+        directory = os.path.expanduser('~')
+        pid = self.term_list[last_added].\
+            fork_command(shell_name or "bash", directory=directory)
+
+        self.pid_list.append(pid)
         self.term_list[last_added].connect('button-press-event',
                 self.show_context_menu)
@@ -720 +724 @@
         bnt = gtk.RadioButton(group=parent,
                               label=_('Terminal %s') % (last_added+1))
-        bnt.connect('clicked', self.set_terminal_focus)
+        bnt.connect('clicked', lambda *x:
+                        self.notebook.set_current_page (len(tabs)))
         bnt.set_property('draw-indicator', False)
         bnt.show()
@@ -758 +763 @@
 
         self.notebook.append_page(mhbox, None)
-        self.notebook.connect('switch-page', self.set_last_pos)
-        self.notebook.connect('focus-tab', self.set_terminal_focus)
 
         self.load_config()
         self.term_list[last_added].show()
         self.notebook.set_current_page(last_added)
-        self.last_pos = last_added
 
     def delete_tab(self, pagepos):
@@ -773 +775 @@
             self.hide()
 
-    def set_terminal_focus(self, *args):
-        self.notebook.set_current_page(self.last_pos)
-        self.term_list[self.last_pos].grab_focus()
+    def set_terminal_focus(self):
+        page = self.notebook.get_current_page()
+        self.term_list[page].grab_focus()
 
     def select_current_tab(self, notebook, user_data, page):
         self.tabs.get_children()[page].set_active(True)
-
-    def set_last_pos(self, notebook, page, page_num):
-        self.last_pos = page_num
 
     def clear_old_terms(self):