GtkWidget *chkbtn_transhdr;
GtkWidget *chkbtn_swapfrom;
- GtkWidget *chkbtn_hscrollbar;
GtkWidget *chkbtn_useaddrbook;
GtkWidget *chkbtn_expand_thread;
- GtkWidget *chkbtn_bold_unread;
GtkWidget *entry_datefmt;
} display;
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
- GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *optmenu_recvdialog;
GtkWidget *optmenu_senddialog;
GtkWidget *checkbtn_no_recv_err_panel;
GtkWidget *printcmd_entry;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
+ GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *checkbtn_confonexit;
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
&prefs_common.display_folder_unread, P_BOOL,
&display.chkbtn_folder_unread,
prefs_set_data_from_toggle, prefs_set_toggle},
-
{"newsgroup_abbrev_len", "16",
&prefs_common.ng_abbrev_len, P_INT,
&display.spinbtn_ng_abbrev_len,
{"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
&display.chkbtn_swapfrom,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
- &display.chkbtn_hscrollbar,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
&display.chkbtn_useaddrbook,
prefs_set_data_from_toggle, prefs_set_toggle},
{"expand_thread", "TRUE", &prefs_common.expand_thread, P_BOOL,
&display.chkbtn_expand_thread,
prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
+ NULL, NULL, NULL},
{"bold_unread", "TRUE", &prefs_common.bold_unread, P_BOOL,
- &display.chkbtn_bold_unread,
- prefs_set_data_from_toggle, prefs_set_toggle},
+ NULL, NULL, NULL},
{"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
NULL, NULL, NULL},
prefs_nextunreadmsgdialog_set_data_from_optmenu,
prefs_nextunreadmsgdialog_set_optmenu},
- {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
- P_BOOL, &interface.checkbtn_addaddrbyclick,
- prefs_set_data_from_toggle, prefs_set_toggle},
{"pixmap_theme_path", DEFAULT_PIXMAP_THEME,
&prefs_common.pixmap_theme_path, P_STRING,
&interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
&prefs_common.ext_editor_cmd, P_STRING,
&other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
+ P_BOOL, &other.checkbtn_addaddrbyclick,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
{"confirm_on_exit", "TRUE", &prefs_common.confirm_on_exit, P_BOOL,
&other.checkbtn_confonexit,
prefs_set_data_from_toggle, prefs_set_toggle},
GtkWidget *frame_summary;
GtkWidget *vbox2;
GtkWidget *chkbtn_swapfrom;
- GtkWidget *chkbtn_hscrollbar;
GtkWidget *chkbtn_useaddrbook;
GtkWidget *chkbtn_expand_thread;
- GtkWidget *chkbtn_bold_unread;
GtkWidget *vbox3;
GtkWidget *label_datefmt;
GtkWidget *button_datefmt;
PACK_CHECK_BUTTON
(vbox2, chkbtn_useaddrbook,
_("Display sender using address book"));
- PACK_CHECK_BUTTON
- (vbox2, chkbtn_hscrollbar, _("Enable horizontal scroll bar"));
PACK_CHECK_BUTTON
(vbox2, chkbtn_expand_thread, _("Expand threads"));
- PACK_CHECK_BUTTON
- (vbox2, chkbtn_bold_unread,
- _("Display unread messages with bold font"));
PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj;
display.chkbtn_swapfrom = chkbtn_swapfrom;
- display.chkbtn_hscrollbar = chkbtn_hscrollbar;
display.chkbtn_expand_thread = chkbtn_expand_thread;
- display.chkbtn_bold_unread = chkbtn_bold_unread;
display.chkbtn_useaddrbook = chkbtn_useaddrbook;
display.entry_datefmt = entry_datefmt;
}
gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
+
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
PACK_CHECK_BUTTON (hbox1, chkbtn_enablecol,
_("Enable coloration of message"));
SET_TOGGLE_SENSITIVITY(chkbtn_enablecol, button_edit_col);
- vbox2 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox2);
- gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
PACK_CHECK_BUTTON
(vbox2, chkbtn_mbalnum,
- _("Display 2-byte alphabet and numeric with 1-byte character"));
+ _("Display multi-byte alphabet and numeric as\n"
+ "ASCII character (Japanese only)"));
+ gtk_label_set_justify (GTK_LABEL (GTK_BIN(chkbtn_mbalnum)->child),
+ GTK_JUSTIFY_LEFT);
+
PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
_("Display header pane above message view"));
GtkWidget *checkbtn_mark_as_read_on_newwin;
GtkWidget *checkbtn_openinbox;
GtkWidget *checkbtn_immedexec;
+ GtkWidget *frame_dialogs;
+ GtkWidget *vbox_dialogs;
GtkWidget *hbox1;
GtkWidget *label;
GtkWidget *dialogs_table;
GtkWidget *checkbtn_no_recv_err_panel;
GtkWidget *checkbtn_close_recv_dialog;
- GtkWidget *frame_addr;
- GtkWidget *vbox_addr;
- GtkWidget *checkbtn_addaddrbyclick;
-
GtkWidget *button_keybind;
GtkWidget *hbox2;
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 8);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
- PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
+ PACK_FRAME (vbox1, frame_dialogs, _("Dialogs"));
+ vbox_dialogs = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox_dialogs);
+ gtk_container_add (GTK_CONTAINER (frame_dialogs), vbox_dialogs);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_dialogs), 8);
dialogs_table = gtk_table_new (2, 2, FALSE);
gtk_widget_show (dialogs_table);
- gtk_container_add (GTK_CONTAINER (vbox2), dialogs_table);
- gtk_container_set_border_width (GTK_CONTAINER (dialogs_table), 8);
+ gtk_container_add (GTK_CONTAINER (vbox_dialogs), dialogs_table);
+ gtk_container_set_border_width (GTK_CONTAINER (dialogs_table), 4);
gtk_table_set_row_spacings (GTK_TABLE (dialogs_table), VSPACING_NARROW);
gtk_table_set_col_spacings (GTK_TABLE (dialogs_table), 8);
- label = gtk_label_new (_("Show send dialog"));
+ /* Next Unread Message Dialog */
+ label = gtk_label_new (_("Show no-unread-message dialog"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
+ gtk_widget_show (optmenu_nextunreadmsgdialog);
+ gtk_table_attach (GTK_TABLE (dialogs_table),
+ optmenu_nextunreadmsgdialog, 1, 2, 0, 1,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ menu = gtk_menu_new ();
+ MENUITEM_ADD (menu, menuitem, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+ MENUITEM_ADD (menu, menuitem, _("Assume 'Yes'"),
+ NEXTUNREADMSGDIALOG_ASSUME_YES);
+ MENUITEM_ADD (menu, menuitem, _("Assume 'No'"),
+ NEXTUNREADMSGDIALOG_ASSUME_NO);
+
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog), menu);
+
+ label = gtk_label_new (_("Show send dialog"));
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 1, 2,
+ GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
optmenu_senddialog = gtk_option_menu_new ();
gtk_widget_show (optmenu_senddialog);
- gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_senddialog, 1, 2, 0, 1,
+ gtk_table_attach (GTK_TABLE (dialogs_table),
+ optmenu_senddialog, 1, 2, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
menu = gtk_menu_new ();
label = gtk_label_new (_("Show receive dialog"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 1, 2,
+ gtk_table_attach (GTK_TABLE (dialogs_table), label, 0, 1, 2, 3,
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
optmenu_recvdialog = gtk_option_menu_new ();
gtk_widget_show (optmenu_recvdialog);
- gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_recvdialog, 1, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (dialogs_table), optmenu_recvdialog, 1, 2, 2, 3,
GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
menu = gtk_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
- PACK_CHECK_BUTTON (vbox2, checkbtn_no_recv_err_panel,
+ PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_no_recv_err_panel,
_("Don't popup error dialog on receive error"));
- PACK_CHECK_BUTTON (vbox2, checkbtn_close_recv_dialog,
+ PACK_CHECK_BUTTON (vbox_dialogs, checkbtn_close_recv_dialog,
_("Close receive dialog when finished"));
- PACK_FRAME (vbox1, frame_addr, _("Address book"));
-
- vbox_addr = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox_addr);
- gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
-
- PACK_CHECK_BUTTON
- (vbox_addr, checkbtn_addaddrbyclick,
- _("Add address to destination when double-clicked"));
-
- /* Next Unread Message Dialog */
- hbox2 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
-
- label = gtk_label_new (_("Show no-unread-message dialog"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
-
- optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
- gtk_widget_show (optmenu_nextunreadmsgdialog);
- gtk_box_pack_start (GTK_BOX (hbox2), optmenu_nextunreadmsgdialog,
- FALSE, FALSE, 0);
-
- optmenu_nextunreadmsgdialog_menu = gtk_menu_new ();
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
- MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
- _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog),
- optmenu_nextunreadmsgdialog_menu);
-
-
- /* Receive Dialog */
-/* hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
- label = gtk_label_new (_("Show receive Dialog"));
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
- recvdialog_optmenu = gtk_option_menu_new ();
- gtk_widget_show (recvdialog_optmenu);
- gtk_box_pack_start (GTK_BOX (hbox), recvdialog_optmenu, FALSE, FALSE, 0);
-
- recvdialog_optmenu_menu = gtk_menu_new ();
-
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Always"), RECVDIALOG_ALWAYS);
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Only if a sylpheed window is active"), RECVDIALOG_WINDOW_ACTIVE);
- MENUITEM_ADD (recvdialog_optmenu_menu, recvdialog_menuitem, _("Never"), RECVDIALOG_NEVER);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu); */
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
interface.optmenu_senddialog = optmenu_senddialog;
interface.checkbtn_no_recv_err_panel = checkbtn_no_recv_err_panel;
interface.checkbtn_close_recv_dialog = checkbtn_close_recv_dialog;
- interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
interface.combo_pixmap_theme = combo_pixmap_theme;
interface.entry_pixmap_theme = entry_pixmap_theme;
GtkWidget *exteditor_combo;
GtkWidget *exteditor_entry;
+ GtkWidget *frame_addr;
+ GtkWidget *vbox_addr;
+ GtkWidget *checkbtn_addaddrbyclick;
+
GtkWidget *frame_cliplog;
GtkWidget *vbox_cliplog;
GtkWidget *hbox_cliplog;
NULL);
exteditor_entry = GTK_COMBO (exteditor_combo)->entry;
+ PACK_FRAME (vbox1, frame_addr, _("Address book"));
+
+ vbox_addr = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox_addr);
+ gtk_container_add (GTK_CONTAINER (frame_addr), vbox_addr);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_addr), 8);
+
+ PACK_CHECK_BUTTON
+ (vbox_addr, checkbtn_addaddrbyclick,
+ _("Add address to destination when double-clicked"));
+
/* Clip Log */
PACK_FRAME (vbox1, frame_cliplog, _("Log Size"));
other.exteditor_combo = exteditor_combo;
other.exteditor_entry = exteditor_entry;
+ other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
+
other.checkbtn_cliplog = checkbtn_cliplog;
other.loglength_entry = loglength_entry;