/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007 The Claws Mail Team
+ * Copyright (C) 2007-2011 The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
}
-static GtkItemFactory *apply_popup_factory = NULL;
static GtkWidget *apply_popup_menu = NULL;
-static void apply_popup_delete (void *obj, guint action, void *data)
+static void apply_popup_delete (GtkAction *action, gpointer data)
{
GtkTreeIter sel;
GtkTreeModel *model;
APPLYWINDOW_UNLOCK();
}
-static void apply_popup_delete_all (void *obj, guint action, void *data)
+static void apply_popup_delete_all (GtkAction *action, gpointer data)
{
GSList *cur;
GtkTreeModel *model;
APPLYWINDOW_UNLOCK();
}
-static GtkItemFactoryEntry apply_popup_entries[] =
+static GtkActionEntry apply_popup_actions[] =
{
- {N_("/_Delete"), NULL, apply_popup_delete, 0, NULL, NULL},
- {N_("/Delete _all"), NULL, apply_popup_delete_all, 0, NULL, NULL},
+ { "EditTags", NULL, "EditTags" },
+ { "EditTags/Delete", NULL, N_("_Delete"), NULL, "Delete tag", G_CALLBACK(apply_popup_delete) },
+ { "EditTags/DeleteAll", NULL, N_("Delete _all"), NULL, "Delete all tags", G_CALLBACK(apply_popup_delete_all) }
};
static gint apply_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
GtkTreeView *list_view)
{
+ GtkActionGroup *actions;
+ GtkUIManager *gui_manager = gtkut_ui_manager();
+
if (applywindow.busy)
return FALSE;
gboolean non_empty;
if (!apply_popup_menu) {
- gint n_entries = sizeof(apply_popup_entries) /
- sizeof(apply_popup_entries[0]);
- apply_popup_menu = menu_create_items(apply_popup_entries, n_entries,
- "<TagPopupMenu>", &apply_popup_factory,
- list_view);
+ actions = cm_menu_create_action_group("EditTags", apply_popup_actions,
+ G_N_ELEMENTS(apply_popup_actions), (gpointer)list_view);
+
+ MENUITEM_ADDUI("/Menus", "EditTags", "EditTags", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI("/Menus/EditTags", "Delete", "EditTags/Delete",
+ GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI("/Menus/EditTags", "DeleteAll", "EditTags/DeleteAll",
+ GTK_UI_MANAGER_MENUITEM)
+
+ apply_popup_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(gui_manager, "/Menus/EditTags")) );
}
/* grey out popup menu items if list is empty */
non_empty = gtk_tree_model_get_iter_first(model, &iter);
- menu_set_sensitive(apply_popup_factory, "/Delete", non_empty);
- menu_set_sensitive(apply_popup_factory, "/Delete all", non_empty);
+ cm_menu_set_sensitive("EditTags/Delete", non_empty);
+ cm_menu_set_sensitive("EditTags/DeleteAll", non_empty);
gtk_menu_popup(GTK_MENU(apply_popup_menu),
NULL, NULL, NULL, NULL,
APPLYWINDOW_UNLOCK();
apply_window_list_view_clear_tags(applywindow.taglist);
gtk_widget_hide(applywindow.window);
+ gtk_window_set_modal(GTK_WINDOW(applywindow.window), FALSE);
}
static void apply_window_close_cb(GtkWidget *widget,
gchar *new_tag = gtk_editable_get_chars(GTK_EDITABLE(applywindow.add_entry), 0, -1);
g_strstrip(new_tag);
if (new_tag && *new_tag) {
- gint id = tags_get_id_for_str(new_tag);
+ gint id;
FindTagInStore fis;
+ if (!(IS_NOT_RESERVED_TAG(new_tag))) {
+ alertpanel_error(_("You entered a reserved tag name, please choose another instead."));
+ g_free(new_tag);
+ return;
+ }
+ id = tags_get_id_for_str(new_tag);
APPLYWINDOW_LOCK();
if (id == -1) {
id = tags_add_tag(new_tag);
{
if (applywindow.busy)
return;
- apply_popup_delete(NULL, 0, NULL);
+ apply_popup_delete(NULL, NULL);
gtk_widget_grab_focus(applywindow.taglist);
}
if (event && event->keyval == GDK_Escape)
apply_window_close();
else if (event && event->keyval == GDK_Delete)
- apply_popup_delete(NULL, 0, NULL);
+ apply_popup_delete(NULL, NULL);
return FALSE;
}