Permalink
Browse files

Merge branch 'master' of github.com:robmcmullen/peppy

  • Loading branch information...
Rob McMullen
Rob McMullen committed Feb 25, 2014
2 parents 827cf49 + c2a80ca commit 87c7e08d30b48e5285b8acd51f9799fab6f1d8c2
Showing with 4 additions and 3 deletions.
  1. +4 −3 peppy/plugins/exception_handler.py
@@ -245,6 +245,7 @@ def OnClose(self, evt):
"""
ErrorDialog.REPORTER_ACTIVE = False
self.EndModal(1)
self.Destroy()
evt.Skip()
@@ -276,9 +277,9 @@ def __DoLayout(self):
abort_b = wx.Button(self, wx.ID_ABORT, _("Abort"))
abort_b.SetToolTipString(_("Exit the application"))
send_b = wx.Button(self, ID_SEND, _("Send Error Report"))
send_b.SetDefault()
close_b = wx.Button(self, wx.ID_CLOSE, ("Attempt to Continue"))
send_b = wx.Button(self, ID_SEND, _("... and Send Error Report"))
send_b.SetDefault()
ignore_b = wx.Button(self, wx.ID_IGNORE, ("Ignore Reoccurrences"))
# Layout
@@ -293,7 +294,7 @@ def __DoLayout(self):
bsizer = wx.BoxSizer(wx.HORIZONTAL)
bsizer.AddMany([((5, 5), 0), (abort_b, 0), ((-1, -1), 1, wx.EXPAND),
(send_b, 0), ((5, 5), 0), (close_b, 0), ((5, 5), 0),
(close_b, 0), ((5, 5), 0), (send_b, 0), ((5, 5), 0),
(ignore_b, 0), ((5, 5), 0)])
vsizer.AddMany([((5, 5), 0),

0 comments on commit 87c7e08

Please sign in to comment.