Changeset 649806d in sasview for src/sas

Timestamp:

Jul 3, 2015 11:39:50 PM (9 years ago)

Author:

butler

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1170492

Parents:

805f07a

Message:

Fix add text panel in plot panel. Wx 3.0 no longer recognizes -1 as a
proportion.

File:

• src/sas/plottools/TextDialog.py (modified) (7 diffs)

src/sas/plottools/TextDialog.py

@@ -8 +8 @@
     FONT_VARIANT = 1
     PNL_WIDTH = 500
-FAMILY = ['serif', 'sas-serif', 'fantasy', 'monospace']
+FAMILY = ['serif', 'sans-serif', 'fantasy', 'monospace']
 SIZE = [8, 9, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72]
 STYLE = ['normal', 'italic']
@@ -20 +20 @@
         Dialog window pops- up when selecting 'Add Text' on the toolbar
         """
-        wx.Dialog.__init__(self, parent, id, title, size=(PNL_WIDTH, 280))
+        wx.Dialog.__init__(self, parent, id, title, size=(PNL_WIDTH, 300))
         self.parent = parent
         # Font
@@ -35 +35 @@
         text_box = wx.BoxSizer(wx.HORIZONTAL)
         sizer = wx.GridBagSizer(1, 3)
-        _BOX_WIDTH = 60
-        font_description = wx.StaticBox(self, -1, 'Font', size=(PNL_WIDTH - 20, 70))
+        _BOX_WIDTH = 70
+        font_description = wx.StaticBox(self, -1, 'Font')
         font_box = wx.StaticBoxSizer(font_description, wx.VERTICAL)
         family_box = wx.BoxSizer(wx.HORIZONTAL)
@@ -103 +103 @@
         self.font_style.SetToolTipString("Font style of the text.")
         # font color
-        self.font_color = wx.ComboBox(self, -1, style=wx.CB_READONLY)
+        self.font_color = wx.ComboBox(self, -1, style = wx.CB_READONLY)
         wx.EVT_COMBOBOX(self.font_color, -1, self.on_color)
         self.font_color.SetMinSize((_BOX_WIDTH, -1))
@@ -111 +111 @@
         # Buttons on the bottom
         self.static_line_1 = wx.StaticLine(self, -1)
-        self.ok_button = wx.Button(self, wx.ID_OK, 'OK', size=(_BOX_WIDTH, 25))
-        self.close_button = wx.Button(self, wx.ID_CANCEL, 'Cancel', size=(_BOX_WIDTH, 25))
+        self.ok_button = wx.Button(self, wx.ID_OK, 'OK',
+                                   size = (_BOX_WIDTH, 25))
+        self.close_button = wx.Button(self, wx.ID_CANCEL, 'Cancel',
+                                      size = (_BOX_WIDTH, 25))
 
         # Intro
@@ -121 +123 @@
         sizer.Add(wx.StaticText(self, -1, explanation), (iy, ix),
                   (1, 1), wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-        family_box.Add(wx.StaticText(self, -1, 'Family :'), -1, 0)
-        family_box.Add(self.font_family, -1, 0)
+        family_box.Add(wx.StaticText(self, -1, 'Family :', size = (50, -1)),
+                       0, wx.TOP, 5)
+        family_box.Add(self.font_family, 0, 0)
         family_box.Add((_BOX_WIDTH / 2, -1))
-        family_box.Add(wx.StaticText(self, -1, 'Size :'), -1, 0)
-        family_box.Add(self.font_size, -1, 0)
+        family_box.Add(wx.StaticText(self, -1, 'Size :', size = (50, -1)),
+                       0, wx.TOP, 5)
+        family_box.Add(self.font_size, 0, 0)
         if unit_box != None:
             family_box.Add((_BOX_WIDTH / 2, -1))
-            family_box.Add(tick_label_text, -1, 0)
-            family_box.Add(self.tick_label_check, -1, 0)
-        style_box.Add(wx.StaticText(self, -1, 'Style :'), -1, 0)
-        style_box.Add(self.font_style, -1, 0)
+            family_box.Add(tick_label_text, 0, 0)
+            family_box.Add(self.tick_label_check, 0, 0)
+        style_box.Add(wx.StaticText(self, -1, 'Style :', size = (50, -1)),
+                      0, wx.TOP, 5)
+        style_box.Add(self.font_style, 0, 0)
         style_box.Add((_BOX_WIDTH / 2, -1))
-        style_box.Add(wx.StaticText(self, -1, 'Weight :'), -1, 0)
-        style_box.Add(self.font_weight, -1, 0)
+        style_box.Add(wx.StaticText(self, -1, 'Weight :', size = (50, -1)),
+                      0, wx.TOP, 5)
+        style_box.Add(self.font_weight, 0, 0)
         style_box.Add((_BOX_WIDTH / 2, -1))
-        style_box.Add(wx.StaticText(self, -1, 'Color :'), -1, 0)
-        style_box.Add(self.font_color, -1, 0)
-        font_box.Add(family_box, -1, 10)
-        font_box.Add(style_box, -1, 10)
+        style_box.Add(wx.StaticText(self, -1, 'Color :', size = (45, -1)),
+                      0, wx.TOP, 5)
+        style_box.Add(self.font_color, 0, 0)
+        font_box.Add(family_box, 0, 10)
+        font_box.Add((0,5))
+        font_box.Add(style_box, 0, 10)
         iy += 1
         ix = 0
@@ -152 +160 @@
         vbox.Add(text_box, 0, wx.EXPAND, 15)
         if unit_box != None:
-            unit_box.Add(unit_text, -1, 0)
-            unit_box.Add(self.unit_ctrl, -1, 0)
+            unit_box.Add(unit_text, 0, 0)
+            unit_box.Add(self.unit_ctrl, 0, 0)
             vbox.Add((5, 5))
             vbox.Add(unit_box, 0, wx.LEFT, 15)