Update pretty{Description,StatusMessage} for users module jobs.

src/modules/users/CreateUserJob.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   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 <strong>%1</strong>." ).arg( m_userName );
+}
+
+
+QString
+CreateUserJob::prettyStatusMessage() const
+{
+    return tr( "Creating user %1." ).arg( m_userName );
+}
+
+
 Calamares::JobResult
 CreateUserJob::exec()
 {

src/modules/users/CreateUserJob.h

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   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:

src/modules/users/SetHostNameJob.cpp

@@ -1,19 +1,20 @@
-/*
+/* === This file is part of Calamares - <http://github.com/calamares> ===
- * Copyright (C) 2014  Rohan Garg <rohan@kde.org>
  *
- * This program is free software: you can redistribute it and/or modify
+ *   Copyright 2014, Rohan Garg <rohan@kde.org>
- * it under the terms of the GNU General Public License as published by
+ *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ *   Calamares is free software: you can redistribute it and/or modify
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   it under the terms of the GNU General Public License as published by
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   the Free Software Foundation, either version 3 of the License, or
- * GNU General Public License for more details.
+ *   (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License
+ *   Calamares is distributed in the hope that it will be useful,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
  */
 
 #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 <strong>%1</strong>." ).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();

src/modules/users/SetHostNameJob.h

@@ -1,19 +1,20 @@
-/*
+/* === This file is part of Calamares - <http://github.com/calamares> ===
- * Copyright (C) 2014  Rohan Garg <rohan@kde.org>
  *
- * This program is free software: you can redistribute it and/or modify
+ *   Copyright 2014, Rohan Garg <rohan@kde.org>
- * it under the terms of the GNU General Public License as published by
+ *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ *   Calamares is free software: you can redistribute it and/or modify
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   it under the terms of the GNU General Public License as published by
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   the Free Software Foundation, either version 3 of the License, or
- * GNU General Public License for more details.
+ *   (at your option) any later version.
  *
- * You should have received a copy of the GNU General Public License
+ *   Calamares is distributed in the hope that it will be useful,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
  */
 
 #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;

src/modules/users/SetPasswordJob.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   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()
 {

src/modules/users/SetPasswordJob.h

@@ -1,6 +1,6 @@
 /* === This file is part of Calamares - <http://github.com/calamares> ===
  *
- *   Copyright 2014, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
  *
  *   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: