if (!name || !address) return -1;
+ debug_print( "completion: add_address: %s - %s\n", name, address );
+
ae = g_new0(address_entry, 1);
ce1 = g_new0(completion_entry, 1),
ce2 = g_new0(completion_entry, 1);
wchar_t *wtext;
wchar_t *wp;
wchar_t rfc_mail_sep;
+ wchar_t quote;
+ gboolean in_quote = FALSE;
gchar *str;
+ if (mbtowc(&rfc_mail_sep, ",", 1) < 0) return NULL;
+ if (mbtowc("e, "\"", 1) < 0) return NULL;
+
edit_text = gtk_entry_get_text(entry);
if (edit_text == NULL) return NULL;
cur_pos = gtk_editable_get_position(GTK_EDITABLE(entry));
- if (mbtowc(&rfc_mail_sep, ",", 1) < 0) {
- g_free(wtext);
- return NULL;
- }
-
/* scan for a separator. doesn't matter if walk points at null byte. */
- for (wp = wtext + cur_pos; wp > wtext && *wp != rfc_mail_sep; wp--)
- ;
+ for (wp = wtext + cur_pos; wp > wtext; wp--) {
+ if (!in_quote && *wp == rfc_mail_sep)
+ break;
+ if (*wp == quote)
+ in_quote ^= TRUE;
+ }
/* have something valid */
if (wcslen(wp) == 0) {
return NULL;
}
-#define IS_VALID_CHAR(x) (iswalnum(x) || ((x) > 0x7f))
+#define IS_VALID_CHAR(x) (iswalnum(x) || (x) == quote || ((x) > 0x7f))
/* now scan back until we hit a valid character */
for (; *wp && !IS_VALID_CHAR(*wp); wp++)
gchar *get_complete_address(gint index)
{
const address_entry *p;
-
+ gchar *address = NULL;
+
if (index < g_completion_count) {
if (index == 0)
- return g_strdup(g_completion_prefix);
+ address = g_strdup(g_completion_prefix);
else {
/* get something from the unique addresses */
p = (address_entry *)g_slist_nth_data
(g_completion_addresses, index - 1);
- if (p == NULL)
- return NULL;
- else
- return g_strdup_printf
- ("%s <%s>", p->name, p->address);
+ if (p != NULL) {
+ if (strchr_with_skip_quote(p->name, '"', ','))
+ address = g_strdup_printf
+ ("\"%s\" <%s>", p->name, p->address);
+ else
+ address = g_strdup_printf
+ ("%s <%s>", p->name, p->address);
+ }
}
- } else
- return NULL;
+ }
+
+ return address;
}
gchar *get_next_complete_address(void)
{N_("/_Address/_Edit"), "<alt>Return", addressbook_edit_address_cb, 0, NULL},
{N_("/_Address/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Import _LDIF"), NULL, addressbook_import_ldif_cb, 0, NULL},
- {N_("/_Tools/Import M_utt"), NULL, addressbook_import_mutt_cb, 0, NULL},
+ {N_("/_Tools/Import _LDIF file"), NULL, addressbook_import_ldif_cb, 0, NULL},
+ {N_("/_Tools/Import M_utt file"), NULL, addressbook_import_mutt_cb, 0, NULL},
{N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
{N_("/_Tools/Import _Mozilla"), NULL, NULL, 0, NULL},
{N_("/_Tools/Import _vCard"), NULL, NULL, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Export _LDIF"), NULL, NULL, 0, NULL},
+ {N_("/_Tools/Export _LDIF file"), NULL, NULL, 0, NULL},
{N_("/_Tools/Export v_Card"), NULL, NULL, 0, NULL},
*/
addressbook_load_tree();
gtk_ctree_select(GTK_CTREE(addrbook.ctree),
GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
- }
- else {
+ } else
gtk_widget_hide(addrbook.window);
- }
gtk_widget_show_all(addrbook.window);
+
addressbook_set_target_compose(target);
}
void addressbook_set_target_compose(Compose *target)
{
addrbook.target_compose = target;
+
addressbook_button_set_sensitive();
}
}
if( address ) {
if( name ) {
- buf = g_strdup_printf( "%s <%s>", name, address );
+ if( strchr_with_skip_quote( name, '"', ',' ) )
+ buf = g_strdup_printf( "\"%s\" <%s>", name, address );
+ else
+ buf = g_strdup_printf( "%s <%s>", name, address );
}
else {
buf = g_strdup( address );
GtkWidget *checkbtn_addaddrbyclick;
GtkWidget *optmenu_recvdialog;
GtkWidget *optmenu_nextunreadmsgdialog;
- GtkWidget *keybind_combo;
} interface;
static struct Other {
GtkWidget *tgt_folder_btn;
} color_buttons;
+static struct KeybindDialog {
+ GtkWidget *window;
+ GtkWidget *combo;
+} keybind;
+
static GtkWidget *quote_desc_win;
static GtkWidget *font_sel_win;
static guint font_sel_conn_id;
GdkEventKey *event,
gpointer data);
static void prefs_font_selection_ok (GtkButton *button, GtkEntry *entry);
+
+static void prefs_keybind_select (void);
+static gint prefs_keybind_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
+static void prefs_keybind_key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
+static void prefs_keybind_cancel (void);
static void prefs_keybind_apply_clicked (GtkWidget *widget);
static gint prefs_common_deleted (GtkWidget *widget,
GtkWidget *menuitem;
GtkWidget *frame_addr;
- GtkWidget *vbox_addr;
+ GtkWidget *vbox_addr;
GtkWidget *checkbtn_addaddrbyclick;
- GtkWidget *keybind_frame;
- GtkWidget *keybind_label;
- GtkWidget *keybind_combo;
- GtkWidget *keybind_btn;
+ GtkWidget *button_keybind;
GtkWidget *hbox2;
GtkWidget *optmenu_nextunreadmsgdialog;
gtk_option_menu_set_menu (GTK_OPTION_MENU (recvdialog_optmenu), recvdialog_optmenu_menu); */
-PACK_FRAME(vbox1, keybind_frame, _("Shortcut key"));
-
- vbox2 = gtk_vbox_new (FALSE, 8);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (keybind_frame), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
hbox1 = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
- keybind_label = gtk_label_new
- (_("Select the preset key bindings.\n"
- "You can also modify each menu's shortcuts by pressing\n"
- "any key(s) when placing the mouse pointer on the item."));
- gtk_widget_show (keybind_label);
- gtk_box_pack_start (GTK_BOX (hbox1), keybind_label, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (keybind_label), GTK_JUSTIFY_LEFT);
-
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
- keybind_combo = gtk_combo_new ();
- gtk_widget_show (keybind_combo);
- gtk_box_pack_start (GTK_BOX (hbox1), keybind_combo, TRUE, TRUE, 0);
- gtkut_combo_set_items (GTK_COMBO (keybind_combo),
- _("Default"),
- "Mew / Wanderlust",
- "Mutt",
- _("Old Sylpheed"),
- NULL);
- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (keybind_combo)->entry),
- FALSE);
-
- keybind_btn = gtk_button_new_with_label(_(" Apply "));
- gtk_widget_show (keybind_btn);
- gtk_box_pack_end (GTK_BOX (hbox1), keybind_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (keybind_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_keybind_apply_clicked),
- NULL);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+ button_keybind = gtk_button_new_with_label (_(" Set key bindings... "));
+ gtk_widget_show (button_keybind);
+ gtk_box_pack_start (GTK_BOX (hbox1), button_keybind, FALSE, FALSE, 0);
+ gtk_signal_connect (GTK_OBJECT (button_keybind), "clicked",
+ GTK_SIGNAL_FUNC (prefs_keybind_select), NULL);
/* interface.checkbtn_emacs = checkbtn_emacs; */
interface.checkbtn_openunread = checkbtn_openunread;
interface.checkbtn_openinbox = checkbtn_openinbox;
interface.optmenu_recvdialog = optmenu_recvdialog;
interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
- interface.keybind_combo = keybind_combo;
}
static void prefs_other_create(void)
gtk_widget_hide(font_sel_win);
}
+static void prefs_keybind_select(void)
+{
+ GtkWidget *window;
+ GtkWidget *vbox1;
+ GtkWidget *hbox1;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkWidget *confirm_area;
+ GtkWidget *ok_btn;
+ GtkWidget *cancel_btn;
+
+ window = gtk_window_new (GTK_WINDOW_DIALOG);
+ gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+ gtk_window_set_title (GTK_WINDOW (window), _("Key bindings"));
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+ gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
+ manage_window_set_transient (GTK_WINDOW (window));
+
+ vbox1 = gtk_vbox_new (FALSE, VSPACING);
+ gtk_container_add (GTK_CONTAINER (window), vbox1);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ label = gtk_label_new
+ (_("Select the preset of key bindings.\n"
+ "You can also modify each menu's shortcuts by pressing\n"
+ "any key(s) when placing the mouse pointer on the item."));
+ gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ combo = gtk_combo_new ();
+ gtk_box_pack_start (GTK_BOX (hbox1), combo, TRUE, TRUE, 0);
+ gtkut_combo_set_items (GTK_COMBO (combo),
+ _("Default"),
+ "Mew / Wanderlust",
+ "Mutt",
+ _("Old Sylpheed"),
+ NULL);
+ gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (combo)->entry), FALSE);
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+ gtkut_button_set_create (&confirm_area, &ok_btn, _("OK"),
+ &cancel_btn, _("Cancel"), NULL, NULL);
+ gtk_box_pack_end (GTK_BOX (hbox1), confirm_area, FALSE, FALSE, 0);
+ gtk_widget_grab_default (ok_btn);
+
+ gtk_signal_connect (GTK_OBJECT (window), "focus_in_event",
+ GTK_SIGNAL_FUNC (manage_window_focus_in), NULL);
+ gtk_signal_connect (GTK_OBJECT (window), "focus_out_event",
+ GTK_SIGNAL_FUNC (manage_window_focus_out), NULL);
+ gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+ GTK_SIGNAL_FUNC (prefs_keybind_deleted), NULL);
+ gtk_signal_connect (GTK_OBJECT (window), "key_press_event",
+ GTK_SIGNAL_FUNC (prefs_keybind_key_pressed), NULL);
+ gtk_signal_connect (GTK_OBJECT (ok_btn), "clicked",
+ GTK_SIGNAL_FUNC (prefs_keybind_apply_clicked),
+ NULL);
+ gtk_signal_connect (GTK_OBJECT (cancel_btn), "clicked",
+ GTK_SIGNAL_FUNC (prefs_keybind_cancel),
+ NULL);
+
+ gtk_widget_show_all(window);
+
+ keybind.window = window;
+ keybind.combo = combo;
+}
+
+static void prefs_keybind_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
+{
+ if (event && event->keyval == GDK_Escape)
+ prefs_keybind_cancel();
+}
+
+static gint prefs_keybind_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_keybind_cancel();
+ return TRUE;
+}
+
+static void prefs_keybind_cancel(void)
+{
+ gtk_widget_destroy(keybind.window);
+ keybind.window = NULL;
+ keybind.combo = NULL;
+}
+
static void prefs_keybind_apply_clicked(GtkWidget *widget)
{
- GtkEntry *entry = GTK_ENTRY(GTK_COMBO(interface.keybind_combo)->entry);
+ GtkEntry *entry = GTK_ENTRY(GTK_COMBO(keybind.combo)->entry);
gchar *text;
gchar *rc_str;
static gchar *default_menurc =
- "(menu-path \"<Main>/File/Empty trash\" \"<shift>D\")\n"
+ "(menu-path \"<Main>/File/Empty trash\" \"\")\n"
"(menu-path \"<Main>/File/Save as...\" \"<control>S\")\n"
"(menu-path \"<Main>/File/Print...\" \"\")\n"
"(menu-path \"<Main>/File/Exit\" \"<control>Q\")\n"
gtk_item_factory_parse_rc_string(empty_menurc);
gtk_item_factory_parse_rc_string(rc_str);
+
+ gtk_widget_destroy(keybind.window);
+ keybind.window = NULL;
+ keybind.combo = NULL;
}
static void prefs_common_charset_set_data_from_optmenu(PrefParam *pparam)
projects / claws.git / commitdiff