comparison src/prefs.c @ 2254:c0ac78ffe77f

[gaim-migrate @ 2264] Redid the proxy preferences to look like the rest of the preferences. Next on the list: Privacy settings. committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Mon, 10 Sep 2001 05:37:29 +0000
parents e8e2a72a37b7
children 9c8f353331e7
comparison
equal deleted inserted replaced
2253:eb4401ac17ed 2254:c0ac78ffe77f
71 GtkWidget *prefs_away_list = NULL; 71 GtkWidget *prefs_away_list = NULL;
72 GtkWidget *prefs_away_menu = NULL; 72 GtkWidget *prefs_away_menu = NULL;
73 GtkWidget *preftree = NULL; 73 GtkWidget *preftree = NULL;
74 GtkCTreeNode *general_node = NULL; 74 GtkCTreeNode *general_node = NULL;
75 GtkCTreeNode *deny_node = NULL; 75 GtkCTreeNode *deny_node = NULL;
76 GtkWidget *prefs_proxy_frame = NULL;
76 77
77 static void destdeb(GtkWidget *m, gpointer n) 78 static void destdeb(GtkWidget *m, gpointer n)
78 { 79 {
79 gtk_widget_destroy(debugbutton); 80 gtk_widget_destroy(debugbutton);
80 debugbutton = NULL; 81 debugbutton = NULL;
332 save_prefs(); 333 save_prefs();
333 } 334 }
334 335
335 static void proxy_print_optionrad(GtkRadioButton *entry, int entrynum) 336 static void proxy_print_optionrad(GtkRadioButton *entry, int entrynum)
336 { 337 {
338 if (entrynum == PROXY_NONE)
339 gtk_widget_set_sensitive(GTK_WIDGET(prefs_proxy_frame), FALSE);
340 else
341 gtk_widget_set_sensitive(GTK_WIDGET(prefs_proxy_frame), TRUE);
342
337 proxytype = entrynum; 343 proxytype = entrynum;
338 save_prefs(); 344 save_prefs();
339 } 345 }
340 346
341 static void proxy_page() 347 static void proxy_page()
344 GtkWidget *vbox; 350 GtkWidget *vbox;
345 GtkWidget *hbox; 351 GtkWidget *hbox;
346 GtkWidget *label; 352 GtkWidget *label;
347 GtkWidget *entry; 353 GtkWidget *entry;
348 GtkWidget *first, *opt; 354 GtkWidget *first, *opt;
355 GtkWidget *frame;
356 GtkWidget *table;
349 357
350 parent = prefdialog->parent; 358 parent = prefdialog->parent;
351 gtk_widget_destroy(prefdialog); 359 gtk_widget_destroy(prefdialog);
352 360
353 prefdialog = gtk_frame_new(_("Proxy Options")); 361 prefdialog = gtk_frame_new(_("Proxy Options"));
365 label = gtk_label_new(_("Not all protocols can use these proxy options. Please see the " 373 label = gtk_label_new(_("Not all protocols can use these proxy options. Please see the "
366 "README file for details.")); 374 "README file for details."));
367 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5); 375 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
368 gtk_widget_show(label); 376 gtk_widget_show(label);
369 377
370 hbox = gtk_hbox_new(TRUE, 0); 378 frame = gtk_frame_new(_("Proxy Type"));
371 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 379 gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
372 gtk_widget_show(hbox); 380 gtk_widget_show(frame);
373 381 gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
374 first = gtk_radio_button_new_with_label(NULL, "No proxy"); 382
375 gtk_box_pack_start(GTK_BOX(hbox), first, FALSE, FALSE, 0); 383 table = gtk_table_new(2, 2, FALSE);
384 gtk_container_set_border_width(GTK_CONTAINER(table), 5);
385 gtk_table_set_col_spacings(GTK_TABLE(table), 5);
386 gtk_table_set_row_spacings(GTK_TABLE(table), 5);
387 gtk_widget_show(table);
388 gtk_container_add(GTK_CONTAINER(frame), table);
389
390 first = gtk_radio_button_new_with_label(NULL, _("No Proxy"));
391 gtk_table_attach(GTK_TABLE(table), first, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
392
376 gtk_signal_connect(GTK_OBJECT(first), "clicked", 393 gtk_signal_connect(GTK_OBJECT(first), "clicked",
377 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_NONE); 394 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_NONE);
378 gtk_widget_show(first); 395 gtk_widget_show(first);
396
379 if (proxytype == PROXY_NONE) 397 if (proxytype == PROXY_NONE)
380 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(first), TRUE); 398 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(first), TRUE);
381 399
382 opt = 400 opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("SOCKS 4"));
383 gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "SOCKS 4"); 401 gtk_table_attach(GTK_TABLE(table), opt, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
384 gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0);
385 gtk_signal_connect(GTK_OBJECT(opt), "clicked", 402 gtk_signal_connect(GTK_OBJECT(opt), "clicked",
386 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS4); 403 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS4);
387 gtk_widget_show(opt); 404 gtk_widget_show(opt);
388 if (proxytype == PROXY_SOCKS4) 405 if (proxytype == PROXY_SOCKS4)
389 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); 406 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
390 407
391 hbox = gtk_hbox_new(TRUE, 0);
392 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
393 gtk_widget_show(hbox);
394
395 opt = 408 opt =
396 gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "SOCKS 5"); 409 gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("SOCKS 5"));
397 gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0); 410 gtk_table_attach(GTK_TABLE(table), opt, 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
398 gtk_signal_connect(GTK_OBJECT(opt), "clicked", 411 gtk_signal_connect(GTK_OBJECT(opt), "clicked",
399 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS5); 412 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS5);
400 gtk_widget_show(opt); 413 gtk_widget_show(opt);
401 if (proxytype == PROXY_SOCKS5) 414 if (proxytype == PROXY_SOCKS5)
402 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); 415 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
403 416
404 opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), "HTTP"); 417 opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("HTTP"));
405 gtk_box_pack_start(GTK_BOX(hbox), opt, FALSE, FALSE, 0); 418 gtk_table_attach(GTK_TABLE(table), opt, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
406 gtk_signal_connect(GTK_OBJECT(opt), "clicked", 419 gtk_signal_connect(GTK_OBJECT(opt), "clicked",
407 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_HTTP); 420 GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_HTTP);
408 gtk_widget_show(opt); 421 gtk_widget_show(opt);
409 if (proxytype == PROXY_HTTP) 422 if (proxytype == PROXY_HTTP)
410 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); 423 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
411 424
412 hbox = gtk_hbox_new(TRUE, 5); 425
413 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 426 frame = gtk_frame_new(_("Proxy Server"));
414 gtk_widget_show(hbox); 427 gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
415 428 gtk_widget_show(frame);
416 label = gtk_label_new("Proxy Host:"); 429 gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
417 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); 430
431 prefs_proxy_frame = frame;
432
433 if (proxytype == PROXY_NONE)
434 gtk_widget_set_sensitive(GTK_WIDGET(frame), FALSE);
435
436 table = gtk_table_new(2, 4, FALSE);
437 gtk_container_set_border_width(GTK_CONTAINER(table), 5);
438 gtk_table_set_col_spacings(GTK_TABLE(table), 5);
439 gtk_table_set_row_spacings(GTK_TABLE(table), 10);
440 gtk_widget_show(table);
441 gtk_container_add(GTK_CONTAINER(frame), table);
442
443
444 label = gtk_label_new(_("Host"));
445 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
418 gtk_widget_show(label); 446 gtk_widget_show(label);
447 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
419 448
420 entry = gtk_entry_new(); 449 entry = gtk_entry_new();
421 gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); 450 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
422 gtk_signal_connect(GTK_OBJECT(entry), "changed", 451 gtk_signal_connect(GTK_OBJECT(entry), "changed",
423 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYHOST); 452 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYHOST);
424 gtk_entry_set_text(GTK_ENTRY(entry), proxyhost); 453 gtk_entry_set_text(GTK_ENTRY(entry), proxyhost);
425 gtk_widget_show(entry); 454 gtk_widget_show(entry);
426 455
427 hbox = gtk_hbox_new(TRUE, 5); 456 hbox = gtk_hbox_new(TRUE, 5);
428 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 457 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
429 gtk_widget_show(hbox); 458 gtk_widget_show(hbox);
430 459
431 label = gtk_label_new("Proxy Port:"); 460 label = gtk_label_new(_("Port"));
432 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); 461 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
462 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
433 gtk_widget_show(label); 463 gtk_widget_show(label);
434 464
435 entry = gtk_entry_new(); 465 entry = gtk_entry_new();
436 gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); 466 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
437 gtk_signal_connect(GTK_OBJECT(entry), "changed", 467 gtk_signal_connect(GTK_OBJECT(entry), "changed",
438 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPORT); 468 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPORT);
469
439 if (proxyport) { 470 if (proxyport) {
440 char buf[128]; 471 char buf[128];
441 g_snprintf(buf, sizeof(buf), "%d", proxyport); 472 g_snprintf(buf, sizeof(buf), "%d", proxyport);
442 gtk_entry_set_text(GTK_ENTRY(entry), buf); 473 gtk_entry_set_text(GTK_ENTRY(entry), buf);
443 } 474 }
444 gtk_widget_show(entry); 475 gtk_widget_show(entry);
445 476
446 hbox = gtk_hbox_new(TRUE, 0); 477 label = gtk_label_new(_("User"));
447 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 478 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
448 gtk_widget_show(hbox); 479 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
449
450 label = gtk_label_new("Proxy User:");
451 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
452 gtk_widget_show(label); 480 gtk_widget_show(label);
453 481
454 entry = gtk_entry_new(); 482 entry = gtk_entry_new();
455 gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); 483 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
456 gtk_signal_connect(GTK_OBJECT(entry), "changed", 484 gtk_signal_connect(GTK_OBJECT(entry), "changed",
457 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYUSER); 485 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYUSER);
458 gtk_entry_set_text(GTK_ENTRY(entry), proxyuser); 486 gtk_entry_set_text(GTK_ENTRY(entry), proxyuser);
459 gtk_widget_show(entry); 487 gtk_widget_show(entry);
460 488
461 hbox = gtk_hbox_new(TRUE, 5); 489 hbox = gtk_hbox_new(TRUE, 5);
462 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 490 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
463 gtk_widget_show(hbox); 491 gtk_widget_show(hbox);
464 492
465 label = gtk_label_new("Proxy Password:"); 493 label = gtk_label_new(_("Password"));
466 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); 494 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
495 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
467 gtk_widget_show(label); 496 gtk_widget_show(label);
468 497
469 entry = gtk_entry_new(); 498 entry = gtk_entry_new();
470 gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); 499 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0);
471 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); 500 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
472 gtk_signal_connect(GTK_OBJECT(entry), "changed", 501 gtk_signal_connect(GTK_OBJECT(entry), "changed",
473 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPASS); 502 GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPASS);
474 gtk_entry_set_text(GTK_ENTRY(entry), proxypass); 503 gtk_entry_set_text(GTK_ENTRY(entry), proxypass);
475 gtk_widget_show(entry); 504 gtk_widget_show(entry);