From 6fa88e361f7eb3e3089dcd3fc7734ac0ea0f1a4e Mon Sep 17 00:00:00 2001 From: eagerm Date: Tue, 10 Nov 2020 20:20:34 -0800 Subject: [PATCH] Reduce differences between demo/ScrolledThumbnail and demo/ThumbnailCtrl --- demo/agw/ScrolledThumbnail.py | 33 ++++++++++++++++++--------------- demo/agw/ThumbnailCtrl.py | 21 ++++++++++----------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/demo/agw/ScrolledThumbnail.py b/demo/agw/ScrolledThumbnail.py index 5c0a8187..611f8388 100644 --- a/demo/agw/ScrolledThumbnail.py +++ b/demo/agw/ScrolledThumbnail.py @@ -8,7 +8,7 @@ import os import sys import time import images -import wx.lib.agw.scrolledthumbnail as ST +import wx.lib.agw.scrolledthumbnail as TC from wx.lib.agw.scrolledthumbnail import (ScrolledThumbnail, Thumb, NativeImageHandler, @@ -27,14 +27,15 @@ class ScrolledThumbnailDemo(wx.Frame): def __init__(self, parent, log): wx.Frame.__init__(self, parent, size=(850,800)) + self.name = "ScrolledThumbnail" self.SetIcon(images.Mondrian.GetIcon()) - self.SetTitle("ScrolledThumbnail wxPython Demo ;-)") + self.SetTitle(self.name + " wxPython Demo ;-)") self.statusbar = self.CreateStatusBar(2) self.statusbar.SetStatusWidths([-2, -1]) # statusbar fields - statusbar_fields = [("ScrolledThumbnail Demo, Michael Eager @ 23 Oct 2020"), + statusbar_fields = [(self.name + " Demo, Michael Eager @ 10 Nov 2020"), ("Welcome To wxPython!")] for i in range(len(statusbar_fields)): @@ -111,6 +112,7 @@ class ScrolledThumbnailDemo(wx.Frame): splitter.SetMinimumPaneSize(140) self.CenterOnScreen() + def SetProperties(self): self.radiostyle4.SetValue(1) @@ -185,8 +187,8 @@ class ScrolledThumbnailDemo(wx.Frame): def OnAbout(self, event): - msg = "This Is The About Dialog Of The ScrollThumbnail Demo.\n\n" + \ - "Author: Michael Eager @ 23 Oct 2020\n\n" + \ + msg = "This Is The About Dialog Of The " + self.name + " Demo.\n\n" + \ + "Author: Michael Eager @ 10 Nov 2020\n\n" + \ "Adapted from the ThumbnailCtrl Demo\n" + \ "By Andrea Gavana @ 10 Dec 2005\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ @@ -194,7 +196,7 @@ class ScrolledThumbnailDemo(wx.Frame): "eager@eagercon.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" - dlg = wx.MessageDialog(self, msg, "ScrolledThumbnail Demo", + dlg = wx.MessageDialog(self, msg, self.name + " Demo", wx.OK | wx.ICON_INFORMATION) dlg.SetFont(wx.Font(8, wx.NORMAL, wx.NORMAL, wx.NORMAL, False)) @@ -240,13 +242,13 @@ class ScrolledThumbnailDemo(wx.Frame): pos = self.radios.index(radio) if pos == 0: - self.scroll.SetThumbOutline(ST.THUMB_OUTLINE_NONE) + self.scroll.SetThumbOutline(TC.THUMB_OUTLINE_NONE) elif pos == 1: - self.scroll.SetThumbOutline(ST.THUMB_OUTLINE_FULL) + self.scroll.SetThumbOutline(TC.THUMB_OUTLINE_FULL) elif pos == 2: - self.scroll.SetThumbOutline(ST.THUMB_OUTLINE_RECT) + self.scroll.SetThumbOutline(TC.THUMB_OUTLINE_RECT) elif pos == 3: - self.scroll.SetThumbOutline(ST.THUMB_OUTLINE_IMAGE) + self.scroll.SetThumbOutline(TC.THUMB_OUTLINE_IMAGE) self.scroll.Refresh() @@ -340,7 +342,7 @@ class ScrolledThumbnailDemo(wx.Frame): val = float(val) except: errstr = "Error: a float value is required." - dlg = wx.MessageDialog(self, errstr, "ScrolledThumbnailDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -350,7 +352,7 @@ class ScrolledThumbnailDemo(wx.Frame): if val < 1.0: errstr = "Error: zoom factor must be grater than 1.0." - dlg = wx.MessageDialog(self, errstr, "ScrolledThumbnailDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -367,7 +369,7 @@ class ScrolledThumbnailDemo(wx.Frame): height = int(self.textthumbheight.GetValue().strip()) except: errstr = "Error: thumb size must be integers (min 50x50)." - dlg = wx.MessageDialog(self, errstr, "ScrolledThumbnailDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -577,7 +579,7 @@ class ScrolledThumbnailDemo(wx.Frame): self.log.write("OnGlobalPopupMenu: say hello message...\n") msgstr = "Info: let's say hello to wxPython! " - dlg = wx.MessageDialog(self, msgstr, "ScrolledThumbnailDemo Info", + dlg = wx.MessageDialog(self, msgstr, self.name + " Info", wx.OK | wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() @@ -591,7 +593,7 @@ class ScrolledThumbnailDemo(wx.Frame): self.log.write("OnGlobalPopupMenu: number of thumbs: %d\n"%items) msgstr = "Info: number of thumbs: %d"%items - dlg = wx.MessageDialog(self, msgstr, "ScrolledThumbnailDemo Info", + dlg = wx.MessageDialog(self, msgstr, self.name + " Info", wx.OK | wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() @@ -599,6 +601,7 @@ class ScrolledThumbnailDemo(wx.Frame): event.Skip() + #--------------------------------------------------------------------------- diff --git a/demo/agw/ThumbnailCtrl.py b/demo/agw/ThumbnailCtrl.py index efd8a06d..d37a9d74 100644 --- a/demo/agw/ThumbnailCtrl.py +++ b/demo/agw/ThumbnailCtrl.py @@ -25,14 +25,15 @@ class ThumbnailCtrlDemo(wx.Frame): def __init__(self, parent, log): wx.Frame.__init__(self, parent, size=(850,800)) + self.name = "ThumbnailCtrl" self.SetIcon(images.Mondrian.GetIcon()) - self.SetTitle("ThumbnailCtrl wxPython Demo ;-)") + self.SetTitle(self.name + " wxPython Demo ;-)") self.statusbar = self.CreateStatusBar(2) self.statusbar.SetStatusWidths([-2, -1]) # statusbar fields - statusbar_fields = [("ThumbnailCtrl Demo, Michael Eager @ 15 Oct 2020"), + statusbar_fields = [(self.name + " Demo, Michael Eager @ 10 Nov 2020"), ("Welcome To wxPython!")] for i in range(len(statusbar_fields)): @@ -193,7 +194,7 @@ class ThumbnailCtrlDemo(wx.Frame): def OnAbout(self, event): - msg = "This Is The About Dialog Of The ThumbnailCtrl Demo.\n\n" + \ + msg = "This Is The About Dialog Of The " + self.name + " Demo.\n\n" + \ "Author: Andrea Gavana @ 10 Dec 2005\n\n" + \ "Modified: Michael Eager @ 15 Oct 2020\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ @@ -201,7 +202,7 @@ class ThumbnailCtrlDemo(wx.Frame): "eager@eagercon.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" - dlg = wx.MessageDialog(self, msg, "ThumbnailCtrl Demo", + dlg = wx.MessageDialog(self, msg, self.name + " Demo", wx.OK | wx.ICON_INFORMATION) dlg.SetFont(wx.Font(8, wx.NORMAL, wx.NORMAL, wx.NORMAL, False)) @@ -344,7 +345,7 @@ class ThumbnailCtrlDemo(wx.Frame): val = float(val) except: errstr = "Error: a float value is required." - dlg = wx.MessageDialog(self, errstr, "ThumbnailCtrlDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -354,7 +355,7 @@ class ThumbnailCtrlDemo(wx.Frame): if val < 1.0: errstr = "Error: zoom factor must be grater than 1.0." - dlg = wx.MessageDialog(self, errstr, "ThumbnailCtrlDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -371,7 +372,7 @@ class ThumbnailCtrlDemo(wx.Frame): height = int(self.textthumbheight.GetValue().strip()) except: errstr = "Error: thumb size must be integers (min 50x50)." - dlg = wx.MessageDialog(self, errstr, "ThumbnailCtrlDemo Error", + dlg = wx.MessageDialog(self, errstr, self.name + " Error", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() @@ -581,7 +582,7 @@ class ThumbnailCtrlDemo(wx.Frame): self.log.write("OnGlobalPopupMenu: say hello message...\n") msgstr = "Info: let's say hello to wxPython! " - dlg = wx.MessageDialog(self, msgstr, "ThumbnailCtrlDemo Info", + dlg = wx.MessageDialog(self, msgstr, self.name + " Info", wx.OK | wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() @@ -595,7 +596,7 @@ class ThumbnailCtrlDemo(wx.Frame): self.log.write("OnGlobalPopupMenu: number of thumbs: %d\n"%items) msgstr = "Info: number of thumbs: %d"%items - dlg = wx.MessageDialog(self, msgstr, "ThumbnailCtrlDemo Info", + dlg = wx.MessageDialog(self, msgstr, self.name + " Info", wx.OK | wx.ICON_INFORMATION) dlg.ShowModal() dlg.Destroy() @@ -646,5 +647,3 @@ if __name__ == '__main__': import sys,os import run run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:]) - -