From: <sv...@ww...> - 2005-02-05 18:40:42
|
Author: mkrose Date: 2005-02-05 10:40:32 -0800 (Sat, 05 Feb 2005) New Revision: 1464 Added: trunk/CSP/CSPSim/Tools/Layout/Images/ trunk/CSP/CSPSim/Tools/Layout/Images/move-on.png trunk/CSP/CSPSim/Tools/Layout/Images/move.png trunk/CSP/CSPSim/Tools/Layout/Images/move.xcf trunk/CSP/CSPSim/Tools/Layout/Images/rotate-on.png trunk/CSP/CSPSim/Tools/Layout/Images/rotate.png trunk/CSP/CSPSim/Tools/Layout/Images/rotate.xcf trunk/CSP/CSPSim/Tools/Layout/Images/views.xcf trunk/CSP/CSPSim/Tools/Layout/Images/viewz.png Modified: trunk/CSP/CSPSim/Tools/Layout/UI.py Log: Add icons needed by CSP layout. Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1464 Added: trunk/CSP/CSPSim/Tools/Layout/Images/move-on.png =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/move-on.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/move.png =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/move.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/move.xcf =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/move.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/rotate-on.png =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/rotate-on.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/rotate.png =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/rotate.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/rotate.xcf =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/rotate.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/views.xcf =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/views.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/CSP/CSPSim/Tools/Layout/Images/viewz.png =================================================================== (Binary files differ) Property changes on: trunk/CSP/CSPSim/Tools/Layout/Images/viewz.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/CSP/CSPSim/Tools/Layout/UI.py =================================================================== --- trunk/CSP/CSPSim/Tools/Layout/UI.py 2005-02-05 18:20:23 UTC (rev 1463) +++ trunk/CSP/CSPSim/Tools/Layout/UI.py 2005-02-05 18:40:32 UTC (rev 1464) @@ -558,8 +558,8 @@ control = None if type == RADIO: handler, name, help = tool[1:] - bm0 = wxBitmapFromImage(wxImage("%s.bmp" % name)) - bm1 = wxBitmapFromImage(wxImage("%s-on.bmp" % name)) + bm0 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s.png" % name))) + bm1 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s-on.png" % name))) toolbar.AddRadioTool(id, bm0, bm1, name, help) if handler is not None: EVT_TOOL(self, id, handler) @@ -574,22 +574,22 @@ EVT_BUTTON(self, id, handler) elif type == TOOL: handler, name, help = tool[1:] - bm0 = wxBitmapFromImage(wxImage("%s.bmp" % name)) + bm0 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s.png" % name))) bm1 = wxNullBitmap toolbar.AddTool(id, bm0, bm1, 1, name, help) if handler is not None: EVT_TOOL(self, id, handler) elif type == CHECK: handler, name, help = tool[1:] - bm0 = wxBitmapFromImage(wxImage("%s.bmp" % name)) - bm1 = wxBitmapFromImage(wxImage("%s-on.bmp" % name)) + bm0 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s.png" % name))) + bm1 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s-on.png" % name))) toolbar.AddCheckTool(id, bm0, bm1, name, help) if handler is not None: EVT_TOOL(self, id, handler) elif type == TOGGLE: handler, name, help = tool[1:] - bm0 = wxBitmapFromImage(wxImage("%s.bmp" % name)) - bm1 = wxBitmapFromImage(wxImage("%s-on.bmp" % name)) + bm0 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s.png" % name))) + bm1 = wxBitmapFromImage(wxImage(os.path.join("Images", "%s-on.png" % name))) control = wxBitmapToggleButton(toolbar, id, bm0) control.SetToolTip(wxToolTip(help)) control.SetBitmaps(bm0, bm1) |