qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Removed PXML support.

Browse Source 
PXML is the metadata format for Pandora packages. It is not used on the
NanoNote or under Dingux.
Ideally it would be a compilation option, but without an active upstream it
would not receive any testing and therefore likely be broken. So in my
opinion it is more time efficient to remove it now and re-add if it is ever
wanted again.
This commit is contained in:
Maarten ter Huurne
2010-06-17 19:37:21 +02:00
parent 1bead23082
commit dae5627091
10 changed files with 8 additions and 6036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/menu.cpp
View File

@@ -30,7 +30,6 @@
#include "menu.h"
#include "filelister.h"
#include "utilities.h"
#include "pxml.h"
using namespace std;
@@ -185,7 +184,7 @@ bool Menu::addLink(string path, string file, string section) {
}
//if the extension is not equal to gpu or dge then enable the wrapepr by default
bool wrapper = false, pxml = false;
bool wrapper = false;
//strip the extension from the filename
string title = file;
@@ -194,7 +193,6 @@ bool Menu::addLink(string path, string file, string section) {
string ext = title.substr(pos, title.length());
transform(ext.begin(), ext.end(), ext.begin(), (int(*)(int)) tolower);
if (ext == ".gpu" || ext == ".dge") wrapper = false;
else if (ext == ".pxml") pxml = true;
title = title.substr(0, pos);
}
@@ -246,29 +244,7 @@ bool Menu::addLink(string path, string file, string section) {
cout << "\033[0;34mGMENU2X:\033[0m Manual: " << manual << endl;
#endif
// Read pxml
string shorttitle="", description="", exec="", icon="";
if (pxml) {
PXml pxmlDoc(path+file);
if (pxmlDoc.isValid()) {
shorttitle = pxmlDoc.getTitle();
description = pxmlDoc.getDescription();
exec = pxmlDoc.getExec();
if (!exec.empty() && exec[0]!='/')
exec = path+exec;
icon = pxmlDoc.getIcon();
if (!icon.empty() && icon[0]!='/')
icon = path+icon;
} else {
#ifdef DEBUG
cout << "\033[0;34mGMENU2X:\033[0m Error loading pxml " << file << ": " << pxmlDoc.getError() << endl;
#endif
return false;
}
} else {
shorttitle = title;
exec = path+file;
}
string shorttitle=title, description="", exec=path+file, icon="";
//Reduce title lenght to fit the link width
if (gmenu2x->font->getTextWidth(shorttitle)>gmenu2x->skinConfInt["linkWidth"]) {