Updating branch refs/heads/master to 0286c5852a1bb04d2f0c40f4569c56edc0ade325 (commit) from e17e8e86430be14f18eb30e7f6cf4ad390622d31 (commit)
commit 0286c5852a1bb04d2f0c40f4569c56edc0ade325 Author: John Lindgren <john.lindg...@aol.com> Date: Mon Jan 30 19:27:45 2012 -0500 Cosmetic fixes. panel-plugin/config_gui.c | 36 ------------------------------------ panel-plugin/config_gui.h | 3 +-- panel-plugin/main.c | 11 +++-------- 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c index 3550c35..a4c891d 100644 --- a/panel-plugin/config_gui.c +++ b/panel-plugin/config_gui.c @@ -54,12 +54,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, struct gui_t *p_poGUI) { - GtkWidget *wPB_About; - GtkWidget *alignment2; - GtkWidget *hbox3; - GtkWidget *image1; - GtkWidget *label10; - GtkWidget *hseparator9; GtkWidget *table1; GtkWidget *label1; GtkWidget *wTF_Cmd; @@ -80,35 +74,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, tooltips = gtk_tooltips_new (); - wPB_About = gtk_button_new (); - gtk_widget_show (wPB_About); - gtk_box_pack_start (GTK_BOX (vbox1), wPB_About, FALSE, FALSE, 0); - GTK_WIDGET_UNSET_FLAGS (wPB_About, GTK_CAN_FOCUS); - gtk_tooltips_set_tip (tooltips, wPB_About, _("About..."), NULL); - gtk_button_set_relief (GTK_BUTTON (wPB_About), GTK_RELIEF_NONE); - - alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment2); - gtk_container_add (GTK_CONTAINER (wPB_About), alignment2); - - hbox3 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox3); - gtk_container_add (GTK_CONTAINER (alignment2), hbox3); - - image1 = gtk_image_new_from_stock ("gnome-stock-about", - GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image1); - gtk_box_pack_start (GTK_BOX (hbox3), image1, FALSE, FALSE, 0); - - label10 = gtk_label_new_with_mnemonic (_("Generic Monitor")); - gtk_widget_show (label10); - gtk_box_pack_start (GTK_BOX (hbox3), label10, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT); - - hseparator9 = gtk_hseparator_new (); - gtk_widget_show (hseparator9); - gtk_box_pack_start (GTK_BOX (vbox1), hseparator9, TRUE, TRUE, 0); - table1 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table1); gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, TRUE, 0); @@ -205,7 +170,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT); if (p_poGUI) { - COPYVAL (p_poGUI, wPB_About); COPYVAL (p_poGUI, wTF_Cmd); COPYVAL (p_poGUI, wTB_Title); COPYVAL (p_poGUI, wTF_Title); diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h index c6bb672..47fa984 100644 --- a/panel-plugin/config_gui.h +++ b/panel-plugin/config_gui.h @@ -3,7 +3,7 @@ * Header file to construct the configure GUI * Copyright (c) 2004 Roger Seguin <roger_seg...@msn.com> * <http://rmlx.dyndns.org> - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -34,7 +34,6 @@ typedef struct gui_t { /* Configuration GUI widgets */ - GtkWidget *wPB_About; GtkWidget *wTF_Cmd; GtkWidget *wTB_Title; GtkWidget *wTF_Title; diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 4bcd5c9..1f7a029 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -591,12 +591,12 @@ static void UpdateConf (void *p_pvPlugin) static void About (Widget_t w, void *unused) /* Called back when the About button in clicked */ { - xfce_dialog_show_info (NULL, NULL, - _("%s %s - Generic Monitor\n" - "Cyclically spawns a script/program, captures its output " + xfce_dialog_show_info (NULL, + _("Cyclically spawns a script/program, captures its output " "and displays the resulting string in the panel\n\n" "(c) 2004 Roger Seguin <roger_seg...@msn.com>\n" "(c) 2006 Julien Devemy <jujuc...@gmail.com>"), + _("%s %s - Generic Monitor"), PACKAGE, VERSION); }/* About() */ @@ -665,8 +665,6 @@ static void genmon_create_options (XfcePanelPlugin *plugin, g_signal_connect (dlg, "response", G_CALLBACK (genmon_dialog_response), poPlugin); - gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Generic Monitor")); vbox = gtk_vbox_new(FALSE, BORDER); @@ -679,9 +677,6 @@ static void genmon_create_options (XfcePanelPlugin *plugin, (void) genmon_CreateConfigGUI (GTK_WIDGET (vbox), poGUI); - g_signal_connect (GTK_WIDGET (poGUI->wPB_About), "clicked", - G_CALLBACK (About), 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (poGUI->wTB_Title), poConf->fTitleDisplayed); gtk_widget_set_sensitive (GTK_WIDGET (poGUI->wTF_Title), _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits