[Commit-gnuradio] [gnuradio] 08/13: qtgui: Adding a themes directory and install qss files there.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 3689666ae36a26bd7a6a0a869caf6a58c600179e
Author: Tom Rondeau <address@hidden>
Date:   Fri Apr 3 10:31:08 2015 -0700

    qtgui: Adding a themes directory and install qss files there.
---
 CMakeLists.txt                         |  1 +
 gr-qtgui/CMakeLists.txt                | 12 ++++++++++++
 gr-qtgui/examples/CMakeLists.txt       |  2 --
 gr-qtgui/gr-qtgui.conf                 |  2 +-
 gr-qtgui/{examples => themes}/alt.qss  |  9 ++++++---
 gr-qtgui/{examples => themes}/dark.qss |  0
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 783a5cd..f7602ac 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 ad832b9..4f0ca13 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 cd6de24..d4b914a 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 b1d3414..2d0c8cd 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
similarity index 94%
rename from gr-qtgui/examples/alt.qss
rename to gr-qtgui/themes/alt.qss
index ba46242..29bec19 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
similarity index 100%
rename from gr-qtgui/examples/dark.qss
rename to gr-qtgui/themes/dark.qss