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

Pull across beta bits from prior beta branch
author Chris Cannam
date Wed, 10 Sep 2014 09:54:49 +0100
parents ce4d9e149086 e927e43e428e
children
comparison
equal deleted inserted replaced
848:9f82fa990cbd 849:4a7c62938a13
160 m_playControlsWidth(0), 160 m_playControlsWidth(0),
161 m_preferencesDialog(0), 161 m_preferencesDialog(0),
162 m_layerTreeDialog(0), 162 m_layerTreeDialog(0),
163 m_activityLog(new ActivityLog()), 163 m_activityLog(new ActivityLog()),
164 m_keyReference(new KeyReference()), 164 m_keyReference(new KeyReference()),
165 m_templateWatcher(0) 165 m_templateWatcher(0),
166 m_surveyer(0),
167 m_versionTester(0)
166 { 168 {
167 Profiler profiler("MainWindow::MainWindow"); 169 Profiler profiler("MainWindow::MainWindow");
168 170
169 setWindowTitle(QApplication::applicationName()); 171 setWindowTitle(QApplication::applicationName());
170 172
299 newSession(); 301 newSession();
300 302
301 connect(m_midiInput, SIGNAL(eventsAvailable()), 303 connect(m_midiInput, SIGNAL(eventsAvailable()),
302 this, SLOT(midiEventsAvailable())); 304 this, SLOT(midiEventsAvailable()));
303 305
306 #ifdef BETA_RELEASE
307 QStringList bits = QString(SV_VERSION).split(".");
308 QString beta = SV_VERSION;
309 if (bits.length() == 3) {
310 beta = QString("%1.%2 beta").arg(bits[0]).arg(bits[1].toInt() + 1);
311 }
312 QMessageBox::information
313 (this, tr("Test release"),
314 tr("<p>This is a test release of %1 (v%2 / v%3).</p>"
315 "<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>"
316 "<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:cannam+sv@all-day-breakfast.com\">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>")
317 .arg(QApplication::applicationName())
318 .arg(SV_VERSION)
319 .arg(beta));
320
321 (void)withOSCSupport; // avoid warning
322 #else
304 NetworkPermissionTester tester; 323 NetworkPermissionTester tester;
305 bool networkPermission = tester.havePermission(); 324 bool networkPermission = tester.havePermission();
306 if (networkPermission) { 325 if (networkPermission) {
307 if (withOSCSupport) { 326 if (withOSCSupport) {
308 startOSCQueue(); 327 startOSCQueue();
312 ("sonicvisualiser.org", "survey23-present.txt", "survey23.php"); 331 ("sonicvisualiser.org", "survey23-present.txt", "survey23.php");
313 m_versionTester = new VersionTester 332 m_versionTester = new VersionTester
314 ("sonicvisualiser.org", "latest-version.txt", SV_VERSION); 333 ("sonicvisualiser.org", "latest-version.txt", SV_VERSION);
315 connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)), 334 connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)),
316 this, SLOT(newerVersionAvailable(QString))); 335 this, SLOT(newerVersionAvailable(QString)));
317 } else { 336 }
318 m_surveyer = 0; 337 #endif
319 m_versionTester = 0;
320 }
321 } 338 }
322 339
323 MainWindow::~MainWindow() 340 MainWindow::~MainWindow()
324 { 341 {
325 // SVDEBUG << "MainWindow::~MainWindow" << endl; 342 // SVDEBUG << "MainWindow::~MainWindow" << endl;