[Commit-gnuradio] r10266 - in gnuradio/trunk/grc: scripts src/gui

[jblum]

Author: jblum
Date: 2009-01-20 00:14:39 -0700 (Tue, 20 Jan 2009)
New Revision: 10266

Modified:
   gnuradio/trunk/grc/scripts/grc
   gnuradio/trunk/grc/scripts/usrp_probe
   gnuradio/trunk/grc/src/gui/ActionHandler.py
Log:
set the icon in both executables

Modified: gnuradio/trunk/grc/scripts/grc
===================================================================
--- gnuradio/trunk/grc/scripts/grc      2009-01-20 05:06:04 UTC (rev 10265)
+++ gnuradio/trunk/grc/scripts/grc      2009-01-20 07:14:39 UTC (rev 10266)
@@ -18,6 +18,10 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
+import pygtk
+pygtk.require('2.0')
+import gtk
+
 from gnuradio.grc.platforms.base.Constants import VERSION
 from optparse import OptionParser
 
@@ -35,5 +39,8 @@
        (options, args) = parser.parse_args()
        from gnuradio.grc.platforms.python.Platform import Platform
        from gnuradio.grc.gui.ActionHandler import ActionHandler
+       #setup icon using icon theme
+       try: 
gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
+       except: pass
        ActionHandler(args, Platform())
 

Modified: gnuradio/trunk/grc/scripts/usrp_probe
===================================================================
--- gnuradio/trunk/grc/scripts/usrp_probe       2009-01-20 05:06:04 UTC (rev 
10265)
+++ gnuradio/trunk/grc/scripts/usrp_probe       2009-01-20 07:14:39 UTC (rev 
10266)
@@ -109,9 +109,13 @@
 If the problem persists, there may be a problem with you gnuradio installation 
or USB 2.0.
 '''%str(e))
 
-#enter the mainloop
-gtk.gdk.threads_init()
-gtk.gdk.threads_enter()
-USRPProbeWindow()
-gtk.main()
-gtk.gdk.threads_leave()
+if __name__ == '__main__':
+       #setup icon using icon theme
+       try: 
gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
+       except: pass
+       #enter the mainloop
+       gtk.gdk.threads_init()
+       gtk.gdk.threads_enter()
+       USRPProbeWindow()
+       gtk.main()
+       gtk.gdk.threads_leave()

Modified: gnuradio/trunk/grc/src/gui/ActionHandler.py
===================================================================
--- gnuradio/trunk/grc/src/gui/ActionHandler.py 2009-01-20 05:06:04 UTC (rev 
10265)
+++ gnuradio/trunk/grc/src/gui/ActionHandler.py 2009-01-20 07:14:39 UTC (rev 
10266)
@@ -53,9 +53,6 @@
                """
                self.clipboard = None
                platform = Platform(platform)
-               #setup icon using icon theme
-               try: 
gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
-               except: pass
                for action in Actions.get_all_actions(): 
action.connect('activate', self._handle_actions)
                #setup the main window
                self.main_window = MainWindow(self.handle_states, platform)