Download as
Browse Code »

Commit ae2012a4d7eb732e15b9a5d6c483dc5d03a6cc15

Authored by tatiana
1 parent 93044664
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

ENH: Changed project toolbari to aui

Showing 1 changed file with 15 additions and 25 deletions   Show diff stats
invesalius/gui/frame.py
  Diff comments   View file @ae2012a
@@ -20,6 +20,7 @@ import sys @@ -20,6 +20,7 @@ import sys
20 20
21 import wx 21 import wx
22 import wx.aui 22 import wx.aui
  23 +import wx.lib.agw.aui as aui
23 import wx.lib.pubsub as ps 24 import wx.lib.pubsub as ps
24 import math 25 import math
25 26
@@ -292,10 +293,11 @@ class TaskBarIcon(wx.TaskBarIcon): @@ -292,10 +293,11 @@ class TaskBarIcon(wx.TaskBarIcon):
292 293
293 # ------------------------------------------------------------------------------ 294 # ------------------------------------------------------------------------------
294 295
295 -class ProjectToolBar(wx.ToolBar): 296 +class ProjectToolBar(aui.AuiToolBar):
296 def __init__(self, parent): 297 def __init__(self, parent):
297 - wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition,  
298 - wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER) 298 + aui.AuiToolBar.__init__(self, parent, -1, wx.DefaultPosition,
  299 + wx.DefaultSize,
  300 + aui.AUI_TB_DEFAULT_STYLE|aui.AUI_TB_OVERFLOW)
299 301
300 self.SetToolBitmapSize(wx.Size(32,32)) 302 self.SetToolBitmapSize(wx.Size(32,32))
301 303
@@ -306,35 +308,23 @@ class ProjectToolBar(wx.ToolBar): @@ -306,35 +308,23 @@ class ProjectToolBar(wx.ToolBar):
306 def __init_items(self): 308 def __init_items(self):
307 309
308 310
309 - if sys.platform == 'darwin':  
310 - BMP_IMPORT = wx.Bitmap("../icons/file_import_original.png",  
311 - wx.BITMAP_TYPE_PNG)  
312 - BMP_NET = wx.Bitmap("../icons/file_from_internet_original.png",  
313 - wx.BITMAP_TYPE_PNG)  
314 - BMP_SAVE = wx.Bitmap("../icons/file_save_original.png",  
315 - wx.BITMAP_TYPE_PNG)  
316 - BMP_PRINT = wx.Bitmap("../icons/print_original.png",  
317 - wx.BITMAP_TYPE_PNG)  
318 - BMP_PHOTO = wx.Bitmap("../icons/tool_photo_original.png",  
319 - wx.BITMAP_TYPE_PNG)  
320 - else:  
321 - BMP_IMPORT = wx.Bitmap("../icons/file_import.png", 311 + BMP_IMPORT = wx.Bitmap("../icons/file_import.png",
322 wx.BITMAP_TYPE_PNG) 312 wx.BITMAP_TYPE_PNG)
323 - BMP_NET = wx.Bitmap("../icons/file_from_internet.png", 313 + BMP_NET = wx.Bitmap("../icons/file_from_internet.png",
324 wx.BITMAP_TYPE_PNG) 314 wx.BITMAP_TYPE_PNG)
325 - BMP_SAVE = wx.Bitmap("../icons/file_save.png", 315 + BMP_SAVE = wx.Bitmap("../icons/file_save.png",
326 wx.BITMAP_TYPE_PNG) 316 wx.BITMAP_TYPE_PNG)
327 - BMP_PRINT = wx.Bitmap("../icons/print.png", 317 + BMP_PRINT = wx.Bitmap("../icons/print.png",
328 wx.BITMAP_TYPE_PNG) 318 wx.BITMAP_TYPE_PNG)
329 - BMP_PHOTO = wx.Bitmap("../icons/tool_photo.png", 319 + BMP_PHOTO = wx.Bitmap("../icons/tool_photo.png",
330 wx.BITMAP_TYPE_PNG) 320 wx.BITMAP_TYPE_PNG)
331 321
332 - self.AddLabelTool(ID_FILE_IMPORT, "Import medical image...", BMP_IMPORT)  
333 - self.AddLabelTool(ID_FILE_LOAD_INTERNET, "Load medical image...", 322 + self.AddSimpleTool(ID_FILE_IMPORT, "Import medical image...", BMP_IMPORT)
  323 + self.AddSimpleTool(ID_FILE_LOAD_INTERNET, "Load medical image...",
334 BMP_NET) 324 BMP_NET)
335 - self.AddLabelTool(ID_FILE_SAVE, "Save InVesalius project", BMP_SAVE)  
336 - self.AddLabelTool(101, "Take photo of screen", BMP_PHOTO)  
337 - self.AddLabelTool(ID_FILE_PRINT, "Print medical image...", BMP_PRINT) 325 + self.AddSimpleTool(ID_FILE_SAVE, "Save InVesalius project", BMP_SAVE)
  326 + self.AddSimpleTool(101, "Take photo of screen", BMP_PHOTO)
  327 + self.AddSimpleTool(ID_FILE_PRINT, "Print medical image...", BMP_PRINT)
338 328
339 329
340 self.Realize() 330 self.Realize()