summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-05-03 07:44:38 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-05-03 07:44:38 -0700
commit696f220ef47e874ec2b310dff8715422aec08125 (patch)
treeccd60c27f81cb4ac73238bade0c4b85d25095be6
parentce64630d5ecb1186c6e857e84a51b831f5b86adf (diff)
parent6c2de14445c32f47576140cf8e95b459234d850d (diff)
Merge remote-tracking branch 'github/pr/1262'
-rw-r--r--grc/gui/CMakeLists.txt7
-rw-r--r--grc/gui/MainWindow.py3
-rw-r--r--grc/gui/icon.pngbin0 -> 4377 bytes
3 files changed, 10 insertions, 0 deletions
diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt
index aa9592b351..168739e7f2 100644
--- a/grc/gui/CMakeLists.txt
+++ b/grc/gui/CMakeLists.txt
@@ -24,3 +24,10 @@ GR_PYTHON_INSTALL(
DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui
COMPONENT "grc"
)
+
+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
new file mode 100644
index 0000000000..1c27323696
--- /dev/null
+++ b/grc/gui/icon.png
Binary files differ