Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed hide/show column

Browse source
This commit is contained in:
csoler 2019-08-03 21:07:48 +02:00
parent 47bee5198c
commit ee678889a3
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 73 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -112,9 +112,9 @@ FriendsDialog::FriendsDialog(QWidget *parent)
// load settings // load settings
RsAutoUpdatePage::lockAllEvents(); RsAutoUpdatePage::lockAllEvents();
ui.friendList->setColumnVisible(NewFriendList::COLUMN_LAST_CONTACT, false); ui.friendList->setColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT, false);
ui.friendList->setColumnVisible(NewFriendList::COLUMN_IP, false); ui.friendList->setColumnVisible(RsFriendListModel::COLUMN_THREAD_IP, false);
ui.friendList->setColumnVisible(NewFriendList::COLUMN_ID, false); ui.friendList->setColumnVisible(RsFriendListModel::COLUMN_THREAD_ID, false);
ui.friendList->setShowGroups(true); ui.friendList->setShowGroups(true);
processSettings(true); processSettings(true);
RsAutoUpdatePage::unlockAllEvents(); RsAutoUpdatePage::unlockAllEvents();

91
retroshare-gui/src/gui/common/NewFriendList.cpp
View file

@ -151,7 +151,7 @@ NewFriendList::NewFriendList(QWidget *parent) :
// ui->peerTreeWidget->addContextMenuAction(mActionSortByState); // ui->peerTreeWidget->addContextMenuAction(mActionSortByState);
/* Set sort */ /* Set sort */
sortByColumn(COLUMN_NAME, Qt::AscendingOrder); sortByColumn(RsFriendListModel::COLUMN_THREAD_NAME, Qt::AscendingOrder);
sortByState(false); sortByState(false);
// workaround for Qt bug, should be solved in next Qt release 4.7.0 // workaround for Qt bug, should be solved in next Qt release 4.7.0
@ -167,10 +167,10 @@ NewFriendList::NewFriendList(QWidget *parent) :
/* Set initial column width */ /* Set initial column width */
int fontWidth = fontMetrics.width("W"); int fontWidth = fontMetrics.width("W");
ui->peerTreeWidget->setColumnWidth(COLUMN_NAME, 22 * fontWidth); ui->peerTreeWidget->setColumnWidth(RsFriendListModel::COLUMN_THREAD_NAME , 22 * fontWidth);
ui->peerTreeWidget->setColumnWidth(COLUMN_LAST_CONTACT, 12 * fontWidth); ui->peerTreeWidget->setColumnWidth(RsFriendListModel::COLUMN_THREAD_IP , 15 * fontWidth);
ui->peerTreeWidget->setColumnWidth(COLUMN_IP, 15 * fontWidth); ui->peerTreeWidget->setColumnWidth(RsFriendListModel::COLUMN_THREAD_ID , 32 * fontWidth);
ui->peerTreeWidget->setColumnWidth(COLUMN_ID, 32 * fontWidth); ui->peerTreeWidget->setColumnWidth(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT, 12 * fontWidth);
int avatarHeight = fontMetrics.height() * 3; int avatarHeight = fontMetrics.height() * 3;
ui->peerTreeWidget->setIconSize(QSize(avatarHeight, avatarHeight)); ui->peerTreeWidget->setIconSize(QSize(avatarHeight, avatarHeight));
@ -180,6 +180,10 @@ NewFriendList::NewFriendList(QWidget *parent) :
mModel->updateInternalData(); mModel->updateInternalData();
QHeaderView *h = ui->peerTreeWidget->header();
h->setContextMenuPolicy(Qt::CustomContextMenu);
connect(h, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(headerContextMenuRequested(QPoint)));
QTimer *timer = new QTimer; QTimer *timer = new QTimer;
QObject::connect(timer,SIGNAL(timeout()),mModel,SLOT(debug_dump())); QObject::connect(timer,SIGNAL(timeout()),mModel,SLOT(debug_dump()));
timer->start(2000); timer->start(2000);
@ -188,7 +192,47 @@ NewFriendList::NewFriendList(QWidget *parent) :
NewFriendList::~NewFriendList() NewFriendList::~NewFriendList()
{ {
delete ui; delete ui;
// delete(mCompareRole); }
void NewFriendList::headerContextMenuRequested(QPoint p)
{
QMenu displayMenu(tr("Show Items"), this);
displayMenu.addAction(ui->actionHideOfflineFriends);
displayMenu.addAction(ui->actionShowState);
displayMenu.addAction(ui->actionShowGroups);
displayMenu.addAction(ui->actionExportFriendlist);
displayMenu.addAction(ui->actionImportFriendlist);
ui->actionHideOfflineFriends->setChecked(mHideUnconnected);
ui->actionShowState->setChecked(mShowState);
ui->actionShowGroups->setChecked(mShowGroups);
QHeaderView *header = ui->peerTreeWidget->header();
{
QAction *action = displayMenu.addAction(QIcon(), tr("Last contact"), this, SLOT(toggleColumnVisible()));
action->setCheckable(true);
action->setData(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT);
action->setChecked(!header->isSectionHidden(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT));
}
{
QAction *action = displayMenu.addAction(QIcon(), tr("IP"), this, SLOT(toggleColumnVisible()));
action->setCheckable(true);
action->setData(RsFriendListModel::COLUMN_THREAD_IP);
action->setChecked(!header->isSectionHidden(RsFriendListModel::COLUMN_THREAD_IP));
}
{
QAction *action = displayMenu.addAction(QIcon(), tr("ID"), this, SLOT(toggleColumnVisible()));
action->setCheckable(true);
action->setData(RsFriendListModel::COLUMN_THREAD_ID);
action->setChecked(!header->isSectionHidden(RsFriendListModel::COLUMN_THREAD_ID));
}
displayMenu.exec(QCursor::pos());
} }
void NewFriendList::addToolButton(QToolButton *toolButton) void NewFriendList::addToolButton(QToolButton *toolButton)
@ -1292,12 +1336,26 @@ void NewFriendList::setHideUnconnected(bool hidden)
} }
} }
void NewFriendList::setColumnVisible(Column column, bool visible) void NewFriendList::setColumnVisible(int col,bool visible)
{ {
ui->peerTreeWidget->setColumnHidden(col, !visible);
}
void NewFriendList::toggleColumnVisible()
{
QAction *action = dynamic_cast<QAction*>(sender());
if (!action)
return;
int column = action->data().toInt();
bool visible = action->isChecked();
//emit columnVisibleChanged(column,visible);
ui->peerTreeWidget->setColumnHidden(column, !visible); ui->peerTreeWidget->setColumnHidden(column, !visible);
} }
void NewFriendList::sortByColumn(Column column, Qt::SortOrder sortOrder) void NewFriendList::sortByColumn(int column, Qt::SortOrder sortOrder)
{ {
ui->peerTreeWidget->sortByColumn(column, sortOrder); ui->peerTreeWidget->sortByColumn(column, sortOrder);
} }
@ -1376,21 +1434,4 @@ void NewFriendList::addPeerToExpand(const RsPgpId& gpgId)
void NewFriendList::createDisplayMenu() void NewFriendList::createDisplayMenu()
{ {
QMenu *displayMenu = new QMenu(tr("Show Items"), this);
connect(displayMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
displayMenu->addAction(ui->actionHideOfflineFriends);
displayMenu->addAction(ui->actionShowState);
displayMenu->addAction(ui->actionShowGroups);
// ui->peerTreeWidget->addContextMenuMenu(displayMenu);
// ui->peerTreeWidget->addContextMenuAction(ui->actionExportFriendlist);
// ui->peerTreeWidget->addContextMenuAction(ui->actionImportFriendlist);
}
void NewFriendList::updateMenu()
{
ui->actionHideOfflineFriends->setChecked(mHideUnconnected);
ui->actionShowState->setChecked(mShowState);
ui->actionShowGroups->setChecked(mShowGroups);
} }

15
retroshare-gui/src/gui/common/NewFriendList.h
View file

@ -46,14 +46,6 @@ class NewFriendList: public QWidget
Q_PROPERTY(QColor textColorStatusBusy READ textColorStatusBusy WRITE setTextColorStatusBusy) Q_PROPERTY(QColor textColorStatusBusy READ textColorStatusBusy WRITE setTextColorStatusBusy)
Q_PROPERTY(QColor textColorStatusOnline READ textColorStatusOnline WRITE setTextColorStatusOnline) Q_PROPERTY(QColor textColorStatusOnline READ textColorStatusOnline WRITE setTextColorStatusOnline)
Q_PROPERTY(QColor textColorStatusInactive READ textColorStatusInactive WRITE setTextColorStatusInactive) Q_PROPERTY(QColor textColorStatusInactive READ textColorStatusInactive WRITE setTextColorStatusInactive)
public:
enum Column
{
COLUMN_NAME = 0,
COLUMN_LAST_CONTACT = 1,
COLUMN_IP = 2,
COLUMN_ID = 3
};
public: public:
explicit NewFriendList(QWidget *parent = 0); explicit NewFriendList(QWidget *parent = 0);
@ -66,10 +58,10 @@ public:
bool getExpandedGroups(std::set<RsNodeGroupId> &groups) const; bool getExpandedGroups(std::set<RsNodeGroupId> &groups) const;
void addPeerToExpand(const RsPgpId &gpgId); void addPeerToExpand(const RsPgpId &gpgId);
bool getExpandedPeers(std::set<RsPgpId> &peers) const; bool getExpandedPeers(std::set<RsPgpId> &peers) const;
void setColumnVisible(int col,bool visible);
std::string getSelectedGroupId() const; std::string getSelectedGroupId() const;
void setColumnVisible(Column column, bool visible); void sortByColumn(int column, Qt::SortOrder sortOrder);
void sortByColumn(Column column, Qt::SortOrder sortOrder);
bool isSortByState(); bool isSortByState();
QColor textColorGroup() const { return mTextColorGroup; } QColor textColorGroup() const { return mTextColorGroup; }
@ -90,9 +82,11 @@ public slots:
void filterItems(const QString &text); void filterItems(const QString &text);
void sortByState(bool sort); void sortByState(bool sort);
void toggleColumnVisible();
void setShowGroups(bool show); void setShowGroups(bool show);
void setHideUnconnected(bool hidden); void setHideUnconnected(bool hidden);
void setShowState(bool show); void setShowState(bool show);
void headerContextMenuRequested(QPoint);
private slots: private slots:
@ -136,7 +130,6 @@ private:
private slots: private slots:
void groupsChanged(); void groupsChanged();
void peerTreeWidgetCustomPopupMenu(); void peerTreeWidgetCustomPopupMenu();
void updateMenu();
void pastePerson(); void pastePerson();