[Rapier-commits] r168 - trunk/src

[This list send mail when a change occurs on the subversion repository]

Author: stevenrwalter
Date: 2007-12-02 22:58:46 +0200 (Sun, 02 Dec 2007)
New Revision: 168

Modified:
   trunk/src/rapier
Log:
Convert show_message() and "waiting" to hildon.Note()


Modified: trunk/src/rapier
===================================================================
--- trunk/src/rapier	2007-12-02 20:58:32 UTC (rev 167)
+++ trunk/src/rapier	2007-12-02 20:58:46 UTC (rev 168)
@@ -811,7 +811,8 @@
         newJob=aJob(self.jobCounter,"remote_modules_list",args)
         self.putJob(newJob)
         self.waitForRemoteModulesFlag=True
-        self.waitingWinLabel.set_text("Waiting for remote modules list")
+        self.waitingWindow.set_property('description',
+                "Waiting for remote modules list")
         self.waitingWindow.show_all()
 
 
@@ -878,9 +879,10 @@
         newJob=aJob(self.jobCounter,'module_management',args)
         self.putJob(newJob)
         self.waitForModuleManagementFlag=True
-        self.waitingWinLabel.set_text("Waiting for operation to perform.\n"+\
-                                      "(Index building may take a very,"+\
-                                      " very long time.)")
+        self.waitingWindow.set_property('description',
+                "Waiting for operation to perform.\n"+
+                "(Index building may take a very,"+
+                " very long time.)")
                                       
         self.waitingWindow.show_all()
 
@@ -1036,27 +1038,14 @@
         self.refresh_remote_modules_tv()        
 
 
-    def hide_message(self,widget,dialog):
-        dialog.destroy()
-
-
-
     def show_message(self,message):
-        dialog=hildon.Window()
-        dialog.set_title("Message")
-        dialog.set_modal(True)
-        dialog.set_transient_for(self.mainWindow)
-        dialog.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-        dialog.okb=gtk.Button('Ok')
-        dialog.okb.connect("clicked",self.hide_message,dialog)
-        dialog.vb=gtk.VBox()
-        dialog.label=gtk.Label()
-        dialog.label.set_text(message)
-        dialog.vb.pack_start(dialog.label,True,True)
-        dialog.vb.pack_start(dialog.okb,False,False)
-        dialog.add(dialog.vb)
-        dialog.show_all()
-        
+        note = hildon.Note("information",
+                (self.mainWindow, message, gtk.STOCK_DIALOG_INFO))
+        note.set_modal(True)
+        def cleanup(*args):
+            note.destroy()
+        note.connect('response', cleanup)
+        note.show()
 
     def process_module_management(self,result):
         self.waitForModuleManagementFlag=False
@@ -1085,23 +1074,10 @@
 
     def prepareWaitingWindow(self):
         """self.mgModWindow"""
-        self.waitingWindow=hildon.Window()
-        self.waitingWindow.set_title("Waiting...")
-        self.waitingWindow.set_modal(True)
-        self.waitingWindow.set_transient_for(self.mgModWindow)
-        self.waitingWindow.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-        self.waitingWinVBox=gtk.VBox(False,0)
-
-        self.waitingWinLabel=gtk.Label()
-        self.waitingWinVBox.pack_start(self.waitingWinLabel,False,False)
-
         self.waitingWinProgressBar=gtk.ProgressBar()
-        self.waitingWinVBox.pack_start(self.waitingWinProgressBar,False,False)
-
-        self.waitingWindow.add(self.waitingWinVBox)
+        self.waitingWindow = hildon.Note("cancel_with_progress_bar",
+                (self.mainWindow, "Waiting...", self.waitingWinProgressBar))
         
-        #self.mgModWindow.set_default_size(450,300)
-        
     def on_key_press(self,widget,event):
         if event.keyval ==gtk.keysyms.F6:
             """Full screen key"""