# HG changeset patch # User laurent # Date 1347469873 -7200 # Node ID 4e84161cce19356dfed4e5146b20ee132ac1db6c # Parent 319dac4c4fd36778ae6f280822df9bb3f5a81b20 Fix bug with tree icons in BrowseLocationsDialog diff -r 319dac4c4fd3 -r 4e84161cce19 dialogs/BrowseLocationsDialog.py --- a/dialogs/BrowseLocationsDialog.py Wed Sep 12 01:17:01 2012 +0200 +++ b/dialogs/BrowseLocationsDialog.py Wed Sep 12 19:11:13 2012 +0200 @@ -23,13 +23,12 @@ from plcopen.structures import LOCATIONDATATYPES from PLCControler import LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY +from util.BitmapLibrary import GetBitmap #------------------------------------------------------------------------------- # Helpers #------------------------------------------------------------------------------- -CWD = os.path.split(os.path.split(os.path.realpath(__file__))[0])[0] - def GetDirChoiceOptions(): _ = lambda x : x return [(_("All"), [LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY]), @@ -105,7 +104,7 @@ ("VAR_INPUT", LOCATION_VAR_INPUT), ("VAR_OUTPUT", LOCATION_VAR_OUTPUT), ("VAR_LOCAL", LOCATION_VAR_MEMORY)]: - self.TreeImageDict[itemtype]=self.TreeImageList.Add(wx.Bitmap(os.path.join(CWD, 'Images', '%s.png'%imgname))) + self.TreeImageDict[itemtype]=self.TreeImageList.Add(GetBitmap(imgname)) # Assign icon list to TreeCtrls self.LocationsTree.SetImageList(self.TreeImageList)