string = (value); \
}
+static void prefs_folder_item_register_page (PrefsPage *page);
+static void prefs_folder_item_unregister_page (PrefsPage *page);
+
typedef struct _FolderItemGeneralPage FolderItemGeneralPage;
typedef struct _FolderItemComposePage FolderItemComposePage;
typedef struct _FolderItemTemplatesPage FolderItemTemplatesPage;
#if USE_ASPELL
GtkWidget *checkbtn_enable_default_dictionary;
GtkWidget *checkbtn_enable_default_alt_dictionary;
- GtkWidget *optmenu_default_dictionary;
- GtkWidget *optmenu_default_alt_dictionary;
+ GtkWidget *combo_default_dictionary;
+ GtkWidget *combo_default_alt_dictionary;
#endif
/* apply to sub folders */
GtkTreeIter iter;
#if USE_ASPELL
GtkWidget *checkbtn_enable_default_dictionary = NULL;
- GtkWidget *optmenu_default_dictionary = NULL;
+ GtkWidget *combo_default_dictionary = NULL;
GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
- GtkWidget *optmenu_default_alt_dictionary = NULL;
+ GtkWidget *combo_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;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_dictionary),
item->prefs->enable_default_dictionary);
- optmenu_default_dictionary = gtk_option_menu_new();
- gtk_table_attach(GTK_TABLE(table), optmenu_default_dictionary, 1, 2,
+ combo_default_dictionary = gtkaspell_dictionary_combo_new(
+ prefs_common.aspell_path, TRUE);
+ gtk_table_attach(GTK_TABLE(table), combo_default_dictionary, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_dictionary),
- gtkaspell_dictionary_option_menu_new(
- prefs_common.aspell_path));
-
dictionary = item->prefs->default_dictionary;
-
- optmenu = GTK_OPTION_MENU(optmenu_default_dictionary);
-
- menu = gtk_option_menu_get_menu(optmenu);
if (dictionary)
- gtkaspell_set_dictionary_menu_active_item(optmenu_default_dictionary, dictionary);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ gtkaspell_set_dictionary_menu_active_item(
+ GTK_COMBO_BOX(combo_default_dictionary), dictionary);
- SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, optmenu_default_dictionary);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_dictionary, combo_default_dictionary);
default_dictionary_rec_checkbtn = gtk_check_button_new();
gtk_table_attach(GTK_TABLE(table), default_dictionary_rec_checkbtn, 2, 3,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_default_alt_dictionary),
item->prefs->enable_default_alt_dictionary);
- optmenu_default_alt_dictionary = gtk_option_menu_new();
- gtk_table_attach(GTK_TABLE(table), optmenu_default_alt_dictionary, 1, 2,
+ combo_default_alt_dictionary = gtkaspell_dictionary_combo_new(
+ prefs_common.aspell_path, FALSE);
+ gtk_table_attach(GTK_TABLE(table), combo_default_alt_dictionary, 1, 2,
rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_alt_dictionary),
- gtkaspell_dictionary_option_menu_new_with_refresh(
- prefs_common.aspell_path, FALSE));
-
dictionary = item->prefs->default_alt_dictionary;
-
- optmenu = GTK_OPTION_MENU(optmenu_default_alt_dictionary);
-
- menu = gtk_option_menu_get_menu(optmenu);
if (dictionary)
- gtkaspell_set_dictionary_menu_active_item(optmenu_default_alt_dictionary, dictionary);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+ gtkaspell_set_dictionary_menu_active_item(
+ GTK_COMBO_BOX(combo_default_alt_dictionary), dictionary);
- SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, optmenu_default_alt_dictionary);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_default_alt_dictionary, combo_default_alt_dictionary);
default_alt_dictionary_rec_checkbtn = gtk_check_button_new();
gtk_table_attach(GTK_TABLE(table), default_alt_dictionary_rec_checkbtn, 2, 3,
page->optmenu_default_account = optmenu_default_account;
#ifdef USE_ASPELL
page->checkbtn_enable_default_dictionary = checkbtn_enable_default_dictionary;
- page->optmenu_default_dictionary = optmenu_default_dictionary;
+ page->combo_default_dictionary = combo_default_dictionary;
page->checkbtn_enable_default_alt_dictionary = checkbtn_enable_default_alt_dictionary;
- page->optmenu_default_alt_dictionary = optmenu_default_alt_dictionary;
+ page->combo_default_alt_dictionary = combo_default_alt_dictionary;
#endif
page->request_return_receipt_rec_checkbtn = request_return_receipt_rec_checkbtn;
static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
{
FolderItemPrefs *prefs = folder->prefs;
-#if USE_ASPELL
- GtkWidget *menu;
-#endif
+
gboolean all = FALSE;
if (folder->path == NULL)
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))) {
prefs->enable_default_dictionary =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_dictionary));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_dictionary));
ASSIGN_STRING(prefs->default_dictionary,
- gtkaspell_get_dictionary_menu_active_item(menu));
+ gtkaspell_get_dictionary_menu_active_item(
+ GTK_COMBO_BOX(page->combo_default_dictionary)));
}
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_alt_dictionary_rec_checkbtn))) {
prefs->enable_default_alt_dictionary =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_alt_dictionary));
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_alt_dictionary));
ASSIGN_STRING(prefs->default_alt_dictionary,
- gtkaspell_get_dictionary_menu_active_item(menu));
+ gtkaspell_get_dictionary_menu_active_item(
+ GTK_COMBO_BOX(page->combo_default_alt_dictionary)));
}
#endif
window,
vbox,
&page->checkbtn_compose_with_format,
- _("Use a specific format for new messages"),
&page->compose_subject_format,
&page->compose_body_format,
FALSE);
window,
vbox,
&page->checkbtn_reply_with_format,
- _("Use a specific reply quote format"),
&page->reply_quotemark,
&page->reply_body_format,
FALSE);
window,
vbox,
&page->checkbtn_forward_with_format,
- _("Use a specific forward quote format"),
&page->forward_quotemark,
&page->forward_body_format,
FALSE);
static void register_general_page()
{
- static gchar *pfi_general_path[2];
+ static gchar *pfi_general_path[3];
static FolderItemGeneralPage folder_item_general_page;
- pfi_general_path[0] = _("General");
- pfi_general_path[1] = NULL;
+ pfi_general_path[0] = _("Folder");
+ pfi_general_path[1] = _("General");
+ pfi_general_path[2] = NULL;
folder_item_general_page.page.path = pfi_general_path;
folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
static void register_compose_page(void)
{
- static gchar *pfi_compose_path[2];
+ static gchar *pfi_compose_path[3];
static FolderItemComposePage folder_item_compose_page;
- pfi_compose_path[0] = _("Compose");
- pfi_compose_path[1] = NULL;
+ pfi_compose_path[0] = _("Folder");
+ pfi_compose_path[1] = _("Compose");
+ pfi_compose_path[2] = NULL;
folder_item_compose_page.page.path = pfi_compose_path;
folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
static void register_templates_page(void)
{
- static gchar *pfi_templates_path[2];
+ static gchar *pfi_templates_path[3];
static FolderItemTemplatesPage folder_item_templates_page;
- pfi_templates_path[0] = _("Templates");
- pfi_templates_path[1] = NULL;
+ pfi_templates_path[0] = _("Folder");
+ pfi_templates_path[1] = _("Templates");
+ pfi_templates_path[2] = NULL;
folder_item_templates_page.page.path = pfi_templates_path;
folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
g_free (title);
}
-void prefs_folder_item_register_page(PrefsPage *page)
+static void prefs_folder_item_register_page(PrefsPage *page)
{
prefs_pages = g_slist_append(prefs_pages, page);
}
-void prefs_folder_item_unregister_page(PrefsPage *page)
+static void prefs_folder_item_unregister_page(PrefsPage *page)
{
prefs_pages = g_slist_remove(prefs_pages, page);
}
projects / claws.git / blobdiff