From dccf9d7219282725967c2305502d7ff98e8cbc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 26 Nov 2016 14:37:36 +0100 Subject: NOISSUE fix text of log upload, do not open browser on screenshot upload --- application/GuiUtil.cpp | 4 +--- application/pages/ScreenshotsPage.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/application/GuiUtil.cpp b/application/GuiUtil.cpp index 5f5f694b..054fc0be 100644 --- a/application/GuiUtil.cpp +++ b/application/GuiUtil.cpp @@ -45,9 +45,7 @@ QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget) setClipboardText(link); CustomMessageBox::selectable( parentWidget, QObject::tr("Upload finished"), - QObject::tr("The link to the uploaded log has been opened in " - "the default " - "browser and placed in your clipboard.").arg(link), + QObject::tr("The link to the uploaded log has been placed in your clipboard.").arg(link), QMessageBox::Information)->exec(); return link; } diff --git a/application/pages/ScreenshotsPage.cpp b/application/pages/ScreenshotsPage.cpp index d58a5d63..a4ee6f9d 100644 --- a/application/pages/ScreenshotsPage.cpp +++ b/application/pages/ScreenshotsPage.cpp @@ -311,14 +311,12 @@ void ScreenshotsPage::on_uploadBtn_clicked() auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id()); QClipboard *clipboard = QApplication::clipboard(); clipboard->setText(link); - DesktopServices::openUrl(link); CustomMessageBox::selectable( - this, tr("Upload finished"), - tr("The link to the uploaded album has been opened in the " - "default browser and placed in your clipboard.
Delete hash: %2 (save " - "this if you want to be able to edit/delete the album)") - .arg(link, imgurAlbum->deleteHash()), - QMessageBox::Information)->exec(); + this, + tr("Upload finished"), + tr("The link to the uploaded album has been placed in your clipboard.") .arg(link), + QMessageBox::Information + )->exec(); } m_uploadActive = false; } -- cgit v1.2.3