changeset 2536:32718f05903d

Aim to ensure we have feedback request in packages we build only (not in distro builds etc)

--- a/config.pri.in	Tue May 12 17:41:54 2020 +0100
+++ b/config.pri.in	Wed May 13 14:08:38 2020 +0100
@@ -4,6 +4,7 @@
 PREFIX_PATH = @prefix@
 
 DEFINES += @HAVES@
+DEFINES += $$[SV_PERSISTENT_DEFINES]
 
 QMAKE_CC = @CC@
 QMAKE_CXX = @CXX@

--- a/deploy/clean-build-and-package	Tue May 12 17:41:54 2020 +0100
+++ b/deploy/clean-build-and-package	Wed May 13 14:08:38 2020 +0100
@@ -35,6 +35,7 @@
     ./repoint install
 
     rm -rf .qmake.stash
+    "$qmake" -set SV_PERSISTENT_DEFINES "WITH_FEEDBACK_REQUEST"
     "$qmake" -r
     make clean
     make -j3

--- a/deploy/linux/docker/Dockerfile_appimage.in	Tue May 12 17:41:54 2020 +0100
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Wed May 13 14:08:38 2020 +0100
@@ -68,6 +68,7 @@
 WORKDIR /sonic-visualiser
 ENV QTDIR /opt/qt510
 ENV PATH /opt/qt510/bin:$PATH
+RUN qmake -set SV_PERSISTENT_DEFINES "WITH_FEEDBACK_REQUEST"
 RUN ./configure
 RUN make -j3
 

--- a/deploy/linux/docker/Dockerfile_deb.in	Tue May 12 17:41:54 2020 +0100
+++ b/deploy/linux/docker/Dockerfile_deb.in	Wed May 13 14:08:38 2020 +0100
@@ -58,6 +58,7 @@
 RUN rm -f /usr/lib/x86_64-linux-gnu/librubberband.so*
 
 WORKDIR /sonic-visualiser
+RUN qmake -set SV_PERSISTENT_DEFINES "WITH_FEEDBACK_REQUEST"
 RUN ./configure
 RUN make -j3
 

--- a/deploy/win32/build-32.bat	Tue May 12 17:41:54 2020 +0100
+++ b/deploy/win32/build-32.bat	Wed May 13 14:08:38 2020 +0100
@@ -23,6 +23,7 @@
 mkdir build_win32
 cd build_win32
 
+qmake -set SV_PERSISTENT_DEFINES "WITH_FEEDBACK_REQUEST"
 qmake -spec win32-g++ -r ..\sonic-visualiser.pro
 if %errorlevel% neq 0 exit /b %errorlevel%
 

--- a/deploy/win64/build-64.bat	Tue May 12 17:41:54 2020 +0100
+++ b/deploy/win64/build-64.bat	Wed May 13 14:08:38 2020 +0100
@@ -34,6 +34,7 @@
 mkdir build_win64
 cd build_win64
 
+qmake -set SV_PERSISTENT_DEFINES "WITH_FEEDBACK_REQUEST"
 qmake -spec win32-msvc -r -tp vc ..\sonic-visualiser.pro
 if %errorlevel% neq 0 exit /b %errorlevel%
 

--- a/main/MainWindow.cpp	Tue May 12 17:41:54 2020 +0100
+++ b/main/MainWindow.cpp	Wed May 13 14:08:38 2020 +0100
@@ -339,8 +339,7 @@
 
         m_surveyer = nullptr;
 
-//#define WITH_SURVEY 1
-#ifdef WITH_SURVEY
+#ifdef WITH_FEEDBACK_REQUEST
         SVDEBUG << "MainWindow: Creating surveyer" << endl;
         Surveyer::Config config;
         config.hostname = "sonicvisualiser.org";
@@ -349,7 +348,9 @@
         config.countdownKey = "countdown41";
         config.countdownFrom = 1;
         config.title = "Sonic Visualiser - Can you help?";
-        config.text = "<h3>Sonic Visualiser: Can you help?</h3><p>Are you using Sonic Visualiser for research or commercial purposes? Or do you intend to do so?</p><p>In the Centre for Digital Music, where Sonic Visualiser is made, we are gathering information about the impact of our work, to guide our future actions.</p><p>Would you be interested in giving us your contact details, and a description of the work you do that is related to Sonic Visualiser?</p><p>Anything you tell us will be used only to guide research and development at Queen Mary University of London.</p>";
+        config.text = "<h3>Sonic Visualiser: Can you help?</h3><p>"
+            "<p>Are you using Sonic Visualiser in academic research or for commercial purposes? Or do you intend to do so?</p>"
+            "<p>If so, would you be interested in telling us something about your work? We are gathering case studies to gauge the impact of our work and to guide our future actions.</p><p>Anything you tell us will be used only to guide research and development at the Centre for Digital Music, Queen Mary University of London.</p>";
         config.acceptLabel = tr("Yes, I'd be happy to");
         config.rejectLabel = tr("No, thank you");
         config.includeSystemInfo = false;