[Goodies-commits] r7573 - in xfce4-notes-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-06-14 20:47:48 +0000 (Sun, 14 Jun 2009)
New Revision: 7573

Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/panel-plugin/defines.h
   xfce4-notes-plugin/trunk/panel-plugin/xfce4-notes-settings.c
Log:
Define new colors

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-06-14 20:16:58 UTC (rev 7572)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-06-14 20:47:48 UTC (rev 7573)
@@ -1,5 +1,11 @@
 2009-06-14  Mike Massonnet <mmassonnet at xfce.org>
 
+Define new colors
+	* panel-plugin/defines.h, panel-plugin/xfce4-notes-settings.c:
+	  - Replace and use some other colors.
+
+2009-06-14  Mike Massonnet <mmassonnet at xfce.org>
+
 Properly shutdown Xfconf
 	* panel-plugin/main.vala:
 	  - On NotesPlugin destruction, destroy application as to call its

Modified: xfce4-notes-plugin/trunk/panel-plugin/defines.h
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/defines.h	2009-06-14 20:16:58 UTC (rev 7572)
+++ xfce4-notes-plugin/trunk/panel-plugin/defines.h	2009-06-14 20:47:48 UTC (rev 7573)
@@ -45,11 +45,13 @@
 #define SIZE_FACTOR                     1.25
 
 /* Background color values */
-#define BACKGROUND_YELLOW               "#FFF4A4"
-#define BACKGROUND_RED                  "#E66C70"
-#define BACKGROUND_BLUE                 "#D3E8F6"
+#define BACKGROUND_YELLOW               "#F7EB96"
+#define BACKGROUND_BLUE                 "#88B7E3"
 #define BACKGROUND_GREEN                "#C1ECB0"
-#define BACKGROUND_PURPLE               "#C19FDB"
+#define BACKGROUND_INDIGO               "#BFA6E9"
+#define BACKGROUND_OLIVE                "#DAF188"
+#define BACKGROUND_CARMIN               "#FF96AC"
+#define BACKGROUND_MIMOSA               "#FCF66F"
 #define BACKGROUND_WHITE                "#F2F1EF"
 
 #endif

Modified: xfce4-notes-plugin/trunk/panel-plugin/xfce4-notes-settings.c
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/xfce4-notes-settings.c	2009-06-14 20:16:58 UTC (rev 7572)
+++ xfce4-notes-plugin/trunk/panel-plugin/xfce4-notes-settings.c	2009-06-14 20:47:48 UTC (rev 7573)
@@ -42,10 +42,12 @@
 enum
 {
   COMBOBOX_BACKGROUND_YELLOW,
-  COMBOBOX_BACKGROUND_RED,
   COMBOBOX_BACKGROUND_BLUE,
   COMBOBOX_BACKGROUND_GREEN,
-  COMBOBOX_BACKGROUND_PURPLE,
+  COMBOBOX_BACKGROUND_INDIGO,
+  COMBOBOX_BACKGROUND_OLIVE,
+  COMBOBOX_BACKGROUND_CARMIN,
+  COMBOBOX_BACKGROUND_MIMOSA,
   COMBOBOX_BACKGROUND_WHITE,
   COMBOBOX_BACKGROUND_CUSTOM,
 };
@@ -238,24 +240,30 @@
 
   combobox = gtk_combo_box_new_text ();
   gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Yellow"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Red"));
   gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Blue"));
   gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Green"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Purple"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Indigo"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Olive"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Carmin"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Mimosa"));
   gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("White"));
   gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Custom..."));
 
   color = xfconf_channel_get_string (xfconf_channel, "/global/background-color", GENERAL_BACKGROUND_COLOR);
   if (!g_ascii_strcasecmp (color, BACKGROUND_YELLOW))
     id = COMBOBOX_BACKGROUND_YELLOW;
-  else if (!g_ascii_strcasecmp (color, BACKGROUND_RED))
-    id = COMBOBOX_BACKGROUND_RED;
   else if (!g_ascii_strcasecmp (color, BACKGROUND_BLUE))
     id = COMBOBOX_BACKGROUND_BLUE;
   else if (!g_ascii_strcasecmp (color, BACKGROUND_GREEN))
     id = COMBOBOX_BACKGROUND_GREEN;
-  else if (!g_ascii_strcasecmp (color, BACKGROUND_PURPLE))
-    id = COMBOBOX_BACKGROUND_PURPLE;
+  else if (!g_ascii_strcasecmp (color, BACKGROUND_INDIGO))
+    id = COMBOBOX_BACKGROUND_INDIGO;
+  else if (!g_ascii_strcasecmp (color, BACKGROUND_OLIVE))
+    id = COMBOBOX_BACKGROUND_OLIVE;
+  else if (!g_ascii_strcasecmp (color, BACKGROUND_CARMIN))
+    id = COMBOBOX_BACKGROUND_CARMIN;
+  else if (!g_ascii_strcasecmp (color, BACKGROUND_MIMOSA))
+    id = COMBOBOX_BACKGROUND_MIMOSA;
   else if (!g_ascii_strcasecmp (color, BACKGROUND_WHITE))
     id = COMBOBOX_BACKGROUND_WHITE;
   else
@@ -287,14 +295,18 @@
 
   if (id == COMBOBOX_BACKGROUND_YELLOW)
     color = BACKGROUND_YELLOW;
-  else if (id == COMBOBOX_BACKGROUND_RED)
-    color = BACKGROUND_RED;
   else if (id == COMBOBOX_BACKGROUND_BLUE)
     color = BACKGROUND_BLUE;
   else if (id == COMBOBOX_BACKGROUND_GREEN)
     color = BACKGROUND_GREEN;
-  else if (id == COMBOBOX_BACKGROUND_PURPLE)
-    color = BACKGROUND_PURPLE;
+  else if (id == COMBOBOX_BACKGROUND_INDIGO)
+    color = BACKGROUND_INDIGO;
+  else if (id == COMBOBOX_BACKGROUND_OLIVE)
+    color = BACKGROUND_OLIVE;
+  else if (id == COMBOBOX_BACKGROUND_CARMIN)
+    color = BACKGROUND_CARMIN;
+  else if (id == COMBOBOX_BACKGROUND_MIMOSA)
+    color = BACKGROUND_MIMOSA;
   else if (id == COMBOBOX_BACKGROUND_WHITE)
     color = BACKGROUND_WHITE;
   else if (id == COMBOBOX_BACKGROUND_CUSTOM)