From 8032d96a17c20304ca34e86bb5c7d643493cff3e Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Tue, 27 Jul 2010 21:41:35 +0200 Subject: [PATCH] Converted public fields of FileLister to private. --- src/filelister.cpp | 10 +++++++++- src/filelister.h | 8 +++++++- src/gmenu2x.cpp | 14 +++++++------- src/menu.cpp | 2 +- src/selector.cpp | 8 ++++---- src/wallpaperdialog.cpp | 12 ++++++------ 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/filelister.cpp b/src/filelister.cpp index 0779840..a323a3e 100644 --- a/src/filelister.cpp +++ b/src/filelister.cpp @@ -95,7 +95,7 @@ void FileLister::browse() cout << "\033[0;34mGMENU2X:\033[0;31m stat failed on '" << filepath << "' with error '" << strerror(errno) << "'\033[0m" << endl; continue; } - if (find(exclude.begin(), exclude.end(), file) != exclude.end()) + if (find(excludes.begin(), excludes.end(), file) != excludes.end()) continue; if (S_ISDIR(st.st_mode)) { @@ -159,3 +159,11 @@ bool FileLister::isDirectory(unsigned int x) { return x < directories.size(); } + +void FileLister::insertFile(const string &file) { + files.insert(files.begin(), file); +} + +void FileLister::addExclude(const string &exclude) { + excludes.push_back(exclude); +} diff --git a/src/filelister.h b/src/filelister.h index f5e4966..4634e04 100644 --- a/src/filelister.h +++ b/src/filelister.h @@ -32,11 +32,12 @@ private: string path, filter; bool showDirectories, showFiles; + vector directories, files, excludes; + public: FileLister(const string &startPath = "/boot/local", bool showDirectories = true, bool showFiles = true); void browse(); - vector directories, files, exclude; unsigned int size(); unsigned int dirCount(); unsigned int fileCount(); @@ -49,6 +50,11 @@ public: void setPath(const string &path, bool doBrowse=true); const string &getFilter(); void setFilter(const string &filter); + + const vector &getDirectories() { return directories; } + const vector &getFiles() { return files; } + void insertFile(const string &file); + void addExclude(const string &exclude); }; #endif /*FILELISTER_H_*/ diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 507fc9b..a08c628 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -272,10 +272,10 @@ GMenu2X::GMenu2X() { FileLister fl("skins/"+confStr["skin"]+"/wallpapers",false,true); fl.setFilter(".png,.jpg,.jpeg,.bmp"); fl.browse(); - if (fl.files.size()<=0 && confStr["skin"] != "Default") + if (fl.getFiles().size()<=0 && confStr["skin"] != "Default") fl.setPath("skins/Default/wallpapers",true); - if (fl.files.size()>0) - confStr["wallpaper"] = fl.getPath()+fl.files[0]; + if (fl.getFiles().size()>0) + confStr["wallpaper"] = fl.getPath()+fl.getFiles()[0]; } initBG(); @@ -1020,7 +1020,7 @@ void GMenu2X::options() { FileLister fl_tr("translations"); fl_tr.browse(); - fl_tr.files.insert(fl_tr.files.begin(),"English"); + fl_tr.insertFile("English"); string lang = tr.lang(); vector encodings; @@ -1028,7 +1028,7 @@ void GMenu2X::options() { encodings.push_back("PAL"); SettingsDialog sd(this,tr["Settings"]); - sd.addSetting(new MenuSettingMultiString(this,tr["Language"],tr["Set the language used by GMenu2X"],&lang,&fl_tr.files)); + sd.addSetting(new MenuSettingMultiString(this,tr["Language"],tr["Set the language used by GMenu2X"],&lang,&fl_tr.getFiles())); sd.addSetting(new MenuSettingBool(this,tr["Save last selection"],tr["Save the last selected link and section on exit"],&confInt["saveSelection"])); sd.addSetting(new MenuSettingInt(this,tr["Clock for GMenu2X"],tr["Set the cpu working frequency when running GMenu2X"],&confInt["menuClock"],200,430)); sd.addSetting(new MenuSettingInt(this,tr["Maximum overclock"],tr["Set the maximum overclock for launching links"],&confInt["maxClock"],200,430)); @@ -1081,12 +1081,12 @@ void GMenu2X::settingsOpen2x() { void GMenu2X::skinMenu() { FileLister fl_sk("skins",true,false); - fl_sk.exclude.push_back(".."); + fl_sk.addExclude(".."); fl_sk.browse(); string curSkin = confStr["skin"]; SettingsDialog sd(this,tr["Skin"]); - sd.addSetting(new MenuSettingMultiString(this,tr["Skin"],tr["Set the skin used by GMenu2X"],&confStr["skin"],&fl_sk.directories)); + sd.addSetting(new MenuSettingMultiString(this,tr["Skin"],tr["Set the skin used by GMenu2X"],&confStr["skin"],&fl_sk.getDirectories())); sd.addSetting(new MenuSettingRGBA(this,tr["Top Bar Color"],tr["Color of the top bar"],&skinConfColors[COLOR_TOP_BAR_BG])); sd.addSetting(new MenuSettingRGBA(this,tr["Bottom Bar Color"],tr["Color of the bottom bar"],&skinConfColors[COLOR_BOTTOM_BAR_BG])); sd.addSetting(new MenuSettingRGBA(this,tr["Selection Color"],tr["Color of the selection and other interface details"],&skinConfColors[COLOR_SELECTION_BG])); diff --git a/src/menu.cpp b/src/menu.cpp index 5d42a7d..4835f84 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -237,7 +237,7 @@ bool Menu::addLink(string path, string file, string section) { if (lcfilename.find("readme") != string::npos) { found = true; - manual = path+fl.files[x]; + manual = path+fl.getFiles()[x]; } } } diff --git a/src/selector.cpp b/src/selector.cpp index 6f0c4ce..dd27006 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -188,16 +188,16 @@ int Selector::exec(int startSelection) { void Selector::prepare(FileLister *fl, vector *screens, vector *titles) { fl->setPath(dir); freeScreenshots(screens); - screens->resize(fl->files.size()); - titles->resize(fl->files.size()); + screens->resize(fl->getFiles().size()); + titles->resize(fl->getFiles().size()); string screendir = link->getSelectorScreens(); if (screendir != "" && screendir[screendir.length()-1]!='/') screendir += "/"; string noext; string::size_type pos; - for (uint i=0; ifiles.size(); i++) { - noext = fl->files[i]; + for (uint i=0; igetFiles().size(); i++) { + noext = fl->getFiles()[i]; pos = noext.rfind("."); if (pos!=string::npos && pos>0) noext = noext.substr(0, pos); diff --git a/src/wallpaperdialog.cpp b/src/wallpaperdialog.cpp index 45020e7..2311d40 100644 --- a/src/wallpaperdialog.cpp +++ b/src/wallpaperdialog.cpp @@ -37,12 +37,12 @@ bool WallpaperDialog::exec() vector wallpapers; if (fileExists("skins/"+gmenu2x->confStr["skin"]+"/wallpapers")) { fl.browse(); - wallpapers = fl.files; + wallpapers = fl.getFiles(); } if (gmenu2x->confStr["skin"] != "Default") { fl.setPath("skins/Default/wallpapers",true); - for (uint i=0; isc["skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0); else gmenu2x->sc["skins/Default/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0); @@ -120,7 +120,7 @@ bool WallpaperDialog::exec() if ( gmenu2x->input[ACTION_B] ) { close = true; if (wallpapers.size()>0) { - if (selectedconfStr["skin"]+"/wallpapers/"+wallpapers[selected]; else wallpaper = "skins/Default/wallpapers/"+wallpapers[selected]; @@ -129,7 +129,7 @@ bool WallpaperDialog::exec() } for (uint i=0; isc.del("skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[i]); else gmenu2x->sc.del("skins/Default/wallpapers/"+wallpapers[i]);