Changeset e173956 in sasview

Timestamp:

Apr 21, 2013 9:24:43 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

af72b2e

Parents:

7267776a

Message:

some cleanups

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (5 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -217 +217 @@
         """
 
-        wx.MDIParentFrame.__init__(self, parent=parent, title=title, pos=pos, size=size)
+        wx.MDIParentFrame.__init__(self, parent=parent, title=title, pos=pos, 
+                                   style=style, size=size)
         # title
         self.title = title
@@ -967 +968 @@
         """
         # Look for plug-in panels
-        panels = []    
+        panels = []  
+        mac_pos_y = 40  
         for item in self.plugins:
             if hasattr(item, "get_panels"):
@@ -1002 +1004 @@
         w, h = self._get_panels_size(self._data_panel)
         win = MDIFrame(self, None, 'None', (w,h))
+        win.EnableCloseButton(False)
         self._data_panel = DataPanel(parent=win)
         win.set_panel(self._data_panel)
@@ -1011 +1014 @@
         else:
             flag = True
-        self._data_panel.frame.EnableCloseButton(False)
         win.Show(flag)
         d_panel_width = w
@@ -1029 +1031 @@
                     frame.SetSize((w, h))
                     frame.Show(False)
-                    """
-                    self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
-                                          Name(p.window_name).
-                                          CenterPane().
-                                          Center().
-                                          CloseButton(False).
-                                          Hide())
-                    """
             else:
                 self.panels[str(id)] = panel_class
                 frame.SetSize((w, h))
                 frame.Show(False)
-                #win = MDIFrame(self, p, p.window_name, (w, h))
-                #win.set_panel(p)
-                """
-                self._mgr.AddPane(p, wx.aui.AuiPaneInfo().
-                                  Name(p.window_name).Caption(p.window_caption).
-                                  Right().
-                                  Dock().
-                                  TopDockable().
-                                  BottomDockable().
-                                  LeftDockable().
-                                  RightDockable().
-                                  MinimizeButton().
-                                  Hide())        
-                """
             if not IS_WIN:
                 x_pos, _ = frame.GetPositionTuple()
-                _, y_size = self.GetSizeTuple()
-                frame.SetPosition((x_pos, y_size))
-        #if frame != None:
-        #    frame.EnableCloseButton(False)
+                frame.SetPosition((x_pos, mac_pos_y))
+
         if not IS_WIN:
-            self.SetSize((self._window_width, 5))
+            self.SetSize((self._window_width, 40))
         
     def update_data(self, prev_data, new_data):