Changeset 484:e6fc7bff478b

Timestamp:

03/31/13 09:33:45 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Implemented the GUI logic of the bug report sending (re #190)

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/gui/bugreport.py (modified) (2 diffs)
• src/mlx/gui/gui.py (modified) (4 diffs)
• src/mlx/web.py (modified) (2 diffs)

locale/en/mlx.po

@@ -1833 +1833 @@
 msgid "bugreport_email_tooltip"
 msgstr "If you enter your e-mail here, you will get status updates about your bug report to this address."
+
+msgid "sendBugReport_busy"
+msgstr "Sending bug report..."
+
+msgid "sendBugReport_success"
+msgstr "Bug report sent successfully."
+
+msgid "sendBugReport_success_sec"
+msgstr ""
+"The report will be analysed and you will be contacted "
+"as soon as possible."
+
+msgid "sendBugReport_error"
+msgstr "Failed to send the bug report."
+
+msgid "sendBugReport_siteerror_sec"
+msgstr ""
+"The website refused to process the bug report. "
+"Contact the logger's author."
+
+msgid "sendBugReport_error_sec"
+msgstr "There was some communication error, try again later."

locale/hu/mlx.po

@@ -1848 +1848 @@
 msgid "bugreport_email_tooltip"
 msgstr "Ha itt megadod az e-mail címed, a hibajelentés állapotáról értesítéseket fogsz kapni a megadott címre."
+
+msgid "sendBugReport_busy"
+msgstr "Hibajelentés küldése..."
+
+msgid "sendBugReport_success"
+msgstr "A hibajelentést elküldtem."
+
+msgid "sendBugReport_success_sec"
+msgstr ""
+"A jelentést elemezzük és felvesszük veled a kapcsolatot "
+"amilyen hamar csak lehet."
+
+msgid "sendBugReport_error"
+msgstr "Nem sikerült elküldeni a hibajelentést."
+
+msgid "sendBugReport_siteerror_sec"
+msgstr ""
+"A web szerver visszautasította a hibajelentést. "
+"Vedd fel a kapcsolatot a program szerzőjével."
+
+msgid "sendBugReport_error_sec"
+msgstr "Valamilyen kommunikációs probléma adódott, próbáld újra később."

src/mlx/gui/bugreport.py

@@ -97 +97 @@
     def run(self):
         """Run the checklist editor dialog."""
+        self.set_sensitive(True)
+        self._description.set_sensitive(True)
         self._updateButtons()
         self._sendButton.grab_default()
         self.show_all()
         response = super(BugReportDialog, self).run()
-        self.hide()
+
+        print "response", response, RESPONSETYPE_ACCEPT
+        if response==RESPONSETYPE_ACCEPT:
+            self._send()
+        else:
+            self.hide()
 
     def _summaryChanged(self, entry):
@@ -110 +117 @@
         """Update the sensitivity of the buttoms."""
         self._sendButton.set_sensitive(self._summary.get_text()!="")
+
+    def _send(self):
+        """Send the bug report."""
+        descriptionBuffer = self._description.get_buffer()
+        description = \
+          descriptionBuffer.get_text(descriptionBuffer.get_start_iter(),
+                                     descriptionBuffer.get_end_iter(),
+                                     False)
+        self.set_sensitive(False)
+        self._gui.sendBugReport(self._summary.get_text(),
+                                description,
+                                self._email.get_text(),
+                                self._bugReportSent)
+
+    def _bugReportSent(self, returned, result):
+        """Called when the bug report was sent."""
+        self.set_sensitive(True)
+        self._description.set_sensitive(True)
+        if returned and result.success:
+            self.hide()
+            self._summary.set_text("")
+            self._description.get_buffer().set_text("")
+            self._email.set_text("")
+        else:
+            self.run()

src/mlx/gui/gui.py

@@ -85 +85 @@
 
         self._sendPIREPCallback = None
+        self._sendBugReportCallback = None
 
         self.webHandler = web.Handler()
@@ -109 +110 @@
         self._checklistEditor = ChecklistEditor(self)
         self._approachCalloutsEditor = ApproachCalloutsEditor(self)
-        self._bugreportDialog = BugReportDialog(self)
+        self._bugReportDialog = BugReportDialog(self)
 
         menuBar = self._buildMenuBar(accelGroup)
@@ -1141 +1142 @@
     def _reportBug(self, menuItem):
         """Callback for reporting a bug."""
-        self._bugreportDialog.run()
+        self._bugReportDialog.run()
 
     def _setupTimeSync(self):
@@ -1382 +1383 @@
             callback(returned, result)
 
+    def sendBugReport(self, summary, description, email, callback = None):
+        """Send the bug report with the given data."""
+        self.beginBusy(xstr("sendBugReport_busy"))
+        self._sendBugReportCallback = callback
+        self.webHandler.sendBugReport(self._bugReportSentCallback,
+                                      summary, description, email)
+
+    def _bugReportSentCallback(self, returned, result):
+        """Callback function for the bug report sending result."""
+        gobject.idle_add(self._handleBugReportSent, returned, result)
+
+    def _handleBugReportSent(self, returned, result):
+        """Callback for the bug report sending result."""
+        self.endBusy()
+        secondaryMarkup = None
+        type = MESSAGETYPE_ERROR
+        if returned:
+            if result.success:
+                type = MESSAGETYPE_INFO
+                messageFormat = xstr("sendBugReport_success")
+                secondaryMarkup = xstr("sendBugReport_success_sec")
+            else:
+                messageFormat = xstr("sendBugReport_error")
+                secondaryMarkup = xstr("sendBugReport_siteerror_sec")
+        else:
+            messageFormat = xstr("sendBugReport_error")
+            secondaryMarkup = xstr("sendBugReport_error_sec")
+
+        dialog = gtk.MessageDialog(parent = self._wizard.gui._bugReportDialog,
+                                   type = type, message_format = messageFormat)
+        dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+        dialog.set_title(WINDOW_TITLE_BASE)
+        if secondaryMarkup is not None:
+            dialog.format_secondary_markup(secondaryMarkup)
+
+        dialog.run()
+        dialog.hide()
+
+        callback = self._sendBugReportCallback
+        self._sendBugReportCallback = None
+        if callback is not None:
+            callback(returned, result)
+
     def _listenHotkeys(self):
         """Setup the hotkeys based on the configuration."""

src/mlx/web.py

@@ -794 +794 @@
 #------------------------------------------------------------------------------
 
+class SendBugReport(Request):
+    """A request to send a bug report to the project homepage."""
+    _latin2Encoder = codecs.getencoder("iso-8859-2")
+
+    def __init__(self, callback, summary, description, email):
+        """Construct the request for the given bug report."""
+        super(SendBugReport, self).__init__(callback)
+        self._summary = summary
+        self._description = description
+        self._email = email
+
+    def run(self):
+        """Perform the sending of the bug report."""
+        time.sleep(3)
+
+        result = Result()
+        result.success = True
+
+        return result
+
+#------------------------------------------------------------------------------
+
 class Handler(threading.Thread):
     """The handler for the web services.
@@ -835 +857 @@
         """Send the given ACARS"""
         self._addRequest(SendACARS(callback, acars))
+
+    def sendBugReport(self, callback, summary, description, email):
+        """Send a bug report with the given data."""
+        self._addRequest(SendBugReport(callback, summary, description, email))
 
     def run(self):