qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 23:20:37 +02:00
Code

Converted public fields of FileLister to private.

Browse Source
This commit is contained in:
Maarten ter Huurne 2010-07-27 21:41:35 +02:00
parent 0c6e23e869
commit 8032d96a17
6 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/filelister.cpp
View File

@ -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; cout << "\033[0;34mGMENU2X:\033[0;31m stat failed on '" << filepath << "' with error '" << strerror(errno) << "'\033[0m" << endl;
continue; continue;
} }
if (find(exclude.begin(), exclude.end(), file) != exclude.end()) if (find(excludes.begin(), excludes.end(), file) != excludes.end())
continue; continue;
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
@ -159,3 +159,11 @@ bool FileLister::isDirectory(unsigned int x)
{ {
return x < directories.size(); 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);
}

8
src/filelister.h
View File

@ -32,11 +32,12 @@ private:
string path, filter; string path, filter;
bool showDirectories, showFiles; bool showDirectories, showFiles;
vector<string> directories, files, excludes;
public: public:
FileLister(const string &startPath = "/boot/local", bool showDirectories = true, bool showFiles = true); FileLister(const string &startPath = "/boot/local", bool showDirectories = true, bool showFiles = true);
void browse(); void browse();
vector<string> directories, files, exclude;
unsigned int size(); unsigned int size();
unsigned int dirCount(); unsigned int dirCount();
unsigned int fileCount(); unsigned int fileCount();
@ -49,6 +50,11 @@ public:
void setPath(const string &path, bool doBrowse=true); void setPath(const string &path, bool doBrowse=true);
const string &getFilter(); const string &getFilter();
void setFilter(const string &filter); void setFilter(const string &filter);
const vector<string> &getDirectories() { return directories; }
const vector<string> &getFiles() { return files; }
void insertFile(const string &file);
void addExclude(const string &exclude);
}; };
#endif /*FILELISTER_H_*/ #endif /*FILELISTER_H_*/

14
src/gmenu2x.cpp
View File

@ -272,10 +272,10 @@ GMenu2X::GMenu2X() {
FileLister fl("skins/"+confStr["skin"]+"/wallpapers",false,true); FileLister fl("skins/"+confStr["skin"]+"/wallpapers",false,true);
fl.setFilter(".png,.jpg,.jpeg,.bmp"); fl.setFilter(".png,.jpg,.jpeg,.bmp");
fl.browse(); fl.browse();
if (fl.files.size()<=0 && confStr["skin"] != "Default") if (fl.getFiles().size()<=0 && confStr["skin"] != "Default")
fl.setPath("skins/Default/wallpapers",true); fl.setPath("skins/Default/wallpapers",true);
if (fl.files.size()>0) if (fl.getFiles().size()>0)
confStr["wallpaper"] = fl.getPath()+fl.files[0]; confStr["wallpaper"] = fl.getPath()+fl.getFiles()[0];
} }
initBG(); initBG();
@ -1020,7 +1020,7 @@ void GMenu2X::options() {
FileLister fl_tr("translations"); FileLister fl_tr("translations");
fl_tr.browse(); fl_tr.browse();
fl_tr.files.insert(fl_tr.files.begin(),"English"); fl_tr.insertFile("English");
string lang = tr.lang(); string lang = tr.lang();
vector<string> encodings; vector<string> encodings;
@ -1028,7 +1028,7 @@ void GMenu2X::options() {
encodings.push_back("PAL"); encodings.push_back("PAL");
SettingsDialog sd(this,tr["Settings"]); 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 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["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)); 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() { void GMenu2X::skinMenu() {
FileLister fl_sk("skins",true,false); FileLister fl_sk("skins",true,false);
fl_sk.exclude.push_back(".."); fl_sk.addExclude("..");
fl_sk.browse(); fl_sk.browse();
string curSkin = confStr["skin"]; string curSkin = confStr["skin"];
SettingsDialog sd(this,tr["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["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["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])); sd.addSetting(new MenuSettingRGBA(this,tr["Selection Color"],tr["Color of the selection and other interface details"],&skinConfColors[COLOR_SELECTION_BG]));

2
src/menu.cpp
View File

@ -237,7 +237,7 @@ bool Menu::addLink(string path, string file, string section) {
if (lcfilename.find("readme") != string::npos) { if (lcfilename.find("readme") != string::npos) {
found = true; found = true;
manual = path+fl.files[x]; manual = path+fl.getFiles()[x];
} }
} }
} }

8
src/selector.cpp
View File

@ -188,16 +188,16 @@ int Selector::exec(int startSelection) {
void Selector::prepare(FileLister *fl, vector<string> *screens, vector<string> *titles) { void Selector::prepare(FileLister *fl, vector<string> *screens, vector<string> *titles) {
fl->setPath(dir); fl->setPath(dir);
freeScreenshots(screens); freeScreenshots(screens);
screens->resize(fl->files.size()); screens->resize(fl->getFiles().size());
titles->resize(fl->files.size()); titles->resize(fl->getFiles().size());
string screendir = link->getSelectorScreens(); string screendir = link->getSelectorScreens();
if (screendir != "" && screendir[screendir.length()-1]!='/') screendir += "/"; if (screendir != "" && screendir[screendir.length()-1]!='/') screendir += "/";
string noext; string noext;
string::size_type pos; string::size_type pos;
for (uint i=0; i<fl->files.size(); i++) { for (uint i=0; i<fl->getFiles().size(); i++) {
noext = fl->files[i]; noext = fl->getFiles()[i];
pos = noext.rfind("."); pos = noext.rfind(".");
if (pos!=string::npos && pos>0) if (pos!=string::npos && pos>0)
noext = noext.substr(0, pos); noext = noext.substr(0, pos);

12
src/wallpaperdialog.cpp
View File

@ -37,12 +37,12 @@ bool WallpaperDialog::exec()
vector<string> wallpapers; vector<string> wallpapers;
if (fileExists("skins/"+gmenu2x->confStr["skin"]+"/wallpapers")) { if (fileExists("skins/"+gmenu2x->confStr["skin"]+"/wallpapers")) {
fl.browse(); fl.browse();
wallpapers = fl.files; wallpapers = fl.getFiles();
} }
if (gmenu2x->confStr["skin"] != "Default") { if (gmenu2x->confStr["skin"] != "Default") {
fl.setPath("skins/Default/wallpapers",true); fl.setPath("skins/Default/wallpapers",true);
for (uint i=0; i<fl.files.size(); i++) for (uint i=0; i<fl.getFiles().size(); i++)
wallpapers.push_back(fl.files[i]); wallpapers.push_back(fl.getFiles()[i]);
} }
#ifdef DEBUG #ifdef DEBUG
cout << "Wallpapers: " << wallpapers.size() << endl; cout << "Wallpapers: " << wallpapers.size() << endl;
@ -54,7 +54,7 @@ bool WallpaperDialog::exec()
if (selected<firstElement) firstElement=selected; if (selected<firstElement) firstElement=selected;
//Wallpaper //Wallpaper
if (selected<wallpapers.size()-fl.files.size()) if (selected<wallpapers.size()-fl.getFiles().size())
gmenu2x->sc["skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0); gmenu2x->sc["skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0);
else else
gmenu2x->sc["skins/Default/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0); gmenu2x->sc["skins/Default/wallpapers/"+wallpapers[selected]]->blit(gmenu2x->s,0,0);
@ -120,7 +120,7 @@ bool WallpaperDialog::exec()
if ( gmenu2x->input[ACTION_B] ) { if ( gmenu2x->input[ACTION_B] ) {
close = true; close = true;
if (wallpapers.size()>0) { if (wallpapers.size()>0) {
if (selected<wallpapers.size()-fl.files.size()) if (selected<wallpapers.size()-fl.getFiles().size())
wallpaper = "skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected]; wallpaper = "skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[selected];
else else
wallpaper = "skins/Default/wallpapers/"+wallpapers[selected]; wallpaper = "skins/Default/wallpapers/"+wallpapers[selected];
@ -129,7 +129,7 @@ bool WallpaperDialog::exec()
} }
for (uint i=0; i<wallpapers.size(); i++) for (uint i=0; i<wallpapers.size(); i++)
if (i<wallpapers.size()-fl.files.size()) if (i<wallpapers.size()-fl.getFiles().size())
gmenu2x->sc.del("skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[i]); gmenu2x->sc.del("skins/"+gmenu2x->confStr["skin"]+"/wallpapers/"+wallpapers[i]);
else else
gmenu2x->sc.del("skins/Default/wallpapers/"+wallpapers[i]); gmenu2x->sc.del("skins/Default/wallpapers/"+wallpapers[i]);