From 1ab4f7ab3ca04e0b8ba17eec75cf18345d6b3fbc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 9 Dec 2009 14:54:51 +0100 Subject: fix incorrect wording This looked wrong: "This crash has been reported, you can find the report(s) at: Kernel oops report was uploaded." Signed-off-by: Denys Vlasenko --- src/Gui/CCMainWindow.py | 4 +++- src/Gui/CC_gui_functions.py | 8 ++++---- src/Hooks/sitecustomize.py | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index d97b34e..e429908 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -218,7 +218,9 @@ class MainWindow(): dump = dumpsListStore.get_value(dumpsListStore.get_iter(path[0]), dumpsListStore.get_n_columns()-1) #move this to Dump class if dump.isReported(): - report_label = _("This crash has been reported, you can find the report(s) at:\n") + report_label = _("This crash has been reported:\n") + # plugin message follows, but at least in case of kerneloops, + # it is not informative (no URL to the report) for message in dump.getMessage().split('\n'): if message: if "http" in message[0:5] or "file:///"[0:8] in message: diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index ba895c6..dfed224 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -206,24 +206,24 @@ def get_icon_for_package(theme,package): return gtk.gdk.pixbuf_new_from_file_at_size(icon_filename,22,22) else: return None - + def show_log(log, parent=None): builder = gtk.Builder() builderfile = "%s%sdialogs.glade" % (sys.path[0],"/") builder.add_from_file(builderfile) dialog = builder.get_object("LogViewer") tevLog = builder.get_object("tevLog") - + if parent: dialog.set_position (gtk.WIN_POS_CENTER_ON_PARENT) dialog.set_transient_for(parent) else: dialog.set_position (gtk.WIN_POS_CENTER) - + buff = gtk.TextBuffer() buff.set_text(log) tevLog.set_buffer(buff) - + dialog.run() dialog.destroy() diff --git a/src/Hooks/sitecustomize.py b/src/Hooks/sitecustomize.py index 97941e8..8027726 100644 --- a/src/Hooks/sitecustomize.py +++ b/src/Hooks/sitecustomize.py @@ -13,12 +13,12 @@ def abrt_daemon_ok(): except Exception, ex: # log the exception? return False - + pid = pidfile.readline() pidfile.close() if not pid: return False - + try: # pid[:-1] strips the trailing '\n' cmdline = open("/proc/%s/cmdline" % pid[:-1], "r").readline() @@ -27,7 +27,7 @@ def abrt_daemon_ok(): return False if not ("abrtd" in cmdline): return False - + return True if abrt_daemon_ok(): -- cgit From e32ed17a382a2c7e9836a943aec81fc5db942024 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 9 Dec 2009 16:06:55 +0100 Subject: better wording to dbus error message (bug 106) See https://fedorahosted.org/abrt/ticket/106 Signed-off-by: Denys Vlasenko --- src/Daemon/CommLayerServerDBus.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index 646974d..7c2d465 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -538,7 +538,8 @@ static void handle_dbus_err(bool error_flag, DBusError *err) return; error_msg_and_die( "Error requesting DBus name %s, possible reasons: " - "abrt run by non-root; dbus config is incorrect", + "abrt run by non-root; dbus config is incorrect; " + "or dbus daemon needs to be restarted to reload dbus config", ABRTD_DBUS_NAME); } -- cgit From c6cfcc792147083ab41eb990f8ee4e3150cd5d75 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 9 Dec 2009 19:48:19 +0100 Subject: Gui: make report status window's text wrap. Fixes bug 82 See https://fedorahosted.org/abrt/ticket/82 Signed-off-by: Denys Vlasenko --- src/Gui/CCReporterDialog.py | 2 +- src/Gui/CC_gui_functions.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index 746c45c..219512e 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -96,7 +96,7 @@ class ReporterDialog(): # this callback is called when user press Cancel or Report button in Report dialog def on_response(self, dialog, response_id, daemon): # the button has been pressed (probably) - print "response_id", response_id + # print "response_id", response_id if response_id == gtk.RESPONSE_APPLY: if not (self.check_settings(daemon) and self.check_report()): dialog.stop_emission("response") diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index dfed224..0532ab7 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -45,9 +45,12 @@ def gui_report_dialog ( report_status_dict, parent_dialog, plugin_label = Label() plugin_label.set_markup("%s: " % plugin) plugin_label.set_justify(gtk.JUSTIFY_RIGHT) + plugin_label.set_alignment(0, 0) status_label = Label() status_label.set_max_width_chars(MAX_WIDTH) status_label.set_selectable(True) + status_label.set_line_wrap(True) + status_label.set_alignment(0, 0) status_hbox.pack_start(plugin_label, expand=False) status_hbox.pack_start(status_label, expand=False) # 0 means not succesfull -- cgit