Changeset 5cfa884 in sasview

Timestamp:

Apr 21, 2013 3:00:41 PM (11 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:

18e1f28

Parents:

31ac4a1

Message:

file dialog bug on MAC: ImageViewer?

File:

• calculatorview/src/sans/perspectives/calculator/image_viewer.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/image_viewer.py

@@ -17 +17 @@
 from sans.dataloader.manipulations import reader2D_converter
 _BOX_WIDTH = 60
+IS_WIN = True
 if sys.platform.count("win32") > 0:
     _DIALOG_WIDTH = 400
 else:
     _DIALOG_WIDTH = 480
+    IS_WIN = False
 
 class ImageView:
@@ -91 +93 @@
         elist = ["All images (*.png, *.bmp, *.gif, *.jpg, *.tif, *.tiff) | \
                 *.png; *.bmp; *.gif; *.jpg; *.tif; *.tiff", 
-                "PNG files (*.png) | *.png", 
-                "BMP files (*.bmp) | *.bmp", 
-                "GIF files (*.gif) | *.gif",
-                "JPG files (*.jpg) | *.jpg",
-                "TIF files (*.tif) | *.tif",
-                "TIFF files (*.tiff) | *.tiff"]
+                "PNG files (*.PNG, *.png) | *.png", 
+                "BMP files (*.BMP, *.bmp) | *.bmp", 
+                "GIF files (*.GIF, *.gif) | *.gif",
+                "JPG files (*.JPG, *.jpg) | *.jpg",
+                "TIF files (*.TIF, *.tif) | *.tif",
+                "TIFF files (*.TIFF, *.tiff) | *.tiff"]
+        if not IS_WIN:
+            del elist[0]
+        elist.append("All files (*.*) | *.*")
         wlist = '|'.join(elist)        
         style = wx.OPEN|wx.FD_MULTIPLE