GNOME.org
 

[gevice] modified: data/ui/Makefile.am new file: data/ui/dbase.xml modified: src/gevice.py: remove c

commit 181f391047d2585be01bba0afc146577c32e9168
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Mon Jul 25 15:57:09 2011 -0400

    	modified:   data/ui/Makefile.am
    	new file:   data/ui/dbase.xml
    	modified:   src/gevice.py: remove call to load_interface_save
    	modified:   src/gevicedatabase.py: remove function load_interface_save

 ChangeLog             |    4 +
 data/ui/Makefile.am   |    2 +-
 data/ui/dbase.xml     |  172 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/gevice.py         |    3 +-
 src/gevicedatabase.py |   49 ++++++--------
 src/geviceprefer.py   |    3 +-
 6 files changed, 201 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aaf7464..907411b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* data/ui/dbase.xml: add new file.
+  * Fixed bug #655285
+
+2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/ui/pref.xml: add new file.
 
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 19fd320..8025f29 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
+ui_DATA = main.xml menu.xml pref.xml dbase.xml
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/data/ui/dbase.xml b/data/ui/dbase.xml
new file mode 100644
index 0000000..02c4f88
--- /dev/null
+++ b/data/ui/dbase.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <object class="GtkWindow" id="window_database">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes" context="yes">Connect to database</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <child>
+      <object class="GtkVBox" id="vbox6">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkTable" id="table6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
+            <property name="n_rows">4</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">10</property>
+            <property name="row_spacing">5</property>
+            <child>
+              <object class="GtkLabel" id="label25">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" context="yes">Host:</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label26">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" context="yes">Database:</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label27">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" context="yes">User database:</property>
+              </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label28">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" context="yes">Password:</property>
+              </object>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_host">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_dbase">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</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>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_user_dbase">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</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>
+            <child>
+              <object class="GtkEntry" id="entry_passwd_dbase">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="visibility">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>
+              </packing>
+            </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="hbox11">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">5</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkButton" id="button_connect_dbase">
+                <property name="label" context="yes">gtk-connect</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_connect_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>
+</interface>
diff --git a/src/gevice.py b/src/gevice.py
index 91def13..92415a4 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -530,10 +530,9 @@ class Gevice:
         
 
     def on_action_save (gevice,action):
-        # temporal
         gevice.gdbase = gevicedatabase.GeviceDatabase ()
 
-	gevice.gdbase.load_interface_save (gevice)
+	gevice.gdbase.load_interface (gevice,"save")
 	gevice.gdbase.label_host.set_text (gevice.gpref.host)
 	gevice.gdbase.label_dbase.set_text (gevice.gpref.dbase)
 	gevice.gdbase.label_user_dbase.set_text (gevice.gpref.user_dbase)
diff --git a/src/gevicedatabase.py b/src/gevicedatabase.py
index 5c1fb1b..c81f9a9 100644
--- a/src/gevicedatabase.py
+++ b/src/gevicedatabase.py
@@ -66,34 +66,27 @@ class GeviceDatabase:
             result = gevice.show_message (_("Unable to execute SQL: " + sql),gtk.MESSAGE_ERROR,gtk.BUTTONS_OK)
             return False
 
-    def load_interface (self,gevice):
-		glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_database",None)
-		self.window_database = glade_file.get_widget ("window_database")
-		self.button_connect_cancel = glade_file.get_widget ("button_connect_cancel")
-		self.button_connect_dbase = glade_file.get_widget ("button_connect_dbase")
-		self.label_host = glade_file.get_widget ("label_host")
-		self.label_dbase = glade_file.get_widget ("label_dbase")
-		self.label_user_dbase = glade_file.get_widget ("label_user_dbase")
-		self.entry_passwd_dbase = glade_file.get_widget ("entry_passwd_dbase")
-		
-		self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press,gevice)		
-		self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked,gevice)
-		self.button_connect_cancel.connect ("clicked",self.on_button_connect_cancel_clicked)
-
-    def load_interface_save (self,gevice):
-		glade_file = gtk.glade.XML (os.path.join (config.GLADEDIR, "gevice.glade"),"window_database_save",None)
-		self.window_database = glade_file.get_widget ("window_database_save")
-		self.button_connect_cancel = glade_file.get_widget ("button_connect_cancel1")
-		self.button_connect_dbase = glade_file.get_widget ("button_connect_dbase1")
-		self.label_host = glade_file.get_widget ("label_host1")
-		self.label_dbase = glade_file.get_widget ("label_dbase1")
-		self.label_user_dbase = glade_file.get_widget ("label_user_dbase1")
-		self.entry_passwd_dbase = glade_file.get_widget ("entry_passwd_dbase1")
-		
-		self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press_save,gevice)		
-		self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked_save,gevice)
-		self.button_connect_cancel.connect ("clicked",self.on_button_connect_cancel_clicked)
-
+    def load_interface (self,gevice,action="connect"):
+	builder = gtk.Builder()
+	builder.add_from_file(os.path.join (config.UIDIR, "dbase.xml"))
+	
+	self.window_database = builder.get_object ("window_database")
+	self.button_connect_cancel = builder.get_object ("button_connect_cancel")
+	self.button_connect_dbase = builder.get_object ("button_connect_dbase")
+	self.label_host = builder.get_object ("label_host")
+	self.label_dbase = builder.get_object ("label_dbase")
+	self.label_user_dbase = builder.get_object ("label_user_dbase")
+	self.entry_passwd_dbase = builder.get_object ("entry_passwd_dbase")
+	
+	if action=="save":
+	  self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked_save,gevice)
+	  self.window_database.set_title (_("Save database"))
+	  self.button_connect_dbase.set_label (_("Save"))
+	else:
+	  self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked,gevice)	  
+	  
+	self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press,gevice)		
+	self.button_connect_cancel.connect ("clicked",self.on_button_connect_cancel_clicked)
 
     def close_window (self,window):
 	    window.destroy()
diff --git a/src/geviceprefer.py b/src/geviceprefer.py
index c55db3e..bfb6e75 100644
--- a/src/geviceprefer.py
+++ b/src/geviceprefer.py
@@ -1,6 +1,7 @@
 import pygtk
 pygtk.require('2.0')
-import gtk.glade
+#import gtk.glade
+import gtk
 import os
 import gconf
 import gobject
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]