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

3 files changed, 72 insertions, 4 deletions

diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py
index d3a3abd0..31ebb410 100644
--- a/src/Gui/CCMainWindow.py
+++ b/src/Gui/CCMainWindow.py
@@ -88,7 +88,7 @@ class MainWindow():
         columns[0] = gtk.TreeViewColumn(_("Package"))
         columns[1] = gtk.TreeViewColumn(_("Application"))
         columns[2] = gtk.TreeViewColumn(_("Date"))
-        columns[3] = gtk.TreeViewColumn(_("Crash Rate"))
+        columns[3] = gtk.TreeViewColumn(_("Crash count"))
         if os.getuid() == 0:
             column = gtk.TreeViewColumn(_("User"))
             columns.append(column)
diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py
index e1d1c1bb..61e65526 100644
--- a/src/Gui/CCReporterDialog.py
+++ b/src/Gui/CCReporterDialog.py
@@ -43,6 +43,10 @@ class ReporterDialog():
         self.tvComment = self.wTree.get_widget("tvComment")
         self.tvComment.connect("focus-in-event", self.on_comment_focus_cb)
         self.comment_changed = False
+        
+        # "how to reproduce" textview
+        self.tevHowToReproduce = self.wTree.get_widget("tevHowToReproduce")
+        self.how_to_changed = False
 
         self.tvReport = self.wTree.get_widget("tvReport")
 
@@ -76,7 +80,7 @@ class ReporterDialog():
         # connect the signals
         self.tvReport.connect_after("size-allocate", self.on_window_resize)
         self.wTree.get_widget("bSend").connect("clicked", self.on_send_clicked)
-        # start whit the warning hidden, so it's not visible when there is no rating
+        # start with the warning hidden, so it's not visible when there is no rating
         self.wTree.get_widget("ebErrors").hide()
         self.hydrate()
 
@@ -182,6 +186,20 @@ class ReporterDialog():
 
                 self.tvComment.set_buffer(buff)
                 continue
+            if item == "How to reproduce":
+                buff = gtk.TextBuffer()
+                how_to_reproduce = _("")
+                try:
+                    if self.report[item][CONTENT]:
+                        how_to_reproduce = self.report[item][CONTENT]
+                        self.how_to_changed = True
+                except Exception, e:
+                    pass
+
+                buff.set_text(how_to_reproduce)
+
+                self.tevHowToReproduce.set_buffer(buff)
+                continue
             # if an backtrace has rating use it
             if item == "rating":
                 try:
@@ -198,7 +216,7 @@ class ReporterDialog():
                     ebErrors.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red"))
                     if package:
                         lErrors.set_markup(
-                            "<span color=\"white\">%s</span>" % _("Reporting disabled because the backtrace is unusable!\nPlease try to install debuginfo manually using command:<span color=\"blue\"> debuginfo-install %s </span>\nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
+                            "<span color=\"white\">%s</span>" % _("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command:<span color=\"blue\"> debuginfo-install %s </span>\nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))]))
                     else:
                         lErrors.set_markup("<span color=\"white\">%s</span>" % _("The bactrace is unusable, you can't report this!"))
                     bSend.set_sensitive(False)
@@ -232,11 +250,18 @@ class ReporterDialog():
                 self.report[rowe["item"]][CONTENT] = rowe["content"]
             else:
                 del self.report[rowe["item"]]
+        # handle comment
         if self.comment_changed:
             buff = self.tvComment.get_buffer()
             self.report["Comment"] = ['t', 'y', buff.get_text(buff.get_start_iter(),buff.get_end_iter())]
         else:
             del self.report["Comment"]
+        # handle how to reproduce
+        if self.how_to_changed:
+            buff = self.tevHowToReproduce.get_buffer()
+            self.report["How to reproduce"] = ['t', 'y', buff.get_text(buff.get_start_iter(),buff.get_end_iter())]
+        else:
+            del self.report["How to reproduce"]
 
     def on_send_clicked(self, button):
     #def on_apply_clicked(self, button, treeview):
diff --git a/src/Gui/report.glade b/src/Gui/report.glade
index 2ccf1690..ce21acb1 100644
--- a/src/Gui/report.glade
+++ b/src/Gui/report.glade
@@ -69,7 +69,50 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <widget class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <widget class="GtkEventBox" id="eventbox2">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="lHowToReproduce">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="ypad">2</property>
+                    <property name="label" translatable="yes">How to reproduce (in a few simple steps)</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <widget class="GtkTextView" id="tevHowToReproduce">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="wrap_mode">word</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkVBox" id="vbox1">