mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-27 21:15:19 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE fix text of log upload, do not open browser on screenshot upload

Browse Source
This commit is contained in:
Petr Mrázek 2016-11-26 14:37:36 +01:00
parent dd0c815396
commit dccf9d7219
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/GuiUtil.cpp
View File

@ -45,9 +45,7 @@ QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
setClipboardText(link); setClipboardText(link);
CustomMessageBox::selectable( CustomMessageBox::selectable(
parentWidget, QObject::tr("Upload finished"), parentWidget, QObject::tr("Upload finished"),
QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been opened in " QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been placed in your clipboard.").arg(link),
"the default "
"browser and placed in your clipboard.").arg(link),
QMessageBox::Information)->exec(); QMessageBox::Information)->exec();
return link; return link;
} }

12
application/pages/ScreenshotsPage.cpp
View File

@ -311,14 +311,12 @@ void ScreenshotsPage::on_uploadBtn_clicked()
auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id()); auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id());
QClipboard *clipboard = QApplication::clipboard(); QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(link); clipboard->setText(link);
DesktopServices::openUrl(link);
CustomMessageBox::selectable( CustomMessageBox::selectable(
this, tr("Upload finished"), this,
tr("The <a href=\"%1\">link to the uploaded album</a> has been opened in the " tr("Upload finished"),
"default browser and placed in your clipboard.<br/>Delete hash: %2 (save " tr("The <a href=\"%1\">link to the uploaded album</a> has been placed in your clipboard.") .arg(link),
"this if you want to be able to edit/delete the album)") QMessageBox::Information
.arg(link, imgurAlbum->deleteHash()), )->exec();
QMessageBox::Information)->exec();
} }
m_uploadActive = false; m_uploadActive = false;
} }