Added wxPython wrappers for the new wx.Treebook and wx.Toolbook
classes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,8 +14,7 @@ pageTexts = [ "Yet",
|
||||
|
||||
class TestCB(wx.Choicebook):
|
||||
def __init__(self, parent, id, log):
|
||||
wx.Choicebook.__init__(self, parent, id
|
||||
)
|
||||
wx.Choicebook.__init__(self, parent, id)
|
||||
self.log = log
|
||||
|
||||
# Now make a bunch of panels for the choice book
|
||||
|
@@ -14,11 +14,11 @@ colourList = [ "Aquamarine", "Black", "Blue", "Blue Violet", "Brown", "Cadet Blu
|
||||
class TestLB(wx.Listbook):
|
||||
def __init__(self, parent, id, log):
|
||||
wx.Listbook.__init__(self, parent, id, style=
|
||||
wx.LB_DEFAULT
|
||||
#wxLB_TOP
|
||||
#wxLB_BOTTOM
|
||||
#wxLB_LEFT
|
||||
#wxLB_RIGHT
|
||||
wx.BK_DEFAULT
|
||||
#wx.BK_TOP
|
||||
#wx.BK_BOTTOM
|
||||
#wx.BK_LEFT
|
||||
#wx.BK_RIGHT
|
||||
)
|
||||
self.log = log
|
||||
|
||||
|
@@ -47,13 +47,8 @@ import images
|
||||
_treeList = [
|
||||
# new stuff
|
||||
('Recent Additions/Updates', [
|
||||
'FoldPanelBar',
|
||||
'GIFAnimationCtrl',
|
||||
'HyperLinkCtrl',
|
||||
'MultiSplitterWindow',
|
||||
'Throbber',
|
||||
'GetMouseState',
|
||||
'FloatCanvas',
|
||||
'Treebook',
|
||||
'Toolbook',
|
||||
]),
|
||||
|
||||
# managed windows == things with a (optional) caption you can close
|
||||
@@ -94,7 +89,6 @@ _treeList = [
|
||||
'CheckBox',
|
||||
'CheckListBox',
|
||||
'Choice',
|
||||
'Choicebook',
|
||||
'ComboBox',
|
||||
'Gauge',
|
||||
'Grid',
|
||||
@@ -103,9 +97,7 @@ _treeList = [
|
||||
'ListCtrl',
|
||||
'ListCtrl_virtual',
|
||||
'ListCtrl_edit',
|
||||
'Listbook',
|
||||
'Menu',
|
||||
'Notebook',
|
||||
'PopupMenu',
|
||||
'PopupWindow',
|
||||
'RadioBox',
|
||||
@@ -127,6 +119,14 @@ _treeList = [
|
||||
'TreeCtrl',
|
||||
'Validator',
|
||||
]),
|
||||
|
||||
('"Book" Controls', [
|
||||
'Choicebook',
|
||||
'Listbook',
|
||||
'Notebook',
|
||||
'Toolbook',
|
||||
'Treebook',
|
||||
]),
|
||||
|
||||
('Custom Controls', [
|
||||
'AnalogClockWindow',
|
||||
|
@@ -13,12 +13,13 @@ import images
|
||||
|
||||
class TestNB(wx.Notebook):
|
||||
def __init__(self, parent, id, log):
|
||||
wx.Notebook.__init__(self, parent, id, size=(21,21),
|
||||
#style=
|
||||
#wx.NB_TOP # | wx.NB_MULTILINE
|
||||
#wx.NB_BOTTOM
|
||||
#wx.NB_LEFT
|
||||
#wx.NB_RIGHT
|
||||
wx.Notebook.__init__(self, parent, id, size=(21,21), style=
|
||||
wx.BK_DEFAULT
|
||||
#wx.BK_TOP
|
||||
#wx.BK_BOTTOM
|
||||
#wx.BK_LEFT
|
||||
#wx.BK_RIGHT
|
||||
# | wx.NB_MULTILINE
|
||||
)
|
||||
self.log = log
|
||||
|
||||
|
109
wxPython/demo/Toolbook.py
Normal file
109
wxPython/demo/Toolbook.py
Normal file
@@ -0,0 +1,109 @@
|
||||
|
||||
import wx
|
||||
|
||||
import ColorPanel
|
||||
import images
|
||||
|
||||
colourList = [ "Aquamarine", "Grey", "Blue", "Blue Violet", "Brown", "Cadet Blue",
|
||||
"Coral", "Wheat", #"Cyan", "Dark Grey", "Dark Green",
|
||||
#"Steel Blue",
|
||||
]
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
def getNextImageID(count):
|
||||
imID = 0
|
||||
while True:
|
||||
yield imID
|
||||
imID += 1
|
||||
if imID == count:
|
||||
imID = 0
|
||||
|
||||
|
||||
class TestTB(wx.Toolbook):
|
||||
def __init__(self, parent, id, log):
|
||||
wx.Toolbook.__init__(self, parent, id, style=
|
||||
wx.BK_DEFAULT
|
||||
#wx.BK_TOP
|
||||
#wx.BK_BOTTOM
|
||||
#wx.BK_LEFT
|
||||
#wx.BK_RIGHT
|
||||
)
|
||||
self.log = log
|
||||
|
||||
# make an image list using the LBXX images
|
||||
il = wx.ImageList(32, 32)
|
||||
for x in range(12):
|
||||
f = getattr(images, 'getLB%02dBitmap' % (x+1))
|
||||
bmp = f()
|
||||
il.Add(bmp)
|
||||
self.AssignImageList(il)
|
||||
imageIdGenerator = getNextImageID(il.GetImageCount())
|
||||
|
||||
# Now make a bunch of panels for the list book
|
||||
first = True
|
||||
for colour in colourList:
|
||||
win = self.makeColorPanel(colour)
|
||||
self.AddPage(win, colour, imageId=imageIdGenerator.next())
|
||||
if first:
|
||||
st = wx.StaticText(win.win, -1,
|
||||
"You can put nearly any type of window here,\n"
|
||||
"and the toolbar can be on either side of the Toolbook",
|
||||
wx.Point(10, 10))
|
||||
first = False
|
||||
|
||||
self.Bind(wx.EVT_TOOLBOOK_PAGE_CHANGED, self.OnPageChanged)
|
||||
self.Bind(wx.EVT_TOOLBOOK_PAGE_CHANGING, self.OnPageChanging)
|
||||
|
||||
|
||||
def makeColorPanel(self, color):
|
||||
p = wx.Panel(self, -1)
|
||||
win = ColorPanel.ColoredPanel(p, color)
|
||||
p.win = win
|
||||
def OnCPSize(evt, win=win):
|
||||
win.SetSize(evt.GetSize())
|
||||
p.Bind(wx.EVT_SIZE, OnCPSize)
|
||||
return p
|
||||
|
||||
|
||||
def OnPageChanged(self, event):
|
||||
old = event.GetOldSelection()
|
||||
new = event.GetSelection()
|
||||
sel = self.GetSelection()
|
||||
self.log.write('OnPageChanged, old:%d, new:%d, sel:%d\n' % (old, new, sel))
|
||||
event.Skip()
|
||||
|
||||
def OnPageChanging(self, event):
|
||||
old = event.GetOldSelection()
|
||||
new = event.GetSelection()
|
||||
sel = self.GetSelection()
|
||||
self.log.write('OnPageChanging, old:%d, new:%d, sel:%d\n' % (old, new, sel))
|
||||
event.Skip()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
def runTest(frame, nb, log):
|
||||
testWin = TestTB(nb, -1, log)
|
||||
return testWin
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
||||
overview = """\
|
||||
<html><body>
|
||||
<h2>wx.Toolbook</h2>
|
||||
<p>
|
||||
This class is a control similar to a notebook control, but with a
|
||||
wx.Toolbar instead of a set of tabs.
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
import sys,os
|
||||
import run
|
||||
run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
|
||||
|
||||
|
||||
|
114
wxPython/demo/Treebook.py
Normal file
114
wxPython/demo/Treebook.py
Normal file
@@ -0,0 +1,114 @@
|
||||
|
||||
import wx
|
||||
|
||||
import ColorPanel
|
||||
import images
|
||||
|
||||
colourList = [ "Aquamarine", "Grey", "Blue", "Blue Violet", "Brown", "Cadet Blue",
|
||||
"Coral", "Wheat", "Cyan", "Dark Grey", "Dark Green",
|
||||
"Steel Blue",
|
||||
]
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
def getNextImageID(count):
|
||||
imID = 0
|
||||
while True:
|
||||
yield imID
|
||||
imID += 1
|
||||
if imID == count:
|
||||
imID = 0
|
||||
|
||||
|
||||
class TestTB(wx.Treebook):
|
||||
def __init__(self, parent, id, log):
|
||||
wx.Treebook.__init__(self, parent, id, style=
|
||||
wx.BK_DEFAULT
|
||||
#wx.BK_TOP
|
||||
#wx.BK_BOTTOM
|
||||
#wx.BK_LEFT
|
||||
#wx.BK_RIGHT
|
||||
)
|
||||
self.log = log
|
||||
|
||||
# make an image list using the LBXX images
|
||||
il = wx.ImageList(32, 32)
|
||||
for x in range(12):
|
||||
f = getattr(images, 'getLB%02dBitmap' % (x+1))
|
||||
bmp = f()
|
||||
il.Add(bmp)
|
||||
self.AssignImageList(il)
|
||||
imageIdGenerator = getNextImageID(il.GetImageCount())
|
||||
|
||||
# Now make a bunch of panels for the list book
|
||||
first = True
|
||||
for colour in colourList:
|
||||
win = self.makeColorPanel(colour)
|
||||
self.AddPage(win, colour, imageId=imageIdGenerator.next())
|
||||
if first:
|
||||
st = wx.StaticText(win.win, -1,
|
||||
"You can put nearly any type of window here,\n"
|
||||
"and the wx.TreeCtrl can be on either side of the\n"
|
||||
"Treebook",
|
||||
wx.Point(10, 10))
|
||||
first = False
|
||||
|
||||
win = self.makeColorPanel(colour)
|
||||
st = wx.StaticText(win.win, -1, "this is a sub-page", (10,10))
|
||||
self.AddSubPage(win, 'a sub-page', imageId=imageIdGenerator.next())
|
||||
|
||||
self.Bind(wx.EVT_TREEBOOK_PAGE_CHANGED, self.OnPageChanged)
|
||||
self.Bind(wx.EVT_TREEBOOK_PAGE_CHANGING, self.OnPageChanging)
|
||||
|
||||
|
||||
def makeColorPanel(self, color):
|
||||
p = wx.Panel(self, -1)
|
||||
win = ColorPanel.ColoredPanel(p, color)
|
||||
p.win = win
|
||||
def OnCPSize(evt, win=win):
|
||||
win.SetSize(evt.GetSize())
|
||||
p.Bind(wx.EVT_SIZE, OnCPSize)
|
||||
return p
|
||||
|
||||
|
||||
def OnPageChanged(self, event):
|
||||
old = event.GetOldSelection()
|
||||
new = event.GetSelection()
|
||||
sel = self.GetSelection()
|
||||
self.log.write('OnPageChanged, old:%d, new:%d, sel:%d\n' % (old, new, sel))
|
||||
event.Skip()
|
||||
|
||||
def OnPageChanging(self, event):
|
||||
old = event.GetOldSelection()
|
||||
new = event.GetSelection()
|
||||
sel = self.GetSelection()
|
||||
self.log.write('OnPageChanging, old:%d, new:%d, sel:%d\n' % (old, new, sel))
|
||||
event.Skip()
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
def runTest(frame, nb, log):
|
||||
testWin = TestTB(nb, -1, log)
|
||||
return testWin
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
||||
overview = """\
|
||||
<html><body>
|
||||
<h2>wx.Treebook</h2>
|
||||
<p>
|
||||
This class is a control similar to a notebook control, but with a
|
||||
wx.TreeCtrl instead of a set of tabs.
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
import sys,os
|
||||
import run
|
||||
run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user