pidgin/gtkprefs.c

changeset 37989
018063ec9d2e
parent 37919
2ecbbb3cc871
child 38358
30ba44276e74
equal deleted inserted replaced
37978:266009ac8af6 37989:018063ec9d2e
2482 gtk_widget_show_all(ret); 2482 gtk_widget_show_all(ret);
2483 2483
2484 purple_prefs_connect_callback(prefs, "/purple/proxy/type", 2484 purple_prefs_connect_callback(prefs, "/purple/proxy/type",
2485 proxy_changed_cb, prefs_proxy_subframe); 2485 proxy_changed_cb, prefs_proxy_subframe);
2486 2486
2487 grid = gtk_grid_table_new(4, 2); 2487 grid = gtk_grid_new();
2488 gtk_container_set_border_width(GTK_CONTAINER(grid), 0); 2488 gtk_container_set_border_width(GTK_CONTAINER(grid), 0);
2489 gtk_grid_set_column_spacing(GTK_GRID(grid), 5); 2489 gtk_grid_set_column_spacing(GTK_GRID(grid), 5);
2490 gtk_grid_set_row_spacing(GTK_GRID(grid), 10); 2490 gtk_grid_set_row_spacing(GTK_GRID(grid), 10);
2491 gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), grid); 2491 gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), grid);
2492 2492
2493 label = gtk_label_new_with_mnemonic(_("_Host:")); 2493 label = gtk_label_new_with_mnemonic(_("_Host:"));
2494 gtk_widget_set_halign(label, GTK_ALIGN_END); 2494 gtk_widget_set_halign(label, GTK_ALIGN_END);
2495 gtk_widget_set_valign(label, GTK_ALIGN_CENTER); 2495 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2496 gtk_grid_attach_full(GTK_GRID(grid), label, 0, 0, 1, 1, 2496 gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
2497 GTK_FILL, 0, 0, 0);
2498 2497
2499 entry = gtk_entry_new(); 2498 entry = gtk_entry_new();
2500 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 2499 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
2501 gtk_grid_attach_full(GTK_GRID(grid), entry, 1, 0, 1, 1, 2500 gtk_widget_set_valign(entry, GTK_ALIGN_CENTER);
2502 GTK_FILL, 0, 0, 0); 2501 gtk_grid_attach(GTK_GRID(grid), entry, 1, 0, 1, 1);
2502
2503 g_signal_connect(G_OBJECT(entry), "changed", 2503 g_signal_connect(G_OBJECT(entry), "changed",
2504 G_CALLBACK(proxy_print_option), (void *)PROXYHOST); 2504 G_CALLBACK(proxy_print_option), (void *)PROXYHOST);
2505 2505
2506 if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info)) 2506 if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info))
2507 gtk_entry_set_text(GTK_ENTRY(entry), 2507 gtk_entry_set_text(GTK_ENTRY(entry),
2513 pidgin_set_accessible_label(entry, GTK_LABEL(label)); 2513 pidgin_set_accessible_label(entry, GTK_LABEL(label));
2514 2514
2515 label = gtk_label_new_with_mnemonic(_("P_ort:")); 2515 label = gtk_label_new_with_mnemonic(_("P_ort:"));
2516 gtk_widget_set_halign(label, GTK_ALIGN_END); 2516 gtk_widget_set_halign(label, GTK_ALIGN_END);
2517 gtk_widget_set_valign(label, GTK_ALIGN_CENTER); 2517 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2518 gtk_grid_attach_full(GTK_GRID(grid), label, 2, 0, 1, 1, 2518 gtk_grid_attach(GTK_GRID(grid), label, 2, 0, 1, 1);
2519 GTK_FILL, 0, 0, 0);
2520 2519
2521 entry = gtk_spin_button_new_with_range(0, 65535, 1); 2520 entry = gtk_spin_button_new_with_range(0, 65535, 1);
2522 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 2521 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
2523 gtk_grid_attach_full(GTK_GRID(grid), entry, 3, 0, 1, 1, 2522 gtk_widget_set_valign(entry, GTK_ALIGN_CENTER);
2524 GTK_FILL, 0, 0, 0); 2523 gtk_grid_attach(GTK_GRID(grid), entry, 3, 0, 1, 1);
2524
2525 g_signal_connect(G_OBJECT(entry), "changed", 2525 g_signal_connect(G_OBJECT(entry), "changed",
2526 G_CALLBACK(proxy_print_option), (void *)PROXYPORT); 2526 G_CALLBACK(proxy_print_option), (void *)PROXYPORT);
2527 2527
2528 if (proxy_info != NULL && purple_proxy_info_get_port(proxy_info) != 0) { 2528 if (proxy_info != NULL && purple_proxy_info_get_port(proxy_info) != 0) {
2529 gtk_spin_button_set_value(GTK_SPIN_BUTTON(entry), 2529 gtk_spin_button_set_value(GTK_SPIN_BUTTON(entry),
2532 pidgin_set_accessible_label(entry, GTK_LABEL(label)); 2532 pidgin_set_accessible_label(entry, GTK_LABEL(label));
2533 2533
2534 label = gtk_label_new_with_mnemonic(_("User_name:")); 2534 label = gtk_label_new_with_mnemonic(_("User_name:"));
2535 gtk_widget_set_halign(label, GTK_ALIGN_END); 2535 gtk_widget_set_halign(label, GTK_ALIGN_END);
2536 gtk_widget_set_valign(label, GTK_ALIGN_CENTER); 2536 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2537 gtk_grid_attach_full(GTK_GRID(grid), label, 0, 1, 1, 1, 2537 gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
2538 GTK_FILL, 0, 0, 0);
2539 2538
2540 entry = gtk_entry_new(); 2539 entry = gtk_entry_new();
2541 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 2540 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
2542 gtk_grid_attach_full(GTK_GRID(grid), entry, 1, 1, 1, 1, 2541 gtk_widget_set_valign(entry, GTK_ALIGN_CENTER);
2543 GTK_FILL, 0, 0, 0); 2542 gtk_grid_attach(GTK_GRID(grid), entry, 1, 1, 1, 1);
2543
2544 g_signal_connect(G_OBJECT(entry), "changed", 2544 g_signal_connect(G_OBJECT(entry), "changed",
2545 G_CALLBACK(proxy_print_option), (void *)PROXYUSER); 2545 G_CALLBACK(proxy_print_option), (void *)PROXYUSER);
2546 2546
2547 if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL) 2547 if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL)
2548 gtk_entry_set_text(GTK_ENTRY(entry), 2548 gtk_entry_set_text(GTK_ENTRY(entry),
2554 pidgin_set_accessible_label(entry, GTK_LABEL(label)); 2554 pidgin_set_accessible_label(entry, GTK_LABEL(label));
2555 2555
2556 label = gtk_label_new_with_mnemonic(_("Pa_ssword:")); 2556 label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
2557 gtk_widget_set_halign(label, GTK_ALIGN_END); 2557 gtk_widget_set_halign(label, GTK_ALIGN_END);
2558 gtk_widget_set_valign(label, GTK_ALIGN_CENTER); 2558 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2559 gtk_grid_attach_full(GTK_GRID(grid), label, 2, 1, 1, 1, 2559 gtk_grid_attach(GTK_GRID(grid), label, 2, 1, 1, 1);
2560 GTK_FILL, 0, 0, 0);
2561 2560
2562 entry = gtk_entry_new(); 2561 entry = gtk_entry_new();
2563 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); 2562 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
2564 gtk_grid_attach_full(GTK_GRID(grid), entry, 3, 1, 1, 1, 2563 gtk_widget_set_valign(entry, GTK_ALIGN_CENTER);
2565 GTK_FILL, 0, 0, 0); 2564 gtk_grid_attach(GTK_GRID(grid), entry, 3, 1, 1, 1);
2565
2566 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); 2566 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
2567 g_signal_connect(G_OBJECT(entry), "changed", 2567 g_signal_connect(G_OBJECT(entry), "changed",
2568 G_CALLBACK(proxy_print_option), (void *)PROXYPASS); 2568 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
2569 2569
2570 if (proxy_info != NULL && purple_proxy_info_get_password(proxy_info) != NULL) 2570 if (proxy_info != NULL && purple_proxy_info_get_password(proxy_info) != NULL)

mercurial