X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f74ff5efa5604fcde3cc5ba9009cb015a6f388cf..f63e3ebbe3272b9690aa2530e0c3048d3f37c7c7:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 4bda0df3c8..f723cb0874 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -20,65 +20,237 @@ import images #--------------------------------------------------------------------------- +## _treeList = [ +## ('New since last release', ['wxGenericDirCtrl', +## 'wxImageFromStream', +## 'RowColSizer', +## 'Unicode', +## 'wxFileHistory', +## ]), + +## ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame', +## 'wxGrid', 'wxSashWindow', +## 'wxScrolledWindow', 'wxSplitterWindow', +## 'wxStatusBar', 'wxNotebook', +## 'wxHtmlWindow', +## 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2', +## 'wxPopupWindow', +## 'wxDynamicSashWindow', +## ]), + +## ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog', +## 'wxSingleChoiceDialog', 'wxTextEntryDialog', +## 'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog', +## 'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog', +## ]), + +## ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice', +## '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', +## 'RowColSizer', +## ]), + +## ('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', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager', +## 'ContextHelp', 'SplitTree', 'Unicode', 'wxFileHistory', +## ]), + +## ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', +## 'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar', +## 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow', +## 'FileBrowseButton', 'GenericButtons', 'wxEditor', +## 'ColourSelect', 'ImageBrowser', +## 'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling', +## 'TablePrint', +## 'wxRightTextCtrl', +## ]), + +## ('Cool Contribs', ['pyTree', 'hangman', +## #'SlashDot', +## 'XMLtreeview' +## ]), + +## ] + + _treeList = [ - ('New since last release', ['wxGenericDirCtrl', - 'wxImageFromStream', - ]), - - ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame', - 'wxGrid', 'wxSashWindow', - 'wxScrolledWindow', 'wxSplitterWindow', - 'wxStatusBar', 'wxNotebook', - 'wxHtmlWindow', - 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2', - 'wxPopupWindow', - 'wxDynamicSashWindow', - ]), - - ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog', - 'wxSingleChoiceDialog', 'wxTextEntryDialog', - 'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog', - 'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog', - ]), - - ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice', - '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']), - - ('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', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager', - 'ContextHelp', 'SplitTree', - ]), - - ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', - 'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar', - 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow', - 'FileBrowseButton', 'GenericButtons', 'wxEditor', - 'ColourSelect', 'ImageBrowser', - 'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling', - 'TablePrint', - 'wxRightTextCtrl', - ]), - - ('Cool Contribs', ['pyTree', 'hangman', - #'SlashDot', - 'XMLtreeview' - ]), - - ] + # new stuff + ('New since last release', [ + 'RowColSizer', + 'Unicode', + 'wxFileHistory', + 'wxGenericDirCtrl', + 'wxImageFromStream', + ]), + + # managed windows == things with a caption you can close + ('Base Frames and Dialogs', [ + 'wxDialog', + 'wxFrame', + 'wxMDIWindows', + 'wxMiniFrame', + ]), + + # the common dialogs + ('Common Dialogs', [ + 'wxColourDialog', + 'wxDirDialog', + 'wxFileDialog', + 'wxFindReplaceDialog', + 'wxFontDialog', + 'wxMessageDialog', + 'wxPageSetupDialog', + 'wxPrintDialog', + 'wxProgressDialog', + 'wxSingleChoiceDialog', + 'wxTextEntryDialog', + ]), + + # dialogs form libraries + ('More Dialogs', [ + 'ErrorDialogs', + 'ImageBrowser', + 'wxMultipleChoiceDialog', + 'wxScrolledMessageDialog', + ]), + + # core controls + ('Core Windows/Controls', [ + 'VirtualListCtrl', + 'wxButton', + 'wxCheckBox', + 'wxCheckListBox', + 'wxChoice', + 'wxComboBox', + 'wxGauge', + 'wxGenericDirCtrl', + 'wxGrid', + 'wxListBox', + 'wxListCtrl', + 'wxNotebook', + 'wxPopupWindow', + 'wxRadioBox', + 'wxSashWindow', + 'wxSlider', + 'wxScrolledWindow', + 'wxSplitterWindow', + 'wxSpinButton', + 'wxSpinCtrl', + 'wxStaticText', + 'wxStaticBitmap', + 'wxStatusBar', + 'wxTextCtrl', + 'wxTimer', + 'wxToggleButton', + 'wxToolBar', + 'wxTreeCtrl', + 'wxValidator', + ]), + + # controls coming from other librairies + ('More Windows/Controls', [ + 'ColourSelect', + 'ContextHelp', + 'FancyText', + 'FileBrowseButton', + 'GenericButtons', + 'PyCrust', + 'PyCrustWithFilling', + 'SplitTree', + 'TablePrint', + 'wxCalendar', + 'wxCalendarCtrl', + 'wxDynamicSashWindow', + 'wxEditableListBox', + 'wxEditor', + 'wxFloatBar', + 'wxHtmlWindow', + 'wxLEDNumberCtrl', + 'wxMimeTypesManager', + 'wxMVCTree', + 'wxStyledTextCtrl_1', + 'wxStyledTextCtrl_2', + 'wxRightTextCtrl', + ]), + + # How to lay out the controls in a frame/dialog + ('Window Layout', [ + 'LayoutAnchors', + 'Layoutf', + 'RowColSizer', + 'Sizers', + 'wxLayoutConstraints', + 'XML_Resource', + ]), + + # ditto + ('Process and Events', [ + 'infoframe', + 'OOR', + 'PythonEvents', + 'Threads', + 'wxProcess', + 'wxTimer', + ]), + + # Clipboard and DnD + ('Clipboard and DnD', [ + 'CustomDragAndDrop', + 'DragAndDrop', + 'URLDragAndDrop', + ]), + + # Images + ('Images', [ + 'wxDragImage', + 'wxImage', + 'wxImageFromStream', + 'wxMask', + ]), + + # Other stuff + ('Miscellaneous', [ + 'ColourDB', + 'DialogUnits', + 'DrawXXXList', + 'FontEnumerator', + 'PrintFramework', + 'Unicode', + 'wxFileHistory', + 'wxJoystick', + 'wxOGL', + 'wxWave', + ]), + + # need libs not coming with the demo + ('Objects using an external library', [ + 'ActiveXWrapper_Acrobat', + 'ActiveXWrapper_IE', + 'wxGLCanvas', + 'wxPlotCanvas', + 'wxVTKRenderWindow', + ]), + + # pyTree, hangman, ... in the samples dir + ('Check out the samples dir too', [ + ]), + +] + + #--------------------------------------------------------------------------- @@ -105,6 +277,7 @@ def opj(path): #--------------------------------------------------------------------------- class wxPythonDemo(wxFrame): + overviewText = "wxPython Overview" def __init__(self, parent, id, title): wxFrame.__init__(self, parent, -1, title, size = (800, 600), @@ -113,14 +286,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__': @@ -134,6 +300,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) @@ -192,10 +359,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]) @@ -215,26 +382,10 @@ class wxPythonDemo(wxFrame): self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN) # Set up a wxHtmlWindow on the Overview Notebook page - # we put it in a panel first because there seems to be a - # refresh bug of some sort (wxGTK) when it is directly in - # the notebook... - if 0: # the old way - self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400)) - self.nb.AddPage(self.ovr, "Overview") - - 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") - - def OnOvrSize(evt, ovr=self.ovr): - ovr.SetSize(evt.GetSize()) + self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400)) + self.nb.AddPage(self.ovr, self.overviewText) - EVT_SIZE(panel, OnOvrSize) - EVT_ERASE_BACKGROUND(panel, EmptyHandler) - - - self.SetOverview("Overview", overview) + self.SetOverview(self.overviewText, overview) # Set up a TextCtrl on the Demo Code Notebook page @@ -246,8 +397,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)) @@ -256,12 +410,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 @@ -308,7 +463,7 @@ class wxPythonDemo(wxFrame): pt = event.GetPosition(); item, flags = self.tree.HitTest(pt) if item == self.tree.GetSelection(): - self.SetOverview(self.tree.GetItemText(item), self.curOverview) + self.SetOverview(self.tree.GetItemText(item)+" Overview", self.curOverview) event.Skip() #--------------------------------------------- @@ -329,9 +484,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 @@ -342,7 +497,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() @@ -414,6 +569,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: @@ -481,21 +655,7 @@ class MySplashScreen(wxSplashScreen): def OnClose(self, evt): frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)") frame.Show(true) - self.ShowTip(frame) - self.Destroy() - - def ShowTip(self, frame): - 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(frame, tp) - index = tp.GetCurrentTip() - open(opj("data/showTips"), "w").write(str( (showTip, index) )) - + evt.Skip() # Make sure the default handler runs too... class MyApp(wxApp): @@ -507,7 +667,6 @@ class MyApp(wxApp): wxInitAllImageHandlers() splash = MySplashScreen() splash.Show() - wxYield() return true