mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-11-25 18:16:30 -05:00
made the age indicator functional, by recursively changing color of directory/files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler
parent
38b0c578bb
commit
024e7f4b44
10 changed files with 114 additions and 62 deletions
|
|
@ -41,7 +41,7 @@
|
|||
RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
|
||||
: QAbstractItemModel(parent),
|
||||
RemoteMode(mode), nIndex(1), indexSet(1) /* ass zero index cant be used */,
|
||||
ageIndicator(0)
|
||||
ageIndicator(IND_ALWAYS)
|
||||
{
|
||||
setSupportedDragActions(Qt::CopyAction);
|
||||
treeStyle();
|
||||
|
|
@ -147,7 +147,6 @@ void RemoteDirModel::treeStyle()
|
|||
std::cerr << "lookup PER/DIR #" << details.count;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return details.count;
|
||||
}
|
||||
|
||||
|
|
@ -184,10 +183,10 @@ QString RemoteDirModel::getAgeIndicatorString(const DirDetails &details) const
|
|||
case IND_LAST_MONTH:
|
||||
if (age < 30 * 24 * 60 * 60) return nind;
|
||||
break;
|
||||
case IND_OLDER:
|
||||
if (age >= 30 * 24 * 60 * 60) return oind;
|
||||
break;
|
||||
case IND_DEFAULT:
|
||||
// case IND_OLDER:
|
||||
// if (age >= 30 * 24 * 60 * 60) return oind;
|
||||
// break;
|
||||
case IND_ALWAYS:
|
||||
return ret;
|
||||
default:
|
||||
return ret;
|
||||
|
|
@ -232,6 +231,18 @@ QString RemoteDirModel::getAgeIndicatorString(const DirDetails &details) const
|
|||
return QString::fromStdString(finfo.path) ;
|
||||
}
|
||||
|
||||
if (role == Qt::TextColorRole)
|
||||
{
|
||||
FileInfo finfo;
|
||||
rsFiles->FileDetails(details.hash, 0, finfo);
|
||||
|
||||
if(details.min_age > ageIndicator)
|
||||
return Qt::gray ;
|
||||
else
|
||||
return Qt::black ;
|
||||
}
|
||||
|
||||
|
||||
if (role == Qt::DecorationRole)
|
||||
{
|
||||
|
||||
|
|
@ -404,7 +415,7 @@ QString RemoteDirModel::getAgeIndicatorString(const DirDetails &details) const
|
|||
case 4:
|
||||
{
|
||||
QString ind("");
|
||||
if (ageIndicator != IND_DEFAULT)
|
||||
if (ageIndicator != IND_ALWAYS)
|
||||
ind = getAgeIndicatorString(details);
|
||||
return ind;
|
||||
}
|
||||
|
|
@ -577,14 +588,15 @@ QModelIndex RemoteDirModel::index(int row, int column, const QModelIndex & paren
|
|||
return QModelIndex();
|
||||
}
|
||||
|
||||
|
||||
/* now iterate through the details to
|
||||
* get the reference number
|
||||
*/
|
||||
|
||||
std::list<DirStub>::iterator it;
|
||||
int i = 0;
|
||||
for(it = details.children.begin(); ((i < row) && (it != details.children.end())); ++it, ++i) ;
|
||||
|
||||
for(it = details.children.begin(); ((i < row) && (it != details.children.end())); ++it,++i) ;
|
||||
|
||||
if (it == details.children.end())
|
||||
{
|
||||
#ifdef RDM_DEBUG
|
||||
|
|
@ -715,14 +727,14 @@ Qt::ItemFlags RemoteDirModel::flags( const QModelIndex & index ) const
|
|||
}
|
||||
|
||||
|
||||
void RemoteDirModel::update (const QModelIndex &index )
|
||||
{
|
||||
#ifdef RDM_DEBUG
|
||||
//std::cerr << "Directory Request(" << id << ") : ";
|
||||
//std::cerr << path << std::endl;
|
||||
#endif
|
||||
//rsFiles -> RequestDirectories(id, path, 1);
|
||||
}
|
||||
//void RemoteDirModel::update (const QModelIndex &index )
|
||||
//{
|
||||
//#ifdef RDM_DEBUG
|
||||
// //std::cerr << "Directory Request(" << id << ") : ";
|
||||
// //std::cerr << path << std::endl;
|
||||
//#endif
|
||||
// //rsFiles -> RequestDirectories(id, path, 1);
|
||||
//}
|
||||
|
||||
void RemoteDirModel::downloadSelected(QModelIndexList list)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,11 +30,10 @@
|
|||
#include "util/misc.h"
|
||||
#include "rsiface/rstypes.h"
|
||||
|
||||
#define IND_DEFAULT 0
|
||||
#define IND_LAST_DAY 1
|
||||
#define IND_LAST_WEEK 2
|
||||
#define IND_LAST_MONTH 3
|
||||
#define IND_OLDER 4
|
||||
static const uint32_t IND_LAST_DAY = 3600*24 ;
|
||||
static const uint32_t IND_LAST_WEEK = 3600*24*7 ;
|
||||
static const uint32_t IND_LAST_MONTH = 3600*24*31 ; // I know, this is approximate
|
||||
static const uint32_t IND_ALWAYS = ~(uint32_t)0 ;
|
||||
|
||||
class RemoteDirModel : public QAbstractItemModel
|
||||
{
|
||||
|
|
@ -82,13 +81,13 @@ class RemoteDirModel : public QAbstractItemModel
|
|||
|
||||
void getFilePaths(QModelIndexList list, std::list<std::string> &fullpaths);
|
||||
|
||||
void changeAgeIndicator(int indicator) { ageIndicator = indicator; }
|
||||
void changeAgeIndicator(uint32_t indicator) { ageIndicator = indicator; }
|
||||
|
||||
|
||||
public slots:
|
||||
|
||||
void collapsed ( const QModelIndex & index ) { update(index); }
|
||||
void expanded ( const QModelIndex & index ) { update(index); }
|
||||
// void collapsed ( const QModelIndex & index ) { update(index); }
|
||||
// void expanded ( const QModelIndex & index ) { update(index); }
|
||||
|
||||
/* Drag and Drop Functionality */
|
||||
public:
|
||||
|
|
@ -97,14 +96,14 @@ class RemoteDirModel : public QAbstractItemModel
|
|||
virtual QStringList mimeTypes () const;
|
||||
|
||||
private:
|
||||
void update (const QModelIndex &index );
|
||||
// void update (const QModelIndex &index );
|
||||
void treeStyle();
|
||||
void downloadDirectory(const DirDetails & details, int prefixLen);
|
||||
static QString getFlagsString(uint32_t) ;
|
||||
QString getAgeIndicatorString(const DirDetails &) const;
|
||||
void getAgeIndicatorRec(DirDetails &details, QString &ret) const;
|
||||
|
||||
int ageIndicator;
|
||||
uint32_t ageIndicator;
|
||||
|
||||
QIcon categoryIcon;
|
||||
QIcon peerIcon;
|
||||
|
|
|
|||
|
|
@ -846,7 +846,12 @@ void SharedFilesDialog::showFrameSplitted(bool show)
|
|||
|
||||
void SharedFilesDialog::indicatorChanged(int index)
|
||||
{
|
||||
model->changeAgeIndicator(index);
|
||||
localModel->changeAgeIndicator(index);
|
||||
static uint32_t correct_indicator[4] = { IND_ALWAYS,IND_LAST_DAY,IND_LAST_WEEK,IND_LAST_MONTH } ;
|
||||
|
||||
model->changeAgeIndicator(correct_indicator[index]);
|
||||
localModel->changeAgeIndicator(correct_indicator[index]);
|
||||
|
||||
ui.remoteDirTreeView->update(ui.remoteDirTreeView->rootIndex());
|
||||
ui.localDirTreeView->update(ui.localDirTreeView->rootIndex()) ;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -669,27 +669,22 @@ p, li { white-space: pre-wrap; }
|
|||
<widget class="QComboBox" name="indicatorCBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>No indicator</string>
|
||||
<string>Always</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Last day</string>
|
||||
<string>One day old</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Last week</string>
|
||||
<string>One Week old</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Last month</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Older</string>
|
||||
<string>One month old</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
|
|
|
|||
|
|
@ -763,7 +763,9 @@ void TransfersDialog::insertTransfers()
|
|||
FileInfo info;
|
||||
if (!rsFiles->FileDetails(*it, RS_FILE_HINTS_DOWNLOAD, info)) continue;
|
||||
//if file transfer is a cache file index file, don't show it
|
||||
if (info.flags & CB_CODE_CACHE) continue;
|
||||
//
|
||||
if (/*(!_show_cache_transfers) &&*/ (info.flags & CB_CODE_CACHE))
|
||||
continue;
|
||||
|
||||
symbol = "";
|
||||
name = QString::fromUtf8(info.fname.c_str());
|
||||
|
|
@ -978,6 +980,8 @@ void TransfersDialog::insertTransfers()
|
|||
{
|
||||
continue;
|
||||
}
|
||||
if (/*(!_show_cache_transfers) &&*/ (info.flags & CB_CODE_CACHE))
|
||||
continue ;
|
||||
|
||||
std::list<TransferInfo>::iterator pit;
|
||||
for(pit = info.peers.begin(); pit != info.peers.end(); pit++)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue