GNOME.org
 

[gthumb] added the icons for the image tools

commit 08e7cb4b33485342e6b992ded02d63e1073f7dbe
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Feb 10 13:46:17 2010 +0100

    added the icons for the image tools

 data/icons/hicolor/16x16/actions/Makefile.am       |   13 ++++++++++++-
 data/icons/hicolor/16x16/actions/histogram.png     |  Bin 0 -> 349 bytes
 .../hicolor/16x16/actions/tool-adjust-colors.png   |  Bin 0 -> 739 bytes
 data/icons/hicolor/16x16/actions/tool-crop.png     |  Bin 0 -> 789 bytes
 .../hicolor/16x16/actions/tool-desaturate.png      |  Bin 0 -> 290 bytes
 data/icons/hicolor/16x16/actions/tool-enhance.png  |  Bin 0 -> 729 bytes
 data/icons/hicolor/16x16/actions/tool-flip.png     |  Bin 0 -> 446 bytes
 data/icons/hicolor/16x16/actions/tool-invert.png   |  Bin 0 -> 259 bytes
 data/icons/hicolor/16x16/actions/tool-mirror.png   |  Bin 0 -> 418 bytes
 data/icons/hicolor/16x16/actions/tool-red-eye.png  |  Bin 0 -> 424 bytes
 .../hicolor/16x16/actions/tool-rotate-270.png      |  Bin 0 -> 435 bytes
 .../icons/hicolor/16x16/actions/tool-rotate-90.png |  Bin 0 -> 465 bytes
 data/icons/hicolor/22x22/actions/Makefile.am       |    6 ++++++
 data/icons/hicolor/22x22/actions/histogram.png     |  Bin 0 -> 515 bytes
 .../hicolor/22x22/actions/tool-adjust-colors.png   |  Bin 0 -> 1179 bytes
 data/icons/hicolor/22x22/actions/tool-crop.png     |  Bin 0 -> 1132 bytes
 .../hicolor/22x22/actions/tool-desaturate.png      |  Bin 0 -> 449 bytes
 data/icons/hicolor/22x22/actions/tool-enhance.png  |  Bin 0 -> 852 bytes
 data/icons/hicolor/22x22/actions/tool-red-eye.png  |  Bin 0 -> 632 bytes
 .../file_tools/gth-file-tool-adjust-colors.c       |    2 +-
 extensions/file_tools/gth-file-tool-crop.c         |    2 +-
 extensions/file_tools/gth-file-tool-desaturate.c   |    2 +-
 extensions/file_tools/gth-file-tool-enhance.c      |    2 +-
 extensions/file_tools/gth-file-tool-equalize.c     |    2 +-
 extensions/file_tools/gth-file-tool-flip.c         |    2 +-
 extensions/file_tools/gth-file-tool-mirror.c       |    2 +-
 extensions/file_tools/gth-file-tool-negative.c     |    2 +-
 extensions/file_tools/gth-file-tool-redo.c         |    2 +-
 extensions/file_tools/gth-file-tool-rotate-left.c  |    2 +-
 extensions/file_tools/gth-file-tool-rotate-right.c |    2 +-
 extensions/file_tools/gth-file-tool-undo.c         |    2 +-
 extensions/red_eye_removal/gth-file-tool-red-eye.c |    2 +-
 gthumb/gth-file-tool.c                             |    2 +-
 gthumb/gth-toolbox.c                               |    2 +-
 34 files changed, 33 insertions(+), 16 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/actions/Makefile.am b/data/icons/hicolor/16x16/actions/Makefile.am
index 4d8dafe..8971c17 100644
--- a/data/icons/hicolor/16x16/actions/Makefile.am
+++ b/data/icons/hicolor/16x16/actions/Makefile.am
@@ -8,7 +8,18 @@ icons_DATA = 			\
 	browser-mode.png	\
 	file-catalog.png	\
 	file-library.png	\
-	file-search.png
+	file-search.png		\
+	histogram.png		\
+	tool-adjust-colors.png	\
+	tool-crop.png		\
+	tool-desaturate.png	\
+	tool-enhance.png	\
+	tool-flip.png		\
+	tool-invert.png		\
+	tool-mirror.png		\
+	tool-red-eye.png	\
+	tool-rotate-270.png	\
+	tool-rotate-90.png
 
 EXTRA_DIST = $(icons_DATA)	
 
diff --git a/data/icons/hicolor/16x16/actions/histogram.png b/data/icons/hicolor/16x16/actions/histogram.png
new file mode 100644
index 0000000..a9dfdb2
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/histogram.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-adjust-colors.png b/data/icons/hicolor/16x16/actions/tool-adjust-colors.png
new file mode 100644
index 0000000..07dc108
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-adjust-colors.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-crop.png b/data/icons/hicolor/16x16/actions/tool-crop.png
new file mode 100644
index 0000000..48bcd12
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-crop.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-desaturate.png b/data/icons/hicolor/16x16/actions/tool-desaturate.png
new file mode 100644
index 0000000..466df88
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-desaturate.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-enhance.png b/data/icons/hicolor/16x16/actions/tool-enhance.png
new file mode 100644
index 0000000..d463e60
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-enhance.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-flip.png b/data/icons/hicolor/16x16/actions/tool-flip.png
new file mode 100644
index 0000000..36a9389
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-flip.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-invert.png b/data/icons/hicolor/16x16/actions/tool-invert.png
new file mode 100644
index 0000000..032bdf5
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-invert.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-mirror.png b/data/icons/hicolor/16x16/actions/tool-mirror.png
new file mode 100644
index 0000000..b95181e
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-mirror.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-red-eye.png b/data/icons/hicolor/16x16/actions/tool-red-eye.png
new file mode 100644
index 0000000..1e63701
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-red-eye.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-rotate-270.png b/data/icons/hicolor/16x16/actions/tool-rotate-270.png
new file mode 100644
index 0000000..786e650
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-rotate-270.png differ
diff --git a/data/icons/hicolor/16x16/actions/tool-rotate-90.png b/data/icons/hicolor/16x16/actions/tool-rotate-90.png
new file mode 100644
index 0000000..951f457
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tool-rotate-90.png differ
diff --git a/data/icons/hicolor/22x22/actions/Makefile.am b/data/icons/hicolor/22x22/actions/Makefile.am
index 3e43547..4d04d66 100644
--- a/data/icons/hicolor/22x22/actions/Makefile.am
+++ b/data/icons/hicolor/22x22/actions/Makefile.am
@@ -9,7 +9,13 @@ icons_DATA = 			\
 	file-catalog.png	\
 	file-library.png	\
 	file-search.png		\
+	histogram.png		\
 	palette.png		\
+	tool-adjust-colors.png	\
+	tool-crop.png		\
+	tool-desaturate.png	\
+	tool-enhance.png	\
+	tool-red-eye.png	\
 	zoom-fit-width.png
 
 EXTRA_DIST = $(icons_DATA)	
diff --git a/data/icons/hicolor/22x22/actions/histogram.png b/data/icons/hicolor/22x22/actions/histogram.png
new file mode 100644
index 0000000..51d67a5
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/histogram.png differ
diff --git a/data/icons/hicolor/22x22/actions/tool-adjust-colors.png b/data/icons/hicolor/22x22/actions/tool-adjust-colors.png
new file mode 100644
index 0000000..72f18df
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/tool-adjust-colors.png differ
diff --git a/data/icons/hicolor/22x22/actions/tool-crop.png b/data/icons/hicolor/22x22/actions/tool-crop.png
new file mode 100644
index 0000000..4dedd93
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/tool-crop.png differ
diff --git a/data/icons/hicolor/22x22/actions/tool-desaturate.png b/data/icons/hicolor/22x22/actions/tool-desaturate.png
new file mode 100644
index 0000000..5112cc7
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/tool-desaturate.png differ
diff --git a/data/icons/hicolor/22x22/actions/tool-enhance.png b/data/icons/hicolor/22x22/actions/tool-enhance.png
new file mode 100644
index 0000000..58c1b41
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/tool-enhance.png differ
diff --git a/data/icons/hicolor/22x22/actions/tool-red-eye.png b/data/icons/hicolor/22x22/actions/tool-red-eye.png
new file mode 100644
index 0000000..6efc192
Binary files /dev/null and b/data/icons/hicolor/22x22/actions/tool-red-eye.png differ
diff --git a/extensions/file_tools/gth-file-tool-adjust-colors.c b/extensions/file_tools/gth-file-tool-adjust-colors.c
index 5660375..2eb040f 100644
--- a/extensions/file_tools/gth-file-tool-adjust-colors.c
+++ b/extensions/file_tools/gth-file-tool-adjust-colors.c
@@ -498,7 +498,7 @@ gth_file_tool_adjust_colors_instance_init (GthFileToolAdjustColors *self)
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_ADJUST_COLORS, GthFileToolAdjustColorsPrivate);
 	self->priv->histogram = gth_histogram_new ();
 
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT, _("Adjust Colors"), _("Adjust Colors"), FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-adjust-colors", _("Adjust Colors..."), _("Adjust Colors"), FALSE);
 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Change brightness, contrast, saturation and gamma level of the image"));
 }
 
diff --git a/extensions/file_tools/gth-file-tool-crop.c b/extensions/file_tools/gth-file-tool-crop.c
index 6cb6974..d6318b0 100644
--- a/extensions/file_tools/gth-file-tool-crop.c
+++ b/extensions/file_tools/gth-file-tool-crop.c
@@ -455,7 +455,7 @@ static void
 gth_file_tool_crop_instance_init (GthFileToolCrop *self)
 {
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_CROP, GthFileToolCropPrivate);
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT, _("Crop"), _("Crop"), TRUE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-crop", _("Crop..."), _("Crop"), TRUE);
 }
 
 
diff --git a/extensions/file_tools/gth-file-tool-desaturate.c b/extensions/file_tools/gth-file-tool-desaturate.c
index c6bf542..3e9973f 100644
--- a/extensions/file_tools/gth-file-tool-desaturate.c
+++ b/extensions/file_tools/gth-file-tool-desaturate.c
@@ -116,7 +116,7 @@ gth_file_tool_desaturate_activate (GthFileTool *base)
 static void
 gth_file_tool_desaturate_instance_init (GthFileToolDesaturate *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT, _("Desaturate"), _("Desaturate"), FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-desaturate", _("Desaturate"), _("Desaturate"), FALSE);
 }
 
 
diff --git a/extensions/file_tools/gth-file-tool-enhance.c b/extensions/file_tools/gth-file-tool-enhance.c
index 6c3cf59..9d9298d 100644
--- a/extensions/file_tools/gth-file-tool-enhance.c
+++ b/extensions/file_tools/gth-file-tool-enhance.c
@@ -278,7 +278,7 @@ gth_file_tool_enhance_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_enhance_instance_init (GthFileToolEnhance *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_ENHANCE */, _("Enhance Colors"), NULL, TRUE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-enhance", _("Enhance Colors"), NULL, TRUE);
 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));
 }
 
diff --git a/extensions/file_tools/gth-file-tool-equalize.c b/extensions/file_tools/gth-file-tool-equalize.c
index 5bced40..864cb6f 100644
--- a/extensions/file_tools/gth-file-tool-equalize.c
+++ b/extensions/file_tools/gth-file-tool-equalize.c
@@ -198,7 +198,7 @@ gth_file_tool_equalize_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_equalize_instance_init (GthFileToolEqualize *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_EQUALIZE */, _("Equalize"), NULL, FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "histogram", _("Equalize"), NULL, FALSE);
 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Equalize image histogram"));
 }
 
diff --git a/extensions/file_tools/gth-file-tool-flip.c b/extensions/file_tools/gth-file-tool-flip.c
index 19f5e18..2b04729 100644
--- a/extensions/file_tools/gth-file-tool-flip.c
+++ b/extensions/file_tools/gth-file-tool-flip.c
@@ -71,7 +71,7 @@ gth_file_tool_flip_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_flip_instance_init (GthFileToolFlip *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_FLIP */, _("Flip"), NULL, FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-flip" /* FIXME GTH_STOCK_FLIP */, _("Flip"), NULL, FALSE);
 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
 }
 
diff --git a/extensions/file_tools/gth-file-tool-mirror.c b/extensions/file_tools/gth-file-tool-mirror.c
index 633965c..262f23c 100644
--- a/extensions/file_tools/gth-file-tool-mirror.c
+++ b/extensions/file_tools/gth-file-tool-mirror.c
@@ -71,7 +71,7 @@ gth_file_tool_mirror_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_mirror_instance_init (GthFileToolMirror *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_MIRROR */, _("Mirror"), NULL, TRUE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-mirror", _("Mirror"), NULL, TRUE);
 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
 }
 
diff --git a/extensions/file_tools/gth-file-tool-negative.c b/extensions/file_tools/gth-file-tool-negative.c
index 8a3171a..e773fa1 100644
--- a/extensions/file_tools/gth-file-tool-negative.c
+++ b/extensions/file_tools/gth-file-tool-negative.c
@@ -98,7 +98,7 @@ gth_file_tool_negative_activate (GthFileTool *base)
 static void
 gth_file_tool_negative_instance_init (GthFileToolNegative *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT, _("Negative"), _("Negative"), FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-invert", _("Negative"), _("Negative"), FALSE);
 }
 
 
diff --git a/extensions/file_tools/gth-file-tool-redo.c b/extensions/file_tools/gth-file-tool-redo.c
index 6152e5a..e8f1f0f 100644
--- a/extensions/file_tools/gth-file-tool-redo.c
+++ b/extensions/file_tools/gth-file-tool-redo.c
@@ -60,7 +60,7 @@ gth_file_tool_redo_activate (GthFileTool *base)
 static void
 gth_file_tool_redo_instance_init (GthFileToolRedo *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_REDO, _("Redo"), _("Redo"), FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "redo", _("Redo"), _("Redo"), FALSE);
 }
 
 
diff --git a/extensions/file_tools/gth-file-tool-rotate-left.c b/extensions/file_tools/gth-file-tool-rotate-left.c
index 30146de..18ce4b1 100644
--- a/extensions/file_tools/gth-file-tool-rotate-left.c
+++ b/extensions/file_tools/gth-file-tool-rotate-left.c
@@ -71,7 +71,7 @@ gth_file_tool_rotate_left_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_rotate_left_instance_init (GthFileToolRotateLeft *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_ROTATE_LEFT */, _("Rotate Left"), NULL, FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-270", _("Rotate Left"), NULL, FALSE);
 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
 }
 
diff --git a/extensions/file_tools/gth-file-tool-rotate-right.c b/extensions/file_tools/gth-file-tool-rotate-right.c
index 45e6cd6..45e429f 100644
--- a/extensions/file_tools/gth-file-tool-rotate-right.c
+++ b/extensions/file_tools/gth-file-tool-rotate-right.c
@@ -71,7 +71,7 @@ gth_file_tool_rotate_right_update_sensitivity (GthFileTool *base)
 static void
 gth_file_tool_rotate_right_instance_init (GthFileToolRotateRight *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT /* FIXME GTH_STOCK_ROTATE_RIGHT */, _("Rotate Right"), NULL, FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-90", _("Rotate Right"), NULL, FALSE);
 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
 }
 
diff --git a/extensions/file_tools/gth-file-tool-undo.c b/extensions/file_tools/gth-file-tool-undo.c
index 9df1787..cd8f087 100644
--- a/extensions/file_tools/gth-file-tool-undo.c
+++ b/extensions/file_tools/gth-file-tool-undo.c
@@ -59,7 +59,7 @@ gth_file_tool_undo_activate (GthFileTool *base)
 static void
 gth_file_tool_undo_instance_init (GthFileToolUndo *self)
 {
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_UNDO, _("Undo"), _("Undo"), TRUE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "undo", _("Undo"), _("Undo"), TRUE);
 }
 
 
diff --git a/extensions/red_eye_removal/gth-file-tool-red-eye.c b/extensions/red_eye_removal/gth-file-tool-red-eye.c
index ef3cbea..4609746 100644
--- a/extensions/red_eye_removal/gth-file-tool-red-eye.c
+++ b/extensions/red_eye_removal/gth-file-tool-red-eye.c
@@ -436,7 +436,7 @@ gth_file_tool_red_eye_instance_init (GthFileToolRedEye *self)
 {
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_RED_EYE, GthFileToolRedEyePrivate);
 	self->priv->is_red = NULL;
-	gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_EDIT, _("Red Eye Removal"), _("Red Eye Removal"), FALSE);
+	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-red-eye", _("Red Eye Removal..."), _("Red Eye Removal"), FALSE);
 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Remove the red eye effect caused by camera flashes"));
 }
 
diff --git a/gthumb/gth-file-tool.c b/gthumb/gth-file-tool.c
index 45b42c5..d522fcc 100644
--- a/gthumb/gth-file-tool.c
+++ b/gthumb/gth-file-tool.c
@@ -176,7 +176,7 @@ gth_file_tool_construct (GthFileTool *self,
 
 	hbox = gtk_hbox_new (FALSE, 6);
 
-	icon = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
+	icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 	gtk_widget_show (icon);
 	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
diff --git a/gthumb/gth-toolbox.c b/gthumb/gth-toolbox.c
index 9714f8d..2629fb0 100644
--- a/gthumb/gth-toolbox.c
+++ b/gthumb/gth-toolbox.c
@@ -238,7 +238,7 @@ child_show_options_cb (GtkWidget *tool,
 
 	markup = g_markup_printf_escaped ("<span size='large' weight='bold'>%s</span>", gth_file_tool_get_options_title (GTH_FILE_TOOL (tool)));
 	gtk_label_set_markup (GTK_LABEL (toolbox->priv->options_title), markup);
-	gtk_image_set_from_stock (GTK_IMAGE (toolbox->priv->options_icon), gth_file_tool_get_icon_name (GTH_FILE_TOOL (tool)), GTK_ICON_SIZE_LARGE_TOOLBAR);
+	gtk_image_set_from_icon_name (GTK_IMAGE (toolbox->priv->options_icon), gth_file_tool_get_icon_name (GTH_FILE_TOOL (tool)), GTK_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (toolbox->priv->options), options);
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (toolbox), GTH_TOOLBOX_OPTIONS_PAGE);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]