X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ee202f3fc42c06a9c9fce1ff7a3173a17395127..bbfc7289d6d2efe7ed31329f5dab8ce99a30e9d7:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index cae2caec0b..5edc12806a 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -47,8 +47,9 @@ import images _treeList = [ # new stuff ('Recent Additions/Updates', [ - 'OGL', - 'FloatCanvas', + 'StockButtons', + 'Ticker', + 'Choicebook', ]), # managed windows == things with a (optional) caption you can close @@ -65,7 +66,6 @@ _treeList = [ 'ColourDialog', 'DirDialog', 'FileDialog', - 'FileDialog_Save', 'FindReplaceDialog', 'FontDialog', 'MessageDialog', @@ -90,6 +90,7 @@ _treeList = [ 'CheckBox', 'CheckListBox', 'Choice', + 'Choicebook', 'ComboBox', 'Gauge', 'Grid', @@ -113,6 +114,7 @@ _treeList = [ 'StaticBitmap', 'StaticText', 'StatusBar', + 'StockButtons', 'TextCtrl', 'ToggleButton', 'ToolBar', @@ -163,6 +165,7 @@ _treeList = [ 'StyledTextCtrl_2', 'TablePrint', 'Throbber', + 'Ticker', 'TimeCtrl', 'VListBox', ]), @@ -189,7 +192,7 @@ _treeList = [ 'PythonEvents', 'Threads', 'Timer', - 'infoframe', + ##'infoframe', # needs better explaination and some fixing ]), # Clipboard and DnD @@ -214,7 +217,7 @@ _treeList = [ # Other stuff ('Miscellaneous', [ 'ColourDB', - 'DialogUnits', + ##'DialogUnits', # needs more explainations 'DrawXXXList', 'FileHistory', 'FontEnumerator', @@ -274,7 +277,7 @@ try: class DemoCodeEditor(PythonSTC): def __init__(self, parent): - PythonSTC.__init__(self, parent, -1, wx.BORDER_NONE) + PythonSTC.__init__(self, parent, -1, style=wx.BORDER_NONE) self.SetUpEditor() # Some methods to make it compatible with how the wxTextCtrl is used @@ -444,8 +447,8 @@ try: except ImportError: class DemoCodeEditor(wx.TextCtrl): def __init__(self, parent): - wx.TextCtrl.__init__(self, parent, -1, style = wx.TE_MULTILINE | - wx.HSCROLL | wx.TE_RICH2 | wx.TE_NOHIDESEL) + wx.TextCtrl.__init__(self, parent, -1, style = + wx.TE_MULTILINE | wx.HSCROLL | wx.TE_RICH2 | wx.TE_NOHIDESEL) def RegisterModifiedEvent(self, eventHandler): self.Bind(wx.EVT_TEXT, eventHandler) @@ -483,7 +486,9 @@ modDefault = modOriginal class DemoCodePanel(wx.Panel): """Panel for the 'Demo Code' tab""" def __init__(self, parent, mainFrame): - wx.Panel.__init__(self, parent) + wx.Panel.__init__(self, parent, size=(1,1)) + if 'wxMSW' in wx.PlatformInfo: + self.Hide() self.mainFrame = mainFrame self.editor = DemoCodeEditor(self) self.editor.RegisterModifiedEvent(self.OnCodeModified) @@ -531,6 +536,7 @@ class DemoCodePanel(wx.Panel): def ActiveModuleChanged(self): self.LoadDemoSource(self.demoModules.GetSource()) self.UpdateControlState() + self.ReloadDemo() def LoadDemoSource(self, source): @@ -574,12 +580,11 @@ class DemoCodePanel(wx.Panel): busy = wx.BusyInfo("Reloading demo module...") self.demoModules.SetActive(modSelected) self.ActiveModuleChanged() - self.ReloadDemo() def ReloadDemo(self): if self.demoModules.name != __name__: - self.mainFrame.RunModule(False) + self.mainFrame.RunModule() def OnCodeModified(self, event): @@ -625,7 +630,6 @@ class DemoCodePanel(wx.Panel): busy = wx.BusyInfo("Reloading demo module...") self.demoModules.LoadFromFile(modModified, modifiedFilename) self.ActiveModuleChanged() - self.ReloadDemo() def OnRestore(self, event): # Handles the "Delete Modified" button @@ -634,7 +638,6 @@ class DemoCodePanel(wx.Panel): os.unlink(modifiedFilename) # Delete the modified copy busy = wx.BusyInfo("Reloading demo module...") self.ActiveModuleChanged() - self.ReloadDemo() #--------------------------------------------------------------------------- @@ -716,8 +719,6 @@ class DemoModules: # load modified module (if one exists) if DoesModifiedExist(name): self.LoadFromFile(modModified, GetModifiedFilename(name)) - if (modDefault == modModified): - self.SetActive(modModified) def LoadFromFile(self, modID, filename): @@ -814,35 +815,6 @@ class DemoModules: self.modules[modID][2] = "" -#--------------------------------------------------------------------------- -class ReloadDemoPanel(wx.Panel): - """ - Panel put into the demo tab when the demo just shows some - top-level window. Enables the demo to be reloaded after being - closed. - """ - - infoText = "This demo runs outside the main window" - - def __init__(self, parent, codePanel, log): - wx.Panel.__init__(self, parent, -1) - self.codePanel = codePanel - self.log = log - - self.label = wx.StaticText(self, -1, self.infoText) - self.btnReload = wx.Button(self, -1, "Reload Demo") - self.btnReload.Bind(wx.EVT_BUTTON, self.OnReload) - - self.box = wx.BoxSizer(wx.VERTICAL) - self.box.Add(self.label, 0, wx.ALIGN_CENTER | wx.ALL, 10) - self.box.Add(self.btnReload, 0, wx.ALIGN_CENTER | wx.ALL, 10) - - self.box.Fit(self) - self.SetSizer(self.box) - - def OnReload(self, event): - self.codePanel.ReloadDemo() - #--------------------------------------------------------------------------- class DemoError: @@ -977,6 +949,84 @@ class DemoErrorPanel(wx.Panel): #--------------------------------------------------------------------------- +class DemoTaskBarIcon(wx.TaskBarIcon): + TBMENU_RESTORE = wx.NewId() + TBMENU_CLOSE = wx.NewId() + TBMENU_CHANGE = wx.NewId() + TBMENU_REMOVE = wx.NewId() + + def __init__(self, frame): + wx.TaskBarIcon.__init__(self) + self.frame = frame + + # Set the image + icon = self.MakeIcon(images.getMondrianImage()) + self.SetIcon(icon, "wxPython Demo") + + # bind some events + self.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate) + self.Bind(wx.EVT_MENU, self.OnTaskBarActivate, id=self.TBMENU_RESTORE) + self.Bind(wx.EVT_MENU, self.OnTaskBarClose, id=self.TBMENU_CLOSE) + self.Bind(wx.EVT_MENU, self.OnTaskBarChange, id=self.TBMENU_CHANGE) + self.Bind(wx.EVT_MENU, self.OnTaskBarRemove, id=self.TBMENU_REMOVE) + + + def CreatePopupMenu(self): + """ + This method is called by the base class when it needs to popup + the menu for the default EVT_RIGHT_DOWN event. Just create + the menu how you want it and return it from this function, + the base class takes care of the rest. + """ + menu = wx.Menu() + menu.Append(self.TBMENU_RESTORE, "Restore wxPython Demo") + menu.Append(self.TBMENU_CLOSE, "Close wxPython Demo") + menu.AppendSeparator() + menu.Append(self.TBMENU_CHANGE, "Change the TB Icon") + menu.Append(self.TBMENU_REMOVE, "Remove the TB Icon") + return menu + + + def MakeIcon(self, img): + """ + The various platforms have different requirements for the + icon size... + """ + if "wxMSW" in wx.PlatformInfo: + img.Scale(16, 16) + elif "wxGTK" in wx.PlatformInfo: + img.Scale(22, 22) + # wxMac can be any size upto 128.128.... + icon = wx.IconFromBitmap(img.ConvertToBitmap() ) + return icon + + + def OnTaskBarActivate(self, evt): + if self.frame.IsIconized(): + self.frame.Iconize(False) + if not self.frame.IsShown(): + self.frame.Show(True) + self.frame.Raise() + + + def OnTaskBarClose(self, evt): + self.frame.Close() + + # because of the way wx.TaskBarIcon.PopupMenu is implemented we have to + # prod the main idle handler a bit to get the window to actually close + wx.GetApp().ProcessIdle() + + + def OnTaskBarChange(self, evt): + icon = self.MakeIcon(images.getRobinImage()) + self.SetIcon(icon, "This is a new icon") + + + def OnTaskBarRemove(self, evt): + self.RemoveIcon() + + +#--------------------------------------------------------------------------- class wxPythonDemo(wx.Frame): overviewText = "wxPython Overview" @@ -989,25 +1039,13 @@ class wxPythonDemo(wx.Frame): self.curOverview = "" self.demoPage = None self.codePage = None - self.useModified = False self.shell = None + self.firstTime = True icon = images.getMondrianIcon() self.SetIcon(icon) - if wx.Platform != '__WXMAC__': - # setup a taskbar icon, and catch some events from it - dim = 16 # (may want to use 22 on wxGTK, but 16 looks okay too) - icon = wx.IconFromBitmap( - images.getMondrianImage().Scale(dim,dim).ConvertToBitmap() ) - #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO) - #icon = images.getMondrianIcon() - self.tbicon = wx.TaskBarIcon() - self.tbicon.SetIcon(icon, "wxPython Demo") - self.tbicon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate) - self.tbicon.Bind(wx.EVT_TASKBAR_RIGHT_UP, self.OnTaskBarMenu) - self.tbicon.Bind(wx.EVT_MENU, self.OnTaskBarActivate, id=self.TBMENU_RESTORE) - self.tbicon.Bind(wx.EVT_MENU, self.OnTaskBarClose, id=self.TBMENU_CLOSE) + self.tbicon = DemoTaskBarIcon(self) wx.CallAfter(self.ShowTip) @@ -1150,7 +1188,7 @@ class wxPythonDemo(wx.Frame): panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler) if "gtk2" in wx.PlatformInfo: - self.ovr.NormalizeFontSizes() + self.ovr.SetStandardFonts() self.SetOverview(self.overviewText, mainOverview) @@ -1263,7 +1301,7 @@ class wxPythonDemo(wx.Frame): if os.path.exists(GetOriginalFilename(demoName)): wx.LogMessage("Loading demo %s.py..." % demoName) self.demoModules = DemoModules(demoName) - self.RunModule(True) + self.LoadDemoSource() self.tree.Refresh() else: self.SetOverview("wxPython", mainOverview) @@ -1279,7 +1317,7 @@ class wxPythonDemo(wx.Frame): self.codePage.LoadDemo(self.demoModules) #--------------------------------------------- - def RunModule(self, loadSource): + def RunModule(self): """Runs the active module""" module = self.demoModules.GetActive() @@ -1298,20 +1336,26 @@ class wxPythonDemo(wx.Frame): try: self.demoPage = module.runTest(self, self.nb, self) - if self.demoPage is None: - self.demoPage = ReloadDemoPanel(self.nb, self.codePage, self) except: self.demoPage = DemoErrorPanel(self.nb, self.codePage, - DemoError(sys.exc_info()), self) + DemoError(sys.exc_info()), self) + + assert self.demoPage is not None, "runTest must return a window!" + else: # There was a previous error in compiling or exec-ing self.demoPage = DemoErrorPanel(self.nb, self.codePage, self.demoModules.GetErrorInfo(), self) - - if loadSource: - self.LoadDemoSource() + self.SetOverview(self.demoModules.name + " Overview", overviewText) - self.UpdateNotebook() + + if self.firstTime: + # cahnge to the demo page the first time a module is run + self.UpdateNotebook(2) + self.firstTime = False + else: + # otherwise just stay on the same tab in case the user has changed to another one + self.UpdateNotebook() #--------------------------------------------- def ShutdownDemoModule(self): @@ -1479,6 +1523,7 @@ class wxPythonDemo(wx.Frame): self.demoPage = None self.codePage = None self.mainmenu = None + self.tbicon.Destroy() self.Destroy() @@ -1516,34 +1561,6 @@ class wxPythonDemo(wx.Frame): self.tree.EnsureVisible(selectedDemo) - #--------------------------------------------- - def OnTaskBarActivate(self, evt): - if self.IsIconized(): - self.Iconize(False) - if not self.IsShown(): - self.Show(True) - self.Raise() - - #--------------------------------------------- - - TBMENU_RESTORE = 1000 - TBMENU_CLOSE = 1001 - - def OnTaskBarMenu(self, evt): - menu = wx.Menu() - menu.Append(self.TBMENU_RESTORE, "Restore wxPython Demo") - menu.Append(self.TBMENU_CLOSE, "Close") - self.tbicon.PopupMenu(menu) - menu.Destroy() - - #--------------------------------------------- - def OnTaskBarClose(self, evt): - self.Close() - - # because of the way wx.TaskBarIcon.PopupMenu is implemented we have to - # prod the main idle handler a bit to get the window to actually close - wx.GetApp().ProcessIdle() - #--------------------------------------------- def OnIconfiy(self, evt):