[Ayttm-commits] CVS: ayttm/src dialog.c,1.21,1.22

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv6656/src

Modified Files:
        dialog.c 
Log Message:
add icons to dialogs


Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dialog.c    22 Mar 2003 12:39:29 -0000      1.21
+++ dialog.c    22 Mar 2003 21:01:11 -0000      1.22
@@ -36,7 +36,8 @@
 #include "pixmaps/tb_yes.xpm"
 #include "pixmaps/tb_no.xpm"
 #include "pixmaps/ok.xpm"
-
+#include "pixmaps/warning.xpm"
+#include "pixmaps/question.xpm"
 
 typedef struct _list_dialog_data {
        void (*callback)(char *value, void *data);
@@ -323,19 +324,34 @@
 {
        GtkWidget *dialog_window;
        GtkWidget *label;
-       GtkWidget *hbox2;
+       GtkWidget *hbox2, *hbox_xpm;
+       GtkWidget *iconwid;
+       GdkPixmap *icon;
+       GdkBitmap *mask;
        GtkWidget *button;
        dialog_buttons *buttons = g_new0(dialog_buttons, 1);
        
        dialog_window = gtk_dialog_new();
        label = gtk_label_new(message);
-       gtk_widget_set_usize(label, 340, -1);
+       gtk_widget_set_usize(label, 240, -1);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show(label);
 
        gtk_misc_set_alignment (GTK_MISC (label), 0.1, 0.5);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->vbox), label, 
TRUE, TRUE, 5);
+
+       hbox_xpm = gtk_hbox_new(FALSE,5);
        
+       icon = 
gdk_pixmap_create_from_xpm_d(statuswindow?statuswindow->window:NULL, &mask, 
NULL, question_xpm);
+       iconwid = gtk_pixmap_new(icon, mask);
+       
+       gtk_box_pack_start(GTK_BOX(hbox_xpm), iconwid, TRUE, TRUE, 20);
+       gtk_box_pack_start(GTK_BOX(hbox_xpm), label, TRUE, TRUE, 5);
+       gtk_widget_show(iconwid);
+       gtk_widget_show(label);
+
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->vbox), hbox_xpm, 
TRUE, TRUE, 5);
+       gtk_widget_show(hbox_xpm);
+               
        button = do_icon_button(_("No"), tb_no_xpm, dialog_window);
        
        gtk_signal_connect(GTK_OBJECT(button), "clicked",
@@ -395,19 +411,34 @@
 {
        GtkWidget *d;
        GtkWidget *label;
-       GtkWidget *close, *hbox2;
+       GtkWidget *close, *hbox2, *hbox_xpm;
+       GtkWidget *iconwid;
+       GdkPixmap *icon;
+       GdkBitmap *mask;
        dialog_buttons *buttons = g_new0(dialog_buttons, 1);
        
        d = gtk_dialog_new();
        label = gtk_label_new(message);
-       gtk_widget_set_usize(label, 340, -1);
+       gtk_widget_set_usize(label, 240, -1);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show(label);
        
        close = do_icon_button(_("OK"), ok_xpm, d);
        
        gtk_misc_set_alignment (GTK_MISC (label), 0.1, 0.5);
-       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), label, TRUE, TRUE, 5);
+       
+       hbox_xpm = gtk_hbox_new(FALSE,5);
+       
+       icon = 
gdk_pixmap_create_from_xpm_d(statuswindow?statuswindow->window:NULL, &mask, 
NULL, warning_xpm);
+       iconwid = gtk_pixmap_new(icon, mask);
+       
+       gtk_box_pack_start(GTK_BOX(hbox_xpm), iconwid, TRUE, TRUE, 20);
+       gtk_box_pack_start(GTK_BOX(hbox_xpm), label, TRUE, TRUE, 5);
+       gtk_widget_show(iconwid);
+       gtk_widget_show(label);
+
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), hbox_xpm, TRUE, TRUE, 
5);
+       gtk_widget_show(hbox_xpm);
        
        hbox2 = gtk_hbox_new(FALSE,0);
        gtk_widget_show(hbox2);