Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 14:20:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c5d171d4e9 into 8fcc52b304

Browse source
This commit is contained in:
defnax 2025-04-02 15:25:25 +00:00 • committed by GitHub
commit b0bb23d06e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View file

@ -61,7 +61,8 @@
#define SHARED_FILES_DIALOG_COLUMN_AGE 3 #define SHARED_FILES_DIALOG_COLUMN_AGE 3
#define SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS 4 #define SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS 4
#define SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR 5 #define SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR 5
#define SHARED_FILES_DIALOG_COLUMN_COUNT 6 #define SHARED_FILES_DIALOG_COLUMN_UPLOADED 6
#define SHARED_FILES_DIALOG_COLUMN_COUNT 7
#define SHARED_FILES_DIALOG_FILTER_STRING "filtered" #define SHARED_FILES_DIALOG_FILTER_STRING "filtered"
@ -235,6 +236,7 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent)
header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_AGE , charWidth*6 ); header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_AGE , charWidth*6 );
header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, charWidth*10 ); header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, charWidth*10 );
header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR , charWidth*20 ); header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR , charWidth*20 );
header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_UPLOADED , charWidth*20 );
header->setStretchLastSection(true); header->setStretchLastSection(true);
@ -293,6 +295,7 @@ RemoteSharedFilesDialog::RemoteSharedFilesDialog(QWidget *parent)
{ {
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_UPLOADED, true) ;
ui.checkButton->hide() ; ui.checkButton->hide() ;
connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadRemoteSelected())); connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadRemoteSelected()));
@ -490,6 +493,7 @@ void RemoteSharedFilesDialog::showProperColumns()
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, false) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, false) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, true) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, true) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_UPLOADED, true) ;
#ifdef DONT_USE_SEARCH_IN_TREE_VIEW #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
ui.filterLabel->hide(); ui.filterLabel->hide();
ui.filterPatternLineEdit->hide(); ui.filterPatternLineEdit->hide();
@ -502,6 +506,7 @@ void RemoteSharedFilesDialog::showProperColumns()
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, true) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, true) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ; ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ;
ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_UPLOADED, true) ;
#ifdef DONT_USE_SEARCH_IN_TREE_VIEW #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
ui.filterLabel->show(); ui.filterLabel->show();
ui.filterPatternLineEdit->show(); ui.filterPatternLineEdit->show();

40
retroshare-gui/src/gui/RemoteDirModel.cpp
View file

@ -54,7 +54,8 @@
#define REMOTEDIRMODEL_COLUMN_AGE 3 #define REMOTEDIRMODEL_COLUMN_AGE 3
#define REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS 4 #define REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS 4
#define REMOTEDIRMODEL_COLUMN_WN_VISU_DIR 5 #define REMOTEDIRMODEL_COLUMN_WN_VISU_DIR 5
#define REMOTEDIRMODEL_COLUMN_COUNT 6 #define REMOTEDIRMODEL_COLUMN_UPLOADED 6
#define REMOTEDIRMODEL_COLUMN_COUNT 7
#define RETROSHARE_DIR_MODEL_FILTER_STRING "filtered" #define RETROSHARE_DIR_MODEL_FILTER_STRING "filtered"
static const uint32_t FLAT_VIEW_MAX_REFS_PER_SECOND = 2000 ; static const uint32_t FLAT_VIEW_MAX_REFS_PER_SECOND = 2000 ;
@ -547,7 +548,17 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
return QString(); return QString();
else else
return misc::timeRelativeToNow(details.max_mtime); return misc::timeRelativeToNow(details.max_mtime);
case REMOTEDIRMODEL_COLUMN_UPLOADED:
{
if(!RemoteMode && details.id == rsPeers->getOwnId()) // Totals in "My files" row
{
uint64_t n = rsFiles->getCumulativeUploadNum();
if(n)
return QString(misc::friendlyUnit(rsFiles->getCumulativeUploadAll()) + QString(" - %1 files").arg(n));
else
return QString("-");
}
}
default: default:
return QString() ; return QString() ;
} }
@ -580,6 +591,14 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
return QVariant(); return QVariant();
case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
return getGroupsString(details.flags,details.parent_groups) ; return getGroupsString(details.flags,details.parent_groups) ;
case REMOTEDIRMODEL_COLUMN_UPLOADED:
{
uint64_t x = rsFiles->getCumulativeUpload(details.hash);
if(x)
return misc::friendlyUnit(x);
else
return QString();
}
default: default:
return tr("FILE"); return tr("FILE");
@ -606,6 +625,8 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
return QVariant(); return QVariant();
case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
return getGroupsString(details.flags,details.parent_groups) ; return getGroupsString(details.flags,details.parent_groups) ;
case REMOTEDIRMODEL_COLUMN_UPLOADED:
return "";
default: default:
return tr("DIR"); return tr("DIR");
@ -665,6 +686,14 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const
case REMOTEDIRMODEL_COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime); case REMOTEDIRMODEL_COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime);
case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str()); case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: return computeDirectoryPath(details); case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: return computeDirectoryPath(details);
case REMOTEDIRMODEL_COLUMN_UPLOADED:
{
uint64_t x = rsFiles->getCumulativeUpload(details.hash);
if(x)
return misc::friendlyUnit(x);
else
return QString();
}
default: default:
return QVariant() ; return QVariant() ;
} }
@ -733,6 +762,8 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
ind = getAgeIndicatorString(details); ind = getAgeIndicatorString(details);
return ind; return ind;
} }
case REMOTEDIRMODEL_COLUMN_UPLOADED:
return (qulonglong) rsFiles->getCumulativeUpload(details.hash);
default: default:
return tr("FILE"); return tr("FILE");
} }
@ -779,6 +810,7 @@ QVariant FlatStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
return computeDirectoryPath(details); return computeDirectoryPath(details);
} }
case REMOTEDIRMODEL_COLUMN_UPLOADED: return (qulonglong) rsFiles->getCumulativeUpload(details.hash);
} }
} }
return QVariant(); return QVariant();
@ -945,6 +977,8 @@ QVariant TreeStyle_RDM::headerData(int section, Qt::Orientation orientation, int
return tr("What's new"); return tr("What's new");
else else
return tr("Visibility"); return tr("Visibility");
case REMOTEDIRMODEL_COLUMN_UPLOADED:
return tr("Uploaded");
} }
return tr("Column %1").arg(section); return tr("Column %1").arg(section);
} }
@ -991,6 +1025,8 @@ QVariant FlatStyle_RDM::headerData(int section, Qt::Orientation orientation, int
return tr("Share Flags"); return tr("Share Flags");
case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
return tr("Directory"); return tr("Directory");
case REMOTEDIRMODEL_COLUMN_UPLOADED:
return tr("Uploaded");
} }
return tr("Column %1").arg(section); return tr("Column %1").arg(section);
} }