Mercurial > hg > sonic-visualiser
diff main/MainWindow.cpp @ 1984:015416e3a298 import-audio-data
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 04 Sep 2018 14:10:47 +0100 |
parents | a28cab68eac6 abd3f881279c |
children | bb9cf19e0b67 |
line wrap: on
line diff
--- a/main/MainWindow.cpp Fri Jun 29 14:10:08 2018 +0100 +++ b/main/MainWindow.cpp Tue Sep 04 14:10:47 2018 +0100 @@ -122,7 +122,6 @@ #include <QRegExp> #include <QScrollArea> #include <QCloseEvent> -#include <QDesktopServices> #include <QDialogButtonBox> #include <QFileSystemWatcher> #include <QTextEdit> @@ -2276,7 +2275,6 @@ 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); @@ -3506,7 +3504,7 @@ MainWindow::manageSavedTemplates() { ResourceFinder rf; - QDesktopServices::openUrl("file:" + rf.getResourceSaveDir("templates")); + openLocalFolder(rf.getResourceSaveDir("templates")); } void @@ -5190,7 +5188,7 @@ aboutText += "</small></p>"; aboutText += - "<p><small>Sonic Visualiser Copyright © 2005–2017 Chris Cannam and " + "<p><small>Sonic Visualiser Copyright © 2005–2018 Chris Cannam and " "Queen Mary, University of London.</small></p>"; aboutText +=