Skip to content

Commit

Permalink
Add label explaining bug reporting using ABRT and link to GitHub
Browse files Browse the repository at this point in the history
The "Report a bug" button which uses ABRT to report bugs may not
work everytime so let's just add a short explanation what the
button does and link to GH issues for people that want to report
a bug manually.

Related: #445
  • Loading branch information
vojtechtrefny committed Aug 11, 2024
1 parent 3a535ba commit 667a215
Show file tree
Hide file tree
Showing 3 changed files with 205 additions and 164 deletions.
12 changes: 12 additions & 0 deletions blivetgui/dialogs/message_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,18 @@ def __init__(self, parent_window, allow_ignore, allow_report, msg, traceback, de
button_quit = builder.get_object("button_quit")
button_quit.connect("clicked", self._on_quit_button)

report_label = builder.get_object("bugreport_label")
if allow_report:
msg = _("If you believe this is a bug, please use the 'Report a bug' button "
"below to report a bug using the\nAutomatic bug reporting tool (ABRT) "
"or open an issue on our "
"<a href=\"https://github.com/storaged-project/blivet-gui/issues\">GitHub</a>.")
else:
msg = _("If you believe this is a bug, please open an issue on our "
"<a href=\"https://github.com/storaged-project/blivet-gui/issues\">GitHub</a>.")

report_label.set_markup("<i>%s</i>" % msg)

def run(self):
self.dialog.show_all()

Expand Down
87 changes: 50 additions & 37 deletions data/ui/exception_dialog.ui
Original file line number Diff line number Diff line change
@@ -1,34 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.40.0 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkMessageDialog" id="exception_dialog">
<property name="can_focus">False</property>
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="can-focus">False</property>
<property name="window-position">center-on-parent</property>
<property name="destroy-with-parent">True</property>
<property name="type-hint">dialog</property>
<property name="deletable">False</property>
<property name="message_type">error</property>
<property name="message-type">error</property>
<property name="text" translatable="yes">Error</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
<property name="layout_style">expand</property>
<property name="can-focus">False</property>
<property name="layout-style">expand</property>
<child>
<object class="GtkButton" id="button_back">
<property name="label" translatable="yes">_Back</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
<property name="expand">True</property>
Expand All @@ -37,12 +34,12 @@
</packing>
</child>
<child>
<object class="GtkButton" id="button_report">
<property name="label" translatable="yes">_Report a bug</property>
<object class="GtkButton" id="button_quit">
<property name="label" translatable="yes">_Quit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
<property name="expand">True</property>
Expand All @@ -51,12 +48,12 @@
</packing>
</child>
<child>
<object class="GtkButton" id="button_quit">
<property name="label" translatable="yes">_Quit</property>
<object class="GtkButton" id="button_report">
<property name="label" translatable="yes">_Report a bug</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
<property name="expand">True</property>
Expand All @@ -71,28 +68,44 @@
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="bugreport_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="margin-left">15</property>
<property name="margin-right">15</property>
<property name="margin-bottom">10</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="margin_bottom">12</property>
<property name="can-focus">True</property>
<property name="margin-left">6</property>
<property name="margin-right">6</property>
<property name="margin-bottom">12</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="min_content_width">600</property>
<property name="min_content_height">250</property>
<property name="can-focus">True</property>
<property name="min-content-width">600</property>
<property name="min-content-height">250</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<property name="can-focus">False</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkLabel" id="exception_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="selectable">True</property>
</object>
</child>
Expand All @@ -103,7 +116,7 @@
<child type="label">
<object class="GtkLabel" id="expander_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Show traceback</property>
<attributes>
<attribute name="weight" value="bold"/>
Expand All @@ -114,7 +127,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">3</property>
</packing>
</child>
</object>
Expand Down
Loading

0 comments on commit 667a215

Please sign in to comment.