diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index 14ffca561..74a7d5744 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -529,7 +529,6 @@ void LocalSharedFilesDialog::checkUpdate() void LocalSharedFilesDialog::forceCheck() { rsFiles->ForceDirectoryCheck(); - return; } void RemoteSharedFilesDialog::spawnCustomPopupMenu( QPoint point ) diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui index dbcba0011..cd79340dd 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui @@ -285,6 +285,9 @@ border-image: url(:/images/closepressed.png) + + <html><head/><body><p>Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. </p></body></html> + check files @@ -396,8 +399,8 @@ border-image: url(:/images/closepressed.png) - + diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp index 1b170b87c..2e91ded27 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp @@ -51,7 +51,8 @@ #define ROLE_SORT_STANDARD_GROUP Qt::UserRole + 2 #define ROLE_SORT_NAME Qt::UserRole + 3 #define ROLE_SORT_STATE Qt::UserRole + 4 -#define ROLE_FILTER_REASON Qt::UserRole + 5 +#define ROLE_SORT_SELECTED Qt::UserRole + 5 +#define ROLE_FILTER_REASON Qt::UserRole + 6 #define IMAGE_FRIENDINFO ":/images/peerdetails_16x16.png" @@ -667,8 +668,13 @@ void FriendSelectionWidget::secured_fillList() emit itemAdded(IDTYPE_GXS, QString::fromStdString(detail.mId.toStdString()), gxsItem); if (std::find(gxsIdsSelected.begin(), gxsIdsSelected.end(), detail.mId) != gxsIdsSelected.end()) + { setSelected(mListModus, gxsItem, true); - } + gxsItem->setData(COLUMN_NAME,ROLE_SORT_SELECTED,0); + } + else + gxsItem->setData(COLUMN_NAME,ROLE_SORT_SELECTED,1); + } } if(mShowTypes & SHOW_CONTACTS) { @@ -1219,9 +1225,18 @@ std::string FriendSelectionWidget::idFromItem(QTreeWidgetItem *item) return item->data(COLUMN_DATA, ROLE_ID).toString().toStdString(); } +void FriendSelectionWidget::sortByChecked(bool sort) +{ + mCompareRole->clear(); + mCompareRole->setRole(COLUMN_NAME,ROLE_SORT_SELECTED); + + ui->friendList->resort(); +} + void FriendSelectionWidget::sortByState(bool sort) { - mCompareRole->setRole(COLUMN_NAME, ROLE_SORT_GROUP); + mCompareRole->clear(); + mCompareRole->setRole(COLUMN_NAME, ROLE_SORT_GROUP); mCompareRole->addRole(COLUMN_NAME, ROLE_SORT_STANDARD_GROUP); if (sort) { diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h index d0d295a3a..f10a748fc 100644 --- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h +++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h @@ -132,7 +132,8 @@ signals: public slots: void sortByState(bool sort); - void filterConnected(bool filter); + void sortByChecked(bool sort); + void filterConnected(bool filter); private slots: void groupsChanged(int type); diff --git a/retroshare-gui/src/gui/common/RSTreeWidgetItem.h b/retroshare-gui/src/gui/common/RSTreeWidgetItem.h index 14a22b97c..8e90baee6 100644 --- a/retroshare-gui/src/gui/common/RSTreeWidgetItem.h +++ b/retroshare-gui/src/gui/common/RSTreeWidgetItem.h @@ -32,6 +32,7 @@ public: RSTreeWidgetItemCompareRole(); explicit RSTreeWidgetItemCompareRole(QMap> map); + void clear() { QMap >::clear() ; } void setRole(const int column, const int role); void addRole(const int column, const int role); void findRoles(const int column, QList &roles) const; diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 432684362..8b5923657 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -889,7 +889,7 @@ void GxsGroupDialog::setSelectedModerators(const std::set& ids) ui.adminsList->show(); ui.filtercomboBox->show(); - ui.adminsList->setSelectedIds(ids, false); + ui.adminsList->setSelectedIds(ids, true); QString moderatorsListString ; RsIdentityDetails det; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp index 8f9b9ed0d..16d0c307b 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp @@ -151,6 +151,7 @@ bool GxsForumGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, M // Local information. Description should be handled here. setSelectedModerators(pgroup->mAdminList.ids); + ui.adminsList->sortByChecked(true); mGroupData = *pgroup; // keeps the private information diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui index e8cc22228..b1e7b7630 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.ui +++ b/retroshare-gui/src/gui/settings/TransferPage.ui @@ -7,7 +7,7 @@ 0 0 701 - 632 + 638 @@ -67,6 +67,9 @@ + + <html><head/><body><p>Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &quot;check files&quot; button in shared files tab.</p></body></html> + minute(s) @@ -289,7 +292,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory in the shared files dialog to be:</span></p>