[GRASS-SVN] r57208 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-07-18 06:02:31 -0700 (Thu, 18 Jul 2013)
New Revision: 57208

Modified:
   grass/trunk/gui/wxpython/gui_core/forms.py
Log:
wxGUI: add icon only to manual page of dialog, make it smaller

Modified: grass/trunk/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/forms.py	2013-07-18 12:42:52 UTC (rev 57207)
+++ grass/trunk/gui/wxpython/gui_core/forms.py	2013-07-18 13:02:31 UTC (rev 57208)
@@ -1705,9 +1705,6 @@
                                 lambda event:
                                     self._switchPageHandler(event = event, priority = 3))
             self.outpage = self.notebook.AddPage(page = self.goutput, text = _("Command output"), name = 'output')
-            index = self.AddBitmapToImageList(section = 'output', imageList = imageList)
-            if index >= 0:
-                self.notebook.SetPageImage('output', index)
         else:
             self.goutput = None
             self._gconsole = None
@@ -2140,12 +2137,10 @@
         
     def AddBitmapToImageList(self, section, imageList):
         iconTheme = UserSettings.Get(group = 'appearance', key = 'iconTheme', subkey = 'type')
-        iconSectionDict = {'manual': os.path.join(globalvar.ETCICONDIR, iconTheme, 'help.png'),
-                           _("Optional"): os.path.join(globalvar.ETCICONDIR, iconTheme, 'settings.png')}
+        iconSectionDict = {'manual': os.path.join(globalvar.ETCICONDIR, iconTheme, 'help.png')}
         if section in iconSectionDict.keys():
-            bitmap = wx.Bitmap(iconSectionDict[section])
-            bitmap.SetSize((16, 16))
-            idx = imageList.Add(bitmap)
+            image = wx.Image(iconSectionDict[section]).Scale(16, 16, wx.IMAGE_QUALITY_HIGH)
+            idx = imageList.Add(wx.BitmapFromImage(image))
             return idx
 
         return -1