Mercurial > pidgin

comparison gtk/gtkprefs.c @ 14888:d17ae8987b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17660] * Add a label for Default Formatting, so the imhtml doesn't look so out of place. * Modify a few things for consistency. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Fri, 03 Nov 2006 03:13:26 +0000
parents e08ba6a460c8
children fdbf71ae8775
comparison
equal deleted inserted replaced
14887:e08ba6a460c8 14888:d17ae8987b11
630 GtkTreeSelection *sel; 630 GtkTreeSelection *sel;
631 GtkTreeRowReference *rowref; 631 GtkTreeRowReference *rowref;
632 GtkWidget *label; 632 GtkWidget *label;
633 GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}}; 633 GtkTargetEntry te[3] = {{"text/plain", 0, 0},{"text/uri-list", 0, 1},{"STRING", 0, 2}};
634 634
635 ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); 635 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
636 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); 636 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
637 637
638 label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list.")); 638 label = gtk_label_new(_("Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."));
639 639
640 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); 640 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
806 GtkWidget *vbox2; 806 GtkWidget *vbox2;
807 GtkWidget *label; 807 GtkWidget *label;
808 GtkSizeGroup *sg; 808 GtkSizeGroup *sg;
809 GList *names = NULL; 809 GList *names = NULL;
810 810
811 ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); 811 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
812 gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); 812 gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER);
813 813
814 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 814 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
815 815
816 vbox = gaim_gtk_make_frame(ret, _("System Tray Icon")); 816 vbox = gaim_gtk_make_frame(ret, _("System Tray Icon"));
817 label = gaim_gtk_prefs_dropdown(vbox, _("_Show System Tray Icon:"), GAIM_PREF_STRING, 817 label = gaim_gtk_prefs_dropdown(vbox, _("_Show system tray icon:"), GAIM_PREF_STRING,
818 "/gaim/gtk/docklet/show", 818 "/gaim/gtk/docklet/show",
819 _("Always"), "always", 819 _("Always"), "always",
820 _("Never"), "never", 820 _("Never"), "never",
821 _("On unread messages"), "pending", 821 _("On unread messages"), "pending",
822 NULL); 822 NULL);
823 gtk_size_group_add_widget(sg, label); 823 gtk_size_group_add_widget(sg, label);
824 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 824 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
825 825
826 vbox = gaim_gtk_make_frame(ret, _("Conversation Window Hiding")); 826 vbox = gaim_gtk_make_frame(ret, _("Conversation Window Hiding"));
827 label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations"), 827 label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
828 GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new", 828 GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new",
829 _("Never"), "never", 829 _("Never"), "never",
830 _("When away"), "away", 830 _("When away"), "away",
831 _("Always"), "always", 831 _("Always"), "always",
832 NULL); 832 NULL);
833 gtk_size_group_add_widget(sg, label); 833 gtk_size_group_add_widget(sg, label);
834 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 834 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
835 835
836 836
837 /* All the tab options! */ 837 /* All the tab options! */
838 vbox = gaim_gtk_make_frame(ret, _("Tab Options")); 838 vbox = gaim_gtk_make_frame(ret, _("Tabs"));
839 839
840 gaim_gtk_prefs_checkbox(_("Show IMs and chats in _tabbed windows"), 840 gaim_gtk_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
841 "/gaim/gtk/conversations/tabs", vbox); 841 "/gaim/gtk/conversations/tabs", vbox);
842 842
843 /* 843 /*
890 GtkWidget *iconpref1; 890 GtkWidget *iconpref1;
891 GtkWidget *iconpref2; 891 GtkWidget *iconpref2;
892 GtkWidget *imhtml; 892 GtkWidget *imhtml;
893 GtkWidget *frame; 893 GtkWidget *frame;
894 894
895 ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); 895 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
896 gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER); 896 gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER);
897 897
898 vbox = gaim_gtk_make_frame(ret, _("Conversations")); 898 vbox = gaim_gtk_make_frame(ret, _("Conversations"));
899 899
900 gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"), 900 gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"),
919 gaim_gtk_prefs_checkbox(_("Use smooth-scrolling"), "/gaim/gtk/conversations/use_smooth_scrolling", vbox); 919 gaim_gtk_prefs_checkbox(_("Use smooth-scrolling"), "/gaim/gtk/conversations/use_smooth_scrolling", vbox);
920 920
921 #ifdef _WIN32 921 #ifdef _WIN32
922 gaim_gtk_prefs_checkbox(_("F_lash window when IMs are received"), "/gaim/gtk/win32/blink_im", vbox); 922 gaim_gtk_prefs_checkbox(_("F_lash window when IMs are received"), "/gaim/gtk/win32/blink_im", vbox);
923 #endif 923 #endif
924
925 vbox = gaim_gtk_make_frame(ret, _("Default Formatting"));
924 926
925 frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar, NULL); 927 frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
926 gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml"); 928 gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml");
927 gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE); 929 gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
928 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), 930 gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
1000 GtkWidget *vbox, *hbox, *entry; 1002 GtkWidget *vbox, *hbox, *entry;
1001 GtkWidget *table, *label, *auto_ip_checkbox, *ports_checkbox, *spin_button; 1003 GtkWidget *table, *label, *auto_ip_checkbox, *ports_checkbox, *spin_button;
1002 GtkSizeGroup *sg; 1004 GtkSizeGroup *sg;
1003 GaimProxyInfo *proxy_info = NULL; 1005 GaimProxyInfo *proxy_info = NULL;
1004 1006
1005 ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); 1007 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
1006 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); 1008 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
1007 1009
1008 vbox = gaim_gtk_make_frame (ret, _("IP Address")); 1010 vbox = gaim_gtk_make_frame (ret, _("IP Address"));
1009 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1011 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1010 gaim_gtk_prefs_labeled_entry(vbox,_("ST_UN server:"), 1012 gaim_gtk_prefs_labeled_entry(vbox,_("ST_UN server:"),
1340 GtkWidget *vbox; 1342 GtkWidget *vbox;
1341 GList *names; 1343 GList *names;
1342 1344
1343 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); 1345 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
1344 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); 1346 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
1347
1345 1348
1346 vbox = gaim_gtk_make_frame (ret, _("Logging")); 1349 vbox = gaim_gtk_make_frame (ret, _("Logging"));
1347 names = gaim_log_logger_get_options(); 1350 names = gaim_log_logger_get_options();
1348 1351
1349 gaim_gtk_prefs_dropdown_from_list(vbox, _("Log _format:"), GAIM_PREF_STRING, 1352 gaim_gtk_prefs_dropdown_from_list(vbox, _("Log _format:"), GAIM_PREF_STRING,
1759 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); 1762 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
1760 1763
1761 button = gtk_button_new_with_label(_("Choose...")); 1764 button = gtk_button_new_with_label(_("Choose..."));
1762 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(select_sound), NULL); 1765 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(select_sound), NULL);
1763 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); 1766 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
1767
1764 gtk_widget_show_all(ret); 1768 gtk_widget_show_all(ret);
1765 1769
1766 return ret; 1770 return ret;
1767 } 1771 }
1768 1772