#include "toolbar.h"
#include "inc.h"
#include "message_search.h"
+#include "combobox.h"
enum
{
static void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
static void compose_update_priority_menu_item(Compose * compose);
-
+#if USE_ASPELL
+static void compose_spell_menu_changed (void *data);
+#endif
static void compose_add_field_list ( Compose *compose,
GList *listAddress );
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
-static void account_activated (GtkMenuItem *menuitem,
+static void account_activated (GtkComboBox *optmenu,
gpointer data);
static void attach_selected (GtkTreeView *tree_view,
GtkTreePath *tree_path,
compose->gtkaspell)
gtkaspell_change_dict(compose->gtkaspell,
item->prefs->default_dictionary);
+ compose_spell_menu_changed(compose);
#endif
if (account->auto_sig)
compose_destroy(compose);
return NULL;
}
+
+ compose->sig_str = compose_get_signature_str(compose);
+
return compose;
}
GtkTextMark *mark;
GtkTextIter iter, iter_end;
gint cur_pos;
+ gchar *search = NULL;
gboolean prev_autowrap;
+ gboolean found = FALSE, shift = FALSE;
g_return_if_fail(compose->account != NULL);
gtk_text_buffer_get_end_iter(buffer, &iter);
- if (replace && compose->sig_str) {
- gboolean found;
+ search = compose->sig_str;
+again:
+ if (replace && search) {
GtkTextIter first_iter, start_iter, end_iter;
gtk_text_buffer_get_start_iter(buffer, &first_iter);
found = FALSE;
else
found = gtk_text_iter_forward_search(&first_iter,
- compose->sig_str,
+ search,
GTK_TEXT_SEARCH_TEXT_ONLY,
&start_iter, &end_iter,
NULL);
gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
iter = start_iter;
}
+ }
+ if (replace && !found && search && strlen(search) > 2
+ && search[0] == '\n' && search[1] == '\n') {
+ search ++;
+ shift = TRUE;
+ goto again;
}
g_free(compose->sig_str);
compose->sig_str = g_strdup("");
cur_pos = gtk_text_iter_get_offset(&iter);
- gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ if (shift && found)
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str + 1, -1);
+ else
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
/* skip \n\n */
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
gtk_text_iter_forward_char(&iter);
{"http://", strcasestr, get_uri_part, make_uri_string},
{"https://", strcasestr, get_uri_part, make_uri_string},
{"ftp://", strcasestr, get_uri_part, make_uri_string},
+ {"sftp://", strcasestr, get_uri_part, make_uri_string},
{"www.", strcasestr, get_uri_part, make_http_string},
{"mailto:", strcasestr, get_uri_part, make_uri_string},
{"@", strcasestr, get_email_part, make_email_string}
activate_privacy_system(compose, account, FALSE);
- if (!init && compose->mode != COMPOSE_REDIRECT)
+ if (!init && compose->mode != COMPOSE_REDIRECT) {
+ undo_block(compose->undostruct);
compose_insert_sig(compose, TRUE);
+ undo_unblock(compose->undostruct);
+ }
}
gboolean compose_check_for_valid_recipient(Compose *compose) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
} else if (val == -3) {
+ if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
"Signature failed: %s"), privacy_get_error());
} else if (val == -2 && errno != 0) {
GList *accounts;
GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *menu;
+ GtkWidget *optmenubox;
+ GtkListStore *menu;
+ GtkTreeIter iter;
GtkWidget *from_name = NULL;
gint num = 0, def_menu = 0;
accounts = account_get_list();
g_return_val_if_fail(accounts != NULL, NULL);
- optmenu = gtk_option_menu_new();
- menu = gtk_menu_new();
+ optmenubox = gtk_event_box_new();
+ optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
hbox = gtk_hbox_new(FALSE, 6);
from_name = gtk_entry_new();
for (; accounts != NULL; accounts = accounts->next, num++) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
- GtkWidget *menuitem;
gchar *name, *from = NULL;
if (ac == compose->account) def_menu = num;
gtk_entry_set_text(GTK_ENTRY(from_name), from);
}
}
- MENUITEM_ADD(menu, menuitem, name, ac->account_id);
- gtk_label_set_use_markup (
- GTK_LABEL (gtk_bin_get_child (GTK_BIN (menuitem))),
- TRUE);
+ COMBOBOX_ADD(menu, name, ac->account_id);
g_free(name);
g_free(from);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(account_activated),
- compose);
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), def_menu);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), def_menu);
+
+ g_signal_connect(G_OBJECT(optmenu), "changed",
+ G_CALLBACK(account_activated),
+ compose);
- gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(compose->tooltips, optmenu,
+ gtk_tooltips_set_tip(compose->tooltips, optmenubox,
_("Account to use for this email"), NULL);
gtk_tooltips_set_tip(compose->tooltips, from_name,
_("Sender address to be used"), NULL);
{
GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- GtkOptionMenu *optmenu;
+ GtkComboBox *optmenu;
GtkTreeSelection *selection;
GList *sel;
GtkTreeModel *model;
gtk_widget_show(attach_prop.window);
manage_window_set_transient(GTK_WINDOW(attach_prop.window));
- optmenu = GTK_OPTION_MENU(attach_prop.encoding_optmenu);
+ optmenu = GTK_COMBO_BOX(attach_prop.encoding_optmenu);
if (ainfo->encoding == ENC_UNKNOWN)
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ENC_BASE64));
+ combobox_select_by_data(optmenu, ENC_BASE64);
else
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ainfo->encoding));
+ combobox_select_by_data(optmenu, ainfo->encoding);
gtk_entry_set_text(GTK_ENTRY(attach_prop.mimetype_entry),
ainfo->content_type ? ainfo->content_type : "");
gchar *cnttype = NULL;
gchar *file = NULL;
off_t size = 0;
- GtkWidget *menu;
- GtkWidget *menuitem;
cancelled = FALSE;
gtk_main();
}
}
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- ainfo->encoding = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ ainfo->encoding = combobox_get_active_data(optmenu);
entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
if (*entry_text != '\0') {
GtkWidget *mimetype_entry;
GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *optmenu_menu;
- GtkWidget *menuitem;
+ GtkListStore *optmenu_menu;
GtkWidget *path_entry;
GtkWidget *filename_entry;
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GList *mime_type_list, *strlist;
+ GtkTreeIter iter;
debug_print("Creating attach_property window...\n");
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- optmenu = gtk_option_menu_new();
- gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
+ optmenu = gtkut_sc_combobox_create(NULL, TRUE);
+ optmenu_menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
- optmenu_menu = gtk_menu_new();
- MENUITEM_ADD(optmenu_menu, menuitem, "7bit", ENC_7BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "8bit", ENC_8BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
- ENC_QUOTED_PRINTABLE);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ COMBOBOX_ADD(optmenu_menu, "7bit", ENC_7BIT);
+ COMBOBOX_ADD(optmenu_menu, "8bit", ENC_8BIT);
+ COMBOBOX_ADD(optmenu_menu, "quoted-printable", ENC_QUOTED_PRINTABLE);
+ COMBOBOX_ADD(optmenu_menu, "base64", ENC_BASE64);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0);
- MENUITEM_ADD(optmenu_menu, menuitem, "base64", ENC_BASE64);
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
return TRUE;
}
-static void account_activated(GtkMenuItem *menuitem, gpointer data)
+static void account_activated(GtkComboBox *optmenu, gpointer data)
{
Compose *compose = (Compose *)data;
PrefsAccount *ac;
gchar *folderidentifier;
+ gint account_id = 0;
+ GtkTreeModel *menu;
+ GtkTreeIter iter;
- ac = account_find_from_id(
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
+ /* Get ID of active account in the combo box */
+ menu = gtk_combo_box_get_model(optmenu);
+ gtk_combo_box_get_active_iter(optmenu, &iter);
+ gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
+
+ ac = account_find_from_id(account_id);
g_return_if_fail(ac != NULL);
if (ac != compose->account)
} else if (val == -2) {
alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
} else if (val == -3) {
+ if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
"Signature failed: %s"), privacy_get_error());
} else if (val == -4) {
{
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
- AlertValue val = G_ALERTDEFAULT;
-
- switch (prefs_common.compose_dnd_mode) {
- case COMPOSE_DND_ASK:
- val = alertpanel_full(_("Insert or attach?"),
- _("Do you want to insert the contents of the file(s) "
- "into the message body, or attach it to the email?"),
- GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"),
- TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
- break;
- case COMPOSE_DND_INSERT:
- val = G_ALERTALTERNATE;
- break;
- case COMPOSE_DND_ATTACH:
- val = G_ALERTOTHER;
- break;
- default:
- /* unexpected case */
- g_warning("error: unexpected compose_dnd_mode option value in compose_insert_drag_received_cb()");
- }
-
- if (val & G_ALERTDISABLE) {
- val &= ~G_ALERTDISABLE;
- /* remember what action to perform by default, only if we don't click Cancel */
- if (val == G_ALERTALTERNATE)
- prefs_common.compose_dnd_mode = COMPOSE_DND_INSERT;
- else
- if (val == G_ALERTOTHER)
- prefs_common.compose_dnd_mode = COMPOSE_DND_ATTACH;
- }
-
- if (val == G_ALERTDEFAULT) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
- return;
- } else if (val == G_ALERTOTHER) {
- compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
- return;
- }
/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
* does not work */
if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ AlertValue val = G_ALERTDEFAULT;
+
+ switch (prefs_common.compose_dnd_mode) {
+ case COMPOSE_DND_ASK:
+ val = alertpanel_full(_("Insert or attach?"),
+ _("Do you want to insert the contents of the file(s) "
+ "into the message body, or attach it to the email?"),
+ GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"),
+ TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+ break;
+ case COMPOSE_DND_INSERT:
+ val = G_ALERTALTERNATE;
+ break;
+ case COMPOSE_DND_ATTACH:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ /* unexpected case */
+ g_warning("error: unexpected compose_dnd_mode option value in compose_insert_drag_received_cb()");
+ }
+
+ if (val & G_ALERTDISABLE) {
+ val &= ~G_ALERTDISABLE;
+ /* remember what action to perform by default, only if we don't click Cancel */
+ if (val == G_ALERTALTERNATE)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_INSERT;
+ else if (val == G_ALERTOTHER)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_ATTACH;
+ }
+
+ if (val == G_ALERTDEFAULT || val == G_ALERTCANCEL) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ } else if (val == G_ALERTOTHER) {
+ compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
+ return;
+ }
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next) {
compose_insert_file(compose, (const gchar *)tmp->data);
projects / claws.git / blobdiff