Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- src/gui-gtk/abrt-gtk.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c index 120389d..bf85418 100644 --- a/src/gui-gtk/abrt-gtk.c +++ b/src/gui-gtk/abrt-gtk.c @@ -236,10 +236,8 @@ GtkWidget *create_menu(void)
/* help submenu */ GtkWidget *help_submenu = gtk_menu_new(); - GtkWidget *log_item = gtk_menu_item_new_with_mnemonic(_("View _log")); GtkWidget *online_help_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_HELP, NULL); GtkWidget *about_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); - gtk_menu_shell_append(GTK_MENU_SHELL(help_submenu), log_item); gtk_menu_shell_append(GTK_MENU_SHELL(help_submenu), online_help_item); gtk_menu_shell_append(GTK_MENU_SHELL(help_submenu), about_item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_item), help_submenu);
Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- src/gui-gtk/abrt-gtk.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c index bf85418..6a4a16d 100644 --- a/src/gui-gtk/abrt-gtk.c +++ b/src/gui-gtk/abrt-gtk.c @@ -5,6 +5,9 @@ #include "abrt-gtk.h" #include "event_config_dialog.h"
+static const char * const help_uri ="http://docs.fedoraproject.org/en-US/" + "Fedora/14/html/Deployment_Guide/ch-abrt.html"; + static GtkListStore *s_dumps_list_store; static GtkWidget *s_treeview; static GtkWidget *g_main_window; @@ -148,9 +151,12 @@ static void on_btn_delete_cb(GtkButton *button, gpointer unused)
static void on_btn_online_help_cb(GtkButton *button, gpointer unused) { - gtk_show_uri(NULL,"http://docs.fedoraproject.org/en-US/Fedor" - "a/14/html/Deployment_Guide/ch-abrt.html", - GDK_CURRENT_TIME, NULL); + gtk_show_uri(NULL, help_uri, GDK_CURRENT_TIME, NULL); +} + +static void on_menu_help_cb(GtkMenuItem *menuitem, gpointer unused) +{ + gtk_show_uri(NULL, help_uri, GDK_CURRENT_TIME, NULL); }
void show_events_list_dialog_cb(GtkMenuItem *menuitem, gpointer user_data) @@ -242,6 +248,8 @@ GtkWidget *create_menu(void) gtk_menu_shell_append(GTK_MENU_SHELL(help_submenu), about_item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_item), help_submenu);
+ g_signal_connect(online_help_item, "activate", G_CALLBACK(on_menu_help_cb), NULL); + return menu; }
looks ok.
Jirka
On 03/10/2011 02:08 PM, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovskynpajkovs@redhat.com
src/gui-gtk/abrt-gtk.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c index bf85418..6a4a16d 100644 --- a/src/gui-gtk/abrt-gtk.c +++ b/src/gui-gtk/abrt-gtk.c @@ -5,6 +5,9 @@ #include "abrt-gtk.h" #include "event_config_dialog.h"
+static const char * const help_uri ="http://docs.fedoraproject.org/en-US/"
- "Fedora/14/html/Deployment_Guide/ch-abrt.html";
- static GtkListStore *s_dumps_list_store; static GtkWidget *s_treeview; static GtkWidget *g_main_window;
@@ -148,9 +151,12 @@ static void on_btn_delete_cb(GtkButton *button, gpointer unused)
static void on_btn_online_help_cb(GtkButton *button, gpointer unused) {
- gtk_show_uri(NULL,"http://docs.fedoraproject.org/en-US/Fedor"
"a/14/html/Deployment_Guide/ch-abrt.html",
GDK_CURRENT_TIME, NULL);
- gtk_show_uri(NULL, help_uri, GDK_CURRENT_TIME, NULL);
+}
+static void on_menu_help_cb(GtkMenuItem *menuitem, gpointer unused) +{
gtk_show_uri(NULL, help_uri, GDK_CURRENT_TIME, NULL); }
void show_events_list_dialog_cb(GtkMenuItem *menuitem, gpointer user_data)
@@ -242,6 +248,8 @@ GtkWidget *create_menu(void) gtk_menu_shell_append(GTK_MENU_SHELL(help_submenu), about_item); gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_item), help_submenu);
- g_signal_connect(online_help_item, "activate", G_CALLBACK(on_menu_help_cb), NULL);
}return menu;
Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- src/gui-gtk/abrt-gtk.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/gui-gtk/abrt-gtk.c b/src/gui-gtk/abrt-gtk.c index 6a4a16d..f4b7912 100644 --- a/src/gui-gtk/abrt-gtk.c +++ b/src/gui-gtk/abrt-gtk.c @@ -159,6 +159,62 @@ static void on_menu_help_cb(GtkMenuItem *menuitem, gpointer unused) gtk_show_uri(NULL, help_uri, GDK_CURRENT_TIME, NULL); }
+static void on_menu_about_cb(GtkMenuItem *menuitem, gpointer unused) +{ + const char *copyright_str = "Copyright © 2009, 2010, 2011 Red Hat, Inc"; + + const char *license_str = "This program is free software; you can redistribut" + "e it and/or modify it under the terms of the GNU General Public License " + "as published by the Free Software Foundation; either version 2 of the Li" + "cense, or (at your option) any later version.\n\nThis program is distrib" + "uted in the hope that it will be useful, but WITHOUT ANY WARRANTY; witho" + "ut even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICU" + "LAR PURPOSE. See the GNU General Public License for more details.\n\nYo" + "u should have received a copy of the GNU General Public License along wi" + "th this program. If not, see http://www.gnu.org/licenses/."; + + const char *website_url = "https://fedorahosted.org/abrt/"; + + const char *authors[] = { + "Anton Arapov aarapov@redhat.com", + "Karel Klic kklic@redhat.com", + "Jiri Moskovcak jmoskovc@redhat.com", + "Nikola Pajkovsky npajkovs@redhat.com", + "Denys Vlasenko dvlasenk@redhat.com", + "Michal Toman mtoman@redhat.com", + "Zdenek Prikryl", + NULL + }; + + const char *artists[] = { + "Patrick Connelly pcon@fedoraproject.org", + "Máirín Duffy duffy@fedoraproject.org", + "Lapo Calamandrei", + NULL + }; + + const char *comments = _("Notification area applet that notifies users about " + "issues detected by ABRT"); + + GtkWidget *about_d = gtk_about_dialog_new(); + + gtk_window_set_default_icon_name("abrt"); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_d), VERSION); + gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_d), "abrt"); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_d), comments); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about_d), "ABRT"); + gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_d), copyright_str); + gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_d), license_str); + gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(about_d),true); + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_d), website_url); + gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about_d), authors); + gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(about_d), artists); + gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about_d), _("translator-credits")); + + gtk_dialog_run(GTK_DIALOG(about_d)); + gtk_widget_hide(GTK_WIDGET(about_d)); +} + void show_events_list_dialog_cb(GtkMenuItem *menuitem, gpointer user_data) { show_events_list_dialog(GTK_WINDOW(g_main_window)); @@ -249,6 +305,7 @@ GtkWidget *create_menu(void) gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_item), help_submenu);
g_signal_connect(online_help_item, "activate", G_CALLBACK(on_menu_help_cb), NULL); + g_signal_connect(about_item, "activate", G_CALLBACK(on_menu_about_cb), NULL);
return menu; }
On 03/10/2011 02:08 PM, Nikola Pajkovsky wrote:
- const char *comments = _("Notification area applet that notifies users about "
"issues detected by ABRT");
- nice copy/paste :)) please change it to something sane the old gui has
ABRT @VERSION@
"JM" == Jiri Moskovcak jmoskovc@redhat.com wrote:
JM> On 03/10/2011 02:08 PM, Nikola Pajkovsky wrote: JM> > + const char *comments = _("Notification area applet that notifies JM> > users about " JM> > + "issues detected by ABRT"); JM> JM> - nice copy/paste :)) please change it to something sane the old gui has JM> JM> ABRT @VERSION@ JM>
yeaaah, fixed and merged with master
crash-catcher@lists.fedorahosted.org