From f6f98ecccd755993c8ba6354281fad271917be25 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 8 Aug 2002 18:28:21 +0000 Subject: [PATCH] Moved tools to be a Python package in wxPython.tools, added scripts to import and launch each tool. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/CHANGES.txt | 2 ++ wxPython/MANIFEST.in | 18 +++++++++------- wxPython/distrib/make_installer.py | 18 +++++++++------- wxPython/scripts/img2png | 5 +++++ wxPython/scripts/img2py | 6 ++++++ wxPython/scripts/img2xpm | 5 +++++ wxPython/scripts/xrced | 4 ++++ wxPython/setup.py | 10 ++++++++- wxPython/wxPython/lib/__init__.py | 1 + wxPython/{ => wxPython}/tools/XRCed/CHANGES | 0 wxPython/{ => wxPython}/tools/XRCed/README | 0 wxPython/{ => wxPython}/tools/XRCed/TODO | 0 wxPython/wxPython/tools/XRCed/__init__.py | 4 ++++ wxPython/{ => wxPython}/tools/XRCed/images.py | 0 wxPython/{ => wxPython}/tools/XRCed/params.py | 0 wxPython/{ => wxPython}/tools/XRCed/xrced.ico | Bin wxPython/{ => wxPython}/tools/XRCed/xrced.py | 20 ++++++++++++++---- wxPython/{ => wxPython}/tools/XRCed/xrced.sh | 0 wxPython/{ => wxPython}/tools/XRCed/xrced.xrc | 0 wxPython/{ => wxPython}/tools/XRCed/xxx.py | 0 wxPython/wxPython/tools/__init__.py | 4 ++++ wxPython/{ => wxPython}/tools/img2img.py | 0 wxPython/{ => wxPython}/tools/img2png.py | 7 +++++- wxPython/{ => wxPython}/tools/img2py.py | 0 wxPython/{ => wxPython}/tools/img2xpm.py | 8 ++++++- 25 files changed, 89 insertions(+), 23 deletions(-) create mode 100755 wxPython/scripts/img2png create mode 100755 wxPython/scripts/img2py create mode 100755 wxPython/scripts/img2xpm create mode 100755 wxPython/scripts/xrced rename wxPython/{ => wxPython}/tools/XRCed/CHANGES (100%) rename wxPython/{ => wxPython}/tools/XRCed/README (100%) rename wxPython/{ => wxPython}/tools/XRCed/TODO (100%) create mode 100644 wxPython/wxPython/tools/XRCed/__init__.py rename wxPython/{ => wxPython}/tools/XRCed/images.py (100%) rename wxPython/{ => wxPython}/tools/XRCed/params.py (100%) rename wxPython/{ => wxPython}/tools/XRCed/xrced.ico (100%) rename wxPython/{ => wxPython}/tools/XRCed/xrced.py (99%) rename wxPython/{ => wxPython}/tools/XRCed/xrced.sh (100%) rename wxPython/{ => wxPython}/tools/XRCed/xrced.xrc (100%) rename wxPython/{ => wxPython}/tools/XRCed/xxx.py (100%) create mode 100644 wxPython/wxPython/tools/__init__.py rename wxPython/{ => wxPython}/tools/img2img.py (100%) rename wxPython/{ => wxPython}/tools/img2png.py (86%) rename wxPython/{ => wxPython}/tools/img2py.py (100%) rename wxPython/{ => wxPython}/tools/img2xpm.py (86%) diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt index 21eb15506d..579493668d 100644 --- a/wxPython/CHANGES.txt +++ b/wxPython/CHANGES.txt @@ -155,6 +155,8 @@ respond to mouse events and etc. Changed the wxDateTime.Parse* methods to return an int that will be -1 on failure, and the index where parsing stopped otherwise. +Moved tools to be a Python package in wxPython.tools, added scripts to +import and launch each tool. diff --git a/wxPython/MANIFEST.in b/wxPython/MANIFEST.in index 844ec9f2df..11ad108fbd 100644 --- a/wxPython/MANIFEST.in +++ b/wxPython/MANIFEST.in @@ -100,14 +100,16 @@ include src/mac/*.cpp include src/mac/*.h include src/mac/*.py -include tools/*.py -include tools/XRCed/CHANGES -include tools/XRCed/TODO -include tools/XRCed/README -include tools/XRCed/*.py -include tools/XRCed/*.xrc -include tools/XRCed/*.ico -include tools/XRCed/*.sh +include wxPython/tools/*.py +include wxPython/tools/XRCed/CHANGES +include wxPython/tools/XRCed/TODO +include wxPython/tools/XRCed/README +include wxPython/tools/XRCed/*.py +include wxPython/tools/XRCed/*.xrc +include wxPython/tools/XRCed/*.ico +include wxPython/tools/XRCed/*.sh + +include scripts/* include contrib/glcanvas/*.i include contrib/glcanvas/*.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 0532fd5bb0..b7ed38f9a0 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -136,14 +136,16 @@ Source: "licence\*.txt"; DestDir: "{app}\wxPython\docs\licenc Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wxPython\docs"; Components: docs Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\wxPython\docs"; Components: docs -Source: "tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools -Source: "tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\*.ico"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "tools\XRCed\*.sh"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools +Source: "wxPython\tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.ico"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.sh"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools + +;; Where to put the scripts on Win32??? Source: "samples\doodle\*.py"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples Source: "samples\doodle\*.txt"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples diff --git a/wxPython/scripts/img2png b/wxPython/scripts/img2png new file mode 100755 index 0000000000..690072ec46 --- /dev/null +++ b/wxPython/scripts/img2png @@ -0,0 +1,5 @@ +#!/usr/bin/env python + +from wxPython.tools.img2png import main +main() + diff --git a/wxPython/scripts/img2py b/wxPython/scripts/img2py new file mode 100755 index 0000000000..a3ce91bbd3 --- /dev/null +++ b/wxPython/scripts/img2py @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +import sys +from wxPython.tools.img2py import main +main(sys.argv[1:]) + diff --git a/wxPython/scripts/img2xpm b/wxPython/scripts/img2xpm new file mode 100755 index 0000000000..899faf12f2 --- /dev/null +++ b/wxPython/scripts/img2xpm @@ -0,0 +1,5 @@ +#!/usr/bin/env python + +from wxPython.tools.img2xpm import main +main() + diff --git a/wxPython/scripts/xrced b/wxPython/scripts/xrced new file mode 100755 index 0000000000..135192e440 --- /dev/null +++ b/wxPython/scripts/xrced @@ -0,0 +1,4 @@ +#!/usr/bin/env python + +from wxPython.tools.XRCed.xrced import main +main() diff --git a/wxPython/setup.py b/wxPython/setup.py index 3f402d577e..66226f0fde 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -904,14 +904,22 @@ if __name__ == "__main__": PKGDIR+'.lib.editor', PKGDIR+'.lib.mixins', PKGDIR+'.lib.PyCrust', + PKGDIR+'.tools', + PKGDIR+'.tools.XRCed', ], ext_package = PKGDIR, ext_modules = wxpExtensions, - options = { 'build' : { 'build_base' : BUILD_BASE }} + options = { 'build' : { 'build_base' : BUILD_BASE }}, ##data_files = TOOLS, + + scripts = ['scripts/img2png', + 'scripts/img2xpm', + 'scripts/img2py', + 'scripts/xrced', + ], ) else: diff --git a/wxPython/wxPython/lib/__init__.py b/wxPython/wxPython/lib/__init__.py index b28b04f643..54e9b268d8 100644 --- a/wxPython/wxPython/lib/__init__.py +++ b/wxPython/wxPython/lib/__init__.py @@ -1,3 +1,4 @@ +# diff --git a/wxPython/tools/XRCed/CHANGES b/wxPython/wxPython/tools/XRCed/CHANGES similarity index 100% rename from wxPython/tools/XRCed/CHANGES rename to wxPython/wxPython/tools/XRCed/CHANGES diff --git a/wxPython/tools/XRCed/README b/wxPython/wxPython/tools/XRCed/README similarity index 100% rename from wxPython/tools/XRCed/README rename to wxPython/wxPython/tools/XRCed/README diff --git a/wxPython/tools/XRCed/TODO b/wxPython/wxPython/tools/XRCed/TODO similarity index 100% rename from wxPython/tools/XRCed/TODO rename to wxPython/wxPython/tools/XRCed/TODO diff --git a/wxPython/wxPython/tools/XRCed/__init__.py b/wxPython/wxPython/tools/XRCed/__init__.py new file mode 100644 index 0000000000..54e9b268d8 --- /dev/null +++ b/wxPython/wxPython/tools/XRCed/__init__.py @@ -0,0 +1,4 @@ +# + + + diff --git a/wxPython/tools/XRCed/images.py b/wxPython/wxPython/tools/XRCed/images.py similarity index 100% rename from wxPython/tools/XRCed/images.py rename to wxPython/wxPython/tools/XRCed/images.py diff --git a/wxPython/tools/XRCed/params.py b/wxPython/wxPython/tools/XRCed/params.py similarity index 100% rename from wxPython/tools/XRCed/params.py rename to wxPython/wxPython/tools/XRCed/params.py diff --git a/wxPython/tools/XRCed/xrced.ico b/wxPython/wxPython/tools/XRCed/xrced.ico similarity index 100% rename from wxPython/tools/XRCed/xrced.ico rename to wxPython/wxPython/tools/XRCed/xrced.ico diff --git a/wxPython/tools/XRCed/xrced.py b/wxPython/wxPython/tools/XRCed/xrced.py similarity index 99% rename from wxPython/tools/XRCed/xrced.py rename to wxPython/wxPython/tools/XRCed/xrced.py index 503c1b1b0f..0584f63043 100644 --- a/wxPython/tools/XRCed/xrced.py +++ b/wxPython/wxPython/tools/XRCed/xrced.py @@ -72,7 +72,10 @@ def SetMenu(m, list): class Panel(wxNotebook): def __init__(self, parent, id = -1): wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM) - sys.modules['params'].panel = self + ##sys.modules['params'].panel = self + import params + params.panel = self + # List of child windows self.pages = [] # Create scrolled windows for pages @@ -997,7 +1000,8 @@ class Frame(wxFrame): frame = self wxFrame.__init__(self, None, -1, '', pos, size) self.CreateStatusBar() - icon = wxIcon(os.path.join(sys.path[0], 'xrced.ico'), wxBITMAP_TYPE_ICO) + progpath = os.path.split(__file__)[0] + icon = wxIcon(os.path.join(progpath, 'xrced.ico'), wxBITMAP_TYPE_ICO) self.SetIcon(icon) # Idle flag @@ -1114,10 +1118,14 @@ class Frame(wxFrame): splitter = wxSplitterWindow(self, -1, style=wxSP_3DSASH) self.splitter = splitter splitter.SetMinimumPaneSize(100) + # Create tree global tree tree = XML_Tree(splitter, -1) - sys.modules['xxx'].tree = tree + ##sys.modules['xxx'].tree = tree + import xxx + xxx.tree = tree + # !!! frame styles are broken # Miniframe for not embedded mode miniFrame = wxFrame(self, -1, 'Properties Panel', @@ -1880,7 +1888,9 @@ class App(wxApp): frame = Frame(pos, size) frame.Show(true) # Load resources from XRC file (!!! should be transformed to .py later?) - sys.modules['params'].frame = frame + ##sys.modules['params'].frame = frame + import params + params.frame = frame frame.res = wxXmlResource('') frame.res.Load(os.path.join(sys.path[0], 'xrced.xrc')) @@ -1893,6 +1903,7 @@ class App(wxApp): def OnExit(self): # Write config + global conf wc = wxConfigBase_Get() wc.WriteInt('autorefresh', conf.autoRefresh) wc.WriteInt('x', conf.x) @@ -1908,6 +1919,7 @@ class App(wxApp): wc.WriteInt('panelHeight', conf.panelHeight) wc.WriteInt('nopanic', 1) wc.Flush() + del conf def main(): app = App() diff --git a/wxPython/tools/XRCed/xrced.sh b/wxPython/wxPython/tools/XRCed/xrced.sh similarity index 100% rename from wxPython/tools/XRCed/xrced.sh rename to wxPython/wxPython/tools/XRCed/xrced.sh diff --git a/wxPython/tools/XRCed/xrced.xrc b/wxPython/wxPython/tools/XRCed/xrced.xrc similarity index 100% rename from wxPython/tools/XRCed/xrced.xrc rename to wxPython/wxPython/tools/XRCed/xrced.xrc diff --git a/wxPython/tools/XRCed/xxx.py b/wxPython/wxPython/tools/XRCed/xxx.py similarity index 100% rename from wxPython/tools/XRCed/xxx.py rename to wxPython/wxPython/tools/XRCed/xxx.py diff --git a/wxPython/wxPython/tools/__init__.py b/wxPython/wxPython/tools/__init__.py new file mode 100644 index 0000000000..54e9b268d8 --- /dev/null +++ b/wxPython/wxPython/tools/__init__.py @@ -0,0 +1,4 @@ +# + + + diff --git a/wxPython/tools/img2img.py b/wxPython/wxPython/tools/img2img.py similarity index 100% rename from wxPython/tools/img2img.py rename to wxPython/wxPython/tools/img2img.py diff --git a/wxPython/tools/img2png.py b/wxPython/wxPython/tools/img2png.py similarity index 86% rename from wxPython/tools/img2png.py rename to wxPython/wxPython/tools/img2png.py index aea14f2694..76e7f6db06 100644 --- a/wxPython/tools/img2png.py +++ b/wxPython/wxPython/tools/img2png.py @@ -26,6 +26,11 @@ import sys import img2img from wxPython import wx -img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_PNG, ".png", __doc__) +def main(): + img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_PNG, ".png", __doc__) + +if __name__ == '__main__': + main() + diff --git a/wxPython/tools/img2py.py b/wxPython/wxPython/tools/img2py.py similarity index 100% rename from wxPython/tools/img2py.py rename to wxPython/wxPython/tools/img2py.py diff --git a/wxPython/tools/img2xpm.py b/wxPython/wxPython/tools/img2xpm.py similarity index 86% rename from wxPython/tools/img2xpm.py rename to wxPython/wxPython/tools/img2xpm.py index e6da69e8d8..2b9a99555c 100644 --- a/wxPython/tools/img2xpm.py +++ b/wxPython/wxPython/tools/img2xpm.py @@ -26,6 +26,12 @@ import sys import img2img from wxPython import wx -img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_XPM, ".xpm", __doc__) +def main(): + img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_XPM, ".xpm", __doc__) + + +if __name__ == '__main__': + main() +