Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-10 07:10:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixed saving of sortByState option

Browse source
This commit is contained in:
csoler 2019-08-15 16:16:01 +02:00
parent 9d696f56bc
commit 6e7a86058d
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,6 +145,7 @@ public:
void setShowOfflineNodes(bool b) { m_showOfflineNodes = b ; } void setShowOfflineNodes(bool b) { m_showOfflineNodes = b ; }
bool showOfflineNodes() const { return m_showOfflineNodes ; } bool showOfflineNodes() const { return m_showOfflineNodes ; }
bool sortByState() const { return m_sortByState ; }
private: private:
const QHeaderView *m_header ; const QHeaderView *m_header ;
@ -286,6 +287,8 @@ void NewFriendList::headerContextMenuRequested(QPoint p)
displayMenu.addAction(mActionSortByState); displayMenu.addAction(mActionSortByState);
mActionSortByState->setChecked(mProxyModel->sortByState());
displayMenu.addAction(ui->actionShowOfflineFriends); displayMenu.addAction(ui->actionShowOfflineFriends);
displayMenu.addAction(ui->actionShowState); displayMenu.addAction(ui->actionShowState);
displayMenu.addAction(ui->actionShowGroups); displayMenu.addAction(ui->actionShowGroups);
@ -338,15 +341,10 @@ void NewFriendList::addToolButton(QToolButton *toolButton)
void NewFriendList::processSettings(bool load) void NewFriendList::processSettings(bool load)
{ {
// state of peer tree // state of peer tree
//ui->peerTreeWidget->setSettingsVersion(2);
//ui->peerTreeWidget->processSettings(load);
if (load) { if (load) {
// load settings // load settings
// ui->peerTreeWidget->header()->doItemsLayout(); // is needed because I added a third column
// restoreState would corrupt the internal sectionCount
// states // states
setShowUnconnected(!Settings->value("hideUnconnected", mProxyModel->showOfflineNodes()).toBool()); setShowUnconnected(!Settings->value("hideUnconnected", mProxyModel->showOfflineNodes()).toBool());
setShowState(Settings->value("showState", mShowState).toBool()); setShowState(Settings->value("showState", mShowState).toBool());
@ -357,7 +355,7 @@ void NewFriendList::processSettings(bool load)
setColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT,Settings->value("showLastContact", isColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT)).toBool()); setColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT,Settings->value("showLastContact", isColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT)).toBool());
// sort // sort
toggleSortByState(Settings->value("sortByState", isSortByState()).toBool()); toggleSortByState(Settings->value("sortByState", mProxyModel->sortByState()).toBool());
// open groups // open groups
int arrayIndex = Settings->beginReadArray("Groups"); int arrayIndex = Settings->beginReadArray("Groups");
@ -389,7 +387,7 @@ void NewFriendList::processSettings(bool load)
Settings->setValue("showLastContact",isColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT)); Settings->setValue("showLastContact",isColumnVisible(RsFriendListModel::COLUMN_THREAD_LAST_CONTACT));
// sort // sort
Settings->setValue("sortByState", isSortByState()); Settings->setValue("sortByState", mProxyModel->sortByState());
// open groups // open groups
Settings->beginWriteArray("Groups"); Settings->beginWriteArray("Groups");
@ -408,7 +406,6 @@ void NewFriendList::toggleSortByState(bool sort)
{ {
mProxyModel->setSortByState(sort); mProxyModel->setSortByState(sort);
mProxyModel->setFilterRegExp(QRegExp(QString(RsFriendListModel::FilterString))) ;// triggers a re-display. mProxyModel->setFilterRegExp(QRegExp(QString(RsFriendListModel::FilterString))) ;// triggers a re-display.
processSettings(false);
} }
void NewFriendList::changeEvent(QEvent *e) void NewFriendList::changeEvent(QEvent *e)
@ -1461,8 +1458,6 @@ void NewFriendList::toggleColumnVisible()
//emit columnVisibleChanged(column,visible); //emit columnVisibleChanged(column,visible);
ui->peerTreeWidget->setColumnHidden(column, !visible); ui->peerTreeWidget->setColumnHidden(column, !visible);
processSettings(false); // save settings
} }
void NewFriendList::sortByColumn(int column, Qt::SortOrder sortOrder) void NewFriendList::sortByColumn(int column, Qt::SortOrder sortOrder)
@ -1472,14 +1467,7 @@ void NewFriendList::sortByColumn(int column, Qt::SortOrder sortOrder)
void NewFriendList::setShowState(bool show) void NewFriendList::setShowState(bool show)
{ {
if (mShowState != show) { mShowState = show;
mShowState = show;
}
}
bool NewFriendList::isSortByState()
{
return mActionSortByState->isChecked();
} }
void NewFriendList::setShowGroups(bool show) void NewFriendList::setShowGroups(bool show)

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

@ -64,7 +64,6 @@ public:
std::string getSelectedGroupId() const; std::string getSelectedGroupId() const;
void sortByColumn(int column, Qt::SortOrder sortOrder); void sortByColumn(int column, Qt::SortOrder sortOrder);
bool isSortByState();
QColor textColorGroup() const { return mModel->mTextColorGroup; } QColor textColorGroup() const { return mModel->mTextColorGroup; }
QColor textColorStatusOffline() const { return mModel->mTextColorStatus[RS_STATUS_OFFLINE ]; } QColor textColorStatusOffline() const { return mModel->mTextColorStatus[RS_STATUS_OFFLINE ]; }