Download as
Browse Code »

Commit a3bf2d1b69d8f55988845f53b14b5ca04710d222

Authored by Thiago Franco de Moraes
1 parent b13d34ff
Exists in mactoolbar_bkp

Converted ProjectToolbat to auitoolbar

Showing 1 changed file with 23 additions and 11 deletions   Show diff stats
invesalius/gui/frame.py
  Diff comments   View file @a3bf2d1
@@ -881,14 +881,14 @@ class TaskBarIcon(wx.TaskBarIcon): @@ -881,14 +881,14 @@ class TaskBarIcon(wx.TaskBarIcon):
881 # ------------------------------------------------------------------ 881 # ------------------------------------------------------------------
882 # ------------------------------------------------------------------ 882 # ------------------------------------------------------------------
883 883
884 -class ProjectToolBar(wx.ToolBar): 884 +class ProjectToolBar(AuiToolBar):
885 """ 885 """
886 Toolbar related to general project operations, including: import, 886 Toolbar related to general project operations, including: import,
887 open, save and saveas, among others. 887 open, save and saveas, among others.
888 """ 888 """
889 def __init__(self, parent): 889 def __init__(self, parent):
890 style = wx.TB_FLAT|wx.TB_NODIVIDER| wx.TB_DOCKABLE 890 style = wx.TB_FLAT|wx.TB_NODIVIDER| wx.TB_DOCKABLE
891 - wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, 891 + AuiToolBar.__init__(self, parent, -1, wx.DefaultPosition,
892 wx.DefaultSize, 892 wx.DefaultSize,
893 style) 893 style)
894 self.SetToolBitmapSize(wx.Size(32,32)) 894 self.SetToolBitmapSize(wx.Size(32,32))
@@ -956,21 +956,27 @@ class ProjectToolBar(wx.ToolBar): @@ -956,21 +956,27 @@ class ProjectToolBar(wx.ToolBar):
956 BMP_PHOTO = wx.Bitmap(path, wx.BITMAP_TYPE_PNG) 956 BMP_PHOTO = wx.Bitmap(path, wx.BITMAP_TYPE_PNG)
957 957
958 # Create tool items based on bitmaps 958 # Create tool items based on bitmaps
959 - self.AddLabelTool(const.ID_DICOM_IMPORT, 959 + self.AddTool(const.ID_DICOM_IMPORT,
960 "", 960 "",
961 - shortHelp =_("Import DICOM files...\tCtrl+I"),  
962 - bitmap=BMP_IMPORT) 961 + BMP_IMPORT,
  962 + wx.NullBitmap,
  963 + wx.ITEM_NORMAL,
  964 + short_help_string =_("Import DICOM files...\tCtrl+I"))
963 #self.AddLabelTool(const.ID_DICOM_LOAD_NET, 965 #self.AddLabelTool(const.ID_DICOM_LOAD_NET,
964 # "Load medical image...", 966 # "Load medical image...",
965 # BMP_NET) 967 # BMP_NET)
966 - self.AddLabelTool(const.ID_PROJECT_OPEN, 968 + self.AddTool(const.ID_PROJECT_OPEN,
967 "", 969 "",
968 - shortHelp =_("Open InVesalius project..."),  
969 - bitmap=BMP_OPEN)  
970 - self.AddLabelTool(const.ID_PROJECT_SAVE, 970 + BMP_OPEN,
  971 + wx.NullBitmap,
  972 + wx.ITEM_NORMAL,
  973 + short_help_string =_("Open InVesalius project..."))
  974 + self.AddTool(const.ID_PROJECT_SAVE,
971 "", 975 "",
972 - shortHelp = _("Save InVesalius project"),  
973 - bitmap=BMP_SAVE) 976 + BMP_SAVE,
  977 + wx.NullBitmap,
  978 + wx.ITEM_NORMAL,
  979 + short_help_string = _("Save InVesalius project"))
974 #self.AddLabelTool(const.ID_SAVE_SCREENSHOT, 980 #self.AddLabelTool(const.ID_SAVE_SCREENSHOT,
975 # "Take photo of screen", 981 # "Take photo of screen",
976 # BMP_PHOTO) 982 # BMP_PHOTO)
@@ -988,6 +994,7 @@ class ProjectToolBar(wx.ToolBar): @@ -988,6 +994,7 @@ class ProjectToolBar(wx.ToolBar):
988 self.SetStateProjectOpen() 994 self.SetStateProjectOpen()
989 else: 995 else:
990 self.SetStateProjectClose() 996 self.SetStateProjectClose()
  997 + self.Refresh()
991 998
992 def SetStateProjectClose(self): 999 def SetStateProjectClose(self):
993 """ 1000 """
@@ -995,6 +1002,7 @@ class ProjectToolBar(wx.ToolBar): @@ -995,6 +1002,7 @@ class ProjectToolBar(wx.ToolBar):
995 """ 1002 """
996 for tool in self.enable_items: 1003 for tool in self.enable_items:
997 self.EnableTool(tool, False) 1004 self.EnableTool(tool, False)
  1005 + self.Refresh()
998 1006
999 def SetStateProjectOpen(self): 1007 def SetStateProjectOpen(self):
1000 """ 1008 """
@@ -1002,6 +1010,7 @@ class ProjectToolBar(wx.ToolBar): @@ -1002,6 +1010,7 @@ class ProjectToolBar(wx.ToolBar):
1002 """ 1010 """
1003 for tool in self.enable_items: 1011 for tool in self.enable_items:
1004 self.EnableTool(tool, True) 1012 self.EnableTool(tool, True)
  1013 + self.Refresh()
1005 1014
1006 1015
1007 1016
@@ -1167,6 +1176,7 @@ class ObjectToolBar(AuiToolBar): @@ -1167,6 +1176,7 @@ class ObjectToolBar(AuiToolBar):
1167 self.SetStateProjectOpen() 1176 self.SetStateProjectOpen()
1168 else: 1177 else:
1169 self.SetStateProjectClose() 1178 self.SetStateProjectClose()
  1179 + self.Refresh()
1170 1180
1171 def _UntoggleAllItems(self, pubsub_evt=None): 1181 def _UntoggleAllItems(self, pubsub_evt=None):
1172 """ 1182 """
@@ -1488,6 +1498,7 @@ class LayoutToolBar(AuiToolBar): @@ -1488,6 +1498,7 @@ class LayoutToolBar(AuiToolBar):
1488 self.SetStateProjectOpen() 1498 self.SetStateProjectOpen()
1489 else: 1499 else:
1490 self.SetStateProjectClose() 1500 self.SetStateProjectClose()
  1501 + self.Refresh()
1491 1502
1492 def _SetLayoutWithoutTask(self, pubsub_evt): 1503 def _SetLayoutWithoutTask(self, pubsub_evt):
1493 """ 1504 """
@@ -1660,6 +1671,7 @@ class HistoryToolBar(AuiToolBar): @@ -1660,6 +1671,7 @@ class HistoryToolBar(AuiToolBar):
1660 self.SetStateProjectOpen() 1671 self.SetStateProjectOpen()
1661 else: 1672 else:
1662 self.SetStateProjectClose() 1673 self.SetStateProjectClose()
  1674 + self.Refresh()
1663 1675
1664 def _SetLayoutWithoutTask(self, pubsub_evt): 1676 def _SetLayoutWithoutTask(self, pubsub_evt):
1665 """ 1677 """