[gevice] on_button_diagram_generate_clicked(). method is rewritten to read selections.

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit 411e2902f515eb48121ebadfcdcf873bdc358b3a
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Tue Oct 4 12:40:32 2011 -0300

    on_button_diagram_generate_clicked(). method is rewritten to read selections.

 ChangeLog            |    4 ++++
 src/gevice.py        |    6 +++---
 src/gevicediagram.py |   15 +++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 152ab4d..e0fc02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-04  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* src/gevice.py:
+	* src/gevicediagram.py: on_button_diagram_generate_clicked(). method is rewritten to read selections.
+
+2011-10-04  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* src/gevice.py:
 	* src/geviceexport.py: load_interface(). Uses new  Gtk.FileChooserDialog().
 
 2011-10-04  Alejandro Valdes Jimenez  <avaldes gnome org>
diff --git a/src/gevice.py b/src/gevice.py
index 60dff06..b8b7c91 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -25,7 +25,7 @@ import os.path
 
 import config
 import gevicefind
-#import gevicediagram
+import gevicediagram
 import geviceprefer
 import gevicevte
 import gevicedevice
@@ -467,7 +467,7 @@ class Gevice:
     gevice.gevicefind.load_interface(gevice)
     gevice.gevicefind.show_interface()
     
-  def on_action_diagram (gevice,action):
+  def on_action_diagram (gevice,action,data):
     i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
     
     #check if the user have selected some device
@@ -476,7 +476,7 @@ class Gevice:
       gevice.gdiagram.load_interface (gevice)
       gevice.gdiagram.show_interface ()
     else:
-      result = gevice.show_message (_("You need choose some device to generate the diagram."),Gtk.MESSAGE_WARNING,Gtk.BUTTONS_OK)
+      result = gevice.show_message (_("You need choose some device to generate the diagram."),None,(Gtk.STOCK_OK, Gtk.ResponseType.OK),gevice.window_main)
       
   def on_action_print (gevice,action):
     gprint = geviceprint.GevicePrint()
diff --git a/src/gevicediagram.py b/src/gevicediagram.py
index 2a4917a..b8bdd2d 100644
--- a/src/gevicediagram.py
+++ b/src/gevicediagram.py
@@ -1,6 +1,4 @@
-import pygtk
-pygtk.require('2.0')
-import gtk
+from gi.repository import Gtk
 import os
 from pygraphviz import *
 
@@ -33,7 +31,7 @@ class GeviceDiagram:
         self.name_link = None
 
     def load_interface (self,gevice):
-	builder = gtk.Builder()
+	builder = Gtk.Builder()
 	builder.add_from_file(os.path.join (config.UIDIR, "diagram.xml"))
 	
         self.window_diagram = builder.get_object ("window_diagram")
@@ -70,8 +68,13 @@ class GeviceDiagram:
         self.A.node_attr['shape'] = 'box'
         self.A.node_attr['color'] = 'black'
         
-        self.form = self.combobox_format.get_active_text()
-        self.prog = self.combobox_program.get_active_text()
+	iter_form = self.combobox_format.get_active_iter()
+	model_form = self.combobox_format.get_model()
+        self.form = model_form.get_value(iter_form,0)
+	
+	iter_prog = self.combobox_program.get_active_iter()
+	model_prog = self.combobox_program.get_model()
+        self.prog = model_prog.get_value(iter_prog,0)
 
         i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)