comparison framework/SVFileReader.cpp @ 109:2dd30a7cd21a

* More work to abstract out interactive components used in the data library,
  so that it does not need to depend on QtGui.

 #include "view/View.h"
 #include "base/PlayParameters.h"
 #include "base/PlayParameterRepository.h"
 
 #include "data/fileio/AudioFileReaderFactory.h"
-#include "data/fileio/FileFinder.h"
 #include "data/fileio/FileSource.h"
+
+#include "widgets/FileFinder.h"
 
 #include "data/model/WaveFileModel.h"
 #include "data/model/EditableDenseThreeDimensionalModel.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "data/model/SparseTimeValueModel.h"

 #include "data/model/ImageModel.h"
 
 #include "transform/TransformFactory.h"
 
 #include "view/Pane.h"
+
+#include "widgets/ProgressDialog.h"
 
 #include "Document.h"
 
 #include <QString>
 #include <QMessageBox>

         FileFinder *ff = FileFinder::getInstance();
         QString originalPath = attributes.value("file");
         QString path = ff->find(FileFinder::AudioFile,
                                 originalPath, m_location);
 
-        FileSource file(path, FileSource::ProgressDialog);
+        ProgressDialog dialog(tr("Opening file or URL..."), true, 2000);
+        FileSource file(path, &dialog);
         file.waitForStatus();
 
         if (!file.isOK()) {
             std::cerr << "SVFileReader::readModel: Failed to retrieve file \"" << path.toStdString() << "\" for wave file model: " << file.getErrorString().toStdString() << std::endl;
         } else if (!file.isAvailable()) {