diff options
| -rwxr-xr-x | grc/scripts/grc | 7 | ||||
| -rwxr-xr-x | grc/scripts/usrp_probe | 16 | ||||
| -rw-r--r-- | grc/src/gui/ActionHandler.py | 3 |
3 files changed, 17 insertions, 9 deletions
diff --git a/grc/scripts/grc b/grc/scripts/grc index 11f9c60d3..94fb4294c 100755 --- a/grc/scripts/grc +++ b/grc/scripts/grc @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software 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 @@ and you are welcome to redistribute it. (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()) diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe index eab57677d..c92603482 100755 --- a/grc/scripts/usrp_probe +++ b/grc/scripts/usrp_probe @@ -109,9 +109,13 @@ If the USRP cannot be found, make sure that the USRP is plugged-in and restart t 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() diff --git a/grc/src/gui/ActionHandler.py b/grc/src/gui/ActionHandler.py index 4c5516311..91dd0fb45 100644 --- a/grc/src/gui/ActionHandler.py +++ b/grc/src/gui/ActionHandler.py @@ -53,9 +53,6 @@ class ActionHandler: """ 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) |