From 2b12bd82e41e23a26a99d8afbd4918409469c27f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 29 Apr 2019 10:38:25 -0400 Subject: [PATCH] [oemid] Stub of a Job - Create job, run it, and just debug-log what it should do. --- src/modules/oemid/CMakeLists.txt | 1 + src/modules/oemid/IDJob.cpp | 38 ++++++++++++++++++++++++++++++ src/modules/oemid/IDJob.h | 39 +++++++++++++++++++++++++++++++ src/modules/oemid/OEMViewStep.cpp | 4 +++- 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/modules/oemid/IDJob.cpp create mode 100644 src/modules/oemid/IDJob.h diff --git a/src/modules/oemid/CMakeLists.txt b/src/modules/oemid/CMakeLists.txt index a2c807a60..0c4ad03ad 100644 --- a/src/modules/oemid/CMakeLists.txt +++ b/src/modules/oemid/CMakeLists.txt @@ -2,6 +2,7 @@ calamares_add_plugin( oemid TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES + IDJob.cpp OEMViewStep.cpp UI OEMPage.ui diff --git a/src/modules/oemid/IDJob.cpp b/src/modules/oemid/IDJob.cpp new file mode 100644 index 000000000..db62b39c5 --- /dev/null +++ b/src/modules/oemid/IDJob.cpp @@ -0,0 +1,38 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, Adriaan de Groot + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#include "IDJob.h" + +#include "utils/Logger.h" + +IDJob::IDJob(const QString& id, QObject* parent) + : Job( parent ) + , m_batchIdentifier( id ) +{ +} + +QString IDJob::prettyName() const +{ + return tr( "OEM Batch Identifier" ); +} + +Calamares::JobResult IDJob::exec() +{ + cDebug() << "Setting OEM Batch ID to" << m_batchIdentifier; + return Calamares::JobResult::ok(); +} diff --git a/src/modules/oemid/IDJob.h b/src/modules/oemid/IDJob.h new file mode 100644 index 000000000..0f563837e --- /dev/null +++ b/src/modules/oemid/IDJob.h @@ -0,0 +1,39 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, Adriaan de Groot + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#ifndef IDJOB_H +#define IDJOB_H + +#include "Job.h" + +#include + +class IDJob : public Calamares::Job +{ +public: + explicit IDJob( const QString& id, QObject* parent = nullptr ); + + virtual QString prettyName() const override; + virtual Calamares::JobResult exec() override; + +private: + QString m_batchIdentifier; +} ; + + +#endif diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index 5f3d81d69..0f076927b 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -20,6 +20,8 @@ #include "ui_OEMPage.h" +#include "IDJob.h" + #include "utils/Retranslator.h" #include "utils/Variant.h" @@ -128,7 +130,7 @@ QWidget * OEMViewStep::widget() Calamares::JobList OEMViewStep::jobs() const { - return Calamares::JobList(); + return Calamares::JobList() << Calamares::job_ptr( new IDJob( m_user_batchIdentifier ) ); } void OEMViewStep::setConfigurationMap(const QVariantMap& configurationMap)