[gevice] Fixed bug #655285

From: Alejandro Valdes Jimenez <avaldes src gnome org>
To: commits-list gnome org
Cc:
Subject: [gevice] Fixed bug #655285
Date: Mon, 25 Jul 2011 20:56:03 +0000 (UTC)
commit 947f55d403db81971d749b37663066e2847fa23e
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Mon Jul 25 16:50:01 2011 -0400

    Fixed bug #655285

 ChangeLog           |    5 +-
 data/ui/Makefile.am |    2 +-
 data/ui/device.xml  |  298 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gevicedevice.py |   39 +++++---
 4 files changed, 329 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 907411b..d3e3594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* data/ui/device.xml: add new file
+
+2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/ui/dbase.xml: add new file.
-  * Fixed bug #655285
+	* Fixed bug #655285
 
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/ui/pref.xml: add new file.
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 8025f29..4dafd14 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -4,6 +4,6 @@
 
 uidir   = $(pkgdatadir)/ui
 
-ui_DATA = main.xml menu.xml pref.xml dbase.xml
+ui_DATA = main.xml menu.xml pref.xml dbase.xml device.xml
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/data/ui/device.xml b/data/ui/device.xml
new file mode 100644
index 0000000..d34c090
--- /dev/null
+++ b/data/ui/device.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_device">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Device</property>
+    <property name="resizable">False</property>
+    <property name="window_position">center</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <child>
+      <object class="GtkVBox" id="vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">15</property>
+        <child>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkTable" id="table_data">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="n_rows">8</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">2</property>
+                <property name="row_spacing">2</property>
+                <child>
+                  <object class="GtkEntry" id="entry_comment_device">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">Comment</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_serial_device">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">Serial</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">Model</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_ip_device">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">IP</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combo_link">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">Link</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_name_device">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="activates_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="yes">Name</property>
+                  </object>
+                  <packing>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Location</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combo_location">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Ports Availables</property>
+                  </object>
+                  <packing>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry_ports">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">â</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combo_model">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkButton" id="button_accept_device">
+                <property name="label" context="yes">gtk-ok</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_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_cancel_device">
+                <property name="label" context="yes">gtk-cancel</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_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/src/gevicedevice.py b/src/gevicedevice.py
index 2a54363..539c563 100644
--- a/src/gevicedevice.py
+++ b/src/gevicedevice.py
@@ -1,6 +1,7 @@
 import pygtk
 pygtk.require('2.0')
-import gtk.glade
+#import gtk.glade
+import gtk
 import os
 
 import gettext
@@ -132,32 +133,44 @@ class GeviceDevice:
         dialog.destroy()
 
     def load_interface (self,gevice):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_device",None)
-        self.window_device = glade_file.get_widget ("window_device")
-        self.entry_name_device = glade_file.get_widget ("entry_name_device")
-        self.entry_ip_device = glade_file.get_widget ("entry_ip_device")
-        self.entry_comment_device = glade_file.get_widget ("entry_comment_device")
-        self.entry_serial_device = glade_file.get_widget ("entry_serial_device")
-        self.entry_ports = glade_file.get_widget ("entry_ports")
-        self.combo_link = glade_file.get_widget ("combo_link")
-        self.combo_location = glade_file.get_widget ("combo_location")
-        self.combo_model = glade_file.get_widget ("combo_model")
-        self.button_cancel_device = glade_file.get_widget ("button_cancel_device")
-        self.button_accept_device = glade_file.get_widget ("button_accept_device")
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "device.xml"))
+	
+        self.window_device = builder.get_object ("window_device")
+        self.entry_name_device = builder.get_object ("entry_name_device")
+        self.entry_ip_device = builder.get_object ("entry_ip_device")
+        self.entry_comment_device = builder.get_object ("entry_comment_device")
+        self.entry_serial_device = builder.get_object ("entry_serial_device")
+        self.entry_ports = builder.get_object ("entry_ports")
+        self.combo_link = builder.get_object ("combo_link")
+        self.combo_location = builder.get_object ("combo_location")
+        self.combo_model = builder.get_object ("combo_model")
+        self.button_cancel_device = builder.get_object ("button_cancel_device")
+        self.button_accept_device = builder.get_object ("button_accept_device")
 
         # signals window device
         self.window_device.connect ("delete-event",self.on_window_device_delete_event)
         self.button_cancel_device.connect ("clicked",self.on_button_cancel_device_clicked)
         self.button_accept_device.connect ("clicked",self.on_button_accept_device_clicked,gevice)
        
+	cell = gtk.CellRendererText()
+        self.combo_model.pack_start(cell)
+        self.combo_model.add_attribute(cell, 'text', 0)
         gevice.list_models = gevice.gdbase.get_list_of_models (gevice)
         self.combo_model.set_model (gevice.list_models)
         
+	cell = gtk.CellRendererText()
+        self.combo_link.pack_start(cell)
+        self.combo_link.add_attribute(cell, 'text', 0)
         gevice.list_links = gevice.gdbase.get_list_of_links (gevice)
         self.combo_link.set_model (gevice.list_links)
         
+	cell = gtk.CellRendererText()
+        self.combo_location.pack_start(cell)
+        self.combo_location.add_attribute(cell, 'text', 0)
         gevice.list_location = gevice.gdbase.get_list_of_location (gevice)
         self.combo_location.set_model (gevice.list_location)        
+	
 
     def show_interface (self):
         self.window_device.show_all ()
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]