Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1227 from RetroPooh/openlocal

Browse source 
bring back open local file on link click
This commit is contained in:
csoler 2018-07-10 11:20:43 +02:00 • committed by GitHub
commit 80f4907d66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -860,17 +860,17 @@ QString RetroShareLink::title() const
break; break;
case TYPE_FILE: case TYPE_FILE:
return QString("%1 (%2)").arg(hash()).arg(misc::friendlyUnit(size())); return QString("Size: %2 hash: %1").arg(hash()).arg(misc::friendlyUnit(size()));
case TYPE_PERSON: case TYPE_PERSON:
return PeerDefs::rsidFromId(RsPgpId(hash().toStdString())); return PeerDefs::rsidFromId(RsPgpId(hash().toStdString()));
case TYPE_FORUM: case TYPE_FORUM:
/* fallthrough */ return QString("Forum id: %1").arg(hash());
case TYPE_CHANNEL: case TYPE_CHANNEL:
/* fallthrough */ return QString("Channel id: %1").arg(hash());
case TYPE_SEARCH: case TYPE_SEARCH:
break; return QString("Search files");
case TYPE_MESSAGE: case TYPE_MESSAGE:
return PeerDefs::rsidFromId(RsPeerId(hash().toStdString())); return PeerDefs::rsidFromId(RsPeerId(hash().toStdString()));
@ -1386,13 +1386,6 @@ static void processList(const QStringList &list, const QString &textSingular, co
++countUnknown; ++countUnknown;
break; break;
case TYPE_FILE:
{
col.merge_in(link.name(),link.size(),RsFileHash(link.hash().toStdString())) ;
fileLinkFound = true;
}
break;
case TYPE_PERSON: case TYPE_PERSON:
{ {
#ifdef DEBUG_RSLINK #ifdef DEBUG_RSLINK
@ -1547,6 +1540,22 @@ static void processList(const QStringList &list, const QString &textSingular, co
} }
break ; break ;
case TYPE_FILE:
{
FileInfo fi1;
if(links.size()==1 && rsFiles->alreadyHaveFile(RsFileHash(link.hash().toStdString()), fi1)
&& !link.name().endsWith(RsCollection::ExtensionString))
{
/* fallthrough */
}
else
{
col.merge_in(link.name(),link.size(),RsFileHash(link.hash().toStdString())) ;
fileLinkFound = true;
break;
}
}
//break;
case TYPE_EXTRAFILE: case TYPE_EXTRAFILE:
{ {
#ifdef DEBUG_RSLINK #ifdef DEBUG_RSLINK
@ -1621,14 +1630,14 @@ static void processList(const QStringList &list, const QString &textSingular, co
} else if (ret == QMessageBox::NoToAll) { } else if (ret == QMessageBox::NoToAll) {
dontOpenNextFile = true; dontOpenNextFile = true;
} }
needNotifySuccess = false;
} }
} }
if (rsFiles->FileRequest(cleanname.toUtf8().constData(), RsFileHash(link.hash().toStdString()), link.size(), "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds)) { if (rsFiles->FileRequest(cleanname.toUtf8().constData(), RsFileHash(link.hash().toStdString()), link.size(), "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds)) {
fileAdded.append(link.name()); fileAdded.append(link.name());
} else { } else {
if (!bFileOpened) fileExist.append(link.name()); if (!bFileOpened && links.size()>1) fileExist.append(link.name());}
}
} }
break; break;