/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto & 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include "intl.h"
#include "prefs_gtk.h"
#include "inc.h"
#include "utils.h"
#include "prefs_actions.h"
#include "action.h"
#include "description_window.h"
+#include "gtkutils.h"
+#include "manual.h"
+
+enum {
+ PREFS_ACTIONS_STRING, /*!< string pointer managed by list store,
+ * and never touched or retrieved by
+ * us */
+ PREFS_ACTIONS_DATA, /*!< pointer to string that is not managed by
+ * the list store, and which is retrieved
+ * and touched by us */
+ PREFS_ACTIONS_VALID, /*!< contains a valid action, otherwise "(New)" */
+ N_PREFS_ACTIONS_COLUMNS
+};
static struct Actions
{
GtkWidget *name_entry;
GtkWidget *cmd_entry;
- GtkWidget *actions_clist;
+ GtkWidget *actions_list_view;
} actions;
+static int modified = FALSE;
+static int modified_list = FALSE;
+
/* widget creating functions */
static void prefs_actions_create (MainWindow *mainwin);
static void prefs_actions_set_dialog (void);
-static gint prefs_actions_clist_set_row (gint row);
+static gint prefs_actions_clist_set_row (GtkTreeIter *row);
/* callback functions */
-static void prefs_actions_help_cb (GtkWidget *w,
- gpointer data);
+static void prefs_actions_info_cb (GtkWidget *w,
+ GtkWidget *window);
static void prefs_actions_register_cb (GtkWidget *w,
gpointer data);
static void prefs_actions_substitute_cb (GtkWidget *w,
gpointer data);
static void prefs_actions_down (GtkWidget *w,
gpointer data);
-static void prefs_actions_select (GtkCList *clist,
- gint row,
- gint column,
- GdkEvent *event);
-static void prefs_actions_row_move (GtkCList *clist,
- gint source_row,
- gint dest_row);
static gint prefs_actions_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer *data);
gpointer data);
+static GtkListStore* prefs_actions_create_data_store (void);
+
+static void prefs_actions_list_view_insert_action (GtkWidget *list_view,
+ GtkTreeIter *row_iter,
+ gchar *action,
+ gboolean is_valid);
+static GtkWidget *prefs_actions_list_view_create (void);
+static void prefs_actions_create_list_view_columns (GtkWidget *list_view);
+static gboolean prefs_actions_selected (GtkTreeSelection *selector,
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean currently_selected,
+ gpointer data);
+
void prefs_actions_open(MainWindow *mainwin)
{
inc_lock();
gtk_widget_show(actions.window);
}
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void prefs_actions_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.actionswin_width = allocation->width;
+ prefs_common.actionswin_height = allocation->height;
+}
+
static void prefs_actions_create(MainWindow *mainwin)
{
GtkWidget *window;
GtkWidget *vbox;
+ GtkWidget *help_btn;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GtkWidget *confirm_area;
GtkWidget *vbox1;
+ GtkWidget *table;
- GtkWidget *entry_vbox;
- GtkWidget *hbox;
GtkWidget *name_label;
GtkWidget *name_entry;
GtkWidget *cmd_label;
GtkWidget *cond_hbox;
GtkWidget *cond_scrolledwin;
- GtkWidget *cond_clist;
+ GtkWidget *cond_list_view;
- GtkWidget *help_button;
+ GtkWidget *info_btn;
GtkWidget *btn_vbox;
GtkWidget *up_btn;
GtkWidget *down_btn;
-
- gchar *title[1];
+ static GdkGeometry geometry;
debug_print("Creating actions configuration window...\n");
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_actions");
gtk_container_set_border_width(GTK_CONTAINER (window), 8);
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, TRUE, TRUE);
- gtk_window_set_default_size(GTK_WINDOW(window), 400, -1);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
vbox = gtk_vbox_new(FALSE, 6);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
gtk_window_set_title(GTK_WINDOW(window), _("Actions configuration"));
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(prefs_actions_deleted), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(prefs_actions_size_allocate_cb), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(prefs_actions_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
G_CALLBACK(prefs_actions_ok), mainwin);
g_signal_connect(G_OBJECT(cancel_btn), "clicked",
G_CALLBACK(prefs_actions_cancel), NULL);
+ g_signal_connect(G_OBJECT(help_btn), "clicked",
+ G_CALLBACK(manual_open_with_anchor_cb),
+ MANUAL_ANCHOR_ACTIONS);
- vbox1 = gtk_vbox_new(FALSE, 8);
+ vbox1 = gtk_vbox_new(FALSE, VSPACING);
gtk_widget_show(vbox1);
gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
- entry_vbox = gtk_vbox_new(FALSE, 4);
- gtk_box_pack_start(GTK_BOX(vbox1), entry_vbox, FALSE, FALSE, 0);
-
- hbox = gtk_hbox_new(FALSE, 8);
- gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, FALSE, FALSE, 0);
-
- name_label = gtk_label_new(_("Menu name:"));
- gtk_box_pack_start(GTK_BOX(hbox), name_label, FALSE, FALSE, 0);
-
- name_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox), name_entry, TRUE, TRUE, 0);
-
- hbox = gtk_hbox_new(FALSE, 8);
- gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, TRUE, TRUE, 0);
-
- cmd_label = gtk_label_new(_("Command line:"));
- gtk_box_pack_start(GTK_BOX(hbox), cmd_label, FALSE, FALSE, 0);
-
- cmd_entry = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox), cmd_entry, TRUE, TRUE, 0);
-
- gtk_widget_show_all(entry_vbox);
+ table = gtk_table_new(2, 2, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+ gtk_widget_show(table);
+ gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, FALSE, 0);
+
+ name_label = gtk_label_new (_("Menu name"));
+ gtk_widget_show (name_label);
+ gtk_misc_set_alignment (GTK_MISC (name_label), 1, 0.5);
+ gtk_table_attach (GTK_TABLE (table), name_label, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ name_entry = gtk_entry_new ();
+ gtk_widget_show (name_entry);
+ gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+ (GtkAttachOptions) (0), 0, 0);
+
+ cmd_label = gtk_label_new (_("Command line"));
+ gtk_widget_show (cmd_label);
+ gtk_misc_set_alignment (GTK_MISC (cmd_label), 1, 0.5);
+ gtk_table_attach (GTK_TABLE (table), cmd_label, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ cmd_entry = gtk_entry_new ();
+ gtk_widget_show (cmd_entry);
+ gtk_table_attach (GTK_TABLE (table), cmd_entry, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+ (GtkAttachOptions) (0), 0, 0);
/* register / substitute / delete */
gtk_widget_show(btn_hbox);
gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label(_("Add"));
+ reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
gtk_widget_show(reg_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
G_CALLBACK(prefs_actions_register_cb), NULL);
- subst_btn = gtk_button_new_with_label(_(" Replace "));
+ subst_btn = gtkut_get_replace_btn(_("Replace"));
gtk_widget_show(subst_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(subst_btn), "clicked",
G_CALLBACK(prefs_actions_substitute_cb),
NULL);
- del_btn = gtk_button_new_with_label(_("Delete"));
+ del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_widget_show(del_btn);
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_actions_delete_cb), NULL);
- help_button = gtk_button_new_with_label(_(" Syntax help "));
- gtk_widget_show(help_button);
- gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(help_button), "clicked",
- G_CALLBACK(prefs_actions_help_cb), NULL);
+#if GTK_CHECK_VERSION(2, 8, 0)
+ info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+#else
+ info_btn = gtk_button_new_with_label(_("Info..."));
+#endif
+ gtk_widget_show(info_btn);
+ gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(info_btn), "clicked",
+ G_CALLBACK(prefs_actions_info_cb), GTK_WINDOW(window));
cond_hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show(cond_hbox);
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = _("Current actions");
- cond_clist = gtk_clist_new_with_titles(1, title);
- gtk_widget_show(cond_clist);
- gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_clist);
- gtk_clist_set_column_width(GTK_CLIST (cond_clist), 0, 80);
- gtk_clist_set_selection_mode(GTK_CLIST (cond_clist),
- GTK_SELECTION_BROWSE);
- GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(cond_clist)->column[0].button,
- GTK_CAN_FOCUS);
- g_signal_connect(G_OBJECT(cond_clist), "select_row",
- G_CALLBACK(prefs_actions_select), NULL);
- g_signal_connect_after(G_OBJECT(cond_clist), "row_move",
- G_CALLBACK(prefs_actions_row_move),
- NULL);
+ cond_list_view = prefs_actions_list_view_create();
+ gtk_widget_show(cond_list_view);
+ gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_list_view);
btn_vbox = gtk_vbox_new(FALSE, 8);
gtk_widget_show(btn_vbox);
gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
- up_btn = gtk_button_new_with_label(_("Up"));
+ up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
gtk_widget_show(up_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(up_btn), "clicked",
G_CALLBACK(prefs_actions_up), NULL);
- down_btn = gtk_button_new_with_label(_("Down"));
+ down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
gtk_widget_show(down_btn);
gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(down_btn), "clicked",
G_CALLBACK(prefs_actions_down), NULL);
+ if (!geometry.min_height) {
+ geometry.min_width = 486;
+ geometry.min_height = 322;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.actionswin_width,
+ prefs_common.actionswin_height);
+
gtk_widget_show(window);
actions.window = window;
actions.name_entry = name_entry;
actions.cmd_entry = cmd_entry;
- actions.actions_clist = cond_clist;
+ actions.actions_list_view = cond_list_view;
}
debug_print("Reading actions configurations...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
- if ((fp = fopen(rcpath, "rb")) == NULL) {
+ if ((fp = g_fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
g_free(rcpath);
return;
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
- const gchar *src_codeset = conv_get_current_charset_str();
+ const gchar *src_codeset = conv_get_locale_charset_str();
const gchar *dest_codeset = CS_UTF_8;
gchar *tmp;
tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
if (!tmp) {
- g_warning("Faild to convert character set of action configuration\n");
+ g_warning("Failed to convert character set of action configuration\n");
tmp = g_strdup(buf);
}
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
if ((pfile= prefs_write_open(rcpath)) == NULL) {
- g_warning("failed to write configuration to file\n");
+ g_warning("Failed to write configuration to file\n");
g_free(rcpath);
return;
}
for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
gchar *tmp = (gchar *)cur->data;
const gchar *src_codeset = CS_UTF_8;
- const gchar *dest_codeset = conv_get_current_charset_str();
+ const gchar *dest_codeset = conv_get_locale_charset_str();
gchar *act;
act = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
if (!act) {
- g_warning("Faild to convert character set of action configuration\n");
+ g_warning("Failed to convert character set of action configuration\n");
act = g_strdup(act);
}
static void prefs_actions_set_dialog(void)
{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
+ GtkListStore *store;
GSList *cur;
- gchar *action_str[1];
- gint row;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
- gtk_clist_freeze(clist);
- gtk_clist_clear(clist);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(actions.actions_list_view)));
+ gtk_list_store_clear(store);
- action_str[0] = _("(New)");
- row = gtk_clist_append(clist, action_str);
- gtk_clist_set_row_data(clist, row, NULL);
+ prefs_actions_list_view_insert_action(actions.actions_list_view,
+ NULL, _("(New)"), FALSE);
for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
- gchar *action[1];
-
- action[0] = (gchar *)cur->data;
- row = gtk_clist_append(clist, action);
- gtk_clist_set_row_data(clist, row, action[0]);
+ gchar *action = (gchar *) cur->data;
+
+ prefs_actions_list_view_insert_action(actions.actions_list_view,
+ NULL, action, TRUE);
}
- gtk_clist_thaw(clist);
+ /* select first entry */
+ selection = gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(actions.actions_list_view));
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store),
+ &iter))
+ gtk_tree_selection_select_iter(selection, &iter);
}
static void prefs_actions_set_list(void)
{
- gint row = 1;
- gchar *action;
-
+ GtkTreeIter iter;
+ GtkListStore *store;
+
g_slist_free(prefs_common.actions_list);
prefs_common.actions_list = NULL;
- while ((action = (gchar *)gtk_clist_get_row_data
- (GTK_CLIST(actions.actions_clist), row)) != NULL) {
- prefs_common.actions_list =
- g_slist_append(prefs_common.actions_list, action);
- row++;
+ store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(actions.actions_list_view)));
+
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
+ do {
+ gchar *action;
+ gboolean is_valid;
+
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
+ PREFS_ACTIONS_DATA, &action,
+ PREFS_ACTIONS_VALID, &is_valid,
+ -1);
+
+ if (is_valid)
+ prefs_common.actions_list =
+ g_slist_append(prefs_common.actions_list,
+ action);
+
+ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store),
+ &iter));
}
}
#define GET_ENTRY(entry) \
entry_text = gtk_entry_get_text(GTK_ENTRY(entry))
-static gint prefs_actions_clist_set_row(gint row)
+static gint prefs_actions_clist_set_row(GtkTreeIter *row)
{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
const gchar *entry_text;
gint len;
gchar action[PREFSBUFSIZE];
- gchar *buf[1];
+ gchar *new_action;
+ GtkListStore *store;
- g_return_val_if_fail(row != 0, -1);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(actions.actions_list_view)));
+
GET_ENTRY(actions.name_entry);
if (entry_text[0] == '\0') {
return -1;
}
+ if (entry_text[0] == '/') {
+ alertpanel_error(_("A leading '/' is not allowed in the menu name."));
+ return -1;
+ }
+
if (strchr(entry_text, ':')) {
alertpanel_error(_("Colon ':' is not allowed in the menu name."));
return -1;
}
strncpy(action, entry_text, PREFSBUFSIZE - 1);
+
+ while (strstr(action, "//")) {
+ char *to_move = strstr(action, "//")+1;
+ char *where = strstr(action, "//");
+ int old_len = strlen(action);
+ memmove(where, to_move, strlen(to_move));
+ action[old_len-1] = '\0';
+ }
+
g_strstrip(action);
/* Keep space for the ': ' delimiter */
}
if (action_get_type(entry_text) == ACTION_ERROR) {
- alertpanel_error(_("The command\n%s\nhas a syntax error."),
- entry_text);
+ gchar *message;
+ message = g_markup_printf_escaped(_("The command\n%s\nhas a syntax error."),
+ entry_text);
+ alertpanel_error(message);
+ g_free(message);
return -1;
}
strcat(action, entry_text);
- buf[0] = action;
- if (row < 0)
- row = gtk_clist_append(clist, buf);
- else {
- gchar *old_action;
- gtk_clist_set_text(clist, row, 0, action);
- old_action = (gchar *) gtk_clist_get_row_data(clist, row);
- if (old_action)
- g_free(old_action);
- }
-
- buf[0] = g_strdup(action);
-
- gtk_clist_set_row_data(clist, row, buf[0]);
-
+ new_action = g_strdup(action);
+ prefs_actions_list_view_insert_action(actions.actions_list_view,
+ row, new_action, TRUE);
+
prefs_actions_set_list();
return 0;
static void prefs_actions_register_cb(GtkWidget *w, gpointer data)
{
- prefs_actions_clist_set_row(-1);
+ prefs_actions_clist_set_row(NULL);
+ modified = FALSE;
+ modified_list = TRUE;
}
static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data)
{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
- gchar *action;
- gint row;
+ GtkTreeIter isel, inew;
+ GtkTreePath *path_sel, *path_new;
+ GtkTreeSelection *selection = gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(actions.actions_list_view));
+ GtkTreeModel *model;
- if (!clist->selection) return;
+ if (!gtk_tree_selection_get_selected(selection, &model, &isel))
+ return;
+ if (!gtk_tree_model_get_iter_first(model, &inew))
+ return;
- row = GPOINTER_TO_INT(clist->selection->data);
- if (row == 0) return;
+ path_sel = gtk_tree_model_get_path(model, &isel);
+ path_new = gtk_tree_model_get_path(model, &inew);
- action = gtk_clist_get_row_data(clist, row);
- if (!action) return;
+ if (path_sel && path_new
+ && gtk_tree_path_compare(path_sel, path_new) != 0)
+ prefs_actions_clist_set_row(&isel);
- prefs_actions_clist_set_row(row);
+ gtk_tree_path_free(path_sel);
+ gtk_tree_path_free(path_new);
+ modified = FALSE;
+ modified_list = TRUE;
}
static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
+ GtkTreeIter sel;
+ GtkTreeModel *model;
gchar *action;
- gint row;
- if (!clist->selection) return;
- row = GPOINTER_TO_INT(clist->selection->data);
- if (row == 0) return;
+ if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(actions.actions_list_view)),
+ &model, &sel))
+ return;
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
- _("Yes"), _("No"), NULL) == G_ALERTALTERNATE)
+ GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
return;
- action = gtk_clist_get_row_data(clist, row);
- g_free(action);
- gtk_clist_remove(clist, row);
+ /* XXX: Here's the reason why we need to store the original
+ * pointer: we search the slist for it. */
+ gtk_tree_model_get(model, &sel,
+ PREFS_ACTIONS_DATA, &action,
+ -1);
+ gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
+
prefs_common.actions_list = g_slist_remove(prefs_common.actions_list,
action);
+ modified_list = TRUE;
}
static void prefs_actions_up(GtkWidget *w, gpointer data)
{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
- gint row;
-
- if (!clist->selection) return;
-
- row = GPOINTER_TO_INT(clist->selection->data);
- if (row > 1)
- gtk_clist_row_move(clist, row, row - 1);
-}
+ GtkTreePath *prev, *sel, *try;
+ GtkTreeIter isel;
+ GtkListStore *store = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreeIter iprev;
+
+ if (!gtk_tree_selection_get_selected
+ (gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(actions.actions_list_view)),
+ &model,
+ &isel))
+ return;
+ store = (GtkListStore *)model;
+ sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
+ if (!sel)
+ return;
+
+ /* no move if we're at row 0 or 1, looks phony, but other
+ * solutions are more convoluted... */
+ try = gtk_tree_path_copy(sel);
+ if (!gtk_tree_path_prev(try) || !gtk_tree_path_prev(try)) {
+ gtk_tree_path_free(try);
+ gtk_tree_path_free(sel);
+ return;
+ }
+ gtk_tree_path_free(try);
-static void prefs_actions_down(GtkWidget *w, gpointer data)
-{
- GtkCList *clist = GTK_CLIST(actions.actions_clist);
- gint row;
+ prev = gtk_tree_path_copy(sel);
+ if (!gtk_tree_path_prev(prev)) {
+ gtk_tree_path_free(prev);
+ gtk_tree_path_free(sel);
+ return;
+ }
- if (!clist->selection) return;
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(store),
+ &iprev, prev);
+ gtk_tree_path_free(sel);
+ gtk_tree_path_free(prev);
- row = GPOINTER_TO_INT(clist->selection->data);
- if (row > 0 && row < clist->rows - 1)
- gtk_clist_row_move(clist, row, row + 1);
+ gtk_list_store_swap(store, &iprev, &isel);
+ prefs_actions_set_list();
+ modified_list = TRUE;
}
-#define ENTRY_SET_TEXT(entry, str) \
- gtk_entry_set_text(GTK_ENTRY(entry), str ? str : "")
-
-static void prefs_actions_select(GtkCList *clist, gint row, gint column,
- GdkEvent *event)
+static void prefs_actions_down(GtkWidget *w, gpointer data)
{
- gchar *action;
- gchar *cmd;
- gchar buf[PREFSBUFSIZE];
- action = gtk_clist_get_row_data(clist, row);
+ GtkListStore *store = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreeIter next, sel;
+ GtkTreePath *try;
+
+ if (!gtk_tree_selection_get_selected
+ (gtk_tree_view_get_selection
+ (GTK_TREE_VIEW(actions.actions_list_view)),
+ &model,
+ &sel))
+ return;
+ store = (GtkListStore *)model;
+ try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
+ if (!try)
+ return;
- if (!action) {
- ENTRY_SET_TEXT(actions.name_entry, "");
- ENTRY_SET_TEXT(actions.cmd_entry, "");
+ /* no move when we're at row 0 */
+ if (!gtk_tree_path_prev(try)) {
+ gtk_tree_path_free(try);
return;
}
+ gtk_tree_path_free(try);
- strncpy(buf, action, PREFSBUFSIZE - 1);
- buf[PREFSBUFSIZE - 1] = 0x00;
- cmd = strstr(buf, ": ");
-
- if (cmd && cmd[2])
- ENTRY_SET_TEXT(actions.cmd_entry, &cmd[2]);
- else
+ next = sel;
+ if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
return;
- *cmd = 0x00;
- ENTRY_SET_TEXT(actions.name_entry, buf);
-}
-
-static void prefs_actions_row_move(GtkCList *clist,
- gint source_row, gint dest_row)
-{
+ gtk_list_store_swap(store, &next, &sel);
prefs_actions_set_list();
- if (gtk_clist_row_is_visible(clist, dest_row) != GTK_VISIBILITY_FULL) {
- gtk_clist_moveto(clist, dest_row, -1,
- source_row < dest_row ? 1.0 : 0.0, 0.0);
- }
+ modified_list = TRUE;
}
static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
{
if (event && event->keyval == GDK_Escape)
prefs_actions_cancel(widget, data);
+ else {
+ GtkWidget *focused = gtkut_get_focused_child(
+ GTK_CONTAINER(widget));
+ if (focused && GTK_IS_EDITABLE(focused)) {
+ modified = TRUE;
+ }
+ }
return FALSE;
}
static void prefs_actions_cancel(GtkWidget *w, gpointer data)
{
+ if (modified && alertpanel(_("Entry not saved"),
+ _("The entry was not saved. Close anyway?"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != G_ALERTDEFAULT) {
+ return;
+ } else if (modified_list && alertpanel(_("Actions list not saved"),
+ _("The actions list has been modified. Close anyway?"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != G_ALERTDEFAULT) {
+ return;
+ }
+ modified = FALSE;
+ modified_list = FALSE;
prefs_actions_read_config();
gtk_widget_hide(actions.window);
inc_unlock();
static void prefs_actions_ok(GtkWidget *widget, gpointer data)
{
- GtkItemFactory *ifactory;
- MainWindow *mainwin = (MainWindow *)data;
-
+ MainWindow *mainwin = (MainWindow *) data;
+ GList *list;
+ GList *iter;
+ MessageView *msgview;
+ Compose *compose;
+
+ if (modified && alertpanel(_("Entry not saved"),
+ _("The entry was not saved. Close anyway?"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != G_ALERTDEFAULT) {
+ return;
+ } else if (modified_list && alertpanel(_("Actions list not saved"),
+ _("The actions list has been modified. Close anyway?"),
+ GTK_STOCK_CLOSE, _("+_Continue editing"),
+ NULL) != G_ALERTDEFAULT) {
+ return;
+ }
+ modified = FALSE;
+ modified_list = FALSE;
+ prefs_actions_set_list();
prefs_actions_write_config();
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
- action_update_mainwin_menu(ifactory, mainwin);
+
+ /* Update mainwindow actions menu */
+ main_window_update_actions_menu(mainwin);
+
+ /* Update separated message view actions menu */
+ list = messageview_get_msgview_list();
+ for (iter = list; iter; iter = iter->next) {
+ msgview = (MessageView *) iter->data;
+ messageview_update_actions_menu(msgview);
+ }
+
+ /* Update compose windows actions menu */
+ list = compose_get_compose_list();
+ for (iter = list; iter; iter = iter->next) {
+ compose = (Compose *) iter->data;
+ compose_update_actions_menu(compose);
+ }
+
gtk_widget_hide(actions.window);
inc_unlock();
}
* When adding new lines, remember to put one string for each line
*/
static gchar *actions_desc_strings[] = {
- N_("MENU NAME:"), NULL,
- " ", N_("Use / in menu name to make submenus."),
+ N_("<span weight=\"bold\" underline=\"single\">Menu name:</span>"), NULL,
+ N_("Use / in menu name to make submenus."), NULL,
"", NULL,
- N_("COMMAND LINE:"), NULL,
- N_("Begin with:"), NULL,
+ N_("<span weight=\"bold\" underline=\"single\">Command line:</span>"), NULL,
+ N_("<span weight=\"bold\">Begin with:</span>"), NULL,
" |", N_("to send message body or selection to command's standard input"),
- " >", N_("to send user provided text to command's standard input"),
+ " >", N_("to send user provided text to command's standard input"),
" *", N_("to send user provided hidden text to command's standard input"),
- N_("End with:"), NULL,
+ N_("<span weight=\"bold\">End with:</span>"), NULL,
" |", N_("to replace message body or selection with command's standard output"),
- " >", N_("to insert command's standard output without replacing old text"),
- " &", N_("to run command asynchronously"),
- N_("Use:"), NULL,
+ " >", N_("to insert command's standard output without replacing old text"),
+ " &", N_("to run command asynchronously"),
+ N_("<span weight=\"bold\">Use:</span>"), NULL,
" %f", N_("for the file of the selected message in RFC822/2822 format "),
" %F", N_("for the list of the files of the selected messages in RFC822/2822 format"),
" %p", N_("for the file of the selected decoded message MIME part"),
" %u", N_("for a user provided argument"),
" %h", N_("for a user provided hidden argument (e.g. password)"),
" %s", N_("for the text selection"),
- NULL
+ " %as{}", N_("apply filtering actions between {} to selected messages"),
+ " %%", N_("for a literal %"),
+ NULL, NULL
};
static DescriptionWindow actions_desc_win = {
- NULL,
- 2,
- N_("Description of symbols"),
+ NULL,
+ NULL,
+ 2,
+ N_("Actions"),
+ N_("The Actions feature is a way for the user to launch "
+ "external commands to process a complete message file or just "
+ "one of its parts."),
actions_desc_strings
};
-static void prefs_actions_help_cb(GtkWidget *w, gpointer data)
+static void prefs_actions_info_cb(GtkWidget *w, GtkWidget *window)
{
+ actions_desc_win.parent = window;
description_window_create(&actions_desc_win);
}
+
+static GtkListStore* prefs_actions_create_data_store(void)
+{
+ return gtk_list_store_new(N_PREFS_ACTIONS_COLUMNS,
+ G_TYPE_STRING,
+ G_TYPE_POINTER,
+ G_TYPE_BOOLEAN,
+ -1);
+}
+
+static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
+ GtkTreeIter *row_iter,
+ gchar *action,
+ gboolean is_valid)
+{
+ GtkTreeIter iter;
+ GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(list_view)));
+
+ if (row_iter == NULL) {
+ /* append new */
+ gtk_list_store_append(list_store, &iter);
+ gtk_list_store_set(list_store, &iter,
+ PREFS_ACTIONS_STRING, action,
+ PREFS_ACTIONS_DATA, action,
+ PREFS_ACTIONS_VALID, is_valid,
+ -1);
+ } else {
+ /* change existing */
+ gchar *old_action;
+
+ gtk_tree_model_get(GTK_TREE_MODEL(list_store), row_iter,
+ PREFS_ACTIONS_DATA, &old_action,
+ -1);
+
+ g_free(old_action);
+ gtk_list_store_set(list_store, row_iter,
+ PREFS_ACTIONS_STRING, action,
+ PREFS_ACTIONS_DATA, action,
+ -1);
+ }
+}
+
+static GtkWidget *prefs_actions_list_view_create(void)
+{
+ GtkTreeView *list_view;
+ GtkTreeSelection *selector;
+ GtkTreeModel *model;
+
+ model = GTK_TREE_MODEL(prefs_actions_create_data_store());
+ list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+ g_object_unref(model);
+
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+ gtk_tree_view_set_reorderable(list_view, TRUE);
+
+ selector = gtk_tree_view_get_selection(list_view);
+ gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+ gtk_tree_selection_set_select_function(selector, prefs_actions_selected,
+ NULL, NULL);
+
+ /* create the columns */
+ prefs_actions_create_list_view_columns(GTK_WIDGET(list_view));
+
+ return GTK_WIDGET(list_view);
+}
+
+static void prefs_actions_create_list_view_columns(GtkWidget *list_view)
+{
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Current actions"),
+ renderer,
+ "text", PREFS_ACTIONS_STRING,
+ NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
+}
+
+#define ENTRY_SET_TEXT(entry, str) \
+ gtk_entry_set_text(GTK_ENTRY(entry), str ? str : "")
+
+static gboolean prefs_actions_selected(GtkTreeSelection *selector,
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean currently_selected,
+ gpointer data)
+{
+ gchar *action;
+ gchar *cmd;
+ gchar buf[PREFSBUFSIZE];
+ GtkTreeIter iter;
+ gboolean is_valid;
+
+ if (currently_selected)
+ return TRUE;
+
+ if (!gtk_tree_model_get_iter(model, &iter, path))
+ return TRUE;
+
+ gtk_tree_model_get(model, &iter,
+ PREFS_ACTIONS_VALID, &is_valid,
+ PREFS_ACTIONS_DATA, &action,
+ -1);
+ if (!is_valid) {
+ ENTRY_SET_TEXT(actions.name_entry, "");
+ ENTRY_SET_TEXT(actions.cmd_entry, "");
+ return TRUE;
+ }
+
+ strncpy(buf, action, PREFSBUFSIZE - 1);
+ buf[PREFSBUFSIZE - 1] = 0x00;
+ cmd = strstr(buf, ": ");
+
+ if (cmd && cmd[2])
+ ENTRY_SET_TEXT(actions.cmd_entry, &cmd[2]);
+ else
+ return TRUE;
+
+ *cmd = 0x00;
+ ENTRY_SET_TEXT(actions.name_entry, buf);
+
+ return TRUE;
+}
+
projects / claws.git / blobdiff