Merge lp:~duanedesign/clicompanion/clicompanion.seperate.merge into lp:clicompanion

[Duane Hinnen]

merge of lp:clicompanion.seperate
Because of the way that branch was created it was necessary to create clicompanion.seperate.merge and then merge it with trunk

[Duane Hinnen (duanedesign)]

This is actually clicompanion.seperate. I had to create another branch of trunk and do the merge correctly. This is what the clicompanion.seperate.merge is.

review: Approve

=== removed file 'CLIcompanion.16.png'
 Binary files CLIcompanion.16.png	2010-10-06 06:54:47 +0000 and CLIcompanion.16.png	1970-01-01 00:00:00 +0000 differ
=== added file 'MANIFEST'
--- MANIFEST	1970-01-01 00:00:00 +0000
+++ MANIFEST	2010-11-30 16:11:27 +0000
@@ -0,0 +1,12 @@
+setup.py
+clicompanion
+clicompanionlib/__init__.py
+clicompanionlib/controller.py
+clicompanionlib/menus_buttons.py
+clicompanionlib/tabs.py
+clicompanionlib/utils.py
+clicompanionlib/view.py
+data/ubuntuone-indicator.desktop
+data/clicompanion.config
+data/clicompanion.16.png
+data/clicompanion.64.png
 
=== added file 'clicompanion'
--- clicompanion	1970-01-01 00:00:00 +0000
+++ clicompanion	2010-11-30 16:11:27 +0000
@@ -0,0 +1,37 @@
+#! /usr/bin/env python
+
+import locale
+import gettext
+import os
+
+from clicompanionlib.view import run
+
+
+BASEDIR = '/usr/share/clicompanion/'
+
+def get_language():
+    """Return the language to be used by the system.
+
+    If it finds the system language in the translated files, it
+    returns it, otherwise it just returns None.
+    """
+    loc = locale.setlocale(locale.LC_ALL, "")
+    loc = loc[:2]
+    traducidos = os.listdir(locale_dir)
+    if loc in traducidos:
+        return loc
+    return
+
+locale_dir = os.path.join(BASEDIR, "locale")
+gettext.install('clicompanion', locale_dir, unicode=True)
+idioma = get_language()
+if idioma is not None:
+    mo = os.path.join(locale_dir, '%s/LC_MESSAGES/clicompanion.mo' % idioma)
+    if not os.access(mo, os.F_OK):
+        raise IOError("The l10n directory (for language %r) exists but "
+                      "not the clicompanion.mo file" % idioma)
+    trans = gettext.translation('clicompanion', locale_dir, languages=[idioma])
+    trans.install(unicode=True)
+
+if __name__ == "__main__":
+    run()
 
=== removed directory 'clicompanion'
=== removed file 'clicompanion.py'
--- clicompanion.py	2010-10-06 06:47:50 +0000
+++ clicompanion.py	1970-01-01 00:00:00 +0000
@@ -1,723 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# clicompanion.py - commandline tool.
-#
-# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#pdb debugger
-#import pdb; pdb.set_trace()
-#
-
-
-import re
-import sys
-import pygtk
-pygtk.require('2.0')
-
-import os
-import os.path
-
-## Starting with the i18n ###
-import locale
-import gettext
-
-BASEDIR = '/usr/share/clicompanion/'
-
-def get_language():
-    """Return the language to be used by the system.
-
-    If it finds the system language in the translated files, it
-    returns it, otherwise it just returns None.
-    """
-    loc = locale.setlocale(locale.LC_ALL, "")
-    loc = loc[:2]
-    traducidos = os.listdir(locale_dir)
-    if loc in traducidos:
-        return loc
-    return
-
-locale_dir = os.path.join(BASEDIR, "locale")
-gettext.install('clicompanion', locale_dir, unicode=True)
-idioma = get_language()
-if idioma is not None:
-    mo = os.path.join(locale_dir, '%s/LC_MESSAGES/clicompanion.mo' % idioma)
-    if not os.access(mo, os.F_OK):
-        raise IOError("The l10n directory (for language %r) exists but "
-                      "not the clicompanion.mo file" % idioma)
-    trans = gettext.translation('clicompanion', locale_dir, languages=[idioma])
-    trans.install(unicode=True)
-## End with i18n ###
-
-## import gtk or print error
-try:
-    import gtk
-except:
-    error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
-        _("You need to install the python gtk bindings"))
-    error.run()
-    sys.exit (1)    
-    
-## import vte or display message dialog
-try:
-    import vte
-except:
-    error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
-        _('You need to install python bindings for libvte'))
-    error.run()
-    sys.exit (1)
-
-import clicompanion.menus_buttons 
-from clicompanion.utils import get_user_shell, sumfile 
-
-
-#TODO: Get rid of global commands CMNDS and ROW
-CMNDS = []
-ROW = ''
-CHEATSHEET = os.path.expanduser("~/.clicompanion")
-CHEATSHEETBAK = os.path.expanduser("~/.clicompanion.bak")
-CONFIG_ORIG = "/etc/clicompanion.d/clicompanion.config"
-
-
-class Companion(object):
-    '''
-    All the actions the program can do.
-    '''
-    ## copy config file to user $HOME if does not exist
-    def setup(self):
-        """Create an initial cheatsheet."""       
-        if not os.path.exists(CHEATSHEET):
-            if os.path.exists(CONFIG_ORIG):
-                os.system ("cp %s %s" % (CONFIG_ORIG, CHEATSHEET))
-            else:
-                ## Oops! Looks like there's no cheatsheet in CHEATSHEET.
-                ## Then, create an empty cheatsheet.
-                open(CHEATSHEET, 'w').close()
-                  
-        elif os.path.exists(CHEATSHEET):
-            if os.path.exists(CONFIG_ORIG):
-                md5 = sumfile()
-                print md5
-                if md5 == '824868f40cd02f0039d5a1fbdbe642d7' or 'a244f1b197f5cfc6b2f35b65911d3930' or '08e7f4de1838b79ab476fcbfb8074da0' or 'd68d6e9da0a3753c8142b63f0ea74511' or '8ab6d4bf6168c1b775221f466c2fcbbd' or ' 6f4f152766441670a55d3bf00567c92e' or ' f4e73fe22505091d6d75767fafc2848c' or ' 7d2f69943cfe5dbd33a45c63008fca17' or '7fc757ca67121b14e574280a6dbe24ef' or '0e345d5934032aa7fecb23cff56d5407':
-                    os.system ("cp %s %s" % (CONFIG_ORIG, CHEATSHEET))
-                    print '.clicompanion not modified by user'
-                #TODO what to do if user has modified command dictionary?
-                else:
-                    os.system ("cp %s %s" % (CHEATSHEET, CHEATSHEETBAK))
-                    os.system ("cp %s %s" % (CONFIG_ORIG, CHEATSHEET))
-                    print '.clicompanion modified by user'
-                
-    ## close the window and quit
-    def delete_event(self, widget,  data=None):
-        gtk.main_quit()
-        return False
-
-    ## Info Dialog Box
-    ## if a command needs more info EX: a package name, a path
-    def get_info(self, widget, data=None):
-        global ROW
-        row_int = int(ROW[0][0])
-
-        ## Create Dialog object
-        dialog = gtk.MessageDialog(
-            None,
-            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-            gtk.MESSAGE_QUESTION,
-            gtk.BUTTONS_OK,
-            None)
-
-        # Primary text
-        dialog.set_markup(_("This command requires more information"))
-
-        ## create the text input field
-        entry = gtk.Entry()
-        ## allow the user to press enter to do ok
-        entry.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
-
-        ## create a horizontal box to pack the entry and a label
-        hbox = gtk.HBox()
-        hbox.pack_start(gtk.Label(self.liststore[row_int][1]+":"), False, 5, 5)
-        hbox.pack_end(entry)
-        ## some secondary text
-        dialog.format_secondary_markup(_("Please provide a "+self.liststore[row_int][1]))
-        ## add it and show it
-        dialog.vbox.pack_end(hbox, True, True, 0)
-        dialog.show_all()
-
-        ## Show the dialog
-        dialog.run()
-
-        ## user text assigned to a variable
-        text = entry.get_text()
-        user_input = text.split(' ')
-
-        ## The destroy method must be called otherwise the 'Close' button will
-        ## not work.
-        dialog.destroy()
-        return user_input
-
-    def responseToDialog(self, text, dialog, response):
-        dialog.response(response)
-
-    ## Add command dialog box
-    def add_command(self, widget):
-
-        ## Create Dialog object
-        dialog = gtk.MessageDialog(
-            None,
-            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-            gtk.MESSAGE_QUESTION,
-            gtk.BUTTONS_OK,
-            None)
-
-        ## primaary text
-        dialog.set_markup(_("Add a command to your clicompanion dictionary"))
-
-        #create the text input field
-        entry1 = gtk.Entry()
-        entry2 = gtk.Entry()
-        entry3 = gtk.Entry()
-        ## allow the user to press enter to do ok
-        entry1.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
-        entry2.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
-        entry3.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
-
-        ## create three labels
-        hbox1 = gtk.HBox()
-        hbox1.pack_start(gtk.Label(_("Command")), False, 5, 5)
-        hbox1.pack_start(entry1, False, 5, 5)
-
-        hbox1.pack_start(gtk.Label(_("User Input")), False, 5, 5)
-        hbox1.pack_start(entry2, False, 5, 5)
-
-        hbox2 = gtk.HBox()
-        hbox2.pack_start(gtk.Label(_("Description")), False, 5, 5)
-        hbox2.pack_start(entry3, True, 5, 5)
-
-        ## cancel button
-        dialog.add_button('Cancel', gtk.RESPONSE_DELETE_EVENT)
-        ## some secondary text
-        dialog.format_secondary_markup(_("Please provide a command. Use a @ symbol where user input is required at runtime. Example: ls /any/direstory would be entered as ls @. Also include a brief description."))
-
-        ## add it and show it
-        dialog.vbox.pack_end(hbox2, True, True, 0)
-        dialog.vbox.pack_end(hbox1, True, True, 0)
-        dialog.show_all()
-        ## Show the dialog
-        result = dialog.run()
-
-        if result == gtk.RESPONSE_OK:
-            ## user text assigned to a variable
-            text1 = entry1.get_text()
-            text2 = entry2.get_text()
-            text3 = entry3.get_text()
-            ## open flat file that contains the commands and add the new command
-            with open(CHEATSHEET, "a") as cheatfile:
-                if text1 != "":
-                    cheatfile.write(text1+" :"+text2+" : "+text3+'\n')
-                    cheatfile.close()
-                    l = str(text1+" :"+text2+" : "+text3)
-                    ls = l.split(':',2)
-                    CMNDS.append(ls[0])
-                    self.liststore.append([ls[0],ls[1],ls[2]])
-
-        ## The destroy method must be called otherwise the 'Close' button will
-        ## not work.
-        dialog.destroy()
-        #return text
-
-    ## This the edit function
-    def edit_command(self, widget , data=None):
-
-        global ROW
-        row_int = int(ROW[0][0])
-
-
-        row_obj1 = self.liststore[row_int][0]
-        text1 = "".join(row_obj1)
-
-        row_obj2 = self.liststore[row_int][1]
-        text2 = "".join(row_obj2)
-
-        row_obj3 = self.liststore[row_int][2]
-        text3 = "".join(row_obj3)
-
-        ## Create Dialog object
-        dialog = gtk.MessageDialog(
-            None,
-            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-            gtk.MESSAGE_QUESTION,
-            gtk.BUTTONS_OK,
-            None)
-
-        # primary text
-        dialog.set_markup(_("Edit the command in your clicompanion dictionary"))
-
-        ## create the text input fields
-        entry1 = gtk.Entry()
-        entry1.set_text(text1)
-        entry2 = gtk.Entry()
-        entry2.set_text(text2)
-        entry3 = gtk.Entry()
-        entry3.set_text(text3)
-        ## allow the user to press enter to do ok
-        entry1.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
-
-        ## create three labels
-        hbox1 = gtk.HBox()
-        hbox1.pack_start(gtk.Label(_("Command")), False, 5, 5)
-        hbox1.pack_start(entry1, False, 5, 5)
-
-        hbox1.pack_start(gtk.Label(_("User Input")), False, 5, 5)
-        hbox1.pack_start(entry2, False, 5, 5)
-
-        hbox2 = gtk.HBox()
-        hbox2.pack_start(gtk.Label(_("Description")), False, 5, 5)
-        hbox2.pack_start(entry3, True, 5, 5)
-
-        ## cancel button
-        dialog.add_button('Cancel', gtk.RESPONSE_DELETE_EVENT)
-        ## some secondary text
-        dialog.format_secondary_markup(_("Please provide a command, description, and what type of user variable, if any, is required."))
-
-        ## add it and show it
-        dialog.vbox.pack_end(hbox2, True, True, 0)
-        dialog.vbox.pack_end(hbox1, True, True, 0)
-        dialog.show_all()
-        ## Show the dialog
-        result = dialog.run()
-
-        if result == gtk.RESPONSE_OK:
-            ## user text assigned to a variable
-            text1 = entry1.get_text()
-            text2 = entry2.get_text()
-            text3 = entry3.get_text()
-
-            if text1 != "":
-                self.remove_command(widget)
-                ## open flat file, add the new command
-                with open(CHEATSHEET, "a") as cheatfile:
-                        cheatfile.write(text1+":"+text2+":"+text3+'\n')
-                        cheatfile.close()
-                        l = str(text1+":"+text2+":"+text3)
-                        ls = l.split(':',2)
-                        CMNDS.append(ls[0])
-                        self.liststore.append([ls[0],ls[1],ls[2]])
-
-        ## The destroy method must be called otherwise the 'Close' button will
-        ## not work.
-        dialog.destroy()
-
-
-    ## Remove command from command file and GUI
-    def remove_command(self, widget, data=None):
-        global ROW
-        row_int = int(ROW[0][0]) #convert pathlist into something usable
-
-        del CMNDS[row_int]
-        del self.liststore[row_int]
-
-
-        ## open command file and delete line so the change is persistent
-        with open(CHEATSHEET, "r") as cheatfile:
-            cheatlines = cheatfile.readlines()
-            del cheatlines[row_int]
-            cheatfile.close()
-        with open(CHEATSHEET, "w") as cheatfile2:
-            cheatfile2.writelines(cheatlines)
-            cheatfile2.close()
-
-
-    def _filter_commands(self, widget, data=None):
-        """
-        Show commands matching a given search term.
-        The user should enter a term in the search box and the treeview should
-        only display the rows which contain the search term.
-        Pretty straight-forward.
-        """
-        search_term = self.search_box.get_text()
-
-        ## Create a TreeModelFilter object which provides auxiliary functions for
-        ## filtering data.
-        ## http://www.pygtk.org/pygtk2tutorial/sec-TreeModelSortAndTreeModelFilter.html
-        modelfilter = self.liststore.filter_new()
-        def search(modelfilter, iter, search_term):
-            try:
-                ## Iterate through every column and row and check if the search
-                ## term is there:
-                if search_term in modelfilter.get_value(iter, 0) or \
-                   search_term in modelfilter.get_value(iter, 1) or \
-                   search_term in modelfilter.get_value(iter, 2):
-                    return True
-            except TypeError:
-                ## Python raises a TypeError if row data doesn't exist. Catch
-                ## that and fail silently.
-                pass
-
-        modelfilter.set_visible_func(search, search_term)
-        self.treeview.set_model(modelfilter)
-
-    ## send the command to the terminal
-    def run_command(self, widget, data=None):
-        global ROW
-        text = ""
-        row_int = int(ROW[0][0]) ## removes everything but number from [5,]
-
-        ## get the current notebook page so the function knows which terminal to run the command in.
-        pagenum = self.notebook.get_current_page()
-        widget = self.notebook.get_nth_page(pagenum)
-        page_widget = widget.get_child()
-
-        ## CMNDS is where commands are stored
-        cmnd = CMNDS[row_int] 
-        ## find how many @(user arguments) are in command
-        match = re.findall('@', cmnd) 
-        '''
-        Make sure user arguments were found. Replace @ with something
-        .format can read. This is done so the user can just enter @, when
-        adding a command where arguments are needed, instead
-        of {0[1]}, {0[1]}, {0[2]}
-        '''    
-        if match == False:
-            pass
-        else:
-            num = len(match)
-            ran = 0
-            new_cmnd = self.replace(cmnd, num, ran)
-
-        if not self.liststore[row_int][1] == " ": # command with user input
-            text = Companion.get_info(self, text)
-            c = new_cmnd.format(text)
-            page_widget.feed_child(c+"\n") #send command w/ input
-            page_widget.show()
-        else: ## command that has no user input
-            page_widget.feed_child(cmnd+"\n") #send command
-            page_widget.show()
-            page_widget.grab_focus()
-            
-    ## replace @ with {0[n]}
-    def replace(self, cmnd, num, ran):
-        replace_cmnd=re.sub('@', '{0['+str(ran)+']}', cmnd, count=1)
-        cmnd = replace_cmnd
-        ran += 1
-        if ran < num:
-            return self.replace(cmnd, num, ran)    
-        else:
-            pass
-        return cmnd
-        
-    ## open the man page for selected command
-    def man_page(self, widget, data=None):
-        row_int = int(ROW[0][0]) # removes everything but number from EX: [5,]
-        cmnd = CMNDS[row_int] #CMNDS is where commands are store
-        splitcommand = self._filter_sudo_from(cmnd.split(" "))
-        ## get current notebook tab to use in function
-        pagenum = self.notebook.get_current_page()
-        widget = self.notebook.get_nth_page(pagenum)
-        page_widget = widget.get_child()
-        #send command to Terminal
-        page_widget.feed_child("man "+splitcommand[0]+"| most \n") 
-        page_widget.grab_focus()
-        page_widget.show()
-
-
-    @staticmethod
-    def _filter_sudo_from(command):
-        """Filter the sudo from `command`, where `command` is a list.
-        Return the command list with the "sudo" filtered out.
-        """
-        if command[0].startswith("sudo"):
-            del command[0]
-            return command
-        return command
-
-
-    ## open file containing command dictionary and put it in a variable
-    def update(self):
-        try:
-            with open(CHEATSHEET, "r") as cheatfile:
-                bugdata=cheatfile.read()
-                cheatfile.close()
-        except IOError:
-            ## CHEATSHEET is not there. Oh, no!
-            ## So, run self.setup() again.
-            self.setup()
-            ## Then, run me again.
-            self.update()
-
-        global CMNDS
-        ## add bug data from .clicompanion to the liststore
-        CMNDS = []
-        for line in bugdata.splitlines():
-            l = line.split(':',2)
-            CMNDS.append(l[0])
-            self.liststore.append([l[0],l[1],l[2]])
-
-
-
-    ## add a new terminal in a tab above the current terminal
-    def add_tab(self,   data=None):
-
-        _vte = vte.Terminal()
-        _vte.set_size_request(700, 220)
-        _vte.connect ("child-exited", lambda term: gtk.main_quit())
-        _vte.fork_command(get_user_shell()) # Get the user's default shell
-
-        vte_tab = gtk.ScrolledWindow()
-        vte_tab.add(_vte)
-        #self.notebook.set_show_tabs(True)
-        #self.notebook.set_show_border(True)
-
-        gcp = self.notebook.get_current_page() +1
-        pagenum = ('Tab %d') % gcp
-
-        box = gtk.HBox()
-        label = gtk.Label(pagenum)
-        box.pack_start(label, True, True)
-
-        ## x image for tab close button
-        close_image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU)
-        ## close button
-        closebtn = gtk.Button()
-        closebtn.set_relief(gtk.RELIEF_NONE)
-        closebtn.set_focus_on_click(True)
-
-        closebtn.add(close_image)
-        ## put button in a box and show box
-        box.pack_end(closebtn, False, False)
-        box.show_all()
-
-        self.notebook.prepend_page(vte_tab, box) # add tab
-        self.notebook.set_scrollable(True)
-        _vte.connect ("button_press_event", self.copy_paste, None)
-        vte_tab.grab_focus()
-        # signal handler for tab
-        closebtn.connect("clicked", self.close_tab, vte_tab) 
-        self.window.show_all()
-
-        return vte_tab
-
-
-    ## Remove a page from the notebook
-    def close_tab(self, sender, widget):
-        ## get the page number of the tab we wanted to close
-        pagenum = self.notebook.page_num(widget)
-        ## and close it
-        self.notebook.remove_page(pagenum)
-
-    #TODO: Move to menus_buttons
-    def copy_paste(self, vte, event, data=None):
-        if event.button == 3:
-
-            time = event.time
-            ## right-click popup menu Copy
-            popupMenu = gtk.Menu()
-            menuPopup1 = gtk.ImageMenuItem (gtk.STOCK_COPY)
-            popupMenu.add(menuPopup1)
-            menuPopup1.connect('activate', lambda x: vte.copy_clipboard())
-            ## right-click popup menu Paste
-            menuPopup2 = gtk.ImageMenuItem (gtk.STOCK_PASTE)
-            popupMenu.add(menuPopup2)
-            menuPopup2.connect('activate', lambda x: vte.paste_clipboard())
-
-            ## Show popup menu
-            popupMenu.show_all()
-            popupMenu.popup( None, None, None, event.button, time)
-            return True
-        else:
-            pass
-
-    def about_event(self):
-        pass
-    def help_event(self):
-        pass
-        
-    #liststore in a scrolled window in an expander
-    def expanded_cb(self, expander, params):
-        if expander.get_expanded():
-
-            self.update()
-            ## create the TreeView
-            self.treeview = gtk.TreeView()
-            ## create window with scrollbar
-            self.scrolledwindow = gtk.ScrolledWindow()
-            self.scrolledwindow.set_size_request(700, 220)
-
-            ## create the TreeViewColumns to display the data
-            self.treeview.columns = [None]*3
-            self.treeview.columns[0] = gtk.TreeViewColumn(_('Command'))
-            self.treeview.columns[1] = gtk.TreeViewColumn(_('User Argument'))
-            self.treeview.columns[2] = gtk.TreeViewColumn(_('Description'))
-            
-            ## right click menu event capture
-            bar = clicompanion.menus_buttons.FileMenu()
-            self.treeview.connect ("button_press_event", bar.right_click, self)
-            
-            for n in range(3):
-                ## add columns to treeview
-                self.treeview.append_column(self.treeview.columns[n])
-                ## create a CellRenderers to render the data
-                self.treeview.columns[n].cell = gtk.CellRendererText()
-                ## add the cells to the columns
-                self.treeview.columns[n].pack_start(self.treeview.columns[n].cell,
-                                                    True)
-                ## set the cell attributes to the appropriate liststore column
-                self.treeview.columns[n].set_attributes(
-                self.treeview.columns[n].cell, text=n)   
-                self.treeview.columns[n].set_resizable(True)          
-
-            ## The set_model() method sets the "model" property for the treeview to the value of model. model : the new tree model to use with the treeview
-            self.treeview.set_model(self.liststore)
-            self.scrolledwindow.add(self.treeview)
-            expander.add(self.scrolledwindow)
-            
-            self.window.show_all()
-
-            self.treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)
-            self.treeview.get_selection().connect('changed',lambda s: mark_selected(s))
-
-            def mark_selected(treeselection):
-                (model,pathlist)=treeselection.get_selected_rows()
-                global ROW
-                ROW = pathlist    
-
-            # Activate the search box when not expanded
-            self.search_box.set_sensitive(True)
-        else:
-            # De-activate the search box when not expanded
-            self.search_box.set_sensitive(False)
-
-            expander.remove(expander.child)
-            ##reset the size of the window to its original one
-            self.window.resize(1, 1)
-        return        
-        
-        
-    def __init__(self):
-        ##For now TERM is hardcoded to xterm because of a change
-        ##in libvte in Ubuntu Maverick
-        os.putenv('TERM', 'xterm')
-        ## copy config file to user $HOME if does not exist
-        self.setup()
-        #TODO: do we want to do this? Or just keep the height under 600.
-        ##Get user screen size##
-        #screen = gtk.gdk.display_get_default().get_default_screen()
-        #screen_size = screen.get_monitor_geometry(0)
-        #height =  screen.get_height() ## screen height ##
-        ## Create a new window
-        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        ## create a liststore with three string columns
-        self.liststore = gtk.ListStore(str, str, str)
-        ## Create an expander
-        expander = gtk.Expander()
-        ## Create Notebook
-        self.notebook = gtk.Notebook()
-        ## set Window title
-        self.window.set_title("CLI Companion")
-        ## Adding icon
-        icon = gtk.gdk.pixbuf_new_from_file("/usr/share/pixmaps/clicompanion.16.png")
-        self.window.set_icon(icon)
-        ## Sets the border width of the window.
-        self.window.set_border_width(10)
-        ## set the size of the window
-        self.window.set_default_size(700, 400)
-        ## Sets the position of the window relative to the screen
-        self.window.set_position(gtk.WIN_POS_CENTER)
-        ## Allow user to resize window
-        self.window.set_resizable(True)
-        
-        self.window.connect("delete_event", self.delete_event)
-
-        ## 'File' and 'Help' Drop Down Menu [menus_buttons.py]
-        bar = clicompanion.menus_buttons.FileMenu()
-        menu_bar = bar.the_menu(self)    
-        ## The search section
-        self.search_label = gtk.Label(_("Search:"))
-        self.search_label.set_alignment(xalign=-1, yalign=0)
-        self.search_box = gtk.Entry()
-        self.search_box.connect("changed", self._filter_commands)
-        ## search box tooltip
-        self.search_box.set_tooltip_text("Search your list of commands")
-        # Set the search box sensitive at program start, because expander is not
-        # unfolded by default
-        self.search_box.set_sensitive(False)
-        ## hbox for menu and search Entry
-        menu_search_hbox = gtk.HBox(False)
-        menu_search_hbox.pack_end(self.search_box, True)
-        menu_search_hbox.pack_end(self.search_label, False, False, 10)
-        menu_search_hbox.pack_start(menu_bar, True)
-
-        ## TODO Do we want to start with the command list open or closed?
-        ## This code opens the app with it open
-        ## We would also need to change the search field disable code
-        ## start program with expander open
-        #expander.set_expanded(True)
-        #self.expanded_cb(expander, None)
-
-        ## expander signal
-        expander.connect('notify::expanded', self.expanded_cb)
-
-        ## expander title
-        expander_hbox = gtk.HBox()
-        image = gtk.Image()
-        image.set_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
-        label = gtk.Label(' Command List')
-        ## tooltip for the label of the expander
-        expander_hbox.set_tooltip_text("Click to show/hide command list")
-        
-        ## add expander widget to hbox
-        expander_hbox.pack_start(image, False, False)
-        expander_hbox.pack_start(label, True, False)
-        expander.set_label_widget(expander_hbox)
-
-        ## Add the first tab with the Terminal
-        self.add_tab()
-        self.notebook.set_tab_pos(1)
-
-        ## The "Add Tab" tab
-        add_tab_button = gtk.Button("+")
-        ## tooltip for "Add Tab" tab
-        add_tab_button.set_tooltip_text("Click to add another Tab")
-        add_tab_button.connect("clicked", self.add_tab)
-        self.notebook.append_page(gtk.Label(""), add_tab_button)
-        
-        ## buttons at bottom of main window [menus_buttons.py]
-        button_box = bar.buttons(self, 10, gtk.BUTTONBOX_END)
-
-        ## vbox for search, notebook, buttonbar
-        self.vbox = gtk.VBox()
-        self.window.add(self.vbox)
-        ## pack everytyhing in the vbox
-        #self.vbox.pack_start(menu_bar, False, False,  0) ##menuBar
-        self.vbox.pack_start(menu_search_hbox, False, False, 5)
-        self.vbox.pack_start(expander, False, False, 5)
-        self.vbox.pack_start(self.notebook, True, True, 10)
-        self.vbox.pack_start(button_box, False, False, 5)
-
-
-        #self.vte.grab_focus()
-        self.window.show_all()
-        return
-
-def main():
-    try:
-        gtk.main()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == "__main__":
-    companion = Companion()
-    main()
-
 
=== removed file 'clicompanion/__init__.py'
--- clicompanion/__init__.py	2010-10-06 06:54:47 +0000
+++ clicompanion/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# clicompanion.py - commandline tool.
-#
-# Copyright 2010 Duane Hinnen, Kenny Meyer
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-'''
-blah, blah, blah
-'''
 
=== removed file 'clicompanion/menus_buttons.py'
--- clicompanion/menus_buttons.py	2010-10-06 06:54:47 +0000
+++ clicompanion/menus_buttons.py	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
-#
-# This file contains the menus, buttons, and right clicks
-#
-#import clicompanion
-import gtk
-
-class FileMenu(object):
-    def the_menu(self, cli):
-        menu = gtk.Menu()
-        root_menu = gtk.MenuItem(_("File"))       
-        root_menu.set_submenu(menu)
- 
-        menu2 = gtk.Menu()       
-        root_menu2 = gtk.MenuItem(_("Help"))
-        root_menu2.set_submenu(menu2)
-
-        ##FILE MENU ##     
-        ## Make 'Run' menu entry
-        menu_item1 = gtk.MenuItem(_("Run Command"))
-        menu.append(menu_item1)
-        menu_item1.connect("activate", cli.run_command)
-        menu_item1.show()
-
-        ## Make 'Add' file menu entry
-        menu_item2 = gtk.MenuItem(_("Add Command"))
-        menu.append(menu_item2)
-        menu_item2.connect("activate", cli.add_command)
-        menu_item2.show()
-        
-        ## Make 'Remove' file menu entry
-        menu_item2 = gtk.MenuItem(_("Remove Command"))
-        menu.append(menu_item2)
-        menu_item2.connect("activate", cli.remove_command)
-        menu_item2.show()
-
-        ## Make 'Quit' file menu entry
-        menu_item3 = gtk.MenuItem(_("Quit"))
-        menu.append(menu_item3)
-        menu_item3.connect("activate", cli.delete_event)
-        menu_item3.show()
-
-
-        ## Make 'Add Tab' file menu entry
-        menu_item4 = gtk.MenuItem(_("Add Tab"))
-        menu.append(menu_item4)
-        menu_item4.connect("activate", cli.add_tab)
-        menu_item4.show()
-        
-        
-        ## HELP MENU ##
-        ## Make 'About' file menu entry
-        menu_item11 = gtk.MenuItem(_("About"))
-        menu2.append(menu_item11)
-        menu_item11.connect("activate", cli.about_event)
-        menu_item11.show()
-
-
-        ## Make 'Help' file menu entry
-        menu_item22 = gtk.MenuItem(_("Help"))
-        menu2.append(menu_item22)
-        menu_item22.connect("activate", cli.help_event)
-        menu_item22.show()
-        
-
-        menu_bar = gtk.MenuBar()
-        
-        menu_bar.append (root_menu) ##Menu bar(file)
-        menu_bar.append (root_menu2) ##Menu bar(help)       
-        #menu_bar.show() ##show File Menu # Menu Bar
-        ##Show 'File' Menu
-        #root_menu.show()
-        return menu_bar
-        
-        
-        
-    def buttons(self, cli,  spacing, layout):
-        #button box at bottom of main window
-        frame = gtk.Frame()
-        bbox = gtk.HButtonBox()
-        bbox.set_border_width(5)
-        frame.add(bbox)
-
-        # Set the appearance of the Button Box
-        bbox.set_layout(layout)
-        bbox.set_spacing(spacing)
-        # Run button
-        buttonRun = gtk.Button(_("Run"))
-        bbox.add(buttonRun)
-        buttonRun.connect("clicked", cli.run_command)
-        buttonRun.set_tooltip_text("Click to run a highlighted command")
-        # Add button
-        buttonAdd = gtk.Button(stock=gtk.STOCK_ADD)
-        bbox.add(buttonAdd)
-        buttonAdd.connect("clicked", cli.add_command)
-        buttonAdd.set_tooltip_text("Click to add a command to your command list")
-        # Edit button
-        buttonEdit = gtk.Button("Edit")
-        bbox.add(buttonEdit)
-        buttonEdit.connect("clicked", cli.edit_command)
-        buttonEdit.set_tooltip_text("Click to edit a command in your command list")
-        # Delete button
-        buttonDelete = gtk.Button(stock=gtk.STOCK_DELETE)
-        bbox.add(buttonDelete)
-        buttonDelete.connect("clicked", cli.remove_command)
-        buttonDelete.set_tooltip_text("Click to delete a command in your command list")
-        #Help Button
-        buttonHelp = gtk.Button(stock=gtk.STOCK_HELP)
-        bbox.add(buttonHelp)
-        buttonHelp.connect("clicked", cli.man_page)
-        buttonHelp.set_tooltip_text("Click to get help with a command in your command list")
-        # Cancel button
-        buttonCancel = gtk.Button(stock=gtk.STOCK_QUIT)
-        bbox.add(buttonCancel)
-        buttonCancel.connect("clicked", cli.delete_event)
-        buttonCancel.set_tooltip_text("Click to quit CLI Companion")
-
-        return frame      
-        
-        
-    #right-click popup menu for the Liststore(command list)
-    def right_click(self, treeview, event, cli):
-        if event.button == 3:
-            x = int(event.x)
-            y = int(event.y)
-            time = event.time
-            pthinfo = treeview.get_path_at_pos(x, y)
-            if pthinfo is not None:
-                path, col, cellx, celly = pthinfo
-                treeview.grab_focus()
-                treeview.set_cursor( path, col, 0)
-                
-                # right-click popup menu Apply(run)
-                popupMenu = gtk.Menu()
-                menuPopup1 = gtk.ImageMenuItem (gtk.STOCK_APPLY)
-                popupMenu.add(menuPopup1)
-                menuPopup1.connect("activate", cli.run_command)
-                # right-click popup menu Edit        
-                menuPopup2 = gtk.ImageMenuItem (gtk.STOCK_EDIT)
-                popupMenu.add(menuPopup2)
-                menuPopup2.connect("activate", cli.edit_command)
-                # right-click popup menu Delete                 
-                menuPopup3 = gtk.ImageMenuItem (gtk.STOCK_DELETE)
-                popupMenu.add(menuPopup3)
-                menuPopup3.connect("activate", cli.remove_command)
-                # right-click popup menu Help                
-                menuPopup4 = gtk.ImageMenuItem (gtk.STOCK_HELP)
-                popupMenu.add(menuPopup4)
-                menuPopup4.connect("activate", cli.man_page)
-                # Show popup menu
-                popupMenu.show_all()
-                popupMenu.popup( None, None, None, event.button, time)
-            return True          
-
 
=== removed file 'clicompanion/utils.py'
--- clicompanion/utils.py	2010-10-06 06:54:47 +0000
+++ clicompanion/utils.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# -*- mode: python; coding: utf-8; -*-
-#
-# clicompanion.py - commandline tool.
-#
-# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-"""
-A collection of useful functions.
-"""
-
-import getpass
-import hashlib
-import os
-
-CHEATSHEET = os.path.expanduser("~/.clicompanion")
-CONFIG_ORIG = "/etc/clicompanion.d/clicompanion.config"
-
-def get_user_shell():
-    """Get the user's shell defined in /etc/passwd ."""
-    data = None
-    try:
-        # Read out the data in /etc/passwd
-        with open('/etc/passwd') as f:
-            data = f.readlines()
-    except e:
-        print "Something unexpected happened!"
-        raise e
-
-    for i in data:
-        tmp = i.split(":")
-        # Check for the entry of the currently logged in user
-        if tmp[0] == getpass.getuser(): 
-            # Columns are separated by colons, so split each column.
-            # Sample /etc/passwd entry for a user:
-            # 
-            #  jorge:x:1001:1002:,,,:/home/jorge:/bin/bash
-            #
-            # The last column is relevant for us.
-            # Don't forget to strip the newline at the end of the string!
-            return i.split(":")[-1:][0].strip('\n')
-            
-            
-def sumfile():
-    '''Returns an md5 hash for an object with read() method.'''
-    m = hashlib.md5()
-    with open(CHEATSHEET, 'rb') as cheatsheet:
-        d = cheatsheet.read()
-        m.update(d)
-        pp = m.hexdigest()
-        print pp
-    return m.hexdigest()
-
 
=== added directory 'clicompanionlib'
=== added file 'clicompanionlib/__init__.py'
--- clicompanionlib/__init__.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/__init__.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# clicompanion.py - commandline tool.
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+'''
+blah, blah, blah
+'''
 
=== added file 'clicompanionlib/controller.py'
--- clicompanionlib/controller.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/controller.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,428 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# clicompanion.py - commandline tool.
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# IMPORTANT: you need to move the .cheatsheet file to your $HOME
+#
+
+
+import pygtk
+pygtk.require('2.0')
+import re
+import webbrowser
+
+import os
+# import gtk or print error
+try:
+    import gtk
+except:
+    print >> sys.stderr, "You need to install the python gtk bindings"
+    sys.exit(1)
+    
+# TODO: these handle the exception different. Which do we like?
+# import vte or display dialog
+try:
+    import vte
+except:
+    error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
+        'You need to install python bindings for libvte')
+    error.run()
+    sys.exit (1)
+    
+from clicompanionlib.utils import get_user_shell
+import view
+
+
+CHEATSHEET = os.path.expanduser("~/.clicompanion2")
+CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
+
+
+class Actions(object):
+    ## Info Dialog Box
+    ## if a command needs more info EX: a package name, a path
+    def get_info(self, widget, liststore):
+
+        row_int = int(view.ROW[0][0])
+
+        ## Create Dialog object
+        dialog = gtk.MessageDialog(
+            None,
+            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+            gtk.MESSAGE_QUESTION,
+            gtk.BUTTONS_OK,
+            None)
+
+        # Primary text
+        dialog.set_markup(_("This command requires more information"))
+
+        ## create the text input field
+        entry = gtk.Entry()
+        ## allow the user to press enter to do ok
+        entry.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
+
+        ## create a horizontal box to pack the entry and a label
+        hbox = gtk.HBox()
+        hbox.pack_start(gtk.Label(liststore[row_int][1]+":"), False, 5, 5)
+        hbox.pack_end(entry)
+        ## some secondary text
+        dialog.format_secondary_markup(_("Please provide a "+liststore[row_int][1]))
+        ## add it and show it
+        dialog.vbox.pack_end(hbox, True, True, 0)
+        dialog.show_all()
+
+        ## Show the dialog
+        dialog.run()
+
+        ## user text assigned to a variable
+        text = entry.get_text()
+        user_input = text.split(' ')
+
+        ## The destroy method must be called otherwise the 'Close' button will
+        ## not work.
+        dialog.destroy()
+        return user_input
+
+    def responseToDialog(self, text, dialog, response):
+        dialog.response(response)
+
+    ## Add command dialog box
+    def add_command(self, widget, liststore):
+
+        ## Create Dialog object
+        dialog = gtk.MessageDialog(
+            None,
+            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+            gtk.MESSAGE_QUESTION,
+            gtk.BUTTONS_OK,
+            None)
+
+        ## primaary text
+        dialog.set_markup(_("Add a command to your CLI Companion dictionary"))
+
+        #create the text input field
+        entry1 = gtk.Entry()
+        entry2 = gtk.Entry()
+        entry3 = gtk.Entry()
+        ## allow the user to press enter to do ok
+        entry1.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
+        entry2.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
+        entry3.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
+
+        ## create three labels
+        hbox1 = gtk.HBox()
+        hbox1.pack_start(gtk.Label(_("Command")), False, 5, 5)
+        hbox1.pack_start(entry1, False, 5, 5)
+
+        hbox1.pack_start(gtk.Label(_("User Input")), False, 5, 5)
+        hbox1.pack_start(entry2, False, 5, 5)
+
+        hbox2 = gtk.HBox()
+        hbox2.pack_start(gtk.Label(_("Description")), False, 5, 5)
+        hbox2.pack_start(entry3, True, 5, 5)
+
+        ## cancel button
+        dialog.add_button('Cancel', gtk.RESPONSE_DELETE_EVENT)
+        ## some secondary text
+        dialog.format_secondary_markup(_("When entering a command, use a ? symbol if user input is required at runtime. Example: ls /any/direstory would be entered as ls ? .For each ? in your command, if any, use the User Input field to provide a hint for each variable. Using our example ls ? you could put directory as the User Input. Lastly provide a brief Description."))
+
+        ## add it and show it
+        dialog.vbox.pack_end(hbox2, True, True, 0)
+        dialog.vbox.pack_end(hbox1, True, True, 0)
+        dialog.show_all()
+        ## Show the dialog
+        result = dialog.run()
+
+        if result == gtk.RESPONSE_OK:
+            ## user text assigned to a variable
+            text1 = entry1.get_text()
+            text2 = entry2.get_text()
+            text3 = entry3.get_text()
+            '''open flat file, add the new command, update CMNDS variable
+            ## update commands in liststore (on screen) '''
+            with open(CHEATSHEET, "a") as cheatfile:
+                if text1 != "":
+                    ## write new commands to .clicompanion2 file
+                    cheatfile.write(text1+":"+text2+":"+text3+'\n')
+                    cheatfile.close()
+                    l = str(text1+":"+text2+":"+text3)
+                    ls = l.split(':',2)
+                    ## update view.CMNDS variable
+                    filteredcommandplus = ls[0], ls[1]
+                    view.CMNDS.append(filteredcommandplus)
+                    ## update the command list on screen
+                    liststore.append([ls[0],ls[1],ls[2]])
+
+
+        ## The destroy method must be called otherwise the 'Close' button will
+        ## not work.
+        dialog.destroy()
+        #return text
+
+    ## This the edit function
+    def edit_command(self, widget , liststore):
+
+        row_int = int(view.ROW[0][0])
+
+        row_obj1 = liststore[row_int][0]
+        text1 = "".join(row_obj1)
+
+        row_obj2 = liststore[row_int][1]
+        text2 = "".join(row_obj2)
+
+        row_obj3 = liststore[row_int][2]
+        text3 = "".join(row_obj3)
+
+        ## Create Dialog object
+        dialog = gtk.MessageDialog(
+            None,
+            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+            gtk.MESSAGE_QUESTION,
+            gtk.BUTTONS_OK,
+            None)
+
+        # primary text
+        dialog.set_markup(_("Edit the command in your clicompanion dictionary"))
+
+        ## create the text input fields
+        entry1 = gtk.Entry()
+        entry1.set_text(text1)
+        entry2 = gtk.Entry()
+        entry2.set_text(text2)
+        entry3 = gtk.Entry()
+        entry3.set_text(text3)
+        ## allow the user to press enter to do ok
+        entry1.connect("activate", self.responseToDialog, dialog, gtk.RESPONSE_OK)
+
+        ## create three labels
+        hbox1 = gtk.HBox()
+        hbox1.pack_start(gtk.Label(_("Command")), False, 5, 5)
+        hbox1.pack_start(entry1, False, 5, 5)
+
+        hbox1.pack_start(gtk.Label(_("User Input")), False, 5, 5)
+        hbox1.pack_start(entry2, False, 5, 5)
+
+        hbox2 = gtk.HBox()
+        hbox2.pack_start(gtk.Label(_("Description")), False, 5, 5)
+        hbox2.pack_start(entry3, True, 5, 5)
+
+        ## cancel button
+        dialog.add_button('Cancel', gtk.RESPONSE_DELETE_EVENT)
+        ## some secondary text
+        dialog.format_secondary_markup(_("Please provide a command, description, and what type of user variable, if any, is required."))
+
+        ## add it and show it
+        dialog.vbox.pack_end(hbox2, True, True, 0)
+        dialog.vbox.pack_end(hbox1, True, True, 0)
+        dialog.show_all()
+        ## Show the dialog
+        result = dialog.run()
+
+        if result == gtk.RESPONSE_OK:
+            ## user text assigned to a variable
+            text1 = entry1.get_text()
+            text2 = entry2.get_text()
+            text3 = entry3.get_text()
+
+            if text1 != "":
+                self.remove_command(widget, liststore)
+                '''open flat file, add the new command, update CMNDS variable
+                ## update commands in liststore (on screen) '''
+                with open(CHEATSHEET, "a") as cheatfile:
+                        ## write new commands to .clicompanion2 file
+                        cheatfile.write(text1+":"+text2+":"+text3+'\n')
+                        cheatfile.close()
+                        l = str(text1+":"+text2+":"+text3)
+                        ls = l.split(':',2)
+                        ## update view.CMNDS variable
+                        filteredcommandplus = ls[0], ls[1]
+                        view.CMNDS.append(filteredcommandplus)
+                        ## update the command list on screen
+                        liststore.append([ls[0],ls[1],ls[2]])
+
+        ## The destroy method must be called otherwise the 'Close' button will
+        ## not work.
+        dialog.destroy()
+
+
+    ## Remove command from command file and GUI
+    def remove_command(self, widget, liststore):
+
+        row_int = int(view.ROW[0][0]) #convert pathlist into something usable   
+        del view.CMNDS[row_int]
+        del liststore[row_int]
+
+        ## open command file and delete line so the change is persistent
+        with open(CHEATSHEET, "r") as cheatfile:
+            cheatlines = cheatfile.readlines()
+            del cheatlines[row_int]
+            cheatfile.close()
+        with open(CHEATSHEET, "w") as cheatfile2:
+            cheatfile2.writelines(cheatlines)
+            cheatfile2.close()
+
+
+    def _filter_commands(self, widget, liststore, treeview):
+        """
+        Show commands matching a given search term.
+        The user should enter a term in the search box and the treeview should
+        only display the rows which contain the search term.
+        Pretty straight-forward.
+        """
+        search_term = widget.get_text()
+        
+        ## Create a TreeModelFilter object which provides auxiliary functions for
+        ## filtering data.
+        ## http://www.pygtk.org/pygtk2tutorial/sec-TreeModelSortAndTreeModelFilter.html
+        modelfilter = liststore.filter_new()
+        def search(modelfilter, iter, search_term):
+            try:
+                ## Iterate through every column and row and check if the search
+                ## term is there:
+                if search_term in modelfilter.get_value(iter, 0) or \
+                   search_term in modelfilter.get_value(iter, 1) or \
+                   search_term in modelfilter.get_value(iter, 2):
+                        return True
+                                         
+            except TypeError:
+                ## Python raises a TypeError if row data doesn't exist. Catch
+                ## that and fail silently.
+                pass
+
+        modelfilter.set_visible_func(search, search_term)
+        treeview.set_model(modelfilter)
+        
+
+        #clear CMNDS list then populate it with the filteredlist of commands
+        view.CMNDS = []
+        for line in modelfilter:
+            linelist = line
+            filteredcommandplus = linelist[0], linelist[1]
+            view.CMNDS.append(filteredcommandplus)
+            
+
+
+    ## send the command to the terminal
+    def run_command(self, widget, notebook, liststore):
+        text = ""
+        row_int = int(view.ROW[0][0]) ## removes everything but number from [5,]
+
+        ## get the current notebook page so the function knows which terminal to run the command in.
+        pagenum = notebook.get_current_page()
+        widget = notebook.get_nth_page(pagenum)
+        page_widget = widget.get_child()
+        ## view.CMNDS is where commands are stored
+        cmnd = view.CMNDS[row_int][0]
+            
+        ## find how many ?(user arguments) are in command
+        match = re.findall('\?', cmnd) 
+        '''
+        Make sure user arguments were found. Replace ? with something
+        .format can read. This is done so the user can just enter ?, when
+        adding a command where arguments are needed, instead
+        of {0[1]}, {0[1]}, {0[2]}
+        '''    
+        if match == False:
+            pass
+        else:
+            num = len(match)
+            ran = 0
+            new_cmnd = self.replace(cmnd, num, ran)
+
+
+        if not view.CMNDS[row_int][1] == "": # command with user input
+            text = self.get_info(self, liststore)
+            c = new_cmnd.format(text)
+            page_widget.feed_child(c+"\n") #send command w/ input
+            page_widget.show()
+            page_widget.grab_focus()
+        else: ## command that has no user input
+            page_widget.feed_child(cmnd+"\n") #send command
+            page_widget.show()
+            page_widget.grab_focus()
+            
+    ## replace ? with {0[n]}
+    def replace(self, cmnd, num, ran):
+        replace_cmnd=re.sub('\?', '{0['+str(ran)+']}', cmnd, count=1)
+        cmnd = replace_cmnd
+        ran += 1
+        if ran < num:
+            return self.replace(cmnd, num, ran)    
+        else:
+            pass
+        return cmnd
+        
+    ## open the man page for selected command
+    def man_page(self, widget, notebook):
+        row_int = int(view.ROW[0][0]) # removes everything but number from EX: [5,]
+        cmnd = view.CMNDS[row_int][0] #CMNDS is where commands are store
+        splitcommand = self._filter_sudo_from(cmnd.split(" "))
+        ## get current notebook tab to use in function
+        pagenum = notebook.get_current_page()
+        widget = notebook.get_nth_page(pagenum)
+        page_widget = widget.get_child()
+        #send command to Terminal
+        page_widget.feed_child("man "+splitcommand[0]+"| most \n") 
+        page_widget.grab_focus()
+        page_widget.show()
+
+
+    @staticmethod
+    def _filter_sudo_from(command):
+        """Filter the sudo from `command`, where `command` is a list.
+        Return the command list with the "sudo" filtered out.
+        """
+        if command[0].startswith("sudo"):
+            del command[0]
+            return command
+        return command
+
+
+
+    #TODO: Move to menus_buttons
+    def copy_paste(self, vte, event, data=None):
+        if event.button == 3:
+
+            time = event.time
+            ## right-click popup menu Copy
+            popupMenu = gtk.Menu()
+            menuPopup1 = gtk.ImageMenuItem (gtk.STOCK_COPY)
+            popupMenu.add(menuPopup1)
+            menuPopup1.connect('activate', lambda x: vte.copy_clipboard())
+            ## right-click popup menu Paste
+            menuPopup2 = gtk.ImageMenuItem (gtk.STOCK_PASTE)
+            popupMenu.add(menuPopup2)
+            menuPopup2.connect('activate', lambda x: vte.paste_clipboard())
+
+            ## Show popup menu
+            popupMenu.show_all()
+            popupMenu.popup( None, None, None, event.button, time)
+            return True
+        else:
+            pass
+            
+    ## close the window and quit
+    def delete_event(self, widget,  data=None):
+        gtk.main_quit()
+        return False
+
+    def about_event(self, widget, data=None):
+        pass
+    def help_event(self, widget, data=None):
+        webbrowser.open("http://okiebuntu.homelinux.com/okwiki/clicompanion")
+            
+            
 
=== added file 'clicompanionlib/menus_buttons.py'
--- clicompanionlib/menus_buttons.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/menus_buttons.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,175 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+#
+# This file contains the menus, buttons, and right clicks
+#
+
+import gtk
+import clicompanionlib.tabs
+
+
+class FileMenu(object):
+
+    def the_menu(self, actions, notebook, liststore):
+        menu = gtk.Menu()
+        root_menu = gtk.MenuItem(_("File"))       
+        root_menu.set_submenu(menu)
+ 
+        menu2 = gtk.Menu()       
+        root_menu2 = gtk.MenuItem(_("Help"))
+        root_menu2.set_submenu(menu2)
+
+        ##FILE MENU ##     
+        ## Make 'Run' menu entry
+        menu_item1 = gtk.MenuItem(_("Run Command"))
+        menu.append(menu_item1)
+        menu_item1.connect("activate", actions.run_command, notebook, liststore)
+        menu_item1.show()
+
+        ## Make 'Add' file menu entry
+        menu_item2 = gtk.MenuItem(_("Add Command"))
+        menu.append(menu_item2)
+        menu_item2.connect("activate", actions.add_command, liststore)
+        menu_item2.show()
+        
+        ## Make 'Remove' file menu entry
+        menu_item2 = gtk.MenuItem(_("Remove Command"))
+        menu.append(menu_item2)
+        menu_item2.connect("activate", actions.remove_command, liststore)
+        menu_item2.show()
+        
+        ## Make 'Add Tab' file menu entry
+        tabs = clicompanionlib.tabs.Tabs()
+        menu_item4 = gtk.MenuItem(_("Add Tab"))
+        menu.append(menu_item4)
+        menu_item4.connect("activate", tabs.add_tab, notebook)
+        menu_item4.show()
+
+        ## Make 'Quit' file menu entry
+        menu_item3 = gtk.MenuItem(_("Quit"))
+        menu.append(menu_item3)
+        menu_item3.connect("activate", actions.delete_event)
+        menu_item3.show()
+        
+        
+        ## HELP MENU ##
+        ## Make 'About' file menu entry
+        menu_item11 = gtk.MenuItem(_("About"))
+        menu2.append(menu_item11)
+        menu_item11.connect("activate", actions.about_event)
+        menu_item11.show()
+
+
+        ## Make 'Help' file menu entry
+        menu_item22 = gtk.MenuItem(_("Help"))
+        menu2.append(menu_item22)
+        menu_item22.connect("activate", actions.help_event)
+        menu_item22.show()
+        
+
+        menu_bar = gtk.MenuBar()
+        
+        menu_bar.append (root_menu) ##Menu bar(file)
+        menu_bar.append (root_menu2) ##Menu bar(help)       
+        #menu_bar.show() ##show File Menu # Menu Bar
+        ##Show 'File' Menu
+        #root_menu.show()
+        return menu_bar
+        
+        
+        
+    def buttons(self, actions,  spacing, layout, notebook, liststore):
+        #button box at bottom of main window
+        frame = gtk.Frame()
+        bbox = gtk.HButtonBox()
+        bbox.set_border_width(5)
+        frame.add(bbox)
+
+        # Set the appearance of the Button Box
+        bbox.set_layout(layout)
+        bbox.set_spacing(spacing)
+        # Run button
+        buttonRun = gtk.Button(_("Run"))
+        bbox.add(buttonRun)
+        buttonRun.connect("clicked", actions.run_command, notebook, liststore)
+        buttonRun.set_tooltip_text(_("Click to run a highlighted command"))
+        # Add button
+        buttonAdd = gtk.Button(stock=gtk.STOCK_ADD)
+        bbox.add(buttonAdd)
+        buttonAdd.connect("clicked", actions.add_command, liststore)
+        buttonAdd.set_tooltip_text(_("Click to add a command to your command list"))
+        # Edit button
+        buttonEdit = gtk.Button("Edit")
+        bbox.add(buttonEdit)
+        buttonEdit.connect("clicked", actions.edit_command, liststore)
+        buttonEdit.set_tooltip_text(_("Click to edit a command in your command list"))
+        # Delete button
+        buttonDelete = gtk.Button(stock=gtk.STOCK_DELETE)
+        bbox.add(buttonDelete)
+        buttonDelete.connect("clicked", actions.remove_command, liststore)
+        buttonDelete.set_tooltip_text(_("Click to delete a command in your command list"))
+        #Help Button
+        buttonHelp = gtk.Button(stock=gtk.STOCK_HELP)
+        bbox.add(buttonHelp)
+        buttonHelp.connect("clicked", actions.man_page, notebook)
+        buttonHelp.set_tooltip_text(_("Click to get help with a command in your command list"))
+        # Cancel button
+        buttonCancel = gtk.Button(stock=gtk.STOCK_QUIT)
+        bbox.add(buttonCancel)
+        buttonCancel.connect("clicked", actions.delete_event)
+        buttonCancel.set_tooltip_text(_("Click to quit CLI Companion"))
+
+        return frame      
+        
+        
+    #right-click popup menu for the Liststore(command list)
+    def right_click(self, widget, event, actions, treeview, notebook, liststore):
+        if event.button == 3:
+            x = int(event.x)
+            y = int(event.y)
+            time = event.time
+            pthinfo = treeview.get_path_at_pos(x, y)
+            if pthinfo is not None:
+                path, col, cellx, celly = pthinfo
+                treeview.grab_focus()
+                treeview.set_cursor( path, col, 0)
+                
+                # right-click popup menu Apply(run)
+                popupMenu = gtk.Menu()
+                menuPopup1 = gtk.ImageMenuItem (gtk.STOCK_APPLY)
+                popupMenu.add(menuPopup1)
+                menuPopup1.connect("activate", actions.run_command, notebook, liststore)
+                # right-click popup menu Edit        
+                menuPopup2 = gtk.ImageMenuItem (gtk.STOCK_EDIT)
+                popupMenu.add(menuPopup2)
+                menuPopup2.connect("activate", actions.edit_command, liststore)
+                # right-click popup menu Delete                 
+                menuPopup3 = gtk.ImageMenuItem (gtk.STOCK_DELETE)
+                popupMenu.add(menuPopup3)
+                menuPopup3.connect("activate", actions.remove_command, liststore)
+                # right-click popup menu Help                
+                menuPopup4 = gtk.ImageMenuItem (gtk.STOCK_HELP)
+                popupMenu.add(menuPopup4)
+                menuPopup4.connect("activate", actions.man_page, notebook)
+                # Show popup menu
+                popupMenu.show_all()
+                popupMenu.popup( None, None, None, event.button, time)
+            return True          
+
+
 
=== added file 'clicompanionlib/tabs.py'
--- clicompanionlib/tabs.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/tabs.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import vte
+
+from clicompanionlib.utils import get_user_shell
+import clicompanionlib.controller
+
+class Tabs(object):
+      
+        
+        
+    ## add a new terminal in a tab above the current terminal
+    def add_tab(self,widget, notebook):
+
+        _vte = vte.Terminal()
+        _vte.set_size_request(700, 220)
+        _vte.connect ("child-exited", lambda term: gtk.main_quit())
+        _vte.fork_command(get_user_shell()) # Get the user's default shell
+
+        vte_tab = gtk.ScrolledWindow()
+        vte_tab.add(_vte)
+        #notebook.set_show_tabs(True)
+        #notebook.set_show_border(True)
+
+        gcp = notebook.get_current_page() +1
+        pagenum = ('Tab %d') % gcp
+
+        box = gtk.HBox()
+        label = gtk.Label(pagenum)
+        box.pack_start(label, True, True)
+
+        ## x image for tab close button
+        close_image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU)
+        ## close button
+        closebtn = gtk.Button()
+        closebtn.set_relief(gtk.RELIEF_NONE)
+        closebtn.set_focus_on_click(True)
+
+        closebtn.add(close_image)
+        ## put button in a box and show box
+        box.pack_end(closebtn, False, False)
+        box.show_all()
+
+        notebook.prepend_page(vte_tab, box) # add tab
+        notebook.set_scrollable(True)
+        actions = clicompanionlib.controller.Actions()
+        _vte.connect ("button_press_event", actions.copy_paste, None)
+        vte_tab.grab_focus()
+        # signal handler for tab
+        closebtn.connect("clicked", self.close_tab, vte_tab, notebook) 
+        vte_tab.show_all()
+
+        return vte_tab
+
+
+    ## Remove a page from the notebook
+    def close_tab(self, sender, widget, notebook):
+        ## get the page number of the tab we wanted to close
+        pagenum = notebook.page_num(widget)
+        ## and close it
+        notebook.remove_page(pagenum) 
 
=== added file 'clicompanionlib/utils.py'
--- clicompanionlib/utils.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/utils.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# clicompanion.py - commandline tool.
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer, Marcos Vanetta
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+"""
+A collection of useful functions.
+"""
+
+import getpass
+import os
+
+CHEATSHEET = os.path.expanduser("~/.clicompanion2")
+#CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
+
+#TODO: Move this to controller.py
+def get_user_shell():
+    """Get the user's shell defined in /etc/passwd ."""
+    data = None
+    try:
+        # Read out the data in /etc/passwd
+        with open('/etc/passwd') as f:
+            data = f.readlines()
+    except e:
+        print "Something unexpected happened!"
+        raise e
+
+    for i in data:
+        tmp = i.split(":")
+        # Check for the entry of the currently logged in user
+        if tmp[0] == getpass.getuser(): 
+            # Columns are separated by colons, so split each column.
+            # Sample /etc/passwd entry for a user:
+            # 
+            #  jorge:x:1001:1002:,,,:/home/jorge:/bin/bash
+            #
+            # The last column is relevant for us.
+            # Don't forget to strip the newline at the end of the string!
+            return i.split(":")[-1:][0].strip('\n')
+
 
=== added file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	1970-01-01 00:00:00 +0000
+++ clicompanionlib/view.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,279 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# clicompanion.py - commandline tool.
+#
+# Copyright 2010 Duane Hinnen, Kenny Meyer
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+#
+
+import pygtk
+pygtk.require('2.0')
+import os
+
+# import gtk or print error
+try:
+    import gtk
+except:
+    print >> sys.stderr, "You need to install the python gtk bindings"
+    sys.exit(1)
+    
+# TODO: these handle the exception different. Which do we like?
+# import vte or display dialog
+try:
+    import vte
+except:
+    error = gtk.MessageDialog (None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
+        'You need to install python bindings for libvte')
+    error.run()
+    sys.exit (1)
+    
+import clicompanionlib.menus_buttons
+import clicompanionlib.controller
+from clicompanionlib.utils import get_user_shell 
+import clicompanionlib.tabs
+
+
+CHEATSHEET = os.path.expanduser("~/.clicompanion2")
+CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
+CMNDS = [] ## will hold the commands. Actually the first two columns
+ROW = '1' ## holds the currently selected row
+
+
+
+class MainWindow():
+
+    ## open file containing command dictionary and put it in a variable
+    def update(self, liststore):
+        try:
+            with open(CHEATSHEET, "r") as cheatfile:
+                bugdata=cheatfile.read()
+                cheatfile.close()
+        except IOError:
+            ## CHEATSHEET is not there. Oh, no!
+            ## So, run self.setup() again.
+            self.setup()
+            ## Then, run me again.
+            self.update(liststore)
+
+        ## add bug data from .clicompanion --> bugdata --> to the liststore
+        for line in bugdata.splitlines():
+            l = line.split(':',2)
+            commandplus = l[0], l[1]
+            CMNDS.append(commandplus)
+            liststore.append([l[0],l[1],l[2]])
+
+          
+    #copy config file to user $HOME if does not exist
+    def setup(self):
+        """
+        Check if ~/.clicompanion2 exists. If not check for original
+        installed in /etc/clicompanion.d/. If origianl exists copy to $HOME.
+        if not create a new, blank ~/.clicompanion2 so program will not crash
+        """
+
+        if not os.path.exists(CHEATSHEET):
+            if os.path.exists(CONFIG_ORIG):
+                os.system ("cp %s %s" % (CONFIG_ORIG, CHEATSHEET))
+            else:
+                # Oops! Looks like there's no cheatsheet in CHEATSHEET.
+                # Then, create an empty cheatsheet.
+                open(CHEATSHEET, 'w').close()
+    
+    
+    #liststore in a scrolled window in an expander
+    def expanded_cb(self, expander, params, notebook, treeview, liststore):
+        if expander.get_expanded():
+
+
+            # Activate the search box when expanded
+            self.search_box.set_sensitive(True)
+        else:
+            # De-activate the search box when not expanded
+            self.search_box.set_sensitive(False)
+            expander.set_expanded(False)
+            #expander.remove(expander.child)
+            ##reset the size of the window to its original one
+            self.window.resize(1, 1)
+        return  
+        
+
+    # close the window and quit
+    def delete_event(self, widget,  data=None):
+        gtk.main_quit()
+        return False
+  
+    def __init__(self):
+
+        ##For now TERM is hardcoded to xterm because of a change
+        ##in libvte in Ubuntu Maverick
+        os.putenv('TERM', 'xterm')
+        ## copy config file to user $HOME if does not exist
+        self.setup()
+        
+        #TODO: do we want to do this? Or just keep the height under 600.
+        ##Get user screen size##
+        #screen = gtk.gdk.display_get_default().get_default_screen()
+        #screen_size = screen.get_monitor_geometry(0)
+        #height =  screen.get_height() ## screen height ##
+        
+        ## Create UI widgets
+        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        liststore = gtk.ListStore(str, str, str)
+        treeview = gtk.TreeView()
+        expander = gtk.Expander()
+        self.scrolledwindow = gtk.ScrolledWindow()
+        notebook = gtk.Notebook()
+
+        ## set sizes and borders
+        self.scrolledwindow.set_size_request(700, 220)
+        self.window.set_default_size(700, 625)
+        self.window.set_border_width(10)
+        ## Sets the position of the window relative to the screen
+        self.window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
+        ## Allow user to resize window
+        self.window.set_resizable(True)
+        
+        ## set Window title and icon
+        self.window.set_title("CLI Companion")
+        icon = gtk.gdk.pixbuf_new_from_file("/usr/share/pixmaps/clicompanion.16.png")
+        self.window.set_icon(icon)
+        
+        # get commands and put in liststore
+        self.update(liststore) 
+        ## create the TreeViewColumns to display the data
+        treeview.columns = [None]*3
+        treeview.columns[0] = gtk.TreeViewColumn(_('Command'))
+        treeview.columns[1] = gtk.TreeViewColumn(_('User Input'))
+        treeview.columns[2] = gtk.TreeViewColumn(_('Description'))
+        
+        for n in range(3):
+            ## add columns to treeview
+            treeview.append_column(treeview.columns[n])
+            ## create a CellRenderers to render the data
+            treeview.columns[n].cell = gtk.CellRendererText()
+            ## add the cells to the columns
+            treeview.columns[n].pack_start(treeview.columns[n].cell,
+                                                True)
+            ## set the cell attributes to the appropriate liststore column
+            treeview.columns[n].set_attributes(
+            treeview.columns[n].cell, text=n)   
+            treeview.columns[n].set_resizable(True) 
+        
+        #set treeview model and put treeview in the scrolled window and the scrolled window in the expander.
+        treeview.set_model(liststore)
+        self.scrolledwindow.add(treeview)
+        expander.add(self.scrolledwindow)
+        #self.window.show_all()
+
+        ## instantiate tabs
+        tabs = clicompanionlib.tabs.Tabs()
+        ## instantiate controller.Actions, where all the button actions are
+        actions = clicompanionlib.controller.Actions()
+        ## instantiate 'File' and 'Help' Drop Down Menu [menus_buttons.py]
+        bar = clicompanionlib.menus_buttons.FileMenu()
+        menu_bar = bar.the_menu(actions, notebook, liststore)
+        
+
+        #get row of selection
+        def mark_selected(self, treeselection):
+            global ROW
+            (model, pathlist)=treeselection.get_selected_rows()
+            ROW = pathlist
+
+
+        selection = treeview.get_selection()
+        selection.set_mode(gtk.SELECTION_SINGLE)
+        selection.select_path(0)
+        selection.connect("changed", mark_selected, selection)      
+        
+        
+        ## The search section
+        self.search_label = gtk.Label(_("Search:"))
+        self.search_label.set_alignment(xalign=-1, yalign=0)
+        self.search_box = gtk.Entry()
+        self.search_box.connect("changed", actions._filter_commands, liststore, treeview)
+        ## search box tooltip
+        self.search_box.set_tooltip_text(_("Search your list of commands"))
+        # Set the search box sensitive at program start, because expander is not
+        # unfolded by default
+        self.search_box.set_sensitive(False)
+        ## hbox for menu and search Entry
+        menu_search_hbox = gtk.HBox(False)
+        menu_search_hbox.pack_end(self.search_box, True)
+        menu_search_hbox.pack_end(self.search_label, False, False, 10)
+        menu_search_hbox.pack_start(menu_bar, True)
+
+
+        ## expander title
+        expander_hbox = gtk.HBox()
+        image = gtk.Image()
+        image.set_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
+        label = gtk.Label(_('Command List'))
+        ## tooltip for the label of the expander
+        expander_hbox.set_tooltip_text(_("Click to show/hide command list"))
+        
+        ## add expander widget to hbox
+        expander_hbox.pack_start(image, False, False)
+        expander_hbox.pack_start(label, True, False)
+        expander.set_label_widget(expander_hbox)
+
+        ## Add the first tab with the Terminal
+        tabs.add_tab(self, notebook)
+        notebook.set_tab_pos(1)
+
+        ## The "Add Tab" tab
+        add_tab_button = gtk.Button("+")
+        ## tooltip for "Add Tab" tab
+        add_tab_button.set_tooltip_text(_("Click to add another Tab"))
+        ## create first tab
+        notebook.append_page(gtk.Label(""), add_tab_button)
+        
+        ## buttons at bottom of main window [menus_buttons.py]
+        button_box = bar.buttons(actions, 10, gtk.BUTTONBOX_END, notebook, liststore)
+
+        ## vbox for search, notebook, buttonbar
+        self.vbox = gtk.VBox()
+        self.window.add(self.vbox)
+        ## pack everytyhing in the vbox
+        #self.vbox.pack_start(menu_bar, False, False,  0) ##menuBar
+        self.vbox.pack_start(menu_search_hbox, False, False, 5)
+        self.vbox.pack_start(expander, False, False, 5)
+        self.vbox.pack_start(notebook, True, True, 10)
+        self.vbox.pack_start(button_box, False, False, 5)
+        
+        ## signals
+        expander.connect('notify::expanded', self.expanded_cb, notebook, treeview, liststore)
+        self.window.connect("delete_event", self.delete_event)
+        add_tab_button.connect("clicked", tabs.add_tab, notebook)
+        ## right click menu event capture
+        treeview.connect ("button_press_event", bar.right_click, actions, treeview,  notebook, liststore)
+
+
+        #self.vte.grab_focus()
+        self.window.show_all()
+        return
+
+    def main(self):
+        try:
+            gtk.main()
+        except KeyboardInterrupt:
+            pass
+        
+def run():
+    
+    main_window = MainWindow()
+    main_window.main()
 
=== added directory 'data'
=== added file 'data/clicompanion.16.png'
 Binary files data/clicompanion.16.png	1970-01-01 00:00:00 +0000 and data/clicompanion.16.png	2010-11-30 16:11:27 +0000 differ
=== added file 'data/clicompanion.64.png'
 Binary files data/clicompanion.64.png	1970-01-01 00:00:00 +0000 and data/clicompanion.64.png	2010-11-30 16:11:27 +0000 differ
=== added file 'data/clicompanion.desktop'
--- data/clicompanion.desktop	1970-01-01 00:00:00 +0000
+++ data/clicompanion.desktop	2010-11-30 16:11:27 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=CLI Companion
+Comment=Run and store terminal commands from a GUI
+Categories=Utility;GTK;
+Exec=clicompanion
+Icon=clicompanion
+Type=Application
 
=== added file 'data/clicompanion2.config'
--- data/clicompanion2.config	1970-01-01 00:00:00 +0000
+++ data/clicompanion2.config	2010-11-30 16:11:27 +0000
@@ -0,0 +1,48 @@
+dpkg -l ?:package:Find version of a package
+df -h::file system disk space usage
+free -m::show RAM usage
+ps auxww | grep ?:process:displays information about the active process
+iwconfig::Display wireless network information
+ifconfig -a::displays the status of the currently active interfaces
+sudo iwlist::scan Scan Wireless networks
+sudo /etc/init.d/networking restart::Reset the Network
+lsb_release -a::What version of Ubuntu do I have?
+uname -a::What kernel am I running
+sudo apt-get update && sudo apt-get upgrade::Refresh update info and update all packages 
+sudo apt-get clean::clear out all packages in /var/cache/apt/archives
+sudo apt-get autoclean::clear out obsolete packages(packages with a newer release)
+apt-cache search ?:package:Find information on a package (not installed)
+sudo lshw::List hardware 
+lspci::list all PCI devices
+aplay -l::List all soundcards and digital audio devices
+cat ?:path:Read File & Print to Standard Output
+ls ? :path:List Folders Contents
+ls -lSr ?:path:Show files by size, biggest last
+mv ?:path:Move (Rename) Files
+cp ?:path:Copy Files
+sudo lspci::attached PCI devices
+chmod ? ?:permissions, file:Change access permissions, change mode
+chown ? ?:owner,group, file:Change the owner and/or group of each given file
+dmesg::Print kernel & driver messages
+history::Command History
+locate ?:file:Find files (updatedb to update DB)
+sudo updatedb::update the database for locate
+which ?:command:Show full path name of command
+find -maxdepth 1 -type f | xargs grep -F ?:string:Search all regular files for 'string' in this dir
+gpg -c ?:file:Encypt a file
+gpg ?:file.gpg:Decrypt a file
+tar -xjf ?:archive.tar:Extract all files from archive.tar
+tar -czf ?:Destination.tar.gz  Source:Create Destination from Source
+iostat::cpu and I/O statistics
+netstat::Print network connections and interface statistics
+sudo fdisk -l ?:disk:List partition tables for specified devices
+sudo ufw enable::Enable netfilter firewall
+sudo ufw allow ?:port:Open a port in netfilter firewall
+sudo ufw deny ?:port:Close a port in netfilter firewall
+sudo ufw disable::Disable netfilter firewall
+cat ? ? | sort | uniq > ? :file1, file2, file3:combine, sort and remove duplicates from 2 files
+mkisofs -V LABEL -r dir | gzip > ?:isoname.iso.gz:Create cdrom image(iso) from contents of directory(pwd)
+cdrecord -v dev=/dev/cdrom -audio -pad *.wav::Make audio CD from all wavs in current dir(pwd)
+dpkg-query -W -f='${Installed-Size;10}\t${Package}\n' | sort -k1,1n::List all installed packages by size
+tail -f /var/log/messages::Monitor messages log file
+apropos ?:command or package:search the manual page names and descriptions
 
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2010-11-30 16:11:27 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 Duane Hinnen
+#
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import glob
+from distutils.core import setup
+from DistUtilsExtra.command import *
+
+
+
+setup(  name='clicompanion',
+        version='0.1.0',
+        description='Run Terminal commands from a GUI. Store commands for later use.',
+        author='Duane Hinnen',
+        author_email='[e-mail]',
+        scripts=['clicompanion'],
+        packages=['clicompanionlib'],
+        data_files=[('/etc/clicompanion.d/', ['data/clicompanion2.config']),
+        ('/usr/share/pixmaps', ['data/clicompanion.16.png']),
+        ('/usr/share/applications', ['data/clicompanion.desktop']),
+        ('share/clicompanion/locale/', glob.glob('locale/*/LC_MESSAGES/*.mo')),
+         ],
+         
+        cmdclass = { 'build'       : build_extra.build_extra,
+                     'build_i18n' :  build_i18n.build_i18n,
+        },  
+        )