GUI: add possibility to call script from link in result paragraph html

This commit is contained in:
Jean-Francois Dockes 2014-08-24 18:11:00 +02:00
parent 43e0f4eab4
commit 26c7e1c690
4 changed files with 65 additions and 0 deletions

View File

@ -58,6 +58,7 @@
#ifdef RCL_USE_ASPELL
#include "rclaspell.h"
#endif
#include "appformime.h"
#include "respopup.h"
static const QKeySequence quitKeySeq("Ctrl+q");
@ -927,6 +928,27 @@ void ResList::linkWasClicked(const QUrl &url)
resultPageBack();
break;
// Run script. Link format Rnn|Script Name
case 'R':
{
int i = atoi(ascurl.c_str() + 1) - 1;
QString s = url.toString();
int bar = s.indexOf("|");
if (bar == -1 || bar >= s.size()-1)
break;
string cmdname = qs2utf8s(s.right(s.size() - (bar + 1)));
DesktopDb ddb(path_cat(theconfig->getConfDir(), "scripts"));
DesktopDb::AppDef app;
if (ddb.appByName(cmdname, app)) {
QAction act(QString::fromUtf8(app.name.c_str()), this);
QVariant v(QString::fromUtf8(app.command.c_str()));
act.setData(v);
m_popDoc = i;
menuOpenWith(&act);
}
}
break;
// Spelling: replacement suggestion clicked
case 'S':
{

View File

@ -48,6 +48,7 @@
#include "respopup.h"
#include "rclmain_w.h"
#include "multisave.h"
#include "appformime.h"
static const QKeySequence quitKeySeq("Ctrl+q");
static const QKeySequence closeKeySeq("Ctrl+w");
@ -781,6 +782,25 @@ void ResTable::linkWasClicked(const QUrl &url)
emit editRequested(m_detaildoc);
}
break;
// Run script. Link format Rnn|Script Name
case 'R':
{
int bar = s.indexOf("|");
if (bar == -1 || bar >= s.size()-1)
break;
string cmdname = qs2utf8s(s.right(s.size() - (bar + 1)));
DesktopDb ddb(path_cat(theconfig->getConfDir(), "scripts"));
DesktopDb::AppDef app;
if (ddb.appByName(cmdname, app)) {
QAction act(QString::fromUtf8(app.name.c_str()), this);
QVariant v(QString::fromUtf8(app.command.c_str()));
act.setData(v);
menuOpenWith(&act);
}
}
break;
default:
LOGERR(("ResTable::linkWasClicked: bad link [%s]\n", ascurl));
break;// ??

View File

@ -151,6 +151,22 @@ bool DesktopDb::allApps(vector<AppDef> *apps)
return true;
}
bool DesktopDb::appByName(const string& nm, AppDef& app)
{
for (AppMap::const_iterator it = m_appMap.begin();
it != m_appMap.end(); it++) {
for (vector<AppDef>::const_iterator it1 = it->second.begin();
it1 != it->second.end(); it1++) {
if (!nm.compare(it1->name)) {
app.name = it1->name;
app.command = it1->command;
return true;
}
}
}
return false;
}
const string& DesktopDb::getReason()
{
return m_reason;

View File

@ -33,6 +33,8 @@ public:
AppDef(const std::string& nm, const std::string& cmd)
: name(nm), command(cmd)
{}
AppDef() {}
std::string name;
std::string command;
};
@ -64,6 +66,11 @@ public:
*/
bool allApps(vector<AppDef> *apps);
/**
* Get app with given name
*/
bool appByName(const string& nm, AppDef& app);
typedef map<string, vector<DesktopDb::AppDef> > AppMap;
private: