[finished] Allow positive and negative notifications at end.

src/modules/finished/Config.cpp

@@ -94,25 +94,41 @@ Config::doRestart()
 
 
 void
-Config::doNotify()
+Config::doNotify( bool hasFailed )
 {
     QDBusInterface notify(
         "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications" );
     if ( notify.isValid() )
     {
+        cDebug() << "Sending notification of completion. Failed?" << hasFailed;
+
+        QString title;
+        QString message;
+        if ( hasFailed )
+        {
+            title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" );
+            message = Calamares::Settings::instance()->isSetupMode()
+                ? tr( "The setup of %1 did not complete successfully." )
+                : tr( "The installation of %1 did not complete successfully." );
+        }
+        else
+        {
+            title = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" )
+                                                                   : tr( "Installation Complete" );
+            message = Calamares::Settings::instance()->isSetupMode() ? tr( "The setup of %1 is complete." )
+                                                                     : tr( "The installation of %1 is complete." );
+        }
+
         const auto* branding = Calamares::Branding::instance();
-        QDBusReply< uint > r = notify.call(
+        QDBusReply< uint > r = notify.call( "Notify",
-            "Notify",
+                                            QString( "Calamares" ),
-            QString( "Calamares" ),
+                                            QVariant( 0U ),
-            QVariant( 0U ),
+                                            QString( "calamares" ),
-            QString( "calamares" ),
+                                            title,
-            Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Complete" ) : tr( "Installation Complete" ),
+                                            message.arg( branding->versionedName() ),
-            Calamares::Settings::instance()->isSetupMode()
+                                            QStringList(),
-                ? tr( "The setup of %1 is complete." ).arg( branding->versionedName() )
+                                            QVariantMap(),
-                : tr( "The installation of %1 is complete." ).arg( branding->versionedName() ),
+                                            QVariant( 0 ) );
-            QStringList(),
-            QVariantMap(),
-            QVariant( 0 ) );
         if ( !r.isValid() )
         {
             cWarning() << "Could not call org.freedesktop.Notifications.Notify at end of installation." << r.error();

src/modules/finished/Config.h

@@ -62,10 +62,8 @@ public slots:
      *
      * At the end of installation (when the FinishedViewStep is activated),
      * send a desktop notification via DBus that the install is done.
-     * If the installation failed, don't call this method because
-     * the notification is a positive one.
      */
-    void doNotify();
+    void doNotify( bool hasFailed = false );
 
 signals:
     void restartModeChanged( RestartMode m );