Mercurial > pidgin

comparison src/gtkprefs.c @ 8833:61fdef863ffa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9597] Round 1. This is the first round of prefs I intend to kill. The prefs are still there just commented out from gtkprefs.c to give everyone an idea of which ones I plan on getting rid of and to give them a chance to start playing with new organizations of the dialog. Things that are significant changes, like the "Fonts" page don't even work. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 27 Apr 2004 23:17:12 +0000
parents c61be128dff3
children beb7be215db3
comparison
equal deleted inserted replaced
8832:c313e3b1f2c0 8833:61fdef863ffa
37 37
38 #include "gtkblist.h" 38 #include "gtkblist.h"
39 #include "gtkconv.h" 39 #include "gtkconv.h"
40 #include "gtkdebug.h" 40 #include "gtkdebug.h"
41 #include "gtkimhtml.h" 41 #include "gtkimhtml.h"
42 #include "gtkimhtmltoolbar.h"
42 #include "gtkplugin.h" 43 #include "gtkplugin.h"
43 #include "gtkpluginpref.h" 44 #include "gtkpluginpref.h"
44 #include "gtkprefs.h" 45 #include "gtkprefs.h"
45 #include "gtksound.h" 46 #include "gtksound.h"
46 #include "gtkutils.h" 47 #include "gtkutils.h"
696 g_object_unref(style); 697 g_object_unref(style);
697 } 698 }
698 699
699 GtkWidget *font_page() { 700 GtkWidget *font_page() {
700 GtkWidget *ret; 701 GtkWidget *ret;
701 GtkWidget *button; 702 GtkWidget *imhtml;
702 GtkWidget *vbox, *hbox; 703 GtkWidget *toolbar;
703 GtkWidget *select = NULL; 704 GtkWidget *sw;
704 GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
705 705
706 ret = gtk_vbox_new(FALSE, 18); 706 ret = gtk_vbox_new(FALSE, 18);
707 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 707 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
708 708
709 vbox = gaim_gtk_make_frame(ret, _("Style")); 709 toolbar = gtk_imhtmltoolbar_new();
710 gaim_gtk_prefs_checkbox(_("_Bold"), 710 gtk_box_pack_start(GTK_BOX(ret), toolbar, FALSE, FALSE, 0);
711 "/gaim/gtk/conversations/send_bold", vbox); 711
712 gaim_gtk_prefs_checkbox(_("_Italic"), 712 sw = gtk_scrolled_window_new(NULL, NULL);
713 "/gaim/gtk/conversations/send_italic", vbox); 713 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
714 gaim_gtk_prefs_checkbox(_("_Underline"), 714 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
715 "/gaim/gtk/conversations/send_underline", vbox); 715 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
716 #if 0 716 gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0);
717 /*who in their right mind would use this as a default anyway? 717
718 * and plus, it wouldn't work as the code currently existed, 718
719 * and then i went and applied simguy's patch to remove the 719 imhtml = gtk_imhtml_new(NULL, NULL);
720 * non-functional code. 720 gtk_imhtml_set_editable(GTK_IMHTML(imhtml), TRUE);
721 * 721 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
722 * remove this after string freeze ends 722 gtk_imhtml_set_whole_buffer_formatting_only(imhtml, TRUE);
723 */ 723
724 gaim_gtk_prefs_checkbox(_("_Strikethrough"), 724 gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml),
725 "/gaim/gtk/conversations/send_strikethrough", vbox); 725 gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
726 #endif 726 gtk_imhtml_html_shortcuts(GTK_IMHTML(imhtml),
727 vbox = gaim_gtk_make_frame(ret, _("Face")); 727 gaim_prefs_get_bool("/gaim/gtk/conversations/html_shortcuts"));
728 hbox = gtk_hbox_new(FALSE, 6); 728 gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), imhtml);
729 gtk_container_add(GTK_CONTAINER(vbox), hbox); 729 gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(toolbar), "default");
730 button = gaim_gtk_prefs_checkbox(_("Use custo_m face"), 730 gaim_setup_imhtml(imhtml);
731 "/gaim/gtk/conversations/use_custom_font", hbox); 731 gtk_imhtml_append_text(GTK_IMHTML(imhtml), "This is preview text", 0);
732 gtk_size_group_add_widget(sg, button); 732 gtk_container_add(GTK_CONTAINER(sw), imhtml);
733 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_FONT); 733
734
735 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_font"))
736 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
737
738 g_signal_connect(G_OBJECT(button), "clicked",
739 G_CALLBACK(gaim_gtk_toggle_sensitive), select);
740 g_signal_connect(G_OBJECT(select), "clicked",
741 G_CALLBACK(show_font_dialog), NULL);
742 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
743
744 hbox = gtk_hbox_new(FALSE, 5);
745 gtk_container_add(GTK_CONTAINER(vbox), hbox);
746
747 button = gaim_gtk_prefs_checkbox(_("Use custom si_ze"),
748 "/gaim/gtk/conversations/use_custom_size", hbox);
749 gtk_size_group_add_widget(sg, button);
750 select = gaim_gtk_prefs_labeled_spin_button(hbox, NULL,
751 "/gaim/gtk/conversations/font_size", 1, 7, NULL);
752
753 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_size"))
754 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
755
756 g_signal_connect(G_OBJECT(button), "clicked",
757 G_CALLBACK(gaim_gtk_toggle_sensitive), select);
758
759 vbox = gaim_gtk_make_frame(ret, _("Color"));
760 hbox = gtk_hbox_new(FALSE, 5);
761 gtk_container_add(GTK_CONTAINER(vbox), hbox);
762
763 button = gaim_gtk_prefs_checkbox(_("_Text color"),
764 "/gaim/gtk/conversations/use_custom_fgcolor", hbox);
765 gtk_size_group_add_widget(sg, button);
766
767 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
768 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
769 pref_fg_picture = show_color_pref(hbox, TRUE);
770 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(update_color),
771 pref_fg_picture);
772
773 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_fgcolor"))
774 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
775
776 g_signal_connect(G_OBJECT(button), "clicked",
777 G_CALLBACK(gaim_gtk_toggle_sensitive), select);
778 g_signal_connect(G_OBJECT(select), "clicked", G_CALLBACK(show_fgcolor_dialog), NULL);
779 hbox = gtk_hbox_new(FALSE, 5);
780 gtk_container_add(GTK_CONTAINER(vbox), hbox);
781
782 button = gaim_gtk_prefs_checkbox(_("Bac_kground color"),
783 "/gaim/gtk/conversations/use_custom_bgcolor", hbox);
784 gtk_size_group_add_widget(sg, button);
785 select = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
786 gtk_box_pack_start(GTK_BOX(hbox), select, FALSE, FALSE, 0);
787 pref_bg_picture = show_color_pref(hbox, FALSE);
788 g_signal_connect(G_OBJECT(button), "clicked",
789 G_CALLBACK(update_color), pref_bg_picture);
790
791 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_bgcolor"))
792 gtk_widget_set_sensitive(GTK_WIDGET(select), FALSE);
793
794 g_signal_connect(G_OBJECT(select), "clicked",
795 G_CALLBACK(show_bgcolor_dialog), NULL);
796 g_signal_connect(G_OBJECT(button), "clicked",
797 G_CALLBACK(gaim_gtk_toggle_sensitive), select);
798
799 gtk_widget_show_all(ret); 734 gtk_widget_show_all(ret);
800 return ret; 735 return ret;
801 } 736 }
802 737
803 738
806 GtkWidget *vbox; 741 GtkWidget *vbox;
807 ret = gtk_vbox_new(FALSE, 18); 742 ret = gtk_vbox_new(FALSE, 18);
808 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 743 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
809 744
810 vbox = gaim_gtk_make_frame (ret, _("Display")); 745 vbox = gaim_gtk_make_frame (ret, _("Display"));
811 gaim_gtk_prefs_checkbox(_("Show graphical _smileys"), 746 /*
812 "/gaim/gtk/conversations/show_smileys", vbox); 747 gaim_gtk_prefs_checkbox(_("Show graphical _smileys"),
748 "/gaim/gtk/conversations/show_smileys", vbox);
749 */
813 gaim_gtk_prefs_checkbox(_("Show _timestamp on messages"), 750 gaim_gtk_prefs_checkbox(_("Show _timestamp on messages"),
814 "/gaim/gtk/conversations/show_timestamps", vbox); 751 "/gaim/gtk/conversations/show_timestamps", vbox);
815 gaim_gtk_prefs_checkbox(_("Show _URLs as links"), 752 /*
753 gaim_gtk_prefs_checkbox(_("Show _URLs as links"),
816 "/gaim/gtk/conversations/show_urls_as_links", vbox); 754 "/gaim/gtk/conversations/show_urls_as_links", vbox);
817 755 */
818 #ifdef USE_GTKSPELL 756 #ifdef USE_GTKSPELL
819 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), 757 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"),
820 "/gaim/gtk/conversations/spellcheck", vbox); 758 "/gaim/gtk/conversations/spellcheck", vbox);
821 #endif 759 #endif
822 vbox = gaim_gtk_make_frame (ret, _("Ignore")); 760 /* vbox = gaim_gtk_make_frame (ret, _("Ignore"));
823 gaim_gtk_prefs_checkbox(_("Ignore c_olors"), 761 gaim_gtk_prefs_checkbox(_("Ignore c_olors"),
824 "/gaim/gtk/conversations/ignore_colors", vbox); 762 "/gaim/gtk/conversations/ignore_colors", vbox);
825 gaim_gtk_prefs_checkbox(_("Ignore font _faces"), 763 gaim_gtk_prefs_checkbox(_("Ignore font _faces"),
826 "/gaim/gtk/conversations/ignore_fonts", vbox); 764 "/gaim/gtk/conversations/ignore_fonts", vbox);
827 gaim_gtk_prefs_checkbox(_("Ignore font si_zes"), 765 gaim_gtk_prefs_checkbox(_("Ignore font si_zes"),
828 "/gaim/gtk/conversations/ignore_font_sizes", vbox); 766 "/gaim/gtk/conversations/ignore_font_sizes", vbox);
829 767 */
768 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), NULL, vbox);
830 gtk_widget_show_all(ret); 769 gtk_widget_show_all(ret);
831 return ret; 770 return ret;
832 } 771 }
833 772
834 GtkWidget *hotkeys_page() { 773 GtkWidget *hotkeys_page() {
878 gaim_gtk_prefs_dropdown_from_list(vbox, _("_Sorting:"), GAIM_PREF_STRING, 817 gaim_gtk_prefs_dropdown_from_list(vbox, _("_Sorting:"), GAIM_PREF_STRING,
879 "/gaim/gtk/blist/sort_type", l); 818 "/gaim/gtk/blist/sort_type", l);
880 819
881 g_list_free(l); 820 g_list_free(l);
882 821
883 vbox = gaim_gtk_make_frame (ret, _("Buddy List Toolbar")); 822 /*
884 gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 823 vbox = gaim_gtk_make_frame (ret, _("Buddy List Toolbar"));
885 "/gaim/gtk/blist/button_style", 824 gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
886 _("Pictures"), GAIM_BUTTON_IMAGE, 825 "/gaim/gtk/blist/button_style",
887 _("Text"), GAIM_BUTTON_TEXT, 826 _("Pictures"), GAIM_BUTTON_IMAGE,
888 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 827 _("Text"), GAIM_BUTTON_TEXT,
889 _("None"), GAIM_BUTTON_NONE, 828 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
890 NULL); 829 _("None"), GAIM_BUTTON_NONE,
830 NULL);
831 */
891 832
892 vbox = gaim_gtk_make_frame (ret, _("Buddy List Window")); 833 vbox = gaim_gtk_make_frame (ret, _("Buddy List Window"));
893 gaim_gtk_prefs_checkbox(_("_Raise window on events"), 834 gaim_gtk_prefs_checkbox(_("_Raise window on events"),
894 "/gaim/gtk/blist/raise_on_events", vbox); 835 "/gaim/gtk/blist/raise_on_events", vbox);
895 836
896 vbox = gaim_gtk_make_frame (ret, _("Group Display")); 837 /*
897 gaim_gtk_prefs_checkbox(_("Show _numbers in groups"), 838 vbox = gaim_gtk_make_frame (ret, _("Group Display"));
898 "/gaim/gtk/blist/show_group_count", vbox); 839 gaim_gtk_prefs_checkbox(_("Show _numbers in groups"),
840 "/gaim/gtk/blist/show_group_count", vbox);
841 */
899 842
900 vbox = gaim_gtk_make_frame (ret, _("Buddy Display")); 843 vbox = gaim_gtk_make_frame (ret, _("Buddy Display"));
901 gaim_gtk_prefs_checkbox(_("Show buddy _icons"), 844 gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
902 "/gaim/gtk/blist/show_buddy_icons", vbox); 845 "/gaim/gtk/blist/show_buddy_icons", vbox);
903 gaim_gtk_prefs_checkbox(_("Show _warning levels"), 846 gaim_gtk_prefs_checkbox(_("Show _warning levels"),
936 g_list_free(names); 879 g_list_free(names);
937 880
938 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 881 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
939 gtk_size_group_add_widget(sg, label); 882 gtk_size_group_add_widget(sg, label);
940 883
884 /*
941 gaim_gtk_prefs_checkbox(_("Send _URLs as links"), 885 gaim_gtk_prefs_checkbox(_("Send _URLs as links"),
942 "/core/conversations/send_urls_as_links", vbox); 886 "/core/conversations/send_urls_as_links", vbox);
943 887 */
944 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"), 888 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"),
945 "/gaim/gtk/conversations/show_formatting_toolbar", vbox); 889 "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
946 890
947 gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"), 891 gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"),
948 "/core/conversations/use_alias_for_title", vbox); 892 "/core/conversations/use_alias_for_title", vbox);
981 gtk_widget_set_sensitive(GTK_WIDGET(close_checkbox), FALSE); 925 gtk_widget_set_sensitive(GTK_WIDGET(close_checkbox), FALSE);
982 } 926 }
983 927
984 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked", 928 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
985 G_CALLBACK(gaim_gtk_toggle_sensitive), close_checkbox); 929 G_CALLBACK(gaim_gtk_toggle_sensitive), close_checkbox);
986 930 /*
987 icons_checkbox = gaim_gtk_prefs_checkbox(_("Show status _icons on tabs"), 931 icons_checkbox = gaim_gtk_prefs_checkbox(_("Show status _icons on tabs"),
988 "/gaim/gtk/conversations/icons_on_tabs", 932 "/gaim/gtk/conversations/icons_on_tabs",
989 vbox); 933 vbox);
990 934
991 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) { 935 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) {
992 gtk_widget_set_sensitive(GTK_WIDGET(icons_checkbox), FALSE); 936 gtk_widget_set_sensitive(GTK_WIDGET(icons_checkbox), FALSE);
993 } 937 }
938 */
994 939
995 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked", 940 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
996 G_CALLBACK(gaim_gtk_toggle_sensitive), icons_checkbox); 941 G_CALLBACK(gaim_gtk_toggle_sensitive), icons_checkbox);
997 942
998 gtk_widget_show_all(ret); 943 gtk_widget_show_all(ret);
1009 ret = gtk_vbox_new(FALSE, 18); 954 ret = gtk_vbox_new(FALSE, 18);
1010 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 955 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1011 956
1012 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 957 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1013 958
1014 vbox = gaim_gtk_make_frame (ret, _("Window")); 959 /*vbox = gaim_gtk_make_frame (ret, _("Window"));
1015 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 960 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
1016 "/gaim/gtk/conversations/im/button_type", 961 "/gaim/gtk/conversations/im/button_type",
1017 _("Pictures"), GAIM_BUTTON_IMAGE, 962 _("Pictures"), GAIM_BUTTON_IMAGE,
1018 _("Text"), GAIM_BUTTON_TEXT, 963 _("Text"), GAIM_BUTTON_TEXT,
1019 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 964 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
1031 gaim_gtk_prefs_checkbox(_("_Raise window on events"), 976 gaim_gtk_prefs_checkbox(_("_Raise window on events"),
1032 "/gaim/gtk/conversations/im/raise_on_events", vbox); 977 "/gaim/gtk/conversations/im/raise_on_events", vbox);
1033 gaim_gtk_prefs_checkbox(_("Hide window on _send"), 978 gaim_gtk_prefs_checkbox(_("Hide window on _send"),
1034 "/gaim/gtk/conversations/im/hide_on_send", vbox); 979 "/gaim/gtk/conversations/im/hide_on_send", vbox);
1035 gtk_widget_show (vbox); 980 gtk_widget_show (vbox);
1036 981 */
1037 vbox = gaim_gtk_make_frame (ret, _("Buddy Icons")); 982 vbox = gaim_gtk_make_frame (ret, _("Buddy Icons"));
1038 gaim_gtk_prefs_checkbox(_("Show buddy _icons"), 983 gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
1039 "/gaim/gtk/conversations/im/show_buddy_icons", vbox); 984 "/gaim/gtk/conversations/im/show_buddy_icons", vbox);
1040 gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"), 985 gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"),
1041 "/gaim/gtk/conversations/im/animate_buddy_icons", vbox); 986 "/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
1042 987
1043 vbox = gaim_gtk_make_frame (ret, _("Display")); 988 /*vbox = gaim_gtk_make_frame (ret, _("Display"));
1044 gaim_gtk_prefs_checkbox(_("Show _logins in window"), 989 gaim_gtk_prefs_checkbox(_("Show _logins in window"),
1045 "/core/conversations/im/show_login", vbox); 990 "/core/conversations/im/show_login", vbox);
1046 991 */
1047 vbox = gaim_gtk_make_frame (ret, _("Typing Notification")); 992 vbox = gaim_gtk_make_frame (ret, _("Typing Notification"));
1048 gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"), 993 gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"),
1049 "/core/conversations/im/send_typing", vbox); 994 "/core/conversations/im/send_typing", vbox);
1050 995
1051 gtk_widget_show_all(ret); 996 gtk_widget_show_all(ret);
1060 1005
1061 ret = gtk_vbox_new(FALSE, 18); 1006 ret = gtk_vbox_new(FALSE, 18);
1062 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1007 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1063 1008
1064 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); 1009 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
1065 1010 /*
1066 vbox = gaim_gtk_make_frame (ret, _("Window")); 1011 vbox = gaim_gtk_make_frame (ret, _("Window"));
1067 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 1012 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
1068 "/gaim/gtk/conversations/chat/button_type", 1013 "/gaim/gtk/conversations/chat/button_type",
1069 _("Pictures"), GAIM_BUTTON_IMAGE, 1014 _("Pictures"), GAIM_BUTTON_IMAGE,
1070 _("Text"), GAIM_BUTTON_TEXT, 1015 _("Text"), GAIM_BUTTON_TEXT,
1086 vbox = gaim_gtk_make_frame (ret, _("Tab Completion")); 1031 vbox = gaim_gtk_make_frame (ret, _("Tab Completion"));
1087 gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"), 1032 gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"),
1088 "/gaim/gtk/conversations/chat/tab_completion", vbox); 1033 "/gaim/gtk/conversations/chat/tab_completion", vbox);
1089 gaim_gtk_prefs_checkbox(_("_Old-style tab completion"), 1034 gaim_gtk_prefs_checkbox(_("_Old-style tab completion"),
1090 "/gaim/gtk/conversations/chat/old_tab_complete", vbox); 1035 "/gaim/gtk/conversations/chat/old_tab_complete", vbox);
1091 1036 */
1092 vbox = gaim_gtk_make_frame (ret, _("Display")); 1037 vbox = gaim_gtk_make_frame (ret, _("Display"));
1093 gaim_gtk_prefs_checkbox(_("_Show people joining in window"), 1038 /*
1039 gaim_gtk_prefs_checkbox(_("_Show people joining in window"),
1094 "/core/conversations/chat/show_join", vbox); 1040 "/core/conversations/chat/show_join", vbox);
1095 gaim_gtk_prefs_checkbox(_("_Show people leaving in window"), 1041 gaim_gtk_prefs_checkbox(_("_Show people leaving in window"),
1096 "/core/conversations/chat/show_leave", vbox); 1042 "/core/conversations/chat/show_leave", vbox);
1043 */
1097 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"), 1044 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"),
1098 "/gaim/gtk/conversations/chat/color_nicks", vbox); 1045 "/gaim/gtk/conversations/chat/color_nicks", vbox);
1099 1046
1100 gtk_widget_show_all(ret); 1047 gtk_widget_show_all(ret);
1101 return ret; 1048 return ret;
1553 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1500 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1554 1501
1555 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1502 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1556 1503
1557 vbox = gaim_gtk_make_frame (ret, _("Sound Options")); 1504 vbox = gaim_gtk_make_frame (ret, _("Sound Options"));
1558 gaim_gtk_prefs_checkbox(_("Sounds when you _log in"), 1505 /* gaim_gtk_prefs_checkbox(_("Sounds when you _log in"),
1559 "/gaim/gtk/sound/signon", vbox); 1506 "/gaim/gtk/sound/signon", vbox);
1507 */
1560 gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"), 1508 gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"),
1561 "/gaim/gtk/sound/conv_focus", vbox); 1509 "/gaim/gtk/sound/conv_focus", vbox);
1562 gaim_gtk_prefs_checkbox(_("_Sounds while away"), 1510 gaim_gtk_prefs_checkbox(_("_Sounds while away"),
1563 "/core/sound/while_away", vbox); 1511 "/core/sound/while_away", vbox);
1564 1512
1640 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1588 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1641 1589
1642 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1590 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1643 1591
1644 vbox = gaim_gtk_make_frame (ret, _("Away")); 1592 vbox = gaim_gtk_make_frame (ret, _("Away"));
1645 gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"), 1593 /*
1646 "/core/conversations/away_back_on_send", vbox); 1594 gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"),
1595 "/core/conversations/away_back_on_send", vbox);
1596 */
1647 gaim_gtk_prefs_checkbox(_("_Queue new messages when away"), 1597 gaim_gtk_prefs_checkbox(_("_Queue new messages when away"),
1648 "/gaim/gtk/away/queue_messages", vbox); 1598 "/gaim/gtk/away/queue_messages", vbox);
1649 1599
1650 vbox = gaim_gtk_make_frame (ret, _("Auto-response")); 1600 vbox = gaim_gtk_make_frame (ret, _("Auto-response"));
1651 hbox = gtk_hbox_new(FALSE, 0); 1601 /*
1652 gtk_container_add(GTK_CONTAINER(vbox), hbox); 1602 hbox = gtk_hbox_new(FALSE, 0);
1653 gaim_gtk_prefs_labeled_spin_button(hbox, _("Seconds before _resending:"), 1603 gtk_container_add(GTK_CONTAINER(vbox), hbox);
1654 "/core/away/auto_response/sec_before_resend", 1604 gaim_gtk_prefs_labeled_spin_button(hbox, _("Seconds before _resending:"),
1655 1, 24 * 60 * 60, sg); 1605 "/core/away/auto_response/sec_before_resend",
1606 1, 24 * 60 * 60, sg);
1607 */
1656 gaim_gtk_prefs_checkbox(_("_Send auto-response"), 1608 gaim_gtk_prefs_checkbox(_("_Send auto-response"),
1657 "/core/away/auto_response/enabled", vbox); 1609 "/core/away/auto_response/enabled", vbox);
1658 gaim_gtk_prefs_checkbox(_("_Only send auto-response when idle"), 1610 gaim_gtk_prefs_checkbox(_("_Only send auto-response when idle"),
1659 "/core/away/auto_response/idle_only", vbox); 1611 "/core/away/auto_response/idle_only", vbox);
1660 gaim_gtk_prefs_checkbox(_("Send auto-response in _active conversations"), 1612 /*
1613 gaim_gtk_prefs_checkbox(_("Send auto-response in _active conversations"),
1661 "/core/away/auto_response/in_active_conv", vbox); 1614 "/core/away/auto_response/in_active_conv", vbox);
1662 1615 */
1663 if (!gaim_prefs_get_bool("/core/away/auto_response/enabled")) 1616 if (!gaim_prefs_get_bool("/core/away/auto_response/enabled"))
1664 gtk_widget_set_sensitive(hbox, FALSE); 1617 gtk_widget_set_sensitive(hbox, FALSE);
1665 1618
1666 auto_resp_pref_id = gaim_prefs_connect_callback("/core/away/auto_response/enabled", 1619 auto_resp_pref_id = gaim_prefs_connect_callback("/core/away/auto_response/enabled",
1667 auto_resp_changed_cb, hbox); 1620 auto_resp_changed_cb, hbox);