Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #444 from PhenomRetroShare/Add_MergeFilterIdFilterToHeaderContextMenu

Browse Source 
Merge Filter ComboBox to Header Context Menu in IdDialog.
This commit is contained in:
Cyril Soler 2016-07-29 22:02:57 +02:00 committed by GitHub
commit b1dcd2ff08
5 changed files with 430 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -202,22 +202,21 @@ IdDialog::IdDialog(QWidget *parent) :
connect(ui->idTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection())); connect(ui->idTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
connect(ui->idTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(IdListCustomPopupMenu(QPoint))); connect(ui->idTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(IdListCustomPopupMenu(QPoint)));
connect(ui->filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged()));
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(ui->ownOpinion_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(modifyReputation())); connect(ui->ownOpinion_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(modifyReputation()));
connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite())); connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite()));
ui->avlabel->setPixmap(QPixmap(":/images/user/friends64.png")); ui->avLabel_Person->setPixmap(QPixmap(":/images/user/friends64.png"));
ui->avlabel_Circles->setPixmap(QPixmap(":/icons/circles_128.png")); ui->avlabel_Circles->setPixmap(QPixmap(":/icons/circles_128.png"));
ui->headerTextLabel->setText(tr("People")); ui->headerTextLabel_Person->setText(tr("People"));
ui->headerTextLabel_Circles->setText(tr("Circles")); ui->headerTextLabel_Circles->setText(tr("Circles"));
/* Initialize splitter */ /* Initialize splitter */
ui->splitter->setStretchFactor(0, 0); ui->mainSplitter->setStretchFactor(0, 0);
ui->splitter->setStretchFactor(1, 1); ui->mainSplitter->setStretchFactor(1, 1);
/*remove /*remove
QList<int> sizes; QList<int> sizes;
@ -225,13 +224,54 @@ IdDialog::IdDialog(QWidget *parent) :
ui->splitter->setSizes(sizes);*/ ui->splitter->setSizes(sizes);*/
/* Add filter types */ /* Add filter types */
ui->filterComboBox->addItem(tr("All"), RSID_FILTER_ALL); QMenu *idTWHMenu = new QMenu(tr("Show"), this);
ui->filterComboBox->addItem(tr("Owned by myself"), RSID_FILTER_OWNED_BY_YOU); idTWHMenu->setVisible(true);
ui->filterComboBox->addItem(tr("Linked to my node"), RSID_FILTER_YOURSELF); ui->idTreeWidget->addHeaderContextMenuMenu(idTWHMenu);
ui->filterComboBox->addItem(tr("Linked to neighbor nodes"), RSID_FILTER_FRIENDS);
ui->filterComboBox->addItem(tr("Linked to distant nodes"), RSID_FILTER_OTHERS); QActionGroup *idTWHActionGroup = new QActionGroup(this);
ui->filterComboBox->addItem(tr("Anonymous"), RSID_FILTER_PSEUDONYMS); QAction *idTWHAction = new QAction(QIcon(),tr("All"), this);
ui->filterComboBox->setCurrentIndex(0); idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setChecked(true);
filter = RSID_FILTER_ALL;
idTWHAction->setData(RSID_FILTER_ALL);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
idTWHAction = new QAction(QIcon(),tr("Owned by myself"), this);
idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setData(RSID_FILTER_OWNED_BY_YOU);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
idTWHAction = new QAction(QIcon(),tr("Linked to my node"), this);
idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setData(RSID_FILTER_YOURSELF);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
idTWHAction = new QAction(QIcon(),tr("Linked to neighbor nodes"), this);
idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setData(RSID_FILTER_FRIENDS);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
idTWHAction = new QAction(QIcon(),tr("Linked to distant nodes"), this);
idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setData(RSID_FILTER_OTHERS);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
idTWHAction = new QAction(QIcon(),tr("Anonymous"), this);
idTWHAction->setActionGroup(idTWHActionGroup);
idTWHAction->setCheckable(true);
idTWHAction->setData(RSID_FILTER_PSEUDONYMS);
connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
idTWHMenu->addAction(idTWHAction);
/* Add filter actions */ /* Add filter actions */
QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem(); QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem();
@ -577,7 +617,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
// remove any identity that has an item, but no subscription flag entry // remove any identity that has an item, but no subscription flag entry
std::vector<QTreeWidgetItem*> to_delete ; std::vector<QTreeWidgetItem*> to_delete ;
for(uint32_t k=0;k<item->childCount();++k) for(uint32_t k=0; k < (uint32_t)item->childCount(); ++k)
if(details.mSubscriptionFlags.find(RsGxsId(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString())) == details.mSubscriptionFlags.end()) if(details.mSubscriptionFlags.find(RsGxsId(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString())) == details.mSubscriptionFlags.end())
to_delete.push_back(item->child(k)); to_delete.push_back(item->child(k));
@ -599,7 +639,7 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
QTreeWidgetItem *subitem = NULL ; QTreeWidgetItem *subitem = NULL ;
// see if the item already exists // see if the item already exists
for(uint32_t k=0;k<item->childCount();++k) for(uint32_t k=0; k < (uint32_t)item->childCount(); ++k)
if(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString() == it->first.toStdString()) if(item->child(k)->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString() == it->first.toStdString())
{ {
subitem = item->child(k); subitem = item->child(k);
@ -1247,7 +1287,7 @@ void IdDialog::processSettings(bool load)
ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RSID_COL_NICKNAME).toInt()); ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RSID_COL_NICKNAME).toInt());
// state of splitter // state of splitter
ui->splitter->restoreState(Settings->value("splitter").toByteArray()); ui->mainSplitter->restoreState(Settings->value("splitter").toByteArray());
} else { } else {
// save settings // save settings
@ -1255,7 +1295,7 @@ void IdDialog::processSettings(bool load)
Settings->setValue("filterColumn", ui->filterLineEdit->currentFilter()); Settings->setValue("filterColumn", ui->filterLineEdit->currentFilter());
// state of splitter // state of splitter
Settings->setValue("splitter", ui->splitter->saveState()); Settings->setValue("splitter", ui->mainSplitter->saveState());
//save expanding //save expanding
Settings->setValue("ExpandAll", allItem->isExpanded()); Settings->setValue("ExpandAll", allItem->isExpanded());
@ -1266,16 +1306,22 @@ void IdDialog::processSettings(bool load)
Settings->endGroup(); Settings->endGroup();
} }
void IdDialog::filterComboBoxChanged()
{
requestIdList();
}
void IdDialog::filterChanged(const QString& /*text*/) void IdDialog::filterChanged(const QString& /*text*/)
{ {
filterIds(); filterIds();
} }
void IdDialog::filterToggled(const bool &value)
{
if (value) {
QAction *source = qobject_cast<QAction *>(QObject::sender());
if (source) {
filter = source->data().toInt();
requestIdList();
}
}
}
void IdDialog::updateSelection() void IdDialog::updateSelection()
{ {
QTreeWidgetItem *item = ui->idTreeWidget->currentItem(); QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
@ -1460,7 +1506,7 @@ void IdDialog::insertIdList(uint32_t token)
{ {
mStateHelper->setLoading(IDDIALOG_IDLIST, false); mStateHelper->setLoading(IDDIALOG_IDLIST, false);
int accept = ui->filterComboBox->itemData(ui->filterComboBox->currentIndex()).toInt(); int accept = filter;
RsGxsIdGroup data; RsGxsIdGroup data;
std::vector<RsGxsIdGroup> datavector; std::vector<RsGxsIdGroup> datavector;
@ -1633,7 +1679,7 @@ void IdDialog::insertIdDetails(uint32_t token)
time_t now = time(NULL) ; time_t now = time(NULL) ;
ui->lineEdit_LastUsed->setText(getHumanReadableDuration(now - data.mLastUsageTS)) ; ui->lineEdit_LastUsed->setText(getHumanReadableDuration(now - data.mLastUsageTS)) ;
ui->headerTextLabel->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE)); ui->headerTextLabel_Person->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
QPixmap pixmap ; QPixmap pixmap ;
@ -1644,7 +1690,7 @@ void IdDialog::insertIdDetails(uint32_t token)
std::cerr << "Setting header frame image : " << pixmap.width() << " x " << pixmap.height() << std::endl; std::cerr << "Setting header frame image : " << pixmap.width() << " x " << pixmap.height() << std::endl;
#endif #endif
ui->avlabel->setPixmap(pixmap); ui->avLabel_Person->setPixmap(pixmap);
ui->avatarLabel->setPixmap(pixmap); ui->avatarLabel->setPixmap(pixmap);
if (data.mPgpKnown) if (data.mPgpKnown)
@ -1664,23 +1710,23 @@ void IdDialog::insertIdDetails(uint32_t token)
if(data.mPgpId.isNull()) if(data.mPgpId.isNull())
{ {
ui->lineEdit_GpgId->hide() ; ui->lineEdit_GpgId->hide() ;
ui->PgpId_LB->hide() ; ui->label_GpgId->hide() ;
} }
else else
{ {
ui->lineEdit_GpgId->show() ; ui->lineEdit_GpgId->show() ;
ui->PgpId_LB->show() ; ui->label_GpgId->show() ;
} }
if(data.mPgpKnown) if(data.mPgpKnown)
{ {
ui->lineEdit_GpgName->show() ; ui->lineEdit_GpgName->show() ;
ui->PgpName_LB->show() ; ui->label_GpgName->show() ;
} }
else else
{ {
ui->lineEdit_GpgName->hide() ; ui->lineEdit_GpgName->hide() ;
ui->PgpName_LB->hide() ; ui->label_GpgName->hide() ;
} }
bool isLinkedToOwnPgpId = (data.mPgpKnown && (data.mPgpId == ownPgpId)) ; bool isLinkedToOwnPgpId = (data.mPgpKnown && (data.mPgpId == ownPgpId)) ;
@ -1702,7 +1748,9 @@ void IdDialog::insertIdDetails(uint32_t token)
ui->lineEdit_Type->setText(tr("Linked to unknown Retroshare node")) ; ui->lineEdit_Type->setText(tr("Linked to unknown Retroshare node")) ;
} }
else else
{
ui->lineEdit_Type->setText(tr("Anonymous identity")) ; ui->lineEdit_Type->setText(tr("Anonymous identity")) ;
}
if (isOwnId) if (isOwnId)
{ {
@ -2055,6 +2103,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
if(!one_item_owned_by_you) if(!one_item_owned_by_you)
{ {
if(n_selected_items == 1) // if only one item is selected, allow to chat with this item if(n_selected_items == 1) // if only one item is selected, allow to chat with this item
{
if(own_identities.size() <= 1) if(own_identities.size() <= 1)
{ {
QAction *action = contextMnu.addAction(QIcon(":/images/chat_24.png"), tr("Chat with this person"), this, SLOT(chatIdentity())); QAction *action = contextMnu.addAction(QIcon(":/images/chat_24.png"), tr("Chat with this person"), this, SLOT(chatIdentity()));
@ -2082,6 +2131,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
action->setData(QString::fromStdString((*it).toStdString())) ; action->setData(QString::fromStdString((*it).toStdString())) ;
} }
} }
}
// always allow to send messages // always allow to send messages
contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMsg())); contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message"), this, SLOT(sendMsg()));

3
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -83,8 +83,8 @@ private slots:
void grantCircleMembership() ; void grantCircleMembership() ;
void revokeCircleMembership() ; void revokeCircleMembership() ;
void filterComboBoxChanged();
void filterChanged(const QString &text); void filterChanged(const QString &text);
void filterToggled(const bool &value);
void addIdentity(); void addIdentity();
void removeIdentity(); void removeIdentity();
@ -149,6 +149,7 @@ private:
std::map<uint32_t, CircleUpdateOrder> mCircleUpdates ; std::map<uint32_t, CircleUpdateOrder> mCircleUpdates ;
RsGxsGroupId mId; RsGxsGroupId mId;
int filter;
/* UI - Designer */ /* UI - Designer */
Ui::IdDialog *ui; Ui::IdDialog *ui;

74
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -19,7 +19,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="IdDialogGLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -46,7 +46,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="titleBarFrameHLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -132,12 +132,12 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="mainSplitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="leftVLayout">
<item> <item>
<widget class="QFrame" name="toolBarFrame"> <widget class="QFrame" name="toolBarFrame">
<property name="frameShape"> <property name="frameShape">
@ -146,7 +146,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="toolBarFrameHLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>1</number> <number>1</number>
</property> </property>
@ -229,12 +229,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QComboBox" name="filterComboBox"/>
</item>
<item>
<layout class="QHBoxLayout" name="filterLayout"/>
</item>
<item> <item>
<widget class="RSTreeWidget" name="idTreeWidget"> <widget class="RSTreeWidget" name="idTreeWidget">
<property name="sizePolicy"> <property name="sizePolicy">
@ -291,11 +285,11 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QTabWidget" name="tabWidget1"> <widget class="QTabWidget" name="rightTabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="personTab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/no_avatar_background.png</normaloff>:/images/no_avatar_background.png</iconset> <normaloff>:/images/no_avatar_background.png</normaloff>:/images/no_avatar_background.png</iconset>
@ -303,11 +297,9 @@
<attribute name="title"> <attribute name="title">
<string>Person</string> <string>Person</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="personTabVLayout">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_4"> <widget class="QFrame" name="headerFramePerson">
<item>
<widget class="QFrame" name="headerFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -319,7 +311,7 @@
<number>12</number> <number>12</number>
</property> </property>
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="avlabel"> <widget class="QLabel" name="avLabel_Person">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
@ -344,7 +336,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1" rowspan="2" colspan="2"> <item row="0" column="1" rowspan="2" colspan="2">
<widget class="StyledElidedLabel" name="headerTextLabel"> <widget class="StyledElidedLabel" name="headerTextLabel_Person">
<property name="text"> <property name="text">
<string>People</string> <string>People</string>
</property> </property>
@ -358,9 +350,9 @@
<property name="title"> <property name="title">
<string>Identity info</string> <string>Identity info</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="detailsGroupBoxGLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="detailTextGLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -377,21 +369,21 @@
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_KeyId">
<property name="text"> <property name="text">
<string>Identity ID :</string> <string>Identity ID :</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_Nickname">
<property name="text"> <property name="text">
<string>Identity name :</string> <string>Identity name :</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="PgpId_LB"> <widget class="QLabel" name="label_GpgId">
<property name="text"> <property name="text">
<string>Owner node ID :</string> <string>Owner node ID :</string>
</property> </property>
@ -428,7 +420,7 @@
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="PgpName_LB"> <widget class="QLabel" name="label_GpgName">
<property name="text"> <property name="text">
<string>Owner node name :</string> <string>Owner node name :</string>
</property> </property>
@ -445,7 +437,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_Type">
<property name="text"> <property name="text">
<string>Type:</string> <string>Type:</string>
</property> </property>
@ -455,7 +447,7 @@
<widget class="QLineEdit" name="lineEdit_Type"/> <widget class="QLineEdit" name="lineEdit_Type"/>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_LastUsed">
<property name="text"> <property name="text">
<string>Last used:</string> <string>Last used:</string>
</property> </property>
@ -467,7 +459,7 @@
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="detailAvatarVLayout">
<item> <item>
<widget class="QLabel" name="avatarLabel"> <widget class="QLabel" name="avatarLabel">
<property name="sizePolicy"> <property name="sizePolicy">
@ -513,7 +505,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="avatarVSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -541,9 +533,9 @@
<property name="title"> <property name="title">
<string>Reputation</string> <string>Reputation</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="reputationGroupBoxVLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="reputationGLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
</property> </property>
@ -567,14 +559,14 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="ownOpinion_LB">
<property name="text"> <property name="text">
<string>Your opinion:</string> <string>Your opinion:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="neighborNodesOpinion_LB">
<property name="text"> <property name="text">
<string>Neighbor nodes:</string> <string>Neighbor nodes:</string>
</property> </property>
@ -627,7 +619,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="overallOpinion_LB">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -645,7 +637,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="reputationVSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -661,10 +653,8 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item>
</layout>
</widget> </widget>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="circleTab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="../images.qrc"> <iconset resource="../images.qrc">
<normaloff>:/images/circles/circles_64.png</normaloff>:/images/circles/circles_64.png</iconset> <normaloff>:/images/circles/circles_64.png</normaloff>:/images/circles/circles_64.png</iconset>
@ -672,16 +662,16 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>Circles</string> <string>Circles</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="circleTabVLayout">
<item> <item>
<widget class="QFrame" name="headerFrame_2"> <widget class="QFrame" name="headerFrameCircle">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="headerFrameCircleGLayout">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>12</number> <number>12</number>
</property> </property>

12
retroshare-gui/src/gui/common/RSTreeWidget.cpp
View File

@ -169,6 +169,11 @@ void RSTreeWidget::addHeaderContextMenuAction(QAction *action)
mHeaderContextMenuActions.push_back(action); mHeaderContextMenuActions.push_back(action);
} }
void RSTreeWidget::addHeaderContextMenuMenu(QMenu *menu)
{
mHeaderContextMenuMenus.push_back(menu);
}
void RSTreeWidget::headerContextMenuRequested(const QPoint &pos) void RSTreeWidget::headerContextMenuRequested(const QPoint &pos)
{ {
QMenu contextMenu(this); QMenu contextMenu(this);
@ -207,6 +212,13 @@ void RSTreeWidget::headerContextMenuRequested(const QPoint &pos)
contextMenu.addActions(mHeaderContextMenuActions); contextMenu.addActions(mHeaderContextMenuActions);
} }
if (!mHeaderContextMenuMenus.isEmpty()) {
foreach(QMenu *menu, mHeaderContextMenuMenus) {
contextMenu.addSeparator();
contextMenu.addMenu(menu);
}
}
if (contextMenu.isEmpty()) { if (contextMenu.isEmpty()) {
return; return;
} }

3
retroshare-gui/src/gui/common/RSTreeWidget.h
View File

@ -47,6 +47,8 @@ public:
// Add QAction to context menu (action won't be deleted) // Add QAction to context menu (action won't be deleted)
void addHeaderContextMenuAction(QAction *action); void addHeaderContextMenuAction(QAction *action);
// Add QMenu to context menu (menu won't be deleted)
void addHeaderContextMenuMenu(QMenu *menu);
signals: signals:
void signalMouseMiddleButtonClicked(QTreeWidgetItem *item); void signalMouseMiddleButtonClicked(QTreeWidgetItem *item);
@ -69,6 +71,7 @@ private:
quint32 mSettingsVersion; quint32 mSettingsVersion;
QMap<int, bool> mColumnCustomizable; QMap<int, bool> mColumnCustomizable;
QList<QAction*> mHeaderContextMenuActions; QList<QAction*> mHeaderContextMenuActions;
QList<QMenu*> mHeaderContextMenuMenus;
}; };
#endif #endif