mirror of
https://github.com/LMMS/lmms.git
synced 2026-03-17 21:48:23 -04:00
Merge pull request #98 from Lukas-W/stable-0.4-iss90
Update file open/save dialogs
This commit is contained in:
@@ -30,7 +30,6 @@
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtGui/QFileDialog>
|
||||
#include <QtGui/QMessageBox>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
@@ -61,6 +60,8 @@
|
||||
#include "interpolation.h"
|
||||
#include "templates.h"
|
||||
|
||||
#include "FileDialog.h"
|
||||
|
||||
|
||||
SampleBuffer::SampleBuffer( const QString & _audio_file,
|
||||
bool _is_base64_data ) :
|
||||
@@ -829,10 +830,7 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
|
||||
|
||||
QString SampleBuffer::openAudioFile() const
|
||||
{
|
||||
QFileDialog ofd( NULL, tr( "Open audio file" ) );
|
||||
#if QT_VERSION >= 0x040806
|
||||
ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons );
|
||||
#endif
|
||||
FileDialog ofd( NULL, tr( "Open audio file" ) );
|
||||
|
||||
QString dir;
|
||||
if( !m_audioFile.isEmpty() )
|
||||
@@ -855,7 +853,7 @@ QString SampleBuffer::openAudioFile() const
|
||||
}
|
||||
// change dir to position of previously opened file
|
||||
ofd.setDirectory( dir );
|
||||
ofd.setFileMode( QFileDialog::ExistingFiles );
|
||||
ofd.setFileMode( FileDialog::ExistingFiles );
|
||||
|
||||
// set filters
|
||||
QStringList types;
|
||||
|
||||
Reference in New Issue
Block a user