[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src dialog.c,1.18,1.19 dialog.h,1.10,1.11
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src dialog.c,1.18,1.19 dialog.h,1.10,1.11 |
Date: |
Sat, 22 Mar 2003 06:32:56 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv1467/src
Modified Files:
dialog.c dialog.h
Log Message:
nicer dialogs
Index: dialog.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dialog.c 29 Jan 2003 19:19:22 -0000 1.18
+++ dialog.c 22 Mar 2003 11:32:53 -0000 1.19
@@ -186,8 +186,6 @@
(guchar *)data, 2);
#endif
gdk_window_set_icon(w, NULL, icon_pm, icon_bm);
-// gdk_window_set_back_pixmap(w, icon_pm, 0 );
- // gdk_window_set_group(w, statuswindow->window);
}
static void list_dialog_callback(GtkWidget *widget,
@@ -255,14 +253,7 @@
(gpointer)dialog_window);
gtk_widget_show(clist);
/* End list construction */
-/*
- button_box = gtk_hbox_new(FALSE, 5);
- gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2 );
-
- gtk_container_add(GTK_CONTAINER(button_box), button_box);
- gtk_widget_show(button_box);
-*/
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->action_area),
clist, FALSE, FALSE, 5 );
@@ -270,74 +261,92 @@
eb_debug(DBG_CORE, ">Leaving, all done\n");
}
-void do_dialog( gchar * message, gchar * title, void (*action)(GtkWidget *
widget, gpointer data), gpointer data )
-{
- GtkWidget * dialog_window;
- GtkWidget * button;
- GtkWidget * label;
- GdkPixmap *pm;
- GdkBitmap *bm;
- GtkWidget * button_box;
+GtkWidget * do_icon_button (char *label, char **xpm, GtkWidget *w) {
+ GtkWidget *button;
+ GtkWidget *blabel;
+ GtkWidget *hbox;
+ GtkWidget *iconwid;
+ GdkPixmap *icon;
+ GdkBitmap *mask;
+
+ hbox = gtk_hbox_new(FALSE, 0);
+
+ icon = gdk_pixmap_create_from_xpm_d(w->window, &mask, NULL, xpm);
+ iconwid = gtk_pixmap_new(icon, mask);
+ blabel = gtk_label_new(label);
+
+ gtk_box_pack_start(GTK_BOX(hbox), iconwid, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), blabel, FALSE, FALSE, 2);
+
+ gtk_widget_show(iconwid);
+ gtk_widget_show(blabel);
+ gtk_widget_show(hbox);
+
+ button = gtk_button_new();
- dialog_window = gtk_dialog_new();
- gtk_window_set_position(GTK_WINDOW(dialog_window), GTK_WIN_POS_MOUSE);
- gtk_widget_realize(dialog_window);
- gtk_window_set_title(GTK_WINDOW(dialog_window), title );
+ gtk_widget_show(hbox);
+ gtk_container_add (GTK_CONTAINER (button), hbox);
+ gtk_widget_set_usize(button,
button->requisition.width<100?100:button->requisition.width, 25);
+ gtk_widget_show(button);
+ return button;
+}
+void do_dialog( gchar * message, gchar * title, void (*action)(GtkWidget *
widget, gpointer data), gpointer data )
+{
+ GtkWidget *dialog_window;
+ GtkWidget *label;
+ GtkWidget *hbox2;
+ GtkWidget *button;
+
+ dialog_window = gtk_dialog_new();
label = gtk_label_new(message);
- gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->vbox),
- label, FALSE, FALSE, 5);
-
- button_box = gtk_hbox_new(FALSE, 5);
- pm = gdk_pixmap_create_from_xpm_d(statuswindow->window, &bm, NULL,
tb_yes_xpm);
- label = gtk_pixmap_new(pm, bm);
-
- gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2 );
-
- label = gtk_label_new(_("Yes"));
- gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2 );
-
+ gtk_widget_set_usize(label, 340, -1);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_widget_show(label);
- button = gtk_button_new();
- gtk_container_add(GTK_CONTAINER(button), button_box);
- gtk_widget_show(button_box);
+ 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);
+
+ button = do_icon_button(_("No"), tb_no_xpm, dialog_window);
+
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(action), data );
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog_window);
- gtk_object_set_user_data(GTK_OBJECT(button), (gpointer)1);
+ gtk_object_set_user_data(GTK_OBJECT(button), (gpointer)0);
+ gtk_widget_show(button);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->action_area),
- button, FALSE, FALSE, 5 );
-
- button_box = gtk_hbox_new(FALSE, 5);
- pm = gdk_pixmap_create_from_xpm_d(statuswindow->window, &bm, NULL,
tb_no_xpm);
- label = gtk_pixmap_new(pm, bm);
-
- gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2 );
-
- label = gtk_label_new(_("No"));
- gtk_box_pack_start(GTK_BOX(button_box), label, FALSE, FALSE, 2 );
-
-
- button = gtk_button_new();
- gtk_container_add(GTK_CONTAINER(button), button_box);
+ hbox2 = gtk_hbox_new(FALSE,0);
+ gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
+ button = do_icon_button(_("Yes"), tb_yes_xpm, dialog_window);
+
gtk_signal_connect(GTK_OBJECT(button), "clicked",
- GTK_SIGNAL_FUNC(action), data);
+ GTK_SIGNAL_FUNC(action), data );
gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
(gpointer)dialog_window);
- gtk_object_set_user_data(GTK_OBJECT(button), (gpointer)0 );
+ gtk_object_set_user_data(GTK_OBJECT(button), (gpointer)1);
+ gtk_widget_show(button);
+
+ gtk_box_pack_end(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
+ gtk_widget_show(hbox2);
+
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_window)->action_area),
- button, FALSE, FALSE, 5 );
+ hbox2, TRUE, TRUE, 0);
+
+ gtk_container_set_border_width(GTK_CONTAINER(dialog_window), 5);
+ gtk_widget_realize(dialog_window);
+ gtk_window_set_title(GTK_WINDOW(dialog_window), title );
+ gtk_window_set_position(GTK_WINDOW(dialog_window), GTK_WIN_POS_MOUSE);
+ gtk_widget_set_usize(dialog_window, 350,
+ dialog_window->requisition.height<150?
150:dialog_window->requisition.height);
- gtk_widget_show_all(dialog_window);
+ gtk_widget_show(dialog_window);
}
@@ -352,19 +361,24 @@
{
GtkWidget *d;
GtkWidget *label;
- GtkWidget *close;
-
+ GtkWidget *close, *hbox2;
d = gtk_dialog_new();
label = gtk_label_new(message);
+ gtk_widget_set_usize(label, 340, -1);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_widget_show(label);
- close = gtk_button_new_with_label(_(" OK "));
- gtk_widget_show(close);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox),
- label, TRUE, TRUE, 5);
- gtk_box_pack_end(GTK_BOX(GTK_DIALOG(d)->action_area),
- close, FALSE, FALSE, 5);
+
+ 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);
+
+ hbox2 = gtk_hbox_new(FALSE,0);
+ gtk_widget_show(hbox2);
+ gtk_box_pack_end(GTK_BOX(hbox2), close, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), hbox2, TRUE,
TRUE, 0);
+
/* so text isn't up against the border */
gtk_container_set_border_width(GTK_CONTAINER(d), 5);
gtk_widget_realize(d);
@@ -372,6 +386,7 @@
gtk_window_set_position(GTK_WINDOW(d), GTK_WIN_POS_MOUSE);
gtk_signal_connect_object(GTK_OBJECT(close), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(d));
gtk_window_set_modal(GTK_WINDOW(d), modal);
+ gtk_widget_set_usize(d, 350, d->requisition.height<150?
150:d->requisition.height);
gtk_widget_show(d);
gtk_widget_grab_focus(close);
}
Index: dialog.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dialog.h 29 Jan 2003 19:19:22 -0000 1.10
+++ dialog.h 22 Mar 2003 11:32:53 -0000 1.11
@@ -97,6 +97,7 @@
void do_list_dialog( gchar * message, gchar * title, char **list, void
(*action)(char * text, gpointer data), gpointer data );
void do_text_input_window( gchar * title, gchar * value, void (*action)(char *
text, gpointer data), gpointer data );
void eb_icon(GdkWindow *);
+GtkWidget * do_icon_button (char *label, char **xpm, GtkWidget *w);
#ifdef __cplusplus
} /* extern "C" */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src dialog.c,1.18,1.19 dialog.h,1.10,1.11,
Colin Leroy <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.370,1.371 configure.in,1.365,1.366
- Next by Date:
[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.84,1.85
- Previous by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.370,1.371 configure.in,1.365,1.366
- Next by thread:
[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.84,1.85
- Index(es):