Changeset 940aca7 in sasview for plottools


Ignore:
Timestamp:
May 19, 2012 12:17:02 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
baa915c
Parents:
d225e32
Message:

Merge 2.1.1 into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • plottools/src/danse/common/plottools/SizeDialog.py

    r10bfeb3 r940aca7  
    1010        textbox = wx.BoxSizer(wx.HORIZONTAL) 
    1111        hbox = wx.BoxSizer(wx.HORIZONTAL) 
    12         text1 = "Enter in a custom size (float values > 0 accepted)" 
     12        text1 = "Enter in a custom size (> 0 accepted)" 
    1313        msg = wx.StaticText(self, -1, text1, (30,15), style=wx.ALIGN_CENTRE) 
    1414        msg.SetLabel(text1) 
     
    1616         
    1717        textbox.Add(self.myTxtCtrl, flag=wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 
    18                  border=10, proportion=2) 
     18                 border=10) 
    1919        vbox.Add(msg, flag=wx.ALL, border=10, proportion=1) 
    2020        vbox.Add(textbox, flag=wx.EXPAND|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 
    2121                 border=10) 
    22         self.myTxtCtrl.SetValue(str(10)) 
     22        self.myTxtCtrl.SetValue(str(5)) 
    2323         
    2424        okButton = wx.Button(self, wx.ID_OK, 'OK', size=(70, 25)) 
Note: See TracChangeset for help on using the changeset viewer.