#include "manage_window.h"
#include "utils.h"
#include "addr_compl.h"
+#include "prefs_scoring.h"
+#include "gtkutils.h"
PrefsFolderItem tmp_prefs;
GtkWidget *entry_folder_chmod;
GtkWidget *checkbtn_enable_default_account;
GtkWidget *optmenu_default_account;
+ GtkWidget *folder_color;
+ GtkWidget *folder_color_btn;
};
+static GtkWidget *color_dialog;
+
static PrefParam param[] = {
{"sort_by_number", "FALSE", &tmp_prefs.sort_by_number, P_BOOL,
NULL, NULL, NULL},
NULL, NULL, NULL},
{"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
NULL, NULL, NULL},
+ {"folder_color", "", &tmp_prefs.color, P_INT,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
struct PrefsFolderItemDialog *dialog);
gint prefs_folder_item_chmod_mode (gchar *folder_chmod);
+static void set_button_color(guint rgbvalue, GtkWidget *button);
+static void folder_color_set_dialog(GtkWidget *widget, gpointer data);
+static void folder_color_set_dialog_ok(GtkWidget *widget, gpointer data);
+static void folder_color_set_dialog_cancel(GtkWidget *widget, gpointer data);
+static void folder_color_set_dialog_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
+
void prefs_folder_item_read_config(FolderItem * item)
{
*item->prefs = tmp_prefs;
- /* MIGRATION */
- item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
+ /*
+ * MIGRATION: next lines are migration code. the idea is that
+ * if used regularly, claws folder config ends up
+ * in the same file as sylpheed-main
+ */
+
+ item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
+
+ /* MIGRATION: 0.7.8main+ has persistent sort order. claws had the sort
+ * order in different members, which is ofcourse a little
+ * bit phoney. */
+ if (item->sort_key == SORT_BY_NONE) {
+ item->sort_key = (tmp_prefs.sort_by_number ? SORT_BY_NUMBER :
+ tmp_prefs.sort_by_size ? SORT_BY_SIZE :
+ tmp_prefs.sort_by_date ? SORT_BY_DATE :
+ tmp_prefs.sort_by_from ? SORT_BY_FROM :
+ tmp_prefs.sort_by_subject ? SORT_BY_SUBJECT :
+ tmp_prefs.sort_by_score ? SORT_BY_SCORE :
+ SORT_BY_NONE);
+ item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
+ }
}
void prefs_folder_item_save_config(FolderItem * item)
void prefs_folder_item_set_config(FolderItem * item,
int sort_type, gint sort_mode)
{
- tmp_prefs = * item->prefs;
-
- tmp_prefs.sort_by_number = FALSE;
- tmp_prefs.sort_by_size = FALSE;
- tmp_prefs.sort_by_date = FALSE;
- tmp_prefs.sort_by_from = FALSE;
- tmp_prefs.sort_by_subject = FALSE;
- tmp_prefs.sort_by_score = FALSE;
-
- switch (sort_mode) {
- case SORT_BY_NUMBER:
- tmp_prefs.sort_by_number = TRUE;
- break;
- case SORT_BY_SIZE:
- tmp_prefs.sort_by_size = TRUE;
- break;
- case SORT_BY_DATE:
- tmp_prefs.sort_by_date = TRUE;
- break;
- case SORT_BY_FROM:
- tmp_prefs.sort_by_from = TRUE;
- break;
- case SORT_BY_SUBJECT:
- tmp_prefs.sort_by_subject = TRUE;
- break;
- case SORT_BY_SCORE:
- tmp_prefs.sort_by_score = TRUE;
- break;
- }
- tmp_prefs.sort_descending = (sort_type == GTK_SORT_DESCENDING);
-
- * item->prefs = tmp_prefs;
+ g_assert(item);
+ g_warning("prefs_folder_item_set_config() should never be called\n");
+ item->sort_key = sort_type;
+ item->sort_type = sort_mode;
}
PrefsFolderItem * prefs_folder_item_new(void)
tmp_prefs.enable_default_account = FALSE;
tmp_prefs.default_account = 0;
tmp_prefs.save_copy_to_folder = FALSE;
+ tmp_prefs.color = 0;
tmp_prefs.scoring = NULL;
tmp_prefs.processing = NULL;
gint prefs_folder_item_get_sort_mode(FolderItem * item)
{
- tmp_prefs = * item->prefs;
-
- if (tmp_prefs.sort_by_number)
- return SORT_BY_NUMBER;
- if (tmp_prefs.sort_by_size)
- return SORT_BY_SIZE;
- if (tmp_prefs.sort_by_date)
- return SORT_BY_DATE;
- if (tmp_prefs.sort_by_from)
- return SORT_BY_FROM;
- if (tmp_prefs.sort_by_subject)
- return SORT_BY_SUBJECT;
- if (tmp_prefs.sort_by_score)
- return SORT_BY_SCORE;
- return SORT_BY_NONE;
+ g_assert(item != NULL);
+ g_warning("prefs_folder_item_get_sort_mode() should never be called\n");
+ return item->sort_key;
}
gint prefs_folder_item_get_sort_type(FolderItem * item)
{
- tmp_prefs = * item->prefs;
-
- if (tmp_prefs.sort_descending)
- return GTK_SORT_DESCENDING;
- else
- return GTK_SORT_ASCENDING;
+ g_assert(item != NULL);
+ g_warning("prefs_folder_item_get_sort_type() should never be called\n");
+ return item->sort_type;
}
#define SAFE_STRING(str) \
GtkWidget *optmenu_default_account;
GtkWidget *optmenu_default_account_menu;
GtkWidget *optmenu_default_account_menuitem;
+ GtkWidget *folder_color;
+ GtkWidget *folder_color_btn;
GList *cur_ac;
GList *account_list;
PrefsAccount *ac_prefs;
MANAGE_WINDOW_SIGNALS_CONNECT (window);
/* Table */
- table = gtk_table_new(4, 2, FALSE);
+ table = gtk_table_new(8, 2, FALSE);
gtk_widget_show(table);
gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
gtk_container_add(GTK_CONTAINER (window), table);
rowcount++;
+ /* Folder color */
+ folder_color = gtk_label_new(_("Folder color"));
+ gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5);
+ gtk_widget_show(folder_color);
+ gtk_table_attach_defaults(GTK_TABLE(table), folder_color, 0, 1,
+ rowcount, rowcount + 1);
+
+ folder_color_btn = gtk_button_new_with_label("");
+ gtk_widget_set_usize(folder_color_btn, 36, 26);
+ gtk_container_set_border_width(GTK_CONTAINER(folder_color_btn), 2);
+ gtk_widget_show(folder_color_btn);
+ gtk_table_attach(GTK_TABLE(table), folder_color_btn,
+ 1, 2, rowcount, rowcount + 1,
+ GTK_SHRINK, 0, 0, 0);
+
+ dialog->item->prefs->color = item->prefs->color;
+
+ gtk_signal_connect(GTK_OBJECT(folder_color_btn), "clicked",
+ GTK_SIGNAL_FUNC(folder_color_set_dialog),
+ dialog);
+
+ set_button_color(item->prefs->color, folder_color_btn);
+
+ rowcount++;
+
/* Ok and Cancle Buttons */
gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
&cancel_btn, _("Cancel"), NULL, NULL);
dialog->entry_folder_chmod = entry_folder_chmod;
dialog->checkbtn_enable_default_account = checkbtn_enable_default_account;
dialog->optmenu_default_account = optmenu_default_account;
+ dialog->folder_color = folder_color;
+ dialog->folder_color_btn = folder_color_btn;
g_free(infotext);
if (dialog->item == dialog->folderview->summaryview->folder_item &&
(prefs->enable_simplify_subject != old_simplify_val ||
0 != strcmp2(prefs->simplify_subject_regexp, old_simplify_str)))
- summary_show(dialog->folderview->summaryview, dialog->item, FALSE);
+ summary_show(dialog->folderview->summaryview, dialog->item);
if (old_simplify_str) g_free(old_simplify_str);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ prefs->color = dialog->item->prefs->color;
+ /* update folder view */
+ if (prefs->color > 0)
+ folderview_update_item(dialog->item, FALSE);
prefs_folder_item_save_config(dialog->item);
prefs_folder_item_destroy(dialog);
return newmode;
}
+
+static void set_button_color(guint rgbvalue, GtkWidget *button)
+{
+ GtkStyle *newstyle;
+ GdkColor gdk_color;
+
+ gtkut_convert_int_to_gdk_color(rgbvalue, &gdk_color);
+ newstyle = gtk_style_copy(gtk_widget_get_default_style());
+ newstyle->bg[GTK_STATE_NORMAL] = gdk_color;
+ newstyle->bg[GTK_STATE_PRELIGHT] = gdk_color;
+ newstyle->bg[GTK_STATE_ACTIVE] = gdk_color;
+ gtk_widget_set_style(GTK_WIDGET(button), newstyle);
+}
+
+static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
+{
+ struct PrefsFolderItemDialog *folder_dialog = data;
+ GtkColorSelectionDialog *dialog;
+ gdouble color[4] = {0.0, 0.0, 0.0, 0.0};
+ guint rgbcolor;
+
+ color_dialog = gtk_color_selection_dialog_new(_("Pick color for folder"));
+ gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
+ gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
+ manage_window_set_transient(GTK_WINDOW(color_dialog));
+
+ gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+ "clicked", GTK_SIGNAL_FUNC(folder_color_set_dialog_ok), data);
+ gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+ "clicked", GTK_SIGNAL_FUNC(folder_color_set_dialog_cancel), data);
+ gtk_signal_connect(GTK_OBJECT(color_dialog), "key_press_event",
+ GTK_SIGNAL_FUNC(folder_color_set_dialog_key_pressed),
+ data);
+
+ rgbcolor = folder_dialog->item->prefs->color;
+ color[0] = (gdouble) ((rgbcolor & 0xff0000) >> 16) / 255.0;
+ color[1] = (gdouble) ((rgbcolor & 0x00ff00) >> 8) / 255.0;
+ color[2] = (gdouble) (rgbcolor & 0x0000ff) / 255.0;
+
+ dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
+ gtk_color_selection_set_color(GTK_COLOR_SELECTION(dialog->colorsel), color);
+
+ gtk_widget_show(color_dialog);
+}
+
+static void folder_color_set_dialog_ok(GtkWidget *widget, gpointer data)
+{
+ struct PrefsFolderItemDialog *folder_dialog = data;
+ GtkColorSelection *colorsel = (GtkColorSelection *)
+ ((GtkColorSelectionDialog *) color_dialog)->colorsel;
+ gdouble color[4];
+ guint red, green, blue, rgbvalue;
+
+ gtk_color_selection_get_color(colorsel, color);
+
+ red = (guint) (color[0] * 255.0);
+ green = (guint) (color[1] * 255.0);
+ blue = (guint) (color[2] * 255.0);
+ rgbvalue = (guint) ((red * 0x10000) | (green * 0x100) | blue);
+
+ folder_dialog->item->prefs->color = rgbvalue;
+ set_button_color(rgbvalue, folder_dialog->folder_color_btn);
+
+ gtk_widget_destroy(color_dialog);
+}
+
+static void folder_color_set_dialog_cancel(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_destroy(color_dialog);
+}
+
+static void folder_color_set_dialog_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
+{
+ gtk_widget_destroy(color_dialog);
+}
+