[Git][gajim/gajim][master] 2 commits: Port ExceptionHook to GTK3

Philipp Hörist pushed to branch master at gajim / gajim

Commits: aa50acd1 by Philipp Hörist at 2017-01-07T21:07:53+01:00 Port ExceptionHook to GTK3

- - - - - f8a314b5 by Philipp Hörist at 2017-01-07T22:36:09+01:00 Merge branch 'dev' into 'master'

ExceptionHook port to GTK3

See merge request !25 - - - - -

3 changed files:

- + data/gui/exception_dialog.ui - src/application.py - src/gtkexcepthook.py

Changes:

===================================== data/gui/exception_dialog.ui ===================================== --- /dev/null +++ b/data/gui/exception_dialog.ui @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.19.0 --> +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkDialog" id="ExceptionDialog"> + <property name="can_focus">False</property> + <property name="title" translatable="yes">Exception</property> + <property name="window_position">center</property> + <property name="icon_name">dialog-error</property> + <property name="type_hint">dialog</property> + <property name="gravity">center</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox"> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="margin_right">12</property> + <property name="margin_top">12</property> + <property name="margin_bottom">13</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area"> + <property name="can_focus">False</property> + <property name="margin_top">5</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="close_btn"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <property name="always_show_image">True</property> + <signal name="clicked" handler="on_close_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="report_btn"> + <property name="label" translatable="yes">Report Bug</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_report_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">20</property> + <property name="column_spacing">20</property> + <child> + <object class="GtkImage" id="image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="stock">gtk-dialog-error</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="msglabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes">A programming error has been detected. +It probably is not fatal, but should be reported +to the developers nonetheless.</property> + <property name="max_width_chars">60</property> + <property name="lines">3</property> + <attributes> + <attribute name="font-desc" value="&lt;Geben Sie den Wert ein&gt; 12"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="exception_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> +</interface>

===================================== src/application.py ===================================== --- a/src/application.py +++ b/src/application.py @@ -94,6 +94,9 @@ class GajimApplication(Gtk.Application):

Gtk.Application.do_activate(self)

+ import gtkexcepthook + gtkexcepthook.init() + # Create and initialize Application Paths & Databases import common.configpaths common.configpaths.gajimpaths.init(

===================================== src/gtkexcepthook.py ===================================== --- a/src/gtkexcepthook.py +++ b/src/gtkexcepthook.py @@ -1,6 +1,7 @@ # -*- coding:utf-8 -*- ## src/gtkexcepthook.py ## +## Copyright (C) 2016 Philipp Hörist <philipp AT hoerist.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> @@ -24,83 +25,61 @@ import sys import os import traceback import threading +import webbrowser +import gi

+gi.require_version('Gtk', '3.0') from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import Pango -from common import i18n # installs _() function -from dialogs import HigDialog - from io import StringIO -from common import helpers +from common import configpaths + +glade_file = os.path.join(configpaths.get('GUI'), 'exception_dialog.ui')

_exception_in_progress = threading.Lock()

-def _info(type_, value, tb): + +def _hook(type_, value, tb): if not _exception_in_progress.acquire(False): # Exceptions have piled up, so we use the default exception # handler for such exceptions - _excepthook_save(type_, value, tb) + sys.__excepthook__(type_, value, tb) return

- dialog = HigDialog(None, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE, - _('A programming error has been detected'), - _('It probably is not fatal, but should be reported ' - 'to the developers nonetheless.')) + ExceptionDialog(type_, value, tb) + _exception_in_progress.release()

- dialog.set_modal(False) - #FIXME: add icon to this button - RESPONSE_REPORT_BUG = 42 - dialog.add_buttons(Gtk.STOCK_CLOSE, Gtk.ButtonsType.CLOSE, - _('_Report Bug'), RESPONSE_REPORT_BUG) - report_button = dialog.action_area.get_children()[0] # right to left - report_button.grab_focus()

- # Details - textview = Gtk.TextView() - textview.set_editable(False) - textview.override_font(Pango.FontDescription('Monospace')) - sw = Gtk.ScrolledWindow() - sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - sw.add(textview) - frame = Gtk.Frame() - frame.set_shadow_type(Gtk.ShadowType.IN) - frame.add(sw) - frame.set_border_width(6) - textbuffer = textview.get_buffer() - trace = StringIO() - traceback.print_exception(type_, value, tb, None, trace) - textbuffer.set_text(trace.getvalue()) - textview.set_size_request( - Gdk.Screen.width() / 3, - Gdk.Screen.height() / 4) - expander = Gtk.Expander(label=_('Details')) - expander.add(frame) - dialog.vbox.pack_start(expander, True, True, 0) +class ExceptionDialog(): + def __init__(self, type_, value, tb): + builder = Gtk.Builder() + builder.add_from_file(glade_file) + self.dialog = builder.get_object("ExceptionDialog") + builder.connect_signals(self) + builder.get_object("report_btn").grab_focus() + self.exception_view = builder.get_object("exception_view") + buffer_ = self.exception_view.get_buffer() + trace = StringIO() + traceback.print_exception(type_, value, tb, None, trace) + buffer_.set_text(trace.getvalue()) + self.exception_view.set_editable(False) + self.dialog.run()

- dialog.set_resizable(True) - # on expand the details the dialog remains centered on screen - dialog.set_position(Gtk.WindowPosition.CENTER_ALWAYS) + def on_report_clicked(self, *args): + url = 'https://dev.gajim.org/gajim/gajim/issues' + webbrowser.open(url, new=2)

- def on_dialog_response(dialog, response): - if response == RESPONSE_REPORT_BUG: - url = 'http://trac.gajim.org/wiki/HowToCreateATicket' - helpers.launch_browser_mailer('url', url) - else: - dialog.destroy() - dialog.connect('response', on_dialog_response) - dialog.show_all() + def on_close_clicked(self, *args): + self.dialog.destroy()

- _exception_in_progress.release()

-# gdb/kdm etc if we use startx this is not True -if os.name == 'nt' or not sys.stderr.isatty(): - #FIXME: maybe always show dialog? - _excepthook_save = sys.excepthook - sys.excepthook = _info +def init(): + # gdb/kdm etc if we use startx this is not True + if os.name == 'nt' or not sys.stderr.isatty(): + # FIXME: maybe always show dialog? + sys.excepthook = _hook

# this is just to assist testing (python gtkexcepthook.py) if __name__ == '__main__': - _excepthook_save = sys.excepthook - sys.excepthook = _info + init() + print(sys.version) raise Exception()

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e967d4ed774e1d7f839c20abdc795cbbd1...