#include "gtk/colorsel.h"
#include "string_match.h"
#include "quote_fmt.h"
+#include "combobox.h"
#if USE_ASPELL
#include "gtkaspell.h"
GtkWidget *hbox, *hbox2, *hbox_spc;
GtkWidget *label;
- GtkWidget *folder_type_menu;
+ GtkListStore *folder_type_menu;
GtkWidget *folder_type;
+ GtkTreeIter iter;
GtkWidget *dummy_checkbtn;
- GtkWidget *menuitem;
SpecialFolderItemType type;
GtkWidget *no_save_warning = NULL;
GtkWidget *offlinesync_rec_checkbtn;
GtkTooltips *tooltips;
+ tooltips = gtk_tooltips_new();
page->item = item;
/* Table */
rowcount++;
/* folder_type */
- folder_type = gtk_option_menu_new ();
+ folder_type = gtkut_sc_combobox_create(NULL, FALSE);
gtk_widget_show (folder_type);
type = F_NORMAL;
else if (folder_has_parent_of_type(item, F_TRASH))
type = F_TRASH;
- folder_type_menu = gtk_menu_new ();
+ folder_type_menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+ GTK_COMBO_BOX(folder_type)));
- MENUITEM_ADD (folder_type_menu, menuitem, _("Normal"), F_NORMAL);
- MENUITEM_ADD (folder_type_menu, menuitem, _("Inbox"), F_INBOX);
- MENUITEM_ADD (folder_type_menu, menuitem, _("Outbox"), F_OUTBOX);
- MENUITEM_ADD (folder_type_menu, menuitem, _("Drafts"), F_DRAFT);
- MENUITEM_ADD (folder_type_menu, menuitem, _("Queue"), F_QUEUE);
- MENUITEM_ADD (folder_type_menu, menuitem, _("Trash"), F_TRASH);
- gtk_option_menu_set_menu (GTK_OPTION_MENU (folder_type), folder_type_menu);
+ COMBOBOX_ADD (folder_type_menu, _("Normal"), F_NORMAL);
+ COMBOBOX_ADD (folder_type_menu, _("Inbox"), F_INBOX);
+ COMBOBOX_ADD (folder_type_menu, _("Outbox"), F_OUTBOX);
+ COMBOBOX_ADD (folder_type_menu, _("Drafts"), F_DRAFT);
+ COMBOBOX_ADD (folder_type_menu, _("Queue"), F_QUEUE);
+ COMBOBOX_ADD (folder_type_menu, _("Trash"), F_TRASH);
- gtk_option_menu_set_history(GTK_OPTION_MENU(folder_type), type);
+ combobox_select_by_data(GTK_COMBO_BOX(folder_type), type);
dummy_checkbtn = gtk_check_button_new();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dummy_checkbtn), type != F_INBOX);
folder_color_btn = gtk_button_new_with_label("");
gtk_widget_set_size_request(folder_color_btn, 36, 26);
gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
- tooltips = gtk_tooltips_new();
gtk_tooltips_set_tip(tooltips, folder_color_btn,
_("Pick color for folder"), NULL);
/* Check folder for new mail */
checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
+ gtk_tooltips_set_tip(tooltips, checkbtn_newmailcheck,
+ _("Turn this option on if mail is delivered directly "
+ "to this folder by server side filtering on IMAP or "
+ "by an external application"), NULL);
gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
gtk_widget_set_size_request (hbox_spc, 12, -1);
- label_offlinesync = gtk_label_new(_("Fetch bodies for the last"));
+ label_offlinesync = gtk_label_new(_("Fetch message bodies from the last"));
gtk_widget_show (label_offlinesync);
gtk_box_pack_start (GTK_BOX (hbox), label_offlinesync, FALSE, FALSE, 0);
entry_offlinesync = gtk_entry_new();
gtk_widget_set_size_request (entry_offlinesync, 64, -1);
gtk_widget_show (entry_offlinesync);
+ gtk_tooltips_set_tip(tooltips, entry_offlinesync, _("0: all bodies"), NULL);
gtk_box_pack_start (GTK_BOX (hbox), entry_offlinesync, FALSE, FALSE, 0);
- label_end_offlinesync = gtk_label_new(_("days (0: all bodies)"));
+ label_end_offlinesync = gtk_label_new(_("days"));
gtk_widget_show (label_end_offlinesync);
gtk_box_pack_start (GTK_BOX (hbox), label_end_offlinesync, FALSE, FALSE, 0);
- checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(_("Remove older bodies"));
+ checkbtn_remove_old_offlinesync = gtk_check_button_new_with_label(
+ _("Remove older messages bodies"));
hbox2 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox2);
gchar *buf;
gboolean all = FALSE;
SpecialFolderItemType type = F_NORMAL;
- GtkWidget *menu;
- GtkWidget *menuitem;
if (folder->path == NULL)
return;
if (page->item == folder)
all = TRUE;
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->folder_type));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- type = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
if (all && folder->stype != type) {
folder_item_change_type(folder, type);
}
GtkWidget *entry_default_reply_to = NULL;
GtkWidget *checkbtn_enable_default_account = NULL;
GtkWidget *optmenu_default_account = NULL;
- GtkWidget *optmenu_default_account_menu = NULL;
- GtkWidget *optmenu_default_account_menuitem = NULL;
+ GtkListStore *optmenu_default_account_menu = NULL;
+ GtkTreeIter iter;
#if USE_ASPELL
GtkWidget *checkbtn_enable_default_dictionary = NULL;
GtkWidget *optmenu_default_dictionary = NULL;
GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
GtkWidget *optmenu_default_alt_dictionary = NULL;
+ GtkWidget *default_dictionary_rec_checkbtn = NULL;
+ GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
+ gchar *dictionary;
+ GtkOptionMenu *optmenu;
+ GtkWidget *menu;
+ GtkWidget *menuitem;
#endif
GtkWidget *request_return_receipt_rec_checkbtn = NULL;
GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
GtkWidget *default_to_rec_checkbtn = NULL;
GtkWidget *default_reply_to_rec_checkbtn = NULL;
GtkWidget *default_account_rec_checkbtn = NULL;
-#if USE_ASPELL
- GtkWidget *default_dictionary_rec_checkbtn = NULL;
- GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
-#endif
GList *cur_ac;
GList *account_list;
-#if USE_ASPELL
- gchar *dictionary;
-#endif
PrefsAccount *ac_prefs;
- GtkOptionMenu *optmenu;
- GtkWidget *menu;
- GtkWidget *menuitem;
- gint account_index, index;
+ gboolean default_account_set = FALSE;
page->item = item;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_account),
item->prefs->enable_default_account);
- optmenu_default_account = gtk_option_menu_new ();
+ optmenu_default_account = gtkut_sc_combobox_create(NULL, FALSE);
gtk_table_attach(GTK_TABLE(table), optmenu_default_account, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
- optmenu_default_account_menu = gtk_menu_new ();
+ optmenu_default_account_menu = GTK_LIST_STORE(
+ gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_default_account)));
account_list = account_get_list();
- account_index = 0;
- index = 0;
for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
ac_prefs = (PrefsAccount *)cur_ac->data;
if (item->folder->account &&
if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
continue;
- MENUITEM_ADD (optmenu_default_account_menu, optmenu_default_account_menuitem,
+ COMBOBOX_ADD (optmenu_default_account_menu,
ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
ac_prefs->account_id);
- /* get the index for menu's set_history (sad method?) */
- if (ac_prefs->account_id == item->prefs->default_account)
- account_index = index;
- index++;
- }
- optmenu = GTK_OPTION_MENU(optmenu_default_account);
- gtk_option_menu_set_menu(optmenu, optmenu_default_account_menu);
-
- gtk_option_menu_set_history(optmenu, account_index);
+ /* Set combobox to current default account id */
+ if (ac_prefs->account_id == item->prefs->default_account) {
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_default_account),
+ ac_prefs->account_id);
+ default_account_set = TRUE;
+ }
+ }
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ /* If nothing has been set (folder doesn't have a default account set),
+ * pre-select global default account, since that's what actually used
+ * anyway. We don't want nothing selected in combobox. */
+ if( !default_account_set )
+ combobox_select_by_data(GTK_COMBO_BOX(optmenu_default_account),
+ account_get_default()->account_id);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_account, optmenu_default_account);
static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
{
FolderItemPrefs *prefs = folder->prefs;
+#if USE_ASPELL
GtkWidget *menu;
- GtkWidget *menuitem;
+#endif
gboolean all = FALSE;
if (folder->path == NULL)
prefs->enable_default_to = FALSE;
prefs->enable_default_reply_to = FALSE;
}
- if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))) {
+
+ if (all || gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn))) {
prefs->enable_default_account =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_account));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- prefs->default_account = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account));
+ prefs->default_account = combobox_get_active_data(
+ GTK_COMBO_BOX(page->optmenu_default_account));
}
#if USE_ASPELL
FolderItemTemplatesPage *page = (FolderItemTemplatesPage *) page_;
FolderItem *item = (FolderItem *) data;
- GtkWidget *table;
- GtkWidget *label;
- guint rowcount;
+ GtkWidget *notebook;
GtkWidget *vbox;
- GtkWidget *alignment;
+ GtkWidget *page_vbox;
GtkWidget *new_msg_format_rec_checkbtn;
GtkWidget *reply_format_rec_checkbtn;
GtkWidget *forward_format_rec_checkbtn;
- page->item = item;
+ page->item = item;
- /* Table */
- table = gtk_table_new(5, 3, FALSE);
- gtk_container_set_border_width (GTK_CONTAINER (table), VBOX_BORDER);
- gtk_table_set_row_spacings(GTK_TABLE(table), 4);
- gtk_table_set_col_spacings(GTK_TABLE(table), 4);
- rowcount = 0;
-
- /* Apply to subfolders */
- label = gtk_label_new(_("Apply to\nsubfolders"));
- gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
- gtk_table_attach(GTK_TABLE(table), label, 2, 3,
- rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- rowcount++;
+ page_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (page_vbox);
+
+ /* Notebook */
+ notebook = gtk_notebook_new();
+ gtk_widget_show(notebook);
+ gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
+ gtk_box_pack_start(GTK_BOX(page_vbox), notebook, TRUE, TRUE, 0);
/* compose format */
vbox = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 1, 2,
- rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
quotefmt_create_new_msg_fmt_widgets(
window,
&page->compose_body_format,
FALSE);
- vbox = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 2, 3,
- rowcount, rowcount + 1, GTK_SHRINK, GTK_FILL, 0, 0);
-
- new_msg_format_rec_checkbtn = gtk_check_button_new();
- gtk_box_pack_start (GTK_BOX(vbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
- alignment = gtk_alignment_new(0, 1, 0, 0);
- gtk_box_pack_start (GTK_BOX(vbox), alignment, FALSE, FALSE, 0);
-
- rowcount++;
+ new_msg_format_rec_checkbtn = gtk_check_button_new_with_label(
+ _("Apply to subfolders"));
+ gtk_box_pack_end (GTK_BOX(vbox), new_msg_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Compose")));
/* reply format */
vbox = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 1, 2,
- rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
quotefmt_create_reply_fmt_widgets(
window,
&page->reply_body_format,
FALSE);
- vbox = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 2, 3,
- rowcount, rowcount + 1, GTK_SHRINK, GTK_FILL, 0, 0);
-
- reply_format_rec_checkbtn = gtk_check_button_new();
- gtk_box_pack_start (GTK_BOX(vbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
- alignment = gtk_alignment_new(0, 1, 0, 0);
- gtk_box_pack_start (GTK_BOX(vbox), alignment, FALSE, FALSE, 0);
-
- rowcount++;
+ reply_format_rec_checkbtn = gtk_check_button_new_with_label(
+ _("Apply to subfolders"));
+ gtk_box_pack_end (GTK_BOX(vbox), reply_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Reply")));
/* forward format */
vbox = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 1, 2,
- rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
quotefmt_create_forward_fmt_widgets(
window,
&page->forward_body_format,
FALSE);
- vbox = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 2, 3,
- rowcount, rowcount + 1, GTK_SHRINK, GTK_FILL, 0, 0);
-
- forward_format_rec_checkbtn = gtk_check_button_new();
- gtk_box_pack_start (GTK_BOX(vbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
- alignment = gtk_alignment_new(0, 1, 0, 0);
- gtk_box_pack_start (GTK_BOX(vbox), alignment, FALSE, FALSE, 0);
-
- rowcount++;
+ forward_format_rec_checkbtn = gtk_check_button_new_with_label(
+ _("Apply to subfolders"));
+ gtk_box_pack_end (GTK_BOX(vbox), forward_format_rec_checkbtn, FALSE, FALSE, 0);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, gtk_label_new(_("Forward")));
/* information button */
- vbox = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
- gtk_table_attach(GTK_TABLE(table), vbox, 1, 2,
- rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- rowcount++;
- quotefmt_add_info_button(window, vbox);
-
+ quotefmt_add_info_button(window, page_vbox);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(page->checkbtn_compose_with_format),
item->prefs->compose_with_format);
pref_set_textview_from_pref(GTK_TEXT_VIEW(page->forward_body_format),
item->prefs->forward_body_format);
- gtk_widget_show_all(table);
+ gtk_widget_show_all(page_vbox);
page->window = GTK_WIDGET(window);
- page->table = table;
page->new_msg_format_rec_checkbtn = new_msg_format_rec_checkbtn;
page->reply_format_rec_checkbtn = reply_format_rec_checkbtn;
page->forward_format_rec_checkbtn = forward_format_rec_checkbtn;
- page->page.widget = table;
+ page->page.widget = page_vbox;
}
static void prefs_folder_item_templates_destroy_widget_func(PrefsPage *page_)
projects / claws.git / blobdiff