header = N_("To:");
break;
}
- header = prefs_common.trans_hdr ? gettext(header) : header;
+ header = prefs_common_translated_header_name(header);
cur = begin = (gchar *)address;
subject = gtk_editable_get_chars(
GTK_EDITABLE(compose->subject_entry), 0, -1);
+#ifndef MAEMO
if (subject && strlen(subject))
str = g_strdup_printf(_("%s - Compose message%s"),
subject, edited);
else
str = g_strdup_printf(_("[no subject] - Compose message%s"), edited);
+#else
+ str = g_strdup(_("Compose message"));
+#endif
+
gtk_window_set_title(GTK_WINDOW(compose->window), str);
g_free(str);
g_free(subject);
g_strstrip(entry);
if (entry[0] != '\0') {
for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
- if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (!strcmp(header, prefs_common_translated_header_name(*strptr))) {
compose->to_list = address_list_append(compose->to_list, entry);
recipient_found = TRUE;
}
}
for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
- if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (!strcmp(header, prefs_common_translated_header_name(*strptr))) {
compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
g_strstrip(entry);
if (strcmp(entry, compose->account->auto_cc)
- || strcmp(header, (prefs_common.trans_hdr ? gettext("Cc:") : "Cc:"))) {
+ || strcmp(header, prefs_common_translated_header_name("Cc:"))) {
found_other = TRUE;
g_free(entry);
break;
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
g_strstrip(entry);
if (strcmp(entry, compose->account->auto_bcc)
- || strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
+ || strcmp(header, prefs_common_translated_header_name("Bcc:"))) {
found_other = TRUE;
g_free(entry);
break;
debug_print("Writing redirect header\n");
- cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
- to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
+ cc_hdr = prefs_common_translated_header_name("Cc:");
+ to_hdr = prefs_common_translated_header_name("To:");
first_to_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
fieldstr = g_string_sized_new(64);
fieldname_w_colon = g_strconcat(fieldname, ":", NULL);
- trans_fieldname = (prefs_common.trans_hdr ? gettext(fieldname_w_colon) : fieldname_w_colon);
+ trans_fieldname = prefs_common_translated_header_name(fieldname_w_colon);
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
subst_char(headervalue, '\n', ' ');
string = std_headers;
while (*string != NULL) {
- headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
+ headername_trans = prefs_common_translated_header_name(*string);
if (!strcmp(headername_trans,headername_wcolon))
standard_header = TRUE;
string++;
g_free(tmpstr);
}
+static void compose_add_to_addressbook_cb(GtkMenuItem *menuitem, gpointer user_data)
+{
+ gchar *address;
+
+ g_return_if_fail(user_data != NULL);
+
+ address = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data)));
+ g_strstrip(address);
+ if (*address != '\0') {
+ gchar *name = procheader_get_fromname(address);
+ extract_address(address);
+ addressbook_add_contact(name, address, NULL);
+ }
+ g_free(address);
+}
+
+static void compose_entry_popup_extend(GtkEntry *entry, GtkMenu *menu, gpointer user_data)
+{
+ GtkWidget *menuitem;
+ gchar *address;
+
+ g_return_if_fail(menu != NULL);
+ g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+
+ menuitem = gtk_separator_menu_item_new();
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+ gtk_widget_show(menuitem);
+
+ menuitem = gtk_menu_item_new_with_mnemonic(_("Add to address _book"));
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+
+ address = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+ g_strstrip(address);
+ if (*address == '\0') {
+ gtk_widget_set_sensitive(GTK_WIDGET(menuitem), FALSE);
+ }
+
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(compose_add_to_addressbook_cb), entry);
+ gtk_widget_show(menuitem);
+}
+
static void compose_create_header_entry(Compose *compose)
{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
combo = gtk_combo_new();
string = headers;
while(*string != NULL) {
- combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
+ combo_list = g_list_append(combo_list, prefs_common_translated_header_name(*string));
string++;
}
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(combo);
- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
+ compose->header_nextrow, compose->header_nextrow+1,
+ GTK_SHRINK, GTK_FILL, 0, 0);
if (compose->header_last) {
- const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ const gchar *last_header_entry = gtk_entry_get_text(
+ GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
string = headers;
while (*string != NULL) {
if (!strcmp(*string, last_header_entry))
if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
case A_NNTP:
- header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
+ header = prefs_common_translated_header_name("Newsgroups:");
break;
default:
- header = prefs_common.trans_hdr ? _("To:") : "To:";
+ header = prefs_common_translated_header_name("To:");
break;
}
}
gtk_widget_show(entry);
gtk_tooltips_set_tip(compose->tooltips, entry,
_("Use <tab> to autocomplete from addressbook"), NULL);
- gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2,
+ compose->header_nextrow, compose->header_nextrow+1,
+ GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
g_signal_connect(G_OBJECT(entry), "key-press-event",
G_CALLBACK(compose_headerentry_key_press_event_cb),
g_signal_connect(G_OBJECT(entry), "drag-drop",
G_CALLBACK(compose_drag_drop),
compose);
+ g_signal_connect(G_OBJECT(entry), "populate-popup",
+ G_CALLBACK(compose_entry_popup_extend),
+ NULL);
address_completion_register_entry(GTK_ENTRY(entry), TRUE);
compose->header_nextrow++;
compose->header_last = headerentry;
+
+ if (!compose->first_combo)
+ compose->first_combo = combo;
+ if (!compose->first_entry)
+ compose->first_entry = entry;
+
}
static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text)
for (list = compose->header_list; list; list = list->next) {
ComposeHeaderEntry *headerentry =
(ComposeHeaderEntry *)list->data;
+ if (headerentry->combo == compose->first_combo)
+ compose->first_combo = NULL;
+ if (headerentry->entry == compose->first_entry)
+ compose->first_entry = NULL;
gtk_widget_destroy(headerentry->combo);
gtk_widget_destroy(headerentry->entry);
g_free(headerentry);
}
+ if (compose->first_combo)
+ gtk_widget_destroy(compose->first_combo);
+ if (compose->first_entry)
+ gtk_widget_destroy(compose->first_entry);
+ compose->header_last = NULL;
g_slist_free(compose->header_list);
compose->header_list = NULL;
compose->header_nextrow = 1;
return header_scrolledwin ;
}
+static gboolean popup_attach_button_pressed(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ GdkEventButton event;
+
+ event.button = 3;
+ event.time = gtk_get_current_event_time();
+
+ return attach_button_pressed(compose->attach_clist, &event, compose);
+}
+
static GtkWidget *compose_create_attach(Compose *compose)
{
GtkWidget *attach_scrwin;
G_CALLBACK(attach_selected), compose);
g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
G_CALLBACK(attach_button_pressed), compose);
+#ifndef MAEMO
+ g_signal_connect(G_OBJECT(attach_clist), "popup-menu",
+ G_CALLBACK(popup_attach_button_pressed), compose);
+#else
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(attach_clist), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect(G_OBJECT(attach_clist), "tap-and-hold",
+ G_CALLBACK(popup_attach_button_pressed), compose);
+#endif
g_signal_connect(G_OBJECT(attach_clist), "key_press_event",
G_CALLBACK(attach_key_pressed), compose);
G_CALLBACK(text_inserted), compose);
g_signal_connect(G_OBJECT(text), "button_press_event",
G_CALLBACK(text_clicked), compose);
+#ifndef MAEMO
g_signal_connect(G_OBJECT(text), "popup-menu",
G_CALLBACK(compose_popup_menu), compose);
+#else
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(text), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect(G_OBJECT(text), "tap-and-hold",
+ G_CALLBACK(compose_popup_menu), compose);
+#endif
g_signal_connect(G_OBJECT(subject_entry), "changed",
G_CALLBACK(compose_changed_cb), compose);
gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 300 : 280);
else
gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230);
- gtk_paned_add1(GTK_PANED(paned), edit_vbox);
- gtk_paned_add2(GTK_PANED(paned), notebook);
-#else
+#endif
gtk_paned_add1(GTK_PANED(paned), notebook);
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
-#endif
gtk_widget_show_all(paned);
compose->paned = paned;
+ compose->notebook = notebook;
compose->edit_vbox = edit_vbox;
compose->ruler_hbox = ruler_hbox;
compose->ruler = ruler;
menu_set_sensitive(ifactory, "/Options/Reply mode", compose->mode == COMPOSE_REPLY);
if (account->protocol != A_NNTP)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry),
+ prefs_common_translated_header_name("To:"));
else
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry),
+ prefs_common_translated_header_name("Newsgroups:"));
addressbook_set_target_compose(compose);
g_signal_connect(G_OBJECT(optmenu), "changed",
G_CALLBACK(account_activated),
compose);
+ g_signal_connect(G_OBJECT(from_name), "populate-popup",
+ G_CALLBACK(compose_entry_popup_extend),
+ NULL);
gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
Compose *compose = (Compose *)data;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
+ !inc_offline_should_override(TRUE,
_("Claws Mail needs network access in order "
"to send this email.")))
return;
static void compose_cut_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_cut_clipboard(compose->focused_editable);
}
static void compose_copy_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_copy_clipboard(compose->focused_editable);
}
static void compose_paste_as_quote_cb(Compose *compose)
{
gint wrap_quote = prefs_common.linewrap_quote;
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ ) {
/* let text_insert() (called directly or at a later time
* after the gtk_editable_paste_clipboard) know that
* text is to be inserted as a quotation. implemented
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
static void compose_allsel_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_allsel(compose->focused_editable);
}
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
+
+#ifdef MAEMO
+ if (GTK_IS_TEXT_VIEW(widget)
+ && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->edit_vbox) {
+ gtk_widget_ref(compose->notebook);
+ gtk_widget_ref(compose->edit_vbox);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
+ gtk_paned_add1(GTK_PANED(compose->paned), compose->edit_vbox);
+ gtk_paned_add2(GTK_PANED(compose->paned), compose->notebook);
+ gtk_widget_unref(compose->notebook);
+ gtk_widget_unref(compose->edit_vbox);
+ g_signal_handlers_block_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ gtk_widget_grab_focus(widget);
+ g_signal_handlers_unblock_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ } else if (!GTK_IS_TEXT_VIEW(widget)
+ && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->notebook) {
+ gtk_widget_ref(compose->notebook);
+ gtk_widget_ref(compose->edit_vbox);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
+ gtk_paned_add1(GTK_PANED(compose->paned), compose->notebook);
+ gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
+ gtk_widget_unref(compose->notebook);
+ gtk_widget_unref(compose->edit_vbox);
+ g_signal_handlers_block_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ gtk_widget_grab_focus(widget);
+ g_signal_handlers_unblock_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ }
+#endif
}
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
compose->modified = TRUE;
+#ifndef MAEMO
compose_set_title(compose);
+#endif
}
static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
gchar *entry = gtk_editable_get_chars(
GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
- if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("To:") : "To:")) == 0 ) {
+ if ( strcasecmp(header, prefs_common_translated_header_name("To:")) == 0 ) {
if ( newmsginfo->to == NULL ) {
newmsginfo->to = g_strdup(entry);
} else {
newmsginfo->to = tmp;
}
} else
- if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("Cc:") : "Cc:")) == 0 ) {
+ if ( strcasecmp(header, prefs_common_translated_header_name("Cc:")) == 0 ) {
if ( newmsginfo->cc == NULL ) {
newmsginfo->cc = g_strdup(entry);
} else {
}
} else
if ( strcasecmp(header,
- (prefs_common.trans_hdr ? gettext("Newsgroups:") : "Newsgroups:")) == 0 ) {
+ prefs_common_translated_header_name("Newsgroups:")) == 0 ) {
if ( newmsginfo->newsgroups == NULL ) {
newmsginfo->newsgroups = g_strdup(entry);
} else {
projects / claws.git / blobdiff