comparison data/fileio/CSVFileReader.cpp @ 308:14e0f60435b8

* Make it possible to drop audio files, layer files, session files and images
  onto SV panes.
  Need to do a bit more work on where we expect the dropped file to go,
  particularly in the case of audio files -- at the moment they're always
  opened in new panes, but it may be better to by default replace whatever is
  in the target pane.

 #include "model/Model.h"
 #include "base/RealTime.h"
 #include "model/SparseOneDimensionalModel.h"
 #include "model/SparseTimeValueModel.h"
 #include "model/EditableDenseThreeDimensionalModel.h"
+#include "DataFileReaderFactory.h"
 
 #include <QFile>
 #include <QString>
 #include <QRegExp>
 #include <QStringList>

     CSVFormatDialog *dialog = new CSVFormatDialog
 	(0, m_file, m_mainModelSampleRate);
 
     if (dialog->exec() == QDialog::Rejected) {
 	delete dialog;
-	return 0;
+        throw DataFileReaderFactory::ImportCancelled;
     }
 
     CSVFormatDialog::ModelType   modelType = dialog->getModelType();
     CSVFormatDialog::TimingType timingType = dialog->getTimingType();
     CSVFormatDialog::TimeUnits   timeUnits = dialog->getTimeUnits();

 
     (void)guessFormat(file);
 
     QGridLayout *layout = new QGridLayout;
 
-    layout->addWidget(new QLabel(tr("\nPlease select the correct data format for this file.\n")),
+    layout->addWidget(new QLabel(tr("<b>Select Data Format</b><p>Please select the correct data format for this file.")),
 		      0, 0, 1, 4);
 
     layout->addWidget(new QLabel(tr("Each row specifies:")), 1, 0);
 
     m_modelTypeCombo = new QComboBox;