[Phonehome-commits] r31 - in trunk/frontend: data src

[pamadio at garage.maemo.org]

Author: pamadio
Date: 2008-10-15 20:58:41 +0300 (Wed, 15 Oct 2008)
New Revision: 31

Modified:
   trunk/frontend/data/phonehome-gui.glade
   trunk/frontend/src/phonehome-gui
Log:
canceling

Modified: trunk/frontend/data/phonehome-gui.glade
===================================================================
--- trunk/frontend/data/phonehome-gui.glade	2008-10-15 17:50:57 UTC (rev 30)
+++ trunk/frontend/data/phonehome-gui.glade	2008-10-15 17:58:41 UTC (rev 31)
@@ -195,7 +195,7 @@
 	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkButton" id="ok_button">
+	    <widget class="GtkButton" id="cancel_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -203,12 +203,12 @@
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Wed, 15 Oct 2008 16:10:13 GMT"/>
+	      <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Wed, 15 Oct 2008 17:50:46 GMT"/>
 	    </widget>
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="cancel_button">
+	    <widget class="GtkButton" id="ok_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -216,7 +216,7 @@
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Wed, 15 Oct 2008 16:10:21 GMT"/>
+	      <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Wed, 15 Oct 2008 17:51:05 GMT"/>
 	    </widget>
 	  </child>
 	</widget>

Modified: trunk/frontend/src/phonehome-gui
===================================================================
--- trunk/frontend/src/phonehome-gui	2008-10-15 17:50:57 UTC (rev 30)
+++ trunk/frontend/src/phonehome-gui	2008-10-15 17:58:41 UTC (rev 31)
@@ -43,11 +43,13 @@
         self.vbox1.reparent(self.hildon_window)
         self.main_xml.get_widget("main_window").destroy()
         main_dic = {
+            "on_ok_button_clicked":self.ok_button_clicked,
+            "on_cancel_button_clicked":self.cancel_button_clicked
             }
         self.main_xml.signal_autoconnect(main_dic)
         
-        self.cancel_button=self.main_xml.get_widget("ok_button")
-        self.ok_button=self.main_xml.get_widget("cancel_button")
+        self.ok_button=self.main_xml.get_widget("ok_button")
+        self.cancel_button=self.main_xml.get_widget("cancel_button")
         self.tid_label=self.main_xml.get_widget("tabletid_label")
         self.password_label=self.main_xml.get_widget("password_label")
         self.server_label=self.main_xml.get_widget("server_label")
@@ -77,6 +79,12 @@
         
     def end_application(self,widget=False):
         gtk.main_quit()
+
+    def ok_button_clicked(self,widget):
+        print "ok"
+
+    def cancel_button_clicked(self,widget):
+        self.end_application()
 """
 locale.setlocale(locale.LC_ALL, "fr_FR")
 os.environ["LANGUAGE"]="fr_FR"