napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code-formatted and Copyright-text added

Browse Source
This commit is contained in:
Anubhav Choudhary 2021-01-23 21:16:32 +05:30
parent ff66e4b3d5
commit a2c930a714
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/branding/default/branding.desc
View File

@ -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

5
src/libcalamaresui/Branding.cpp
View File

@ -4,6 +4,7 @@
* SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse)
* SPDX-FileCopyrightText: 2019 Camilo Higuita <milo.h@aol.com>
* SPDX-FileCopyrightText: 2021 Anubhav Choudhary <ac.10edu@gmail.com>
* 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

11
src/libcalamaresui/Branding.h
View File

@ -4,6 +4,7 @@
* SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2018 Raul Rodrigo Segura (raurodse)
* SPDX-FileCopyrightText: 2019 Camilo Higuita <milo.h@aol.com>
* SPDX-FileCopyrightText: 2021 Anubhav Choudhary <ac.10edu@gmail.com>
* 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;

11
src/libcalamaresui/ViewManager.cpp
View File

@ -4,6 +4,7 @@
* SPDX-FileCopyrightText: 2017-2018 Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2019 Dominic Hayes <ferenosdev@outlook.com>
* SPDX-FileCopyrightText: 2019 Gabriel Craciunescu <crazy@frugalware.org>
* SPDX-FileCopyrightText: 2021 Anubhav Choudhary <ac.10edu@gmail.com>
* 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() )
{