Changeset 1b70098 in sasview

Timestamp:

Apr 13, 2009 8:00:45 AM (16 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:

2355e7d

Parents:

45ed4dad

Message:

generalize os.join for ball.ico

File:

• guiframe/gui_manager.py (modified) (4 diffs)

guiframe/gui_manager.py

@@ -194 +194 @@
                     filemode='w')        
         
-        path = os.path.dirname(__file__)
-        ico_file = os.path.join(path,'images/ball.ico')
+        path_up = os.path.dirname(__file__)
+        path = ico_file = os.path.join(path_up,'images')
+        ico_file = os.path.join(path,'ball.ico')
         if os.path.isfile(ico_file):
             self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         else:
-            ico_file = os.path.join(os.getcwd(),'images/ball.ico')
+            ico_file = os.path.join(os.getcwd(),'ball.ico')
             if os.path.isfile(ico_file):
                 self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
@@ -391 +392 @@
                                           Name(p.window_name).Caption(p.window_caption).
                                           CenterPane().
-                                          BestSize(wx.Size(600,600)).
+                                          BestSize(wx.Size(550,600)).
                                           MinSize(wx.Size(500,500)).
                                           Hide())
@@ -407 +408 @@
                                   MinimizeButton().
                                   Hide().
-                                  BestSize(wx.Size(600,600)).
+                                  BestSize(wx.Size(550,600)).
                                   MinSize(wx.Size(500,500)))
                                
@@ -464 +465 @@
                           #Hide().
                           #Show().
-                          BestSize(wx.Size(600,600)).
+                          BestSize(wx.Size(550,600)).
                           MinSize(wx.Size(500,500)))
                           #BestSize(wx.Size(400,400)).