# HG changeset patch # User mathieub # Date 1318861515 -3600 # Node ID 915ac1d3c807f153f6d9861066c367d6a052625b # Parent 0136555495ae74b3ca10ecb94c08cf151fb9a792# Parent c469f8d8208eab9c8fcc6b4db05c1f00e3c32a7c Merge from the default branch diff -r 0136555495ae -r 915ac1d3c807 framework/MainWindowBase.cpp --- a/framework/MainWindowBase.cpp Tue Oct 11 11:16:38 2011 +0100 +++ b/framework/MainWindowBase.cpp Mon Oct 17 15:25:15 2011 +0100 @@ -340,6 +340,14 @@ } void +MainWindowBase::setDefaultSessionTemplate(QString n) +{ + QSettings settings; + settings.beginGroup("MainWindow"); + settings.setValue("sessiontemplate", n); +} + +void MainWindowBase::updateMenuStates() { Pane *currentPane = 0; diff -r 0136555495ae -r 915ac1d3c807 framework/MainWindowBase.h --- a/framework/MainWindowBase.h Tue Oct 11 11:16:38 2011 +0100 +++ b/framework/MainWindowBase.h Mon Oct 17 15:25:15 2011 +0100 @@ -399,6 +399,7 @@ virtual void registerLastOpenedFilePath(FileFinder::FileType type, QString path); virtual QString getDefaultSessionTemplate() const; + virtual void setDefaultSessionTemplate(QString); virtual void createPlayTarget(); virtual void openHelpUrl(QString url);