applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcalamaresui: rename and document pastebin method

Browse source
This commit is contained in:
Adriaan de Groot 2019-07-30 15:46:37 +02:00
parent 2aae30f517
commit 566be48f16
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcalamaresui/ViewManager.cpp
View file

@ -245,7 +245,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole )
{ {
// TODO: host and port should be configurable // TODO: host and port should be configurable
QString pasteUrlMsg = CalamaresUtils::pastebin( msgBox, QStringLiteral( "termbin.com" ), 9999 ); QString pasteUrlMsg = CalamaresUtils::sendLogToPastebin( msgBox, QStringLiteral( "termbin.com" ), 9999 );
QString pasteUrlTitle = tr( "Install Log Paste URL" ); QString pasteUrlTitle = tr( "Install Log Paste URL" );
if ( pasteUrlMsg.isEmpty() ) if ( pasteUrlMsg.isEmpty() )
@ -253,6 +253,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
pasteUrlMsg = tr( "The upload was unsuccessful. No web-paste was done." ); pasteUrlMsg = tr( "The upload was unsuccessful. No web-paste was done." );
} }
// TODO: make the URL clickable, or copy it to the clipboard automatically
QMessageBox::critical(nullptr, QMessageBox::critical(nullptr,
pasteUrlTitle, pasteUrlTitle,
pasteUrlMsg); pasteUrlMsg);

2
src/libcalamaresui/utils/Paste.cpp
View file

@ -29,7 +29,7 @@ namespace CalamaresUtils
{ {
QString QString
pastebin( QObject* parent, const QString& ficheHost, int fichePort ) sendLogToPastebin( QObject* parent, const QString& ficheHost, int fichePort )
{ {
QString pasteUrlFmt = parent->tr( "Install log posted to:\n%1" ); QString pasteUrlFmt = parent->tr( "Install log posted to:\n%1" );
QFile pasteSourceFile( Logger::logFile() ); QFile pasteSourceFile( Logger::logFile() );

10
src/libcalamaresui/utils/Paste.h
View file

@ -24,7 +24,13 @@ class QString;
namespace CalamaresUtils namespace CalamaresUtils
{ {
QString pastebin( QObject* parent, const QString& ficheHost, int fichePort );
} /** @brief Send the current log file to a pastebin
*
* Returns the (string) URL that the pastebin gives us.
*/
QString sendLogToPastebin( QObject* parent, const QString& ficheHost, int fichePort );
} // namespace CalamaresUtils
#endif #endif