Merge lp:~bdfhjk/clicompanion/fix-738264 into lp:clicompanion

[Marek Bardoński]

[Duane Hinnen (duanedesign)]

This great. Looks good.
This has been bugging me for awhile now. No pun intended. Glad it is fixed.
good work!

review: Approve

=== modified file 'clicompanionlib/controller.py'
--- clicompanionlib/controller.py	2011-03-18 15:46:30 +0000
+++ clicompanionlib/controller.py	2011-03-20 12:29:23 +0000
@@ -163,7 +163,7 @@
                     l = str(text1+":"+text2+":"+text3)
                     #ls = l.split(':',2)
                     ## update view.CMNDS variable
-                    filteredcommandplus = text1, text2
+                    filteredcommandplus = text1, text2, text3
                     view.CMNDS.append(filteredcommandplus)
                     ## update the command list on screen
                     liststore.append([text1,text2,text3])
@@ -176,9 +176,21 @@
 
     ## This the edit function
     def edit_command(self, widget , liststore):
-
-        row_int = int(view.ROW[0][0])
-
+		
+        row_int_x = int(view.ROW[0][0])
+        row_int = 0
+		## TODO: Not implemented with filted yet
+        if view.FILTER == 1:
+            with open(CHEATSHEET, "r") as cheatfile:
+                cheatlines = cheatfile.readlines()
+                for i in range(len(cheatlines)):
+			    	if view.CMNDS[row_int_x][0] in cheatlines[i] and view.CMNDS[row_int_x][1] in cheatlines[i] :
+				    	row_int = i 
+                cheatfile.close()
+        else:
+			row_int = row_int_x
+
+         
         row_obj1 = view.MainWindow.liststore[row_int][0]
         text1 = "".join(row_obj1)
 
@@ -250,7 +262,7 @@
                         l = str(text1+":"+text2+":"+text3)
                         #ls = l.split(':',2)
                         ## update view.CMNDS variable
-                        filteredcommandplus = text1, text2
+                        filteredcommandplus = text1, text2, text3
                         view.CMNDS.append(filteredcommandplus)
                         ## update the command list on screen
                         liststore.append([text1,text2,text3])
@@ -262,9 +274,21 @@
 
     ## Remove command from command file and GUI
     def remove_command(self, widget, liststore):
+		
+        row_int_x = int(view.ROW[0][0])
+        row_int = 0
+		## TODO: Not implemented with filted yet
+        if view.FILTER == 1:
+            with open(CHEATSHEET, "r") as cheatfile:
+                cheatlines = cheatfile.readlines()
+                for i in range(len(cheatlines)):
+			    	if view.CMNDS[row_int_x][0] in cheatlines[i] and view.CMNDS[row_int_x][1] in cheatlines[i]:
+				    	row_int = i 
+                cheatfile.close()
+        else:
+			row_int = row_int_x
 
-        row_int = int(view.ROW[0][0]) #convert pathlist into something usable   
-        del view.CMNDS[row_int]
+        del view.CMNDS[row_int_x]
         del liststore[row_int]
 
         ## open command file and delete line so the change is persistent
@@ -285,6 +309,10 @@
         Pretty straight-forward.
         """
         search_term = widget.get_text().lower()
+        if search_term == "":
+		    view.FILTER = 0
+        else:
+		    view.FILTER = 1
         
         ## Create a TreeModelFilter object which provides auxiliary functions for
         ## filtering data.
@@ -303,6 +331,11 @@
                 ## Python raises a TypeError if row data doesn't exist. Catch
                 ## that and fail silently.
                 pass
+            except AttributeError:
+                ## Python raises a AttributeError if row data was modified . Catch
+                ## that and fail silently.
+                pass
+
 
         modelfilter.set_visible_func(search, search_term)
         treeview.set_model(modelfilter)
@@ -312,13 +345,14 @@
         view.CMNDS = []
         for line in modelfilter:
             linelist = line
-            filteredcommandplus = linelist[0], linelist[1]
+            filteredcommandplus = linelist[0], linelist[1], linelist[2]
             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,]
 
@@ -369,7 +403,21 @@
         
     ## 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,]
+        try:
+            row_int = int(view.ROW[0][0]) # removes everything but number from EX: [5,]
+        except IndexError:  
+            ## When user not choose row, when is in filter mode
+            dialog = gtk.MessageDialog(
+                None,
+                gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                gtk.MESSAGE_QUESTION,
+                gtk.BUTTONS_OK,
+                None)
+            dialog.set_markup('You must choose row to view help')
+            dialog.show_all()
+            dialog.run()
+            dialog.destroy()     
+            return 
         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
@@ -423,7 +471,34 @@
     
     ## Help --> About and Help --> Help menus
     def about_event(self, widget, data=None):
-        pass
+        # Create AboutDialog object
+        dialog = gtk.AboutDialog()
+
+        # Add the application name to the dialog
+        dialog.set_name('CLI Companion ')
+
+        # Set the application version
+        dialog.set_version('1.0')
+
+        # Pass a list of authors.  This is then connected to the 'Credits'
+        # button.  When clicked the buttons opens a new window showing
+        # each author on their own line.
+        dialog.set_authors(['Duane Hinnen', 'Kenny Meyer', 'Marcos Vanetta'])
+
+        # Add a short comment about the application, this appears below the application
+        # name in the dialog
+        dialog.set_comments('This is a CLI Companion program.')
+
+        # Add license information, this is connected to the 'License' button
+        # and is displayed in a new window.
+        dialog.set_license('Distributed under the GNU license. You can see it at <http://www.gnu.org/licenses/>.')
+
+        # Show the dialog
+        dialog.run()
+
+        # The destroy method must be called otherwise the 'Close' button will
+        # not work.
+        dialog.destroy()
     def help_event(self, widget, data=None):
         webbrowser.open("http://okiebuntu.homelinux.com/okwiki/clicompanion")
         

=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	2011-03-18 15:46:30 +0000
+++ clicompanionlib/view.py	2011-03-20 12:29:23 +0000
@@ -51,9 +51,17 @@
 CONFIGFILE = os.path.expanduser("~/.config/clicompanion/config")
 CHEATSHEET = os.path.expanduser("~/.clicompanion2")
 CONFIG_ORIG = "/etc/clicompanion.d/clicompanion2.config"
-CMNDS = [] ## will hold the commands. Actually the first two columns
+
+## Changed two->three columns
+CMNDS = [] ## will hold the commands. Actually the first three columns
 ROW = '1' ## holds the currently selected row
-
+TARGETS = [
+    ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0),
+    ('text/plain', 0, 1),
+    ('TEXT', 0, 2),
+    ('STRING', 0, 3),
+    ]
+FILTER = 0
 
 
 class MainWindow():
@@ -75,7 +83,7 @@
         ## add bug data from .clicompanion --> bugdata --> to the liststore
         for line in bugdata.splitlines():
             l = line.split(':',2)
-            commandplus = l[0], l[1]
+            commandplus = l[0], l[1], l[2]
             CMNDS.append(commandplus)
             self.liststore.append([l[0],l[1],l[2]])