Changeset e0f28e6 in sasview for src/sas

Timestamp:

Oct 4, 2016 3:13:42 PM (8 years ago)

Author:

smk78

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c1fdf84

Parents:

d4c8513a

Message:

Updated About box text and images. Changed SNS image to ORNL image (more
inclusive) and added ANSTO image.

Location:

src/sas/sasgui/guiframe

Files:

• aboutbox.py (modified) (13 diffs)
• images/ansto_logo.png (added)
• images/ornl_logo.png (added)

src/sas/sasgui/guiframe/aboutbox.py

@@ -106 +106 @@
         self.bitmap_button_nist = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_umd = wx.BitmapButton(self, -1, wx.NullBitmap)
-        self.bitmap_button_sns = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_ornl = wx.BitmapButton(self, -1, wx.NullBitmap)
+        #self.bitmap_button_sns = wx.BitmapButton(self, -1, wx.NullBitmap)
         #self.bitmap_button_nsf = wx.BitmapButton(self, -1,
         #                                         wx.NullBitmap)
@@ -115 +116 @@
         self.bitmap_button_ess = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_ill = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_ansto = wx.BitmapButton(self, -1, wx.NullBitmap)
         
         self.static_line_3 = wx.StaticLine(self, -1)
@@ -124 +126 @@
         self.Bind(wx.EVT_BUTTON, self.onNistLogo, self.bitmap_button_nist)
         self.Bind(wx.EVT_BUTTON, self.onUmdLogo, self.bitmap_button_umd)
-        self.Bind(wx.EVT_BUTTON, self.onSnsLogo, self.bitmap_button_sns)
+        #self.Bind(wx.EVT_BUTTON, self.onSnsLogo, self.bitmap_button_sns)
+        self.Bind(wx.EVT_BUTTON, self.onOrnlLogo, self.bitmap_button_ornl)
         #self.Bind(wx.EVT_BUTTON, self.onNsfLogo, self.bitmap_button_nsf)
         #self.Bind(wx.EVT_BUTTON, self.onDanseLogo, self.bitmap_button_danse)
@@ -131 +134 @@
         self.Bind(wx.EVT_BUTTON, self.onEssLogo, self.bitmap_button_ess)
         self.Bind(wx.EVT_BUTTON, self.onIllLogo, self.bitmap_button_ill)
+        self.Bind(wx.EVT_BUTTON, self.onAnstoLogo, self.bitmap_button_ansto)
         # end wxGlade
         # fill in acknowledgements
@@ -163 +167 @@
         self.bitmap_button_umd.SetBitmapLabel(logo)
 
-        
+        image = file_dir + "/images/ornl_logo.png"
+        if os.path.isfile(config._ornl_logo):
+            image = config._ornl_logo
+        logo = wx.Bitmap(image)        
+        self.bitmap_button_ornl.SetBitmapLabel(logo)
+
+        """
         image = file_dir + "/images/sns_logo.png"
         if os.path.isfile(config._sns_logo):
@@ -170 +180 @@
         self.bitmap_button_sns.SetBitmapLabel(logo)
         
-        """
         image = file_dir + "/images/nsf_logo.png"
         if os.path.isfile(config._nsf_logo):
@@ -206 +215 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_ill.SetBitmapLabel(logo)
+        
+        image = file_dir + "/images/ansto_logo.png"
+        if os.path.isfile(config._ansto_logo):
+            image = config._ansto_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_ansto.SetBitmapLabel(logo)
                 
         # resize dialog window to fit version number nicely
@@ -227 +242 @@
         self.bitmap_button_nist.SetSize(self.bitmap_button_nist.GetBestSize())
         self.bitmap_button_umd.SetSize(self.bitmap_button_umd.GetBestSize())
-        self.bitmap_button_sns.SetSize(self.bitmap_button_sns.GetBestSize())
+        self.bitmap_button_ornl.SetSize(self.bitmap_button_ornl.GetBestSize())
+        #self.bitmap_button_sns.SetSize(self.bitmap_button_sns.GetBestSize())
         #self.bitmap_button_nsf.SetSize(self.bitmap_button_nsf.GetBestSize())
         #self.bitmap_button_danse.SetSize(self.bitmap_button_danse.GetBestSize())
@@ -234 +250 @@
         self.bitmap_button_ess.SetSize(self.bitmap_button_ess.GetBestSize())
         self.bitmap_button_ill.SetSize(self.bitmap_button_ill.GetBestSize())
+        self.bitmap_button_ansto.SetSize(self.bitmap_button_ansto.GetBestSize())
         # end wxGlade
 
@@ -285 +302 @@
         sizer_logos.Add(self.bitmap_button_nist, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_sns, 0, 
+        #sizer_logos.Add(self.bitmap_button_sns, 0, 
+        #                wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_ornl, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
         sizer_logos.Add(self.bitmap_button_isis, 0, 
@@ -292 +311 @@
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
         sizer_logos.Add(self.bitmap_button_ill, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_ansto, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
                 
@@ -321 +342 @@
         event.Skip()
         
+    def onOrnlLogo(self, event): 
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._ornl_url)
+        event.Skip()
+        
     def onSnsLogo(self, event): 
         """
@@ -368 +396 @@
         # wxGlade: DialogAbout.<event_handler>
         launchBrowser(config._ill_url)
+        event.Skip()
+
+    def onAnstoLogo(self, event):
+        """
+        """ 
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._ansto_url)
         event.Skip()