Mercurial > pidgin.yaz
comparison src/conversation.c @ 615:9f168ba28ac2
[gaim-migrate @ 625]
the default fontface now works in buddy chats as well
committer: Tailor Script <tailor@pidgin.im>
author | Todd Kulesza <fflewddur> |
---|---|
date | Sat, 05 Aug 2000 04:38:19 +0000 |
parents | 0f7e5ff95f71 |
children | 83b0caceea9a |
comparison
equal
deleted
inserted
replaced
614:a3e32af35b30 | 615:9f168ba28ac2 |
---|---|
1305 font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, | 1305 font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, |
1306 &win->style->white, fontface_xpm ); | 1306 &win->style->white, fontface_xpm ); |
1307 font_p = gtk_pixmap_new(font_i, mask); | 1307 font_p = gtk_pixmap_new(font_i, mask); |
1308 gtk_widget_show(font_p); | 1308 gtk_widget_show(font_p); |
1309 smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_xpm); | 1309 smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_xpm); |
1310 /*gdk_pixmap_create_from_xpm_d(win->window, &mask | |
1311 &win->style->white, smile_xpm);*/ | |
1312 smiley_p = gtk_pixmap_new(smiley_i, mask); | 1310 smiley_p = gtk_pixmap_new(smiley_i, mask); |
1313 gtk_widget_show(smiley_p); | 1311 gtk_widget_show(smiley_p); |
1314 | 1312 |
1315 bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1313 bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1316 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, | 1314 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, |
1317 _("Bold"), _("Bold Text"), _("Bold"), bold_p, | 1315 _("Bold"), _("Bold Text"), _("Bold"), bold_p, |
1318 GTK_SIGNAL_FUNC(do_bold), entry); | 1316 GTK_SIGNAL_FUNC(do_bold), entry); |
1319 italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1317 italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1320 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1318 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1321 NULL, _("Italics"), _("Italics Text"), | 1319 NULL, _("Italics"), _("Italics Text"), |
1322 _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), entry); | 1320 _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), entry); |
1323 underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1321 underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1324 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1322 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1325 NULL, _("Underline"), _("Underline Text"), | 1323 NULL, _("Underline"), _("Underline Text"), |
1327 strike = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1325 strike = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1328 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1326 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1329 NULL, _("Strike"), _("Strike through Text"), | 1327 NULL, _("Strike"), _("Strike through Text"), |
1330 _("Strike"), strike_p, GTK_SIGNAL_FUNC(do_strike), entry); | 1328 _("Strike"), strike_p, GTK_SIGNAL_FUNC(do_strike), entry); |
1331 gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); | 1329 gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
1332 small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Small"), _("Decrease font size"), _("Small"), small_p, GTK_SIGNAL_FUNC(do_small), entry); | 1330 small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
1333 normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Normal"), _("Normal font size"), _("Normal"), normal_p, GTK_SIGNAL_FUNC(do_normal), entry); | 1331 _("Small"), _("Decrease font size"), _("Small"), |
1334 big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), _("Big"), _("Increase font size"), _("Big"), big_p, GTK_SIGNAL_FUNC(do_big), entry); | 1332 small_p, GTK_SIGNAL_FUNC(do_small), entry); |
1333 normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), | |
1334 _("Normal"), _("Normal font size"), _("Normal"), | |
1335 normal_p, GTK_SIGNAL_FUNC(do_normal), entry); | |
1336 big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), | |
1337 _("Big"), _("Increase font size"), _("Big"), | |
1338 big_p, GTK_SIGNAL_FUNC(do_big), entry); | |
1335 font = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1339 font = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1336 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1340 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1337 NULL, _("Font"), _("Select Font"), | 1341 NULL, _("Font"), _("Select Font"), |
1338 _("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c); | 1342 _("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c); |
1339 | |
1340 gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); | 1343 gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
1341 link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1344 link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1342 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1345 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1343 NULL, _("Link"), _("Insert Link"), | 1346 NULL, _("Link"), _("Insert Link"), |
1344 _("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c); | 1347 _("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c); |
1345 palette = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1348 palette = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1346 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1349 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1347 NULL, _("Color"), _("Text Color"), | 1350 NULL, _("Color"), _("Text Color"), |
1348 _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); | 1351 _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); |
1349 wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1352 wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1350 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1353 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1351 NULL, _("Logging"), _("Enable logging"), | 1354 NULL, _("Logging"), _("Enable logging"), |
1352 _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); | 1355 _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); |
1353 smiley = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1356 smiley = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1354 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1357 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1355 NULL, _("Smiley"), _("Insert smiley face"), _("Smiley"), | 1358 NULL, _("Smiley"), _("Insert smiley face"), _("Smiley"), |
1356 smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c); | 1359 smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c); |
1357 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1360 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
1358 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1361 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
1359 NULL, _("Sound"), _("Enable sounds"), | 1362 NULL, _("Sound"), _("Enable sounds"), |
1360 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); | 1363 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); |
1361 c->makesound=0; | 1364 c->makesound=0; |
1362 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(speaker), TRUE); | 1365 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(speaker), TRUE); |
1363 | 1366 |
1364 state_lock = 1; | 1367 state_lock = 1; |
1365 if (find_log_info(c->name)) | 1368 if (find_log_info(c->name)) |
1366 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), TRUE); | 1369 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), TRUE); |
1367 else | 1370 else |
1368 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE); | 1371 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE); |
1369 state_lock = 0; | 1372 state_lock = 0; |
1370 | 1373 |
1371 /* use a slicker look if the user wants to */ | 1374 /* use a slicker look if the user wants to */ |
1372 if (display_options & OPT_DISP_COOL_LOOK) | 1375 if (display_options & OPT_DISP_COOL_LOOK) |
1373 { | 1376 { |
1374 gtk_button_set_relief(GTK_BUTTON(strike), GTK_RELIEF_NONE); | 1377 gtk_button_set_relief(GTK_BUTTON(strike), GTK_RELIEF_NONE); |
1388 | 1391 |
1389 gtk_widget_show(toolbar); | 1392 gtk_widget_show(toolbar); |
1390 | 1393 |
1391 c->bold = bold; | 1394 c->bold = bold; |
1392 c->strike = strike; | 1395 c->strike = strike; |
1393 c->italic = italic; | 1396 c->italic = italic; |
1394 c->underline = underline; | 1397 c->underline = underline; |
1395 c->log_button = wood; | 1398 c->log_button = wood; |
1396 c->palette = palette; | 1399 c->palette = palette; |
1397 c->link = link; | 1400 c->link = link; |
1398 c->wood = wood; | 1401 c->wood = wood; |
1399 c->font = font; | 1402 c->font = font; |
1400 c->smiley = smiley; | 1403 c->smiley = smiley; |
1401 | 1404 |
1402 gtk_widget_set_sensitive(c->log_button, ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE); | 1405 gtk_widget_set_sensitive(c->log_button, ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE); |
1403 | 1406 |
1404 gtk_widget_set_sensitive(c->bold, ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE); | 1407 gtk_widget_set_sensitive(c->bold, ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE); |
1405 gtk_widget_set_sensitive(c->italic, ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE); | 1408 gtk_widget_set_sensitive(c->italic, ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE); |
1406 gtk_widget_set_sensitive(c->underline, ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE); | 1409 gtk_widget_set_sensitive(c->underline, ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE); |
1407 gtk_widget_set_sensitive(c->strike, ((font_options & OPT_FONT_STRIKE)) ? FALSE : TRUE); | 1410 gtk_widget_set_sensitive(c->strike, ((font_options & OPT_FONT_STRIKE)) ? FALSE : TRUE); |
1411 | 1414 |
1412 | 1415 |
1413 void show_conv(struct conversation *c) | 1416 void show_conv(struct conversation *c) |
1414 { | 1417 { |
1415 GtkWidget *win; | 1418 GtkWidget *win; |
1416 char buf[256]; | 1419 char buf[256]; |
1417 GtkWidget *text; | 1420 GtkWidget *text; |
1418 GtkWidget *sw; | 1421 GtkWidget *sw; |
1419 GtkWidget *send; | 1422 GtkWidget *send; |
1420 GtkWidget *info; | 1423 GtkWidget *info; |
1421 GtkWidget *warn; | 1424 GtkWidget *warn; |
1422 GtkWidget *block; | 1425 GtkWidget *block; |
1423 /* GtkWidget *color; */ | |
1424 GtkWidget *close; | 1426 GtkWidget *close; |
1425 GtkWidget *entry; | 1427 GtkWidget *entry; |
1426 GtkWidget *toolbar; | 1428 GtkWidget *toolbar; |
1427 GtkWidget *bbox; | 1429 GtkWidget *bbox; |
1428 GtkWidget *vbox; | 1430 GtkWidget *vbox; |
1429 GtkWidget *vbox2; | 1431 GtkWidget *vbox2; |
1430 GtkWidget *paned; | 1432 GtkWidget *paned; |
1431 GtkWidget *add; | 1433 GtkWidget *add; |
1432 | 1434 |
1433 win = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 1435 win = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
1434 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE); | 1436 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE); |
1435 | 1437 |
1436 gtk_widget_realize(win); | 1438 gtk_widget_realize(win); |
1437 aol_icon(win->window); | 1439 aol_icon(win->window); |
1438 | |
1439 | 1440 |
1440 c->window = win; | 1441 c->window = win; |
1441 | 1442 |
1442 send = gtk_button_new_with_label(_("Send")); | 1443 send = gtk_button_new_with_label(_("Send")); |
1443 info = gtk_button_new_with_label(_("Info")); | 1444 info = gtk_button_new_with_label(_("Info")); |
1444 warn = gtk_button_new_with_label(_("Warn")); | 1445 warn = gtk_button_new_with_label(_("Warn")); |
1445 /* color = gtk_button_new_with_label("Color"); */ | |
1446 close = gtk_button_new_with_label(_("Close")); | 1446 close = gtk_button_new_with_label(_("Close")); |
1447 if (find_buddy(c->name) != NULL) { | 1447 if (find_buddy(c->name) != NULL) |
1448 add = gtk_button_new_with_label(_("Remove")); | 1448 add = gtk_button_new_with_label(_("Remove")); |
1449 } | 1449 else |
1450 else { | |
1451 add = gtk_button_new_with_label(_("Add")); | 1450 add = gtk_button_new_with_label(_("Add")); |
1452 } | 1451 block = gtk_button_new_with_label(_("Block")); |
1453 block = gtk_button_new_with_label(_("Block")); | |
1454 | 1452 |
1455 /* use a slicker look if the user wants to */ | 1453 /* use a slicker look if the user wants to */ |
1456 if (display_options & OPT_DISP_COOL_LOOK) | 1454 if (display_options & OPT_DISP_COOL_LOOK) |
1457 { | 1455 { |
1458 gtk_button_set_relief(GTK_BUTTON(send), GTK_RELIEF_NONE); | 1456 gtk_button_set_relief(GTK_BUTTON(send), GTK_RELIEF_NONE); |
1461 gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE); | 1459 gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE); |
1462 gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE); | 1460 gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE); |
1463 gtk_button_set_relief(GTK_BUTTON(block), GTK_RELIEF_NONE); | 1461 gtk_button_set_relief(GTK_BUTTON(block), GTK_RELIEF_NONE); |
1464 } | 1462 } |
1465 | 1463 |
1466 bbox = gtk_hbox_new(TRUE, 0); | 1464 bbox = gtk_hbox_new(TRUE, 0); |
1467 vbox = gtk_vbox_new(FALSE, 0); | 1465 vbox = gtk_vbox_new(FALSE, 0); |
1468 vbox2 = gtk_vbox_new(FALSE, 0); | 1466 vbox2 = gtk_vbox_new(FALSE, 0); |
1469 paned = gtk_vpaned_new(); | 1467 paned = gtk_vpaned_new(); |
1470 | 1468 |
1471 gtk_paned_pack1(GTK_PANED(paned), vbox, FALSE, TRUE); | 1469 gtk_paned_pack1(GTK_PANED(paned), vbox, FALSE, TRUE); |
1476 entry = gtk_text_new(NULL, NULL); | 1474 entry = gtk_text_new(NULL, NULL); |
1477 gtk_text_set_editable(GTK_TEXT(entry), TRUE); | 1475 gtk_text_set_editable(GTK_TEXT(entry), TRUE); |
1478 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE); | 1476 gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE); |
1479 gtk_object_set_user_data(GTK_OBJECT(entry), c); | 1477 gtk_object_set_user_data(GTK_OBJECT(entry), c); |
1480 c->entry = entry; | 1478 c->entry = entry; |
1481 | 1479 gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback),c); |
1480 c->add_button = add; | |
1481 | |
1482 /* Toolbar */ | 1482 /* Toolbar */ |
1483 toolbar = build_conv_toolbar(c); | 1483 toolbar = build_conv_toolbar(c); |
1484 | 1484 |
1485 | 1485 /* Text box */ |
1486 c->add_button = add; | 1486 text = gtk_html_new(NULL, NULL); |
1487 | |
1488 | |
1489 gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback),c); | |
1490 | |
1491 /* Text box */ | |
1492 | |
1493 | |
1494 text = gtk_html_new(NULL, NULL); | |
1495 | |
1496 gtk_html_set_editable(GTK_HTML(text), FALSE); | 1487 gtk_html_set_editable(GTK_HTML(text), FALSE); |
1497 /* gtk_html_set_transparent(GTK_HTML(text), (transparent) ? TRUE : FALSE);*/ | 1488 /* gtk_html_set_transparent(GTK_HTML(text), (transparent) ? TRUE : FALSE);*/ |
1498 c->text = text; | 1489 c->text = text; |
1499 | 1490 |
1500 sw = gtk_scrolled_window_new (NULL, NULL); | 1491 sw = gtk_scrolled_window_new (NULL, NULL); |
1501 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), | 1492 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), |
1502 GTK_POLICY_NEVER, | 1493 GTK_POLICY_NEVER, |
1503 GTK_POLICY_ALWAYS); | 1494 GTK_POLICY_ALWAYS); |
1504 gtk_widget_show(sw); | 1495 gtk_widget_show(sw); |
1505 gtk_container_add(GTK_CONTAINER(sw), text); | 1496 gtk_container_add(GTK_CONTAINER(sw), text); |
1506 gtk_widget_show(text); | 1497 gtk_widget_show(text); |
1507 | 1498 |
1508 | 1499 GTK_HTML (text)->hadj->step_increment = 10.0; |
1509 | 1500 GTK_HTML (text)->vadj->step_increment = 10.0; |
1510 | 1501 gtk_widget_set_usize(sw, 320, 150); |
1511 GTK_HTML (text)->hadj->step_increment = 10.0; | |
1512 GTK_HTML (text)->vadj->step_increment = 10.0; | |
1513 gtk_widget_set_usize(sw, 320, 150); | |
1514 | |
1515 | |
1516 | 1502 |
1517 /* Ready and pack buttons */ | 1503 /* Ready and pack buttons */ |
1518 gtk_object_set_user_data(GTK_OBJECT(win), c); | 1504 gtk_object_set_user_data(GTK_OBJECT(win), c); |
1519 gtk_object_set_user_data(GTK_OBJECT(close), c); | 1505 gtk_object_set_user_data(GTK_OBJECT(close), c); |
1520 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), c); | 1506 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), c); |
1521 gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback), c); | 1507 gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback), c); |
1522 gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(add_callback), c); | 1508 gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(add_callback), c); |
1523 gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), c); | 1509 gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), c); |
1524 gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c); | 1510 gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c); |
1525 gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); | 1511 gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); |
1526 /* gtk_signal_connect(GTK_OBJECT(color), "clicked", GTK_SIGNAL_FUNC(color_callback), c); */ | |
1527 | 1512 |
1528 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c); | 1513 gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c); |
1529 gtk_widget_set_usize(entry, 300, 25); | 1514 gtk_widget_set_usize(entry, 300, 25); |
1530 | 1515 |
1531 gtk_box_pack_start(GTK_BOX(bbox), send, TRUE, TRUE, 5); | 1516 gtk_box_pack_start(GTK_BOX(bbox), send, TRUE, TRUE, 5); |
1532 gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 5); | 1517 gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 5); |
1533 gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 5); | 1518 gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 5); |
1534 gtk_box_pack_start(GTK_BOX(bbox), block, TRUE, TRUE, 5); | 1519 gtk_box_pack_start(GTK_BOX(bbox), block, TRUE, TRUE, 5); |
1535 /* gtk_box_pack_start(GTK_BOX(bbox), color, TRUE, TRUE, 5); */ | |
1536 gtk_box_pack_start(GTK_BOX(bbox), add, TRUE, TRUE, 5); | 1520 gtk_box_pack_start(GTK_BOX(bbox), add, TRUE, TRUE, 5); |
1537 gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5); | 1521 gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5); |
1538 | 1522 |
1539 /* pack and fill the rest */ | 1523 /* pack and fill the rest */ |
1540 | |
1541 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5); | 1524 gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5); |
1542 gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 5); | 1525 gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 5); |
1543 gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 5); | 1526 gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 5); |
1544 gtk_box_pack_start(GTK_BOX(vbox2), bbox, FALSE, FALSE, 5); | 1527 gtk_box_pack_start(GTK_BOX(vbox2), bbox, FALSE, FALSE, 5); |
1545 | 1528 |
1546 gtk_widget_show(send); | 1529 gtk_widget_show(send); |
1547 gtk_widget_show(info); | 1530 gtk_widget_show(info); |
1548 gtk_widget_show(warn); | 1531 gtk_widget_show(warn); |
1549 /* gtk_widget_show(color); */ | |
1550 gtk_widget_show(close); | 1532 gtk_widget_show(close); |
1551 gtk_widget_show(add); | 1533 gtk_widget_show(add); |
1552 gtk_widget_show(block); | 1534 gtk_widget_show(block); |
1553 gtk_widget_show(bbox); | 1535 gtk_widget_show(bbox); |
1554 gtk_widget_show(vbox); | 1536 gtk_widget_show(vbox); |
1555 gtk_widget_show(entry); | 1537 gtk_widget_show(entry); |
1556 gtk_widget_show(text); | 1538 gtk_widget_show(text); |
1557 | 1539 |