From dc92d571f4f97f6420fdf1a94cc41c1d2808d71b Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sun, 9 Aug 2015 05:13:19 -0500 Subject: Progress on edit lexicon dialog. * Files can now be loaded from user directory as well as app directory. * Edit lexicon dialog has been added, and pretty much all of the GUI elements framed out. Not actually implemented, yet. * Embiggen the board configuration dialog. * Some bits of code refactoring. --- datamanager.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'datamanager.h') diff --git a/datamanager.h b/datamanager.h index 15e793a..196d525 100644 --- a/datamanager.h +++ b/datamanager.h @@ -99,21 +99,24 @@ public: // Find a file at datadir/subdir/lexicon/file. // If this doesn't exist, tries backupLexicon instead of lexicon. // Returns empty string if the file is not found. - string findDataFile(const string &subDirectory, const string &lexicon, string file); + string findDataFile(const string &subDirectory, const string &lexicon, const string &file); // Find a file at datadir/subdir/file. // Returns empty string if the file is not found. - string findDataFile(const string &subDirectory, string file); + string findDataFile(const string &subDirectory, const string &file); // returns similarly-named file - string makeDataFilename(const string &subDirectory, const string &lexicon, string file); - string makeDataFilename(const string &subDirectory, string file); + string makeDataFilename(const string &subDirectory, const string &lexicon, const string &file, bool user); + string makeDataFilename(const string &subDirectory, const string &file, bool user); void setBackupLexicon(string backupLexicon) { m_backupLexicon = backupLexicon; } string backupLexicon() { return m_backupLexicon; } - void setDataDirectory(string directory) { m_dataDirectory = directory; } - string dataDirectory() { return m_dataDirectory; } + void setAppDataDirectory(string directory) { m_appDataDirectory = directory; } + string appDataDirectory() { return m_appDataDirectory; } + + void setUserDataDirectory(string directory) { m_userDataDirectory = directory; } + string userDataDirectory() { return m_userDataDirectory; } void seedRandomNumbers(unsigned int seed); int randomNumber(); @@ -123,7 +126,9 @@ private: bool fileExists(const string &filename); - string m_dataDirectory; + string m_appDataDirectory; + + string m_userDataDirectory; // lexicon that has all data files string m_backupLexicon; -- cgit v1.2.3