GUI: small reorganization in report message dialog

2 files changed, 15 insertions, 23 deletions

diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index c85a329..7722fcc 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -298,6 +298,8 @@ string CTicketUploader::Report(const map_crash_data_t& pCrashData,
         msg += "Please copy this into ticket: ";
         msg += ticket_name;
         msg += '\n';
+        msg += "========cut here=========";
+        msg += '\n';
     }
     else
     {
@@ -321,35 +323,25 @@ string CTicketUploader::Report(const map_crash_data_t& pCrashData,
     }
     msg += "FILE: ";
     msg += outfile_basename;
-    msg += "\nMD5SUM:\n";
+    msg += "\nMD5SUM:";
     msg += md5sum;
+    msg += '\n';
     if (do_encrypt)
     {
         msg += "KEY: aes-128-cbc\n";
         msg += key;
+        msg += '\n';
     }
-    msg += "END:\n";
+    msg += "==========end===========\n";
 
     // warn the client (why _warn_? it's not an error, maybe update_client?):
-    error_msg("%s", msg.c_str());
-
-    string ret;
-    if (do_upload)
-    {
-        ret = _("report sent to ") + upload_url + '/' + outfile_basename;
-        update_client("%s", ret.c_str());
-    }
-    else
-    {
-        ret = _("report copied to /tmp/") + outfile_basename;
-        update_client("%s", ret.c_str());
-    }
-
+    //error_msg("%s", msg.c_str());
+    
     // delete the temporary directory
     cmd = ssprintf("rm -rf %s", tmpdir_name);
     RunCommand(cmd.c_str());
 
-    return ret;
+    return msg;
 }
 
 static bool is_string_safe(const char *str)
diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py
index e226021..708a151 100644
--- a/src/Gui/CC_gui_functions.py
+++ b/src/Gui/CC_gui_functions.py
@@ -43,18 +43,18 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
     message = ""
     status_vbox = gtk.VBox()
     for plugin, res in report_status_dict.iteritems():
-        status_hbox = gtk.HBox()
-        plugin_label = Label()
+        plugin_status_vbox = gtk.VBox()
+        plugin_label = gtk.Label()
         plugin_label.set_markup("<b>%s</b>: " % plugin)
         plugin_label.set_justify(gtk.JUSTIFY_RIGHT)
         plugin_label.set_alignment(0, 0)
-        status_label = Label()
+        status_label = gtk.Label()
         status_label.set_max_width_chars(MAX_WIDTH)
         status_label.set_selectable(True)
         status_label.set_line_wrap(True)
         status_label.set_alignment(0, 0)
-        status_hbox.pack_start(plugin_label, expand=False)
-        status_hbox.pack_start(status_label, expand=False)
+        plugin_status_vbox.pack_start(plugin_label, expand=False)
+        plugin_status_vbox.pack_start(status_label, expand=False)
         # 0 means not succesfull
         #if report_status_dict[plugin][0] == '0':
         # this first one is actually a fallback to set at least
@@ -73,7 +73,7 @@ def gui_report_dialog ( report_status_dict, parent_dialog,
                 status_label.set_text("%s" % report_status_dict[plugin][1])
         if len(report_status_dict[plugin][1]) > MAX_WIDTH:
             status_label.set_tooltip_text(report_status_dict[plugin][1])
-        status_vbox.pack_start(status_hbox, expand=False)
+        status_vbox.pack_start(plugin_status_vbox, expand=False)
     main_hbox.pack_start(status_vbox)
 
     if widget != None: