[gevice] Fixed bug #655265



commit 5f56067e4d4fa03d9f292baf9af7ee04dff928cd
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Mon Jul 25 18:40:16 2011 -0400

    Fixed bug #655265

 ChangeLog               |    8 +++
 data/ui/Makefile.am     |   14 ++++-
 data/ui/diagram.xml     |    4 +-
 data/ui/edifice.xml     |  120 +++++++++++++++++++++++++++++++++++++++
 data/ui/gevice.xml      |  129 -----------------------------------------
 data/ui/location.xml    |  145 +++++++++++++++++++++++++++++++++++++++++++++++
 data/ui/maintainer.xml  |   98 +++++++++++++++++++++++++++++++
 data/ui/maintainer1.xml |   98 +++++++++++++++++++++++++++++++
 data/ui/model.xml       |  144 ++++++++++++++++++++++++++++++++++++++++++++++
 src/gevice.py           |    2 +-
 src/gevicemaintainer.py |  132 +++++++++++++++++++++++-------------------
 11 files changed, 701 insertions(+), 193 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ca7eef9..1ebad80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* data/ui/edifice.xml: add new file
+	* data/ui/location.xml: add new file 
+	* data/ui/maintainer.xml: add new file
+	* data/ui/maintainer1.xml: add new file
+	* data/ui/model.xml: add new file
+	* Fixed bug #655265
+
+2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/ui/menu.xml:
 	* Fixed bug #655266
 
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 092d0ef..30efb68 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -4,6 +4,18 @@
 
 uidir   = $(pkgdatadir)/ui
 
-ui_DATA = main.xml menu.xml pref.xml dbase.xml device.xml find.xml diagram.xml
+ui_DATA = \
+	main.xml\
+	menu.xml\
+	pref.xml\
+	dbase.xml\
+	device.xml\
+	find.xml\
+	diagram.xml\
+	location.xml\
+	edifice.xml\
+	maintainer.xml\
+	maintainer1.xml\
+	model.xml
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/data/ui/diagram.xml b/data/ui/diagram.xml
index 044e780..270de80 100644
--- a/data/ui/diagram.xml
+++ b/data/ui/diagram.xml
@@ -45,7 +45,7 @@
     <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>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes" context="yes">Generate diagram</property>
+    <property name="title" translatable="yes" context="yes">Generate Diagram</property>
     <property name="resizable">False</property>
     <property name="window_position">center</property>
     <child>
@@ -132,7 +132,7 @@
             <property name="spacing">5</property>
             <child>
               <object class="GtkButton" id="button_diagram_generate">
-                <property name="label" context="yes">gtk-convert</property>
+                <property name="label" context="yes">gtk-execute</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
diff --git a/data/ui/edifice.xml b/data/ui/edifice.xml
new file mode 100644
index 0000000..b180f86
--- /dev/null
+++ b/data/ui/edifice.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_edifice">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" context="yes">New Edifice</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkVBox" id="vbox13">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkComboBox" id="combobox_campus">
+                <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">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_edifice">
+                <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="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label38">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Campus</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label39">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Edifice</property>
+              </object>
+            </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="hbox15">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label" context="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">
+                <property name="label" context="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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/data/ui/gevice.xml b/data/ui/gevice.xml
index 6619425..cb2467d 100644
--- a/data/ui/gevice.xml
+++ b/data/ui/gevice.xml
@@ -1,135 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
-  <object class="GtkWindow" id="window_diagram">
-    <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>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes" context="yes">Generate diagram</property>
-    <property name="resizable">False</property>
-    <property name="window_position">center</property>
-    <child>
-      <object class="GtkVBox" id="vbox8">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">15</property>
-        <child>
-          <object class="GtkHBox" id="hbox3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="yes">Program</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="combobox_program">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkCellRendererText" id="renderer1"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="yes">Format</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBox" id="combobox_format">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkCellRendererText" id="renderer2"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</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="hbox4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkButton" id="button_diagram_generate">
-                <property name="label" context="yes">gtk-convert</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_diagram_cancel">
-                <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">True</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkWindow" id="window_edifice">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" context="yes">New Edifice</property>
diff --git a/data/ui/location.xml b/data/ui/location.xml
new file mode 100644
index 0000000..cb5d040
--- /dev/null
+++ b/data/ui/location.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_location">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" context="yes">New Location</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkVBox" id="vbox12">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table9">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkComboBox" id="combobox_edifice">
+                <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>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="combobox_level">
+                <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">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_location">
+                <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="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label35">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Edifice</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label36">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Level</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label37">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Location</property>
+              </object>
+            </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="hbox14">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label" context="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">
+                <property name="label" context="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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/data/ui/maintainer.xml b/data/ui/maintainer.xml
new file mode 100644
index 0000000..14e719c
--- /dev/null
+++ b/data/ui/maintainer.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_maintainer">
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <property name="default_width">350</property>
+    <property name="default_height">300</property>
+    <child>
+      <object class="GtkVBox" id="vbox7">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow3">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkTreeView" id="treeview">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="reorderable">True</property>
+                <property name="rules_hint">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_rem">
+                <property name="label" context="yes">gtk-remove</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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>
+            <child>
+              <object class="GtkButton" id="button_add">
+                <property name="label" context="yes">gtk-add</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_close">
+                <property name="label" context="yes">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">3</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/data/ui/maintainer1.xml b/data/ui/maintainer1.xml
new file mode 100644
index 0000000..5d24d38
--- /dev/null
+++ b/data/ui/maintainer1.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_maintainer1">
+    <property name="can_focus">False</property>
+    <property name="window_position">center</property>
+    <property name="default_width">350</property>
+    <property name="default_height">300</property>
+    <child>
+      <object class="GtkVBox" id="vbox9">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow4">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="reorderable">True</property>
+                <property name="rules_hint">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox12">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_rem1">
+                <property name="label" context="yes">gtk-remove</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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>
+            <child>
+              <object class="GtkButton" id="button_add1">
+                <property name="label" context="yes">gtk-add</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_close1">
+                <property name="label" context="yes">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">3</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/data/ui/model.xml b/data/ui/model.xml
new file mode 100644
index 0000000..5d7a4af
--- /dev/null
+++ b/data/ui/model.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_model">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" context="yes">New Model</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkVBox" id="vbox10">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkComboBox" id="combobox_mark">
+                <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>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="combobox_type">
+                <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">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_model">
+                <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="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label21">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Mark</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label22">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Type</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label30">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes" context="yes">Model</property>
+              </object>
+            </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="hbox13">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="button_ok">
+                <property name="label" context="yes">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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">
+                <property name="label" context="yes">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</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/gevice.py b/src/gevice.py
index 92415a4..89c674d 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -182,7 +182,7 @@ class Gevice:
             ('EditDevice', gtk.STOCK_EDIT, _('Edit'), None, _('Edit data of device selected'), self.on_action_editdevice),
             ('Expand', gtk.STOCK_INDENT, _('Expand'), None, _('Expand tree of device selected'), self.on_action_expand),
             ('Decrease', gtk.STOCK_UNINDENT, _('Decrease'), None, _('Decrease tree of device selected'), self.on_action_decrease),
-            ('Diagram', gtk.STOCK_CONVERT, _('Create diagram'),None, _('Create diagram of devices'), self.on_action_diagram),
+            ('Diagram', gtk.STOCK_CONVERT, _('Generate Diagram'),None, _('Generate diagram of devices'), self.on_action_diagram),
             ('Mark', gtk.STOCK_EDIT, _('Mark'),None, _('Mark'), self.on_action_mark),
             ('TypeOfLink', gtk.STOCK_EDIT, _('Type of link'),None, _('Type of link'), self.on_action_typeoflink),
             ('TypeOfDev', gtk.STOCK_EDIT, _('Type of device'),None, _('Type of device'), self.on_action_typeofdev),
diff --git a/src/gevicemaintainer.py b/src/gevicemaintainer.py
index 71ac151..37985b8 100644
--- a/src/gevicemaintainer.py
+++ b/src/gevicemaintainer.py
@@ -9,7 +9,7 @@ import config
 
 import gettext
 gettext.textdomain(config.PACKAGE)
-gtk.glade.textdomain(config.PACKAGE)
+#gtk.glade.textdomain(config.PACKAGE)
 from gettext import gettext as _
 
 class GeviceMaintainer:
@@ -22,12 +22,14 @@ class GeviceMaintainer:
 
     
     def load_interface (self,gevice,title,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_maintainer",None)
-        self.window_maintainer = glade_file.get_widget ("window_maintainer")
-        self.button_add = glade_file.get_widget ("button_add")
-        self.button_rem = glade_file.get_widget ("button_rem")
-        self.button_close = glade_file.get_widget ("button_close")
-        self.treeview = glade_file.get_widget ("treeview")        
+        builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "maintainer.xml"))
+	
+        self.window_maintainer = builder.get_object ("window_maintainer")
+        self.button_add = builder.get_object ("button_add")
+        self.button_rem = builder.get_object ("button_rem")
+        self.button_close = builder.get_object ("button_close")
+        self.treeview = builder.get_object ("treeview")        
         
         #self.treeview.set_rules_hint (True)
         self.window_maintainer.set_title (title)
@@ -55,12 +57,14 @@ class GeviceMaintainer:
         self.button_rem.connect ("clicked",self.on_button_rem_clicked,gevice,sql)
 
     def load_interface1 (self,gevice,title,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_maintainer1",None)
-        self.window_maintainer = glade_file.get_widget ("window_maintainer1")
-        self.button_add = glade_file.get_widget ("button_add1")
-        self.button_rem = glade_file.get_widget ("button_rem1")
-        self.button_close = glade_file.get_widget ("button_close1")
-        self.treeview = glade_file.get_widget ("treeview1")        
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "maintainer1.xml"))
+	
+        self.window_maintainer = builder.get_object ("window_maintainer1")
+        self.button_add = builder.get_object ("button_add1")
+        self.button_rem = builder.get_object ("button_rem1")
+        self.button_close = builder.get_object ("button_close1")
+        self.treeview = builder.get_object ("treeview1")        
         
         self.window_maintainer.set_title (title)
 
@@ -97,12 +101,14 @@ class GeviceMaintainer:
         self.button_add.connect ("clicked",self.on_button_add_model_clicked,gevice,sql)
         
     def load_interface2 (self,gevice,title,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_maintainer1",None)
-        self.window_maintainer = glade_file.get_widget ("window_maintainer1")
-        self.button_add = glade_file.get_widget ("button_add1")
-        self.button_rem = glade_file.get_widget ("button_rem1")
-        self.button_close = glade_file.get_widget ("button_close1")
-        self.treeview = glade_file.get_widget ("treeview1")        
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "maintainer1.xml"))
+      
+        self.window_maintainer = builder.get_object ("window_maintainer1")
+        self.button_add = builder.get_object ("button_add1")
+        self.button_rem = builder.get_object ("button_rem1")
+        self.button_close = builder.get_object ("button_close1")
+        self.treeview = builder.get_object ("treeview1")        
         
         self.window_maintainer.set_title (title)
 
@@ -139,12 +145,14 @@ class GeviceMaintainer:
         self.button_add.connect ("clicked",self.on_button_add_location_clicked,gevice,sql)        
         
     def load_interface3 (self,gevice,title,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_maintainer1",None)
-        self.window_maintainer = glade_file.get_widget ("window_maintainer1")
-        self.button_add = glade_file.get_widget ("button_add1")
-        self.button_rem = glade_file.get_widget ("button_rem1")
-        self.button_close = glade_file.get_widget ("button_close1")
-        self.treeview = glade_file.get_widget ("treeview1")        
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "maintainer1.xml"))
+	
+        self.window_maintainer = builder.get_object ("window_maintainer1")
+        self.button_add = builder.get_object ("button_add1")
+        self.button_rem = builder.get_object ("button_rem1")
+        self.button_close = builder.get_object ("button_close1")
+        self.treeview = builder.get_object ("treeview1")        
         
         self.window_maintainer.set_title (title)
 
@@ -175,23 +183,24 @@ class GeviceMaintainer:
         cell.connect('edited', self.on_model_edited,gevice,sql)        
         col.pack_start (cell,True)
         col.add_attribute (cell,"text",2)
-		
-        self.button_close.connect ("clicked",self.on_button_close_clicked,)
-        self.button_rem.connect ("clicked",self.on_button_rem_model_clicked,gevice,sql)
-        self.button_add.connect ("clicked",self.on_button_add_edifice_clicked,gevice,sql)                
-
-
+	
+	self.button_close.connect ("clicked",self.on_button_close_clicked,)
+	self.button_rem.connect ("clicked",self.on_button_rem_model_clicked,gevice,sql)
+	self.button_add.connect ("clicked",self.on_button_add_edifice_clicked,gevice,sql)
+    
     def load_interface_model (self,gevice,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_model",None)
-        self.window_model = glade_file.get_widget ("window_model")
-        self.button_ok = glade_file.get_widget ("button_ok")
-        self.button_cancel = glade_file.get_widget ("button_cancel")
-        self.combobox_type = glade_file.get_widget ("combobox_type")
-        self.combobox_mark = glade_file.get_widget ("combobox_mark")
-        self.entry_model = glade_file.get_widget ("entry_model")
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "model.xml"))
+      
+        self.window_model = builder.get_object ("window_model")
+        self.button_ok = builder.get_object ("button_ok")
+        self.button_cancel = builder.get_object ("button_cancel")
+        self.combobox_type = builder.get_object ("combobox_type")
+        self.combobox_mark = builder.get_object ("combobox_mark")
+        self.entry_model = builder.get_object ("entry_model")
         
         self.button_cancel.connect ("clicked",self.on_button_model_cancel_clicked)
-        self.button_ok.connect ("clicked",self.on_button_location_ok_clicked,gevice,sql)
+        self.button_ok.connect ("clicked",self.on_button_model_ok_clicked,gevice,sql)
         
         self.list_type = gevice.gdbase.get_list_of_data(gevice,sql["sql_tipo_disp"])
         self.combobox_type.set_model(self.list_type)
@@ -212,13 +221,15 @@ class GeviceMaintainer:
         self.window_model.show_all()
 
     def load_interface_location (self,gevice,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_location",None)
-        self.window_location = glade_file.get_widget ("window_location")
-        self.button_ok = glade_file.get_widget ("button_ok")
-        self.button_cancel = glade_file.get_widget ("button_cancel")
-        self.combobox_level = glade_file.get_widget ("combobox_level")
-        self.combobox_edifice = glade_file.get_widget ("combobox_edifice")
-        self.entry_location = glade_file.get_widget ("entry_location")
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "location.xml"))
+	
+        self.window_location = builder.get_object ("window_location")
+        self.button_ok = builder.get_object ("button_ok")
+        self.button_cancel = builder.get_object ("button_cancel")
+        self.combobox_level = builder.get_object ("combobox_level")
+        self.combobox_edifice = builder.get_object ("combobox_edifice")
+        self.entry_location = builder.get_object ("entry_location")
         
         self.button_cancel.connect ("clicked",self.on_button_location_cancel_clicked)
         self.button_ok.connect ("clicked",self.on_button_location_ok_clicked,gevice,sql)
@@ -242,17 +253,19 @@ class GeviceMaintainer:
         self.window_location.show_all()        
 
     def load_interface_edifice (self,gevice,sql):
-        glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_edifice",None)
-        self.window_edifice = glade_file.get_widget ("window_edifice")
-        self.button_ok = glade_file.get_widget ("button_ok")
-        self.button_cancel = glade_file.get_widget ("button_cancel")
-        self.combobox_campus = glade_file.get_widget ("combobox_campus")
-        self.entry_edifice = glade_file.get_widget ("entry_edifice")
-        
-        self.button_cancel.connect ("clicked",self.on_button_edifice_cancel_clicked)
-        self.button_ok.connect ("clicked",self.on_button_edifice_ok_clicked,gevice,sql)
-        
-        self.list_campus = gevice.gdbase.get_list_of_data(gevice,sql["sql_campus"])
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "edifice.xml"))
+      
+        self.window_edifice = builder.get_object ("window_edifice")
+        self.button_ok = builder.get_object ("button_ok")
+        self.button_cancel = builder.get_object ("button_cancel")
+        self.combobox_campus = builder.get_object ("combobox_campus")
+        self.entry_edifice = builder.get_object ("entry_edifice")
+	
+	self.button_cancel.connect ("clicked",self.on_button_edifice_cancel_clicked)
+	self.button_ok.connect ("clicked",self.on_button_edifice_ok_clicked,gevice,sql)
+	
+	self.list_campus = gevice.gdbase.get_list_of_data(gevice,sql["sql_campus"])
         self.combobox_campus.set_model(self.list_campus)
         cell = gtk.CellRendererText()
         self.combobox_campus.pack_start(cell, True)
@@ -261,7 +274,7 @@ class GeviceMaintainer:
         self.entry_edifice.set_text("")
         self.combobox_campus.set_active(0)
         
-        self.window_edifice.show_all()        
+        self.window_edifice.show_all()
 
     def on_button_model_cancel_clicked (self,button):
         self.close_window (self.window_model)    
@@ -400,8 +413,7 @@ class GeviceMaintainer:
         self.load_interface_location(gevice,sql)         
 
     def on_button_add_edifice_clicked(self,button,gevice,sql):
-        self.load_interface_edifice(gevice,sql)                 
-         
+        self.load_interface_edifice(gevice,sql)                          
     
     def on_button_rem_clicked(self,button,gevice,sql):
         selection = self.treeview.get_selection()



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