Merge lp:~fraser-waters08/spud/diamond-improvements into lp:spud

[Fraser Waters]

Fixes for bugs
#784587: Diamond: default sizing of right-hand side pane is quite annoying
#784589: Diamond: storing data when editing python code moves the widget up to the top of the code
#784592: Diamond: font sizing is fixed
#785090: Diamond forks on launch
#804334: Picks up pesky NFS dot files from the schemata folder

Each fix is in it's own revision.

[lp:~fraser-waters08/spud/diamond-improvements]

407. By Fraser Waters on 2011-07-05

Fix up accidental revert.

[Patrick Farrell (pefarrell)]

Hi Fraser,

I really like how the attribute window disappears when there are no attributes. But is it possible to change the packing of the data entry widget so that it expands to fill the available space? At the minute, it leaves lots of grey space between the widgets, which looks a little ugly.

Aside from that it all looks great!

Patrick

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2011-07-04 13:15:21 +0000
+++ diamond/bin/diamond	2011-07-05 13:56:23 +0000
@@ -45,6 +45,7 @@
                "Options:\n" + \
                "\n" + \
                "-h               Display this message\n" + \
+               "-f               Forks at startup\n" + \
                "-s [SCHEMAFILE]  Use the supplied schema file *\n" + \
                "-t [TRONFILE]    Use the supplied schematron file for extended validation\n" + \
                "-v               Verbosity switch - if supplied Diamond prints additional\n" + \
@@ -57,21 +58,8 @@
 
 def main():
 
-  # Detach from controlling terminal
-  try:
-    pid = os.fork()
-    if pid == 0:
-      os.setsid()
-      pid = os.fork()
-      if pid != 0:
-        os._exit(0)
-    else:
-      os._exit(0)
-  except:
-    pass
-
-  try:
-    opts, args = getopt.getopt(sys.argv[1:], "hvs:t:")
+  try:
+    opts, args = getopt.getopt(sys.argv[1:], "hvfs:t:")
   except:
     Help()
     sys.exit(1)
@@ -85,6 +73,19 @@
   if ("-h", "") in opts:
     Help()
     return
+  if ("-f", "") in opts:
+    # Detach from controlling terminal
+    try:
+      pid = os.fork()
+      if pid == 0:
+        os.setsid()
+        pid = os.fork()
+        if pid != 0:
+          os._exit(0)
+      else:
+        os._exit(0)
+    except:
+      pass
 
   import diamond.config as config
   import diamond.dialogs as dialogs
 
=== modified file 'diamond/diamond/config.py'
--- diamond/diamond/config.py	2010-11-11 14:15:01 +0000
+++ diamond/diamond/config.py	2011-07-05 13:56:23 +0000
@@ -34,7 +34,7 @@
 for dir in dirs:
   try:
     for file in os.listdir(dir):
-      if file[-1] == "~": 
+      if file[-1] == "~" or file[0] == ".": #skip files like .nfs0000 
         continue # bloody emacs
       # Skip item gracefully here if there's a problem.
       # This is useful if the schemata files are in a subversion
 
=== modified file 'diamond/diamond/interface.py'
--- diamond/diamond/interface.py	2011-07-04 14:49:07 +0000
+++ diamond/diamond/interface.py	2011-07-05 13:56:23 +0000
@@ -1965,6 +1965,8 @@
 
     self.update_node_comment()
 
+    self.gui.get_widget("optionsFrame").queue_resize()
+    
     return
 
   def node_desc_mouse_over(self, widget, event):
@@ -2047,17 +2049,16 @@
     Update the RHS attributes widget.
     """
 
-    iter = self.node_attrs.get_model().get_iter_first()
-    while iter is not None:
-      next_iter = self.node_attrs.get_model().iter_next(iter)
-      self.node_attrs.get_model().remove(iter)
-      iter = next_iter
+    self.node_attrs.get_model().clear()
 
     if self.selected_node is None:
       self.node_attrs.get_column(2).set_property("visible", False)
       self.node_attrs.get_column(0).queue_resize()
       self.node_attrs.get_column(1).queue_resize()
+    elif len(self.selected_node.attrs.keys()) == 0:
+      self.gui.get_widget("attributeFrame").set_property("visible", False)
     else:
+      self.gui.get_widget("attributeFrame").set_property("visible", True)
       for key in self.selected_node.attrs.keys():
         iter = self.node_attrs.get_model().append()
         self.node_attrs.get_model().set_value(iter, 0, key)
@@ -2605,9 +2606,6 @@
     else:
       store_success = self.node_data_entry_store()
 
-    if store_success:
-      self.node_data_revert()
-
     if self.scherror.errlist_is_open():
       if self.scherror.errlist_type == 0:
          self.scherror.on_validate_schematron()
 
=== modified file 'diamond/gui/gui.glade'
--- diamond/gui/gui.glade	2009-06-09 10:29:16 +0000
+++ diamond/gui/gui.glade	2011-07-05 13:56:23 +0000
@@ -298,7 +298,6 @@
                                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                 <child>
                                   <widget class="GtkTextView" id="nodeDescription">
-                                    <property name="height_request">50</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -322,7 +321,7 @@
                             </child>
                           </widget>
                           <packing>
-                            <property name="resize">False</property>
+                            <property name="resize">True</property>
                             <property name="shrink">False</property>
                           </packing>
                         </child>
@@ -350,7 +349,6 @@
                                         <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                         <child>
                                           <widget class="GtkTreeView" id="nodeAttributes">
-                                            <property name="height_request">50</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -371,7 +369,10 @@
                                     </child>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="padding">2</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -394,6 +395,7 @@
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="padding">2</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -452,7 +454,6 @@
                                     <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                                     <child>
                                       <widget class="GtkTextView" id="nodeComment">
-                                        <property name="height_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>