mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-10 23:30:14 -04:00
Merge branch 'master' into jsonapi
This commit is contained in:
G10h4ck
GitHub
commit
047ae7f723
260 changed files with 1737 additions and 1178 deletions
|
|
@ -76,6 +76,7 @@
|
|||
#define IMAGE_COLLOPEN ":/images/library.png"
|
||||
#define IMAGE_EDITSHARE ":/images/edit_16.png"
|
||||
#define IMAGE_MYFILES ":/icons/svg/folders1.svg"
|
||||
#define IMAGE_REMOVE ":/images/deletemail24.png"
|
||||
|
||||
/*define viewType_CB value */
|
||||
#define VIEW_TYPE_TREE 0
|
||||
|
|
@ -229,6 +230,9 @@ SharedFilesDialog::SharedFilesDialog(RetroshareDirModel *_tree_model,RetroshareD
|
|||
sendlinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Send retroshare Links" ), this );
|
||||
connect( sendlinkAct , SIGNAL( triggered() ), this, SLOT( sendLinkTo( ) ) );
|
||||
|
||||
removeExtraFileAct = new QAction(QIcon(IMAGE_REMOVE), tr( "Stop sharing this file" ), this );
|
||||
connect( removeExtraFileAct , SIGNAL( triggered() ), this, SLOT( removeExtraFile() ) );
|
||||
|
||||
collCreateAct= new QAction(QIcon(IMAGE_COLLCREATE), tr("Create Collection..."), this) ;
|
||||
connect(collCreateAct,SIGNAL(triggered()),this,SLOT(collCreate())) ;
|
||||
collModifAct= new QAction(QIcon(IMAGE_COLLMODIF), tr("Modify Collection..."), this) ;
|
||||
|
|
@ -1093,7 +1097,7 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point )
|
|||
|
||||
currentFile = model->data(midx, RetroshareDirModel::FileNameRole).toString() ;
|
||||
int type = model->getType(midx) ;
|
||||
if (type != DIR_TYPE_DIR && type != DIR_TYPE_FILE) return;
|
||||
if (type != DIR_TYPE_DIR && type != DIR_TYPE_FILE && type != DIR_TYPE_EXTRA_FILE) return;
|
||||
|
||||
QMenu contextMnu(this) ;
|
||||
|
||||
|
|
@ -1127,58 +1131,71 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point )
|
|||
contextMnu.addMenu(&collectionMenu) ;
|
||||
contextMnu.addSeparator() ;//------------------------------------
|
||||
contextMnu.addAction(QIcon(IMAGE_MSG), tr("Recommend in a message to..."), this, SLOT(recommendFilesToMsg())) ;
|
||||
break;
|
||||
|
||||
case DIR_TYPE_EXTRA_FILE:
|
||||
contextMnu.addAction(openfileAct) ;
|
||||
contextMnu.addSeparator() ;//------------------------------------
|
||||
contextMnu.addAction(copylinkAct) ;
|
||||
contextMnu.addAction(sendlinkAct) ;
|
||||
contextMnu.addAction(removeExtraFileAct) ;
|
||||
|
||||
break ;
|
||||
|
||||
default :
|
||||
return ;
|
||||
}
|
||||
|
||||
GxsChannelDialog *channelDialog = dynamic_cast<GxsChannelDialog*>(MainWindow::getPage(MainWindow::Channels));
|
||||
QMenu shareChannelMenu(tr("Share on channel...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards
|
||||
|
||||
if(channelDialog != NULL)
|
||||
{
|
||||
shareChannelMenu.setIcon(QIcon(IMAGE_CHANNEL));
|
||||
|
||||
std::map<RsGxsGroupId,RsGroupMetaData> grp_metas ;
|
||||
channelDialog->getGroupList(grp_metas) ;
|
||||
|
||||
std::vector<std::pair<std::string,RsGxsGroupId> > grplist ; // I dont use a std::map because two or more channels may have the same name.
|
||||
|
||||
for(auto it(grp_metas.begin());it!=grp_metas.end();++it)
|
||||
if(IS_GROUP_PUBLISHER((*it).second.mSubscribeFlags) && IS_GROUP_SUBSCRIBED((*it).second.mSubscribeFlags))
|
||||
grplist.push_back(std::make_pair((*it).second.mGroupName, (*it).second.mGroupId));
|
||||
|
||||
std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ;
|
||||
|
||||
for(auto it(grplist.begin());it!=grplist.end();++it)
|
||||
shareChannelMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareOnChannel()))->setData(QString::fromStdString((*it).second.toStdString())) ;
|
||||
|
||||
contextMnu.addMenu(&shareChannelMenu) ;
|
||||
}
|
||||
|
||||
GxsForumsDialog *forumsDialog = dynamic_cast<GxsForumsDialog*>(MainWindow::getPage(MainWindow::Forums));
|
||||
QMenu shareForumMenu(tr("Share on forum...")) ; // added here because the shareChannelMenu QMenu object is deleted afterwards
|
||||
|
||||
if(forumsDialog != NULL)
|
||||
if(type != DIR_TYPE_EXTRA_FILE)
|
||||
{
|
||||
shareForumMenu.setIcon(QIcon(IMAGE_FORUMS));
|
||||
GxsChannelDialog *channelDialog = dynamic_cast<GxsChannelDialog*>(MainWindow::getPage(MainWindow::Channels));
|
||||
|
||||
std::map<RsGxsGroupId,RsGroupMetaData> grp_metas ;
|
||||
forumsDialog->getGroupList(grp_metas) ;
|
||||
if(channelDialog != NULL)
|
||||
{
|
||||
shareChannelMenu.setIcon(QIcon(IMAGE_CHANNEL));
|
||||
|
||||
std::vector<std::pair<std::string,RsGxsGroupId> > grplist ; // I dont use a std::map because two or more channels may have the same name.
|
||||
std::map<RsGxsGroupId,RsGroupMetaData> grp_metas ;
|
||||
channelDialog->getGroupList(grp_metas) ;
|
||||
|
||||
for(auto it(grp_metas.begin());it!=grp_metas.end();++it)
|
||||
if(IS_GROUP_SUBSCRIBED((*it).second.mSubscribeFlags))
|
||||
grplist.push_back(std::make_pair((*it).second.mGroupName, (*it).second.mGroupId));
|
||||
std::vector<std::pair<std::string,RsGxsGroupId> > grplist ; // I dont use a std::map because two or more channels may have the same name.
|
||||
|
||||
std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ;
|
||||
for(auto it(grp_metas.begin());it!=grp_metas.end();++it)
|
||||
if(IS_GROUP_PUBLISHER((*it).second.mSubscribeFlags) && IS_GROUP_SUBSCRIBED((*it).second.mSubscribeFlags))
|
||||
grplist.push_back(std::make_pair((*it).second.mGroupName, (*it).second.mGroupId));
|
||||
|
||||
for(auto it(grplist.begin());it!=grplist.end();++it)
|
||||
shareForumMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareInForum()))->setData(QString::fromStdString((*it).second.toStdString())) ;
|
||||
std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ;
|
||||
|
||||
contextMnu.addMenu(&shareForumMenu) ;
|
||||
for(auto it(grplist.begin());it!=grplist.end();++it)
|
||||
shareChannelMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareOnChannel()))->setData(QString::fromStdString((*it).second.toStdString())) ;
|
||||
|
||||
contextMnu.addMenu(&shareChannelMenu) ;
|
||||
}
|
||||
|
||||
GxsForumsDialog *forumsDialog = dynamic_cast<GxsForumsDialog*>(MainWindow::getPage(MainWindow::Forums));
|
||||
|
||||
if(forumsDialog != NULL)
|
||||
{
|
||||
shareForumMenu.setIcon(QIcon(IMAGE_FORUMS));
|
||||
|
||||
std::map<RsGxsGroupId,RsGroupMetaData> grp_metas ;
|
||||
forumsDialog->getGroupList(grp_metas) ;
|
||||
|
||||
std::vector<std::pair<std::string,RsGxsGroupId> > grplist ; // I dont use a std::map because two or more channels may have the same name.
|
||||
|
||||
for(auto it(grp_metas.begin());it!=grp_metas.end();++it)
|
||||
if(IS_GROUP_SUBSCRIBED((*it).second.mSubscribeFlags))
|
||||
grplist.push_back(std::make_pair((*it).second.mGroupName, (*it).second.mGroupId));
|
||||
|
||||
std::sort(grplist.begin(),grplist.end(),ChannelCompare()) ;
|
||||
|
||||
for(auto it(grplist.begin());it!=grplist.end();++it)
|
||||
shareForumMenu.addAction(QString::fromUtf8((*it).first.c_str()), this, SLOT(shareInForum()))->setData(QString::fromStdString((*it).second.toStdString())) ;
|
||||
|
||||
contextMnu.addMenu(&shareForumMenu) ;
|
||||
}
|
||||
}
|
||||
|
||||
contextMnu.exec(QCursor::pos()) ;
|
||||
|
|
@ -1564,6 +1581,20 @@ void SharedFilesDialog::FilterItems()
|
|||
#endif
|
||||
}
|
||||
|
||||
void SharedFilesDialog::removeExtraFile()
|
||||
{
|
||||
std::list<DirDetails> files_info ;
|
||||
|
||||
model->getFileInfoFromIndexList(getSelected(),files_info);
|
||||
|
||||
for(auto it(files_info.begin());it!=files_info.end();++it)
|
||||
{
|
||||
std::cerr << "removing file " << (*it).name << ", hash = " << (*it).hash << std::endl;
|
||||
|
||||
rsFiles->ExtraFileRemove((*it).hash);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DEPRECATED_CODE
|
||||
bool SharedFilesDialog::flat_FilterItem(const QModelIndex &index, const QString &text, int /*level*/)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ private slots:
|
|||
void copyLink();
|
||||
void copyLinkhtml();
|
||||
void sendLinkTo();
|
||||
void removeExtraFile();
|
||||
|
||||
void collCreate();
|
||||
void collModif();
|
||||
|
|
@ -122,6 +123,7 @@ protected:
|
|||
QAction* sendlinkAct;
|
||||
QAction* sendchatlinkAct;
|
||||
QAction* copylinkhtmlAct;
|
||||
QAction* removeExtraFileAct;
|
||||
|
||||
QAction *collCreateAct;
|
||||
QAction *collModifAct;
|
||||
|
|
|
|||
|
|
@ -826,6 +826,9 @@ TransfersDialog::TransfersDialog(QWidget *parent)
|
|||
QHeaderView *qhvDLList = ui.downloadList->header();
|
||||
qhvDLList->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(qhvDLList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(downloadListHeaderCustomPopupMenu(QPoint)));
|
||||
QHeaderView *qhvULList = ui.uploadsList->header();
|
||||
qhvULList->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(qhvULList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(uploadsListHeaderCustomPopupMenu(QPoint)));
|
||||
|
||||
// Why disable autoscroll ?
|
||||
// With disabled autoscroll, the treeview doesn't scroll with cursor move
|
||||
|
|
@ -1006,7 +1009,7 @@ TransfersDialog::TransfersDialog(QWidget *parent)
|
|||
collOpenAct = new QAction(QIcon(IMAGE_COLLOPEN), tr( "Download from collection file..." ), this );
|
||||
connect(collOpenAct, SIGNAL(triggered()), this, SLOT(collOpen()));
|
||||
|
||||
/** Setup the actions for the header context menu */
|
||||
/** Setup the actions for the download header context menu */
|
||||
showDLSizeAct= new QAction(tr("Size"),this);
|
||||
showDLSizeAct->setCheckable(true); showDLSizeAct->setToolTip(tr("Show Size Column"));
|
||||
connect(showDLSizeAct,SIGNAL(triggered(bool)),this,SLOT(setShowDLSizeColumn(bool))) ;
|
||||
|
|
@ -1044,6 +1047,26 @@ TransfersDialog::TransfersDialog(QWidget *parent)
|
|||
showDLPath->setCheckable(true); showDLPath->setToolTip(tr("Show Path Column"));
|
||||
connect(showDLPath,SIGNAL(triggered(bool)),this,SLOT(setShowDLPath(bool))) ;
|
||||
|
||||
/** Setup the actions for the upload header context menu */
|
||||
showULPeerAct= new QAction(tr("Peer"),this);
|
||||
showULPeerAct->setCheckable(true); showULPeerAct->setToolTip(tr("Show Peer Column"));
|
||||
connect(showULPeerAct,SIGNAL(triggered(bool)),this,SLOT(setShowULPeerColumn(bool))) ;
|
||||
showULSizeAct= new QAction(tr("Size"),this);
|
||||
showULSizeAct->setCheckable(true); showULSizeAct->setToolTip(tr("Show Peer Column"));
|
||||
connect(showULSizeAct,SIGNAL(triggered(bool)),this,SLOT(setShowULSizeColumn(bool))) ;
|
||||
showULTransferredAct= new QAction(tr("Transferred"),this);
|
||||
showULTransferredAct->setCheckable(true); showULTransferredAct->setToolTip(tr("Show Transferred Column"));
|
||||
connect(showULTransferredAct,SIGNAL(triggered(bool)),this,SLOT(setShowULTransferredColumn(bool))) ;
|
||||
showULSpeedAct= new QAction(tr("Speed"),this);
|
||||
showULSpeedAct->setCheckable(true); showULSpeedAct->setToolTip(tr("Show Speed Column"));
|
||||
connect(showULSpeedAct,SIGNAL(triggered(bool)),this,SLOT(setShowULSpeedColumn(bool))) ;
|
||||
showULProgressAct= new QAction(tr("Progress"),this);
|
||||
showULProgressAct->setCheckable(true); showULProgressAct->setToolTip(tr("Show Progress Column"));
|
||||
connect(showULProgressAct,SIGNAL(triggered(bool)),this,SLOT(setShowULProgressColumn(bool))) ;
|
||||
showULHashAct= new QAction(tr("Hash"),this);
|
||||
showULHashAct->setCheckable(true); showULHashAct->setToolTip(tr("Show Hash Column"));
|
||||
connect(showULHashAct,SIGNAL(triggered(bool)),this,SLOT(setShowULHashColumn(bool))) ;
|
||||
|
||||
/** Setup the actions for the upload context menu */
|
||||
ulOpenFolderAct = new QAction(QIcon(IMAGE_OPENFOLDER), tr("Open Folder"), this);
|
||||
connect(ulOpenFolderAct, SIGNAL(triggered()), this, SLOT(ulOpenFolder()));
|
||||
|
|
@ -1420,6 +1443,29 @@ void TransfersDialog::uploadsListCustomPopupMenu( QPoint /*point*/ )
|
|||
contextMnu.exec(QCursor::pos());
|
||||
}
|
||||
|
||||
void TransfersDialog::uploadsListHeaderCustomPopupMenu( QPoint /*point*/ )
|
||||
{
|
||||
std::cerr << "TransfersDialog::uploadsListHeaderCustomPopupMenu()" << std::endl;
|
||||
QMenu contextMnu( this );
|
||||
|
||||
showULPeerAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UPEER));
|
||||
showULSizeAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_USIZE));
|
||||
showULTransferredAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UTRANSFERRED));
|
||||
showULSpeedAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_ULSPEED));
|
||||
showULProgressAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UPROGRESS));
|
||||
showULHashAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UHASH));
|
||||
|
||||
QMenu *menu = contextMnu.addMenu(tr("Columns"));
|
||||
menu->addAction(showULPeerAct);
|
||||
menu->addAction(showULSizeAct);
|
||||
menu->addAction(showULTransferredAct);
|
||||
menu->addAction(showULSpeedAct);
|
||||
menu->addAction(showULProgressAct);
|
||||
menu->addAction(showULHashAct);
|
||||
|
||||
contextMnu.exec(QCursor::pos());
|
||||
}
|
||||
|
||||
void TransfersDialog::chooseDestinationDirectory()
|
||||
{
|
||||
QString dest_dir = QFileDialog::getExistingDirectory(this,tr("Choose directory")) ;
|
||||
|
|
@ -2791,6 +2837,13 @@ void TransfersDialog::setShowDLIDColumn (bool show) { ui.downloadList->
|
|||
void TransfersDialog::setShowDLLastDLColumn (bool show) { ui.downloadList->setColumnHidden(COLUMN_LASTDL, !show); }
|
||||
void TransfersDialog::setShowDLPath (bool show) { ui.downloadList->setColumnHidden(COLUMN_PATH, !show); }
|
||||
|
||||
void TransfersDialog::setShowULPeerColumn (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UPEER, !show); }
|
||||
void TransfersDialog::setShowULSizeColumn (bool show) { ui.uploadsList->setColumnHidden(COLUMN_USIZE, !show); }
|
||||
void TransfersDialog::setShowULTransferredColumn(bool show) { ui.uploadsList->setColumnHidden(COLUMN_UTRANSFERRED, !show); }
|
||||
void TransfersDialog::setShowULSpeedColumn (bool show) { ui.uploadsList->setColumnHidden(COLUMN_ULSPEED, !show); }
|
||||
void TransfersDialog::setShowULProgressColumn (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UPROGRESS, !show); }
|
||||
void TransfersDialog::setShowULHashColumn (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UHASH, !show); }
|
||||
|
||||
void TransfersDialog::expandAllDL()
|
||||
{
|
||||
ui.downloadList->expandAll();
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ private slots:
|
|||
void downloadListCustomPopupMenu( QPoint point );
|
||||
void downloadListHeaderCustomPopupMenu( QPoint point );
|
||||
void uploadsListCustomPopupMenu( QPoint point );
|
||||
void uploadsListHeaderCustomPopupMenu (QPoint point );
|
||||
|
||||
void cancel();
|
||||
void forceCheck();
|
||||
|
|
@ -158,6 +159,13 @@ private slots:
|
|||
void setShowDLLastDLColumn(bool show);
|
||||
void setShowDLPath(bool show);
|
||||
|
||||
void setShowULPeerColumn(bool show);
|
||||
void setShowULSizeColumn(bool show);
|
||||
void setShowULTransferredColumn(bool show);
|
||||
void setShowULSpeedColumn(bool show);
|
||||
void setShowULProgressColumn(bool show);
|
||||
void setShowULHashColumn(bool show);
|
||||
|
||||
void filterChanged(const QString &text);
|
||||
|
||||
signals:
|
||||
|
|
@ -217,7 +225,7 @@ private:
|
|||
QAction *collViewAct;
|
||||
QAction *collOpenAct;
|
||||
|
||||
/** Defines the actions for the header context menu */
|
||||
/** Defines the actions for the header context menu in download */
|
||||
QAction* showDLSizeAct;
|
||||
QAction* showDLCompleteAct;
|
||||
QAction* showDLDLSpeedAct;
|
||||
|
|
@ -235,6 +243,14 @@ private:
|
|||
QAction* ulOpenFolderAct;
|
||||
QAction* ulCopyLinkAct;
|
||||
|
||||
/** Defines the actions for the header context menu in upload*/
|
||||
QAction* showULPeerAct;
|
||||
QAction* showULSizeAct;
|
||||
QAction* showULTransferredAct;
|
||||
QAction* showULSpeedAct;
|
||||
QAction* showULProgressAct;
|
||||
QAction* showULHashAct;
|
||||
|
||||
bool m_bProcessSettings;
|
||||
void processSettings(bool bLoad);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue