[Pkg-bazaar-commits] ./bzr-gtk/unstable r293: Merge status for viz by Gary.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 293
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2007-10-03 21:24:20 +0200
message:
  Merge status for viz by Gary.
modified:
  NEWS
  viz/branchwin.py
    ------------------------------------------------------------
    revno: 280.2.1
    committer: Gary van der Merwe <garyvdm at gmail.com>
    branch nick: gtk
    timestamp: Mon 2007-09-24 12:50:52 +0200
    message:
      Add a message to the viz window to indicate that graph is still loading.
    modified:
      NEWS
      viz/branchwin.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-10-02 17:23:52 +0000
+++ b/NEWS	2007-10-03 19:24:20 +0000
@@ -37,6 +37,8 @@
 
   * Added keyboard shortcuts for closing windows and exiting Olive.
     (#139559, Daniel Schierbeck)
+  * Add a message to the viz window to indicate that the graph is still loading.
+    (Gary van der Merwe)
  
   * The tip revision will be automatically selected in the branch visualization
     window. (#144244, Daniel Schierbeck)

=== modified file 'viz/branchwin.py'
--- a/viz/branchwin.py	2007-10-01 08:19:05 +0000
+++ b/viz/branchwin.py	2007-10-03 19:24:20 +0000
@@ -59,7 +59,8 @@
         self.add(vbox)
 
         vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
-
+        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
+        
         paned = gtk.VPaned()
         paned.pack1(self.construct_top(), resize=True, shrink=False)
         paned.pack2(self.construct_bottom(), resize=False, shrink=True)
@@ -68,6 +69,24 @@
         vbox.set_focus_child(paned)
 
         vbox.show()
+    
+    def construct_loading_msg(self):
+        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
+                                                 gtk.ICON_SIZE_BUTTON)
+        image_loading.show()
+        
+        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
+        label_loading.set_alignment(0.0, 0.5)        
+        label_loading.show()
+        
+        self.loading_msg_box = gtk.HBox()
+        self.loading_msg_box.set_spacing(5)
+        self.loading_msg_box.set_border_width(5)        
+        self.loading_msg_box.pack_start(image_loading, False, False)
+        self.loading_msg_box.pack_start(label_loading, True, True)
+        self.loading_msg_box.show()
+        
+        return self.loading_msg_box
 
     def construct_top(self):
         """Construct the top-half of the window."""
@@ -205,6 +224,7 @@
         self.index = index
         self.treeview.set_model(self.model)
         self.treeview.get_selection().select_path(0)
+        self.loading_msg_box.hide()
         return False
     
     def _on_key_pressed(self, widget, event):