The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-14 11:06:01 +05:00
Code Issues Packages Projects Releases Wiki Activity

enabled the default icons for circles & added optional change via context menu

Browse Source
This commit is contained in:
defnax 2026-03-28 14:45:19 +01:00
parent c772917516
commit cab6efd83e
2 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,6 +448,8 @@ IdDialog::IdDialog(QWidget *parent)
//connect(ui->treeWidget_membership, SIGNAL(itemSelectionChanged()), this, SLOT(circle_selected()));
connect(ui->treeWidget_membership, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CircleListCustomPopupMenu(QPoint)));
connect(ui->autoBanIdentities_CB, SIGNAL(toggled(bool)), this, SLOT(toggleAutoBanIdentities(bool)));
connect(ui->treeWidget_membership, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(createCustomContextMenu(QPoint)));
updateIdTimer.setSingleShot(true);
connect(&updateIdTimer, SIGNAL(timeout()), this, SLOT(updateIdList()));
@ -658,10 +660,6 @@ static QTreeWidgetItem *setChildItem(QTreeWidgetItem *item, const RsGroupMetaDat
QTreeWidgetItem *subitem = new QTreeWidgetItem();
QPixmap pixmap ;
pixmap = GxsIdDetails::makeColoredGroupIcon( circle_group.mGroupId, ":/icons/png/people2.png", GxsIdDetails::MEDIUM);
subitem->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, pixmap);
subitem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QString::fromUtf8(circle_group.mGroupName.c_str()));
subitem->setData(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole, QString::fromStdString(circle_group.mGroupId.toStdString()));
subitem->setData(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole, QVariant(circle_group.mSubscribeFlags));
@ -978,6 +976,29 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
// add all items
item->addChildren(new_sub_items);
// The bullet colors below are for the *Membership*. This is independent from admin rights, which cannot be shown as a color.
// Admin/non admin is shows using Bold font.
if (mUseColoredGroupIcons)
{
if(am_I_in_circle)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(":/icons/png/circles-green.png"));
else if(am_I_invited || am_I_pending)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(":/icons/png/circles-notify.png"));
else
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(":/icons/png/circles.png"));
}
else
{
if(am_I_in_circle)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(IMAGE_MEMBER));
else if(am_I_invited || am_I_pending)
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(IMAGE_INVITED));
else
item->setIcon(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, FilesDefs::getIconFromQtResourcePath(IMAGE_UNKNOWN));
}
}
ui->treeWidget_membership->setSortingEnabled(true);
@ -1345,6 +1366,8 @@ void IdDialog::processSettings(bool load)
ui->idTreeWidget->header()->restoreState(Settings->value(objectName()).toByteArray());
ui->idTreeWidget->header()->setHidden(Settings->value(objectName()+"HiddenHeader", false).toBool());
mUseColoredGroupIcons = Settings->value("UseColoredGroupIcons", false).toBool();
// filterColumn
//ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RsIdentityListModel::COLUMN_THREAD_NAME).toInt());
@ -1370,6 +1393,8 @@ void IdDialog::processSettings(bool load)
Settings->setValue(objectName(), ui->idTreeWidget->header()->saveState());
Settings->setValue(objectName()+"HiddenHeader", ui->idTreeWidget->header()->isHidden());
Settings->setValue("UseColoredGroupIcons", mUseColoredGroupIcons);
// filterColumn
//Settings->setValue("filterColumn", ui->filterLineEdit->currentFilter());
@ -2794,3 +2819,26 @@ void IdDialog::sortColumn(int col,Qt::SortOrder so)
mLastSortColumn = col;
mLastSortOrder = so;
}
void IdDialog::createCustomContextMenu(const QPoint &point)
{
QMenu contextMenu(tr("Options"), this);
QAction *toggleIconsAct = new QAction(tr("Use Circle Icons"), this);
toggleIconsAct->setCheckable(true);
toggleIconsAct->setChecked(mUseColoredGroupIcons);
connect(toggleIconsAct, SIGNAL(triggered()), this, SLOT(toggleColoredGroupIcons()));
contextMenu.addAction(toggleIconsAct);
contextMenu.addSeparator();
// ... existing menu actions ...
contextMenu.exec(ui->treeWidget_membership->mapToGlobal(point));
}
void IdDialog::toggleColoredGroupIcons()
{
mUseColoredGroupIcons = !mUseColoredGroupIcons;
// Trigger a refresh of the tree to apply changes immediately
updateCircles();
}

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

@ -107,8 +107,11 @@ private slots:
void IdListCustomPopupMenu( QPoint point );
void headerContextMenuRequested(QPoint);
void toggleColumnVisible();
void createCustomContextMenu(const QPoint &point);
void CircleListCustomPopupMenu(QPoint point) ;
void toggleColoredGroupIcons();
#ifdef SUSPENDED
void circle_selected() ;
#endif
@ -184,6 +187,7 @@ private:
QTimer updateCirclesTimer;
bool needUpdateIdsOnNextShow;
bool needUpdateCirclesOnNextShow;
bool mUseColoredGroupIcons;
FontSizeHandler mFontSizeHandler;