/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
*
* 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
#include <errno.h>
#include "intl.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "prefs_display_header.h"
#include "prefs_common.h"
#include "manage_window.h"
GtkWidget *other_headers;
} dispheader;
-/*
- parameter name, default value, pointer to the prefs variable, data type,
- pointer to the widget pointer,
- pointer to the function for data setting,
- pointer to the function for widget setting
- */
-
-#define VSPACING 12
-#define VSPACING_NARROW 4
-#define DEFAULT_ENTRY_WIDTH 80
-#define PREFSBUFSIZE 1024
-
/* widget creating functions */
static void prefs_display_header_create (void);
static void prefs_display_header_up (void);
static void prefs_display_header_down (void);
+static void prefs_display_header_row_moved (GtkCList *clist,
+ gint source_row,
+ gint dest_row,
+ gpointer data);
+
static void prefs_display_header_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_display_header_ok (void);
static void prefs_display_header_cancel (void);
+static gint prefs_display_header_deleted (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static gchar *defaults[] =
{
void prefs_display_header_open(void)
{
+ if (prefs_rc_is_readonly(DISPLAY_HEADER_RC))
+ return;
+
if (!dispheader.window) {
prefs_display_header_create();
}
gchar *title[1];
- debug_print(_("Creating display header setting window...\n"));
+ debug_print("Creating display header setting window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Display header setting"));
+ _("Displayed header configuration"));
+ MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
+ GTK_SIGNAL_FUNC(prefs_display_header_deleted),
+ NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_display_header_key_pressed),
NULL);
- 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(ok_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_display_header_ok),
NULL);
"Reply-To", "Sender", "User-Agent", "X-Mailer",
NULL);
- clist_hbox = gtk_hbox_new (FALSE, 8);
+ clist_hbox = gtk_hbox_new (FALSE, 10);
gtk_widget_show (clist_hbox);
gtk_box_pack_start (GTK_BOX (vbox1), clist_hbox, TRUE, TRUE, 0);
gtk_clist_set_use_drag_icons (GTK_CLIST (headers_clist), FALSE);
GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (headers_clist)->column[0].button,
GTK_CAN_FOCUS);
+ gtk_signal_connect_after
+ (GTK_OBJECT (headers_clist), "row_move",
+ GTK_SIGNAL_FUNC (prefs_display_header_row_moved), NULL);
btn_vbox = gtk_vbox_new (FALSE, 8);
gtk_widget_show (btn_vbox);
gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_display_header_register_cb),
- FALSE);
+ GINT_TO_POINTER(FALSE));
del_btn = gtk_button_new_with_label (_("Delete"));
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC
(prefs_display_header_register_cb),
- (void *) TRUE);
+ GINT_TO_POINTER(TRUE));
del_btn = gtk_button_new_with_label (_("Delete"));
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_display_header_delete_cb),
- (void *) hidden_headers_clist);
+ hidden_headers_clist);
PACK_CHECK_BUTTON (btn_hbox, checkbtn_other_headers,
- _("Show other headers"));
+ _("Show all unspecified headers"));
SET_TOGGLE_SENSITIVITY (checkbtn_other_headers, clist_hbox2);
gtk_widget_show_all(window);
gchar buf[PREFSBUFSIZE];
DisplayHeaderProp *dp;
- debug_print(_("Reading configuration for displaying headers...\n"));
+ debug_print("Reading configuration for displaying headers...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DISPLAY_HEADER_RC, NULL);
- if ((fp = fopen(rcpath, "r")) == NULL) {
+ if ((fp = fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
g_free(rcpath);
prefs_common.disphdr_list = NULL;
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
- g_strchomp(buf);
+ g_strdelimit(buf, "\r\n", '\0');
dp = display_header_prop_read_str(buf);
if (dp)
prefs_common.disphdr_list =
PrefFile *pfile;
GSList *cur;
- debug_print(_("Writing configuration for displaying headers...\n"));
+ debug_print("Writing configuration for displaying headers...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DISPLAY_HEADER_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;
}
if (fputs(dpstr, pfile->fp) == EOF ||
fputc('\n', pfile->fp) == EOF) {
FILE_OP_ERROR(rcpath, "fputs || fputc");
- prefs_write_close_revert(pfile);
+ prefs_file_close_revert(pfile);
g_free(rcpath);
g_free(dpstr);
return;
g_free(rcpath);
- if (prefs_write_close(pfile) < 0) {
- g_warning(_("failed to write configuration to file\n"));
+ if (prefs_file_close(pfile) < 0) {
+ g_warning("failed to write configuration to file\n");
return;
}
}
static void prefs_display_header_register_cb(GtkButton *btn,
gpointer hidden_data)
{
- gboolean hidden = (gboolean)hidden_data;
-
- prefs_display_header_clist_set_row(hidden);
+ prefs_display_header_clist_set_row(GPOINTER_TO_INT(hidden_data));
}
static void prefs_display_header_delete_cb(GtkButton *btn, gpointer clist_data)
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
- if (row > 0) {
+ if (row > 0)
gtk_clist_row_move(clist, row, row - 1);
- prefs_display_header_set_list();
- }
}
static void prefs_display_header_down(void)
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
- if (row >= 0 && row < clist->rows - 1) {
+ if (row >= 0 && row < clist->rows - 1)
gtk_clist_row_move(clist, row, row + 1);
- prefs_display_header_set_list();
- }
+}
+
+static void prefs_display_header_row_moved(GtkCList *clist, gint source_row,
+ gint dest_row, gpointer data)
+{
+ prefs_display_header_set_list();
}
static void prefs_display_header_key_pressed(GtkWidget *widget,
prefs_display_header_read_config();
gtk_widget_hide(dispheader.window);
}
+
+static gint prefs_display_header_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ prefs_display_header_cancel();
+ return TRUE;
+}
projects / claws.git / blobdiff