#include "gtk/menu.h"
#include "manage_window.h"
+#include "combobox.h"
typedef struct _ReceivePage
{
#endif
GtkWidget *label_recvdialog;
- GtkWidget *menu;
- GtkWidget *menuitem;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *optmenu_recvdialog;
GtkWidget *checkbtn_no_recv_err_panel;
GtkWidget *checkbtn_close_recv_dialog;
gtk_misc_set_alignment(GTK_MISC(label_recvdialog), 0, 0.5);
gtk_widget_show (label_recvdialog);
- optmenu_recvdialog = gtk_option_menu_new ();
+ optmenu_recvdialog = gtkut_sc_combobox_create(NULL, FALSE);
gtk_widget_show (optmenu_recvdialog);
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Always"), RECV_DIALOG_ALWAYS);
- MENUITEM_ADD (menu, menuitem, _("Only on manual receiving"),
- RECV_DIALOG_MANUAL);
- MENUITEM_ADD (menu, menuitem, _("Never"), RECV_DIALOG_NEVER);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_recvdialog), menu);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(optmenu_recvdialog)));
+ COMBOBOX_ADD (menu, _("Always"), RECV_DIALOG_ALWAYS);
+ COMBOBOX_ADD (menu, _("Only on manual receiving"), RECV_DIALOG_MANUAL);
+ COMBOBOX_ADD (menu, _("Never"), RECV_DIALOG_NEVER);
hbox = gtk_hbox_new(FALSE, 20);
gtk_widget_show(hbox);
prefs_common.extinc_cmd);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_autochk),
prefs_common.autochk_itv);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_recvdialog),
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_recvdialog),
prefs_common.recv_dialog_mode);
prefs_receive->window = GTK_WIDGET(window);
{
ReceivePage *page = (ReceivePage *) _page;
gchar *tmp;
- GtkWidget *menu;
- GtkWidget *menuitem;
prefs_common.use_extinc = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_incext));
prefs_common.newmail_notify_cmd = tmp;
#endif
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_recvdialog));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_common.recv_dialog_mode = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ prefs_common.recv_dialog_mode =
+ combobox_get_active_data(GTK_COMBO_BOX(page->optmenu_recvdialog));
+
inc_autocheck_timer_remove();
inc_autocheck_timer_set();
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *checkbtn_never_send_retrcpt;
- GtkWidget *optmenu_senddialog;
+ GtkWidget *checkbtn_senddialog;
GtkWidget *optmenu_charset;
GtkWidget *optmenu_encoding_method;
} SendPage;
GtkWidget *optmenu_encoding;
GtkWidget *label_encoding;
GtkTooltips *encoding_tooltip;
- GtkWidget *label_senddialog;
- GtkWidget *menu;
- GtkWidget *optmenu_senddialog;
+ GtkWidget *checkbtn_senddialog;
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *checkbtn_never_send_retrcpt;
GtkWidget *table;
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
- PACK_CHECK_BUTTON (vbox2, checkbtn_savemsg,
+ PACK_CHECK_BUTTON(vbox2, checkbtn_savemsg,
_("Save sent messages to Sent folder"));
- PACK_CHECK_BUTTON (vbox2, checkbtn_confirm_send_queued_messages,
+ PACK_CHECK_BUTTON(vbox2, checkbtn_confirm_send_queued_messages,
_("Confirm before sending queued messages"));
PACK_CHECK_BUTTON(vbox2, checkbtn_never_send_retrcpt,
- _("Never send Return Receipts"));
+ _("Never send Return Receipts"));
+
+ PACK_CHECK_BUTTON(vbox2, checkbtn_senddialog,
+ _("Show send dialog"));
- table = gtk_table_new(3, 2, FALSE);
+ table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(table);
gtk_container_add (GTK_CONTAINER (vbox1), table);
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- label_senddialog = gtk_label_new (_("Show send dialog"));
- gtk_widget_show (label_senddialog);
- gtk_table_attach(GTK_TABLE(table), label_senddialog, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify(GTK_LABEL(label_senddialog), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label_senddialog), 1, 0.5);
-
- /* FIXME : Is it good to change this menu into a checkbtn ? */
- optmenu_senddialog = gtk_option_menu_new ();
- gtk_widget_show (optmenu_senddialog);
- gtk_table_attach(GTK_TABLE(table), optmenu_senddialog, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
- menu = gtk_menu_new ();
- MENUITEM_ADD (menu, menuitem, _("Always"), SEND_DIALOG_ALWAYS);
- MENUITEM_ADD (menu, menuitem, _("Never"), SEND_DIALOG_NEVER);
-
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_senddialog), menu);
-
label_outcharset = gtk_label_new (_("Outgoing encoding"));
gtk_widget_show (label_outcharset);
gtk_table_attach(GTK_TABLE(table), label_outcharset, 0, 1, 1, 2,
prefs_common.confirm_send_queued_messages);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_never_send_retrcpt),
prefs_common.never_send_retrcpt);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_senddialog),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_senddialog),
prefs_common.send_dialog_mode);
prefs_common_charset_set_optmenu(optmenu_charset,
prefs_common.outgoing_charset);
prefs_send->checkbtn_savemsg = checkbtn_savemsg;
prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
prefs_send->checkbtn_never_send_retrcpt = checkbtn_never_send_retrcpt;
- prefs_send->optmenu_senddialog = optmenu_senddialog;
+ prefs_send->checkbtn_senddialog = checkbtn_senddialog;
prefs_send->optmenu_charset = optmenu_charset;
prefs_send->optmenu_encoding_method = optmenu_encoding;
static void prefs_send_save(PrefsPage *_page)
{
SendPage *page = (SendPage *) _page;
- GtkWidget *menu;
- GtkWidget *menuitem;
prefs_common.savemsg = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_savemsg));
GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages));
prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(page->checkbtn_never_send_retrcpt));
+ prefs_common.send_dialog_mode = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_senddialog));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_senddialog));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs_common.send_dialog_mode = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
g_free(prefs_common.outgoing_charset);
prefs_common.outgoing_charset = prefs_common_charset_set_data_from_optmenu(
page->optmenu_charset);