A few little tweaks

[wxWidgets.git] / wxPython / demo / Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 893fca90d29942fe1b2454a868fc88f07e15c4e7..15b039e16057de8b51adc4441a29eaeb63c1e228 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -11,62 +11,207 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 

-import sys, os
+import sys, os, time, string

 from   wxPython.wx import *
 from   wxPython.wx import *

-from   wxPython.lib.splashscreen import SplashScreen

 from   wxPython.html import wxHtmlWindow
 
 from   wxPython.html import wxHtmlWindow
 

+##from wxPython.stc import *
+
+import images
+

 #---------------------------------------------------------------------------
 
 
 _treeList = [
 #---------------------------------------------------------------------------
 
 
 _treeList = [

-    ('New since last release', ['wxProcess',
-                                ]),
-
-    ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
-
-    ('Non-Managed Windows', ['wxGrid', 'wxSashWindow',
-                             'wxScrolledWindow', 'wxSplitterWindow',
-                             'wxStatusBar', 'wxNotebook',
-                             'wxHtmlWindow',
-                             'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),
-
-    ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
-                        'wxSingleChoiceDialog', 'wxTextEntryDialog',
-                        'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
-                        'wxMessageDialog', 'wxProgressDialog']),
-
-    ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
-                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
-                  'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
-                  'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
-                  'wxCalendarCtrl',
-                  ]),
-
-    ('Window Layout', ['wxLayoutConstraints', 'Sizers', ]),
-
-    ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
-                        'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
-                        'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
-                        'PythonEvents', 'Threads',
-                        'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
-                        'wxDragImage',
-                        ]),
-
-    ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
-                          'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
-                          'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
-                          'FileBrowseButton', 'GenericButtons', 'wxEditor',
-                          'PyShellWindow',
-                          ]),
-
-    ('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',
+        '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',
+        ]),
+
+    # pyTree, hangman, ... in the samples dir
+    ('Check out the samples dir too', [
+        ]),
+
+]
+
+
+
+#---------------------------------------------------------------------------
+
+class MyLog(wxPyLog):
+    def __init__(self, textCtrl, logTime=0):
+        wxPyLog.__init__(self)
+        self.tc = textCtrl
+        self.logTime = logTime
+
+    def DoLogString(self, message, timeStamp):
+        if self.logTime:
+            message = time.strftime("%X", time.localtime(timeStamp)) + \
+                      ": " + message
+        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):
 
 #---------------------------------------------------------------------------
 
 class wxPythonDemo(wxFrame):

+    overviewText = "wxPython Overview"

 
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, -1, title, size = (800, 600),
 
     def __init__(self, parent, id, title):
         wxFrame.__init__(self, parent, -1, title, size = (800, 600),


@@ -75,10 +220,10 @@ class wxPythonDemo(wxFrame):
         self.cwd = os.getcwd()
         self.curOverview = ""
 
         self.cwd = os.getcwd()
         self.curOverview = ""
 

-        if wxPlatform == '__WXMSW__':
-            icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
-            self.SetIcon(icon)
+        icon = images.getMondrianIcon()
+        self.SetIcon(icon)

 
 

+        if wxPlatform == '__WXMSW__':

             # setup a taskbar icon, and catch some events from it
             self.tbicon = wxTaskBarIcon()
             self.tbicon.SetIcon(icon, "wxPython Demo")
             # setup a taskbar icon, and catch some events from it
             self.tbicon = wxTaskBarIcon()
             self.tbicon.SetIcon(icon, "wxPython Demo")


@@ -89,8 +234,11 @@ class wxPythonDemo(wxFrame):
 
 
         self.otherWin = None
 
 
         self.otherWin = None

+        self.showTip = true

         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)
         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)

+        EVT_ICONIZE(self, self.OnIconfiy)
+        EVT_MAXIMIZE(self, self.OnMaximize)

 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)
 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)


@@ -98,8 +246,11 @@ class wxPythonDemo(wxFrame):
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 
         splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
         splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
 

+        def EmptyHandler(evt): pass
+        EVT_ERASE_BACKGROUND(splitter, EmptyHandler)
+        EVT_ERASE_BACKGROUND(splitter2, EmptyHandler)

 
 

-        # Prevent TreeCtrl from displaying all items after destruction
+        # Prevent TreeCtrl from displaying all items after destruction when true

         self.dying = false
 
         # Make a File menu
         self.dying = false
 
         # Make a File menu


@@ -142,10 +293,10 @@ class wxPythonDemo(wxFrame):
         self.tree = wxTreeCtrl(splitter, tID,
                                style=wxTR_HAS_BUTTONS |
                                wxTR_EDIT_LABELS |
         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"))
         #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])
         firstChild = None
         for item in _treeList:
             child = self.tree.AppendItem(root, item[0])


@@ -162,7 +313,7 @@ class wxPythonDemo(wxFrame):
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook
         EVT_LEFT_DOWN            (self.tree,      self.OnTreeLeftDown)
 
         # Create a Notebook

-        self.nb = wxNotebook(splitter2, -1)
+        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
 
         # Set up a wxHtmlWindow on the Overview Notebook page
         # we put it in a panel first because there seems to be a


@@ -170,33 +321,38 @@ class wxPythonDemo(wxFrame):
         # the notebook...
         if 0:  # the old way
             self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
         # 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
-            panel = wxPanel(self.nb, -1)
+        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.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())
 
             EVT_SIZE(panel, OnOvrSize)
 
             def OnOvrSize(evt, ovr=self.ovr):
                 ovr.SetSize(evt.GetSize())
 
             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
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
 
 
         # Set up a TextCtrl on the Demo Code Notebook page
         self.txt = wxTextCtrl(self.nb, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)

-        self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))

         self.nb.AddPage(self.txt, "Demo Code")
 
 
         # Set up a log on the View Log Notebook page
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         self.nb.AddPage(self.txt, "Demo Code")
 
 
         # 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
         # Set the wxWindows log target to be this textctrl

-        wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+        #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))

 
 
 
 
 
 


@@ -204,12 +360,13 @@ class wxPythonDemo(wxFrame):
 
         # add the windows to the splitter and split it.
         splitter2.SplitHorizontally(self.nb, self.log)
 
         # 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.SplitVertically(self.tree, splitter2)

+

         splitter.SetSashPosition(180, true)
         splitter.SetMinimumPaneSize(20)
         splitter.SetSashPosition(180, true)
         splitter.SetMinimumPaneSize(20)

+        splitter2.SetSashPosition(450, true)
+        splitter2.SetMinimumPaneSize(20)
+

 
 
         # select initial items
 
 
         # select initial items


@@ -256,7 +413,7 @@ class wxPythonDemo(wxFrame):
         pt = event.GetPosition();
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():
         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()
 
     #---------------------------------------------
         event.Skip()
 
     #---------------------------------------------


@@ -277,9 +434,9 @@ class wxPythonDemo(wxFrame):
                 self.nb.SetSelection(0)
             self.nb.DeletePage(2)
 
                 self.nb.SetSelection(0)
             self.nb.DeletePage(2)
 

-        if itemText == 'Overview':
+        if itemText == self.overviewText:

             self.GetDemoFile('Main.py')
             self.GetDemoFile('Main.py')

-            self.SetOverview('Overview', overview)
+            self.SetOverview(self.overviewText, overview)

             self.nb.Refresh();
             self.window = None
 
             self.nb.Refresh();
             self.window = None
 


@@ -290,19 +447,20 @@ class wxPythonDemo(wxFrame):
                 try:
                     self.GetDemoFile(itemText + '.py')
                     module = __import__(itemText, globals())
                 try:
                     self.GetDemoFile(itemText + '.py')
                     module = __import__(itemText, globals())

-                    self.SetOverview(itemText, module.overview)
+                    self.SetOverview(itemText + " Overview", module.overview)

                 finally:
                     wxEndBusyCursor()
                 finally:
                     wxEndBusyCursor()

+                self.tree.Refresh()

 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();
 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();

-                wxYield()
+                wxSafeYield()

 
                 self.window = module.runTest(self, self.nb, self) ###
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')
 
                 self.window = module.runTest(self, self.nb, self) ###
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')

-                    wxYield()

                     self.nb.SetSelection(2)
                     self.nb.SetSelection(2)

+                    self.nb.Refresh()  # without this wxMac has troubles showing the just added page

 
             else:
                 self.ovr.SetPage("")
 
             else:
                 self.ovr.SetPage("")


@@ -329,7 +487,6 @@ class wxPythonDemo(wxFrame):
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')
         lead = text[:6]
         if lead != '<html>' and lead != '<HTML>':
             text = string.join(string.split(text, '\n'), '<br>')

-            #text = '<font size="-1"><pre>' + text + '</pre></font>'

         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 
         self.ovr.SetPage(text)
         self.nb.SetPageText(0, name)
 


@@ -363,6 +520,25 @@ class wxPythonDemo(wxFrame):
             self.window = self.otherWin
             self.otherWin = None
 
             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:
     #---------------------------------------------
     def OnDemoMenu(self, event):
         try:


@@ -403,51 +579,58 @@ class wxPythonDemo(wxFrame):
         wxGetApp().ProcessIdle()
 
 
         wxGetApp().ProcessIdle()
 
 

-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
+    #---------------------------------------------
+    def OnIconfiy(self, evt):
+        wxLogMessage("OnIconfiy")
+        evt.Skip()
+
+    #---------------------------------------------
+    def OnMaximize(self, evt):
+        wxLogMessage("OnMaximize")
+        evt.Skip()

 
 

-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

 
 
 
 

-    def AfterSplash(self):
-        self.splash.Close(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 OnClose(self, evt):

         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
         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
+

 
 
 #---------------------------------------------------------------------------
 
 def main():
     try:
 
 
 #---------------------------------------------------------------------------
 
 def main():
     try:

-        demoPath = os.path.split(__file__)[0]
+        demoPath = os.path.dirname(__file__)

         os.chdir(demoPath)
     except:
         pass
         os.chdir(demoPath)
     except:
         pass

-    app = MyApp(0)
+    app = MyApp(wxPlatform == "__WXMAC__")

     app.MainLoop()
 
 
     app.MainLoop()