2009-10-17 [paul] 3.7.3cvs1

[claws.git] / src / prefs_customheader.c

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 056f13a4c423fd790f1535d240ca443acc4e1793..1cf1ab3a90ef7bc422756a41ea155a55df0bf7b9 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 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
@@ -47,6 +47,7 @@
 #include "alertpanel.h"
 #include "base64.h"
 #include "filesel.h"
+#include "combobox.h"
 
 enum {
        CUSTHDR_STRING,         /*!< display string managed by list store */
@@ -63,6 +64,7 @@ static struct CustomHdr {
        GtkWidget *hdr_combo;
        GtkWidget *hdr_entry;
        GtkWidget *val_entry;
+       GtkWidget *preview;
        GtkWidget *list_view;
 } customhdr;
 
@@ -123,6 +125,7 @@ void prefs_custom_header_open(PrefsAccount *ac)
        cur_ac = ac;
 
        gtk_widget_show(customhdr.window);
+       gtk_window_set_modal(GTK_WINDOW(customhdr.window), TRUE);
 }
 
 static void prefs_custom_header_create(void)
@@ -149,6 +152,7 @@ static void prefs_custom_header_create(void)
        GtkWidget *arrow;
        GtkWidget *add_btn;
        GtkWidget *del_btn;
+       GtkWidget *preview;
 
        GtkWidget *ch_hbox;
        GtkWidget *ch_scrolledwin;
@@ -163,7 +167,6 @@ static void prefs_custom_header_create(void)
        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);
@@ -209,15 +212,12 @@ static void prefs_custom_header_create(void)
                          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);
@@ -233,7 +233,7 @@ static void prefs_custom_header_create(void)
                          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,
@@ -304,14 +304,19 @@ static void prefs_custom_header_create(void)
        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;
@@ -609,12 +614,18 @@ static void prefs_custom_header_val_from_file_cb(void)
                                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] == ' ') {
@@ -776,12 +787,14 @@ static void prefs_custom_header_ok(void)
 {
        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,
@@ -843,6 +856,7 @@ static GtkWidget *prefs_custom_header_list_view_create(void)
        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);
@@ -880,6 +894,8 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 {
        GtkTreeIter iter;
        CustomHeader *ch;
+       GtkImage *preview;
+       GdkPixbuf *pixbuf;
        CustomHeader default_ch = { 0, "", NULL };
 
        if (currently_selected)
@@ -896,7 +912,39 @@ static gboolean prefs_custom_header_selected(GtkTreeSelection *selector,
 
        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);
+#if GLIB_CHECK_VERSION(2,10,0)
+               g_object_ref_sink (G_OBJECT(preview));
+#else
+               gtk_object_ref (G_OBJECT(preview));
+               gtk_object_sink (G_OBJECT(preview));
+#endif
+       } 
+#if HAVE_LIBCOMPFACE
+else if (!strcmp2("X-Face", ch->name)) {
+               GdkColor color;
+               color.pixel = 0;
+               preview = GTK_IMAGE(xface_get_from_header(ch->value, 
+                                         &color, 
+                                         mainwindow_get_mainwindow()->window->window));        
+               pixbuf = gtk_image_get_pixbuf(preview);
+               gtk_image_set_from_pixbuf (GTK_IMAGE(customhdr.preview), pixbuf);
+               gtk_widget_show(customhdr.preview);
+#if GLIB_CHECK_VERSION(2,10,0)
+               g_object_ref_sink (G_OBJECT(preview));
+#else
+               gtk_object_ref (G_OBJECT(preview));
+               gtk_object_sink (G_OBJECT(preview));
+#endif
+       } 
+#endif
+else {
+               gtk_widget_hide(customhdr.preview);
+       }
        return TRUE;
 }