Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-21 23:40:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show the correct name in the title of the RsCollectionDialog when the filename contains ".".

Browse source 
Fixed creating of the download path of the collection when running as portable version.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4715 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-12-08 09:16:45 +00:00
parent a7ab09e453
commit ac9e35160b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View file

@ -33,7 +33,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const s
{ {
setupUi(this) ; setupUi(this) ;
setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_filename).baseName())); setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_filename).completeBaseName()));
// 1 - add all elements to the list. // 1 - add all elements to the list.
@ -175,7 +175,7 @@ void RsCollectionDialog::download()
QString cleanPath = dldir + _dlinfos[i].path ; QString cleanPath = dldir + _dlinfos[i].path ;
std::cerr << "making directory " << cleanPath.toStdString() << std::endl; std::cerr << "making directory " << cleanPath.toStdString() << std::endl;
if(!QDir(cleanPath).mkpath(cleanPath)) if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br> "+cleanPath) ; QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br> "+cleanPath) ;
rsFiles->FileRequest(_dlinfos[i].name.toUtf8().constData(), _dlinfos[i].hash.toUtf8().constData(), _dlinfos[i].size, cleanPath.toUtf8().constData(), RS_FILE_HINTS_NETWORK_WIDE, std::list<std::string>()); rsFiles->FileRequest(_dlinfos[i].name.toUtf8().constData(), _dlinfos[i].hash.toUtf8().constData(), _dlinfos[i].size, cleanPath.toUtf8().constData(), RS_FILE_HINTS_NETWORK_WIDE, std::list<std::string>());