Update of /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16907/orpg/gametree/nodehandlers
Modified Files:
Tag: BRANCH-1-7-1
minilib.py
Log Message:
Fix for the stupid buttons again
Index: minilib.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/orpg/gametree/nodehandlers/minilib.py,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** minilib.py 18 Apr 2007 23:41:01 -0000 1.24.2.1
--- minilib.py 21 Apr 2007 22:13:29 -0000 1.24.2.2
***************
*** 39,58 ****
# import scriptkit
- # GUI Constants
- # DLG_FRAME = 1
- # DLG_DIALOG = 2
- # DLG_MYMINIFRAME = 3
- # DLG_DEFAULT = 4
- LISTBOX_ID = wx.ID_ANY
- MINICOUNT_ID = wx.ID_ANY
- OK_BUTTON = wx.ID_ANY
- ADD_BUTTON = wx.ID_ANY
- CANCEL_BUTTON = wx.ID_ANY
- LAYER_MINIATURES = 'miniatures'
-
# Constants
! TO_MINILIB_MAP = { 'path' : 'url', 'label' : 'name', 'id' : None, 'action':None }
! FROM_MINILIB_MAP = { 'url' : 'path', 'name' : 'label', 'unique' : None, }
! CORE_ATTRIBUTES = [ 'name', 'url', 'unique', 'posy', 'posx', 'hide', 'face', 'heading', 'align', 'locked', 'width', 'height', ]
ATTRIBUTE_NAME = 'name'
--- 39,46 ----
# import scriptkit
# Constants
! TO_MINILIB_MAP = {'path':'url', 'label':'name', 'id':None, 'action':None}
! FROM_MINILIB_MAP = {'url':'path', 'name':'label', 'unique':None}
! CORE_ATTRIBUTES = ['name', 'url', 'unique', 'posy', 'posx', 'hide', 'face', 'heading', 'align', 'locked', 'width', 'height']
ATTRIBUTE_NAME = 'name'
***************
*** 296,308 ****
s = self.GetClientSizeTuple()
! self.sizer = wx.BoxSizer( wx.VERTICAL )
! box = wx.BoxSizer( wx.HORIZONTAL )
! self.listbox = wx.ListBox( self, LISTBOX_ID, ( 10, 10 ), (s[0] - 10,
! s[1] - 30 ), names, wx.LB_EXTENDED )
! self.count = wx.TextCtrl( self, MINICOUNT_ID, '1' )
box.Add( wx.StaticText( self, -1, 'Minis to add' ), 0, wx.EXPAND )
box.Add(wx.Size(10,10))
! box.Add( self.count, 1, wx.EXPAND )
self.sizer.Add( self.listbox, 1, wx.EXPAND )
--- 284,295 ----
s = self.GetClientSizeTuple()
! self.sizer = wx.BoxSizer(wx.VERTICAL)
! box = wx.BoxSizer(wx.HORIZONTAL)
! self.listbox = wx.ListBox(self, wx.ID_ANY, (10, 10), (s[0] - 10, s[1] - 30 ), names, wx.LB_EXTENDED)
! self.count = wx.TextCtrl(self, wx.ID_ANY, '1')
box.Add( wx.StaticText( self, -1, 'Minis to add' ), 0, wx.EXPAND )
box.Add(wx.Size(10,10))
! box.Add(self.count, 1, wx.EXPAND)
self.sizer.Add( self.listbox, 1, wx.EXPAND )
***************
*** 310,322 ****
box = wx.BoxSizer( wx.HORIZONTAL )
! box.Add( wx.Button( self, OK_BUTTON, 'Add' ), 0, wx.EXPAND )
! box.Add( wx.Button( self, ADD_BUTTON, 'Add No Label' ), 0, wx.EXPAND )
! box.Add( wx.Button( self, CANCEL_BUTTON, 'Done' ), 0, wx.EXPAND )
self.sizer.Add(wx.Size(10,10))
! self.sizer.Add( box, 0, wx.EXPAND )
! self.Bind(wx.EVT_BUTTON, self.on_ok, id=OK_BUTTON)
! self.Bind(wx.EVT_BUTTON, self.on_ok, id=ADD_BUTTON)
! self.Bind(wx.EVT_BUTTON, self.on_close, id=CANCEL_BUTTON)
self.SetSizer(self.sizer)
self.SetAutoLayout(True)
--- 297,312 ----
box = wx.BoxSizer( wx.HORIZONTAL )
! self.okBtn = wx.Button(self, wx.ID_ANY, 'Add')
! box.Add(self.okBtn, 0, wx.EXPAND)
! self.addBtn = wx.Button(self, wx.ID_ANY, 'Add No Label')
! box.Add(self.addBtn, 0, wx.EXPAND)
! self.cancleBtn = wx.Button(self, wx.ID_ANY, 'Done')
! box.Add(self.cancleBtn, 0, wx.EXPAND)
self.sizer.Add(wx.Size(10,10))
! self.sizer.Add(box, 0, wx.EXPAND)
! self.Bind(wx.EVT_BUTTON, self.on_ok, self.okBtn)
! self.Bind(wx.EVT_BUTTON, self.on_ok, self.addBtn)
! self.Bind(wx.EVT_BUTTON, self.on_close, self.cancleBtn)
self.SetSizer(self.sizer)
self.SetAutoLayout(True)
|
