Mercurial > hg > svcore
diff 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.
author | Chris Cannam |
---|---|
date | Wed, 10 Oct 2007 15:18:02 +0000 |
parents | 7336fe3a7caa |
children | 21e79997e80f |
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp Wed Oct 10 10:22:34 2007 +0000 +++ b/data/fileio/CSVFileReader.cpp Wed Oct 10 15:18:02 2007 +0000 @@ -20,6 +20,7 @@ #include "model/SparseOneDimensionalModel.h" #include "model/SparseTimeValueModel.h" #include "model/EditableDenseThreeDimensionalModel.h" +#include "DataFileReaderFactory.h" #include <QFile> #include <QString> @@ -91,7 +92,7 @@ if (dialog->exec() == QDialog::Rejected) { delete dialog; - return 0; + throw DataFileReaderFactory::ImportCancelled; } CSVFormatDialog::ModelType modelType = dialog->getModelType(); @@ -304,7 +305,7 @@ 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);