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 branch 'pr1608'

Browse Source 
Closes #1539
This commit is contained in:
tux3 2015-05-10 12:59:33 +02:00
commit 73668c8cc4
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/chatlog/content/filetransferwidget.cpp
View File

@ -121,7 +121,7 @@ void FileTransferWidget::autoAcceptTransfer(const QString &path)
if (Nexus::tryRemoveFile(filepath)) if (Nexus::tryRemoveFile(filepath))
Core::getInstance()->acceptFileRecvRequest(fileInfo.friendId, fileInfo.fileNum, filepath); Core::getInstance()->acceptFileRecvRequest(fileInfo.friendId, fileInfo.fileNum, filepath);
else else
qDebug() << "Warning: Cannot write to " << filepath; qWarning() << "Warning: Cannot write to " << filepath;
} }
void FileTransferWidget::acceptTransfer(const QString &filepath) void FileTransferWidget::acceptTransfer(const QString &filepath)
@ -488,15 +488,16 @@ void FileTransferWidget::handleButton(QPushButton *btn)
void FileTransferWidget::showPreview(const QString &filename) void FileTransferWidget::showPreview(const QString &filename)
{ {
static const QStringList previewExtensions = { "png", "jpeg", "jpg", "gif" }; static const QStringList previewExtensions = { "png", "jpeg", "jpg", "gif", "PNG", "JPEG", "JPG", "GIF" };
if (previewExtensions.contains(QFileInfo(filename).suffix())) if (previewExtensions.contains(QFileInfo(filename).suffix()))
{ {
const int size = qMax(ui->previewLabel->width(), ui->previewLabel->height()); const int size = qMax(ui->previewLabel->width(), ui->previewLabel->height());
QPixmap pmap = QPixmap(filename).scaled(QSize(size, size), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); QPixmap pmap = QPixmap(filename).scaled(QSize(size, size), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
ui->previewLabel->setPixmap(pmap); ui->previewLabel->setPixmap(pmap);
ui->previewLabel->show(); ui->previewLabel->show();
ui->previewLabel->setCursor(Qt::PointingHandCursor);
// Show mouseover preview, but make sure it's not larger than 50% of the screen width/height // Show mouseover preview, but make sure it's not larger than 50% of the screen width/height
QRect desktopSize = QApplication::desktop()->screenGeometry(); QRect desktopSize = QApplication::desktop()->screenGeometry();
QImage image = QImage(filename).scaled(0.5*desktopSize.width(), 0.5*desktopSize.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation); QImage image = QImage(filename).scaled(0.5*desktopSize.width(), 0.5*desktopSize.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);