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

The sections directories shall now be found under the user-specific directory.

Browse Source
This commit is contained in:
Ayla 2011-04-03 11:44:08 +02:00
parent 8336c83129
commit 114fe594d0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/menu.cpp
View File

@ -57,7 +57,7 @@ Menu::Menu(GMenu2X *gmenu2x) {
while ((dptr = readdir(dirp))) { while ((dptr = readdir(dirp))) {
if (dptr->d_name[0]=='.') continue; if (dptr->d_name[0]=='.') continue;
filepath = (string)"sections/"+dptr->d_name; filepath = GMenu2X::getHome()+(string)"/sections/"+dptr->d_name;
int statRet = stat(filepath.c_str(), &st); int statRet = stat(filepath.c_str(), &st);
if (!S_ISDIR(st.st_mode)) continue; if (!S_ISDIR(st.st_mode)) continue;
if (statRet != -1) { if (statRet != -1) {
@ -165,7 +165,7 @@ void Menu::setSectionIndex(int i) {
string Menu::sectionPath(int section) { string Menu::sectionPath(int section) {
if (section<0 || section>(int)sections.size()) section = iSection; if (section<0 || section>(int)sections.size()) section = iSection;
return "sections/"+sections[section]+"/"; return GMenu2X::getHome()+"/sections/"+sections[section]+"/";
} }
/*==================================== /*====================================
@ -207,14 +207,14 @@ bool Menu::addLink(string path, string file, string section) {
title = title.substr(0, pos); title = title.substr(0, pos);
} }
string linkpath = "sections/"+section+"/"+title; string linkpath = GMenu2X::getHome()+"/sections/"+section+"/"+title;
int x=2; int x=2;
while (fileExists(linkpath)) { while (fileExists(linkpath)) {
stringstream ss; stringstream ss;
linkpath = ""; linkpath = "";
ss << x; ss << x;
ss >> linkpath; ss >> linkpath;
linkpath = "sections/"+section+"/"+title+linkpath; linkpath = GMenu2X::getHome()+"/sections/"+section+"/"+title+linkpath;
x++; x++;
} }
@ -293,7 +293,7 @@ bool Menu::addLink(string path, string file, string section) {
} }
bool Menu::addSection(const string &sectionName) { bool Menu::addSection(const string &sectionName) {
string sectiondir = "sections/"+sectionName; string sectiondir = GMenu2X::getHome()+"/sections/"+sectionName;
if (mkdir(sectiondir.c_str(),0777)==0) { if (mkdir(sectiondir.c_str(),0777)==0) {
sections.push_back(sectionName); sections.push_back(sectionName);
linklist ll; linklist ll;