Revision 3138

src/prefs_common_dialog.c (revision 3138)
168 168
	GtkWidget *spinbtn_scrollstep;
169 169
	GtkObject *spinbtn_scrollstep_adj;
170 170
	GtkWidget *chkbtn_halfpage;
171

  
172
	GtkWidget *chkbtn_resize_image;
173
	GtkWidget *chkbtn_inline_image;
174 171
} message;
175 172

  
176 173
static struct Attach {
177 174
	GtkWidget *chkbtn_show_attach_tab;
178 175
	GtkWidget *chkbtn_show_files_first;
176

  
177
	GtkWidget *chkbtn_resize_image;
178
	GtkWidget *chkbtn_inline_image;
179 179
} attach;
180 180

  
181 181
static struct ColorLabel {
......
468 468
	{"scroll_half_page", &message.chkbtn_halfpage,
469 469
	 prefs_set_data_from_toggle, prefs_set_toggle},
470 470

  
471
	{"resize_image", &message.chkbtn_resize_image,
472
	 prefs_set_data_from_toggle, prefs_set_toggle},
473
	{"inline_image", &message.chkbtn_inline_image,
474
	 prefs_set_data_from_toggle, prefs_set_toggle},
475

  
476 471
	/* Attachment */
477 472
	{"show_attach_tab", &attach.chkbtn_show_attach_tab,
478 473
	 prefs_set_data_from_toggle, prefs_set_toggle},
479 474
	{"show_attached_files_first", &attach.chkbtn_show_files_first,
480 475
	 prefs_set_data_from_toggle, prefs_set_toggle},
481 476

  
477
	{"resize_image", &attach.chkbtn_resize_image,
478
	 prefs_set_data_from_toggle, prefs_set_toggle},
479
	{"inline_image", &attach.chkbtn_inline_image,
480
	 prefs_set_data_from_toggle, prefs_set_toggle},
481

  
482 482
	/* Encoding */
483 483
	{"default_encoding", &display.optmenu_dispencoding,
484 484
	 prefs_common_charset_set_data_from_optmenu,
......
1859 1859
	GtkWidget *spinbtn_scrollstep;
1860 1860
	GtkWidget *chkbtn_halfpage;
1861 1861

  
1862
	GtkWidget *frame_image;
1863
	GtkWidget *vbox_image;
1864
	GtkWidget *chkbtn_resize_image;
1865
	GtkWidget *chkbtn_inline_image;
1866

  
1867 1862
	vbox1 = gtk_vbox_new (FALSE, VSPACING);
1868 1863
	gtk_widget_show (vbox1);
1869 1864

  
......
1994 1989

  
1995 1990
	SET_TOGGLE_SENSITIVITY (chkbtn_smoothscroll, hbox_scr)
1996 1991

  
1997
	PACK_FRAME(vbox1, frame_image, _("Images"));
1998

  
1999
	vbox_image = gtk_vbox_new (FALSE, 0);
2000
	gtk_widget_show (vbox_image);
2001
	gtk_container_add (GTK_CONTAINER (frame_image), vbox_image);
2002
	gtk_container_set_border_width (GTK_CONTAINER (vbox_image), 8);
2003

  
2004
	PACK_CHECK_BUTTON(vbox_image, chkbtn_resize_image,
2005
			  _("Resize attached large images to fit in the window"));
2006
	PACK_CHECK_BUTTON(vbox_image, chkbtn_inline_image,
2007
			  _("Display images as inline"));
2008

  
2009 1992
	message.chkbtn_enablecol   = chkbtn_enablecol;
2010 1993
	message.button_edit_col    = button_edit_col;
2011 1994
	message.chkbtn_disphdrpane = chkbtn_disphdrpane;
......
2019 2002
	message.spinbtn_scrollstep_adj = spinbtn_scrollstep_adj;
2020 2003
	message.chkbtn_halfpage        = chkbtn_halfpage;
2021 2004

  
2022
	message.chkbtn_resize_image = chkbtn_resize_image;
2023
	message.chkbtn_inline_image = chkbtn_inline_image;
2024

  
2025 2005
	return vbox1;
2026 2006
}
2027 2007

  
......
2031 2011
	GtkWidget *vbox2;
2032 2012
	GtkWidget *chkbtn_show_attach_tab;
2033 2013
	GtkWidget *chkbtn_show_files_first;
2014
	GtkWidget *frame_image;
2015
	GtkWidget *vbox_image;
2016
	GtkWidget *chkbtn_resize_image;
2017
	GtkWidget *chkbtn_inline_image;
2034 2018

  
2035 2019
	vbox1 = gtk_vbox_new (FALSE, VSPACING);
2036 2020
	gtk_widget_show (vbox1);
......
2044 2028
	PACK_CHECK_BUTTON(vbox2, chkbtn_show_files_first,
2045 2029
			  _("Show attached files first on message view"));
2046 2030

  
2031
	PACK_FRAME(vbox1, frame_image, _("Images"));
2032

  
2033
	vbox_image = gtk_vbox_new (FALSE, 0);
2034
	gtk_widget_show (vbox_image);
2035
	gtk_container_add (GTK_CONTAINER (frame_image), vbox_image);
2036
	gtk_container_set_border_width (GTK_CONTAINER (vbox_image), 8);
2037

  
2038
	PACK_CHECK_BUTTON(vbox_image, chkbtn_resize_image,
2039
			  _("Resize attached large images to fit in the window"));
2040
	PACK_CHECK_BUTTON(vbox_image, chkbtn_inline_image,
2041
			  _("Display images as inline"));
2042

  
2047 2043
	attach.chkbtn_show_attach_tab  = chkbtn_show_attach_tab;
2048 2044
	attach.chkbtn_show_files_first = chkbtn_show_files_first;
2049 2045

  
2046
	attach.chkbtn_resize_image = chkbtn_resize_image;
2047
	attach.chkbtn_inline_image = chkbtn_inline_image;
2048

  
2050 2049
	return vbox1;
2051 2050
}
2052 2051

  
ChangeLog (revision 3138)
1
2012-07-26
2

  
3
	* src/prefs_common_dialog.c: moved Images option in Display - Attach
4
	  tab.
5

  
1 6
2012-07-25
2 7

  
3 8
	* libsylph/prefs_common.[ch]

Also available in: Unified diff