diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 2f4c14e1c..3a7dd2b06 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -303,6 +303,8 @@ QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln) return QIcon(":/images/FileTypeDocument.png"); else if (ext == "html" || ext == "htm" || ext == "php") return QIcon(":/images/FileTypeDocument.png"); + else if (ext == "rscollection") + return QIcon(":/images/mimetypes/rscollection-16.png"); else return QIcon(":/images/FileTypeAny.png"); } @@ -914,7 +916,7 @@ void RetroshareDirModel::createCollectionFile(const QModelIndexList &list) return ; } - QString filename = QFileDialog::getSaveFileName(NULL,tr("Create selection file"),".",tr("Collection files")+" (*.rsCollection)") ; + QString filename = QFileDialog::getSaveFileName(NULL,tr("Create selection file"),".",tr("Collection files")+" (*.rscollection)") ; if(filename.isNull()) return ; diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp index fefd11257..2dbacb2f0 100644 --- a/retroshare-gui/src/gui/SearchDialog.cpp +++ b/retroshare-gui/src/gui/SearchDialog.cpp @@ -1282,6 +1282,11 @@ void SearchDialog::setIconAndType(QTreeWidgetItem *item, QString ext) item->setIcon(SR_NAME_COL, QIcon(":/images/FileTypeDocument.png")); item->setText(SR_TYPE_COL, QString::fromUtf8("Document")); } + else if (ext == "rscollection") + { + item->setIcon(SR_NAME_COL, QIcon(":/images/library.png")); + item->setText(SR_TYPE_COL, QString::fromUtf8("RetroShare collection file")); + } else if (ext == "sub" || ext == "srt") { item->setIcon(SR_NAME_COL, QIcon(":/images/FileTypeAny.png")); diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index 962ca5a44..3cea09618 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -655,6 +655,8 @@ QIcon TransfersDialog::getIconFromExtension(QString ext) return QIcon(QString::fromUtf8(":/images/FileTypeDocument.png")) ; else if (ext == "html" || ext == "htm" || ext == "php") return QIcon(QString::fromUtf8(":/images/FileTypeDocument.png")) ; + else if (ext == "rscollection") + return QIcon(QString::fromUtf8(":/images/mimetypes/rscollection-16.png")) ; else return QIcon(QString::fromUtf8(":/images/FileTypeAny.png")) ; } diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp index cb9528f51..29034c825 100644 --- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp +++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp @@ -22,11 +22,11 @@ #include #include #include -#include #include #include "SubFileItem.h" +#include #include #include "util/misc.h" @@ -571,7 +571,7 @@ void SubFileItem::play() QFileInfo qinfo; qinfo.setFile(info.path.c_str()); if (qinfo.exists()) { - if (!QDesktopServices::openUrl(QUrl::fromLocalFile(qinfo.absoluteFilePath()))) { + if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(qinfo.absoluteFilePath()))) { std::cerr << "openTransfer(): can't open file " << info.path << std::endl; } }else{ diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 1dbbabc23..585325bbb 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -398,6 +398,7 @@ images/loader/32-loader.gif images/loader/progress.gif images/mimetypes/pdf.png + images/mimetypes/rscollection-16.png images/view-certificate-copy-32.png images/view-certificate-export-32.png images/textedit/textbold.png diff --git a/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png b/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png new file mode 100644 index 000000000..ab6d1686e Binary files /dev/null and b/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png differ