[gevice] enable find option.

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit 2e5694dfb088e3cb1bf62019929546b8ebc5910e
Author: Alejandro ValdÃs Jimenez <avaldes gnome org>
Date:   Fri Dec 14 17:34:37 2012 -0300

    enable find option.

 ChangeLog         |    5 +++++
 data/ui/find.xml  |   28 ++++++++--------------------
 src/gevice.py     |   12 +++++++-----
 src/gevicefind.py |   45 ++++++++++++++++++++-------------------------
 4 files changed, 40 insertions(+), 50 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dac5197..4987334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 2012-12-14  Alejandro ValdéJimenez  <avaldes gnome org>
+	* data/ui/find.xml: change to modal window.
+	* src/gevice.py: enable find option.
+	* src/gevicefind.py: clean code.
+
+2012-12-14  Alejandro ValdéJimenez  <avaldes gnome org>
 	* src/gevice.py: enable export option.
 	* src/geviceexport.py: clean code.
 
diff --git a/data/ui/find.xml b/data/ui/find.xml
index 7cadace..5e23a7b 100644
--- a/data/ui/find.xml
+++ b/data/ui/find.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window_find">
     <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -22,12 +22,14 @@
             <property name="spacing">5</property>
             <child>
               <object class="GtkRadioButton" id="radiobutton_namedevice">
-                <property name="label" translatable="yes" context="yes">Device name</property>
+                <property name="label" translatable="yes" context="yes">Name</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.5</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
@@ -40,29 +42,13 @@
             <child>
               <object class="GtkRadioButton" id="radiobutton_ip">
                 <property name="label" translatable="yes" context="yes">IP</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">radiobutton_namedevice</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="radiobutton_serial">
-                <property name="label" translatable="yes" context="yes">Serial</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
+                <property name="xalign">0.5</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">radiobutton_namedevice</property>
@@ -70,7 +56,7 @@
               <packing>
                 <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -125,6 +111,7 @@
             <child>
               <object class="GtkButton" id="button_find_find">
                 <property name="label" context="yes">gtk-find</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -141,6 +128,7 @@
             <child>
               <object class="GtkButton" id="button_find_cancel">
                 <property name="label" context="yes">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/src/gevice.py b/src/gevice.py
index ff71733..a9a52a6 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -23,7 +23,7 @@ import os.path
 from struct import unpack
 
 import config
-###import gevicefind
+import gevicefind
 import gevicediagram
 import geviceprefer
 import gevicevte
@@ -160,7 +160,7 @@ class Gevice:
       ])
       
     self.actiongroup_model.add_actions([
-      ('Find', Gtk.STOCK_FIND, _('Find'),None, _('Search a device'), self.passing),
+      ('Find', Gtk.STOCK_FIND, _('Find'),None, _('Search a device'), self.on_action_find),
       ('Save', Gtk.STOCK_SAVE, _('Save'), None, _('Save model'), self.on_action_save),
       ('Export', Gtk.STOCK_SELECT_ALL, _('Export all to CSV'), None, _('Export all to CSV'), self.on_action_export),
       ('AddDevice', Gtk.STOCK_ADD, _('Add'),None, _('Add a device'), self.on_action_adddevice),
@@ -191,9 +191,6 @@ class Gevice:
     self.actiongroup_window.set_sensitive (True)
     self.actiongroup_device.set_sensitive (False)
 
-  def passing(self):
-    pass
-
   def main(self):
     Gtk.main()
   
@@ -493,6 +490,11 @@ class Gevice:
     dialogexport.load_interface (self)
     dialogexport.save_file (self)
 
+  def on_action_find (self,action):
+    self.gevicefind = gevicefind.GeviceFind ()
+    self.gevicefind.load_interface(self)
+    self.gevicefind.show_interface()
+
 if __name__ == "__main__":
   gevice = Gevice()
   gevice.main()
diff --git a/src/gevicefind.py b/src/gevicefind.py
index 758d6f2..9c3a85e 100644
--- a/src/gevicefind.py
+++ b/src/gevicefind.py
@@ -35,7 +35,6 @@ class GeviceFind:
     self.entry_find = None
     self.radiobutton_namedevice = None
     self.radiobutton_ip = None
-    self.radiobutton_serial = None    	
     self.data_finded = []
 
   def load_interface (self,gevice):
@@ -48,7 +47,6 @@ class GeviceFind:
     self.entry_find = builder.get_object ("entry_find")
     self.radiobutton_namedevice = builder.get_object ("radiobutton_namedevice")
     self.radiobutton_ip = builder.get_object ("radiobutton_ip")
-    self.radiobutton_serial = builder.get_object ("radiobutton_serial")
 
     self.window_find.connect ("delete-event",self.on_window_find_delete_event)
     self.button_find_cancel.connect ("clicked",self.on_button_cancel_find_clicked)
@@ -56,7 +54,6 @@ class GeviceFind:
     self.entry_find.connect ("key-press-event", self.on_entry_find_key_press,gevice)
     self.radiobutton_namedevice.connect ("toggled", self.on_radiobutton_toggled)
     self.radiobutton_ip.connect ("toggled", self.on_radiobutton_toggled)
-    self.radiobutton_serial.connect ("toggled", self.on_radiobutton_toggled)
 
     self.entry_find.grab_focus()
 
@@ -75,35 +72,33 @@ class GeviceFind:
   def on_window_find_delete_event (self,window,event):
     self.close_window (window)
 
-  def search_in_iter (self,model,path,iter,gevice):    
-    data = model.get_value(iter,self.column_find)
-    res = data.find(self.sname)
-
-    if (res >= 0):	
-      try:
-	# exist in list?
-	self.data_finded.index(data)
-      except:
-	# add to list of match
-	self.data_finded.append(data)
-	selection = gevice.gmodel.treeview.get_selection()
-	gevice.gmodel.treeview.set_cursor(path,None,False)
-	gevice.gmodel.treeview.grab_focus()
-	selection.select_iter(iter)
-	return True
-
-  def on_button_find_find_clicked(self,button,gevice):      
+  def on_button_find_find_clicked(self,button,gevice):
     self.sname = self.entry_find.get_text().strip()
 
     if (self.radiobutton_namedevice.get_active() == True):
-      self.column_find = config.COLUMN_NAME_DEV
+      self.column_find = 0
     elif (self.radiobutton_ip.get_active() == True):
-      self.column_find = config.COLUMN_IP_DEV
-    elif (self.radiobutton_serial.get_active() == True):
-      self.column_find = config.COLUMN_SERIAL_DEV
+      self.column_find = 1
 
     gevice.gmodel.treestore.foreach(self.search_in_iter,gevice)
 
+  def search_in_iter (self,model,path,iter,gevice):    
+    data = model.get_value(iter,self.column_find)
+    res = data.find(self.sname)
+
+    if (res >= 0):
+      try:
+        # exist in list?
+        self.data_finded.index(data)
+      except:
+        # add to list of match
+        self.data_finded.append(data)
+        selection = gevice.gmodel.treeview.get_selection()
+        gevice.gmodel.treeview.set_cursor(path,None,False)
+        gevice.gmodel.treeview.grab_focus()
+        selection.select_iter(iter)
+        return True
+
   def on_entry_find_key_press (self,widget,event,gevice):
     if Gdk.keyval_name(event.keyval) == "Return":
       self.on_button_find_find_clicked(None,gevice)