Merge lp:~roadmr/checkbox/cdts-report-3-checkbox-gui-send-client-name-option into lp:checkbox

[Daniel Manrique]

  checkbox-gui: Added support for sending client-name as an option to exporters.

   checkbox-gui: Added support for client-name as an option to exporters.

    when saving both html and xml, the applicationName will be sent as an
    option to the exporters, to be used as the client-name that will appear
    in the reports.

    Note I didn't use the existing applicationName variable because it has
    special meaning to QML to configure storage paths, so it can't be just
    renamed (but also doesn't just work if used), so I simply copied the
    value on another variable.

[Zygmunt Krynicki (zyga)]

Looks good to me, thanks, +1

review: Approve

=== modified file 'checkbox-gui/checkbox-gui/main.cpp'
--- checkbox-gui/checkbox-gui/main.cpp	2014-03-19 13:48:36 +0000
+++ checkbox-gui/checkbox-gui/main.cpp	2014-04-01 23:41:12 +0000
@@ -54,6 +54,7 @@
 
     // Register the applicationName with the QML runtime
     viewer.rootContext()->setContextProperty("applicationName", applicationName);
+    viewer.rootContext()->setContextProperty("client_name", applicationName);
 
     // Register the GuiEngine with the QML runtime
     viewer.rootContext()->setContextProperty("guiEngine", &guiengine);
 
=== modified file 'checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml'
--- checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-03-20 11:17:53 +0000
+++ checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml	2014-04-01 23:41:12 +0000
@@ -90,11 +90,13 @@
         onClicked: {
             var submit_to = settings.value("transport/submit_to", "")
             var export_path = settings.value("exporter/xml_export_path", "")
+            var option_list = new Array("client-name=" + client_name);
 
             if (!export_path) {
                 export_path = guiEngine.GetSaveFileName();
             }
-            var success = guiEngine.GuiExportSessionToFileAsXML(export_path);
+            var success = guiEngine.GuiExportSessionToFileAsXML(export_path,
+                                                                option_list);
             if (submit_to == "certification") {
                 if (success) {
                     dialog.text = guiEngine.SendSubmissionViaCertificationTransport(export_path,
@@ -117,8 +119,10 @@
         onClicked: {
             onClicked:{
                 var mysavepath = '/tmp/report.html';
-                runmanagerview.reportIsSaved = guiEngine.GuiExportSessionToFileAsHTML(mysavepath);
-                Qt.openUrlExternally(mysavepath)
+                var option_list = new Array("client-name=" + client_name);
+                runmanagerview.reportIsSaved = guiEngine.GuiExportSessionToFileAsHTML(mysavepath,
+                                                                                      option_list);
+                Qt.openUrlExternally(mysavepath);
             }
         }
     }
 
=== modified file 'checkbox-gui/gui-engine/gui-engine.cpp'
--- checkbox-gui/gui-engine/gui-engine.cpp	2014-03-20 10:35:19 +0000
+++ checkbox-gui/gui-engine/gui-engine.cpp	2014-04-01 23:41:12 +0000
@@ -2009,10 +2009,10 @@
     return reply;
 }
 
-bool GuiEngine::GuiExportSessionToFileAsXML(const QString& output_file)
+bool GuiEngine::GuiExportSessionToFileAsXML(const QString& output_file,
+                                            const QStringList& option_list)
 {
     QString output_format = "xml";
-    QStringList options;    // No options
 
     // very basic argument checking
     if (output_file.isEmpty()) {
@@ -2020,15 +2020,15 @@
     }
 
     // FIXME - When we get a useful success/failure code here, return to caller
-    QString done = ExportSessionToFile(m_session,output_format,options,output_file);
+    QString done = ExportSessionToFile(m_session,output_format,option_list,output_file);
 
     return true;
 }
 
-bool GuiEngine::GuiExportSessionToFileAsHTML(const QString& output_file)
+bool GuiEngine::GuiExportSessionToFileAsHTML(const QString& output_file,
+                                             const QStringList& option_list)
 {
     QString output_format = "html";
-    QStringList options;    // No options
 
     // very basic argument checking
     if (output_file.isEmpty()) {
@@ -2036,7 +2036,7 @@
     }
 
     // FIXME - When we get a useful success/failure code here, return to caller
-    QString done = ExportSessionToFile(m_session,output_format,options,output_file);
+    QString done = ExportSessionToFile(m_session,output_format,option_list,output_file);
 
     return true;
 }
 
=== modified file 'checkbox-gui/gui-engine/gui-engine.h'
--- checkbox-gui/gui-engine/gui-engine.h	2014-03-20 10:35:19 +0000
+++ checkbox-gui/gui-engine/gui-engine.h	2014-04-01 23:41:12 +0000
@@ -163,8 +163,10 @@
         QString GuiExportSessionAsXML(void);
         QString GuiExportSessionAsHTML(void);
 
-        bool GuiExportSessionToFileAsXML(const QString& output_file);
-        bool GuiExportSessionToFileAsHTML(const QString& output_file);
+        bool GuiExportSessionToFileAsXML(const QString& output_file,
+                                         const QStringList& option_list);
+        bool GuiExportSessionToFileAsHTML(const QString& output_file,
+                                          const QStringList& option_list);
         
         const QString SendSubmissionViaCertificationTransport( \
                                      const QString &submission_path,