qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 14:59:42 +02:00
Code

Use the '%f' token to insert the selected file on the params.

Browse Source 
Other tokens available are '%F', '%u' and '%U'.
It replaces the previous token '[selFile]'.
This commit is contained in:
Paul Cercueil 2012-10-22 23:34:33 +02:00
parent 0fc6ac67f0
commit e7e21b424b
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/linkapp.cpp
View File

@ -48,6 +48,8 @@
using fastdelegate::MakeDelegate; using fastdelegate::MakeDelegate;
using namespace std; using namespace std;
static const char *tokens[] = { "%f", "%F", "%u", "%U", };
#ifdef HAVE_LIBOPK #ifdef HAVE_LIBOPK
LinkApp::LinkApp(GMenu2X *gmenu2x_, Touchscreen &ts, InputManager &inputMgr_, LinkApp::LinkApp(GMenu2X *gmenu2x_, Touchscreen &ts, InputManager &inputMgr_,
const char* linkfile, bool opk) const char* linkfile, bool opk)
@ -130,8 +132,25 @@ LinkApp::LinkApp(GMenu2X *gmenu2x_, Touchscreen &ts, InputManager &inputMgr_,
param = opk_read_param(pdata, "Exec"); param = opk_read_param(pdata, "Exec");
if (!param) if (!param)
ERROR("Missing \"Exec\" parameter\n"); ERROR("Missing \"Exec\" parameter\n");
else else {
exec = param; string tmp = param;
pos = tmp.find(' ');
exec = tmp.substr(0, pos);
if (pos != tmp.npos) {
unsigned int i;
params = tmp.substr(pos + 1);
for (i = 0; i < sizeof(tokens) / sizeof(tokens[0]); i++) {
if (params.find(tokens[i]) != params.npos) {
selectorbrowser = true;
selectordir = CARD_ROOT;
break;
}
}
}
}
#ifdef PLATFORM_DINGUX #ifdef PLATFORM_DINGUX
param = opk_read_param(pdata, "Terminal"); param = opk_read_param(pdata, "Terminal");
@ -482,30 +501,25 @@ void LinkApp::launch(const string &selectedFile, const string &selectedDir) {
} }
#endif #endif
//selectedFile
if (selectedFile != "") { if (selectedFile != "") {
string selectedFileExtension; string path;
string selectedFileName;
string dir;
string::size_type i = selectedFile.rfind(".");
if (i != string::npos) {
selectedFileExtension = selectedFile.substr(i,selectedFile.length());
selectedFileName = selectedFile.substr(0,i);
}
if (selectedDir == "") if (selectedDir == "")
dir = getSelectorDir(); path = getSelectorDir();
else else
dir = selectedDir; path = selectedDir;
path = cmdclean(path + selectedFile);
if (params == "") { if (params == "") {
params = cmdclean(dir+selectedFile); params = path;
} else { } else {
string origParams = params; unsigned int i;
params = strreplace(params,"[selFullPath]",cmdclean(dir+selectedFile)); string::size_type pos;
params = strreplace(params,"[selPath]",cmdclean(dir));
params = strreplace(params,"[selFile]",cmdclean(selectedFileName)); for (i = 0; i < sizeof(tokens) / sizeof(tokens[0]); i++)
params = strreplace(params,"[selExt]",cmdclean(selectedFileExtension)); while((pos = params.find(tokens[i])) != params.npos)
if (params == origParams) params += " " + cmdclean(dir+selectedFile); params.replace(pos, 2, path);
} }
} }