diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-03 07:50:50 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-05-03 07:50:50 -0700 |
| commit | 9ed7f6e9944846db9c948498ad5ac0cb37988244 (patch) | |
| tree | f2a97dfc917c1375622970284750d365cc3ad068 | |
| parent | 486e0a9d06e43f3b8669471bef13a5eeedbda4c6 (diff) | |
| parent | 2933a6709410a4ba40b4286e369b29bd24cbd37e (diff) | |
Merge branch 'next' into python3
| -rw-r--r-- | grc/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 3 | ||||
| -rw-r--r-- | grc/gui/icon.png | bin | 0 -> 4377 bytes |
3 files changed, 5 insertions, 1 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 264debcaf1..5a32c7cd70 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -156,8 +156,9 @@ GR_PYTHON_INSTALL( GR_PYTHON_INSTALL( DIRECTORY core gui DESTINATION "${GR_PYTHON_DIR}/gnuradio/grc" - FILES_MATCHING REGEX "\\.(py|dtd|grc|tmpl)$" + FILES_MATCHING REGEX "\\.(py|dtd|grc|tmpl|png)$" ) + ######################################################################## # Append NSIS commands to set environment variables ######################################################################## diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index c13a59a16d..38fd9a71a1 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -70,6 +70,9 @@ 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") + # Create the menu bar and toolbar generate_modes = platform.get_generate_options() 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 |
