From 8ce16ad399dd36f280be820a63d20282a55fcaed Mon Sep 17 00:00:00 2001 From: Andrey S Date: Sat, 2 Jan 2016 00:00:05 +0300 Subject: [PATCH 1/2] Fixes #2484 - Error message inside the chat --- src/chatlog/content/filetransferwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index 8021ce0e6..b19e39ca7 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -22,6 +22,7 @@ #include "src/nexus.h" #include "src/core/core.h" +#include "src/widget/gui.h" #include "src/widget/style.h" #include "src/widget/widget.h" #include "src/persistence/settings.h" @@ -138,8 +139,7 @@ void FileTransferWidget::acceptTransfer(const QString &filepath) //test if writable if (!Nexus::tryRemoveFile(filepath)) { - QMessageBox::warning(this, - tr("Location not writable", "Title of permissions popup"), + GUI::showWarning( tr("Location not writable", "Title of permissions popup"), tr("You do not have permission to write that location. Choose another, or cancel the save dialog.", "text of permissions popup")); return; } From d69139bf4a7c1b2d8440edec519b0eb3f59883c0 Mon Sep 17 00:00:00 2001 From: Andrey S Date: Mon, 4 Jan 2016 14:02:37 +0300 Subject: [PATCH 2/2] Remove extra spaces --- src/chatlog/content/filetransferwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index b19e39ca7..d0b44c06c 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -139,8 +139,8 @@ void FileTransferWidget::acceptTransfer(const QString &filepath) //test if writable if (!Nexus::tryRemoveFile(filepath)) { - GUI::showWarning( tr("Location not writable", "Title of permissions popup"), - tr("You do not have permission to write that location. Choose another, or cancel the save dialog.", "text of permissions popup")); + GUI::showWarning(tr("Location not writable", "Title of permissions popup"), + tr("You do not have permission to write that location. Choose another, or cancel the save dialog.", "text of permissions popup")); return; }