StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #430 from apprb/ftrans

Browse Source 
FileTransferWidget improvements
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-13 20:07:49 +02:00
commit a8ca4aeadb
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/filetransferinstance.cpp
View File

@ -24,7 +24,7 @@
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#define CONTENT_WIDTH 250 #define MAX_CONTENT_WIDTH 250
#define MAX_PREVIEW_SIZE 25*1024*1024 #define MAX_PREVIEW_SIZE 25*1024*1024
uint FileTransferInstance::Idconter = 0; uint FileTransferInstance::Idconter = 0;
@ -43,9 +43,10 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
// update this whenever you change the font in innerStyle.css // update this whenever you change the font in innerStyle.css
QFontMetrics fm(Style::getFont(Style::Small)); QFontMetrics fm(Style::getFont(Style::Small));
filenameElided = fm.elidedText(filename, Qt::ElideRight, CONTENT_WIDTH); filenameElided = fm.elidedText(filename, Qt::ElideRight, MAX_CONTENT_WIDTH);
size = getHumanReadableSize(File.filesize); size = getHumanReadableSize(File.filesize);
contentPrefWidth = std::max(fm.width(filenameElided), fm.width(size));
speed = "0B/s"; speed = "0B/s";
eta = "00:00"; eta = "00:00";
@ -57,7 +58,7 @@ FileTransferInstance::FileTransferInstance(ToxFile File)
File.file->seek(0); File.file->seek(0);
if (preview.loadFromData(File.file->readAll())) if (preview.loadFromData(File.file->readAll()))
{ {
pic = preview.scaledToHeight(50); pic = preview.scaled(100, 50, Qt::KeepAspectRatio, Qt::SmoothTransformation);
} }
} }
File.file->seek(0); File.file->seek(0);
@ -127,7 +128,7 @@ void FileTransferInstance::onFileTransferFinished(ToxFile File)
{ {
if (preview.loadFromData(previewFile.readAll())) if (preview.loadFromData(previewFile.readAll()))
{ {
pic = preview.scaledToHeight(50); pic = preview.scaled(100, 50, Qt::KeepAspectRatio, Qt::SmoothTransformation);
} }
previewFile.close(); previewFile.close();
} }
@ -377,7 +378,8 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage
QString imgBstr = "<img src=\"data:ftrans." + widgetId + ".btnB/png;base64," + QImage2base64(imgB) + "\">"; QString imgBstr = "<img src=\"data:ftrans." + widgetId + ".btnB/png;base64," + QImage2base64(imgB) + "\">";
QString content; QString content;
QString progrBar = "<img src=\"data:progressbar." + widgetId + "/png;base64," + QImage2base64(drawProgressBarImg(double(lastBytesSent)/totalBytes, CONTENT_WIDTH, 9)) + "\">"; QString progrBar = "<img src=\"data:progressbar." + widgetId + "/png;base64," +
QImage2base64(drawProgressBarImg(double(lastBytesSent)/totalBytes, MAX_CONTENT_WIDTH, 9)) + "\">";
content = "<p>" + filenameElided + "</p>"; content = "<p>" + filenameElided + "</p>";
content += "<table cellspacing=\"0\"><tr>"; content += "<table cellspacing=\"0\"><tr>";
@ -421,11 +423,14 @@ QString FileTransferInstance::wrapIntoForm(const QString& content, const QString
res += "<div class=button>" + imgLeftA + "<br>" + imgLeftB + "</div>\n"; res += "<div class=button>" + imgLeftA + "<br>" + imgLeftB + "</div>\n";
res += "</td>\n"; res += "</td>\n";
res += insertMiniature(type); res += insertMiniature(type);
res += "<td width=" + QString::number(CONTENT_WIDTH + 30) + ">\n"; res += "<td width=" + QString::number(contentPrefWidth) + ">\n";
res += "<div class=" + type + ">"; res += "<div class=" + type + ">";
res += content; res += content;
res += "</div>\n"; res += "</div>\n";
res += "</td>\n"; res += "</td>\n";
res += "<td width=3>\n";
res += "<div class=" + type + "></div>\n";
res += "</td>\n";
res += "<td>\n"; res += "<td>\n";
res += "<div class=button>" + imgAstr + "<br>" + imgBstr + "</div>\n"; res += "<div class=button>" + imgAstr + "<br>" + imgBstr + "</div>\n";
res += "</td>\n"; res += "</td>\n";

1
src/filetransferinstance.h
View File

@ -78,6 +78,7 @@ private:
long long lastBytesSent, totalBytes; long long lastBytesSent, totalBytes;
int fileNum; int fileNum;
int friendId; int friendId;
int contentPrefWidth;
QString savePath; QString savePath;
ToxFile::FileDirection direction; ToxFile::FileDirection direction;
QString stopFileButtonStylesheet, pauseFileButtonStylesheet, acceptFileButtonStylesheet; QString stopFileButtonStylesheet, pauseFileButtonStylesheet, acceptFileButtonStylesheet;

6
ui/chatArea/innerStyle.css
View File

@ -41,7 +41,7 @@ div.green {
margin-top: 12px; margin-top: 12px;
margin-bottom: 12px; margin-bottom: 12px;
margin-left: 0px; margin-left: 0px;
margin-right: 12px; margin-right: 0px;
color: @white; color: @white;
background-color: @green; background-color: @green;
font: @small; font: @small;
@ -51,7 +51,7 @@ div.silver {
margin-top: 12px; margin-top: 12px;
margin-bottom: 12px; margin-bottom: 12px;
margin-left: 0px; margin-left: 0px;
margin-right: 12px; margin-right: 0px;
color: @black; color: @black;
background-color: @lightGrey; background-color: @lightGrey;
font: @small; font: @small;
@ -61,7 +61,7 @@ div.red {
margin-top: 12px; margin-top: 12px;
margin-bottom: 12px; margin-bottom: 12px;
margin-left: 0px; margin-left: 0px;
margin-right: 12px; margin-right: 0px;
color: @white; color: @white;
background-color: @red; background-color: @red;
font: @small; font: @small;