From b5972e15509f5ede46251b51645ea8e6140c6051 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sat, 16 Dec 2017 03:01:09 -0500
Subject: add bug report notice to fail messagebox

---
 mk                                         | 12 ++++++------
 src/libcalamaresui/ViewManager.cpp         | 19 +++++++++++++++++++
 src/modules/pacstrap-gui/pacstrap-gui.conf |  2 ++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/mk b/mk
index 05739bc97..48e0295ae 100755
--- a/mk
+++ b/mk
@@ -41,12 +41,12 @@ fi
 
 print "\n--- running cmake ---\n"
 cd ./build
-cmake -DCMAKE_BUILD_TYPE=Debug                                                       \
-      -DCMAKE_INSTALL_PREFIX=/usr                                                    \
-      -DCMAKE_INSTALL_LIBDIR=lib                                                     \
-      -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython         \
-                      dummypythonqt grubcfg initramfs initramfscfg tracking          \
-                      interactiveterminal license plymouthcfg removeuser webview" ..
+cmake -DCMAKE_BUILD_TYPE=Debug                                                 \
+      -DCMAKE_INSTALL_PREFIX=/usr                                              \
+      -DCMAKE_INSTALL_LIBDIR=lib                                               \
+      -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython   \
+                      dummypythonqt initramfs initramfscfg interactiveterminal \
+                      license plymouthcfg removeuser tracking webview"           ..
 
 
 if [ -d /usr/share/calamares/ -o -f /usr/bin/calamares ]
diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 7b5df155b..a4b628d0c 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -29,6 +29,7 @@
 
 #include <QApplication>
 #include <QBoxLayout>
+#include <QFile>
 #include <QMessageBox>
 #include <QMetaObject>
 
@@ -187,6 +188,24 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
         text += "<p>" + details + "</p>";
     msgBox->setInformativeText( text );
 
+    // parabola ISO bug report notice
+    if (QFile::exists("/home/parabola/Desktop/parabola-installer.desktop"))
+    {
+        QFile::copy(Logger::logFile(), "/home/parabola/Desktop/install.log");
+
+        text = "A file named 'install.log' has been placed on the desktop which could be ";
+        text += "useful in diagnosing the cause of this failure. The \"Report Bug\" ";
+        text += "button below will send the 'install.log' to Parabola anonymously.";
+        text += "If you would like to receive email regarding this issue, then you can ";
+        text += "open a bug report manually using your Parabola Bug Tracker account ";
+        text += "(the 'Report a Bug' desktop shortcut). Please note the 'Reason' given ";
+        text += "below and attach the 'install.log' file to the bug report.";
+        text += "<p>Reason:<br />" + message + "</p>";
+        if ( !details.isEmpty() )
+            text += "<p>Details:<br />" + details + "</p>";
+        msgBox->setInformativeText( text );
+    }
+
     connect( msgBox, &QMessageBox::buttonClicked, qApp, &QApplication::quit );
     cLog() << "Calamares will quit when the dialog closes.";
     msgBox->show();
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.conf b/src/modules/pacstrap-gui/pacstrap-gui.conf
index 07f1f98da..62f09a8ac 100644
--- a/src/modules/pacstrap-gui/pacstrap-gui.conf
+++ b/src/modules/pacstrap-gui/pacstrap-gui.conf
@@ -34,6 +34,8 @@ look-and-feel:
 utilities:
   - "dmidecode"
   - "gvfs"
+  - "gxmessage"
+  - "wbar"
 
 x-server:
   - "ttf-dejavu"
-- 
cgit v1.2.2