[gevice] remove some tab spaces



commit 42d92ae550c2590ba420cafcb9c080d8498d9846
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Thu Oct 27 16:07:15 2011 -0300

    remove some tab spaces

 ChangeLog     |    4 ++
 README        |    2 +-
 src/gevice.py |  107 +++++++++++++++++++++++++++------------------------------
 3 files changed, 56 insertions(+), 57 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9c7e20f..d0b689f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-27  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* README:
+	* src/gevice.py: remove some tab spaces.
+
 2011-10-14  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/ui/pref.xml:
 	* src/gevice.py:
diff --git a/README b/README
index 8a2deed..b7a383b 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ it. See the COPYING file for details.
 	- Allow you to draw the net model.
 	- Allow you to print the net diagram in png,gif,jpg formats.
 	- Allow you to save your model in database (Postgresql)
-	- Allow you to manager the device, in terminal (telnet,ssh or local)
+	- Allow you to manager the device, in terminal (telnet,ssh or local) or with RDP, VNC.
 	- Allow export data to CSV file. Use "|" to separate fields (or other).
 
 * Contributing
diff --git a/src/gevice.py b/src/gevice.py
index b89c348..d8bf6b6 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -56,7 +56,7 @@ class Gevice:
     self.modelproto.append (["local"])
     self.modelproto.append (["vnc"])
     self.modelproto.append (["rdp"])
-    self.modelproto.append (["xdmcp"])    
+    self.modelproto.append (["xdmcp"])
     
     # model for devices
     self.gmodel = gevicemodel.GeviceModel(self)
@@ -288,8 +288,6 @@ class Gevice:
     vpaned.add1 (hbox_term)
     
     button_close.connect('clicked',self.close_page_of_notebook,vpaned)
-
-    
     
     if local:
       label.set_text(_("Local"))
@@ -298,69 +296,66 @@ class Gevice:
       if isdual:
         hbox_term2,terminal2 = gvte.new_terminal (self)
         vpaned.add2 (hbox_term2)
-	terminal2.fork_command_full (Vte.PtyFlags.DEFAULT, None, [Vte.get_user_shell()], None, GLib.SpawnFlags.SEARCH_PATH, None, None)
-	
+        terminal2.fork_command_full (Vte.PtyFlags.DEFAULT, None, [Vte.get_user_shell()], None, GLib.SpawnFlags.SEARCH_PATH, None, None)
+    
     else:
       i = self.gmodel.get_iter_selected (self.gmodel.treeview)
       
       if not i["iter"]:
-	result = gevice.show_message (_("Not device selected"),
-	  None,
-	  (Gtk.STOCK_OK, Gtk.ResponseType.OK),
-	  None)
-	return
-	
+        result = gevice.show_message (_("Not device selected"), None,(Gtk.STOCK_OK, Gtk.ResponseType.OK), None)
+        return
       else:
         # get data from device selected (devicename, IP)
         data = self.gmodel.get_data_of_device_from_model(self.gmodel.treeview)
-        label.set_text(data[0])        
-	
-	# get name of user selected (for ssh session)
-	model_user = self.combobox_user.get_model()
-	iter_user = self.combobox_user.get_active_iter()
-	user = model_user.get(iter_user,0)
-	
-	proto = self.get_protocol_selected()
-	if (proto == "rdp"):
-	  cmd =  "rdesktop " 
-	  cmd += "-T'" + data[2] + "' "
-	  cmd += "-u" + user[0]
-	  cmd += " -g800x600 "
-	  cmd += "-rsound:local "
-	  cmd += "-rclipboard:PRIMARYCLIPBOARD "
-	  cmd += "-b -4 "
-	  cmd += data[2]
-	  cmd += " &"
-	  
-	  os.system(cmd)
-	  return
-	
-	if (proto == "vnc"):
-	  cmd =  "vncviewer " 
-	  cmd += "-geometry 800x600 "
-	  cmd += "-Xdialog "
-	  cmd += data[2]
-	  cmd += ":1 "
-	  cmd += " &"
-	  
-	  os.system(cmd)
-	  return
+        label.set_text(data[0])
+
+        # get name of user selected (for ssh session)
+        model_user = self.combobox_user.get_model()
+        iter_user = self.combobox_user.get_active_iter()
+        user = model_user.get(iter_user,0)
+
+        proto = self.get_protocol_selected()
+
+        if (proto == "rdp"):
+          cmd =  "rdesktop " 
+          cmd += "-T'" + data[2] + "' "
+          cmd += "-u" + user[0]
+          cmd += " -g800x600 "
+          cmd += "-rsound:local "
+          cmd += "-rclipboard:PRIMARYCLIPBOARD "
+          cmd += "-b -4 "
+          cmd += data[2]
+          cmd += " &"
+
+          os.system(cmd)
+          return
+
+        if (proto == "vnc"):
+          cmd =  "vncviewer " 
+          cmd += "-geometry 800x600 "
+          cmd += "-Xdialog "
+          cmd += data[2]
+          cmd += ":1 "
+          cmd += " &"
+
+          os.system(cmd)
+          return
+
+        terminal.fork_command_full (Vte.PtyFlags.DEFAULT, None, [proto,'-l',user[0],data[2]], [], GLib.SpawnFlags.SEARCH_PATH, None, None)
+
+        if isdual:
+          hbox_term2,terminal2 = gvte.new_terminal (self)
+          vpaned.add2 (hbox_term2)
+          terminal2.fork_command_full (Vte.PtyFlags.DEFAULT, None, [proto,'-l',user[0],data[2]], [], GLib.SpawnFlags.SEARCH_PATH, None, None)
 
-	terminal.fork_command_full (Vte.PtyFlags.DEFAULT, None, [proto,'-l',user[0],data[2]], [], GLib.SpawnFlags.SEARCH_PATH, None, None)
-        
-	if isdual:
-	  hbox_term2,terminal2 = gvte.new_terminal (self)
-	  vpaned.add2 (hbox_term2)
-	  terminal2.fork_command_full (Vte.PtyFlags.DEFAULT, None, [proto,'-l',user[0],data[2]], [], GLib.SpawnFlags.SEARCH_PATH, None, None)
-        
     page = self.notebook.append_page(vpaned,hbox_label)
     self.notebook.set_tab_reorderable(vpaned,True)
     self.notebook.set_tab_detachable(vpaned,True)
-    
+
     hbox_label.show_all()
     vpaned.show_all()
     self.notebook.set_current_page(page)
-    
+
   def create_button_with_image (self,id_stock,sensitive):
     "return a button with image, utilized in tool of browser"
     
@@ -535,10 +530,10 @@ 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."),
-	None,
-	(Gtk.STOCK_OK, Gtk.ResponseType.OK),
-	gevice.window_main)
+      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()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]