summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-11-26 14:37:36 +0100
committerPetr Mrázek <peterix@gmail.com>2016-11-26 14:37:36 +0100
commitdccf9d7219282725967c2305502d7ff98e8cbc62 (patch)
tree039c8fd199ddad16cb85ad74e2ca967421d87425
parentdd0c8153969cde2157828d4fc1f5fc89c698d1e5 (diff)
downloadMultiMC-dccf9d7219282725967c2305502d7ff98e8cbc62.tar
MultiMC-dccf9d7219282725967c2305502d7ff98e8cbc62.tar.gz
MultiMC-dccf9d7219282725967c2305502d7ff98e8cbc62.tar.lz
MultiMC-dccf9d7219282725967c2305502d7ff98e8cbc62.tar.xz
MultiMC-dccf9d7219282725967c2305502d7ff98e8cbc62.zip
NOISSUE fix text of log upload, do not open browser on screenshot upload
-rw-r--r--application/GuiUtil.cpp4
-rw-r--r--application/pages/ScreenshotsPage.cpp12
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 <a href=\"%1\">link to the uploaded log</a> has been opened in "
- "the default "
- "browser and placed in your clipboard.").arg(link),
+ QObject::tr("The <a href=\"%1\">link to the uploaded log</a> 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 <a href=\"%1\">link to the uploaded album</a> has been opened in the "
- "default browser and placed in your clipboard.<br/>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 <a href=\"%1\">link to the uploaded album</a> has been placed in your clipboard.") .arg(link),
+ QMessageBox::Information
+ )->exec();
}
m_uploadActive = false;
}