From aa1e90e2f648f31efc0b46fa759f1d8d07e582cd Mon Sep 17 00:00:00 2001 From: tatiana Date: Wed, 18 Nov 2009 18:44:49 +0000 Subject: [PATCH] ENH: Toolbar icon for showing/hiding tasks --- .gitattributes | 1 - .pydevproject | 10 ---------- invesalius/gui/frame.py | 28 +++++++++++++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 .pydevproject diff --git a/.gitattributes b/.gitattributes index fffa1b6..53d26c1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ * text=auto !eol -/.pydevproject -text /AUTHORS.txt -text /HEADER.txt -text /INSTALL.txt -text diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index c76d824..0000000 --- a/.pydevproject +++ /dev/null @@ -1,10 +0,0 @@ - - - - - -/InVesalius3/src - -python 2.6 -Default - diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index 10b301b..0592858 100755 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -674,29 +674,28 @@ class LayoutToolBar(wx.ToolBar): self.parent = parent self.__init_items() self.__bind_events_wx() + self.ontool = False def __init_items(self): if sys.platform == 'darwin': - BMP_WITHOUT_MENU =\ + self.BMP_WITHOUT_MENU =\ wx.Bitmap(os.path.join(const.ICON_DIR, "layout_data_only_original.gif"), wx.BITMAP_TYPE_GIF) - BMP_WITH_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, + self.BMP_WITH_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, "layout_full_original.gif"), wx.BITMAP_TYPE_GIF) else: - BMP_WITHOUT_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, + self.BMP_WITHOUT_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, "layout_data_only.gif"), wx.BITMAP_TYPE_GIF) - BMP_WITH_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, + self.BMP_WITH_MENU = wx.Bitmap(os.path.join(const.ICON_DIR, "layout_full.gif"), wx.BITMAP_TYPE_GIF) - self.AddLabelTool(101, "Full layout", BMP_WITHOUT_MENU, kind = wx.ITEM_RADIO) - self.AddLabelTool(102, "Original layout", BMP_WITH_MENU, kind = wx.ITEM_RADIO) - self.ToggleTool(102, True) + self.AddLabelTool(101, "",bitmap=self.BMP_WITHOUT_MENU, shortHelp= "Hide task panel") self.Realize() @@ -704,8 +703,15 @@ class LayoutToolBar(wx.ToolBar): self.Bind(wx.EVT_TOOL, self.OnClick) def OnClick(self, evt): - - if (evt.GetId() == 101): - ps.Publisher().sendMessage('Hide task panel') - else: + if self.ontool: + self.SetToolNormalBitmap(101,self.BMP_WITHOUT_MENU ) ps.Publisher().sendMessage('Show task panel') + self.SetToolShortHelp(101,"Hide task panel") + self.ontool = False + else: + self.bitmap = self.BMP_WITH_MENU + self.SetToolNormalBitmap(101,self.BMP_WITH_MENU) + ps.Publisher().sendMessage('Hide task panel') + self.SetToolShortHelp(101, "Show task panel") + self.ontool = True + -- libgit2 0.21.2