Changeset 7e44299 in sasview

Timestamp:

Apr 5, 2014 8:37:54 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

164d64f

Parents:

1d4e2e7

Message:

Fix FTOL dialog size

Location:

src/sans

Files:

• guiframe/gui_statusbar.py (modified) (3 diffs)
• perspectives/fitting/ftol_dialog.py (modified) (1 diff)

src/sans/guiframe/gui_statusbar.py

@@ -135 +135 @@
         self.status_color = wx.StaticText(self, id=wx.NewId(), label="   ")
         self.status_color.SetBackgroundColour(GREEN)
+        self.status_color.SetForegroundColour(GREEN)
 
         # Create the button used to show the console dialog
@@ -213 +214 @@
         self.list_msg.append(text)
         self.status_color.SetBackgroundColour(GREEN)
+        self.status_color.SetForegroundColour(GREEN)
 
         if self.frame is not None :
@@ -296 +298 @@
         if msg == "warning":
             self.status_color.SetBackgroundColour(YELLOW)
+            self.status_color.SetForegroundColour(YELLOW)
         elif msg == "error":
             self.status_color.SetBackgroundColour(RED)
+            self.status_color.SetForegroundColour(RED)
         else:
             self.status_color.SetBackgroundColour(GREEN)
+            self.status_color.SetForegroundColour(GREEN)
     
     def set_dialog(self, event):

src/sans/perspectives/fitting/ftol_dialog.py

@@ -19 +19 @@
 SANS_F_TOL = 5e-05
 
+PANEL_HEIGHT = 265
+FONT_VARIANT = 0
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 270
-    PANEL_HEIGHT = 265
-    FONT_VARIANT = 0
 else:
     PANEL_WIDTH = 285
-    PANEL_HEIGHT = 265
-    FONT_VARIANT = 1
-    
     
 class ChangeFtol(wx.Dialog):