From 0b8cb7b287dc1dca79ca447214d3f6182ffda468 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 14 Jan 2010 13:54:16 +0000 Subject: [PATCH] changed link scheme to retroshare:// for forums git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2039 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/ForumsDialog.cpp | 9 ++++++--- retroshare-gui/src/gui/forums/CreateForumMsg.cpp | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index 0797d9f30..f758aea82 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -93,7 +93,7 @@ ForumsDialog::ForumsDialog(QWidget *parent) connect( ui.threadTreeWidget, SIGNAL( itemSelectionChanged() ), this, SLOT( changedThread2() ) ); connect( ui.viewBox, SIGNAL( currentIndexChanged ( int ) ), this, SLOT( insertThreads() ) ); - connect(ui.postText, SIGNAL( anchorClicked(const QUrl &)), SLOT(anchorClicked(const QUrl &))); + connect( ui.postText, SIGNAL( anchorClicked(const QUrl &)), SLOT(anchorClicked(const QUrl &))); connect(ui.expandButton, SIGNAL(clicked()), this, SLOT(togglefileview())); @@ -127,6 +127,9 @@ ForumsDialog::ForumsDialog(QWidget *parent) forummenu->addSeparator(); ui.forumpushButton->setMenu(forummenu); + ui.postText->setOpenExternalLinks ( false ); + ui.postText->setOpenLinks ( false ); + /* Hide platform specific features */ #ifdef Q_WS_WIN @@ -1073,7 +1076,7 @@ void ForumsDialog::anchorClicked (const QUrl& link ) std::cerr << "ForumsDialog::anchorClicked link.scheme() : " << link.scheme().toStdString() << std::endl; #endif - if (link.scheme() == "file") { + if (link.scheme() == "retroshare://") { std::string fileName = link.queryItemValue(QString("fileName")).toStdString(); std::string fileHash = link.queryItemValue(QString("fileHash")).toStdString(); uint32_t fileSize = link.queryItemValue(QString("fileSize")).toInt(); @@ -1086,7 +1089,7 @@ void ForumsDialog::anchorClicked (const QUrl& link ) if (fileName != "" && fileHash != "") { std::list srcIds; - //srcIds.push_front(dialogId); + //srcIds.push_front(); rsFiles->FileRequest(fileName, fileHash, fileSize, "", 0, srcIds); QMessageBox mb(tr("File Request Confirmation"), tr("The file has been added to your download list."),QMessageBox::Information,QMessageBox::Ok,0,0); diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp index c74c63fbf..ed04bd03d 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp @@ -350,8 +350,8 @@ void CreateForumMsg::fileHashingFinished(SubFileItem* file) { sprintf(fileSizeChar, "%lld", file->FileSize()); std::string fileSize = *(&fileSizeChar); - std::string mesgString = "" - + "file:?fileHash=" + (file->FileHash()) + "&fileName=" + (file->FileName()) + "&fileSize=" + fileSize + ""; + std::string mesgString = "" + + "retroshare://file|" + (file->FileName()) + "|" + fileSize + "|" + (file->FileHash()) + ""; #ifdef CHAT_DEBUG std::cerr << "CreateForumMsg::anchorClicked mesgString : " << mesgString << std::endl; #endif