From 08249af7168e531579a66cd0d98238a6977da031 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:07:15 +0100 Subject: [PATCH 1/9] Add 'dont-cancel' to settings.conf --- settings.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/settings.conf b/settings.conf index 8135ef3db..bd0d307bd 100644 --- a/settings.conf +++ b/settings.conf @@ -163,3 +163,8 @@ dont-chroot: false # # YAML: boolean. disable-cancel: false + +# If this is set to true, the "Cancel" button will be disabled once +# you start the 'Installation', meaning there won't be a way to cancel +# the Installation until it has finished or installation has failed. +dont-cancel: false From 02d6e1a94659dba08a8dcbdaba897046eeb45ca8 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:11:39 +0100 Subject: [PATCH 2/9] Update Settings.cpp --- src/libcalamares/Settings.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 710846a2c..fc83ce8a3 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -185,6 +185,7 @@ Settings::Settings( const QString& settingsFilePath, , m_doChroot( true ) , m_promptInstall( false ) , m_disableCancel( false ) + , m_dontCancel( false ) { cDebug() << "Using Calamares settings file at" << settingsFilePath; QFile file( settingsFilePath ); @@ -206,6 +207,7 @@ Settings::Settings( const QString& settingsFilePath, m_doChroot = !requireBool( config, "dont-chroot", false ); m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_disableCancel = requireBool( config, "disable-cancel", false ); + m_dontCancel = requireBool( config, "dont-cancel", false ); } catch ( YAML::Exception& e ) { @@ -273,6 +275,12 @@ Settings::disableCancel() const { return m_disableCancel; } + +bool +Settings::dontCancel() const +{ + return m_dontCancel; +} } From d31f2d2116be2174236a23bfeed86b27d9cb05a9 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:12:14 +0100 Subject: [PATCH 3/9] Update Settings.cpp --- src/libcalamares/Settings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index fc83ce8a3..6ddd12df6 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -1,5 +1,6 @@ /* === This file is part of Calamares - === * + * Copyright 2019, Dominic Hayes * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * From 6d6c152f70f9f37fc2b521523a2169c334de6dd1 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:14:55 +0100 Subject: [PATCH 4/9] Update Settings.cpp --- src/libcalamares/Settings.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index 6ddd12df6..eba67de89 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2019, Dominic Hayes + * Copyright 2019, abucodonosor * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * From 700e6f0ec69cffe86a89a41d0c963d904278e61b Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:17:39 +0100 Subject: [PATCH 5/9] Update Settings.h --- src/libcalamares/Settings.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 0c0f0aa91..648017430 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -1,5 +1,7 @@ /* === This file is part of Calamares - === * + * Copyright 2019, Dominic Hayes + * Copyright 2019, abucodonosor * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * @@ -68,6 +70,8 @@ public: bool isSetupMode() const { return m_isSetupMode; } bool disableCancel() const; + + bool dontCancel() const; private: static Settings* s_instance; @@ -84,6 +88,7 @@ private: bool m_isSetupMode; bool m_promptInstall; bool m_disableCancel; + bool m_dontCancel; }; } From 825c92582ae00973396aa45b3469da8d9d0e9331 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 17:20:39 +0100 Subject: [PATCH 6/9] Update ViewManager.cpp --- src/libcalamaresui/ViewManager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index f9a7c9e06..e587deed9 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -1,5 +1,7 @@ /* === This file is part of Calamares - === * + * Copyright 2019, Dominic Hayes + * Copyright 2019, abucodonosor * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * @@ -281,6 +283,8 @@ ViewManager::next() { m_back->setEnabled( false ); m_next->setEnabled( false ); + if (Calamares::Settings::instance()->dontCancel()) + m_quit->setEnabled( false ); } } else From 455505ba782973b0dd060b43ec6928a27a0bca86 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 18:27:03 +0100 Subject: [PATCH 7/9] Update copyright header --- src/libcalamares/Settings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp index eba67de89..4053c0ef4 100644 --- a/src/libcalamares/Settings.cpp +++ b/src/libcalamares/Settings.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2019, Dominic Hayes - * Copyright 2019, abucodonosor + * Copyright 2019, Gabriel Craciunescu * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * From 9cafd0a495ef02ff3a710e4828e7dce296f1061e Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 18:27:30 +0100 Subject: [PATCH 8/9] Update copyright headers --- src/libcalamares/Settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamares/Settings.h b/src/libcalamares/Settings.h index 648017430..75c7886c9 100644 --- a/src/libcalamares/Settings.h +++ b/src/libcalamares/Settings.h @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2019, Dominic Hayes - * Copyright 2019, abucodonosor + * Copyright 2019, Gabriel Craciunescu * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot * From a7ac046b3d6d27fb97195f3c535ccf2451bc912a Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Tue, 16 Apr 2019 18:27:51 +0100 Subject: [PATCH 9/9] Update copyright headers --- src/libcalamaresui/ViewManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index e587deed9..655e581ea 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -1,7 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2019, Dominic Hayes - * Copyright 2019, abucodonosor + * Copyright 2019, Gabriel Craciunescu * Copyright 2014-2015, Teo Mrnjavac * Copyright 2017-2018, Adriaan de Groot *