From 17e977dc2b95abb89a06fb55f2d34a9ab6c4c5f1 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Tue, 19 Jul 2016 02:29:55 +0200 Subject: [PATCH] Removed FLP configuration --- include/ConfigManager.h | 7 ------ include/SetupDialog.h | 4 ---- src/core/ConfigManager.cpp | 16 ------------- src/gui/SetupDialog.cpp | 48 -------------------------------------- 4 files changed, 75 deletions(-) diff --git a/include/ConfigManager.h b/include/ConfigManager.h index b3b1b326d..39c2e6d4c 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -175,11 +175,6 @@ public: return m_vstDir; } - const QString & flDir() const - { - return m_flDir; - } - const QString & ladspaDir() const { return m_ladDir; @@ -237,7 +232,6 @@ public: void setWorkingDir( const QString & _wd ); void setVSTDir( const QString & _vd ); void setArtworkDir( const QString & _ad ); - void setFLDir( const QString & _fd ); void setLADSPADir( const QString & _fd ); void setVersion( const QString & _cv ); void setSTKDir( const QString & _fd ); @@ -265,7 +259,6 @@ private: QString m_dataDir; QString m_artworkDir; QString m_vstDir; - QString m_flDir; QString m_ladDir; QString m_gigDir; QString m_sf2Dir; diff --git a/include/SetupDialog.h b/include/SetupDialog.h index 3c27d3a67..ffe367340 100644 --- a/include/SetupDialog.h +++ b/include/SetupDialog.h @@ -77,7 +77,6 @@ private slots: void setGIGDir( const QString & _gd ); void setSF2Dir( const QString & _sfd ); void setArtworkDir( const QString & _ad ); - void setFLDir( const QString & _fd ); void setLADSPADir( const QString & _ld ); void setSTKDir( const QString & _sd ); void setDefaultSoundfont( const QString & _sf ); @@ -110,7 +109,6 @@ private slots: void openGIGDir(); void openSF2Dir(); void openArtworkDir(); - void openFLDir(); void openLADSPADir(); void openSTKDir(); void openDefaultSoundfont(); @@ -150,7 +148,6 @@ private: QLineEdit * m_wdLineEdit; QLineEdit * m_vdLineEdit; QLineEdit * m_adLineEdit; - QLineEdit * m_fdLineEdit; QLineEdit * m_ladLineEdit; QLineEdit * m_gigLineEdit; QLineEdit * m_sf2LineEdit; @@ -165,7 +162,6 @@ private: QString m_workingDir; QString m_vstDir; QString m_artworkDir; - QString m_flDir; QString m_ladDir; QString m_gigDir; QString m_sf2Dir; diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index 819e67746..0e937bd5b 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -55,7 +55,6 @@ ConfigManager::ConfigManager() : m_dataDir( "data:/" ), m_artworkDir( defaultArtworkDir() ), m_vstDir( m_workingDir + "vst/" ), - m_flDir( QDir::home().absolutePath() ), m_gigDir( m_workingDir + GIG_PATH ), m_sf2Dir( m_workingDir + SF2_PATH ), m_version( defaultVersion() ) @@ -193,14 +192,6 @@ void ConfigManager::setArtworkDir( const QString & _ad ) -void ConfigManager::setFLDir( const QString & _fd ) -{ - m_flDir = ensureTrailingSlash( _fd ); -} - - - - void ConfigManager::setLADSPADir( const QString & _fd ) { m_ladDir = _fd; @@ -422,7 +413,6 @@ void ConfigManager::loadConfigFile( const QString & configFile ) setGIGDir( value( "paths", "gigdir" ) == "" ? gigDir() : value( "paths", "gigdir" ) ); setSF2Dir( value( "paths", "sf2dir" ) == "" ? sf2Dir() : value( "paths", "sf2dir" ) ); setVSTDir( value( "paths", "vstdir" ) ); - setFLDir( value( "paths", "fldir" ) ); setLADSPADir( value( "paths", "laddir" ) ); #ifdef LMMS_HAVE_STK setSTKDir( value( "paths", "stkdir" ) ); @@ -455,11 +445,6 @@ void ConfigManager::loadConfigFile( const QString & configFile ) #endif } - if( m_flDir.isEmpty() || m_flDir == QDir::separator() || m_flDir == "/") - { - m_flDir = ensureTrailingSlash( QDir::home().absolutePath() ); - } - if( m_ladDir.isEmpty() ) { m_ladDir = userLadspaDir(); @@ -502,7 +487,6 @@ void ConfigManager::saveConfigFile() setValue( "paths", "artwork", m_artworkDir ); setValue( "paths", "workingdir", m_workingDir ); setValue( "paths", "vstdir", m_vstDir ); - setValue( "paths", "fldir", m_flDir ); setValue( "paths", "gigdir", m_gigDir ); setValue( "paths", "sf2dir", m_sf2Dir ); setValue( "paths", "laddir", m_ladDir ); diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index 1f64f3c55..4de5a6857 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -112,7 +112,6 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : m_workingDir( QDir::toNativeSeparators( ConfigManager::inst()->workingDir() ) ), m_vstDir( QDir::toNativeSeparators( ConfigManager::inst()->vstDir() ) ), m_artworkDir( QDir::toNativeSeparators( ConfigManager::inst()->artworkDir() ) ), - m_flDir( QDir::toNativeSeparators( ConfigManager::inst()->flDir() ) ), m_ladDir( QDir::toNativeSeparators( ConfigManager::inst()->ladspaDir() ) ), m_gigDir( QDir::toNativeSeparators( ConfigManager::inst()->gigDir() ) ), m_sf2Dir( QDir::toNativeSeparators( ConfigManager::inst()->sf2Dir() ) ), @@ -482,29 +481,6 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : connect( backgroundartworkdir_select_btn, SIGNAL( clicked() ), this, SLOT( openBackgroundArtwork() ) ); - - - - - // FL Studio-dir - TabWidget * fl_tw = new TabWidget( tr( - "FL Studio installation directory" ).toUpper(), - paths ); - fl_tw->setFixedHeight( 48 ); - - m_fdLineEdit = new QLineEdit( m_flDir, fl_tw ); - m_fdLineEdit->setGeometry( 10, 20, txtLength, 16 ); - connect( m_fdLineEdit, SIGNAL( textChanged( const QString & ) ), this, - SLOT( setFLDir( const QString & ) ) ); - - QPushButton * fldir_select_btn = new QPushButton( - embed::getIconPixmap( "project_open", 16, 16 ), - "", fl_tw ); - fldir_select_btn->setFixedSize( 24, 24 ); - fldir_select_btn->move( btnStart, 16 ); - connect( fldir_select_btn, SIGNAL( clicked() ), this, - SLOT( openFLDir() ) ); - // vst-dir TabWidget * vst_tw = new TabWidget( tr( "VST-plugin directory" ).toUpper(), @@ -644,7 +620,6 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : pathSelectorLayout->addSpacing( 10 ); pathSelectorLayout->addWidget( sf_tw ); #endif - pathSelectorLayout->addWidget( fl_tw ); pathSelectorLayout->addSpacing( 10 ); pathSelectorLayout->addWidget( artwork_tw ); pathSelectorLayout->addSpacing( 10 ); @@ -1062,7 +1037,6 @@ void SetupDialog::accept() ConfigManager::inst()->setGIGDir(QDir::fromNativeSeparators(m_gigDir)); ConfigManager::inst()->setSF2Dir(QDir::fromNativeSeparators(m_sf2Dir)); ConfigManager::inst()->setArtworkDir(QDir::fromNativeSeparators(m_artworkDir)); - ConfigManager::inst()->setFLDir(QDir::fromNativeSeparators(m_flDir)); ConfigManager::inst()->setLADSPADir(QDir::fromNativeSeparators(m_ladDir)); #ifdef LMMS_HAVE_FLUIDSYNTH ConfigManager::inst()->setDefaultSoundfont( m_defaultSoundfont ); @@ -1380,20 +1354,6 @@ void SetupDialog::setArtworkDir( const QString & _ad ) -void SetupDialog::openFLDir() -{ - QString new_dir = FileDialog::getExistingDirectory( this, - tr( "Choose FL Studio installation directory" ), - m_flDir ); - if( new_dir != QString::null ) - { - m_fdLineEdit->setText( new_dir ); - } -} - - - - void SetupDialog::openLADSPADir() { QString new_dir = FileDialog::getExistingDirectory( this, @@ -1480,14 +1440,6 @@ void SetupDialog::openBackgroundArtwork() -void SetupDialog::setFLDir( const QString & _fd ) -{ - m_flDir = _fd; -} - - - - void SetupDialog::setLADSPADir( const QString & _fd ) { m_ladDir = _fd;