From 186c065b4cba56359e0b938208e2ab08834a0806 Mon Sep 17 00:00:00 2001 From: Anubhav Choudhary Date: Sat, 23 Jan 2021 22:49:23 +0530 Subject: [PATCH] PasteURL sent to clipboard --- src/libcalamaresui/utils/Paste.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 8099d9024..a48a7c097 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include namespace CalamaresUtils { @@ -22,7 +24,8 @@ namespace CalamaresUtils QString sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort ) { - QString pasteUrlFmt = parent->tr( "Install log posted to:\n%1" ); + QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" ); + QFile pasteSourceFile( Logger::logFile() ); if ( !pasteSourceFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) { @@ -78,6 +81,14 @@ sendLogToPastebin( QObject* parent, const QString& ficheHost, quint16 fichePort QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr ); + QClipboard* clipboard = QApplication::clipboard(); + clipboard->setText(pasteUrlStr, QClipboard::Clipboard); + + if (clipboard->supportsSelection()) + { + clipboard->setText(pasteUrlStr, QClipboard::Selection); + } + if ( nBytesRead < 8 || !pasteUrl.isValid() || !pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) { cError() << "No data from paste server";