commit 768250ffdb392e65ca586b65d3aa790a204f2db5
parent 0ee16468e9bfc1accabe0034251a9a5d7a53d481
Author: Oliver Lowe <o@olowe.co>
Date: Sun, 31 Aug 2025 11:55:26 +1000
Use one folder colour
If the folder names aren't clear and you need colour too then the
names suck
Diffstat:
6 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
@@ -77,8 +77,6 @@ static PrefParam param[] = {
NULL, NULL, NULL},
{"save_copy_to_folder", NULL, &tmp_prefs.save_copy_to_folder, P_BOOL,
NULL, NULL, NULL},
- {"folder_color", "#000000", &tmp_prefs.color, P_COLOR,
- NULL, NULL, NULL},
{"enable_processing", "FALSE", &tmp_prefs.enable_processing, P_BOOL,
NULL, NULL, NULL},
{"enable_processing_when_opening", "TRUE", &tmp_prefs.enable_processing_when_opening, P_BOOL,
@@ -181,10 +179,6 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
prefs->enable_processing = FALSE;
prefs->enable_processing_when_opening = FALSE;
prefs->processing = NULL;
- prefs->color.red = 0;
- prefs->color.green = 0;
- prefs->color.blue = 0;
- prefs->color.alpha = 1;
prefs->newmailcheck = TRUE;
prefs->offlinesync = FALSE;
@@ -261,7 +255,6 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
tmp_prefs.always_sign = src->prefs->always_sign;
tmp_prefs.always_encrypt = src->prefs->always_encrypt;
tmp_prefs.save_copy_to_folder = src->prefs->save_copy_to_folder;
- tmp_prefs.color = src->prefs->color;
*dest->prefs = tmp_prefs;
folder_item_prefs_save_config(dest);
diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
@@ -83,7 +83,6 @@ struct _FolderItemPrefs {
SignOrEncryptType always_sign;
SignOrEncryptType always_encrypt;
gboolean save_copy_to_folder;
- GdkRGBA color;
};
void folder_item_prefs_read_config(FolderItem * item);
diff --git a/src/folderview.c b/src/folderview.c
@@ -1670,14 +1670,10 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
else if (use_color)
gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
- else if (!gdk_rgba_equal(&item->prefs->color, &black))
- gtk_cmctree_node_set_foreground(ctree, node, &item->prefs->color);
} else if (use_color)
gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
else if (item->op_count > 0)
gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
- else if (!gdk_rgba_equal(&item->prefs->color, &black))
- gtk_cmctree_node_set_foreground(ctree, node, &item->prefs->color);
gtk_cmctree_node_set_row_style(ctree, node, style);
@@ -2641,17 +2637,6 @@ static gint folderview_clist_compare(GtkCMCList *clist,
return g_utf8_collate(item1->name, item2->name);
}
-void folderview_set_target_folder_color(GdkRGBA color_op)
-{
- GList *list;
- FolderView *folderview;
-
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- folderview->color_op = color_op;
- }
-}
-
static void drag_state_stop(FolderView *folderview)
{
if (folderview->drag_timer_id)
diff --git a/src/folderview.h b/src/folderview.h
@@ -134,8 +134,6 @@ void folderview_move_folder (FolderView *folderview,
FolderItem *to_folder,
gboolean copy);
-void folderview_set_target_folder_color (GdkRGBA color_op);
-
void folderview_register_popup (FolderViewPopup *fpopup);
void folderview_unregister_popup (FolderViewPopup *fpopup);
void folderview_update_search_icon (FolderItem *item,
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -74,7 +74,6 @@ struct _FolderItemGeneralPage
GtkWidget *entry_regexp_test_result;
GtkWidget *checkbtn_folder_chmod;
GtkWidget *entry_folder_chmod;
- GtkWidget *folder_color_btn;
GtkWidget *checkbtn_enable_processing;
GtkWidget *checkbtn_enable_processing_when_opening;
GtkWidget *checkbtn_newmailcheck;
@@ -90,7 +89,6 @@ struct _FolderItemGeneralPage
/* apply to sub folders */
GtkWidget *simplify_subject_rec_checkbtn;
GtkWidget *folder_chmod_rec_checkbtn;
- GtkWidget *folder_color_rec_checkbtn;
GtkWidget *enable_processing_rec_checkbtn;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
@@ -98,8 +96,6 @@ struct _FolderItemGeneralPage
GtkWidget *offlinesync_rec_checkbtn;
GtkWidget *render_html_rec_checkbtn;
GtkWidget *promote_html_part_rec_checkbtn;
-
- GdkRGBA folder_color;
};
struct _FolderItemComposePage
@@ -208,8 +204,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWidget *checkbtn_folder_chmod;
GtkWidget *entry_folder_chmod;
- GtkWidget *folder_color;
- GtkWidget *folder_color_btn;
GtkWidget *checkbtn_enable_processing;
GtkWidget *checkbtn_enable_processing_when_opening;
GtkWidget *checkbtn_newmailcheck;
@@ -227,7 +221,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
GtkWidget *simplify_subject_rec_checkbtn;
GtkWidget *folder_chmod_rec_checkbtn;
- GtkWidget *folder_color_rec_checkbtn;
GtkWidget *enable_processing_rec_checkbtn;
GtkWidget *enable_processing_when_opening_rec_checkbtn;
GtkWidget *newmailcheck_rec_checkbtn;
@@ -401,36 +394,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
gtk_grid_attach(GTK_GRID(table), box1, 0, rowcount, 1, 1);
folder_chmod_rec_checkbtn = gtk_check_button_new();
gtk_grid_attach(GTK_GRID(table), folder_chmod_rec_checkbtn, 2, rowcount, 1, 1);
-
- rowcount++;
-
- /* Folder color */
- box1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
- box2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
-
- folder_color = gtk_label_new(_("Folder color"));
- gtk_label_set_xalign(GTK_LABEL(folder_color), 0.0);
- gtk_box_pack_start(GTK_BOX(box2), folder_color, FALSE, FALSE, 0);
-
- hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start(GTK_BOX(box2), hbox, FALSE, FALSE, 0);
-
- folder_color_btn = gtk_color_button_new_with_rgba(
- &item->prefs->color);
- gtk_color_button_set_title(GTK_COLOR_BUTTON(folder_color_btn),
- _("Pick color for folder"));
-
- gtk_box_pack_start (GTK_BOX(hbox), folder_color_btn, FALSE, FALSE, 0);
- CLAWS_SET_TIP(folder_color_btn,
- _("Pick color for folder"));
-
- page->folder_color = item->prefs->color;
-
- gtk_grid_attach(GTK_GRID(table), box1, 0, rowcount, 1, 1);
- folder_color_rec_checkbtn = gtk_check_button_new();
- gtk_grid_attach(GTK_GRID(table), folder_color_rec_checkbtn, 2, rowcount, 1, 1);
-
rowcount++;
/* Enable processing at startup */
@@ -650,7 +613,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
page->checkbtn_folder_chmod = checkbtn_folder_chmod;
page->entry_folder_chmod = entry_folder_chmod;
- page->folder_color_btn = folder_color_btn;
page->checkbtn_enable_processing = checkbtn_enable_processing;
page->checkbtn_enable_processing_when_opening = checkbtn_enable_processing_when_opening;
page->checkbtn_newmailcheck = checkbtn_newmailcheck;
@@ -666,7 +628,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
page->simplify_subject_rec_checkbtn = simplify_subject_rec_checkbtn;
page->folder_chmod_rec_checkbtn = folder_chmod_rec_checkbtn;
- page->folder_color_rec_checkbtn = folder_color_rec_checkbtn;
page->enable_processing_rec_checkbtn = enable_processing_rec_checkbtn;
page->enable_processing_when_opening_rec_checkbtn = enable_processing_when_opening_rec_checkbtn;
page->newmailcheck_rec_checkbtn = newmailcheck_rec_checkbtn;
@@ -744,16 +705,6 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage
g_free(buf);
}
- if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn))) {
- GdkRGBA old_color = prefs->color;
- gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(page->folder_color_btn),
- &prefs->color);
-
- /* update folder view */
- if (!gdk_rgba_equal(&prefs->color, &old_color))
- folder_item_update(folder, F_ITEM_UPDATE_MSGCNT);
- }
-
if (all || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn))) {
prefs->enable_processing =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing));
@@ -808,7 +759,6 @@ static gboolean general_save_recurse_func(GNode *node, gpointer data)
!(
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->simplify_subject_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_chmod_rec_checkbtn)) ||
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->folder_color_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable_processing_when_opening_rec_checkbtn)) ||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->newmailcheck_rec_checkbtn)) ||
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -55,7 +55,6 @@ SourceWindow *source_window_create(void)
GtkWidget *window;
GtkWidget *scrolledwin;
GtkWidget *text;
- static PangoFontDescription *font_desc = NULL;
static GdkGeometry geometry;
