Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the img2py tool to use PNG instead of XPM for embedding image

Browse Source 
data in Python source code, and the generated code now uses streams to
convert the image data to wxImage, wxBitmap, or wxIcon.

A few other changes to match recent additions to CVS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-02-26 22:35:10 +00:00
parent c2ff68d3fd
commit afb810d936
19 changed files with 3675 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wxPython/demo/Main.py
View File

@@ -113,14 +113,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__':
@@ -192,8 +185,8 @@ 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")
firstChild = None
@@ -256,12 +249,13 @@ class wxPythonDemo(wxFrame):
# add the windows to the splitter and split it.
splitter2.SplitHorizontally(self.nb, self.log)
splitter.SplitVertically(self.tree, splitter2)
splitter.SetSashPosition(180, true)
splitter.SetMinimumPaneSize(20)
splitter2.SetSashPosition(450, true)
splitter2.SetMinimumPaneSize(20)
splitter.SplitVertically(self.tree, splitter2)
splitter.SetSashPosition(180, true)
splitter.SetMinimumPaneSize(20)
# select initial items

0
wxPython/demo/bitmaps/noicon.png → wxPython/demo/bmp_source/noicon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

0
wxPython/demo/bitmaps/robin.jpg → wxPython/demo/bmp_source/robin.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

70
wxPython/demo/encode_bitmaps.py
View File

@@ -13,49 +13,51 @@ import img2py
command_lines = [
" -n Mondrian bmp_source/mondrian.ico images.py",
" -u -i -n Mondrian bmp_source/mondrian.ico images.py",
"-a -n _10s_ bmp_source/10s.gif images.py",
"-a -n _01c_ bmp_source/01c.gif images.py",
"-a -n _12h_ bmp_source/12h.gif images.py",
"-a -n _13d_ bmp_source/13d.gif images.py",
"-a -n Background bmp_source/backgrnd.png images.py",
"-a -n TestStar -m #FFFFFF bmp_source/teststar.png images.py",
"-a -n TestStar2 bmp_source/teststar.png images.py",
"-a -n TestMask bmp_source/testmask.bmp images.py",
"-a -u -n _10s_ bmp_source/10s.gif images.py",
"-a -u -n _01c_ bmp_source/01c.gif images.py",
"-a -u -n _12h_ bmp_source/12h.gif images.py",
"-a -u -n _13d_ bmp_source/13d.gif images.py",
"-a -u -n Background bmp_source/backgrnd.png images.py",
"-a -u -n TestStar -m #FFFFFF bmp_source/teststar.png images.py",
"-a -u -n TestStar2 bmp_source/teststar.png images.py",
"-a -u -n TestMask bmp_source/testmask.bmp images.py",
"-a -n Test2 bmp_source/test2.bmp images.py",
# "-a -n Robin bmp_source/robin.jpg images.py",
"-a -u -n Test2 bmp_source/test2.bmp images.py",
"-a -u -n Robin bmp_source/robin.jpg images.py",
"-a -n Bulb1 bmp_source/lb1.bmp images.py",
"-a -n Bulb2 bmp_source/lb2.bmp images.py",
"-a -u -n Bulb1 bmp_source/lb1.bmp images.py",
"-a -u -n Bulb2 bmp_source/lb2.bmp images.py",
"-a -n Calendar bmp_source/Calend.bmp images.py",
"-a -n DbDec bmp_source/DbDec.bmp images.py",
"-a -n Dec bmp_source/Dec.bmp images.py",
"-a -n Pt bmp_source/Pt.bmp images.py",
"-a -n DbInc bmp_source/DbInc.bmp images.py",
"-a -n Inc bmp_source/Inc.bmp images.py",
"-a -u -n Calendar bmp_source/Calend.bmp images.py",
"-a -u -n DbDec bmp_source/DbDec.bmp images.py",
"-a -u -n Dec bmp_source/Dec.bmp images.py",
"-a -u -n Pt bmp_source/Pt.bmp images.py",
"-a -u -n DbInc bmp_source/DbInc.bmp images.py",
"-a -u -n Inc bmp_source/Inc.bmp images.py",
"-a -n New -m #C0C0C0 bmp_source/new.bmp images.py",
"-a -n Open -m #C0C0C0 bmp_source/open.bmp images.py",
"-a -n Copy -m #C0C0C0 bmp_source/copy.bmp images.py",
"-a -n Paste -m #C0C0C0 bmp_source/paste.bmp images.py",
"-a -n Tog1 -m #C0C0C0 bmp_source/tog1.bmp images.py",
"-a -n Tog2 -m #C0C0C0 bmp_source/tog2.bmp images.py",
"-a -u -n New -m #C0C0C0 bmp_source/new.bmp images.py",
"-a -u -n Open -m #C0C0C0 bmp_source/open.bmp images.py",
"-a -u -n Copy -m #C0C0C0 bmp_source/copy.bmp images.py",
"-a -u -n Paste -m #C0C0C0 bmp_source/paste.bmp images.py",
"-a -u -n Tog1 -m #C0C0C0 bmp_source/tog1.bmp images.py",
"-a -u -n Tog2 -m #C0C0C0 bmp_source/tog2.bmp images.py",
"-a -n Smiles -m #FFFFFF bmp_source/smiles2.bmp images.py",
"-a -u -n Smiles -m #FFFFFF bmp_source/smiles2.bmp images.py",
"-a -n GridBG bmp_source/GridBG.gif images.py",
"-a -u -n GridBG bmp_source/GridBG.gif images.py",
"-a -n SmallUpArrow -m #0000FF bmp_source/sm_up.bmp images.py",
"-a -n SmallDnArrow -m #0000FF bmp_source/sm_down.bmp images.py",
"-a -u -n SmallUpArrow -m #0000FF bmp_source/sm_up.bmp images.py",
"-a -u -n SmallDnArrow -m #0000FF bmp_source/sm_down.bmp images.py",
"-a -n Folder1 -m #FFFFFF bmp_source/folder1.bmp images.py",
"-a -n Folder2 -m #FFFFFF bmp_source/folder2.bmp images.py",
"-a -n Folder3 -m #FFFFFF bmp_source/folder3.bmp images.py",
"-a -n File1 -m #FFFFFF bmp_source/file1.bmp images.py",
"-a -n File2 -m #FFFFFF bmp_source/file2.bmp images.py",
"-a -u -n Folder1 -m #FFFFFF bmp_source/folder1.bmp images.py",
"-a -u -n Folder2 -m #FFFFFF bmp_source/folder2.bmp images.py",
"-a -u -n Folder3 -m #FFFFFF bmp_source/folder3.bmp images.py",
"-a -u -n File1 -m #FFFFFF bmp_source/file1.bmp images.py",
"-a -u -n File2 -m #FFFFFF bmp_source/file2.bmp images.py",
"-a -u -n NoIcon bmp_source/noicon.png images.py"
]

5257
wxPython/demo/images.py
View File

File diff suppressed because it is too large Load Diff

3
wxPython/demo/wxMimeTypesManager.py
View File

@@ -165,9 +165,10 @@ overview = """\
import mimetypes_wdr
import images
def MyBitmapsFunc( index ):
return wxImage( opj("bitmaps/noicon.png"), wxBITMAP_TYPE_PNG ).ConvertToBitmap()
return images.getNoIconBitmap()
mimetypes_wdr.MyBitmapsFunc = MyBitmapsFunc

6
wxPython/demo/wxStaticBitmap.py
View File

@@ -21,11 +21,7 @@ class TestPanel(wxPanel):
wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
wxSize(bmp.GetWidth(), bmp.GetHeight()))
# This one doesn't convert to the embedded format very well,
# (lots of colors so it explodes in size and takes a noticable
# amount of time to convert back to a bitmap.) So we'll just
# do it the old way
bmp = wxBitmap(opj('bitmaps/robin.jpg'), wxBITMAP_TYPE_JPEG)
bmp = images.getRobinBitmap()
wxStaticBitmap(self, -1, bmp, (80, 150))
wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",