Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

3 files changed, 98 insertions, 80 deletions

diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index a8101d4..f67cd06 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -233,12 +233,14 @@ class MainWindow():
             report_label = _("<b>This crash has been reported:</b>\n")
             # plugin message follows, but at least in case of kerneloops,
             # it is not informative (no URL to the report)
-            for message in dump.getMessage().split('\n'):
-                if message:
-                    #Doesn't work (far too easy to make it worse, not better):
-                    #if "http" in message[0:5] or "file:///"[0:8] in message:
-                    #    message = "<a href=\"%s\">%s</a>" % (message, message)
-                    report_label += "%s\n" % message
+            for message in dump.getMessage().split(';'):
+                 if message:
+                    message_clean = message.strip()
+                    if "http" in message_clean[0:5] or "file:///"[0:8] in message_clean:
+                        report_message = "<a href=\"%s\">%s</a>" % (message_clean, message_clean)
+                    else:
+                        report_message = message_clean
+                    report_label += "%s\n" % report_message
             log2("setting markup '%s'", report_label)
             self.wTree.get_widget("lReported").set_markup(report_label)
         else:
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index 2cba607..d24c0dd 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -39,7 +39,6 @@ class ReporterDialog():
         self.builder.add_from_file(builderfile)
         #Get the Main Window, and connect the "destroy" event
         self.window = self.builder.get_object("reporter_dialog")
-        self.window.set_default_size(640, 480)
         self.window.connect("response", self.on_response, daemon)
         if parent:
             self.window.set_transient_for(parent)
@@ -54,7 +53,7 @@ class ReporterDialog():
         self.tevHowToReproduce = self.builder.get_object("tevHowToReproduce")
         self.how_to_changed = False
 
-        self.builder.get_object("ebErrors").hide()
+        self.builder.get_object("fErrors").hide()
         self.builder.get_object("bLog").connect("clicked", self.show_log_cb, log)
         self.builder.get_object("cbSendBacktrace").connect("toggled", self.on_send_backtrace_toggled)
         self.allow_send()
@@ -65,7 +64,7 @@ class ReporterDialog():
     
     def warn_user(self, warnings):
         # FIXME: show in lError
-        ebErrors = self.builder.get_object("ebErrors")
+        fErrors = self.builder.get_object("fErrors")
         lErrors = self.builder.get_object("lErrors")
         warning_lbl = None
         for warning in warnings:
@@ -74,12 +73,12 @@ class ReporterDialog():
             else:
                 warning_lbl = "* %s" % warning
         lErrors.set_label(warning_lbl)
-        ebErrors.show_all()
+        fErrors.show_all()
         
     def hide_warning(self):
-        ebErrors = self.builder.get_object("ebErrors")
+        fErrors = self.builder.get_object("fErrors")
         lErrors = self.builder.get_object("lErrors")
-        ebErrors.hide()
+        fErrors.hide()
         
     def allow_send(self):
         self.hide_warning()
@@ -97,7 +96,7 @@ class ReporterDialog():
             send = False
             error_msgs.append(_("You must agree with submitting the backtrace."))
         # we have both SendBacktrace and rating
-        elif rating:
+        if rating:
             try:
                 package = self.report["package"][CD_CONTENT]
             # if we don't have package for some reason
@@ -201,7 +200,11 @@ class ReporterDialog():
                 return True
         return True
 
-
+    def set_label(self, label_widget, text):
+        if len(text) > label_widget.get_max_width_chars():
+            label_widget.set_tooltip_text(text)
+        label_widget.set_text(text)
+            
     def hydrate(self):
         self.editable = []
         for item in self.report:
@@ -254,7 +257,7 @@ class ReporterDialog():
                     continue
                 item_label = self.builder.get_object("l%s" % item)
                 if item_label:
-                    item_label.set_text(self.report[item][CD_CONTENT])
+                    self.set_label(item_label, self.report[item][CD_CONTENT])
                 else:
                     # no widget to show this item
                     # probably some new item need to adjust the GUI!
diff --git a/src/Gui/report.glade b/src/Gui/report.glade
index d3bf5eb..d6fec06 100644
--- a/src/Gui/report.glade
+++ b/src/Gui/report.glade
@@ -16,11 +16,12 @@
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
             <child>
               <object class="GtkFrame" id="fSysInfo">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
@@ -32,6 +33,7 @@
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
+                            <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkLabel" id="l">
                                 <property name="visible">True</property>
@@ -78,6 +80,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -92,6 +96,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">0</property>
@@ -103,6 +108,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -114,6 +120,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">2</property>
@@ -125,6 +132,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">3</property>
@@ -139,6 +147,7 @@
                           <object class="GtkVBox" id="vbox5">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
+                            <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkLabel" id="label4">
                                 <property name="visible">True</property>
@@ -185,6 +194,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -198,6 +209,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">0</property>
@@ -209,6 +221,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -220,6 +233,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">2</property>
@@ -231,6 +245,7 @@
                                 <property name="xalign">0</property>
                                 <property name="xpad">5</property>
                                 <property name="label" translatable="yes">N/A</property>
+                                <property name="max_width_chars">40</property>
                               </object>
                               <packing>
                                 <property name="position">3</property>
@@ -245,13 +260,8 @@
                     </child>
                   </object>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="ypad">5</property>
-                    <property name="label" translatable="yes">&lt;b&gt;General information&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
+                <child type="label_item">
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -322,7 +332,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame2">
+              <object class="GtkFrame" id="fUserInfo">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
@@ -381,8 +391,6 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -427,8 +435,6 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -441,13 +447,8 @@
                     </child>
                   </object>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="ypad">5</property>
-                    <property name="label" translatable="yes">&lt;b&gt;User information&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
+                <child type="label_item">
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -482,75 +483,87 @@
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="ebErrors">
+              <object class="GtkFrame" id="fErrors">
                 <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment7">
-                    <property name="visible">True</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="stock">gtk-dialog-warning</property>
-                    <property name="icon-size">6</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkVBox" id="vbox8">
+                  <object class="GtkHBox" id="ebErrors">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkLabel" id="label12">
+                      <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Please fix the following problems&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="lErrors">
+                      <object class="GtkImage" id="image1">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes"> </property>
-                        <property name="use_markup">True</property>
-                        <property name="selectable">True</property>
+                        <property name="stock">gtk-dialog-warning</property>
+                        <property name="icon-size">6</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkAlignment" id="alignment8">
-                    <property name="visible">True</property>
                     <child>
-                      <placeholder/>
+                      <object class="GtkVBox" id="vbox8">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkLabel" id="label12">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Please fix the following problems&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="lErrors">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes"> </property>
+                            <property name="use_markup">True</property>
+                            <property name="selectable">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment8">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
+                </child>
+                <child type="label_item">
+                  <placeholder/>
                 </child>
               </object>
               <packing>