/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "utils.h"
#include "gtkutils.h"
#include "alertpanel.h"
-#include "base64.h"
#include "filesel.h"
+#include "combobox.h"
enum {
CUSTHDR_STRING, /*!< display string managed by list store */
GtkWidget *hdr_combo;
GtkWidget *hdr_entry;
GtkWidget *val_entry;
+ GtkWidget *preview;
GtkWidget *list_view;
} customhdr;
cur_ac = ac;
gtk_widget_show(customhdr.window);
+ gtk_window_set_modal(GTK_WINDOW(customhdr.window), TRUE);
}
static void prefs_custom_header_create(void)
GtkWidget *arrow;
GtkWidget *add_btn;
GtkWidget *del_btn;
+ GtkWidget *preview;
GtkWidget *ch_hbox;
GtkWidget *ch_scrolledwin;
debug_print("Creating custom header setting window...\n");
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_customheader");
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_resizable(GTK_WINDOW (window), TRUE);
vbox = gtk_vbox_new (FALSE, 6);
0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (hdr_label), 0, 0.5);
- hdr_combo = gtk_combo_new ();
- gtk_widget_show (hdr_combo);
+ hdr_combo = combobox_text_new(TRUE, "User-Agent", "Face", "X-Face",
+ "X-Operating-System", NULL);
gtk_table_attach (GTK_TABLE (table1), hdr_combo, 0, 1, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
0, 0, 0);
gtk_widget_set_size_request (hdr_combo, 150, -1);
- gtkut_combo_set_items (GTK_COMBO (hdr_combo),
- "User-Agent", "Face", "X-Face", "X-Operating-System",
- NULL);
val_label = gtk_label_new (_("Value"));
gtk_widget_show (val_label);
0, 0, 0);
gtk_widget_set_size_request (val_entry, 200, -1);
- val_btn = gtk_button_new_with_label (_("From file..."));
+ val_btn = gtkut_get_browse_file_btn(_("Bro_wse"));
gtk_widget_show (val_btn);
gtk_table_attach (GTK_TABLE (table1), val_btn, 2, 3, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
g_signal_connect (G_OBJECT (down_btn), "clicked",
G_CALLBACK (prefs_custom_header_down), NULL);
+ preview = gtk_image_new ();
+ gtk_widget_show (preview);
+ gtk_box_pack_start (GTK_BOX (btn_vbox), preview, FALSE, FALSE, 0);
+
gtk_widget_show_all(window);
customhdr.window = window;
customhdr.ok_btn = ok_btn;
customhdr.cancel_btn = cancel_btn;
+ customhdr.preview = preview;
customhdr.hdr_combo = hdr_combo;
- customhdr.hdr_entry = GTK_COMBO (hdr_combo)->entry;
+ customhdr.hdr_entry = gtk_bin_get_child(GTK_BIN((hdr_combo)));
customhdr.val_entry = val_entry;
customhdr.list_view = list_view;
fclose(fp);
}
-void prefs_custom_header_write_config(PrefsAccount *ac)
+static void prefs_custom_header_write_config(PrefsAccount *ac)
{
gchar *rcpath;
PrefFile *pfile;
CustomHeader *ch;
const gchar *entry_text;
gchar *ch_str;
- GtkListStore *store;
-
- store = GTK_LIST_STORE(gtk_tree_view_get_model
- (GTK_TREE_VIEW(customhdr.list_view)));
entry_text = gtk_entry_get_text(GTK_ENTRY(customhdr.hdr_entry));
if (entry_text[0] == '\0') {
const gchar *hdr = gtk_entry_get_text(GTK_ENTRY(customhdr.hdr_entry));
if (!strcmp(hdr, "Face"))
- filename = filesel_select_file_open(_("Choose a png file"), NULL);
+ filename = filesel_select_file_open(_("Choose a PNG file"), NULL);
else if (!strcmp(hdr, "X-Face"))
- filename = filesel_select_file_open(_("Choose an xbm file"), NULL);
+ filename = filesel_select_file_open(_("Choose an XBM file"), NULL);
else
filename = filesel_select_file_open(_("Choose a text file"), NULL);
if (filename && is_file_exist(filename)) {
FILE *fp = NULL;
gint len;
- gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
+ gchar inbuf[B64_LINE_SIZE], *outbuf;
gchar *tmp = NULL;
gint w, h;
GdkPixbufFormat *format = gdk_pixbuf_get_file_info(
}
if (g_ascii_strcasecmp("png", gdk_pixbuf_format_get_name(format))) {
alertpanel_error(_("The image isn't in the correct format (PNG)."));
- printf("%s\n", gdk_pixbuf_format_get_name(format));
+ g_print("%s\n", gdk_pixbuf_format_get_name(format));
g_free(filename);
return;
}
int i = 0;
if (g_ascii_strcasecmp("xbm", gdk_pixbuf_format_get_name(format))) {
alertpanel_error(_("The image isn't in the correct format (XBM)."));
- printf("%s\n", gdk_pixbuf_format_get_name(format));
+ g_print("%s\n", gdk_pixbuf_format_get_name(format));
g_free(filename);
return;
}
cmd = g_strdup_printf("compface %s", filename);
tmp = get_command_output(cmd);
g_free(cmd);
- if (tmp == NULL || strlen(tmp) == 0){
+ if (tmp == NULL || *tmp == '\0') {
alertpanel_error(_("Couldn't call `compface`. Make sure it's in your $PATH."));
g_free(filename);
g_free(tmp);
return;
}
+ if (strstr(tmp, "compface:")) {
+ alertpanel_error(_("Compface error: %s"), tmp);
+ g_free(filename);
+ g_free(tmp);
+ return;
+ }
while (tmp[i]) {
gchar *tmp2 = NULL;
if (tmp[i] == ' ') {
while ((len = fread(inbuf, sizeof(gchar),
B64_LINE_SIZE, fp))
== B64_LINE_SIZE) {
- base64_encode(outbuf, inbuf, B64_LINE_SIZE);
+ outbuf = g_base64_encode(inbuf, B64_LINE_SIZE);
tmp = contents;
contents = g_strconcat(tmp?tmp:"",outbuf, NULL);
+ g_free(outbuf);
g_free(tmp);
}
if (len > 0 && feof(fp)) {
tmp = contents;
- base64_encode(outbuf, inbuf, len);
+ outbuf = g_base64_encode(inbuf, len);
contents = g_strconcat(tmp?tmp:"",outbuf, NULL);
+ g_free(outbuf);
g_free(tmp);
}
fclose(fp);
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_custom_header_cancel();
return FALSE;
}
{
prefs_custom_header_write_config(cur_ac);
gtk_widget_hide(customhdr.window);
+ gtk_window_set_modal(GTK_WINDOW(customhdr.window), FALSE);
}
static void prefs_custom_header_cancel(void)
{
prefs_custom_header_read_config(cur_ac);
gtk_widget_hide(customhdr.window);
+ gtk_window_set_modal(GTK_WINDOW(customhdr.window), FALSE);
}
static gint prefs_custom_header_deleted(GtkWidget *widget, GdkEventAny *event,
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);
{
GtkTreeIter iter;
CustomHeader *ch;
+ GtkImage *preview;
+ GdkPixbuf *pixbuf;
CustomHeader default_ch = { 0, "", NULL };
if (currently_selected)
ENTRY_SET_TEXT(customhdr.hdr_entry, ch->name);
ENTRY_SET_TEXT(customhdr.val_entry, ch->value);
-
+ if (!strcmp2("Face",ch->name)) {
+ preview = GTK_IMAGE(face_get_from_header (ch->value));
+ pixbuf = gtk_image_get_pixbuf(preview);
+ gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
+ gtk_widget_show(customhdr.preview);
+ g_object_ref_sink (G_OBJECT(preview));
+ }
+#if HAVE_LIBCOMPFACE
+else if (!strcmp2("X-Face", ch->name)) {
+ preview = GTK_IMAGE(xface_get_from_header(ch->value));
+ pixbuf = gtk_image_get_pixbuf(preview);
+ gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
+ gtk_widget_show(customhdr.preview);
+ g_object_ref_sink (G_OBJECT(preview));
+ }
+#endif
+else {
+ gtk_widget_hide(customhdr.preview);
+ }
return TRUE;
}
projects / claws.git / blobdiff