Revision 31

src/prefs_display_header.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2004 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
188 188
	gtk_widget_show (btn_hbox);
189 189
	gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
190 190

  
191
	gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
192
				&cancel_btn, _("Cancel"), NULL, NULL);
191
	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
192
				      &cancel_btn, GTK_STOCK_CANCEL,
193
				      NULL, NULL);
193 194
	gtk_widget_show (confirm_area);
194 195
	gtk_box_pack_end (GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
195 196
	gtk_widget_grab_default (ok_btn);
src/action.c (revision 31)
1103 1103
		gtk_widget_grab_focus(entry);
1104 1104
	}
1105 1105

  
1106
	gtkut_button_set_create(&hbox, &abort_button, _("Abort"),
1107
				&close_button, _("Close"), NULL, NULL);
1106
	gtkut_stock_button_set_create(&hbox, &abort_button, _("Abort"),
1107
				      &close_button, GTK_STOCK_CLOSE,
1108
				      NULL, NULL);
1108 1109
	g_signal_connect(G_OBJECT(abort_button), "clicked",
1109 1110
			 G_CALLBACK(kill_children_cb), children);
1110 1111
	g_signal_connect(G_OBJECT(close_button), "clicked",
src/grouplistdialog.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2003 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
38 38
#include <gtk/gtkscrolledwindow.h>
39 39
#include <gtk/gtkbutton.h>
40 40
#include <gtk/gtkhbbox.h>
41
#include <gtk/gtkstock.h>
41 42
#include <string.h>
42 43
#include <fnmatch.h>
43 44

  
......
241 242
	status_label = gtk_label_new("");
242 243
	gtk_box_pack_start(GTK_BOX(hbox), status_label, FALSE, FALSE, 0);
243 244

  
244
	gtkut_button_set_create(&confirm_area,
245
				&ok_button,      _("OK"),
246
				&cancel_button,  _("Cancel"),
247
				&refresh_button, _("Refresh"));
245
	gtkut_stock_button_set_create(&confirm_area,
246
				      &ok_button, GTK_STOCK_OK,
247
				      &cancel_button, GTK_STOCK_CANCEL,
248
				      &refresh_button, GTK_STOCK_REFRESH);
248 249
	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
249 250
			  confirm_area);
250 251
	gtk_widget_grab_default(ok_button);
src/textview.c (revision 31)
1623 1623
					"the apparent URL (%s).\n"
1624 1624
					"Open it anyway?"),
1625 1625
				      uri->uri, visible_str);
1626
		aval = alertpanel(_("Warning"), msg, _("Yes"), _("No"), NULL);
1626
		aval = alertpanel(_("Warning"), msg,
1627
				  GTK_STOCK_YES, GTK_STOCK_NO, NULL);
1627 1628
		g_free(msg);
1628 1629
		if (aval == G_ALERTDEFAULT)
1629 1630
			retval = TRUE;
src/editbook.c (revision 31)
218 218
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
219 219

  
220 220
	/* Button panel */
221
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
222
				&cancel_btn, _("Cancel"), NULL, NULL);
221
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
222
				      &cancel_btn, GTK_STOCK_CANCEL,
223
				      NULL, NULL);
223 224
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
224 225
	gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
225 226
	gtk_widget_grab_default(ok_btn);
src/editgroup.c (revision 31)
366 366
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
367 367

  
368 368
	/* Button panel */
369
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
370
				&cancel_btn, _("Cancel"), NULL, NULL);
369
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
370
				      &cancel_btn, GTK_STOCK_CANCEL,
371
				      NULL, NULL);
371 372
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
372 373
	gtk_widget_grab_default(ok_btn);
373 374

  
src/importldif.c (revision 31)
757 757
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
758 758

  
759 759
	/* Button panel */
760
	gtkut_button_set_create(&hbbox, &btnPrev, _( "Prev" ),
761
				&btnNext, _( "Next" ),
762
				&btnCancel, _( "Cancel" ) );
760
	gtkut_stock_button_set_create(&hbbox, &btnPrev, _("Prev"),
761
				      &btnNext, _("Next"),
762
				      &btnCancel, GTK_STOCK_CANCEL);
763 763
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
764 764
	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
765 765
	gtk_widget_grab_default(btnNext);
src/summary_search.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2004 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
218 218
	g_signal_connect(G_OBJECT(all_checkbtn), "clicked",
219 219
			 G_CALLBACK(all_clicked), summaryview);
220 220

  
221
	gtkut_button_set_create(&confirm_area,
222
				&search_btn, _("Search"),
223
				&clear_btn,  _("Clear"),
224
				&close_btn,  _("Close"));
221
	gtkut_stock_button_set_create(&confirm_area,
222
				      &search_btn, GTK_STOCK_FIND,
223
				      &clear_btn, GTK_STOCK_CLEAR,
224
				      &close_btn, GTK_STOCK_CLOSE);
225 225
	gtk_widget_show (confirm_area);
226 226
	gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
227 227
	gtk_widget_grab_default(search_btn);
src/message_search.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2004 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
130 130
	gtk_box_pack_start (GTK_BOX (checkbtn_hbox), backward_checkbtn,
131 131
			    FALSE, FALSE, 0);
132 132

  
133
	gtkut_button_set_create(&confirm_area,
134
				&search_btn, _("Search"),
135
				&clear_btn,  _("Clear"),
136
				&close_btn,  _("Close"));
133
	gtkut_stock_button_set_create(&confirm_area,
134
				      &search_btn, GTK_STOCK_FIND,
135
				      &clear_btn, GTK_STOCK_CLEAR,
136
				      &close_btn, GTK_STOCK_CLOSE);
137 137
	gtk_widget_show (confirm_area);
138 138
	gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
139 139
	gtk_widget_grab_default(search_btn);
src/select-keys.c (revision 31)
318 318
    hbox = gtk_hbox_new (FALSE, 8);
319 319
    gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
320 320

  
321
    gtkut_button_set_create (&bbox, 
322
                             &select_btn, _("Select"),
323
                             &cancel_btn, _("Cancel"),
324
                             &other_btn,  _("Other"));
321
    gtkut_stock_button_set_create (&bbox, 
322
                                   &select_btn, _("Select"),
323
                                   &cancel_btn, GTK_STOCK_CANCEL,
324
                                   &other_btn,  _("Other"));
325 325
    gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
326 326
    gtk_widget_grab_default (select_btn);
327 327

  
src/editjpilot.c (revision 31)
342 342
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
343 343

  
344 344
	/* Button panel */
345
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
346
				&cancel_btn, _("Cancel"), NULL, NULL);
345
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
346
				      &cancel_btn, GTK_STOCK_CANCEL,
347
				      NULL, NULL);
347 348
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
348 349
	gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
349 350
	gtk_widget_grab_default(ok_btn);
src/export.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2002 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
194 194
	g_signal_connect(G_OBJECT(file_button), "clicked",
195 195
			 G_CALLBACK(export_filesel_cb), NULL);
196 196

  
197
	gtkut_button_set_create(&confirm_area,
198
				&ok_button,	_("OK"),
199
				&cancel_button, _("Cancel"),
200
				NULL, NULL);
197
	gtkut_stock_button_set_create(&confirm_area,
198
				      &ok_button, GTK_STOCK_OK,
199
				      &cancel_button, GTK_STOCK_CANCEL,
200
				      NULL, NULL);
201 201
	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
202 202
	gtk_widget_grab_default(ok_button);
203 203

  
src/editaddress.c (revision 31)
196 196
	SET_LABEL_AND_ENTRY(_("Address"), addr_entry, 1);
197 197
	SET_LABEL_AND_ENTRY(_("Remarks"), rem_entry,  2);
198 198

  
199
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
200
				&cancel_btn, _("Cancel"), NULL, NULL);
199
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
200
				      &cancel_btn, GTK_STOCK_CANCEL,
201
				      NULL, NULL);
201 202
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
202 203
	gtk_widget_grab_default(ok_btn);
203 204

  
......
669 670
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
670 671

  
671 672
	/* Button panel */
672
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
673
				&cancel_btn, _("Cancel"), NULL, NULL);
673
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
674
				      &cancel_btn, GTK_STOCK_CANCEL,
675
				      NULL, NULL);
674 676
	gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
675 677
	gtk_widget_grab_default(ok_btn);
676 678

  
src/addressadd.c (revision 31)
239 239
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
240 240

  
241 241
	/* Button panel */
242
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
243
				&cancel_btn, _("Cancel"), NULL, NULL);
242
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
243
				      &cancel_btn, GTK_STOCK_CANCEL,
244
				      NULL, NULL);
244 245
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
245 246
	gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
246 247
	gtk_widget_grab_default(ok_btn);
src/editldap_basedn.c (revision 31)
211 211
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
212 212

  
213 213
	/* Button panel */
214
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
215
				&cancel_btn, _("Cancel"), NULL, NULL);
214
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
215
				      &cancel_btn, GTK_STOCK_CANCEL,
216
				      NULL, NULL);
216 217
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
217 218
	gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
218 219
	gtk_widget_grab_default(ok_btn);
src/prefs_summary_column.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2001 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
303 303
	g_signal_connect(G_OBJECT(default_btn), "clicked",
304 304
			 G_CALLBACK(prefs_summary_column_set_to_default), NULL);
305 305

  
306
	gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
307
				&cancel_btn, _("Cancel"), NULL, NULL);
306
	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
307
				      &cancel_btn, GTK_STOCK_CANCEL,
308
				      NULL, NULL);
308 309
	gtk_widget_show(confirm_area);
309 310
	gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
310 311
	gtk_widget_grab_default(ok_btn);
src/import.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2002 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
199 199
	g_signal_connect(G_OBJECT(dest_button), "clicked",
200 200
			 G_CALLBACK(import_destsel_cb), NULL);
201 201

  
202
	gtkut_button_set_create(&confirm_area,
203
				&ok_button,	_("OK"),
204
				&cancel_button, _("Cancel"),
205
				NULL, NULL);
202
	gtkut_stock_button_set_create(&confirm_area,
203
				      &ok_button, GTK_STOCK_OK,
204
				      &cancel_button, GTK_STOCK_CANCEL,
205
				      NULL, NULL);
206 206
	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
207 207
	gtk_widget_grab_default(ok_button);
208 208

  
src/prefs_filter_edit.c (revision 31)
327 327
	gtk_widget_show(vbox);
328 328
	gtk_container_add(GTK_CONTAINER(window), vbox);
329 329

  
330
	gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
331
				&cancel_btn, _("Cancel"), NULL, NULL);
330
	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
331
				      &cancel_btn, GTK_STOCK_CANCEL,
332
				      NULL, NULL);
332 333
	gtk_widget_show(confirm_area);
333 334
	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
334 335
	gtk_widget_grab_default(ok_btn);
......
1552 1553
	del_btn = gtk_button_new_with_label(_(" Delete "));
1553 1554
	gtk_box_pack_start(GTK_BOX(btn_vbox), del_btn, FALSE, FALSE, 0);
1554 1555

  
1555
	gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
1556
				&cancel_btn, _("Cancel"), NULL, NULL);
1556
	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
1557
				      &cancel_btn, GTK_STOCK_CANCEL,
1558
				      NULL, NULL);
1557 1559
	gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
1558 1560
	gtk_widget_grab_default(ok_btn);
1559 1561

  
src/editvcard.c (revision 31)
237 237
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
238 238

  
239 239
	/* Button panel */
240
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
241
				&cancel_btn, _("Cancel"), NULL, NULL);
240
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
241
				      &cancel_btn, GTK_STOCK_CANCEL,
242
				      NULL, NULL);
242 243
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
243 244
	gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
244 245
	gtk_widget_grab_default(ok_btn);
src/prefs_customheader.c (revision 31)
1 1
/*
2 2
 * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
3
 * Copyright (C) 1999-2003 Hiroyuki Yamamoto
3
 * Copyright (C) 1999-2005 Hiroyuki Yamamoto
4 4
 *
5 5
 * This program is free software; you can redistribute it and/or modify
6 6
 * it under the terms of the GNU General Public License as published by
......
154 154
	gtk_widget_show (vbox);
155 155
	gtk_container_add (GTK_CONTAINER (window), vbox);
156 156

  
157
	gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
158
				&cancel_btn, _("Cancel"), NULL, NULL);
157
	gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
158
				      &cancel_btn, GTK_STOCK_CANCEL,
159
				      NULL, NULL);
159 160
	gtk_widget_show (confirm_area);
160 161
	gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
161 162
	gtk_widget_grab_default (ok_btn);
src/editldap.c (revision 31)
241 241
	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
242 242

  
243 243
	/* Button panel */
244
	gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
245
				&cancel_btn, _("Cancel"), NULL, NULL);
244
	gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
245
				      &cancel_btn, GTK_STOCK_CANCEL,
246
				      NULL, NULL);
246 247
	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
247 248
	gtk_widget_grab_default(ok_btn);
248 249

  
src/sigstatus.c (revision 31)
132 132
	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
133 133
	gtk_widget_show(label);
134 134

  
135
	gtkut_button_set_create(&okay_area, &okay_btn, _("OK"),
136
				NULL, NULL, NULL, NULL);
135
	gtkut_stock_button_set_create(&okay_area, &okay_btn, GTK_STOCK_OK,
136
				      NULL, NULL, NULL, NULL);
137 137
	gtk_box_pack_end(GTK_BOX(vbox), okay_area, FALSE, FALSE, 0);
138 138
	gtk_widget_grab_default(okay_btn);
139 139
	g_signal_connect(G_OBJECT(okay_btn), "clicked",
ChangeLog.ja (revision 31)
1 1
2005-01-24
2 2

  
3
	* src/prefs_display_header.c
4
	  src/action.c
5
	  src/grouplistdialog.c
6
	  src/textview.c
7
	  src/editbook.c
8
	  src/editgroup.c
9
	  src/importldif.c
10
	  src/summary_search.c
11
	  src/message_search.c
12
	  src/select-keys.c
13
	  src/editjpilot.c
14
	  src/export.c
15
	  src/editaddress.c
16
	  src/addressadd.c
17
	  src/editldap_basedn.c
18
	  src/prefs_summary_column.c
19
	  src/import.c
20
	  src/prefs_filter_edit.c
21
	  src/editvcard.c
22
	  src/prefs_customheader.c
23
	  src/editldap.c
24
	  src/sigstatus.c: ?ܥ??󥻥åȤ? GTK ?Υ??ȥå??ܥ????????ѡ?
25

  
26
2005-01-24
27

  
3 28
	* src/compose.c
4 29
	  src/inc.c
5 30
	  src/prefs_actions.c
ChangeLog (revision 31)
1 1
2005-01-24
2 2

  
3
	* src/prefs_display_header.c
4
	  src/action.c
5
	  src/grouplistdialog.c
6
	  src/textview.c
7
	  src/editbook.c
8
	  src/editgroup.c
9
	  src/importldif.c
10
	  src/summary_search.c
11
	  src/message_search.c
12
	  src/select-keys.c
13
	  src/editjpilot.c
14
	  src/export.c
15
	  src/editaddress.c
16
	  src/addressadd.c
17
	  src/editldap_basedn.c
18
	  src/prefs_summary_column.c
19
	  src/import.c
20
	  src/prefs_filter_edit.c
21
	  src/editvcard.c
22
	  src/prefs_customheader.c
23
	  src/editldap.c
24
	  src/sigstatus.c: use GTK stock button for button set.
25

  
26
2005-01-24
27

  
3 28
	* src/compose.c
4 29
	  src/inc.c
5 30
	  src/prefs_actions.c

Also available in: Unified diff