Merge lp:~fraser-waters08/spud/statusbar-loading into lp:spud

[Fraser Waters]

Loading a schema shows its location on the status bar.

Two points to be reviewed:
1) Is the change to the main diamond file OK? The removal of statusbar_clear is needed to stop the schema location being cleared, but what about in lining the initialize function.
2) Is the removal of statusbar_clear from on_select_row OK? The update of the treeview after loading a schema always seems to select no row, and thus trigger the clearing of the status bar.

[Patrick Farrell (pefarrell)]

Very nice!

The inlining of the initialise function is fine: it was originally split out so that it could be threaded, but threading it caused all sorts of bizarre behaviour, and I abandoned the idea.

One minor quibble: can you get rid of the '.' at the end of 'Schema ' + schemafile + ' already loaded.'? None of the other messages end in punctuation.

Other than that, it's perfect, I think!

[lp:~fraser-waters08/spud/statusbar-loading]

402. By Fraser Waters on 2011-07-04

Removed full stop from status bar message.

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2011-04-02 09:20:50 +0000
+++ diamond/bin/diamond	2011-07-04 13:59:33 +0000
@@ -206,14 +206,9 @@
 
   i = interface.Diamond(gladefile = gladefile, logofile = logofile, suffix = suffix)
 
-  def initialise(i, s, f):
-    i.open_file(schemafile = s, filename = f)
-    i.main_window.window.set_cursor(None)
-    i.statusbar.clear_statusbar()
-
-  i.statusbar.set_statusbar("Loading ...")
   i.main_window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
-  initialise(i, input_schemafile, input_filename)
+  i.open_file(schemafile = input_schemafile, filename = input_filename)
+  i.main_window.window.set_cursor(None)  
 
   gtk.main()
 

=== modified file 'diamond/diamond/interface.py'
--- diamond/diamond/interface.py	2011-07-04 09:57:05 +0000
+++ diamond/diamond/interface.py	2011-07-04 13:59:33 +0000
@@ -224,6 +224,7 @@
   def load_schema(self, schemafile):
     # so, if the schemafile has already been opened, then ..
     if schemafile == self.schemafile:
+      self.statusbar.set_statusbar('Schema ' + schemafile + ' already loaded')
       return
 
     # if we aren't using a http schema, and we're passed a relative filename, we
@@ -231,12 +232,16 @@
     if 'http' not in schemafile:
       schemafile = os.path.abspath(schemafile)
 
+    self.statusbar.set_statusbar('Loading schema from ' + schemafile)
+
     # now, let's try and read the schema.
     try:
       s_read = schema.Schema(schemafile)
       self.s = s_read
+      self.statusbar.set_statusbar('Loaded schema from ' + schemafile)
     except:
       dialogs.error_tb(self.main_window, "Unable to open schema file \"" + schemafile + "\"")
+      self.statusbar.clear_statusbar()
       return
 
     self.schemafile = schemafile
@@ -1175,7 +1180,6 @@
 
     path = self.get_selected_row(self.treeview.get_selection())
     if path is None:
-      self.statusbar.clear_statusbar()
       return
     iter = self.treestore.get_iter(path)
     choice_or_tree = self.treestore.get_value(iter, 2)