Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-08 15:06:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

restored missing addToGroup menu

Browse Source
This commit is contained in:
csoler 2019-08-23 20:21:57 +02:00
parent b5cdd0f4f0
commit b06f78d954
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
2 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
retroshare-gui/src/gui/common/NewFriendList.cpp
View File

@ -79,17 +79,13 @@
#define COLUMN_DATA 0 // column for storing the userdata id #define COLUMN_DATA 0 // column for storing the userdata id
#define ROLE_ID Qt::UserRole // #define ROLE_ID Qt::UserRole
#define ROLE_STANDARD Qt::UserRole + 1 // #define ROLE_STANDARD Qt::UserRole + 1
#define ROLE_SORT_GROUP Qt::UserRole + 2 // #define ROLE_SORT_GROUP Qt::UserRole + 2
#define ROLE_SORT_STANDARD_GROUP Qt::UserRole + 3 // #define ROLE_SORT_STANDARD_GROUP Qt::UserRole + 3
#define ROLE_SORT_NAME Qt::UserRole + 4 // #define ROLE_SORT_NAME Qt::UserRole + 4
#define ROLE_SORT_STATE Qt::UserRole + 5 // #define ROLE_SORT_STATE Qt::UserRole + 5
#define ROLE_FILTER Qt::UserRole + 6 // #define ROLE_FILTER Qt::UserRole + 6
#define TYPE_GPG 0
#define TYPE_SSL 1
#define TYPE_GROUP 2
// states for sorting (equal values are possible) // states for sorting (equal values are possible)
// used in BuildSortString - state + name // used in BuildSortString - state + name
@ -204,9 +200,6 @@ NewFriendList::NewFriendList(QWidget *parent) : RsAutoUpdatePage(5000,parent), u
int avatarHeight = fontMetrics.height() * 3; int avatarHeight = fontMetrics.height() * 3;
ui->peerTreeWidget->setIconSize(QSize(avatarHeight, avatarHeight)); ui->peerTreeWidget->setIconSize(QSize(avatarHeight, avatarHeight));
/* Initialize display menu */
createDisplayMenu();
mModel->checkInternalData(true); mModel->checkInternalData(true);
QHeaderView *h = ui->peerTreeWidget->header(); QHeaderView *h = ui->peerTreeWidget->header();
@ -546,8 +539,6 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
break; break;
} }
// QMenu *lobbyMenu = NULL;
switch (type) switch (type)
{ {
case RsFriendListModel::ENTRY_TYPE_GROUP: case RsFriendListModel::ENTRY_TYPE_GROUP:
@ -587,21 +578,22 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
RsPgpId gpgId ( details.gpg_id ); RsPgpId gpgId ( details.gpg_id );
// QTreeWidgetItem *parent = c->parent(); QModelIndex parent = mModel->parent(index);
bool foundGroup = false; bool foundGroup = false;
// add action for all groups, except the own group // add action for all groups, except the own group
for (std::list<RsGroupInfo>::iterator groupIt = groupInfoList.begin(); groupIt != groupInfoList.end(); ++groupIt) { for (std::list<RsGroupInfo>::iterator groupIt = groupInfoList.begin(); groupIt != groupInfoList.end(); ++groupIt) {
if (std::find(groupIt->peerIds.begin(), groupIt->peerIds.end(), gpgId) == groupIt->peerIds.end()) { if (std::find(groupIt->peerIds.begin(), groupIt->peerIds.end(), gpgId) == groupIt->peerIds.end()) {
// if (parent) { if (parent.isValid())
// if (addToGroupMenu == NULL) { {
// addToGroupMenu = new QMenu(tr("Add to group"), &contextMenu); if (addToGroupMenu == NULL)
// } addToGroupMenu = new QMenu(tr("Add to group"), &contextMenu);
// QAction* addToGroupAction = new QAction(GroupDefs::name(*groupIt), addToGroupMenu);
// addToGroupAction->setData(QString::fromStdString(groupIt->id.toStdString())); QAction* addToGroupAction = new QAction(GroupDefs::name(*groupIt), addToGroupMenu);
// connect(addToGroupAction, SIGNAL(triggered()), this, SLOT(addToGroup())); addToGroupAction->setData(QString::fromStdString(groupIt->id.toStdString()));
// addToGroupMenu->addAction(addToGroupAction); connect(addToGroupAction, SIGNAL(triggered()), this, SLOT(addToGroup()));
// } addToGroupMenu->addAction(addToGroupAction);
}
if (moveToGroupMenu == NULL) { if (moveToGroupMenu == NULL) {
moveToGroupMenu = new QMenu(tr("Move to group"), &contextMenu); moveToGroupMenu = new QMenu(tr("Move to group"), &contextMenu);
@ -627,13 +619,18 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
groupsMenu->addMenu(moveToGroupMenu); groupsMenu->addMenu(moveToGroupMenu);
} }
if (foundGroup) { if (foundGroup)
{
// add remove from group // add remove from group
// if (parent && parent->type() == TYPE_GROUP) { if (parent.isValid() && mModel->getType(parent) == RsFriendListModel::ENTRY_TYPE_GROUP)
// QAction *removeFromGroup = groupsMenu->addAction(tr("Remove from group")); {
// removeFromGroup->setData(parent->data(COLUMN_DATA, ROLE_ID)); RsGroupInfo info ;
// connect(removeFromGroup, SIGNAL(triggered()), this, SLOT(removeFromGroup())); mModel->getGroupData(parent,info);
// }
QAction *removeFromGroup = groupsMenu->addAction(tr("Remove from group ")+QString::fromUtf8(info.name.c_str()));
removeFromGroup->setData(parent.sibling(parent.row(),RsFriendListModel::COLUMN_THREAD_ID).data(Qt::DisplayRole));
connect(removeFromGroup, SIGNAL(triggered()), this, SLOT(removeFromGroup()));
}
QAction *removeFromAllGroups = groupsMenu->addAction(tr("Remove from all groups")); QAction *removeFromAllGroups = groupsMenu->addAction(tr("Remove from all groups"));
removeFromAllGroups->setData(""); removeFromAllGroups->setData("");
@ -655,9 +652,9 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
contextMenu.addAction(QIcon(IMAGE_FRIENDINFO), tr("Node details"), this, SLOT(configureNode())); contextMenu.addAction(QIcon(IMAGE_FRIENDINFO), tr("Node details"), this, SLOT(configureNode()));
if (type == TYPE_GPG || type == TYPE_SSL) { if (type == RsFriendListModel::ENTRY_TYPE_PROFILE || type == RsFriendListModel::ENTRY_TYPE_NODE)
contextMenu.addAction(QIcon(IMAGE_EXPORTFRIEND), tr("Recommend this node to..."), this, SLOT(recommendNode())); contextMenu.addAction(QIcon(IMAGE_EXPORTFRIEND), tr("Recommend this node to..."), this, SLOT(recommendNode()));
}
RsFriendListModel::RsNodeDetails details; RsFriendListModel::RsNodeDetails details;
mModel->getNodeData(index,details); mModel->getNodeData(index,details);
@ -1137,13 +1134,11 @@ void NewFriendList::checkInternalData(bool force)
std::set<QString> expanded_indexes; std::set<QString> expanded_indexes;
std::set<QString> selected_indexes; std::set<QString> selected_indexes;
if(force) saveExpandedPathsAndSelection(expanded_indexes, selected_indexes);
saveExpandedPathsAndSelection(expanded_indexes, selected_indexes);
mModel->checkInternalData(force); mModel->checkInternalData(force);
if(force) restoreExpandedPathsAndSelection(expanded_indexes, selected_indexes);
restoreExpandedPathsAndSelection(expanded_indexes, selected_indexes);
} }
void NewFriendList::exportFriendlistClicked() void NewFriendList::exportFriendlistClicked()
@ -1543,8 +1538,6 @@ void NewFriendList::toggleColumnVisible()
int column = action->data().toInt(); int column = action->data().toInt();
bool visible = action->isChecked(); bool visible = action->isChecked();
//emit columnVisibleChanged(column,visible);
ui->peerTreeWidget->setColumnHidden(column, !visible); ui->peerTreeWidget->setColumnHidden(column, !visible);
} }
@ -1568,7 +1561,7 @@ void NewFriendList::filterItems(const QString &text)
if(filterColumn == 0) if(filterColumn == 0)
mModel->setFilter(RsFriendListModel::FILTER_TYPE_NAME,lst); mModel->setFilter(RsFriendListModel::FILTER_TYPE_NAME,lst);
else //if(filterColumn==1) else
mModel->setFilter(RsFriendListModel::FILTER_TYPE_ID,lst); mModel->setFilter(RsFriendListModel::FILTER_TYPE_ID,lst);
// We do this in order to trigger a new filtering action in the proxy model. // We do this in order to trigger a new filtering action in the proxy model.
@ -1598,6 +1591,3 @@ void NewFriendList::addPeerToExpand(const RsPgpId& gpgId)
openPeers.insert(gpgId); openPeers.insert(gpgId);
} }
void NewFriendList::createDisplayMenu()
{
}

1
retroshare-gui/src/gui/common/NewFriendList.h
View File

@ -97,7 +97,6 @@ private slots:
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
void createDisplayMenu();
private: private:
Ui::NewFriendList *ui; Ui::NewFriendList *ui;