comparison main/MainWindow.cpp @ 1984:015416e3a298 import-audio-data

Merge from default branch

 #include <QProcess>
 #include <QCheckBox>
 #include <QRegExp>
 #include <QScrollArea>
 #include <QCloseEvent>
-#include <QDesktopServices>
 #include <QDialogButtonBox>
 #include <QFileSystemWatcher>
 #include <QTextEdit>
 
 #include <iostream>

     menu->addSeparator();
     menu->addAction(m_recordAction);
     menu->addSeparator();
 
     m_rightButtonPlaybackMenu->addAction(m_playAction);
-    m_rightButtonPlaybackMenu->addAction(m_recordAction);
     m_rightButtonPlaybackMenu->addAction(m_playSelectionAction);
     m_rightButtonPlaybackMenu->addAction(m_playLoopAction);
     m_rightButtonPlaybackMenu->addAction(m_soloAction);
     if (alAction) m_rightButtonPlaybackMenu->addAction(alAction);
     m_rightButtonPlaybackMenu->addSeparator();

 
 void
 MainWindow::manageSavedTemplates()
 {
     ResourceFinder rf;
-    QDesktopServices::openUrl("file:" + rf.getResourceSaveDir("templates"));
+    openLocalFolder(rf.getResourceSaveDir("templates"));
 }
 
 void
 MainWindow::paneAdded(Pane *pane)
 {

     aboutText += "<br>";
     aboutText += tr("Czech UI translation contributed by Pavel Fric.");
     aboutText += "</small></p>";
 
     aboutText += 
-        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2017 Chris Cannam and "
+        "<p><small>Sonic Visualiser Copyright &copy; 2005&ndash;2018 Chris Cannam and "
         "Queen Mary, University of London.</small></p>";
 
     aboutText +=
         "<p><small>This program is free software; you can redistribute it and/or "
         "modify it under the terms of the GNU General Public License as "