/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001-2007 Hiroyuki Yamamoto & 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/>.
+ *
*/
/* (alfons) - based on a contribution by Satoshi Nagayasu; revised for colorful
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdrawingarea.h>
+#include <gdk/gdkkeysyms.h>
#include "colorlabel.h"
#include "utils.h"
N_("Sky blue"),
N_("Blue"),
N_("Green"),
- N_("Brown")
+ N_("Brown"),
+ N_("Grey"),
+ N_("Light brown"),
+ N_("Dark red"),
+ N_("Dark pink"),
+ N_("Steel blue"),
+ N_("Gold"),
+ N_("Bright green"),
+ N_("Magenta")
};
static GdkColor default_colors[COLORLABELS] = {
{ 0, 0xffff, (0x99 << 8), 0x0 },
- { 0, 0xffff, 0, 0 },
+ { 0, 0xffff, 0x0, 0x0 },
{ 0, 0xffff, (0x66 << 8), 0xffff },
{ 0, 0x0, (0xcc << 8), 0xffff },
{ 0, 0x0, 0x0, 0xffff },
{ 0, 0x0, (0x99 << 8), 0x0 },
- { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 }
+ { 0, (0x66 << 8), (0x33 << 8), (0x33 << 8) },
+ { 0, (0xaa << 8), (0xaa << 8), (0xaa << 8) },
+ { 0, (0xc0 << 8), (0x72 << 8), (0x54 << 8) },
+ { 0, (0xc0 << 8), 0x0, 0x0 },
+ { 0, (0xcc << 8), (0x10 << 8), (0x74 << 8) },
+ { 0, (0x50 << 8), (0x94 << 8), (0xcd << 8) },
+ { 0, 0xffff, (0xd5 << 8), 0x0 },
+ { 0, 0x0, (0xd8 << 8), 0x0 },
+ { 0, (0xc0 << 8), (0x60 << 8), (0xc0 << 8) }
};
+
typedef enum LabelColorChangeFlags_ {
LCCF_COLOR = 1 << 0,
GdkColor color;
/* XXX: note that the label member is supposed to be dynamically
- * allocated and fffreed */
+ * allocated and freed */
gchar *label;
GtkWidget *widget;
} label_colors[NUM_MENUS][COLORLABELS] = {
{
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL }},
{
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
+ { LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
{ LCCF_ALL, { 0 }, NULL, NULL },
for (c = 0; c < COLORLABELS; c++) {
INTCOLOR_TO_GDKCOLOR(prefs_common.custom_colorlabel[c].color,
label_colors[i][c].color);
- if (label_colors[i][c].label != NULL) {
- g_free(label_colors[i][c].label);
- }
+ g_free(label_colors[i][c].label);
label_colors[i][c].label =
g_strdup(prefs_common.custom_colorlabel[c].label);
}
return default_colors[color_index];
}
-gchar *colorlabel_get_color_text(gint color_index)
-{
- G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
-
- colorlabel_recreate_label(color_index);
- return label_colors[0][color_index].label;
-}
-
gchar *colorlabel_get_color_default_text(gint color_index)
{
G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
TRUE, 1, 1, widget->allocation.width - 2,
widget->allocation.height - 2);
- gdk_gc_unref(gc);
+ g_object_unref(gc);
return FALSE;
}
return widget;
}
-/* XXX: this function to check if menus with colors and labels should
- * be recreated */
-gboolean colorlabel_changed(void)
-{
- gint n;
-
- for (n = 0; n < LABEL_COLORS_ELEMS; n++) {
- if (label_colors[0][n].changed)
- return TRUE;
- }
-
- return FALSE;
-}
-
/* XXX: colorlabel_recreate_XXX are there to make sure everything
* is initialized ok, without having to call a global _xxx_init_
* function */
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
- accel = g_strdup_printf("Ctrl+%c", '1'+color_index);
- label = gtk_label_new(accel);
- gtk_widget_show(label);
- gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
- g_free(accel);
- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 4);
+ if (color_index < 9) {
+ accel = gtk_accelerator_get_label(GDK_1+color_index, GDK_CONTROL_MASK);
+ label = gtk_label_new(accel);
+ gtk_widget_show(label);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ g_free(accel);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 4);
+ g_object_set_data(G_OBJECT(item), "accel_label", label);
+ } else {
+ label = gtk_label_new("");
+ gtk_widget_show(label);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 4);
+ g_object_set_data(G_OBJECT(item), "accel_label", label);
+ }
return item;
}
projects / claws.git / blobdiff