diff widgets/InteractiveFileFinder.cpp @ 1051:c02c51ae5238 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf

--- a/widgets/InteractiveFileFinder.cpp	Fri Mar 18 14:25:05 2016 +0000
+++ b/widgets/InteractiveFileFinder.cpp	Wed Apr 20 12:06:28 2016 +0100
@@ -140,6 +140,12 @@
         filter = tr("Comma-separated data files (*.csv)\nSpace-separated .lab files (*.lab)\nText files (*.txt)\nAll files (*.*)");
         break;
 
+    case IMAFile:
+        settingsKeyStub = "imaf";
+        title = "Select an IMAF file";
+        filter = tr("IMAF files (*.ima)\nAll files (*.*)");
+        break;
+
     case AnyFile:
         settingsKeyStub = "last";
         filter = tr("All supported files (*.sv %1 %2 %3)\n%4 session files (*.%5)\nAudio files (%1)\nLayer files (%2)\nRDF files (%3)\nAll files (*.*)")
@@ -289,6 +295,10 @@
         filter = tr("Comma-separated data files (*.csv)\nText files (*.txt)\nAll files (*.*)");
         break;
 
+    case IMAFile:
+        cerr << "ERROR: Internal error: InteractiveFileFinder::getSaveFileName: IMAFile cannot be used here" << endl;
+        abort();
+
     case AnyFile:
         cerr << "ERROR: Internal error: InteractiveFileFinder::getSaveFileName: AnyFile cannot be used here" << endl;
         abort();
@@ -455,6 +465,10 @@
         settingsKeyStub = "layer";
         break;
 
+    case IMAFile:
+        settingsKeyStub = "imaf";
+        break;
+
     case AnyFile:
         settingsKeyStub = "last";
         break;