Mercurial > pidgin

comparison src/gtkprefs.c @ 8998:3738d1eac0ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9773] " This patch completes the removal of the Show joins/leaves in chats preferences It also (temporarily?) brings back the UI for the IM/Chat buttons preferences by changing #if 0 to #if 1 so they're still easy to identify to revist later on. The "Individual log file for each buddy's signons" pref became obsolete a while ago and was incorrectly #if'd out with a prefslash04 label. This patch completes it's death. With this patch applied the only prefslash thing that should block release is the custom font/color/size/etc stuff, I think we need to work out what to do there. There's a bit of whitespace cleanup too." --Stu Tomlinson committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 21 May 2004 14:26:31 +0000
parents c5825a04fb97
children b24967757d46
comparison
equal deleted inserted replaced
8997:8bf2c6122bf1 8998:3738d1eac0ad
988 } 988 }
989 989
990 GtkWidget *im_page() { 990 GtkWidget *im_page() {
991 GtkWidget *ret; 991 GtkWidget *ret;
992 GtkWidget *vbox; 992 GtkWidget *vbox;
993 #if 0 /* PREFSLASH04 */ 993 #if 1 /* PREFSLASH04 */
994 GtkWidget *widge; 994 GtkWidget *widge;
995 #endif /* PREFSLASH04 */ 995 #endif /* PREFSLASH04 */
996 GtkSizeGroup *sg; 996 GtkSizeGroup *sg;
997 997
998 ret = gtk_vbox_new(FALSE, 18); 998 ret = gtk_vbox_new(FALSE, 18);
999 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 999 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1000 1000
1001 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1001 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1002 1002
1003 vbox = gaim_gtk_make_frame (ret, _("Window")); 1003 vbox = gaim_gtk_make_frame (ret, _("Window"));
1004 #if 0 /* PREFSLASH04 */ 1004 #if 1 /* PREFSLASH04 */
1005 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 1005 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
1006 "/gaim/gtk/conversations/im/button_type", 1006 "/gaim/gtk/conversations/im/button_type",
1007 _("Pictures"), GAIM_BUTTON_IMAGE, 1007 _("Pictures"), GAIM_BUTTON_IMAGE,
1008 _("Text"), GAIM_BUTTON_TEXT, 1008 _("Text"), GAIM_BUTTON_TEXT,
1009 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 1009 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
1031 } 1031 }
1032 1032
1033 GtkWidget *chat_page() { 1033 GtkWidget *chat_page() {
1034 GtkWidget *ret; 1034 GtkWidget *ret;
1035 GtkWidget *vbox; 1035 GtkWidget *vbox;
1036 #if 0 /* PREFSLASH04 */ 1036 #if 1 /* PREFSLASH04 */
1037 GtkWidget *dd; 1037 GtkWidget *dd;
1038 #endif /* PREFSLASH04 */ 1038 #endif /* PREFSLASH04 */
1039 GtkSizeGroup *sg; 1039 GtkSizeGroup *sg;
1040 1040
1041 ret = gtk_vbox_new(FALSE, 18); 1041 ret = gtk_vbox_new(FALSE, 18);
1042 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1042 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1043 1043
1044 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); 1044 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
1045 vbox = gaim_gtk_make_frame (ret, _("Window")); 1045 vbox = gaim_gtk_make_frame (ret, _("Window"));
1046 #if 0 /* PREFSLASH04 */ 1046 #if 1 /* PREFSLASH04 */
1047 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 1047 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
1048 "/gaim/gtk/conversations/chat/button_type", 1048 "/gaim/gtk/conversations/chat/button_type",
1049 _("Pictures"), GAIM_BUTTON_IMAGE, 1049 _("Pictures"), GAIM_BUTTON_IMAGE,
1050 _("Text"), GAIM_BUTTON_TEXT, 1050 _("Text"), GAIM_BUTTON_TEXT,
1051 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 1051 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
1056 gtk_misc_set_alignment(GTK_MISC(dd), 0, 0); 1056 gtk_misc_set_alignment(GTK_MISC(dd), 0, 0);
1057 #endif /* PREFSLASH04 */ 1057 #endif /* PREFSLASH04 */
1058 gaim_gtk_prefs_checkbox(_("_Raise window on events"), 1058 gaim_gtk_prefs_checkbox(_("_Raise window on events"),
1059 "/gaim/gtk/conversations/chat/raise_on_events", vbox); 1059 "/gaim/gtk/conversations/chat/raise_on_events", vbox);
1060 vbox = gaim_gtk_make_frame (ret, _("Display")); 1060 vbox = gaim_gtk_make_frame (ret, _("Display"));
1061 #if 0 /* PREFSLASH04 */
1062 gaim_gtk_prefs_checkbox(_("_Show people joining in window"),
1063 "/core/conversations/chat/show_join", vbox);
1064 gaim_gtk_prefs_checkbox(_("_Show people leaving in window"),
1065 "/core/conversations/chat/show_leave", vbox);
1066 #endif /* PREFSLASH04 */
1067 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"), 1061 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"),
1068 "/gaim/gtk/conversations/chat/color_nicks", vbox); 1062 "/gaim/gtk/conversations/chat/color_nicks", vbox);
1069 1063
1070 gtk_widget_show_all(ret); 1064 gtk_widget_show_all(ret);
1071 return ret; 1065 return ret;
1476 box = gaim_gtk_prefs_checkbox(_("Log your _own signons/idleness/awayness"), 1470 box = gaim_gtk_prefs_checkbox(_("Log your _own signons/idleness/awayness"),
1477 "/core/logging/log_own_states", vbox); 1471 "/core/logging/log_own_states", vbox);
1478 g_signal_connect(G_OBJECT(sys_box), "clicked", 1472 g_signal_connect(G_OBJECT(sys_box), "clicked",
1479 G_CALLBACK(gaim_gtk_toggle_sensitive), box); 1473 G_CALLBACK(gaim_gtk_toggle_sensitive), box);
1480 gtk_widget_set_sensitive(box, syslog_enabled); 1474 gtk_widget_set_sensitive(box, syslog_enabled);
1481
1482 #if 0 /* PREFSLASH04 */
1483 gaim_gtk_prefs_checkbox(_("I_ndividual log file for each buddy's signons"),
1484 "/gaim/gtk/logging/individual_logs", vbox);
1485 #endif /* PREFSLASH04 */
1486 1475
1487 gtk_widget_show_all(ret); 1476 gtk_widget_show_all(ret);
1488 return ret; 1477 return ret;
1489 } 1478 }
1490 1479
1668 } 1657 }
1669 1658
1670 static GtkWidget * 1659 static GtkWidget *
1671 protocol_page() { 1660 protocol_page() {
1672 GtkWidget *ret; 1661 GtkWidget *ret;
1673 1662
1674 ret = gtk_label_new(NULL); 1663 ret = gtk_label_new(NULL);
1675 gtk_widget_show(ret); 1664 gtk_widget_show(ret);
1676 1665
1677 return ret; 1666 return ret;
1678 } 1667 }
1679 1668
1680 static GtkWidget *plugin_description=NULL, *plugin_details=NULL; 1669 static GtkWidget *plugin_description=NULL, *plugin_details=NULL;
1681 1670
1688 1677
1689 if (! gtk_tree_selection_get_selected (sel, &model, &iter)) 1678 if (! gtk_tree_selection_get_selected (sel, &model, &iter))
1690 return; 1679 return;
1691 gtk_tree_model_get_value (model, &iter, 3, &val); 1680 gtk_tree_model_get_value (model, &iter, 3, &val);
1692 plug = g_value_get_pointer(&val); 1681 plug = g_value_get_pointer(&val);
1693 1682
1694 pname = g_markup_escape_text(_(plug->info->name), -1); 1683 pname = g_markup_escape_text(_(plug->info->name), -1);
1695 pdesc = g_markup_escape_text(_(plug->info->description), -1); 1684 pdesc = g_markup_escape_text(_(plug->info->description), -1);
1696 pauth = g_markup_escape_text(_(plug->info->author), -1); 1685 pauth = g_markup_escape_text(_(plug->info->author), -1);
1697 pweb = g_markup_escape_text(_(plug->info->homepage), -1); 1686 pweb = g_markup_escape_text(_(plug->info->homepage), -1);
1698 if (plug->error != NULL) { 1687 if (plug->error != NULL) {
1792 } 1781 }
1793 } 1782 }
1794 } 1783 }
1795 1784
1796 if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) { 1785 if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) {
1797 GtkTreeIter iter; 1786 GtkTreeIter iter;
1798 GtkWidget *pref_frame; 1787 GtkWidget *pref_frame;
1799 GaimPluginUiInfo *prefs_info; 1788 GaimPluginUiInfo *prefs_info;
1800 1789
1801 if(plug->info->type == GAIM_PLUGIN_PROTOCOL) 1790 if(plug->info->type == GAIM_PLUGIN_PROTOCOL)
1802 iter = proto_iter; 1791 iter = proto_iter;
1962 col = gtk_tree_view_column_new_with_attributes (_("Name"), 1951 col = gtk_tree_view_column_new_with_attributes (_("Name"),
1963 rendt, 1952 rendt,
1964 "text", 1, 1953 "text", 1,
1965 NULL); 1954 NULL);
1966 gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col); 1955 gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
1967 1956
1968 rendt = gtk_cell_renderer_text_new(); 1957 rendt = gtk_cell_renderer_text_new();
1969 col = gtk_tree_view_column_new_with_attributes(_("Summary"), 1958 col = gtk_tree_view_column_new_with_attributes(_("Summary"),
1970 rendt, 1959 rendt,
1971 "text", 2, 1960 "text", 2,
1972 NULL); 1961 NULL);
1973 gtk_tree_view_append_column(GTK_TREE_VIEW(event_view), col); 1962 gtk_tree_view_append_column(GTK_TREE_VIEW(event_view), col);
1974 1963
1975 g_object_unref(G_OBJECT(ls)); 1964 g_object_unref(G_OBJECT(ls));
1976 gtk_container_add(GTK_CONTAINER(sw), event_view); 1965 gtk_container_add(GTK_CONTAINER(sw), event_view);
1977 1966
1978 1967
1979 nb = gtk_notebook_new(); 1968 nb = gtk_notebook_new();
1980 gtk_notebook_set_tab_pos (GTK_NOTEBOOK(nb), GTK_POS_BOTTOM); 1969 gtk_notebook_set_tab_pos (GTK_NOTEBOOK(nb), GTK_POS_BOTTOM);
1981 gtk_notebook_popup_disable(GTK_NOTEBOOK(nb)); 1970 gtk_notebook_popup_disable(GTK_NOTEBOOK(nb));
1982 1971
1983 /* Description */ 1972 /* Description */
1984 sw = gtk_scrolled_window_new(NULL, NULL); 1973 sw = gtk_scrolled_window_new(NULL, NULL);
1985 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 1974 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
1986 plugin_description = gtk_label_new(NULL); 1975 plugin_description = gtk_label_new(NULL);
1987 1976
1988 vp = gtk_viewport_new(NULL, NULL); 1977 vp = gtk_viewport_new(NULL, NULL);
1989 gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_NONE); 1978 gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_NONE);
1990 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE); 1979 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
1991 1980
1992 gtk_container_add(GTK_CONTAINER(vp), plugin_description); 1981 gtk_container_add(GTK_CONTAINER(vp), plugin_description);
1993 gtk_container_add(GTK_CONTAINER(sw), vp); 1982 gtk_container_add(GTK_CONTAINER(sw), vp);
1994 1983
1995 gtk_label_set_selectable(GTK_LABEL(plugin_description), TRUE); 1984 gtk_label_set_selectable(GTK_LABEL(plugin_description), TRUE);
1996 gtk_label_set_line_wrap(GTK_LABEL(plugin_description), TRUE); 1985 gtk_label_set_line_wrap(GTK_LABEL(plugin_description), TRUE);
1997 gtk_misc_set_alignment(GTK_MISC(plugin_description), 0, 0); 1986 gtk_misc_set_alignment(GTK_MISC(plugin_description), 0, 0);
1998 gtk_misc_set_padding(GTK_MISC(plugin_description), 6, 6); 1987 gtk_misc_set_padding(GTK_MISC(plugin_description), 6, 6);
1999 gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Description"))); 1988 gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Description")));
2000 1989
2001 /* Details */ 1990 /* Details */
2002 sw = gtk_scrolled_window_new(NULL, NULL); 1991 sw = gtk_scrolled_window_new(NULL, NULL);
2003 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 1992 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
2004 plugin_details = gtk_label_new(NULL); 1993 plugin_details = gtk_label_new(NULL);
2005 1994
2006 vp = gtk_viewport_new(NULL, NULL); 1995 vp = gtk_viewport_new(NULL, NULL);
2007 gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_NONE); 1996 gtk_viewport_set_shadow_type(GTK_VIEWPORT(vp), GTK_SHADOW_NONE);
2008 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE); 1997 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
2009 1998
2010 gtk_container_add(GTK_CONTAINER(vp), plugin_details); 1999 gtk_container_add(GTK_CONTAINER(vp), plugin_details);
2011 gtk_container_add(GTK_CONTAINER(sw), vp); 2000 gtk_container_add(GTK_CONTAINER(sw), vp);
2012 2001
2013 gtk_label_set_selectable(GTK_LABEL(plugin_details), TRUE); 2002 gtk_label_set_selectable(GTK_LABEL(plugin_details), TRUE);
2014 gtk_label_set_line_wrap(GTK_LABEL(plugin_details), TRUE); 2003 gtk_label_set_line_wrap(GTK_LABEL(plugin_details), TRUE);
2015 gtk_misc_set_alignment(GTK_MISC(plugin_details), 0, 0); 2004 gtk_misc_set_alignment(GTK_MISC(plugin_details), 0, 0);
2016 gtk_misc_set_padding(GTK_MISC(plugin_details), 6, 6); 2005 gtk_misc_set_padding(GTK_MISC(plugin_details), 6, 6);
2017 gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Details"))); 2006 gtk_notebook_append_page(GTK_NOTEBOOK(nb), sw, gtk_label_new(_("Details")));
2018 gtk_box_pack_start(GTK_BOX(ret), nb, TRUE, TRUE, 0); 2007 gtk_box_pack_start(GTK_BOX(ret), nb, TRUE, TRUE, 0);
2019 2008
2020 g_signal_connect (G_OBJECT (sel), "changed", 2009 g_signal_connect (G_OBJECT (sel), "changed",
2021 G_CALLBACK (prefs_plugin_sel), 2010 G_CALLBACK (prefs_plugin_sel),
2022 NULL); 2011 NULL);
2023 g_signal_connect (G_OBJECT(rend), "toggled", 2012 g_signal_connect (G_OBJECT(rend), "toggled",
2024 G_CALLBACK(plugin_load), ls); 2013 G_CALLBACK(plugin_load), ls);
2025 2014
2026 path = gtk_tree_path_new_first(); 2015 path = gtk_tree_path_new_first();
2027 gtk_tree_selection_select_path(sel, path); 2016 gtk_tree_selection_select_path(sel, path);
2572 scrolled_window = gtk_scrolled_window_new(NULL, NULL); 2561 scrolled_window = gtk_scrolled_window_new(NULL, NULL);
2573 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), 2562 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
2574 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); 2563 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
2575 gtk_container_add(GTK_CONTAINER(frame), scrolled_window); 2564 gtk_container_add(GTK_CONTAINER(frame), scrolled_window);
2576 gtk_widget_show(scrolled_window); 2565 gtk_widget_show(scrolled_window);
2577 2566
2578 /* The tree -- much inspired by the Gimp */ 2567 /* The tree -- much inspired by the Gimp */
2579 prefstree = gtk_tree_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); 2568 prefstree = gtk_tree_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
2580 tree_v = gtk_tree_view_new_with_model (GTK_TREE_MODEL (prefstree)); 2569 tree_v = gtk_tree_view_new_with_model (GTK_TREE_MODEL (prefstree));
2581 gtk_container_add(GTK_CONTAINER(scrolled_window), tree_v); 2570 gtk_container_add(GTK_CONTAINER(scrolled_window), tree_v);
2582 2571
2913 void gaim_gtk_prefs_update_old() { 2902 void gaim_gtk_prefs_update_old() {
2914 /* Rename some old prefs */ 2903 /* Rename some old prefs */
2915 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims"); 2904 gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims");
2916 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats"); 2905 gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats");
2917 gaim_prefs_rename("/core/conversations/placement", 2906 gaim_prefs_rename("/core/conversations/placement",
2918 "/gaim/gtk/conversations/placement"); 2907 "/gaim/gtk/conversations/placement");
2919 2908
2920 /* Remove some no-longer-used prefs */ 2909 /* Remove some no-longer-used prefs */
2921 gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); 2910 gaim_prefs_remove("/gaim/gtk/blist/show_group_count");
2922 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs"); 2911 gaim_prefs_remove("/gaim/gtk/conversations/icons_on_tabs");
2923 gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); 2912 gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors");
2927 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys"); 2916 gaim_prefs_remove("/gaim/gtk/conversations/show_smileys");
2928 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion"); 2917 gaim_prefs_remove("/gaim/gtk/conversations/chat/tab_completion");
2929 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete"); 2918 gaim_prefs_remove("/gaim/gtk/conversations/chat/old_tab_complete");
2930 gaim_prefs_remove("/gaim/gtk/sound/signon"); 2919 gaim_prefs_remove("/gaim/gtk/sound/signon");
2931 gaim_prefs_remove("/gaim/gtk/sound/silent_signon"); 2920 gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
2932 } 2921 gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
2922 }