r11951 - /branches/bieri_gui/gui_bieri/components/spin_view.py -- December 22, 2010 - 17:30

Author: bugman
Date: Wed Dec 22 17:30:25 2010
New Revision: 11951

URL: http://svn.gna.org/viewcvs/relax?rev=11951&view=rev
Log:
create_subtitle() has been split into 2 to differentiate between subtitles 
and header text.

The new create_head_text() method is a duplication of create_subtitle().


Modified:
    branches/bieri_gui/gui_bieri/components/spin_view.py

Modified: branches/bieri_gui/gui_bieri/components/spin_view.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/components/spin_view.py?rev=11951&r1=11950&r2=11951&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/components/spin_view.py (original)
+++ branches/bieri_gui/gui_bieri/components/spin_view.py Wed Dec 22 17:30:25 
2010
@@ -83,8 +83,8 @@
         self.Refresh()
 
 
-    def create_subtitle(self, text):
-        """Generate the subtitle wx.StaticText object.
+    def create_head_text(self, text):
+        """Generate the wx.StaticText object for header text.
 
         @param text:    The text of the subtitle.
         @type text:     str
@@ -108,8 +108,8 @@
         return obj
 
 
-    def create_title(self, text):
-        """Generate the title wx.StaticText object.
+    def create_subtitle(self, text):
+        """Generate the subtitle wx.StaticText object.
 
         @param text:    The text of the subtitle.
         @type text:     str
@@ -117,6 +117,31 @@
         @rtype:         wx.StaticText instance
         """
 
+        # Unicode.
+        text = unicode(text)
+
+        # Fix for the '&' character.
+        text = replace(text, '&', '&&')
+
+        # The object.
+        obj = wx.StaticText(self, -1, text)
+
+        # Formatting.
+        obj.SetFont(wx.Font(pointSize=16, family=wx.FONTFAMILY_ROMAN, 
style=wx.ITALIC, weight=wx.NORMAL, face='Times'))
+
+        # Return the object.
+        return obj
+
+
+    def create_title(self, text):
+        """Generate the title wx.StaticText object.
+
+        @param text:    The text of the subtitle.
+        @type text:     str
+        @return:        The subtitle object.
+        @rtype:         wx.StaticText instance
+        """
+
         # The object.
         title = wx.StaticText(self, -1, text)
 
@@ -214,10 +239,10 @@
 
         # The info grid.
         grid_sizer = wx.FlexGridSizer(1, 2, 5, 50)
-        grid_sizer.Add(self.create_subtitle("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Molecule ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("'%s'" % self.mol_id), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Molecule ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("'%s'" % self.mol_id), 0, 
wx.ADJUST_MINSIZE, 0)
         text_sizer.Add(grid_sizer, 0, wx.LEFT, 0)
 
         # Add the text sizer to the main header sizer.
@@ -286,14 +311,14 @@
 
         # The info grid.
         grid_sizer = wx.FlexGridSizer(4, 2, 5, 50)
-        grid_sizer.Add(self.create_subtitle("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Residue number:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.res_num), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Residue name:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.res_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Residue ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("'%s'" % self.res_id), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Residue number:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.res_num), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Residue name:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.res_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Residue ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("'%s'" % self.res_id), 0, 
wx.ADJUST_MINSIZE, 0)
         text_sizer.Add(grid_sizer, 0, wx.LEFT, 0)
 
         # Add the text sizer to the main header sizer.
@@ -372,18 +397,18 @@
 
         # The info grid.
         grid_sizer = wx.FlexGridSizer(6, 2, 5, 50)
-        grid_sizer.Add(self.create_subtitle("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Residue number:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.res_num), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Residue name:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.res_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Spin number:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.spin_num), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Spin name:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle(self.spin_name), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("Spin ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
-        grid_sizer.Add(self.create_subtitle("'%s'" % self.spin_id), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Molecule:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.mol_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Residue number:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.res_num), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Residue name:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.res_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Spin number:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.spin_num), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Spin name:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text(self.spin_name), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("Spin ID string:"), 0, 
wx.ADJUST_MINSIZE, 0)
+        grid_sizer.Add(self.create_head_text("'%s'" % self.spin_id), 0, 
wx.ADJUST_MINSIZE, 0)
         text_sizer.Add(grid_sizer, 0, wx.LEFT, 0)
 
         # Add the text sizer to the main header sizer.
@@ -413,7 +438,7 @@
         sizer = wx.BoxSizer(wx.VERTICAL)
 
         # The title
-        title = self.create_subtitle("Spin container contents:")
+        title = self.create_subtitle("Spin container contents")
         sizer.Add(title, 0, wx.LEFT, 0)
 
         # Add a spacer.