Revision 786 src/prefs_common_dialog.c

prefs_common_dialog.c (revision 786)
79 79
	GtkWidget *checkbtn_savemsg;
80 80
	GtkWidget *checkbtn_filter_sent;
81 81

  
82
	GtkWidget *optmenu_charset;
83 82
	GtkWidget *optmenu_encoding_method;
84 83
} p_send;
85 84

  
......
133 132
	GtkWidget *chkbtn_expand_thread;
134 133
	GtkWidget *entry_datefmt;
135 134

  
136
	GtkWidget *optmenu_encoding;
135
	GtkWidget *optmenu_dispencoding;
136
	GtkWidget *optmenu_outencoding;
137 137
} display;
138 138

  
139 139
static struct Message {
......
280 280
	{"filter_sent_message", &p_send.checkbtn_filter_sent,
281 281
	 prefs_set_data_from_toggle, prefs_set_toggle},
282 282

  
283
	{"outgoing_charset", &p_send.optmenu_charset,
284
	 prefs_common_charset_set_data_from_optmenu,
285
	 prefs_common_charset_set_optmenu},
286 283
	{"encoding_method", &p_send.optmenu_encoding_method,
287 284
	 prefs_common_encoding_set_data_from_optmenu,
288 285
	 prefs_common_encoding_set_optmenu},
......
399 396
	 prefs_set_data_from_toggle, prefs_set_toggle},
400 397

  
401 398
	/* Encoding */
402
	{"default_encoding", &display.optmenu_encoding,
399
	{"default_encoding", &display.optmenu_dispencoding,
403 400
	 prefs_common_charset_set_data_from_optmenu,
404 401
	 prefs_common_charset_set_optmenu},
402
	{"outgoing_charset", &display.optmenu_outencoding,
403
	 prefs_common_charset_set_data_from_optmenu,
404
	 prefs_common_charset_set_optmenu},
405 405

  
406 406
	/* Junk mail */
407 407
	{"enable_junk", &junk.chkbtn_enable_junk,
......
832 832
	GtkWidget *hbox1;
833 833
	GtkWidget *checkbtn_savemsg;
834 834
	GtkWidget *checkbtn_filter_sent;
835
	GtkWidget *label_outcharset;
836
	GtkWidget *optmenu_charset;
835
	GtkWidget *optmenu_trencoding;
837 836
	GtkWidget *optmenu_menu;
838 837
	GtkWidget *menuitem;
839
	GtkWidget *label_charset_desc;
840
	GtkWidget *optmenu_encoding;
841 838
	GtkWidget *label_encoding;
842 839
	GtkWidget *label_encoding_desc;
843 840

  
......
860 857
	gtk_widget_show (hbox1);
861 858
	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
862 859

  
863
	label_outcharset = gtk_label_new (_("Outgoing encoding"));
864
	gtk_widget_show (label_outcharset);
865
	gtk_box_pack_start (GTK_BOX (hbox1), label_outcharset, FALSE, FALSE, 0);
866

  
867
	optmenu_charset = gtk_option_menu_new ();
868
	gtk_widget_show (optmenu_charset);
869
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_charset, FALSE, FALSE, 0);
870

  
871
	prefs_common_set_encoding_optmenu (GTK_OPTION_MENU (optmenu_charset),
872
					   TRUE);
873

  
874
	PACK_SMALL_LABEL (vbox1, label_charset_desc,
875
			  _("If `Automatic' is selected, the optimal encoding "
876
			    "for the current locale will be used."));
877

  
878
	hbox1 = gtk_hbox_new (FALSE, 8);
879
	gtk_widget_show (hbox1);
880
	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
881

  
882 860
	label_encoding = gtk_label_new (_("Transfer encoding"));
883 861
	gtk_widget_show (label_encoding);
884 862
	gtk_box_pack_start (GTK_BOX (hbox1), label_encoding, FALSE, FALSE, 0);
885 863

  
886
	optmenu_encoding = gtk_option_menu_new ();
887
	gtk_widget_show (optmenu_encoding);
888
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_encoding, FALSE, FALSE, 0);
864
	optmenu_trencoding = gtk_option_menu_new ();
865
	gtk_widget_show (optmenu_trencoding);
866
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_trencoding,
867
			    FALSE, FALSE, 0);
889 868

  
890 869
	optmenu_menu = gtk_menu_new ();
891 870

  
......
899 878

  
900 879
#undef SET_MENUITEM
901 880

  
902
	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_encoding),
881
	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_trencoding),
903 882
				  optmenu_menu);
904 883

  
905 884
	PACK_SMALL_LABEL (vbox1, label_encoding_desc,
......
909 888
	p_send.checkbtn_savemsg     = checkbtn_savemsg;
910 889
	p_send.checkbtn_filter_sent = checkbtn_filter_sent;
911 890

  
912
	p_send.optmenu_charset         = optmenu_charset;
913
	p_send.optmenu_encoding_method = optmenu_encoding;
891
	p_send.optmenu_encoding_method = optmenu_trencoding;
914 892
}
915 893

  
916 894
static void prefs_compose_create(void)
......
1342 1320

  
1343 1321
	GtkWidget *msg_wid;
1344 1322

  
1345
	GtkWidget *label_encoding;
1346
	GtkWidget *optmenu_encoding;
1323
	GtkWidget *label_dispencoding;
1324
	GtkWidget *optmenu_dispencoding;
1325
	GtkWidget *label_outencoding;
1326
	GtkWidget *optmenu_outencoding;
1347 1327
	GtkWidget *label_encoding_desc;
1348 1328

  
1349 1329
	vbox1 = gtk_vbox_new (FALSE, VSPACING);
......
1471 1451
	gtk_widget_show (hbox1);
1472 1452
	gtk_box_pack_start (GTK_BOX (vbox_tab), hbox1, FALSE, FALSE, 0);
1473 1453

  
1474
	label_encoding = gtk_label_new (_("Default character encoding"));
1475
	gtk_widget_show (label_encoding);
1476
	gtk_box_pack_start (GTK_BOX (hbox1), label_encoding, FALSE, FALSE, 0);
1454
	label_dispencoding = gtk_label_new (_("Default character encoding"));
1455
	gtk_widget_show (label_dispencoding);
1456
	gtk_box_pack_start (GTK_BOX (hbox1), label_dispencoding,
1457
			    FALSE, FALSE, 0);
1477 1458

  
1478
	optmenu_encoding = gtk_option_menu_new ();
1479
	gtk_widget_show (optmenu_encoding);
1480
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_encoding, FALSE, FALSE, 0);
1459
	optmenu_dispencoding = gtk_option_menu_new ();
1460
	gtk_widget_show (optmenu_dispencoding);
1461
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_dispencoding,
1462
			    FALSE, FALSE, 0);
1481 1463

  
1482
	prefs_common_set_encoding_optmenu (GTK_OPTION_MENU (optmenu_encoding),
1483
					   FALSE);
1464
	prefs_common_set_encoding_optmenu
1465
		(GTK_OPTION_MENU (optmenu_dispencoding), FALSE);
1484 1466

  
1485 1467
	PACK_SMALL_LABEL (vbox_tab, label_encoding_desc,
1486
			  _("This is used for messages with missing character encoding."));
1468
			  _("This is used when displaying messages with missing character encoding."));
1487 1469

  
1470
	hbox1 = gtk_hbox_new (FALSE, 8);
1471
	gtk_widget_show (hbox1);
1472
	gtk_box_pack_start (GTK_BOX (vbox_tab), hbox1, FALSE, FALSE, 0);
1473

  
1474
	label_outencoding = gtk_label_new (_("Outgoing character encoding"));
1475
	gtk_widget_show (label_outencoding);
1476
	gtk_box_pack_start (GTK_BOX (hbox1), label_outencoding,
1477
			    FALSE, FALSE, 0);
1478

  
1479
	optmenu_outencoding = gtk_option_menu_new ();
1480
	gtk_widget_show (optmenu_outencoding);
1481
	gtk_box_pack_start (GTK_BOX (hbox1), optmenu_outencoding,
1482
			    FALSE, FALSE, 0);
1483

  
1484
	prefs_common_set_encoding_optmenu
1485
		(GTK_OPTION_MENU (optmenu_outencoding), TRUE);
1486

  
1487
	PACK_SMALL_LABEL (vbox_tab, label_encoding_desc,
1488
			  _("If `Automatic' is selected, the optimal encoding "
1489
			    "for the current locale will be used."));
1490

  
1488 1491
	display.fontbtn_textfont = fontbtn_textfont;
1489 1492

  
1490 1493
	display.chkbtn_folder_unread      = chkbtn_folder_unread;
......
1496 1499
	display.chkbtn_expand_thread = chkbtn_expand_thread;
1497 1500
	display.entry_datefmt        = entry_datefmt;
1498 1501

  
1499
	display.optmenu_encoding = optmenu_encoding;
1502
	display.optmenu_dispencoding = optmenu_dispencoding;
1503
	display.optmenu_outencoding  = optmenu_outencoding;
1500 1504
}
1501 1505

  
1502 1506
static GtkWidget *prefs_message_create(void)

Also available in: Unified diff