diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp index 9260a8062..72916eb4d 100644 --- a/src/modules/users/CreateUserJob.cpp +++ b/src/modules/users/CreateUserJob.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,6 +52,20 @@ CreateUserJob::prettyName() const } +QString +CreateUserJob::prettyDescription() const +{ + return tr( "Create user %1." ).arg( m_userName ); +} + + +QString +CreateUserJob::prettyStatusMessage() const +{ + return tr( "Creating user %1." ).arg( m_userName ); +} + + Calamares::JobResult CreateUserJob::exec() { diff --git a/src/modules/users/CreateUserJob.h b/src/modules/users/CreateUserJob.h index eb0903007..fba187644 100644 --- a/src/modules/users/CreateUserJob.h +++ b/src/modules/users/CreateUserJob.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,6 +33,8 @@ public: const QString& userGroup, const QStringList& defaultGroups ); QString prettyName() const override; + QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; private: diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp index 9658b0fb5..20f6c09db 100644 --- a/src/modules/users/SetHostNameJob.cpp +++ b/src/modules/users/SetHostNameJob.cpp @@ -1,19 +1,20 @@ -/* - * Copyright (C) 2014 Rohan Garg +/* === This file is part of Calamares - === * - * This program 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. + * Copyright 2014, Rohan Garg + * Copyright 2015, Teo Mrnjavac * - * This program 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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 "SetHostNameJob.h" @@ -36,6 +37,20 @@ QString SetHostNameJob::prettyName() const return tr( "Set hostname %1" ).arg( m_hostname ); } + +QString +SetHostNameJob::prettyDescription() const +{ + return tr( "Set hostname %1." ).arg( m_hostname ); +} + + +QString +SetHostNameJob::prettyStatusMessage() const +{ + return tr( "Setting hostname %1." ).arg( m_hostname ); +} + Calamares::JobResult SetHostNameJob::exec() { Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); diff --git a/src/modules/users/SetHostNameJob.h b/src/modules/users/SetHostNameJob.h index 2f32063ff..ecd9d34af 100644 --- a/src/modules/users/SetHostNameJob.h +++ b/src/modules/users/SetHostNameJob.h @@ -1,19 +1,20 @@ -/* - * Copyright (C) 2014 Rohan Garg +/* === This file is part of Calamares - === * - * This program 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. + * Copyright 2014, Rohan Garg + * Copyright 2015, Teo Mrnjavac * - * This program 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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 SETHOSTNAMEJOB_CPP_H @@ -27,6 +28,8 @@ class SetHostNameJob : public Calamares::Job public: SetHostNameJob( const QString& hostname ); QString prettyName() const override; + QString prettyDescription() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; private: const QString m_hostname; diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp index 9ec9500fe..247f72b46 100644 --- a/src/modules/users/SetPasswordJob.cpp +++ b/src/modules/users/SetPasswordJob.cpp @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,6 +43,13 @@ SetPasswordJob::prettyName() const } +QString +SetPasswordJob::prettyStatusMessage() const +{ + return tr( "Setting password for user %1." ).arg( m_userName ); +} + + Calamares::JobResult SetPasswordJob::exec() { diff --git a/src/modules/users/SetPasswordJob.h b/src/modules/users/SetPasswordJob.h index be23d39ec..f8e0c2447 100644 --- a/src/modules/users/SetPasswordJob.h +++ b/src/modules/users/SetPasswordJob.h @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * Copyright 2014, Teo Mrnjavac + * Copyright 2014-2015, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ public: SetPasswordJob( const QString& userName, const QString& newPassword ); QString prettyName() const override; + QString prettyStatusMessage() const override; Calamares::JobResult exec() override; private: