diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 11:57:18 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-15 11:57:18 -0700 |
commit | 2a78522fcac36a7ece50b51a5fe26f0e1825c3da (patch) | |
tree | cf1700043154e234f3939548eca0178064e55b6c | |
parent | be78ddac890210e480980f95b01ffe617c4dc714 (diff) | |
parent | 69c73b87068b858b78468881fc1105e529c7343a (diff) |
Merge branch 'master' into next
-rwxr-xr-x | gr-qtgui/examples/pyqt_example_c.py | 3 | ||||
-rwxr-xr-x | gr-qtgui/examples/pyqt_freq_c.py | 3 | ||||
-rwxr-xr-x | gr-qtgui/examples/pyqt_time_c.py | 3 | ||||
-rwxr-xr-x | gr-qtgui/examples/pyqt_waterfall_c.py | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index cb708360f1..1bf61d949d 100755 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): fftsize = 2048 self.qapp = QtGui.QApplication(sys.argv) - ss = open('dark.qss') + ss = open(gr.prefix() + '/share/gnuradio/themes/dark.qss') sstext = ss.read() ss.close() self.qapp.setStyleSheet(sstext) @@ -190,4 +190,3 @@ if __name__ == "__main__": tb.start() tb.qapp.exec_() tb.stop() - diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index 7632176878..c53feb93d4 100755 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): npts = 2048 self.qapp = QtGui.QApplication(sys.argv) - ss = open('dark.qss') + ss = open(gr.prefix() + '/share/gnuradio/themes/dark.qss') sstext = ss.read() ss.close() self.qapp.setStyleSheet(sstext) @@ -191,4 +191,3 @@ if __name__ == "__main__": tb.start() tb.qapp.exec_() tb.stop() - diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index ae8ebfc257..0162bb6ffc 100755 --- a/gr-qtgui/examples/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py @@ -151,7 +151,7 @@ class my_top_block(gr.top_block): npts = 2048 self.qapp = QtGui.QApplication(sys.argv) - ss = open('dark.qss') + ss = open(gr.prefix() + '/share/gnuradio/themes/dark.qss') sstext = ss.read() ss.close() self.qapp.setStyleSheet(sstext) @@ -205,4 +205,3 @@ if __name__ == "__main__": tb.start() tb.qapp.exec_() tb.stop() - diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index 118a3df660..8ec62fc1e2 100755 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -153,7 +153,7 @@ class my_top_block(gr.top_block): taps = filter.firdes.complex_band_pass_2(1, Rs, 1500, 2500, 100, 60) self.qapp = QtGui.QApplication(sys.argv) - ss = open('dark.qss') + ss = open(gr.prefix() + '/share/gnuradio/themes/dark.qss') sstext = ss.read() ss.close() self.qapp.setStyleSheet(sstext) @@ -193,4 +193,3 @@ if __name__ == "__main__": tb.start() tb.qapp.exec_() tb.stop() - |