Mercurial > hg > svapp

comparison framework/MainWindowBase.cpp @ 292:bc78f88a66f5 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Fri, 22 Nov 2013 10:41:36 +0000
parents a3fcaad1a269 3fc0df289533
children 14b1768e5406
comparison
equal deleted inserted replaced
290:a3fcaad1a269 292:bc78f88a66f5
311 return ff->getOpenFileName(type, m_sessionFile); 311 return ff->getOpenFileName(type, m_sessionFile);
312 case FileFinder::SessionOrAudioFile: 312 case FileFinder::SessionOrAudioFile:
313 return ff->getOpenFileName(type, m_sessionFile); 313 return ff->getOpenFileName(type, m_sessionFile);
314 case FileFinder::ImageFile: 314 case FileFinder::ImageFile:
315 return ff->getOpenFileName(type, m_sessionFile); 315 return ff->getOpenFileName(type, m_sessionFile);
316 case FileFinder::CSVFile:
317 return ff->getOpenFileName(type, m_sessionFile);
316 case FileFinder::AnyFile: 318 case FileFinder::AnyFile:
317 if (getMainModel() != 0 && 319 if (getMainModel() != 0 &&
318 m_paneStack != 0 && 320 m_paneStack != 0 &&
319 m_paneStack->getCurrentPane() != 0) { // can import a layer 321 m_paneStack->getCurrentPane() != 0) { // can import a layer
320 return ff->getOpenFileName(FileFinder::AnyFile, m_sessionFile); 322 return ff->getOpenFileName(FileFinder::AnyFile, m_sessionFile);
340 case FileFinder::LayerFileNoMidi: 342 case FileFinder::LayerFileNoMidi:
341 return ff->getSaveFileName(type, m_sessionFile); 343 return ff->getSaveFileName(type, m_sessionFile);
342 case FileFinder::SessionOrAudioFile: 344 case FileFinder::SessionOrAudioFile:
343 return ff->getSaveFileName(type, m_sessionFile); 345 return ff->getSaveFileName(type, m_sessionFile);
344 case FileFinder::ImageFile: 346 case FileFinder::ImageFile:
347 return ff->getSaveFileName(type, m_sessionFile);
348 case FileFinder::CSVFile:
345 return ff->getSaveFileName(type, m_sessionFile); 349 return ff->getSaveFileName(type, m_sessionFile);
346 case FileFinder::AnyFile: 350 case FileFinder::AnyFile:
347 return ff->getSaveFileName(type, m_sessionFile); 351 return ff->getSaveFileName(type, m_sessionFile);
348 } 352 }
349 return ""; 353 return "";