diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-03 12:42:52 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-03 12:42:52 -0700 |
| commit | 8939e2e400b9ca2187c8618d986055bb0346ac07 (patch) | |
| tree | b6ee88ec2635448784789cfea44edf79cab9d68b | |
| parent | 151756b2566985f46ac1aa4e5a5bc94dd3160255 (diff) | |
| parent | 3689666ae36a26bd7a6a0a869caf6a58c600179e (diff) | |
Merge remote-tracking branch 'tom/qtgui/themes_support'
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-qtgui/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | gr-qtgui/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-qtgui/gr-qtgui.conf | 2 | ||||
| -rw-r--r-- | gr-qtgui/themes/alt.qss (renamed from gr-qtgui/examples/alt.qss) | 9 | ||||
| -rw-r--r-- | gr-qtgui/themes/dark.qss (renamed from gr-qtgui/examples/dark.qss) | 0 |
6 files changed, 20 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 783a5cd317..f7602ac1d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) set(GR_LIBEXEC_DIR libexec) set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME}) set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks) +set(GR_THEMES_DIR ${GR_PKG_DATA_DIR}/themes) # Special exception if prefix is /usr so we don't make a /usr/etc. string(COMPARE EQUAL ${CMAKE_INSTALL_PREFIX} "/usr" isusr) diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index ad832b94a1..4f0ca13634 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -140,4 +140,16 @@ install( COMPONENT "qtgui" ) + +######################################################################## +# Install the themes (QSS) files +######################################################################## +install( + FILES + themes/dark.qss + themes/alt.qss + DESTINATION ${GR_THEMES_DIR} + COMPONENT "qtgui" +) + endif(ENABLE_GR_QTGUI) diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt index cd6de245d6..d4b914a0a4 100644 --- a/gr-qtgui/examples/CMakeLists.txt +++ b/gr-qtgui/examples/CMakeLists.txt @@ -38,8 +38,6 @@ GR_PYTHON_INSTALL(PROGRAMS install( FILES - dark.qss - alt.qss qtgui_tags_viewing.grc DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR} COMPONENT "qtgui_python" diff --git a/gr-qtgui/gr-qtgui.conf b/gr-qtgui/gr-qtgui.conf index b1d3414897..2d0c8cda24 100644 --- a/gr-qtgui/gr-qtgui.conf +++ b/gr-qtgui/gr-qtgui.conf @@ -10,5 +10,5 @@ style = raster # Use a QSS style sheet to set the look and styles of the plots -# See gnuradio/examples/qt-gui/dark.qss +# See files in gnuradio/themes/ # qss =
\ No newline at end of file diff --git a/gr-qtgui/examples/alt.qss b/gr-qtgui/themes/alt.qss index ba46242d04..29bec19157 100644 --- a/gr-qtgui/examples/alt.qss +++ b/gr-qtgui/themes/alt.qss @@ -18,9 +18,12 @@ DisplayPlot { qproperty-line_style1: SolidLine; qproperty-line_style2: DashLine; qproperty-line_style3: DotLine; - qproperty-line_width1: 2; - qproperty-line_width2: 2; - qproperty-line_width3: 2; + qproperty-line_width1: 1; + qproperty-line_width2: 1; + qproperty-line_width3: 1; + qproperty-marker_alpha1: 150; + qproperty-marker_alpha2: 150; + qproperty-marker_alpha3: 150; qproperty-axes_label_font_size: 18; } diff --git a/gr-qtgui/examples/dark.qss b/gr-qtgui/themes/dark.qss index 8999bdae72..8999bdae72 100644 --- a/gr-qtgui/examples/dark.qss +++ b/gr-qtgui/themes/dark.qss |