Changeset b618b7f in sasview

Timestamp:

Jun 28, 2012 9:02:34 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

d87e533

Parents:

ce3feca

Message:

Small UI changes in plot appearance dialog.

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/local_perspectives/plotting/appearanceDialog.py

@@ -3 +3 @@
 """
 
-Appearance of graph symbols and legend label dialog.
+Dialog for appearance of plot symbols, color, size etc.
 
 
@@ -27 +27 @@
 
     def __init__(self,parent,title):
-        super(appearanceDialog,self).__init__(parent, title=title,size=(570,400))
+        super(appearanceDialog,self).__init__(parent, title=title,size=(570,430))
 
         self.okay_clicked = False
@@ -75 +75 @@
         self.sizeCustomButton = wx.Button(panel, label='Custom...')
         self.sizeCustomButton.Bind(wx.EVT_BUTTON, self.customSize)
-        self.labelTextBox = wx.TextCtrl(panel,-1, "",size=(180,-1))
+        self.labelTextBox = wx.TextCtrl(panel,-1, "",size=(-1,-1))
 
         # buttons
@@ -84 +84 @@
 
         # now Add all the widgets to relevant spacer - tricky
-        ivbox1.Add(symbolText, flag =  wx.TOP | wx.LEFT | wx.ALIGN_LEFT ,border=10)
-        ivbox1.Add(self.symbolListBox, flag = wx.TOP | wx.LEFT | wx.ALIGN_LEFT ,border=10)
-
-        ihbox1.Add(sizeText, flag = wx.TOP | wx.LEFT | wx.ALIGN_LEFT , border=10)
-        ihbox1.Add((20,-1))
-        ihbox1.Add(self.sizeComboBox, flag =  wx.TOP | wx.LEFT | wx.ALIGN_LEFT , border=10)
-        ihbox1.Add((20,-1))
-        ihbox1.Add(self.sizeCustomButton, flag = wx.ALIGN_LEFT | wx.TOP, border=10)
-
-        ihbox2.Add(colorText,flag = wx.TOP |  wx.LEFT | wx.ALIGN_LEFT, border=10)
-        ihbox2.Add((20,-1))
-        ihbox2.Add(self.colorListBox, flag = wx.TOP | wx.LEFT | wx.ALIGN_LEFT, border=10)
-
-
-
-        ivbox2.Add(ihbox1, flag =  wx.TOP | wx.ALIGN_RIGHT,border=10)
-        ivbox2.Add(ihbox2, flag =  wx.TOP | wx.ALIGN_RIGHT,border=10)
+        ivbox1.Add(symbolText, flag =  wx.ALL  | wx.ALIGN_LEFT ,border=10)
+        ivbox1.Add(self.symbolListBox, flag = wx.ALL | wx.ALIGN_LEFT ,border=10)
+
+        ihbox1.Add(sizeText, flag = wx.ALL| wx.ALIGN_LEFT , border=10)
+        ihbox1.Add(self.sizeComboBox, flag =  wx.ALL | wx.ALIGN_LEFT , border=10)
+        ihbox1.Add(self.sizeCustomButton, flag = wx.ALIGN_LEFT | wx.ALL, border=10)
+
+        ihbox2.Add(colorText,flag = wx.ALL | wx.ALIGN_LEFT, border=10)
+        ihbox2.Add(self.colorListBox, flag = wx.ALL  | wx.ALIGN_LEFT, border=10)
+
+
+
+        ivbox2.Add(ihbox1, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
+        ivbox2.Add(ihbox2, flag =  wx.ALL | wx.ALIGN_RIGHT,border=10)
 
         
-        hbox1.Add((5,-1))
         hbox1.Add(ivbox1,flag =  wx.EXPAND | wx.ALIGN_LEFT ,border=10)
-        hbox1.Add((5,-1))
         hbox1.Add(ivbox2,flag =  wx.EXPAND | wx.ALIGN_RIGHT ,border=10)
-        hbox1.Add((5,-1))
 
    
-        hbox2.Add(OkButton, flag = wx.RIGHT |  wx.ALIGN_RIGHT, border=10)
-        hbox2.Add(cancelButton, flag = wx.RIGHT | wx.ALIGN_RIGHT, border=10)
-
-        hbox3.Add(labelText, flag= wx.TOP | wx.LEFT | wx.ALIGN_LEFT, border=10)
-        hbox3.Add((20,-1))
-        hbox3.Add(self.labelTextBox, wx.TOP |wx.ALIGN_LEFT | wx.LEFT , border=10)
-        hbox3.Add((20,-1))
+        hbox2.Add(OkButton, flag = wx.ALL |  wx.ALIGN_RIGHT, border=10)
+        hbox2.Add(cancelButton, flag = wx.ALL | wx.ALIGN_RIGHT, border=10)
+
+        hbox3.Add(labelText, flag= wx.EXPAND | wx.ALL |  wx.ALIGN_LEFT, border=10)
+        hbox3.Add(self.labelTextBox, wx.EXPAND | wx.ALL |wx.ALIGN_LEFT , border=10)
   
-        vbox.Add((20,-1))
-        symbolStaticBoxSizer.Add(hbox1,flag = wx.TOP | wx.EXPAND,border=10)
-        vbox.Add(symbolStaticBoxSizer, flag = wx.TOP | wx.EXPAND,border=10)
-
-        vbox.Add((-1,20))
-        vbox.Add(hbox3,flag = wx.BOTTOM  | wx.ALIGN_RIGHT, border=20)
-
-
-        vbox.Add(hbox2,flag = wx.BOTTOM  | wx.ALIGN_RIGHT, border=20)
+        symbolStaticBoxSizer.Add(hbox1,flag = wx.ALL | wx.EXPAND,border=10)
+        vbox.Add(symbolStaticBoxSizer, flag = wx.ALL | wx.EXPAND,border=10)
+
+        vbox.Add(hbox3,flag = wx.ALL | wx.EXPAND | wx.ALIGN_RIGHT, border=10)
+
+
+        vbox.Add(hbox2,flag = wx.ALL  | wx.ALIGN_RIGHT, border=10)