9:14 a.m.
The button is visible only in expert mode but keyboard shortcut is
enabled all the time. (Ctrl+Alt+Return)
Closes abrt/abrt#634
Signed-off-by: Jakub Filak <jfilak(a)redhat.com>
---
src/gnome-abrt | 3 +++
src/gnome_abrt/oops.glade | 33 ++++++++++++++++++++++++++++++---
src/gnome_abrt/views.py | 5 ++++-
3 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/gnome-abrt b/src/gnome-abrt
index e1fed11..633eb3a 100755
--- a/src/gnome-abrt
+++ b/src/gnome-abrt
@@ -284,6 +284,8 @@ if __name__ == "__main__":
help=_('Be verbose'))
CMDARGS.add_argument('-p', '--problem',
help=_('Selected problem ID'))
+ CMDARGS.add_argument('-x', '--expert', action='store_true',
+ help=_('Expert mode'))
OPTIONS = CMDARGS.parse_args()
@@ -295,6 +297,7 @@ if __name__ == "__main__":
CONF = get_configuration()
# TODO : mark this option as hidden or something like that
CONF.add_option('problemid', default_value=None)
+ CONF.add_option('expert', default_value=(OPTIONS.expert))
APP_CMDLINE = []
if 'problem' in VARS:
diff --git a/src/gnome_abrt/oops.glade b/src/gnome_abrt/oops.glade
index 7cf5da3..1a075f1 100644
--- a/src/gnome_abrt/oops.glade
+++ b/src/gnome_abrt/oops.glade
@@ -24,10 +24,12 @@
</child>
<child>
<object class="GtkAction" id="gac_detail">
- <property name="label"
translatable="yes">Detail</property>
+ <property name="label"
translatable="yes">Anly_ze</property>
+ <property name="tooltip" translatable="yes">Open
selected problem for analysis</property>
<property name="stock_id">gtk-zoom-in</property>
<signal name="activate" handler="on_gac_detail_activate"
swapped="no"/>
</object>
+ <accelerator key="Return" modifiers="GDK_CONTROL_MASK |
GDK_MOD1_MASK"/>
</child>
<child>
<object class="GtkAction" id="gac_opt_all_problems">
@@ -84,6 +86,13 @@
</object>
</child>
<child>
+ <object class="GtkMenuItem" id="mi_detail">
+ <property name="related_action">gac_detail</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkMenuItem" id="mi_open_directory">
<property
name="related_action">gac_open_directory</property>
<property name="visible">True</property>
@@ -631,7 +640,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -647,7 +656,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -658,6 +667,24 @@
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="margin_left">5</property>
+ <property name="margin_right">5</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_detail">
+ <property
name="related_action">gac_detail</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">end</property>
+ <property name="margin_left">5</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/gnome_abrt/views.py b/src/gnome_abrt/views.py
index 336ee95..6bd4723 100644
--- a/src/gnome_abrt/views.py
+++ b/src/gnome_abrt/views.py
@@ -122,6 +122,7 @@ class OopsWindow(Gtk.ApplicationWindow):
self.nb_problem_layout = builder.get_object('nb_problem_layout')
self.btn_delete = builder.get_object('btn_delete')
self.btn_report = builder.get_object('btn_report')
+ self.btn_detail = builder.get_object('btn_detail')
self.te_search = builder.get_object('te_search')
self.chb_all_problems = builder.get_object('chb_all_problems')
self.vbx_links = builder.get_object('vbx_links')
@@ -211,7 +212,8 @@ class OopsWindow(Gtk.ApplicationWindow):
conf = config.get_configuration()
conf.set_watch('problemid', self._options_observer)
self._options_observer.option_updated(conf, 'problemid')
-
+ self._builder.btn_detail.set_visible(conf['expert'])
+ self._builder.mi_detail.set_visible(conf['expert'])
def _find_problem_iter(self, problem, model):
pit = model.get_iter_first()
@@ -351,6 +353,7 @@ class OopsWindow(Gtk.ApplicationWindow):
self._builder.btn_delete.set_sensitive(sensitive_btn)
self._builder.btn_report.set_sensitive(
sensitive_btn and not problem['not-reportable'] )
+ self._builder.btn_detail.set_sensitive(sensitive_btn)
self._builder.vbx_links.foreach(
lambda w, u: w.destroy(), None)
self._builder.vbx_problem_messages.foreach(
--
1.8.1.4