cheese r649 - in trunk: . data data/icons/16x16 data/icons/16x16/actions src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Sun Apr 13 13:10:49 2008
New Revision: 649
URL: http://svn.gnome.org/viewvc/cheese?rev=649&view=rev

Log:
better effects icon, fixes bug #511369, courtesy of baptiste mille-mathias


Added:
   trunk/data/icons/16x16/actions/
   trunk/data/icons/16x16/actions/Makefile.am
   trunk/data/icons/16x16/actions/effects.png   (contents, props changed)
Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/cheese.glade
   trunk/data/cheese.ui
   trunk/data/icons/16x16/Makefile.am
   trunk/src/Makefile.am
   trunk/src/cheese.c

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Sun Apr 13 13:10:49 2008
@@ -1,6 +1,7 @@
 written by daniel g. siegel <dgsiegel gmail com> and Jaap Haitsma <jaap haitsma org>
 
 the following people contributed to cheese:
+  - Baptiste Mille-Mathias <bmm80 free fr>
   - Diego Escalante Urrelo <dieguito gmail com>
   - Gintautas Miliauskas <gintas akl lt>
   - Luca Ferretti <elle uca libero it>
@@ -16,4 +17,4 @@
                     and Josef VybÃral <josef vybiral gmail com>,
                     published under the GPL
   - effect icons by Lapo Calamandrei <calamandrei gmail com>
-                and Or Dvory <gnudles nana co il>
+                 and Or Dvory <gnudles nana co il>

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Apr 13 13:10:49 2008
@@ -117,6 +117,7 @@
 data/effects/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
+data/icons/16x16/actions/Makefile
 data/icons/22x22/Makefile
 data/icons/24x24/Makefile
 data/icons/32x32/Makefile

Modified: trunk/data/cheese.glade
==============================================================================
--- trunk/data/cheese.glade	(original)
+++ trunk/data/cheese.glade	Sun Apr 13 13:10:49 2008
@@ -155,6 +155,7 @@
                                           <widget class="GtkImage" id="image4">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="icon_size">2</property>
                                             <property name="icon_name">camera-photo</property>
                                           </widget>
                                         </child>
@@ -197,6 +198,7 @@
                                           <widget class="GtkImage" id="image5">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="icon_size">2</property>
                                             <property name="icon_name">camera-video</property>
                                           </widget>
                                         </child>
@@ -299,7 +301,8 @@
                                   <widget class="GtkImage" id="image2">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_name">applications-graphics</property>
+                                    <property name="icon_size">1</property>
+                                    <property name="icon_name">effects</property>
                                   </widget>
                                 </child>
                                 <child>

Modified: trunk/data/cheese.ui
==============================================================================
--- trunk/data/cheese.ui	(original)
+++ trunk/data/cheese.ui	Sun Apr 13 13:10:49 2008
@@ -135,6 +135,7 @@
                                           <object class="GtkImage" id="image4">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="icon_size">2</property>
                                             <property name="icon_name">camera-photo</property>
                                           </object>
                                         </child>
@@ -176,6 +177,7 @@
                                           <object class="GtkImage" id="image5">
                                             <property name="visible">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="icon_size">2</property>
                                             <property name="icon_name">camera-video</property>
                                           </object>
                                         </child>
@@ -276,7 +278,8 @@
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="icon_name">applications-graphics</property>
+                                    <property name="icon_size">1</property>
+                                    <property name="icon_name">effects</property>
                                   </object>
                                 </child>
                                 <child>

Modified: trunk/data/icons/16x16/Makefile.am
==============================================================================
--- trunk/data/icons/16x16/Makefile.am	(original)
+++ trunk/data/icons/16x16/Makefile.am	Sun Apr 13 13:10:49 2008
@@ -1,3 +1,5 @@
+SUBDIRS = actions
+
 themedir = $(datadir)/icons/hicolor
 size = 16x16
 context = apps

Added: trunk/data/icons/16x16/actions/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/16x16/actions/Makefile.am	Sun Apr 13 13:10:49 2008
@@ -0,0 +1,11 @@
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+        effects.png
+
+EXTRA_DIST = \
+        $(icons_DATA)

Added: trunk/data/icons/16x16/actions/effects.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Apr 13 13:10:49 2008
@@ -6,6 +6,7 @@
 	-DLIBDIR=\""$(libdir)"\" 			\
 	-DPACKAGE_DATADIR=\""$(datadir)/cheese"\"	\
 	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\"		\
 	$(CHEESE_CFLAGS)
 
 bin_PROGRAMS = cheese

Modified: trunk/src/cheese.c
==============================================================================
--- trunk/src/cheese.c	(original)
+++ trunk/src/cheese.c	Sun Apr 13 13:10:49 2008
@@ -98,6 +98,8 @@
   g_set_print_handler ((GPrintFunc) cheese_print_handler);
 
   gtk_window_set_default_icon_name ("cheese");
+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                     APPNAME_DATA_DIR G_DIR_SEPARATOR_S "icons");
 
   cheese_window_init ();