From a505d3e494fa8a237c90ad297bf33a567dc207af Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 14 Aug 2014 05:08:36 +0200 Subject: [PATCH] Removed FileLister::insertFile This was a nasty hack to insert English into the list of translations. Instead of modifying the scan results, make a copy and modify the copy. --- src/filelister.cpp | 4 ---- src/filelister.h | 1 - src/gmenu2x.cpp | 5 +++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/filelister.cpp b/src/filelister.cpp index 0364c45..7620a13 100644 --- a/src/filelister.cpp +++ b/src/filelister.cpp @@ -169,7 +169,3 @@ string FileLister::operator[](uint x) const auto dirCount = directories.size(); return x < dirCount ? directories[x] : files[x - dirCount]; } - -void FileLister::insertFile(const string &file) { - files.insert(files.begin(), file); -} diff --git a/src/filelister.h b/src/filelister.h index 5b7c692..dcf34a6 100644 --- a/src/filelister.h +++ b/src/filelister.h @@ -51,7 +51,6 @@ public: const std::vector &getDirectories() { return directories; } const std::vector &getFiles() { return files; } - void insertFile(const std::string &file); }; #endif // FILELISTER_H diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index cb96043..c31c9a2 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -680,7 +680,8 @@ void GMenu2X::showSettings() { fl_tr.browse(GMENU2X_SYSTEM_DIR "/translations"); fl_tr.browse(getHome() + "/translations", false); - fl_tr.insertFile("English"); + vector translations = fl_tr.getFiles(); + translations.insert(translations.begin(), "English"); string lang = tr.lang(); vector encodings; @@ -688,7 +689,7 @@ void GMenu2X::showSettings() { encodings.push_back("PAL"); SettingsDialog sd(this, input, ts, tr["Settings"]); - sd.addSetting(new MenuSettingMultiString(this, ts, tr["Language"], tr["Set the language used by GMenu2X"], &lang, &fl_tr.getFiles())); + sd.addSetting(new MenuSettingMultiString(this, ts, tr["Language"], tr["Set the language used by GMenu2X"], &lang, &translations)); sd.addSetting(new MenuSettingBool(this, ts, tr["Save last selection"], tr["Save the last selected link and section on exit"], &confInt["saveSelection"])); #ifdef ENABLE_CPUFREQ sd.addSetting(new MenuSettingInt(this, ts, tr["Clock for GMenu2X"], tr["Set the cpu working frequency when running GMenu2X"], &confInt["menuClock"], cpuFreqMin, cpuFreqSafeMax, cpuFreqMultiple));