Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed missing dialog box for channel custom directory

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-24 12:45:35 +00:00
parent c2fa746991
commit 9eafd88c77
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -24,6 +24,7 @@
#include <QFile> #include <QFile>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
@ -206,6 +207,7 @@ void ChannelFeed::channelListCustomPopupMenu( QPoint /*point*/ )
QAction *specifyDestinationDirectoryAct = new QAction(QIcon(":/images/filefind.png"), tr("Other..."), &contextMnu); QAction *specifyDestinationDirectoryAct = new QAction(QIcon(":/images/filefind.png"), tr("Other..."), &contextMnu);
directoryMenu->addAction(specifyDestinationDirectoryAct); directoryMenu->addAction(specifyDestinationDirectoryAct);
connect(specifyDestinationDirectoryAct,SIGNAL(triggered()),this,SLOT(chooseDestinationDirectory())) ;
// Now get the list of existing directories. // Now get the list of existing directories.
@ -241,8 +243,10 @@ void ChannelFeed::channelListCustomPopupMenu( QPoint /*point*/ )
directoryMenu->addAction(defaultDestinationDirectoryAct); directoryMenu->addAction(defaultDestinationDirectoryAct);
if(!found) if(ci.destination_directory.empty())
defaultDestinationDirectoryAct->setIcon(QIcon(":/images/start.png")) ; defaultDestinationDirectoryAct->setIcon(QIcon(":/images/start.png")) ;
else if(!found)
specifyDestinationDirectoryAct->setIcon(QIcon(":/images/start.png")) ;
} }
if(ci.channelFlags & RS_DISTRIB_SUBSCRIBED) if(ci.channelFlags & RS_DISTRIB_SUBSCRIBED)
@ -279,7 +283,20 @@ void ChannelFeed::setDestinationDirectory()
std::cerr << "Setting new directory " << dest_dir << " to channel " << mChannelId << std::endl; std::cerr << "Setting new directory " << dest_dir << " to channel " << mChannelId << std::endl;
rsChannels->channelSetDestinationDirectory(mChannelId,dest_dir) ; rsChannels->channelSetDestinationDirectory(mChannelId,dest_dir) ;
} }
void ChannelFeed::chooseDestinationDirectory()
{
ChannelInfo ci;
if (!rsChannels->getChannelInfo(mChannelId, ci))
return;
QString dirname = QFileDialog::getExistingDirectory(NULL,tr("Select channel destination directory"),QString::fromStdString(ci.destination_directory),QFileDialog::ShowDirsOnly) ;
if(dirname.isNull())
return ;
std::cerr << "Setting new directory " << dirname.toStdString() << " to channel " << mChannelId << std::endl;
rsChannels->channelSetDestinationDirectory(mChannelId,dirname.toStdString()) ;
}
void ChannelFeed::createChannel() void ChannelFeed::createChannel()
{ {
CreateChannel *cf = new CreateChannel(); CreateChannel *cf = new CreateChannel();

1
retroshare-gui/src/gui/ChannelFeed.h
View File

@ -80,6 +80,7 @@ private slots:
void shareKey(); void shareKey();
void copyChannelLink(); void copyChannelLink();
void setDestinationDirectory(); void setDestinationDirectory();
void chooseDestinationDirectory();
void channelMsgReadSatusChanged(const QString& channelId, const QString& msgId, int status); void channelMsgReadSatusChanged(const QString& channelId, const QString& msgId, int status);