Commit a5210f00b39f46114d77ea381b957ca458ffc051
1 parent
c64e6b6c
Exists in
master
and in
68 other branches
ENC: GUI toolbar in Linux and MacOS
Showing
1 changed file
with
12 additions
and
12 deletions
Show diff stats
invesalius/gui/frame.py
| ... | ... | @@ -97,24 +97,24 @@ class Frame(wx.Frame): |
| 97 | 97 | |
| 98 | 98 | if sys.platform == 'win32': |
| 99 | 99 | t1 = ProjectToolBar(self) |
| 100 | - #t2 = LayoutToolBar(self) | |
| 100 | + t2 = LayoutToolBar(self) | |
| 101 | 101 | t3 = ObjectToolBar(self) |
| 102 | 102 | t4 = SliceToolBar(self) |
| 103 | 103 | else: |
| 104 | - t4 = SliceToolBar(self) | |
| 105 | - t3 = ProjectToolBar(self) | |
| 106 | - #t2 = LayoutToolBar(self) | |
| 107 | - t1 = ObjectToolBar(self) | |
| 108 | - | |
| 104 | + t4 = ProjectToolBar(self) | |
| 105 | + t3 = LayoutToolBar(self) | |
| 106 | + t2 = ObjectToolBar(self) | |
| 107 | + t1 = SliceToolBar(self) | |
| 108 | + | |
| 109 | 109 | aui_manager.AddPane(t1, wx.aui.AuiPaneInfo(). |
| 110 | 110 | Name("General Features Toolbar"). |
| 111 | 111 | ToolbarPane().Top().Floatable(False). |
| 112 | 112 | LeftDockable(False).RightDockable(False)) |
| 113 | 113 | |
| 114 | - #aui_manager.AddPane(t2, wx.aui.AuiPaneInfo(). | |
| 115 | - # Name("Layout Toolbar"). | |
| 116 | - # ToolbarPane().Top().Floatable(False). | |
| 117 | - # LeftDockable(False).RightDockable(False)) | |
| 114 | + aui_manager.AddPane(t2, wx.aui.AuiPaneInfo(). | |
| 115 | + Name("Layout Toolbar"). | |
| 116 | + ToolbarPane().Top().Floatable(False). | |
| 117 | + LeftDockable(False).RightDockable(False)) | |
| 118 | 118 | |
| 119 | 119 | aui_manager.AddPane(t3, wx.aui.AuiPaneInfo(). |
| 120 | 120 | Name("Project Toolbar"). |
| ... | ... | @@ -366,7 +366,7 @@ class ObjectToolBar(wx.ToolBar): |
| 366 | 366 | wx.BITMAP_TYPE_PNG) |
| 367 | 367 | BMP_ZOOM = wx.Bitmap("../icons/tool_zoom_original.png", |
| 368 | 368 | wx.BITMAP_TYPE_PNG) |
| 369 | - BMP_ZOOM_OUT = wx.Bitmap("../icons/tool_zoom_select_original.png", | |
| 369 | + BMP_ZOOM_SELECT = wx.Bitmap("../icons/tool_zoom_select_original.png", | |
| 370 | 370 | wx.BITMAP_TYPE_PNG) |
| 371 | 371 | BMP_CONTRAST = wx.Bitmap("../icons/tool_contrast.png", |
| 372 | 372 | wx.BITMAP_TYPE_PNG) |
| ... | ... | @@ -510,4 +510,4 @@ class LayoutToolBar(wx.ToolBar): |
| 510 | 510 | self.Realize() |
| 511 | 511 | |
| 512 | 512 | def __bind_events(self): |
| 513 | - pass | |
| 514 | 513 | \ No newline at end of file |
| 514 | + pass | ... | ... |