Merge lp:~simar/clicompanion/fix-625648 into lp:clicompanion

[Gursimran singh]

Under normal conditions if we destroy active tab the focus shifts to left but if the tab destroyed is active and its last tab (which contains a page) then the focus shifts to the left. If the destroyed tab is a tab which not does have focus then focus remains with the same tab that had the focus previously.

[Duane Hinnen (duanedesign)]

review: Approve

=== modified file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	2011-03-21 18:04:14 +0000
+++ clicompanionlib/tabs.py	2011-03-26 12:45:50 +0000
@@ -34,6 +34,9 @@
 #definition gcp - how many pages is visible
 gcp=0;
 
+#definition nop - (no of pages) reflects no of terminal tabs left (some may be closed by the user)
+nop=0;
+
 class Tabs(object):
     '''
     add a new terminal in a tab above the current terminal
@@ -56,10 +59,12 @@
         #notebook.set_show_border(True)
         
         global gcp
+        global nop
+        nop += 1
         gcp += 1
         pagenum = ('Tab %d') % gcp
-        if gcp > 1:
-			notebook.set_show_tabs(True)
+        if nop > 1:
+            notebook.set_show_tabs(True)
         box = gtk.HBox()
         label = gtk.Label(pagenum)
         box.pack_start(label, True, True)
@@ -93,7 +98,17 @@
         ## get the page number of the tab we wanted to close
         pagenum = notebook.page_num(widget)
         ## and close it
-        notebook.remove_page(pagenum) 
+        notebook.remove_page(pagenum)
+        global nop
+        nop -= 1
+        if nop <= 1:
+            notebook.set_show_tabs(False)
+        
+        # check if the focus does not go to the last page (ie with only a + sign)
+        if notebook.get_current_page() == nop:
+            notebook.prev_page()
+        
+        
         
     def update_term_config(self, _vte):
         ##read config file