From 2e7bfe17e65de963214184157cb878d77dc5a1cf Mon Sep 17 00:00:00 2001 From: Lukas W Date: Wed, 22 Jan 2014 22:24:24 +0100 Subject: [PATCH] Update code to use FileInfo instead of QFileInfo Also removed all blocks similar to ``` #if QT_VERSION >= 0x040806 filedialog.setOption( QFileDialog::DontUseCustomDirectoryIcons ); #endif ``` as this now takes place in the new subclass's constructor. --- plugins/patman/patman.cpp | 9 +++------ plugins/sf2_player/sf2_player.cpp | 9 +++------ plugins/vestige/vestige.cpp | 9 +++------ plugins/vst_base/VstPlugin.cpp | 18 ++++++------------ src/core/SampleBuffer.cpp | 10 ++++------ src/core/song.cpp | 20 +++++++------------- src/gui/MainWindow.cpp | 4 ++-- src/gui/setup_dialog.cpp | 25 ++++++++++--------------- src/tracks/InstrumentTrack.cpp | 8 ++++---- 9 files changed, 42 insertions(+), 70 deletions(-) diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index a5a588b211..b2cdc9d1b7 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -25,7 +25,6 @@ #include "patman.h" -#include #include #include #include @@ -39,6 +38,7 @@ #include "song.h" #include "string_pair_drag.h" #include "tooltip.h" +#include "FileDialog.h" #include "embed.cpp" @@ -508,11 +508,8 @@ PatmanView::~PatmanView() void PatmanView::openFile( void ) { - QFileDialog ofd( NULL, tr( "Open patch file" ) ); -#if QT_VERSION >= 0x040806 - ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif - ofd.setFileMode( QFileDialog::ExistingFiles ); + FileDialog ofd( NULL, tr( "Open patch file" ) ); + ofd.setFileMode( FileDialog::ExistingFiles ); QStringList types; types << tr( "Patch-Files (*.pat)" ); diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 2467e717c8..9091cafef9 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -27,9 +27,9 @@ #include #include #include -#include #include +#include "FileDialog.h" #include "sf2_player.h" #include "engine.h" #include "InstrumentTrack.h" @@ -1044,11 +1044,8 @@ void sf2InstrumentView::showFileDialog() { sf2Instrument * k = castModel(); - QFileDialog ofd( NULL, tr( "Open SoundFont file" ) ); -#if QT_VERSION >= 0x040806 - ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif - ofd.setFileMode( QFileDialog::ExistingFiles ); + FileDialog ofd( NULL, tr( "Open SoundFont file" ) ); + ofd.setFileMode( FileDialog::ExistingFiles ); QStringList types; types << tr( "SoundFont2 Files (*.sf2)" ); diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 0cee1a4aa9..2f9239881f 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -25,7 +25,6 @@ #include "vestige.h" #include -#include #include #include #include @@ -43,6 +42,7 @@ #include "string_pair_drag.h" #include "text_float.h" #include "tooltip.h" +#include "FileDialog.h" #include "embed.cpp" @@ -615,10 +615,7 @@ void VestigeInstrumentView::modelChanged() void VestigeInstrumentView::openPlugin() { - QFileDialog ofd( NULL, tr( "Open VST-plugin" ) ); -#if QT_VERSION >= 0x040806 - ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif + FileDialog ofd( NULL, tr( "Open VST-plugin" ) ); QString dir; if( m_vi->m_pluginDLL != "" ) @@ -631,7 +628,7 @@ void VestigeInstrumentView::openPlugin() } // change dir to position of previously opened file ofd.setDirectory( dir ); - ofd.setFileMode( QFileDialog::ExistingFiles ); + ofd.setFileMode( FileDialog::ExistingFiles ); // set filters QStringList types; diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp index 8e331829ba..5ed6164a4e 100644 --- a/plugins/vst_base/VstPlugin.cpp +++ b/plugins/vst_base/VstPlugin.cpp @@ -24,7 +24,6 @@ #include "VstPlugin.h" -#include #include #include #include @@ -49,6 +48,7 @@ #include "MainWindow.h" #include "song.h" #include "templates.h" +#include "FileDialog.h" #include @@ -510,12 +510,9 @@ bool VstPlugin::processMessage( const message & _m ) void VstPlugin::openPreset( ) { - QFileDialog ofd( NULL, tr( "Open Preset" ), "", + FileDialog ofd( NULL, tr( "Open Preset" ), "", tr( "Vst Plugin Preset (*.fxp *.fxb)" ) ); -#if QT_VERSION >= 0x040806 - ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif - ofd.setFileMode( QFileDialog::ExistingFiles ); + ofd.setFileMode( FileDialog::ExistingFiles ); if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() ) { @@ -571,19 +568,16 @@ void VstPlugin::savePreset( ) QString presName = currentProgramName().isEmpty() ? tr(": default") : currentProgramName(); presName.replace(tr("\""), tr("'")); // QFileDialog unable to handle double quotes properly - QFileDialog sfd( NULL, tr( "Save Preset" ), presName.section(": ", 1, 1) + tr(".fxp"), + FileDialog sfd( NULL, tr( "Save Preset" ), presName.section(": ", 1, 1) + tr(".fxp"), tr( "Vst Plugin Preset (*.fxp *.fxb)" ) ); -#if QT_VERSION >= 0x040806 - sfd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif if( p_name != "" ) // remember last directory { sfd.setDirectory( QFileInfo( p_name ).absolutePath() ); } - sfd.setAcceptMode( QFileDialog::AcceptSave ); - sfd.setFileMode( QFileDialog::AnyFile ); + sfd.setAcceptMode( FileDialog::AcceptSave ); + sfd.setFileMode( FileDialog::AnyFile ); if( sfd.exec () == QDialog::Accepted && !sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" ) { diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp index 3308faf604..c9cd284994 100644 --- a/src/core/SampleBuffer.cpp +++ b/src/core/SampleBuffer.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -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; diff --git a/src/core/song.cpp b/src/core/song.cpp index a2c5457aae..a32f453d73 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -47,6 +46,7 @@ #include "ImportFilter.h" #include "InstrumentTrack.h" #include "MainWindow.h" +#include "FileDialog.h" #include "MidiClient.h" #include "mmp.h" #include "note_play_handle.h" @@ -1310,7 +1310,7 @@ bool song::guiSaveProjectAs( const QString & _file_name ) void song::importProject() { - QFileDialog ofd( NULL, tr( "Import file" ), + FileDialog ofd( NULL, tr( "Import file" ), configManager::inst()->userProjectsDir(), tr("MIDI sequences") + " (*.mid *.midi *.rmi);;" + @@ -1320,11 +1320,8 @@ void song::importProject() " (*.h2song);;" + tr("All file types") + " (*.*)"); -#if QT_VERSION >= 0x040806 - ofd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif - ofd.setFileMode( QFileDialog::ExistingFiles ); + ofd.setFileMode( FileDialog::ExistingFiles ); if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() ) { ImportFilter::import( ofd.selectedFiles()[0], this ); @@ -1377,13 +1374,10 @@ void song::exportProject(bool multiExport) return; } - QFileDialog efd( engine::mainWindow() ); -#if QT_VERSION >= 0x040806 - efd.setOption( QFileDialog::DontUseCustomDirectoryIcons ); -#endif + FileDialog efd( engine::mainWindow() ); if (multiExport) { - efd.setFileMode( QFileDialog::Directory); + efd.setFileMode( FileDialog::Directory); efd.setWindowTitle( tr( "Select directory for writing exported tracks..." ) ); if( !m_fileName.isEmpty() ) { @@ -1392,7 +1386,7 @@ void song::exportProject(bool multiExport) } else { - efd.setFileMode( QFileDialog::AnyFile ); + efd.setFileMode( FileDialog::AnyFile ); int idx = 0; QStringList types; while( __fileEncodeDevices[idx].m_fileFormat != @@ -1417,7 +1411,7 @@ void song::exportProject(bool multiExport) efd.setWindowTitle( tr( "Select file for project-export..." ) ); } - efd.setAcceptMode( QFileDialog::AcceptSave ); + efd.setAcceptMode( FileDialog::AcceptSave ); if( efd.exec() == QDialog::Accepted && diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index d23d9b5a50..82a8a61691 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -689,7 +689,7 @@ void MainWindow::openProject( void ) tr( "MultiMedia Project (*.mmp *.mmpz *.xml)" ) ); ofd.setDirectory( configManager::inst()->userProjectsDir() ); - ofd.setFileMode( QFileDialog::ExistingFiles ); + ofd.setFileMode( FileDialog::ExistingFiles ); if( ofd.exec () == QDialog::Accepted && !ofd.selectedFiles().isEmpty() ) { @@ -764,7 +764,7 @@ bool MainWindow::saveProjectAs( void ) sfd.setDirectory( configManager::inst()->userProjectsDir() ); } - if( sfd.exec () == QFileDialog::Accepted && + if( sfd.exec () == FileDialog::Accepted && !sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" ) { engine::getSong()->guiSaveProjectAs( diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index dcda537de9..0b0526aee5 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -23,7 +23,6 @@ */ #include -#include #include #include #include @@ -46,6 +45,7 @@ #include "tooltip.h" #include "led_checkbox.h" #include "lcd_spinbox.h" +#include "FileDialog.h" // platform-specific audio-interface-classes @@ -1056,13 +1056,8 @@ void setupDialog::toggleOneInstrumentTrackWindow( bool _enabled ) void setupDialog::openWorkingDir() { - QString new_dir = QFileDialog::getExistingDirectory( this, - tr( "Choose LMMS working directory" ), - m_workingDir -#if QT_VERSION >= 0x040806 - , QFileDialog::DontUseCustomDirectoryIcons -#endif - ); + QString new_dir = FileDialog::getExistingDirectory( this, + tr( "Choose LMMS working directory" ), m_workingDir ); if( new_dir != QString::null ) { m_wdLineEdit->setText( new_dir ); @@ -1082,7 +1077,7 @@ void setupDialog::setWorkingDir( const QString & _wd ) void setupDialog::openVSTDir() { - QString new_dir = QFileDialog::getExistingDirectory( this, + QString new_dir = FileDialog::getExistingDirectory( this, tr( "Choose your VST-plugin directory" ), m_vstDir ); if( new_dir != QString::null ) @@ -1104,7 +1099,7 @@ void setupDialog::setVSTDir( const QString & _vd ) void setupDialog::openArtworkDir() { - QString new_dir = QFileDialog::getExistingDirectory( this, + QString new_dir = FileDialog::getExistingDirectory( this, tr( "Choose artwork-theme directory" ), m_artworkDir ); if( new_dir != QString::null ) @@ -1126,7 +1121,7 @@ void setupDialog::setArtworkDir( const QString & _ad ) void setupDialog::openFLDir() { - QString new_dir = QFileDialog::getExistingDirectory( this, + QString new_dir = FileDialog::getExistingDirectory( this, tr( "Choose FL Studio installation directory" ), m_flDir ); if( new_dir != QString::null ) @@ -1140,7 +1135,7 @@ void setupDialog::openFLDir() void setupDialog::openLADSPADir() { - QString new_dir = QFileDialog::getExistingDirectory( this, + QString new_dir = FileDialog::getExistingDirectory( this, tr( "Choose LADSPA plugin directory" ), m_ladDir ); if( new_dir != QString::null ) @@ -1163,7 +1158,7 @@ void setupDialog::openLADSPADir() void setupDialog::openSTKDir() { #ifdef LMMS_HAVE_STK - QString new_dir = QFileDialog::getExistingDirectory( this, + QString new_dir = FileDialog::getExistingDirectory( this, tr( "Choose STK rawwave directory" ), m_stkDir ); if( new_dir != QString::null ) @@ -1179,7 +1174,7 @@ void setupDialog::openSTKDir() void setupDialog::openDefaultSoundfont() { #ifdef LMMS_HAVE_FLUIDSYNTH - QString new_file = QFileDialog::getOpenFileName( this, + QString new_file = FileDialog::getOpenFileName( this, tr( "Choose default SoundFont" ), m_defaultSoundfont, "SoundFont2 Files (*.sf2)" ); @@ -1212,7 +1207,7 @@ void setupDialog::openBackgroundArtwork() QString dir = ( m_backgroundArtwork.isEmpty() ) ? m_artworkDir : m_backgroundArtwork; - QString new_file = QFileDialog::getOpenFileName( this, + QString new_file = FileDialog::getOpenFileName( this, tr( "Choose background artwork" ), dir, "Image Files (" + fileTypes + ")" ); diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index f9c3ad9a1e..41db524edc 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -38,6 +37,7 @@ #include #include +#include "FileDialog.h" #include "InstrumentTrack.h" #include "AudioPort.h" #include "AutomationPattern.h" @@ -1462,7 +1462,7 @@ void InstrumentTrackWindow::modelChanged() void InstrumentTrackWindow::saveSettingsBtnClicked() { - QFileDialog sfd( this, tr( "Save preset" ), "", + FileDialog sfd( this, tr( "Save preset" ), "", tr( "XML preset file (*.xpf)" ) ); QString preset_root = configManager::inst()->userPresetsDir(); @@ -1475,9 +1475,9 @@ void InstrumentTrackWindow::saveSettingsBtnClicked() QDir( preset_root ).mkdir( m_track->instrumentName() ); } - sfd.setAcceptMode( QFileDialog::AcceptSave ); + sfd.setAcceptMode( FileDialog::AcceptSave ); sfd.setDirectory( preset_root + m_track->instrumentName() ); - sfd.setFileMode( QFileDialog::AnyFile ); + sfd.setFileMode( FileDialog::AnyFile ); if( sfd.exec () == QDialog::Accepted && !sfd.selectedFiles().isEmpty() && sfd.selectedFiles()[0] != "" )