zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-23 00:42:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Mark Wooding to use GTK stock items for standard 'OK',

Browse Source 
'Yes' and 'No' buttons, which means they get the standard icons that
go on those button types. Also reorders yes/no boxes so that they're
the GNOME standard way round.

[originally from svn r8959]
This commit is contained in:
Simon Tatham
2010-05-29 15:43:40 +00:00
parent 0a4c832e9b
commit d040a921ba
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk.c
View File

@ -826,18 +826,18 @@ int message_box(GtkWidget *parent, char *title, char *msg, int centre,
gtk_label_set_line_wrap(GTK_LABEL(text), TRUE); gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
if (type == MB_OK) { if (type == MB_OK) {
titles = "OK\0"; titles = GTK_STOCK_OK "\0";
def = cancel = 0; def = cancel = 0;
} else { } else {
assert(type == MB_YESNO); assert(type == MB_YESNO);
titles = "Yes\0No\0"; titles = GTK_STOCK_NO "\0" GTK_STOCK_YES "\0";
def = 0; def = 1;
cancel = 1; cancel = 0;
} }
i = 0; i = 0;
while (*titles) { while (*titles) {
button = gtk_button_new_with_label(titles); button = gtk_button_new_from_stock(titles);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area), gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area),
button, FALSE, FALSE, 0); button, FALSE, FALSE, 0);
gtk_widget_show(button); gtk_widget_show(button);
@ -866,7 +866,7 @@ int message_box(GtkWidget *parent, char *title, char *msg, int centre,
gtk_widget_show(window); gtk_widget_show(window);
i = -1; i = -1;
gtk_main(); gtk_main();
return (type == MB_YESNO ? i == 0 : TRUE); return (type == MB_YESNO ? i == 1 : TRUE);
} }
void error_box(GtkWidget *parent, char *msg) void error_box(GtkWidget *parent, char *msg)
@ -956,7 +956,15 @@ static int get_config(frontend *fe, int which)
gtk_window_set_title(GTK_WINDOW(fe->cfgbox), title); gtk_window_set_title(GTK_WINDOW(fe->cfgbox), title);
sfree(title); sfree(title);
w = gtk_button_new_with_label("OK"); w = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area),
w, FALSE, FALSE, 0);
gtk_widget_show(w);
gtk_signal_connect(GTK_OBJECT(w), "clicked",
GTK_SIGNAL_FUNC(config_cancel_button_clicked), fe);
cancel = w;
w = gtk_button_new_from_stock(GTK_STOCK_OK);
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area), gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area),
w, FALSE, FALSE, 0); w, FALSE, FALSE, 0);
gtk_widget_show(w); gtk_widget_show(w);
@ -965,14 +973,6 @@ static int get_config(frontend *fe, int which)
gtk_signal_connect(GTK_OBJECT(w), "clicked", gtk_signal_connect(GTK_OBJECT(w), "clicked",
GTK_SIGNAL_FUNC(config_ok_button_clicked), fe); GTK_SIGNAL_FUNC(config_ok_button_clicked), fe);
w = gtk_button_new_with_label("Cancel");
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->action_area),
w, FALSE, FALSE, 0);
gtk_widget_show(w);
gtk_signal_connect(GTK_OBJECT(w), "clicked",
GTK_SIGNAL_FUNC(config_cancel_button_clicked), fe);
cancel = w;
table = gtk_table_new(1, 2, FALSE); table = gtk_table_new(1, 2, FALSE);
y = 0; y = 0;
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->vbox), gtk_box_pack_end(GTK_BOX(GTK_DIALOG(fe->cfgbox)->vbox),