diff main/MainWindow.cpp @ 849:4a7c62938a13 2.4beta2 sv_v2.4beta2

Pull across beta bits from prior beta branch

--- a/main/MainWindow.cpp	Wed Sep 10 09:52:25 2014 +0100
+++ b/main/MainWindow.cpp	Wed Sep 10 09:54:49 2014 +0100
@@ -162,7 +162,9 @@
     m_layerTreeDialog(0),
     m_activityLog(new ActivityLog()),
     m_keyReference(new KeyReference()),
-    m_templateWatcher(0)
+    m_templateWatcher(0),
+    m_surveyer(0),
+    m_versionTester(0)
 {
     Profiler profiler("MainWindow::MainWindow");
 
@@ -301,6 +303,23 @@
     connect(m_midiInput, SIGNAL(eventsAvailable()),
             this, SLOT(midiEventsAvailable()));
 
+#ifdef BETA_RELEASE
+    QStringList bits = QString(SV_VERSION).split(".");
+    QString beta = SV_VERSION;
+    if (bits.length() == 3) {
+        beta = QString("%1.%2 beta").arg(bits[0]).arg(bits[1].toInt() + 1);
+    }
+    QMessageBox::information
+        (this, tr("Test release"),
+         tr("<p>This is a test release of %1 (v%2 / v%3).</p>"
+            "<p>See the <a href=\"http://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG\">changelog</a> for details of what has changed since the last release.</p>"
+            "<p>Please let us know if you have any problems with this test release, and especially if it crashes. Use the <a href=\"http://sourceforge.net/p/sv1/bugs/\">bug tracker</a> or <a href=\"mailto:[e-mail]\">email</a> to report bugs.</p><p>Please do not use this software for real work, and do not distribute it to other people who have real work to do! Use it only if you are prepared to report any bugs you find.</p>")
+         .arg(QApplication::applicationName())
+         .arg(SV_VERSION)
+         .arg(beta));
+
+    (void)withOSCSupport; // avoid warning
+#else
     NetworkPermissionTester tester;
     bool networkPermission = tester.havePermission();
     if (networkPermission) {
@@ -314,10 +333,8 @@
             ("sonicvisualiser.org", "latest-version.txt", SV_VERSION);
         connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)),
                 this, SLOT(newerVersionAvailable(QString)));
-    } else {
-        m_surveyer = 0;
-        m_versionTester = 0;
     }
+#endif
 }
 
 MainWindow::~MainWindow()