Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv27793
Modified Files:
errorchain.c
Log Message:
* Beautify the error dialog. This is seems to be a never-ending story...
Index: errorchain.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/errorchain.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** errorchain.c 15 Jul 2002 18:36:51 -0000 1.10
--- errorchain.c 28 Sep 2002 20:04:14 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
#include "debug.h"
#include "i18n.h"
+ #include "input.h"
#include "../icons/bomb.xpm"
***************
*** 188,192 ****
GdkPixmap *bomb;
GdkBitmap *bomb_mask;
! GtkWidget *pixmap, *popupwin, *vbox, *vbox1, *hbox0, *hbox, *vbox2, *msg_label, *okbutton;
struct errchain *chain;
struct errmsgs *cur_msg, *old_msg;
--- 189,193 ----
GdkPixmap *bomb;
GdkBitmap *bomb_mask;
! GtkWidget *pixmap, *popupwin, *vbox, *vbox1, *hbox0, *hbox, *vbox2, *msg_label, *okbutton, *align;
struct errchain *chain;
struct errmsgs *cur_msg, *old_msg;
***************
*** 197,206 ****
popupwin = gtk_dialog_new();
gtk_widget_realize(popupwin);
- gtk_container_border_width(GTK_CONTAINER(popupwin), 12);
gtk_window_set_title(GTK_WINDOW(popupwin), chain->title);
gtk_window_set_policy(GTK_WINDOW(popupwin), FALSE, FALSE, FALSE);
vbox1 = GTK_DIALOG(popupwin)->vbox;
gtk_widget_show(vbox1);
hbox = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
--- 198,210 ----
popupwin = gtk_dialog_new();
gtk_widget_realize(popupwin);
gtk_window_set_title(GTK_WINDOW(popupwin), chain->title);
gtk_window_set_policy(GTK_WINDOW(popupwin), FALSE, FALSE, FALSE);
vbox1 = GTK_DIALOG(popupwin)->vbox;
+
gtk_widget_show(vbox1);
hbox = gtk_hbox_new(FALSE, 0);
+ gtk_container_border_width(GTK_CONTAINER(hbox),
+ CONTAINER_BORDER_WIDTH);
+
gtk_widget_show(hbox);
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
***************
*** 213,220 ****
gtk_box_pack_start(GTK_BOX(hbox), pixmap, TRUE, TRUE, 10);
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
! gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
!
/* show messages, freeing them as we go */
cur_msg = chain->msgs;
--- 217,230 ----
gtk_box_pack_start(GTK_BOX(hbox), pixmap, TRUE, TRUE, 10);
+ /* align messages with the error icon. One-line messages
+ look better that way... */
+ align = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
+ gtk_widget_show(align);
+ gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0);
+
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
! gtk_container_add(GTK_CONTAINER(align), vbox);
!
/* show messages, freeing them as we go */
cur_msg = chain->msgs;
***************
*** 222,226 ****
msg_label = gtk_label_new(cur_msg->msg);
gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT);
! gtk_misc_set_alignment(GTK_MISC(msg_label), 0, 0);
gtk_widget_show(msg_label);
gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0);
--- 232,236 ----
msg_label = gtk_label_new(cur_msg->msg);
gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT);
! gtk_misc_set_alignment(GTK_MISC(msg_label), 0, 0.5);
gtk_widget_show(msg_label);
gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0);
***************
*** 235,238 ****
--- 245,249 ----
hbox0 = gtk_hbutton_box_new();
+ gtk_container_border_width(GTK_CONTAINER(hbox0), 0);
gtk_box_pack_end(GTK_BOX(vbox2), hbox0, TRUE, FALSE, 0);
gtk_widget_show(hbox0);
|
