| -rw-r--r-- | core/pim/osearch/applnkitem.cpp | 8 | ||||
| -rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 1e7b1fb..0d04be6 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp @@ -30,30 +30,28 @@ AppLnkItem::~AppLnkItem() QString AppLnkItem::toRichText() { QString text; text += "<b><h3>" + _app->name() + "</b></h3><br>"; text += _app->comment() + "<br>"; text += "<br>`" + _app->exec() + "`<br>"; + text += "<br>`" + _app->file() + "`<br>"; + text += "<br>`" + _app->linkFile() + "`<br>"; return text; } void AppLnkItem::action( int act ) { if (!_app->isValid()) qDebug("INVALID"); if (act == 0) _app->execute(); else if (act == 1){ - QFileInfo file( _app->file() ); - qDebug("opening %s in filemanager", file.dirPath().latin1()); QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); - e << file.dirPath(); -// QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); - // e << _app->file(); + e << _app->linkFile(); } } QIntDict<QString> AppLnkItem::actions() { QIntDict<QString> result; result.insert( 0, new QString( QObject::tr("execute") ) ); result.insert( 1, new QString( QObject::tr("open in filemanager") ) ); diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index 04d08ca..95402b9 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp @@ -30,16 +30,17 @@ DocLnkItem::~DocLnkItem() } QString DocLnkItem::toRichText() { QString text; text += "<b><h3>" + _doc->name() + "</b></h3><br>"; text += _doc->comment() + "<br>"; text += "File: " + _doc->file() + "<br>"; + text += "Link: " + _doc->linkFile() + "<br>"; text += "Mimetype: " + _doc->type() + "<br>"; if ( _doc->type().contains( "text" ) ){ text += "<br><br><hr><br>"; QFile f(_doc->file()); if ( f.open(IO_ReadOnly) ) { QTextStream t( &f ); while ( !t.eof() ) text += t.readLine() + "<br>"; @@ -58,22 +59,18 @@ QString DocLnkItem::toRichText() } void DocLnkItem::action( int act ) { qDebug("action %i",act); if (!_doc->isValid()) qDebug("INVALID"); if (act == 0) _doc->execute(); else if (act == 1){ - QFileInfo file( _doc->file() ); - qDebug("opening %s in filemanager", file.dirPath().latin1()); QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); - e << file.dirPath(); -// QCopEnvelope e("QPE/Application/advancedfm", "setDocument(QString)"); - // e << _doc->file(); + e << _doc->file(); } } QIntDict<QString> DocLnkItem::actions() { QIntDict<QString> result; result.insert( 0, new QString( QObject::tr("open with ") + _doc->exec() ) ); result.insert( 1, new QString( QObject::tr("open in filemanager") ) ); |