diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index cb2418149..8325dd17f 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -220,15 +220,17 @@ slideshowAPI: 2 # These options are to customize online uploading of logs to pastebins: -# - style : Defines the kind of pastebin service to be used. Takes -# string as input +# - style : Defines the kind of pastebin service to be used. ie it can +# provide the functionality of controlling privacy of +# paste (in future).Currently only "fiche" servers +# are supported. Takes string as input # - url : Defines the address of pastebin service to be used. # Takes string as input # - port : Defines the port number to be used to send logs. Takes # integer as input # - enable : Defines if the functionality is to be used or not. Takes # bool as input -logUpload.style : "fische" +logUpload.style : "fiche" logUpload.url : "termbin.com" logUpload.port : 9999 logUpload.enable : true diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 320dccc93..c08fd732e 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot * SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse) * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -513,9 +514,9 @@ Branding::initSimpleSettings( const YAML::Node& doc ) } m_logUploadEnable = doc[ "logUpload.enable" ].as< bool >( false ); - m_logUploadURL = getString( doc, "logUpload.url") ; + m_logUploadURL = getString( doc, "logUpload.url" ); m_logUploadPort = doc[ "logUpload.port" ].as< int >(); - m_logUploadStyle= getString(doc, "logUpload.style" ); + m_logUploadStyle = getString( doc, "logUpload.style" ); } void diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index f5c8fb78e..d273c81c6 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse) * SPDX-FileCopyrightText: 2019 Camilo Higuita + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -216,11 +217,11 @@ public: void setGlobals( GlobalStorage* globalStorage ) const; - //Paste functionality related - bool logUploadEnable() { return m_logUploadEnable; }; - QString logUploadURL() { return m_logUploadURL; }; - int logUploadPort() { return m_logUploadPort; }; - QString logUploadStyle() { return m_logUploadStyle; }; + //Paste functionality related + bool logUploadEnable() { return m_logUploadEnable; }; + QString logUploadURL() { return m_logUploadURL; }; + int logUploadPort() { return m_logUploadPort; }; + QString logUploadStyle() { return m_logUploadStyle; }; public slots: QString string( StringEntry stringEntry ) const; diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 770d79d89..5786c44a5 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -4,6 +4,7 @@ * SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot * SPDX-FileCopyrightText: 2019 Dominic Hayes * SPDX-FileCopyrightText: 2019 Gabriel Craciunescu + * SPDX-FileCopyrightText: 2021 Anubhav Choudhary * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -140,7 +141,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); // TODO: config var + bool shouldOfferWebPaste = Calamares::Branding::instance()->logUploadEnable(); cError() << "Installation failed:"; cDebug() << "- message:" << message; @@ -531,13 +532,9 @@ ViewManager::updateCancelEnabled( bool enabled ) } void -ViewManager::updateBackAndNextVisibility( bool visible) -{ - UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) -} +ViewManager::updateBackAndNextVisibility( bool visible ) { UPDATE_BUTTON_PROPERTY( backAndNextVisible, visible ) } -QVariant -ViewManager::data( const QModelIndex& index, int role ) const +QVariant ViewManager::data( const QModelIndex& index, int role ) const { if ( !index.isValid() ) {