[gevice] src/gevicemodel.py: reorder code.

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit 24815ce354eb58e7d1e588b20057c7fff16addad
Author: Alejandro ValdÃs Jimenez <avaldes gnome org>
Date:   Fri Dec 28 15:58:46 2012 -0300

    src/gevicemodel.py: reorder code.

 ChangeLog             |    7 +++++++
 data/other/testing.db |  Bin 5120 -> 5120 bytes
 src/gevice.py         |   35 ++++++++++++++++++++++++++---------
 src/gevicedevice.py   |   12 +++++++-----
 src/gevicediagram.py  |    2 +-
 src/gevicemodel.py    |   30 ++++--------------------------
 6 files changed, 45 insertions(+), 41 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 162efa5..2a46637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 2012-12-28  Alejandro ValdéJimenez  <avaldes gnome org>
+	* data/other/testing.db:
+	* src/gevice.py:
+	* src/gevicedevice.py:
+	* src/gevicediagram.py:
+	* src/gevicemodel.py: reorder code.
+
+2012-12-28  Alejandro ValdéJimenez  <avaldes gnome org>
 	* data/other/db_gevice.sql: model modified.
 	* data/other/testing.db: update tables.
 	* data/ui/device.xml: add entry-comments
diff --git a/data/other/testing.db b/data/other/testing.db
index df9e157..f36f5f0 100644
Binary files a/data/other/testing.db and b/data/other/testing.db differ
diff --git a/src/gevice.py b/src/gevice.py
index e3a9ee1..57eb6e1 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -48,7 +48,7 @@ class Gevice:
     self.settings = Gtk.Settings.get_default()
     self.settings.set_property('gtk-application-prefer-dark-theme', True)
 
-    # set treemodel for devices
+    # set treestore model for devices
     self.gmodel = gevicemodel.GeviceModel(self)
 
     # get widgets of main app
@@ -330,14 +330,14 @@ class Gevice:
     
   def create_about_dialog (self):
     authors = ('Alejandro Valdes Jimenez [avaldes gnome org]','')
-    translator_credits = ('Alejandro Valdes Jimenez [avaldes gnome org]')
+    ###translator_credits = ('Alejandro Valdes Jimenez [avaldes gnome org]')
     logo =  GdkPixbuf.Pixbuf.new_from_file (os.path.join (config.ARTDIR,"gevice.png"))
     
     ad = Gtk.AboutDialog()
     ad.set_name("Gevice - GNOME Network Device Manager")
     ad.set_version(config.VERSION)
     ad.set_authors(authors)
-    ad.set_translator_credits(translator_credits)
+    ###ad.set_translator_credits(translator_credits)
     ad.set_website("http://projects.gnome.org/gevice/";)
     ad.set_logo(logo)
     
@@ -443,14 +443,21 @@ class Gevice:
     if (action.get_active() == True):
       self.settings.set_property('gtk-application-prefer-dark-theme', True)
     else:
-      self.settings.set_property('gtk-application-prefer-dark-theme', False)      
+      self.settings.set_property('gtk-application-prefer-dark-theme', False)
 
   def on_action_session(self,widget,current):
     self.session = current.get_name()
 
   def on_action_connect(self,action):
     self.connect_to_device()
-    
+
+  def get_iter_selected (self,treeview):
+    treeselection = treeview.get_selection()
+    model,iter = treeselection.get_selected()
+    model,path = treeselection.get_selected_rows()
+    selected = {"iter":iter,"path":path,"model":model}
+    return selected
+
   def connect_to_device (self):
     if (self.actiongroup_device.get_action("Dual").get_active()):
       isdual = True
@@ -477,15 +484,16 @@ class Gevice:
     gvte = gevicevte.GeviceVte()
 
     hbox_term,terminal = gvte.new_terminal (self)
-    vpaned.add1 (hbox_term)    
+    vpaned.add1 (hbox_term)
 
-    i = self.gmodel.get_iter_selected (self.gmodel.treeview)
+    i = self.get_iter_selected (self.gmodel.treeview)
     if not i["iter"]:
       result = gevice.show_infobar_message (_("Not device selected"), Gtk.MessageType.INFO)
       return
     else:
       # get data from device selected (devicename, IP)
-      data = self.gmodel.get_data_of_device_from_model(self.gmodel.treeview)
+      selected = self.get_iter_selected (self.gmodel.treeview)
+      data = self.gmodel.get_data_of_device_from_model(selected)
       label.set_text(data[0])
 
       # get name of user (for ssh session)
@@ -537,7 +545,7 @@ class Gevice:
     self.gpref.show_interface()
 
   def on_action_diagram (self,action):
-    i = self.gmodel.get_iter_selected(self.gmodel.treeview)
+    i = self.get_iter_selected(self.gmodel.treeview)
 
     #check if the user have selected some device
     if (i["iter"]):
@@ -577,6 +585,15 @@ class Gevice:
     self.gevicefind.load_interface(self)
     self.gevicefind.show_interface()
 
+  def on_device_selection_changed (self,selection):
+    model,iter = selection.get_selected()
+
+    if (iter):
+      self.actiongroup_device.set_sensitive (True)
+    else:
+      self.actiongroup_device.set_sensitive (False)
+
+
 if __name__ == "__main__":
   if len(sys.argv)>1:
     gevice = Gevice(sys.argv[1])
diff --git a/src/gevicedevice.py b/src/gevicedevice.py
index 41ed533..f85ce5f 100644
--- a/src/gevicedevice.py
+++ b/src/gevicedevice.py
@@ -40,7 +40,8 @@ class GeviceDevice:
 
   def modify_device (self,gevice):
     self.action = "mod"
-    data = gevice.gmodel.get_data_of_device_from_model(gevice.gmodel.treeview)
+    selected = gevice.get_iter_selected (gevice.gmodel.treeview)
+    data = gevice.gmodel.get_data_of_device_from_model(selected)
 
     self.entry_name_device.set_sensitive(False)
     self.entry_name_device.set_text(data[0])
@@ -50,7 +51,8 @@ class GeviceDevice:
 
   def remove_device (self,gevice):
     self.action = "del"
-    data = gevice.gmodel.get_data_of_device_from_model(gevice.gmodel.treeview)
+    selected = gevice.get_iter_selected (gevice.gmodel.treeview)
+    data = gevice.gmodel.get_data_of_device_from_model(selected)
 
     result = gevice.show_message (_("Do you want to remove: ") + data[0],
       Gtk.MessageType.QUESTION,
@@ -58,7 +60,7 @@ class GeviceDevice:
       None)
 
     if result == Gtk.ResponseType.YES:
-      i = gevice.gmodel.get_iter_selected (gevice.gmodel.treeview)
+      i = gevice.get_iter_selected (gevice.gmodel.treeview)
       gevice.gmodel.treestore.remove(i["iter"])
 
   def load_interface (self,gevice):
@@ -103,8 +105,8 @@ class GeviceDevice:
         (Gtk.STOCK_OK, Gtk.ResponseType.OK),
         self.window_device)
 
-    if alldata:        
-      i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
+    if alldata:
+      i = gevice.get_iter_selected(gevice.gmodel.treeview)
 
       if self.action == "add":
         newiter = gevice.gmodel.treestore.append(i["iter"])
diff --git a/src/gevicediagram.py b/src/gevicediagram.py
index 60c140d..57fac96 100644
--- a/src/gevicediagram.py
+++ b/src/gevicediagram.py
@@ -92,7 +92,7 @@ class GeviceDiagram:
     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)
+    i = gevice.get_iter_selected(gevice.gmodel.treeview)
 
     self.iterfirst = i["iter"]
     self.print_child (gevice,i["iter"],None)
diff --git a/src/gevicemodel.py b/src/gevicemodel.py
index 18fc0f1..4bed8de 100644
--- a/src/gevicemodel.py
+++ b/src/gevicemodel.py
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Gtk,  GdkPixbuf
-import os
-import os.path
-
+from gi.repository import Gtk
 import config
-
 import gettext
 gettext.bindtextdomain(config.PACKAGE,config.LOCALEDIR)
 gettext.textdomain(config.PACKAGE)
@@ -59,31 +55,13 @@ class GeviceModel:
     col.add_attribute (cell,"text",2)
 
     selection = self.treeview.get_selection()
-    selection.connect ("changed",self.on_device_selection_changed,gevice)
-
-    return
+    selection.connect ("changed",gevice.on_device_selection_changed)
 
   def insert_new_item (self,newiter,name,ip,com):
     self.treestore.set_value (newiter,0,str(name))
     self.treestore.set_value (newiter,1,str(ip))
     self.treestore.set_value (newiter,2,str(com))
 
-  def on_device_selection_changed (self,selection,gevice):
-    model,iter = selection.get_selected()
-
-    if (iter):
-      gevice.actiongroup_device.set_sensitive (True)
-    else:
-      gevice.actiongroup_device.set_sensitive (False)
-
-  def get_iter_selected (self,treeview):
-    treeselection = treeview.get_selection()
-    model,iter = treeselection.get_selected()
-    model,path = treeselection.get_selected_rows()
-    selected = {"iter":iter,"path":path,"model":model}
-    return selected
-
-  def get_data_of_device_from_model(self,treeview):
-    i = self.get_iter_selected (treeview)
-    data = i["model"].get(i["iter"],0,1,2)
+  def get_data_of_device_from_model(self,selected):
+    data = selected["model"].get(selected["iter"],0,1,2)
     return data