GNOME.org
 

gimp r26913 - in trunk: . app/actions

Author: mitch
Date: Wed Sep 10 10:01:54 2008
New Revision: 26913
URL: http://svn.gnome.org/viewvc/gimp?rev=26913&view=rev

Log:
2008-09-10  Michael Natterer  <mitch gimp org>

	* app/actions/context-actions.c: made action labels more
	consistent, use 'Â' instead of 'degrees'.

	* app/actions/context-commands.c: cosmetic change in macro
	parameters.



Modified:
   trunk/ChangeLog
   trunk/app/actions/context-actions.c
   trunk/app/actions/context-commands.c

Modified: trunk/app/actions/context-actions.c
==============================================================================
--- trunk/app/actions/context-actions.c	(original)
+++ trunk/app/actions/context-actions.c	Wed Sep 10 10:01:54 2008
@@ -77,31 +77,31 @@
 static GimpEnumActionEntry context_palette_foreground_actions[] =
 {
   { "context-palette-foreground-set", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Set", NULL, NULL,
+    "Foreground Palette Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-palette-foreground-first", GIMP_STOCK_PALETTE,
-    "Foreground Palette color First", NULL, NULL,
+    "Foreground Palette Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-palette-foreground-last", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Last", NULL, NULL,
+    "Foreground Palette Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-palette-foreground-previous", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Previous", NULL, NULL,
+    "Foreground Palette Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-palette-foreground-next", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Next", NULL, NULL,
+    "Foreground Palette Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-palette-foreground-previous-skip", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Skip Back", NULL, NULL,
+    "Foreground Palette Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-palette-foreground-next-skip", GIMP_STOCK_PALETTE,
-    "Foreground Palette color Skip Forward", NULL, NULL,
+    "Foreground Palette Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -109,31 +109,31 @@
 static GimpEnumActionEntry context_palette_background_actions[] =
 {
   { "context-palette-background-set", GIMP_STOCK_PALETTE,
-    "Background Palette color Set", NULL, NULL,
+    "Background Palette Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-palette-background-first", GIMP_STOCK_PALETTE,
-    "Background Palette color First", NULL, NULL,
+    "Background Palette Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-palette-background-last", GIMP_STOCK_PALETTE,
-    "Background Palette color Last", NULL, NULL,
+    "Background Palette Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-palette-background-previous", GIMP_STOCK_PALETTE,
-    "Background Palette color Previous", NULL, NULL,
+    "Background Palette Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-palette-background-next", GIMP_STOCK_PALETTE,
-    "Background Palette color Next", NULL, NULL,
+    "Background Palette Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-palette-background-previous-skip", GIMP_STOCK_PALETTE,
-    "Background Palette color Skip Back", NULL, NULL,
+    "Background Palette Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-palette-background-next-skip", GIMP_STOCK_PALETTE,
-    "Background Palette color Skip ahead", NULL, NULL,
+    "Background Palette Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -141,31 +141,31 @@
 static GimpEnumActionEntry context_colormap_foreground_actions[] =
 {
   { "context-colormap-foreground-set", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Set", NULL, NULL,
+    "Foreground Colormap Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-colormap-foreground-first", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color First", NULL, NULL,
+    "Foreground Colormap Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-colormap-foreground-last", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Last", NULL, NULL,
+    "Foreground Colormap Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-colormap-foreground-previous", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Previous", NULL, NULL,
+    "Foreground Colormap Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-foreground-next", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Next", NULL, NULL,
+    "Foreground Colormap Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-colormap-foreground-previous-skip", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Skip Back", NULL, NULL,
+    "Foreground Colormap Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-foreground-next-skip", GIMP_STOCK_COLORMAP,
-    "Foreground Colormap color Skip Forward", NULL, NULL,
+    "Foreground Colormap Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -173,31 +173,31 @@
 static GimpEnumActionEntry context_colormap_background_actions[] =
 {
   { "context-colormap-background-set", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Set", NULL, NULL,
+    "Background Colormap Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-colormap-background-first", GIMP_STOCK_COLORMAP,
-    "Background Colormap color First", NULL, NULL,
+    "Background Colormap Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-colormap-background-last", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Last", NULL, NULL,
+    "Background Colormap Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-colormap-background-previous", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Previous", NULL, NULL,
+    "Background Colormap Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-background-next", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Next", NULL, NULL,
+    "Background Colormap Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-colormap-background-previous-skip", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Skip Back", NULL, NULL,
+    "Background Colormap Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-background-next-skip", GIMP_STOCK_COLORMAP,
-    "Background Colormap color Skip ahead", NULL, NULL,
+    "Background Colormap Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -205,31 +205,31 @@
 static GimpEnumActionEntry context_swatch_foreground_actions[] =
 {
   { "context-swatch-foreground-set", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Set", NULL, NULL,
+    "Foreground Swatch Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-swatch-foreground-first", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color First", NULL, NULL,
+    "Foreground Swatch Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-swatch-foreground-last", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Last", NULL, NULL,
+    "Foreground Swatch Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-swatch-foreground-previous", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Previous", "9", NULL,
+    "Foreground Swatch Color Previous", "9", NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-foreground-next", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Next", "0", NULL,
+    "Foreground Swatch Color Next", "0", NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-swatch-foreground-previous-skip", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Skip Back", NULL, NULL,
+    "Foreground Swatch Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-foreground-next-skip", GIMP_STOCK_PALETTE,
-    "Foreground Swatch color Skip Forward", NULL, NULL,
+    "Foreground Swatch Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -237,31 +237,31 @@
 static GimpEnumActionEntry context_swatch_background_actions[] =
 {
   { "context-swatch-background-set", GIMP_STOCK_PALETTE,
-    "Background Swatch color Set", NULL, NULL,
+    "Background Swatch Color Set", NULL, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-swatch-background-first", GIMP_STOCK_PALETTE,
-    "Background Swatch color First", NULL, NULL,
+    "Background Swatch Color First", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-swatch-background-last", GIMP_STOCK_PALETTE,
-    "Background Swatch color Last", NULL, NULL,
+    "Background Swatch Color Last", NULL, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-swatch-background-previous", GIMP_STOCK_PALETTE,
-    "Background Swatch color Previous", NULL, NULL,
+    "Background Swatch Color Previous", NULL, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-background-next", GIMP_STOCK_PALETTE,
-    "Background Swatch color Next", NULL, NULL,
+    "Background Swatch Color Next", NULL, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-swatch-background-previous-skip", GIMP_STOCK_PALETTE,
-    "Background Swatch color Skip Back", NULL, NULL,
+    "Background Swatch Color Skip Back", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-background-next-skip", GIMP_STOCK_PALETTE,
-    "Background Swatch color Skip ahead", NULL, NULL,
+    "Background Swatch Color Skip Forward", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -1061,11 +1061,11 @@
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-angle-decrease-skip", GIMP_STOCK_BRUSH,
-    "Rotate Right 15 degrees", NULL, NULL,
+    "Rotate Right 15Â", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-angle-increase-skip", GIMP_STOCK_BRUSH,
-    "Rotate Left 15 degrees", NULL, NULL,
+    "Rotate Left 15Â", NULL, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };

Modified: trunk/app/actions/context-commands.c
==============================================================================
--- trunk/app/actions/context-commands.c	(original)
+++ trunk/app/actions/context-commands.c	Wed Sep 10 10:01:54 2008
@@ -118,7 +118,7 @@
   gimp_context_swap_colors (context);
 }
 
-#define SELECT_COLOR_CMD_CALLBACK(name, fgbg, usec, usep) \
+#define SELECT_COLOR_CMD_CALLBACK(name, fgbg, use_colormap, use_palette) \
 void \
 context_##name##_##fgbg##ground_cmd_callback (GtkAction *action, \
                                               gint       value, \
@@ -129,7 +129,8 @@
   return_if_no_context (context, data); \
 \
   gimp_context_get_##fgbg##ground (context, &color); \
-  context_select_color ((GimpActionSelectType) value, &color, usec, usep); \
+  context_select_color ((GimpActionSelectType) value, &color, \
+                        use_colormap, use_palette); \
   gimp_context_set_##fgbg##ground (context, &color); \
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]