Mercurial > pidgin

comparison src/gtkrequest.c @ 11243:a511b77a368b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13408] sf patch #1246384, from shiyee "This patch globally defines spacings and boreders according to the Gnome Human Interfaces Guidelines, and uses those defines where appropriate. No visual changes are made, but the the intention is that the defines should help promote uniformness." committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 12 Aug 2005 23:53:28 +0000
parents 46086fcc82b7
children f0bc5f121684
comparison
equal deleted inserted replaced
11242:01c06e7ae1f6 11243:a511b77a368b
309 309
310 g_signal_connect(G_OBJECT(dialog), "response", 310 g_signal_connect(G_OBJECT(dialog), "response",
311 G_CALLBACK(input_response_cb), data); 311 G_CALLBACK(input_response_cb), data);
312 312
313 /* Setup the dialog */ 313 /* Setup the dialog */
314 gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); 314 gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2);
315 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6); 315 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2);
316 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 316 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
317 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 317 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
318 gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0); 318 gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
319 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); 319 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
320 320
321 /* Setup the main horizontal box */ 321 /* Setup the main horizontal box */
322 hbox = gtk_hbox_new(FALSE, 12); 322 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
323 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); 323 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
324 324
325 /* Dialog icon. */ 325 /* Dialog icon. */
326 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, 326 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
327 GTK_ICON_SIZE_DIALOG); 327 GTK_ICON_SIZE_DIALOG);
328 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 328 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
329 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 329 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
330 330
331 /* Vertical box */ 331 /* Vertical box */
332 vbox = gtk_vbox_new(FALSE, 12); 332 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
333 333
334 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 334 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
335 335
336 /* Descriptive label */ 336 /* Descriptive label */
337 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; 337 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
467 467
468 g_signal_connect(G_OBJECT(dialog), "response", 468 g_signal_connect(G_OBJECT(dialog), "response",
469 G_CALLBACK(choice_response_cb), data); 469 G_CALLBACK(choice_response_cb), data);
470 470
471 /* Setup the dialog */ 471 /* Setup the dialog */
472 gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); 472 gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2);
473 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2);
473 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 474 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
474 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 475 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
475 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); 476 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
476 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6);
477 477
478 /* Setup the main horizontal box */ 478 /* Setup the main horizontal box */
479 hbox = gtk_hbox_new(FALSE, 12); 479 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
480 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); 480 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
481 481
482 /* Dialog icon. */ 482 /* Dialog icon. */
483 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, 483 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
484 GTK_ICON_SIZE_DIALOG); 484 GTK_ICON_SIZE_DIALOG);
485 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 485 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
486 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 486 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
487 487
488 /* Vertical box */ 488 /* Vertical box */
489 vbox = gtk_vbox_new(FALSE, 12); 489 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
490 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 490 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
491 491
492 /* Descriptive label */ 492 /* Descriptive label */
493 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; 493 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
494 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; 494 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
507 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 507 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
508 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); 508 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
509 509
510 g_free(label_text); 510 g_free(label_text);
511 511
512 vbox2 = gtk_vbox_new(FALSE, 6); 512 vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
513 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); 513 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
514 while ((radio_text = va_arg(args, char*))) { 514 while ((radio_text = va_arg(args, char*))) {
515 int resp = va_arg(args, int); 515 int resp = va_arg(args, int);
516 radio = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio), radio_text); 516 radio = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio), radio_text);
517 gtk_box_pack_start(GTK_BOX(vbox2), radio, FALSE, FALSE, 0); 517 gtk_box_pack_start(GTK_BOX(vbox2), radio, FALSE, FALSE, 0);
576 576
577 g_signal_connect(G_OBJECT(dialog), "response", 577 g_signal_connect(G_OBJECT(dialog), "response",
578 G_CALLBACK(action_response_cb), data); 578 G_CALLBACK(action_response_cb), data);
579 579
580 /* Setup the dialog */ 580 /* Setup the dialog */
581 gtk_container_set_border_width(GTK_CONTAINER(dialog), 6); 581 gtk_container_set_border_width(GTK_CONTAINER(dialog), GAIM_HIG_BORDER/2);
582 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER/2);
582 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 583 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
583 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); 584 gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
584 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 12); 585 gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), GAIM_HIG_BORDER);
585 gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), 6);
586 586
587 /* Setup the main horizontal box */ 587 /* Setup the main horizontal box */
588 hbox = gtk_hbox_new(FALSE, 12); 588 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
589 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox); 589 gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);
590 590
591 /* Dialog icon. */ 591 /* Dialog icon. */
592 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, 592 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
593 GTK_ICON_SIZE_DIALOG); 593 GTK_ICON_SIZE_DIALOG);
594 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 594 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
595 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 595 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
596 596
597 /* Vertical box */ 597 /* Vertical box */
598 vbox = gtk_vbox_new(FALSE, 12); 598 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
599 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 599 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
600 600
601 /* Descriptive label */ 601 /* Descriptive label */
602 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL; 602 primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
603 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL; 603 secondary_esc = (secondary != NULL) ? g_markup_escape_text(secondary, -1) : NULL;
1208 GtkWidget *first_radio = NULL; 1208 GtkWidget *first_radio = NULL;
1209 GtkWidget *radio; 1209 GtkWidget *radio;
1210 gint i; 1210 gint i;
1211 1211
1212 if (g_list_length(labels) == 2) 1212 if (g_list_length(labels) == 2)
1213 box = gtk_hbox_new(FALSE, 6); 1213 box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
1214 else 1214 else
1215 box = gtk_vbox_new(FALSE, 0); 1215 box = gtk_vbox_new(FALSE, 0);
1216 1216
1217 widget = box; 1217 widget = box;
1218 1218
1384 1384
1385 if (title != NULL) 1385 if (title != NULL)
1386 gtk_window_set_title(GTK_WINDOW(win), title); 1386 gtk_window_set_title(GTK_WINDOW(win), title);
1387 1387
1388 gtk_window_set_role(GTK_WINDOW(win), "multifield"); 1388 gtk_window_set_role(GTK_WINDOW(win), "multifield");
1389 gtk_container_set_border_width(GTK_CONTAINER(win), 12); 1389 gtk_container_set_border_width(GTK_CONTAINER(win), GAIM_HIG_BORDER);
1390 gtk_window_set_resizable(GTK_WINDOW(win), FALSE); 1390 gtk_window_set_resizable(GTK_WINDOW(win), FALSE);
1391 1391
1392 g_signal_connect(G_OBJECT(win), "delete_event", 1392 g_signal_connect(G_OBJECT(win), "delete_event",
1393 G_CALLBACK(destroy_multifield_cb), data); 1393 G_CALLBACK(destroy_multifield_cb), data);
1394 1394
1395 /* Setup the main horizontal box */ 1395 /* Setup the main horizontal box */
1396 hbox = gtk_hbox_new(FALSE, 12); 1396 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
1397 gtk_container_add(GTK_CONTAINER(win), hbox); 1397 gtk_container_add(GTK_CONTAINER(win), hbox);
1398 gtk_widget_show(hbox); 1398 gtk_widget_show(hbox);
1399 1399
1400 /* Dialog icon. */ 1400 /* Dialog icon. */
1401 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION, 1401 img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
1403 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); 1403 gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
1404 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0); 1404 gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
1405 gtk_widget_show(img); 1405 gtk_widget_show(img);
1406 1406
1407 /* Setup the vbox */ 1407 /* Setup the vbox */
1408 vbox = gtk_vbox_new(FALSE, 12); 1408 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
1409 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); 1409 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
1410 gtk_widget_show(vbox); 1410 gtk_widget_show(vbox);
1411 1411
1412 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1412 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1413 1413
1438 GTK_SHADOW_NONE); 1438 GTK_SHADOW_NONE);
1439 gtk_widget_set_size_request(sw, -1, 200); 1439 gtk_widget_set_size_request(sw, -1, 200);
1440 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); 1440 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
1441 gtk_widget_show(sw); 1441 gtk_widget_show(sw);
1442 1442
1443 vbox2 = gtk_vbox_new(FALSE, 12); 1443 vbox2 = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
1444 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox2); 1444 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), vbox2);
1445 gtk_widget_show(vbox2); 1445 gtk_widget_show(vbox2);
1446 } else { 1446 } else {
1447 vbox2 = vbox; 1447 vbox2 = vbox;
1448 } 1448 }
1524 if (col_num >= cols) 1524 if (col_num >= cols)
1525 col_num = 0; 1525 col_num = 0;
1526 } 1526 }
1527 1527
1528 table = gtk_table_new(rows, 2 * cols, FALSE); 1528 table = gtk_table_new(rows, 2 * cols, FALSE);
1529 gtk_table_set_row_spacings(GTK_TABLE(table), 6); 1529 gtk_table_set_row_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE);
1530 gtk_table_set_col_spacings(GTK_TABLE(table), 6); 1530 gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BOX_SPACE);
1531 1531
1532 gtk_container_add(GTK_CONTAINER(frame), table); 1532 gtk_container_add(GTK_CONTAINER(frame), table);
1533 gtk_widget_show(table); 1533 gtk_widget_show(table);
1534 1534
1535 for (row_num = 0, fl = field_list; 1535 for (row_num = 0, fl = field_list;
1656 1656
1657 g_object_unref(sg); 1657 g_object_unref(sg);
1658 1658
1659 /* Button box. */ 1659 /* Button box. */
1660 bbox = gtk_hbutton_box_new(); 1660 bbox = gtk_hbutton_box_new();
1661 gtk_box_set_spacing(GTK_BOX(bbox), 6); 1661 gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
1662 gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); 1662 gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
1663 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); 1663 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
1664 gtk_widget_show(bbox); 1664 gtk_widget_show(bbox);
1665 1665
1666 /* Cancel button */ 1666 /* Cancel button */