X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76bfdc78167914a4e9bc762d031a08a3e0601bd7..342639eb749237f29517ce1598406c936690df56:/wxPython/demo/Main.py?ds=sidebyside
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 228f428b94..b53d83aace 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,9 +11,8 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
-import sys, os, time
+import sys, os, time, string
from wxPython.wx import *
-from wxPython.lib.splashscreen import SplashScreen
from wxPython.html import wxHtmlWindow
import images
@@ -22,12 +21,10 @@ import images
_treeList = [
- ('New since last release', ['ContextHelp',
- 'PyCrust',
- 'PyCrustWithFilling',
- 'VirtualListCtrl',
- 'wxListCtrl',
- 'TablePrint',
+ ('New since last release', ['wxGenericDirCtrl',
+ 'wxImageFromStream',
+ 'RowColSizer',
+ 'Unicode',
]),
('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
@@ -35,29 +32,39 @@ _treeList = [
'wxScrolledWindow', 'wxSplitterWindow',
'wxStatusBar', 'wxNotebook',
'wxHtmlWindow',
- 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),
+ 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',
+ 'wxPopupWindow',
+ 'wxDynamicSashWindow',
+ ]),
('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
'wxSingleChoiceDialog', 'wxTextEntryDialog',
'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
- 'wxMessageDialog', 'wxProgressDialog']),
+ 'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog',
+ ]),
('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
- 'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
+ 'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
+ 'wxTextCtrl',
'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
'wxCalendarCtrl', 'wxToggleButton',
+ 'wxEditableListBox', 'wxLEDNumberCtrl',
]),
- ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']),
+ ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource',
+ 'RowColSizer',
+ ]),
- ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
+ ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop',
+ 'FontEnumerator',
'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
'PythonEvents', 'Threads',
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
- 'wxJoystick',
+ 'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
+ 'ContextHelp', 'SplitTree', 'Unicode',
]),
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
@@ -65,10 +72,15 @@ _treeList = [
'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
'FileBrowseButton', 'GenericButtons', 'wxEditor',
'ColourSelect', 'ImageBrowser',
- 'infoframe', 'ColourDB', 'PyCrust', 'TablePrint',
+ 'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+ 'TablePrint',
+ 'wxRightTextCtrl',
]),
- ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
+ ('Cool Contribs', ['pyTree', 'hangman',
+ #'SlashDot',
+ 'XMLtreeview'
+ ]),
]
@@ -87,9 +99,17 @@ class MyLog(wxPyLog):
self.tc.AppendText(message + '\n')
+#---------------------------------------------------------------------------
+
+def opj(path):
+ """Convert paths to the platform-specific separator"""
+ return apply(os.path.join, tuple(string.split(path, '/')))
+
+
#---------------------------------------------------------------------------
class wxPythonDemo(wxFrame):
+ overviewText = "wxPython Overview"
def __init__(self, parent, id, title):
wxFrame.__init__(self, parent, -1, title, size = (800, 600),
@@ -98,14 +118,7 @@ class wxPythonDemo(wxFrame):
self.cwd = os.getcwd()
self.curOverview = ""
- if 1:
- icon = wxIconFromXPMData(images.getMondrianData())
- else:
- # another way to do it
- bmp = images.getMondrianBitmap()
- icon = wxEmptyIcon()
- icon.CopyFromBitmap(bmp)
-
+ icon = images.getMondrianIcon()
self.SetIcon(icon)
if wxPlatform == '__WXMSW__':
@@ -119,6 +132,7 @@ class wxPythonDemo(wxFrame):
self.otherWin = None
+ self.showTip = true
EVT_IDLE(self, self.OnIdle)
EVT_CLOSE(self, self.OnCloseWindow)
EVT_ICONIZE(self, self.OnIconfiy)
@@ -177,10 +191,10 @@ class wxPythonDemo(wxFrame):
self.tree = wxTreeCtrl(splitter, tID,
style=wxTR_HAS_BUTTONS |
wxTR_EDIT_LABELS |
- wxTR_HAS_VARIABLE_ROW_HEIGHT |
- wxSUNKEN_BORDER)
+ wxTR_HAS_VARIABLE_ROW_HEIGHT)
+
#self.tree.SetBackgroundColour(wxNamedColour("Pink"))
- root = self.tree.AddRoot("Overview")
+ root = self.tree.AddRoot("wxPython Overview")
firstChild = None
for item in _treeList:
child = self.tree.AppendItem(root, item[0])
@@ -205,12 +219,12 @@ class wxPythonDemo(wxFrame):
# the notebook...
if 0: # the old way
self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
- self.nb.AddPage(self.ovr, "Overview")
+ self.nb.AddPage(self.ovr, self.overviewText)
else: # hopefully I can remove this hacky code soon, see bug #216861
panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
- self.nb.AddPage(panel, "Overview")
+ self.nb.AddPage(panel, self.overviewText)
def OnOvrSize(evt, ovr=self.ovr):
ovr.SetSize(evt.GetSize())
@@ -219,7 +233,7 @@ class wxPythonDemo(wxFrame):
EVT_ERASE_BACKGROUND(panel, EmptyHandler)
- self.SetOverview("Overview", overview)
+ self.SetOverview(self.overviewText, overview)
# Set up a TextCtrl on the Demo Code Notebook page
@@ -231,8 +245,11 @@ class wxPythonDemo(wxFrame):
# Set up a log on the View Log Notebook page
self.log = wxTextCtrl(splitter2, -1,
style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+
# Set the wxWindows log target to be this textctrl
#wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+
+ # But instead of the above we want to show how to use our own wxLog class
wxLog_SetActiveTarget(MyLog(self.log))
@@ -241,12 +258,13 @@ class wxPythonDemo(wxFrame):
# add the windows to the splitter and split it.
splitter2.SplitHorizontally(self.nb, self.log)
- splitter2.SetSashPosition(450, true)
- splitter2.SetMinimumPaneSize(20)
-
splitter.SplitVertically(self.tree, splitter2)
+
splitter.SetSashPosition(180, true)
splitter.SetMinimumPaneSize(20)
+ splitter2.SetSashPosition(450, true)
+ splitter2.SetMinimumPaneSize(20)
+
# select initial items
@@ -314,9 +332,9 @@ class wxPythonDemo(wxFrame):
self.nb.SetSelection(0)
self.nb.DeletePage(2)
- if itemText == 'Overview':
+ if itemText == self.overviewText:
self.GetDemoFile('Main.py')
- self.SetOverview('Overview', overview)
+ self.SetOverview(self.overviewText, overview)
self.nb.Refresh();
self.window = None
@@ -327,7 +345,7 @@ class wxPythonDemo(wxFrame):
try:
self.GetDemoFile(itemText + '.py')
module = __import__(itemText, globals())
- self.SetOverview(itemText, module.overview)
+ self.SetOverview(itemText + " Overview", module.overview)
finally:
wxEndBusyCursor()
@@ -366,7 +384,6 @@ class wxPythonDemo(wxFrame):
lead = text[:6]
if lead != '' and lead != '':
text = string.join(string.split(text, '\n'), '
')
- #text = '' + text + '
'
self.ovr.SetPage(text)
self.nb.SetPageText(0, name)
@@ -400,6 +417,25 @@ class wxPythonDemo(wxFrame):
self.window = self.otherWin
self.otherWin = None
+ if self.showTip:
+ self.ShowTip()
+ self.showTip = false
+
+
+ #---------------------------------------------
+ def ShowTip(self):
+ try:
+ showTipText = open(opj("data/showTips")).read()
+ showTip, index = eval(showTipText)
+ except IOError:
+ showTip, index = (1, 0)
+ if showTip:
+ tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)
+ showTip = wxShowTip(self, tp)
+ index = tp.GetCurrentTip()
+ open(opj("data/showTips"), "w").write(str( (showTip, index) ))
+
+
#---------------------------------------------
def OnDemoMenu(self, event):
try:
@@ -456,37 +492,31 @@ class wxPythonDemo(wxFrame):
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
-class MyApp(wxApp):
- def OnInit(self):
- wxInitAllImageHandlers()
-
- self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
- duration=4000, callback=self.AfterSplash)
- self.splash.Show(true)
- wxYield()
- return true
-
+class MySplashScreen(wxSplashScreen):
+ def __init__(self):
+ bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap()
+ wxSplashScreen.__init__(self, bmp,
+ wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+ 4000, None, -1)
+ EVT_CLOSE(self, self.OnClose)
- def AfterSplash(self):
- self.splash.Close(true)
+ def OnClose(self, evt):
frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
frame.Show(true)
- self.SetTopWindow(frame)
- self.ShowTip(frame)
+ evt.Skip() # Make sure the default handler runs too...
- def ShowTip(self, frame):
- try:
- showTipText = open("data/showTips").read()
- showTip, index = eval(showTipText)
- except IOError:
- showTip, index = (1, 0)
- #print showTip, index
- if showTip:
- tp = wxCreateFileTipProvider("data/tips.txt", index)
- showTip = wxShowTip(frame, tp)
- index = tp.GetCurrentTip()
- open("data/showTips", "w").write(str( (showTip, index) ))
+class MyApp(wxApp):
+ def OnInit(self):
+ """
+ Create and show the splash screen. It will then create and show
+ the main frame when it is time to do so.
+ """
+ wxInitAllImageHandlers()
+ splash = MySplashScreen()
+ splash.Show()
+ return true
+
#---------------------------------------------------------------------------