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\n"; - res += insertMiniature(); - res += "\n\n"; - res += "
\n"; - res += "

" + filename + "

" + size + "

\n"; - res += "
\n"; + if (type == "red") + { + imgAStr = ""; + imgBStr = ""; + } else { + imgAStr = ""; + imgBStr = ""; + } - return res; + QString content = "

" + 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"; res += "\n"; res += "\n"; res += "
\n"; @@ -304,8 +320,7 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage res += insertMiniature(); res += "\n"; res += "
"; - 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 @@ ui/micButton/micButtonPressed.png ui/micButton/micButton.css ui/volButton/volButton.css + ui/fileTransferInstance/acceptFileButton.png + ui/fileTransferInstance/pauseFileButton.png + ui/fileTransferInstance/resumeFileButton.png + ui/fileTransferInstance/stopFileButton.png + ui/fileTransferInstance/emptyLGreenFileButton.png + ui/fileTransferInstance/emptyLRedFileButton.png + ui/fileTransferInstance/emptyRGreenFileButton.png + ui/fileTransferInstance/emptyRRedFileButton.png diff --git a/ui/chatArea/innerStyle.css b/ui/chatArea/innerStyle.css index e45691330..22af8bc92 100644 --- a/ui/chatArea/innerStyle.css +++ b/ui/chatArea/innerStyle.css @@ -50,7 +50,6 @@ div.button { margin-bottom: 0px; margin-left: 0px; color: #ffffff; - background-color: #6bc260; } div.red { diff --git a/ui/fileTransferInstance/acceptFileButton.png b/ui/fileTransferInstance/acceptFileButton.png new file mode 100644 index 000000000..a3d1f1c00 Binary files /dev/null and b/ui/fileTransferInstance/acceptFileButton.png differ diff --git a/ui/fileTransferInstance/emptyLGreenFileButton.png b/ui/fileTransferInstance/emptyLGreenFileButton.png new file mode 100644 index 000000000..9e0aa60b6 Binary files /dev/null and b/ui/fileTransferInstance/emptyLGreenFileButton.png differ diff --git a/ui/fileTransferInstance/emptyLRedFileButton.png b/ui/fileTransferInstance/emptyLRedFileButton.png new file mode 100644 index 000000000..946593dfc Binary files /dev/null and b/ui/fileTransferInstance/emptyLRedFileButton.png differ diff --git a/ui/fileTransferInstance/emptyRGreenFileButton.png b/ui/fileTransferInstance/emptyRGreenFileButton.png new file mode 100644 index 000000000..a4725df5a Binary files /dev/null and b/ui/fileTransferInstance/emptyRGreenFileButton.png differ diff --git a/ui/fileTransferInstance/emptyRRedFileButton.png b/ui/fileTransferInstance/emptyRRedFileButton.png new file mode 100644 index 000000000..92effd3ac Binary files /dev/null and b/ui/fileTransferInstance/emptyRRedFileButton.png differ diff --git a/ui/fileTransferInstance/pauseFileButton.png b/ui/fileTransferInstance/pauseFileButton.png new file mode 100644 index 000000000..144f763b3 Binary files /dev/null and b/ui/fileTransferInstance/pauseFileButton.png differ diff --git a/ui/fileTransferInstance/resumeFileButton.png b/ui/fileTransferInstance/resumeFileButton.png new file mode 100644 index 000000000..ec97328e9 Binary files /dev/null and b/ui/fileTransferInstance/resumeFileButton.png differ diff --git a/ui/fileTransferInstance/stopFileButton.png b/ui/fileTransferInstance/stopFileButton.png new file mode 100644 index 000000000..a8cca4dad Binary files /dev/null and b/ui/fileTransferInstance/stopFileButton.png differ