mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-28 10:32:22 -04:00
Added new widget for hashing files.
Added new common class FilesDefs to handle informations of file types like icons and names. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
c9fc77f2d1
commit
0ee35b55f4
35 changed files with 932 additions and 1031 deletions
|
|
@ -61,8 +61,7 @@
|
|||
const uint32_t AFI_DEFAULT_PERIOD = (30 * 3600 * 24); /* 30 Days */
|
||||
|
||||
/** Constructor */
|
||||
AttachFileItem::AttachFileItem(std::string hash, std::string name, uint64_t size,
|
||||
uint32_t flags, std::string srcId)
|
||||
AttachFileItem::AttachFileItem(const std::string& hash, const QString& name, uint64_t size, uint32_t flags, const std::string& srcId)
|
||||
:QWidget(NULL), mFileHash(hash), mFileName(name), mFileSize(size), mSrcId(srcId)
|
||||
{
|
||||
/* Invoke the Qt Designer generated object setup routine */
|
||||
|
|
@ -72,7 +71,6 @@ AttachFileItem::AttachFileItem(std::string hash, std::string name, uint64_t size
|
|||
|
||||
mMode = flags & AFI_MASK_STATE;
|
||||
mType = flags & AFI_MASK_TYPE;
|
||||
mPicFlag=0;
|
||||
|
||||
if (mMode == AFI_STATE_EXTRA)
|
||||
{
|
||||
|
|
@ -92,7 +90,7 @@ AttachFileItem::AttachFileItem(std::string hash, std::string name, uint64_t size
|
|||
}
|
||||
|
||||
/** Constructor */
|
||||
AttachFileItem::AttachFileItem(std::string path)
|
||||
AttachFileItem::AttachFileItem(const QString& path)
|
||||
:QWidget(NULL), mPath(path), mFileSize(0)
|
||||
{
|
||||
/* Invoke the Qt Designer generated object setup routine */
|
||||
|
|
@ -100,10 +98,9 @@ AttachFileItem::AttachFileItem(std::string path)
|
|||
|
||||
mMode = AFI_STATE_EXTRA;
|
||||
mType = AFI_TYPE_ATTACH;
|
||||
mPicFlag=0;
|
||||
|
||||
/* ask for Files to hash/prepare it for us */
|
||||
if ((!rsFiles) || (!rsFiles->ExtraFileHash(path, AFI_DEFAULT_PERIOD, 0)))
|
||||
if ((!rsFiles) || (!rsFiles->ExtraFileHash(path.toUtf8().constData(), AFI_DEFAULT_PERIOD, 0)))
|
||||
{
|
||||
mMode = AFI_STATE_ERROR;
|
||||
}
|
||||
|
|
@ -113,7 +110,6 @@ AttachFileItem::AttachFileItem(std::string path)
|
|||
|
||||
void AttachFileItem::Setup()
|
||||
{
|
||||
|
||||
connect( cancelButton, SIGNAL( clicked( void ) ), this, SLOT( cancel ( void ) ) );
|
||||
|
||||
/* once off check - if remote, check if we have it
|
||||
|
|
@ -127,8 +123,7 @@ void AttachFileItem::Setup()
|
|||
if (mMode == AFI_STATE_REMOTE)
|
||||
{
|
||||
FileInfo fi;
|
||||
uint32_t hintflags = RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL
|
||||
| RS_FILE_HINTS_SPEC_ONLY;
|
||||
uint32_t hintflags = RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_SPEC_ONLY;
|
||||
|
||||
/* look up path */
|
||||
if (rsFiles->FileDetails(mFileHash, hintflags, fi))
|
||||
|
|
@ -140,14 +135,12 @@ void AttachFileItem::Setup()
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
mMode = AFI_STATE_LOCAL;
|
||||
mPath = fi.path;
|
||||
mPath = QString::fromUtf8(fi.path.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
updateItemStatic();
|
||||
updateItem();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -169,7 +162,7 @@ void AttachFileItem::updateItemStatic()
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
QString filename = QString::fromUtf8(mFileName.c_str());
|
||||
QString filename = mFileName;
|
||||
mDivisor = 1;
|
||||
|
||||
if (mFileSize > 10000000) /* 10 Mb */
|
||||
|
|
@ -219,7 +212,7 @@ void AttachFileItem::updateItemStatic()
|
|||
std::cerr << "AttachFileItem::updateItemStatic() Updated Path";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
mPath = fi.path;
|
||||
mPath = QString::fromUtf8(fi.path.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -234,12 +227,12 @@ void AttachFileItem::updateItemStatic()
|
|||
cancelButton->setEnabled(false);
|
||||
|
||||
progressBar->setValue(0);
|
||||
filename = "[ERROR] " + filename;
|
||||
filename = tr("[ERROR])") + " " + filename;
|
||||
|
||||
break;
|
||||
|
||||
case AFI_STATE_EXTRA:
|
||||
filename = QString::fromUtf8(mPath.c_str());
|
||||
filename = mPath;
|
||||
|
||||
progressBar->setRange(0, 100);
|
||||
progressBar->setFormat("HASHING");
|
||||
|
|
@ -303,10 +296,8 @@ void AttachFileItem::updateItemStatic()
|
|||
break;
|
||||
}
|
||||
|
||||
|
||||
fileLabel->setText(filename);
|
||||
fileLabel->setToolTip(filename);
|
||||
|
||||
}
|
||||
|
||||
void AttachFileItem::updateItem()
|
||||
|
|
@ -339,7 +330,7 @@ void AttachFileItem::updateItem()
|
|||
std::cerr << std::endl;
|
||||
#endif
|
||||
/* check for file status */
|
||||
if (rsFiles->ExtraFileStatus(mPath, fi))
|
||||
if (rsFiles->ExtraFileStatus(mPath.toUtf8().constData(), fi))
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
std::cerr << "AttachFileItem::updateItem() STATE=>Local";
|
||||
|
|
@ -348,7 +339,7 @@ void AttachFileItem::updateItem()
|
|||
mMode = AFI_STATE_LOCAL;
|
||||
|
||||
/* fill in file details */
|
||||
mFileName = fi.fname;
|
||||
mFileName = QString::fromUtf8(fi.fname.c_str());
|
||||
mFileSize = fi.size;
|
||||
mFileHash = fi.hash;
|
||||
|
||||
|
|
@ -422,7 +413,7 @@ void AttachFileItem::updateItem()
|
|||
/* save path */
|
||||
/* update progress */
|
||||
mMode = AFI_STATE_LOCAL;
|
||||
mPath = fi.path;
|
||||
mPath = QString::fromUtf8(fi.path.c_str());
|
||||
stateChanged = true;
|
||||
}
|
||||
progressBar->setValue(fi.avail / mDivisor);
|
||||
|
|
@ -442,7 +433,6 @@ void AttachFileItem::updateItem()
|
|||
/* update progress */
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/****** update based on new state ******/
|
||||
|
|
@ -485,7 +475,6 @@ void AttachFileItem::updateItem()
|
|||
msec_rate = 2000; /* should be download rate dependent */
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if (repeat)
|
||||
{
|
||||
|
|
@ -495,10 +484,8 @@ void AttachFileItem::updateItem()
|
|||
#endif
|
||||
QTimer::singleShot( msec_rate, this, SLOT(updateItem( void ) ));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
void AttachFileItem::cancel()
|
||||
{
|
||||
#ifdef DEBUG_ITEM
|
||||
|
|
@ -519,7 +506,7 @@ void AttachFileItem::cancel()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
uint32_t AttachFileItem::getState() {
|
||||
uint32_t AttachFileItem::getState()
|
||||
{
|
||||
return mMode;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,49 +41,39 @@ const uint32_t AFI_TYPE_ATTACH = 0x0020;
|
|||
|
||||
class AttachFileItem : public QWidget, private Ui::AttachFileItem
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
/** Default Constructor */
|
||||
AttachFileItem(std::string localpath);
|
||||
AttachFileItem(std::string hash, std::string name, uint64_t size,
|
||||
uint32_t flags, std::string srcId);
|
||||
/** Default Constructor */
|
||||
AttachFileItem(const QString& localpath);
|
||||
AttachFileItem(const std::string& hash, const QString& name, uint64_t size, uint32_t flags, const std::string& srcId);
|
||||
|
||||
/** Default Destructor */
|
||||
/** Default Destructor */
|
||||
|
||||
std::string FileHash() { return mFileHash; }
|
||||
std::string FileName() { return mFileName; }
|
||||
uint64_t FileSize() { return mFileSize; }
|
||||
std::string FilePath() { return mPath; }
|
||||
int getPicFlag() { return mPicFlag;}
|
||||
void setPicFlag(int flag) { mPicFlag=flag;}
|
||||
const std::string& FileHash() { return mFileHash; }
|
||||
const QString& FileName() { return mFileName; }
|
||||
uint64_t FileSize() { return mFileSize; }
|
||||
const QString& FilePath() { return mPath; }
|
||||
|
||||
void updateItemStatic();
|
||||
|
||||
bool done();
|
||||
bool done();
|
||||
bool ready();
|
||||
uint32_t getState();
|
||||
|
||||
public slots:
|
||||
|
||||
private slots:
|
||||
|
||||
void cancel();
|
||||
|
||||
void cancel();
|
||||
void updateItem();
|
||||
|
||||
private:
|
||||
|
||||
void Setup();
|
||||
|
||||
|
||||
std::string mPath;
|
||||
QString mPath;
|
||||
std::string mFileHash;
|
||||
std::string mFileName;
|
||||
QString mFileName;
|
||||
uint64_t mFileSize;
|
||||
std::string mSrcId;
|
||||
|
||||
uint32_t mPicFlag;
|
||||
uint32_t mMode;
|
||||
uint32_t mType;
|
||||
uint64_t mDivisor;
|
||||
|
|
@ -92,11 +82,8 @@ private:
|
|||
float amountDone;
|
||||
|
||||
signals:
|
||||
void fileFinished(AttachFileItem * AttachFileItem);
|
||||
|
||||
void fileFinished(AttachFileItem * AttachFileItem);
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
<height>35</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>35</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
|
|
@ -130,7 +130,7 @@ background: white;}
|
|||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<iconset resource="../../../../plugins/qdiagram_plugin/qdiagram.qrc">
|
||||
<normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
|
|
@ -154,7 +154,7 @@ background: white;}
|
|||
</layout>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../../../../plugins/qdiagram_plugin/qdiagram.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue