comparison framework/MainWindowBase.cpp @ 231:65d75297a37e templating

Pull the default session template directly from settings, instead of storing it

 
     labellerType = (Labeller::ValueType)
         settings.value("labellertype", (int)labellerType).toInt();
     int cycle = settings.value("labellercycle", 4).toInt();
 
-    m_defaultSessionTemplate = settings.value("sessiontemplate", "").toString();
-    if (m_defaultSessionTemplate == "") m_defaultSessionTemplate = "default";
-
     settings.endGroup();
 
     m_labeller = new Labeller(labellerType);
     m_labeller->setCounterCycleSize(cycle);
 

 {
     FileFinder *ff = FileFinder::getInstance();
     ff->registerLastOpenedFilePath(type, path);
 }
 
-void
-MainWindowBase::setDefaultSessionTemplate(QString name)
-{
-    m_defaultSessionTemplate = name;
-}
-
 QString
 MainWindowBase::getDefaultSessionTemplate() const
 {
-    return m_defaultSessionTemplate;
+    QSettings settings;
+    settings.beginGroup("MainWindow");
+    QString templateName = settings.value("sessiontemplate", "").toString();
+    if (templateName == "") templateName = "default";
+    return templateName;
 }
 
 void
 MainWindowBase::updateMenuStates()
 {

                           QString templateName)
 {
 //    std::cerr << "MainWindowBase::openAudio(" << source.getLocation().toStdString() << ")" << std::endl;
 
     if (templateName == "") {
-        templateName = m_defaultSessionTemplate;
+        templateName = getDefaultSessionTemplate();
     }
 
     std::cerr << "template is: \"" << templateName.toStdString() << "\"" << std::endl;
 
     if (!source.isAvailable()) return FileOpenFailed;