Changeset 496:0dadad5a93b8 for src/mlx/gui/gui.py

Timestamp:

04/06/13 14:06:45 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

xplane

Parents:

478:00d38a068da9 (diff), 495:9c830f5791a5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Merged the default branch

Files:

• src/mlx/gui/gui.py (modified) (6 diffs)
• src/mlx/gui/gui.py (modified) (3 diffs)

src/mlx/gui/gui.py

@@ -14 +14 @@
 from mlx.gui.callouts import ApproachCalloutsEditor
 from mlx.gui.pirep import PIREPViewer
+from mlx.gui.bugreport import BugReportDialog
 
 import mlx.const as const
@@ -85 +86 @@
 
         self._sendPIREPCallback = None
+        self._sendBugReportCallback = None
 
         self.webHandler = web.Handler()
@@ -109 +111 @@
         self._checklistEditor = ChecklistEditor(self)
         self._approachCalloutsEditor = ApproachCalloutsEditor(self)
+        self._bugReportDialog = BugReportDialog(self)
 
         menuBar = self._buildMenuBar(accelGroup)
@@ -993 +996 @@
         prefsMenuItem.connect("activate", self._editPreferences)
         toolsMenu.append(prefsMenuItem)
+
+        toolsMenu.append(gtk.SeparatorMenuItem())
+
+        bugReportMenuItem = gtk.ImageMenuItem(gtk.STOCK_PASTE)
+        bugReportMenuItem.set_use_stock(True)
+        bugReportMenuItem.set_label(xstr("menu_tools_bugreport"))
+        bugReportMenuItem.add_accelerator("activate", accelGroup,
+                                          ord(xstr("menu_tools_bugreport_key")),
+                                          CONTROL_MASK, ACCEL_VISIBLE)
+        bugReportMenuItem.connect("activate", self._reportBug)
+        toolsMenu.append(bugReportMenuItem)
 
         viewMenuItem = gtk.MenuItem(xstr("menu_view"))
@@ -1132 +1146 @@
         self._setupTimeSync()
         self._listenHotkeys()
+
+    def _reportBug(self, menuItem):
+        """Callback for reporting a bug."""
+        self._bugReportDialog.run()
 
     def _setupTimeSync(self):
@@ -1372 +1390 @@
             callback(returned, result)
 
+    def sendBugReport(self, summary, description, email, callback = None):
+        """Send the bug report with the given data."""
+        description += "\n\n" + ("=" * 40)
+        description += "\n\nThe contents of the log:\n\n"
+
+        for (timestampString, text) in self._logger.lines:
+            description += unicode(formatFlightLogLine(timestampString, text))
+
+        description += "\n\n" + ("=" * 40)
+        description += "\n\nThe contents of the debug log:\n\n"
+
+        buffer = self._debugLogView.get_buffer()
+        description += buffer.get_text(buffer.get_start_iter(),
+                                       buffer.get_end_iter(), True)
+
+        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") % (result.ticketID,)
+                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/gui/gui.py

@@ -69 +69 @@
         self._flight = None
         self._simulator = None
+        self._fsType = None
         self._monitoring = False
 
@@ -208 +209 @@
 
     @property
+    def fsType(self):
+        """Get the flight simulator type."""
+        return self._fsType
+
+    @property
     def entranceExam(self):
         """Get whether an entrance exam is about to be taken."""
@@ -428 +434 @@
             self._wizard.connected(fsType, descriptor)
         self._reconnecting = False
+        self._fsType = fsType
         self._listenHotkeys()