diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-03 07:44:58 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-03 07:44:58 -0700 |
| commit | 2933a6709410a4ba40b4286e369b29bd24cbd37e (patch) | |
| tree | f3c8233afcf0eeca39eb53ac3832d68a8d904af5 /grc | |
| parent | a7e699fe51a89df96deb2b852fcf67f13b94d24f (diff) | |
| parent | 696f220ef47e874ec2b310dff8715422aec08125 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/gui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 3 | ||||
| -rw-r--r-- | grc/gui/icon.png | bin | 0 -> 4377 bytes |
3 files changed, 10 insertions, 0 deletions
diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt index 12be4a8151..dc661c44ed 100644 --- a/grc/gui/CMakeLists.txt +++ b/grc/gui/CMakeLists.txt @@ -23,3 +23,10 @@ GR_PYTHON_INSTALL( FILES ${py_files} DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui ) + +install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/icon.png + DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui + COMPONENT "grc" +) diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index 686e73cfa3..54141af547 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -91,6 +91,9 @@ class MainWindow(gtk.Window): vbox = gtk.VBox() self.add(vbox) + # Set window icon + self.set_icon_from_file(os.path.dirname(os.path.abspath(__file__)) + "/icon.png") + # Create the menu bar and toolbar self.add_accel_group(Actions.get_accel_group()) self.menu_bar = Bars.MenuBar(generate_modes, action_handler_callback) diff --git a/grc/gui/icon.png b/grc/gui/icon.png Binary files differnew file mode 100644 index 0000000000..1c27323696 --- /dev/null +++ b/grc/gui/icon.png |
