Merge pull request #1908 from curlymorphic/pathDialog

Re organizing of the user LMMS directory

include/ConfigManager.h

@@ -44,6 +44,9 @@ const QString PROJECTS_PATH = "projects/";
 const QString TEMPLATE_PATH = "templates/";
 const QString PRESETS_PATH = "presets/";
 const QString SAMPLES_PATH = "samples/";
+const QString GIG_PATH = "samples/gig/";
+const QString SF2_PATH = "samples/sf2/";
+const QString LADSPA_PATH ="plugins/ladspa/";
 const QString DEFAULT_THEME_PATH = "themes/default/";
 const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
@@ -92,6 +95,26 @@ public:
 		return workingDir() + SAMPLES_PATH;
 	}
 
+	QString userGigDir() const
+	{
+		return workingDir() + GIG_PATH;
+	}
+
+	QString userSf2Dir() const
+	{
+		return workingDir() + SF2_PATH;
+	}
+
+	QString userLadspaDir() const
+	{
+		return workingDir() + LADSPA_PATH;
+	}
+
+	QString userVstDir() const
+	{
+		return m_vstDir;
+	}
+
 	QString factoryProjectsDir() const
 	{
 		return dataDir() + PROJECTS_PATH;
@@ -132,6 +155,16 @@ public:
 		return m_dataDir + LOCALE_PATH;
 	}
 
+	const QString & gigDir() const
+	{
+		return m_gigDir;
+	}
+
+	const QString & sf2Dir() const
+	{
+		return m_sf2Dir;
+	}
+
 	const QString & pluginDir() const
 	{
 		return m_pluginDir;
@@ -206,6 +239,8 @@ public:
 	void setSTKDir( const QString & _fd );
 	void setDefaultSoundfont( const QString & _sf );
 	void setBackgroundArtwork( const QString & _ba );
+	void setGIGDir( const QString & gd );
+	void setSF2Dir( const QString & sfd );
 
 
 private:
@@ -226,6 +261,8 @@ private:
 	QString m_vstDir;
 	QString m_flDir;
 	QString m_ladDir;
+	QString m_gigDir;
+	QString m_sf2Dir;
 	QString m_version;
 #ifdef LMMS_HAVE_STK
 	QString m_stkDir;

include/SetupDialog.h

@@ -1,3 +1,4 @@
+
 /*
  * SetupDialog.h - dialog for setting up LMMS
  *
@@ -71,6 +72,8 @@ private slots:
 	// path settings widget
 	void setWorkingDir( const QString & _wd );
 	void setVSTDir( const QString & _vd );
+	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 );
@@ -96,6 +99,8 @@ private slots:
 
 	void openWorkingDir();
 	void openVSTDir();
+	void openGIGDir();
+	void openSF2Dir();
 	void openArtworkDir();
 	void openFLDir();
 	void openLADSPADir();
@@ -138,6 +143,8 @@ private:
 	QLineEdit * m_adLineEdit;
 	QLineEdit * m_fdLineEdit;
 	QLineEdit * m_ladLineEdit;
+	QLineEdit * m_gigLineEdit;
+	QLineEdit * m_sf2LineEdit;
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	QLineEdit * m_sfLineEdit;
 #endif
@@ -151,6 +158,8 @@ private:
 	QString m_artworkDir;
 	QString m_flDir;
 	QString m_ladDir;
+	QString m_gigDir;
+	QString m_sf2Dir;
 #ifdef LMMS_HAVE_FLUIDSYNTH
 	QString m_defaultSoundfont;
 #endif