Changeset 49e000b in sasview for src/sas

Timestamp:

Oct 10, 2016 6:43:16 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:

278178b

Parents:

3e1c9e5

Message:

Added TU Delft logo to About box aswell, and Acknowledgement. Closes
#692

Location:

src/sas/sasgui/guiframe

Files:

• aboutbox.py (modified) (6 diffs)
• images/tudelft_logo.png (added)

src/sas/sasgui/guiframe/aboutbox.py

@@ -117 +117 @@
         self.bitmap_button_ill = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_ansto = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap)
         
         self.static_line_3 = wx.StaticLine(self, -1)
@@ -135 +136 @@
         self.Bind(wx.EVT_BUTTON, self.onIllLogo, self.bitmap_button_ill)
         self.Bind(wx.EVT_BUTTON, self.onAnstoLogo, self.bitmap_button_ansto)
+        self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft)
         # end wxGlade
         # fill in acknowledgements
@@ -221 +223 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_ansto.SetBitmapLabel(logo)
+        
+        image = file_dir + "/images/tudelft_logo.png"
+        if os.path.isfile(config._tudelft_logo):
+            image = config._tudelft_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_tudelft.SetBitmapLabel(logo)
                 
         # resize dialog window to fit version number nicely
@@ -251 +259 @@
         self.bitmap_button_ill.SetSize(self.bitmap_button_ill.GetBestSize())
         self.bitmap_button_ansto.SetSize(self.bitmap_button_ansto.GetBestSize())
+        self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize())
         # end wxGlade
 
@@ -314 +323 @@
         sizer_logos.Add(self.bitmap_button_ansto, 0, 
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_tudelft, 0, 
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
                 
         sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0)
@@ -405 +416 @@
         event.Skip()
 
+    def onTudelftLogo(self, event):
+        """
+        """ 
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._tudelft_url)
+        event.Skip()
+
 # end of class DialogAbout