From d934e6483190d7d173051380c62bc040911b42cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 7 Jul 2014 00:02:04 +0200 Subject: Tweak the response to successful uploads (screenshots, log pastes) The url will now be shown as link, put into the clipboard AND opened in a browser. At the same time. To avoid losing the URL. --- logic/net/PasteUpload.cpp | 5 ++--- logic/net/PasteUpload.h | 11 ++++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'logic') diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index ec0b2c60..ccd7dc48 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -77,9 +77,8 @@ bool PasteUpload::parseResult(QJsonDocument doc) QLOG_ERROR() << "paste.ee reported error:" << QString(object.value("error").toString()); return false; } - // FIXME: not the place for GUI things. - QString pasteUrl = object.value("paste").toObject().value("link").toString(); - QDesktopServices::openUrl(pasteUrl); + m_pasteLink = object.value("paste").toObject().value("link").toString(); + m_pasteID = object.value("paste").toObject().value("id").toString(); return true; } diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h index 55cfabf4..0ddc8cef 100644 --- a/logic/net/PasteUpload.h +++ b/logic/net/PasteUpload.h @@ -10,7 +10,14 @@ class PasteUpload : public Task public: PasteUpload(QWidget *window, QString text); virtual ~PasteUpload(){}; - + QString pasteLink() + { + return m_pasteLink; + } + QString pasteID() + { + return m_pasteID; + } protected: virtual void executeTask(); @@ -19,6 +26,8 @@ private: QString m_text; QString m_error; QWidget *m_window; + QString m_pasteID; + QString m_pasteLink; std::shared_ptr m_reply; public slots: -- cgit v1.2.3