# HG changeset patch # User Chris Cannam # Date 1305118320 -3600 # Node ID 45bfc5962c334794d7fd83bc5361086bfecfce90 # Parent 5ae2d0f7fe5facfb43ee4187a98dcaed12ce5939 Add some "proper" default templates; ensure default template is updated in menu if our template file disappears diff -r 5ae2d0f7fe5f -r 45bfc5962c33 main/MainWindow.cpp --- a/main/MainWindow.cpp Wed May 11 11:06:20 2011 +0100 +++ b/main/MainWindow.cpp Wed May 11 13:52:00 2011 +0100 @@ -1655,20 +1655,26 @@ settings.beginGroup("MainWindow"); QString deflt = settings.value("sessiontemplate", "").toString(); setDefaultSessionTemplate(deflt == "" ? "default" : deflt); - settings.endGroup(); QActionGroup *templatesGroup = new QActionGroup(this); - QAction *action = new QAction(tr("Default"), this); - action->setObjectName("default"); - connect(action, SIGNAL(triggered()), this, SLOT(changeTemplate())); - action->setCheckable(true); - action->setChecked(deflt == "" || deflt == "default"); - templatesGroup->addAction(action); - m_templatesMenu->addAction(action); + bool haveFoundDefault = false; + + QAction *defaultAction = new QAction(tr("Default"), this); + defaultAction->setObjectName("default"); + connect(defaultAction, SIGNAL(triggered()), this, SLOT(changeTemplate())); + defaultAction->setCheckable(true); + if (deflt == "" || deflt == "default") { + defaultAction->setChecked(true); + haveFoundDefault = true; + } + templatesGroup->addAction(defaultAction); + m_templatesMenu->addAction(defaultAction); m_templatesMenu->addSeparator(); + QAction *action = 0; + QStringList templates = ResourceFinder().getResourceFiles("templates", "svt"); bool havePersonal = false; @@ -1685,13 +1691,24 @@ action = new QAction(t, this); connect(action, SIGNAL(triggered()), this, SLOT(changeTemplate())); action->setCheckable(true); - action->setChecked(deflt == t); + if (deflt == t) { + action->setChecked(true); + haveFoundDefault = true; + } templatesGroup->addAction(action); m_templatesMenu->addAction(action); } if (!templates.empty()) m_templatesMenu->addSeparator(); + if (!haveFoundDefault) { + defaultAction->setChecked(true); + setDefaultSessionTemplate("default"); + settings.setValue("sessiontemplate", ""); + } + + settings.endGroup(); + action = new QAction(tr("Save Template from Current Session..."), this); connect(action, SIGNAL(triggered()), this, SLOT(saveSessionAsTemplate())); m_templatesMenu->addAction(action); diff -r 5ae2d0f7fe5f -r 45bfc5962c33 sonic-visualiser.qrc --- a/sonic-visualiser.qrc Wed May 11 11:06:20 2011 +0100 +++ b/sonic-visualiser.qrc Wed May 11 13:52:00 2011 +0100 @@ -106,8 +106,9 @@ samples/strike.wav samples/tap.wav templates/default.svt - templates/tk.svt - templates/testtemplate.svt + templates/Scrolling Waveforms.svt + templates/Spectrograms.svt + templates/Waveform and Melodic Range Spectrogram.svt i18n/sonic-visualiser_ru.qm i18n/sonic-visualiser_en_GB.qm i18n/sonic-visualiser_en_US.qm diff -r 5ae2d0f7fe5f -r 45bfc5962c33 templates/Scrolling Waveforms.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Scrolling Waveforms.svt Wed May 11 13:52:00 2011 +0100 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 5ae2d0f7fe5f -r 45bfc5962c33 templates/Spectrograms.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Spectrograms.svt Wed May 11 13:52:00 2011 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 5ae2d0f7fe5f -r 45bfc5962c33 templates/Waveform and Melodic Range Spectrogram.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Waveform and Melodic Range Spectrogram.svt Wed May 11 13:52:00 2011 +0100 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 5ae2d0f7fe5f -r 45bfc5962c33 templates/testtemplate.svt --- a/templates/testtemplate.svt Wed May 11 11:06:20 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 5ae2d0f7fe5f -r 45bfc5962c33 templates/tk.svt --- a/templates/tk.svt Wed May 11 11:06:20 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,918 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -