Changes in src/sas/sasgui/guiframe/aboutbox.py [e0f28e6:d85c194] in sasview

File:

• src/sas/sasgui/guiframe/aboutbox.py (modified) (13 diffs)

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_ornl = wx.BitmapButton(self, -1, wx.NullBitmap)
-        #self.bitmap_button_sns = 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)
@@ -116 +115 @@
         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)
@@ -126 +124 @@
         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.onOrnlLogo, self.bitmap_button_ornl)
+        self.Bind(wx.EVT_BUTTON, self.onSnsLogo, self.bitmap_button_sns)
         #self.Bind(wx.EVT_BUTTON, self.onNsfLogo, self.bitmap_button_nsf)
         #self.Bind(wx.EVT_BUTTON, self.onDanseLogo, self.bitmap_button_danse)
@@ -134 +131 @@
         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
@@ -167 +163 @@
         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):
@@ -180 +170 @@
         self.bitmap_button_sns.SetBitmapLabel(logo)
         
+        """
         image = file_dir + "/images/nsf_logo.png"
         if os.path.isfile(config._nsf_logo):
@@ -215 +206 @@
         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
@@ -242 +227 @@
         self.bitmap_button_nist.SetSize(self.bitmap_button_nist.GetBestSize())
         self.bitmap_button_umd.SetSize(self.bitmap_button_umd.GetBestSize())
-        self.bitmap_button_ornl.SetSize(self.bitmap_button_ornl.GetBestSize())
-        #self.bitmap_button_sns.SetSize(self.bitmap_button_sns.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())
@@ -250 +234 @@
         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
 
@@ -302 +285 @@
         sizer_logos.Add(self.bitmap_button_nist, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        #sizer_logos.Add(self.bitmap_button_sns, 0, 
-        #                wx.LEFT|wx.ADJUST_MINSIZE, 2)
-        sizer_logos.Add(self.bitmap_button_ornl, 0, 
+        sizer_logos.Add(self.bitmap_button_sns, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
         sizer_logos.Add(self.bitmap_button_isis, 0, 
@@ -311 +292 @@
                         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)
                 
@@ -342 +321 @@
         event.Skip()
         
-    def onOrnlLogo(self, event): 
-        """
-        """
-        # wxGlade: DialogAbout.<event_handler>
-        launchBrowser(config._ornl_url)
-        event.Skip()
-        
     def onSnsLogo(self, event): 
         """
@@ -396 +368 @@
         # wxGlade: DialogAbout.<event_handler>
         launchBrowser(config._ill_url)
-        event.Skip()
-
-    def onAnstoLogo(self, event):
-        """
-        """ 
-        # wxGlade: DialogAbout.<event_handler>
-        launchBrowser(config._ansto_url)
         event.Skip()