diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2017-09-30 19:35:01 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <sebastian.koslowski@gmail.com> | 2017-09-30 19:39:46 +0200 |
| commit | 7b0c5af6c3b5bdc66fc425049673aa04f6067262 (patch) | |
| tree | bab34be62ddb3f8bb6c672400b558dde6de0b088 | |
| parent | 84fb83901caf1ba9872ebe161d16a6827e0bc3df (diff) | |
[grc] fixes from recent commits (merges #1473)
| -rw-r--r-- | grc/core/utils/hide_bokeh_gui_options_if_not_installed.py | 7 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py b/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py index f209e515a8..ab4a42b2e7 100644 --- a/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py +++ b/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py @@ -20,5 +20,8 @@ def hide_bokeh_gui_options_if_not_installed(options_blk): try: import bokehgui except ImportError: - generate_options = options_blk.params['generate_options'] - del generate_options.options['bokeh_gui'] + for param in options_blk.parameters_data: + if param['id'] == 'generate_options': + ind = param['options'].index('bokeh_gui') + del param['options'][ind] + del param['option_labels'][ind] diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index 01502b38f9..e737610a79 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -71,8 +71,11 @@ class MainWindow(Gtk.ApplicationWindow): vbox = Gtk.VBox() self.add(vbox) - # Set window icon - self.set_icon_from_file(os.path.dirname(os.path.abspath(__file__)) + "/icon.png") + icon_theme = Gtk.IconTheme.get_default() + icon = icon_theme.lookup_icon("gnuradio-grc", 48, 0) + if not icon: + # Set window icon + self.set_icon_from_file(os.path.dirname(os.path.abspath(__file__)) + "/icon.png") # Create the menu bar and toolbar generate_modes = platform.get_generate_options() |