Mercurial > hg > tony

changeset 259:fa329ca6d75e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make session file extension parameterisable, use .ton for Tony
author Chris Cannam
date Wed, 02 Apr 2014 18:22:41 +0100
parents 2042fec57e0b
children 46d59edfd18a
files .hgsubstate src/MainWindow.cpp src/MainWindow.h src/main.cpp
diffstat 4 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Apr 02 12:26:28 2014 +0100
+++ b/.hgsubstate	Wed Apr 02 18:22:41 2014 +0100
@@ -2,6 +2,6 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 e291f3657872db892f6ee525b36e98472a5ccd26 pyin
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
-dd07d48d7d4f7d033299a9142e04718b86c0ef1d svapp
+93cf23bfa1cba443d912716dcf6c20448b0b868d svapp
 8db820ad2b8f4f15b80e103d681f5a66c90983de svcore
-30bc7b2155dc6aab7f8600968776e65320c7187f svgui
+d0fd7630d32f38e816a9147acf7295f812bee1e1 svgui
--- a/src/MainWindow.cpp	Wed Apr 02 12:26:28 2014 +0100
+++ b/src/MainWindow.cpp	Wed Apr 02 18:22:41 2014 +0100
@@ -2685,7 +2685,15 @@
         connect(m_fader, SIGNAL(valueChanged(float)),
                 m_playTarget, SLOT(setOutputGain(float)));
     }
-
+    
+    analyseNewMainModel();
+}
+
+void
+MainWindow::analyseNewMainModel()
+{
+    WaveFileModel *model = getMainModel();
+    
     if (model) {
         if (m_paneStack) {
 
--- a/src/MainWindow.h	Wed Apr 02 12:26:28 2014 +0100
+++ b/src/MainWindow.h	Wed Apr 02 18:22:41 2014 +0100
@@ -235,6 +235,8 @@
     virtual void closeEvent(QCloseEvent *e);
     bool checkSaveModified();
 
+    void analyseNewMainModel();
+
     virtual void updateVisibleRangeDisplay(Pane *p) const;
     virtual void updatePositionStatusDisplays() const;
 };
--- a/src/main.cpp	Wed Apr 02 12:26:28 2014 +0100
+++ b/src/main.cpp	Wed Apr 02 18:22:41 2014 +0100
@@ -21,6 +21,7 @@
 #include "base/PropertyContainer.h"
 #include "base/Preferences.h"
 #include "widgets/TipDialog.h"
+#include "widgets/InteractiveFileFinder.h"
 #include "transform/TransformFactory.h"
 
 #include <QMetaType>
@@ -161,6 +162,8 @@
     QApplication::setOrganizationDomain("qmul.ac.uk");
     QApplication::setApplicationName("Tony");
 
+    InteractiveFileFinder::getInstance()->setApplicationSessionExtension("ton");
+
     QSplashScreen *splash = 0;
     // If we had a splash screen, we would show it here