/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007 The Claws Mail Team
+ * Copyright (C) 2007-2013 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
static gint tag_cmp_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer userdata)
{
gchar *name1, *name2;
+ gint res;
gtk_tree_model_get(model, a, TAG_NAME, &name1, -1);
gtk_tree_model_get(model, b, TAG_NAME, &name2, -1);
return name2 == NULL ? 0:1;
if (name2 == NULL)
- return name1 == NULL ? 0:1;
+ return 1;
- return g_utf8_collate(name1,name2);
+ res = g_utf8_collate(name1,name2);
+ g_free(name1);
+ g_free(name2);
+
+ return res;
}
static void apply_window_create(void);
} applywindow;
#define APPLYWINDOW_LOCK() { \
- gdk_window_set_cursor(applywindow.window->window, applywindow.watch_cursor); \
+ gdk_window_set_cursor(gtk_widget_get_window(applywindow.window), applywindow.watch_cursor); \
applywindow.busy = TRUE; \
}
#define APPLYWINDOW_UNLOCK() { \
- gdk_window_set_cursor(applywindow.window->window, NULL); \
+ gdk_window_set_cursor(gtk_widget_get_window(applywindow.window), NULL); \
applywindow.busy = FALSE; \
}
GtkTreeModel *model;
gint id;
SummaryView *summaryview = NULL;
-
- if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
- (GTK_TREE_VIEW(applywindow.taglist)),
- &model, &sel))
- return;
+ GtkTreeSelection *selection = gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(applywindow.taglist));
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(applywindow.taglist));
+
+ if (!gtk_tree_selection_get_selected(selection, NULL, &sel))
+ return;
if (alertpanel(_("Delete tag"),
_("Do you really want to delete this tag?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
APPLYWINDOW_LOCK();
gtk_tree_model_get(model, &sel,
TAG_DATA, &id,
-1);
+
+ /* Even though this is not documented, gtk_tree_model_get()
+ * seems to invalidate the GtkTreeIter that is passed to it,
+ * so we need to reacquire it. */
+ if (!gtk_tree_selection_get_selected(selection, NULL, &sel))
+ return;
+
gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
if (mainwindow_get_mainwindow() != NULL)
summaryview = mainwindow_get_mainwindow()->summaryview;
static void apply_popup_delete_all (GtkAction *action, gpointer data)
{
- GSList *cur;
+ GSList *cur, *tags;
GtkTreeModel *model;
SummaryView *summaryview = NULL;
if (alertpanel(_("Delete all tags"),
_("Do you really want to delete all tags?"),
- GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
+ ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
APPLYWINDOW_LOCK();
if (mainwindow_get_mainwindow() != NULL)
summaryview = mainwindow_get_mainwindow()->summaryview;
- cur = tags_get_list();
+ cur = tags = tags_get_list();
for (; cur; cur = cur->next) {
gint id = GPOINTER_TO_INT(cur->data);
if (summaryview)
summary_set_tag(summaryview, -id, NULL);
tags_remove_tag(id);
}
+ g_slist_free(tags);
tags_write_tags();
APPLYWINDOW_UNLOCK();
}
-static const GtkActionEntry apply_popup_actions[] =
+static GtkActionEntry apply_popup_actions[] =
{
- { "EditTags", NULL, "EditTags" },
+ { "EditTags", NULL, "EditTags", NULL, NULL, NULL },
{ "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)
gboolean non_empty;
if (!apply_popup_menu) {
- actions = gtk_action_group_new("EditTags");
- gtk_action_group_add_actions(actions, apply_popup_actions,
+ (void) cm_menu_create_action_group("EditTags", apply_popup_actions,
G_N_ELEMENTS(apply_popup_actions), (gpointer)list_view);
- gtk_ui_manager_insert_action_group(gui_manager, actions, 0);
MENUITEM_ADDUI("/Menus", "EditTags", "EditTags", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI("/Menus/EditTags", "Delete", "EditTags/Delete",
/* create the columns */
apply_window_create_list_view_columns(GTK_WIDGET(list_view));
-#ifndef MAEMO
g_signal_connect(G_OBJECT(list_view), "popup-menu",
G_CALLBACK(apply_list_popup_menu), list_view);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(list_view), "tap-and-hold",
- G_CALLBACK(apply_list_popup_menu), list_view);
-#endif
g_signal_connect(G_OBJECT(list_view), "button-press-event",
G_CALLBACK(apply_list_btn_pressed), list_view);
return GTK_WIDGET(list_view);
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 FALSE;
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
apply_window_close();
- else if (event && event->keyval == GDK_Delete)
+ else if (event && event->keyval == GDK_KEY_Delete)
apply_popup_delete(NULL, NULL);
return FALSE;
}
if (applywindow.busy)
return FALSE;
- if (event && (event->keyval == GDK_KP_Enter || event->keyval == GDK_Return)) {
+ if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval == GDK_KEY_Return)) {
apply_window_add_tag();
gtk_entry_set_text(GTK_ENTRY(applywindow.add_entry), "");
gtk_widget_grab_focus(applywindow.taglist);
return FALSE;
}
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void apply_window_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ cm_return_if_fail(allocation != NULL);
+
+ prefs_common.tagswin_width = allocation->width;
+ prefs_common.tagswin_height = allocation->height;
+}
+
static void apply_window_create(void)
{
GtkWidget *window;
GtkWidget *new_tag_entry;
GtkWidget *add_btn;
GtkWidget *del_btn;
+ static GdkGeometry geometry;
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "tag_apply_window");
gtk_window_set_title (GTK_WINDOW(window),
- Q_("Dialog title|Apply tags"));
+ C_("Dialog title", "Apply tags"));
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(apply_window_close_cb), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(apply_window_size_allocate_cb), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(apply_window_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
- gtk_widget_set_size_request(scrolledwin, 500, 250);
-
gtk_container_add(GTK_CONTAINER(scrolledwin), taglist);
gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
gtk_widget_show(close_btn);
gtk_container_add(GTK_CONTAINER (window), vbox1);
+ if (!geometry.min_height) {
+ geometry.min_width = 500;
+ geometry.min_height = 250;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.tagswin_width,
+ prefs_common.tagswin_height);
+
applywindow.window = window;
applywindow.hbox1 = hbox1;
applywindow.vbox1 = vbox1;
static void apply_window_load_tags (void)
{
- GSList *cur;
+ GSList *cur, *tags;
gint id;
apply_window_list_view_clear_tags(applywindow.taglist);
- cur = tags_get_list();
+ cur = tags = tags_get_list();
for (; cur; cur = cur->next) {
id = GPOINTER_TO_INT(cur->data);
apply_window_list_view_insert_tag(applywindow.taglist, NULL, id);
}
+ g_slist_free(tags);
}