Merge pull request #1908 from curlymorphic/pathDialog
Re organizing of the user LMMS directory
This commit is contained in:
@@ -1069,7 +1069,7 @@ void GigInstrumentView::showFileDialog()
|
||||
|
||||
if( QFileInfo( f ).isRelative() )
|
||||
{
|
||||
f = ConfigManager::inst()->userSamplesDir() + f;
|
||||
f = ConfigManager::inst()->gigDir() + f;
|
||||
|
||||
if( QFileInfo( f ).exists() == false )
|
||||
{
|
||||
@@ -1082,7 +1082,7 @@ void GigInstrumentView::showFileDialog()
|
||||
}
|
||||
else
|
||||
{
|
||||
ofd.setDirectory( ConfigManager::inst()->userSamplesDir() );
|
||||
ofd.setDirectory( ConfigManager::inst()->gigDir() );
|
||||
}
|
||||
|
||||
m_fileDialogButton->setEnabled( false );
|
||||
|
||||
@@ -1067,7 +1067,7 @@ void sf2InstrumentView::showFileDialog()
|
||||
QString f = k->m_filename;
|
||||
if( QFileInfo( f ).isRelative() )
|
||||
{
|
||||
f = ConfigManager::inst()->userSamplesDir() + f;
|
||||
f = ConfigManager::inst()->sf2Dir() + f;
|
||||
if( QFileInfo( f ).exists() == false )
|
||||
{
|
||||
f = ConfigManager::inst()->factorySamplesDir() + k->m_filename;
|
||||
@@ -1078,7 +1078,7 @@ void sf2InstrumentView::showFileDialog()
|
||||
}
|
||||
else
|
||||
{
|
||||
ofd.setDirectory( ConfigManager::inst()->userSamplesDir() );
|
||||
ofd.setDirectory( ConfigManager::inst()->sf2Dir() );
|
||||
}
|
||||
|
||||
m_fileDialogButton->setEnabled( false );
|
||||
|
||||
Reference in New Issue
Block a user