Ticket #173: 0001-Add-cmd-line-parameter-to-launch-several-nammed-tabs.patch

ChangeLog

@@ +1 @@
+2009-09-03  Cyril Peponnet <nexus@aflb.com>
+
+        * FEATURE : adding a cmd line parameter to read a file with tab/name/command settings
+        * src/guake.py : adding load_conf_tab def, parameters, modify add_tab and hide_context_menu, adding import re
+        * src/dbusiface.py : adding load_conf_tab method
+
 2008-11-25  Gabriel Falcão <gabriel@nacaolivre.org>
 
         * src/guake.py: Applying Licio's (liciofernando@gmail.com) patch for

src/dbusiface.py

@@ -38 +38 @@
     @dbus.service.method(DBUS_NAME)
     def show_hide(self):
         self.guake.show_hide()
+        
+    @dbus.service.method(DBUS_NAME, in_signature='s')
+    def load_conf_tab(self, config=''):
+        self.guake.load_conf_tab(config)
 
     @dbus.service.method(DBUS_NAME, in_signature='s')
     def add_tab(self, directory=''):

src/guake.py

@@ -35 +35 @@
 import signal
 from thread import start_new_thread
 from time import sleep
+import re
 
 import globalhotkeys
 from simplegladeapp import SimpleGladeApp, bindtextdomain
@@ -560 +561 @@
         self.resizer.connect('motion-notify-event', self.on_resizer_drag)
 
         # adding the first tab on guake
-        self.add_tab()
+        # REMOVED : not really usefull because if we spawn without a term, it is created in show def
+        #self.add_tab()
 
         # loading and setting up configuration stuff
         GConfHandler(self)
@@ -591 +593 @@
                   'press <b>%s</b> to use it.') % label, filename)
             notification.show()
 
+    def load_conf_tab(self, config):
+        """Method that read an existing config file to set some tabs at launch
+        and exectute some commands in them
+        """
+        self.conffilepath = os.path.expanduser(config)
+        try:
+                self.conffile = open(self.conffilepath,'r')
+                for line in self.conffile:
+                        # check if the line begin with # and ignore them
+                        if re.match("^#|^\n",line):
+                                continue
+                        tabprop = line.split(";")
+                        if len(tabprop) == 1:           
+                                self.add_tab(tabprop[0])
+                        else:
+                                self.add_tab(tabprop[0],tabprop[1].replace("\\n","\n"))
+
+        except IOError as (errno, strerror):
+                print "Error : No config file found !" 
+
+        except:
+                print "Error reading file"
+                
     def execute_command(self, command, tab=None):
         """Execute the `command' in the `tab'. If tab is None, the
         command will be executed in the currently selected
@@ -965 +990 @@
 
         return params
 
-    def add_tab(self, directory=None):
+    def add_tab(self, name=None, command=None, directory=None):
         """Adds a new tab to the terminal notebook.
         """
         box = GuakeTerminalBox()
@@ -988 +1013 @@
         pid = box.terminal.fork_command(**final_params)
         self.pid_list.append(pid)
 
-        # Adding a new radio button to the tabbar
-        label = _('Terminal %s') % self.tab_counter
+        # Adding a new radio button to the tabbar, check if we put a name
+        if name == None:        
+                label = _('Terminal %s') % self.tab_counter
+        else:
+                label = name.replace("\n","")
+
+        # if we have somting to execute, do it
+        if command != None:
+                box.terminal.feed_child(command)
+
         tabs = self.tabs.get_children()
         parent = tabs and tabs[0] or None
 
@@ -1090 +1123 @@
     """
     from optparse import OptionParser
     parser = OptionParser()
+
+    parser.add_option('-c', '--config', dest='config',
+            action='store', default=False,
+            help=_('Use a config file to add names tabs and launch commands'))      
+
     parser.add_option('-t', '--toggle-visibility', dest='show_hide',
             action='store_true', default=False,
             help=_('Toggles the visibility of the terminal window'))
@@ -1141 +1179 @@
         already_running = False
 
     called_with_param = False
+   
+    if options.config:
+        remote_object.load_conf_tab(options.config)
+        called_with_param = True
 
     if options.show_hide:
-        remote_object.show_hide()
+        remote_object.show_hide
+        called_with_param = True()
         called_with_param = True
 
     if options.show_preferences: