diff --git a/filetransferinstance.cpp b/filetransferinstance.cpp index 646daedf0..6b9a39250 100644 --- a/filetransferinstance.cpp +++ b/filetransferinstance.cpp @@ -217,14 +217,16 @@ QString FileTransferInstance::getHtmlImage() QString res; if (state == tsPending || state == tsProcessing || state == tsPaused) { - QImage rightUp(":ui/stopFileButton/default.png"); - QImage rightDown; + QImage leftBtnImg(":/ui/fileTransferInstance/stopFileButton.png"); + QImage rightBtnImg; if (state == tsProcessing) - rightDown = QImage(":ui/pauseFileButton/default.png"); + rightBtnImg = QImage(":/ui/fileTransferInstance/pauseFileButton.png"); + else if (state == tsPaused) + rightBtnImg = QImage(":/ui/fileTransferInstance/resumeFileButton.png"); else - rightDown = QImage(":ui/acceptFileButton/default.png"); + rightBtnImg = QImage(":/ui/fileTransferInstance/acceptFileButton.png"); - res = draw2ButtonsForm("green", rightUp, rightDown); + res = draw2ButtonsForm("green", leftBtnImg, rightBtnImg); } else if (state == tsCanceled) { res = drawButtonlessForm("red"); @@ -262,16 +264,21 @@ void FileTransferInstance::pressFromHtml(QString code) QString FileTransferInstance::drawButtonlessForm(const QString &type) { - QString res; + QString imgAStr; + QString imgBStr; - res = "
\n";
- res += " " + filename + " " + size + " | \n
" + filename + "
" + size + "
"; + + return wrapIntoForm(content, type, imgAStr, imgBStr); } QString FileTransferInstance::insertMiniature() @@ -290,12 +297,21 @@ QString FileTransferInstance::insertMiniature() QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage &imgA, const QImage &imgB) { - QString res; - QString widgetId = QString::number(getId()); QString imgAstr = ""; QString imgBstr = ""; + QString content; + content += "" + filename + "
"; + content += "" + getHumanReadableSize(lastBytesSent) + " / " + size; + " (" + speed + ")
\n"; + + return wrapIntoForm(content, type, imgAstr, imgBstr); +} + +QString FileTransferInstance::wrapIntoForm(const QString& content, const QString &type, const QString &imgAstr, const QString &imgBstr) +{ + QString res; + res = "\n"; @@ -304,8 +320,7 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage res += insertMiniature(); res += " | \n";
res += " ";
- res += " \n";
res += "" + filename + " "; - res += "" + getHumanReadableSize(lastBytesSent) + " / " + size; + " (" + speed + ") \n"; + res += content; res += " | \n";
res += "\n";
diff --git a/filetransferinstance.h b/filetransferinstance.h
index 5b8d791e6..2306129ee 100644
--- a/filetransferinstance.h
+++ b/filetransferinstance.h
@@ -58,6 +58,7 @@ private:
QString drawButtonlessForm(const QString &type);
QString draw2ButtonsForm(const QString &type, const QImage &imgA, const QImage &imgB);
QString insertMiniature();
+ QString wrapIntoForm(const QString &content, const QString &type, const QString &imgAstr, const QString &imgBstr);
private:
enum TransfState {tsPending, tsProcessing, tsPaused, tsFinished, tsCanceled};
diff --git a/res.qrc b/res.qrc
index 7cd8ca7ff..508fbef28 100644
--- a/res.qrc
+++ b/res.qrc
@@ -126,5 +126,13 @@
|