mousetweaks r115 - in trunk: . data pixmaps src

[gerdk svn gnome org]

Author: gerdk
Date: Thu Mar 20 00:03:28 2008
New Revision: 115
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=115&view=rev

Log:
2008-03-20 Gerd Kohlberger <gerdk svn gnome org>

	* src/Makefile.am: Remove unused PIXDIR.

	* src/dwell-click-applet.c:
	* data/ctw.glade:
	* pixmaps/Makefile.am:

	Rename pixmaps to remove ubuntuism.



Added:
   trunk/pixmaps/double-click.png
      - copied unchanged from r111, /trunk/pixmaps/human-double.png
   trunk/pixmaps/drag-click.png
      - copied unchanged from r111, /trunk/pixmaps/human-drag.png
   trunk/pixmaps/right-click.png
      - copied unchanged from r111, /trunk/pixmaps/human-right.png
   trunk/pixmaps/single-click.png
      - copied unchanged from r111, /trunk/pixmaps/human-single.png
Removed:
   trunk/pixmaps/human-double.png
   trunk/pixmaps/human-drag.png
   trunk/pixmaps/human-right.png
   trunk/pixmaps/human-single.png
Modified:
   trunk/ChangeLog
   trunk/data/ctw.glade
   trunk/pixmaps/Makefile.am
   trunk/src/Makefile.am
   trunk/src/dwell-click-applet.c

Modified: trunk/data/ctw.glade
==============================================================================
--- trunk/data/ctw.glade	(original)
+++ trunk/data/ctw.glade	Thu Mar 20 00:03:28 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Mon Feb  4 23:47:48 2008 -->
+<!--Generated with glade3 3.4.2 on Thu Mar 20 00:55:23 2008 -->
 <glade-interface>
   <widget class="GtkMenu" id="popup">
     <property name="visible">True</property>
@@ -67,7 +67,7 @@
                     <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="yalign">1</property>
-                    <property name="pixbuf">human-single.png</property>
+                    <property name="pixbuf">single-click.png</property>
                     <property name="icon_size">5</property>
                   </widget>
                 </child>
@@ -105,7 +105,7 @@
                     <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="yalign">1</property>
-                    <property name="pixbuf">human-double.png</property>
+                    <property name="pixbuf">double-click.png</property>
                     <property name="icon_size">5</property>
                   </widget>
                 </child>
@@ -146,7 +146,7 @@
                     <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="yalign">1</property>
-                    <property name="pixbuf">human-drag.png</property>
+                    <property name="pixbuf">drag-click.png</property>
                     <property name="icon_size">5</property>
                   </widget>
                 </child>
@@ -187,7 +187,7 @@
                     <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="yalign">1</property>
-                    <property name="pixbuf">human-right.png</property>
+                    <property name="pixbuf">right-click.png</property>
                     <property name="icon_size">5</property>
                   </widget>
                 </child>

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Thu Mar 20 00:03:28 2008
@@ -1,8 +1,8 @@
 pixdir = $(datadir)/mousetweaks
 pix_DATA =		 \
-	human-single.png \
-	human-double.png \
-	human-drag.png   \
-	human-right.png
+	single-click.png \
+	double-click.png \
+	drag-click.png   \
+	right-click.png
 
 EXTRA_DIST = $(pix_DATA)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Mar 20 00:03:28 2008
@@ -1,7 +1,6 @@
 INCLUDES =				     \
 	$(DEPENDENCIES_CFLAGS)		     \
 	-DDATADIR=\"$(datadir)/mousetweaks\" \
-	-DPIXMAPDIR=\"$(datadir)/pixmaps\"   \
 	-DLOCALEDIR=\"$(datadir)/locale\"
 
 if BUILD_PCA

Modified: trunk/src/dwell-click-applet.c
==============================================================================
--- trunk/src/dwell-click-applet.c	(original)
+++ trunk/src/dwell-click-applet.c	Thu Mar 20 00:03:28 2008
@@ -474,13 +474,13 @@
 		      G_CALLBACK(gconf_value_changed), dd);
 
     dd->click[DWELL_CLICK_TYPE_SINGLE] =
-	gdk_pixbuf_new_from_file (DATADIR "/human-single.png", NULL);
+	gdk_pixbuf_new_from_file (DATADIR "/single-click.png", NULL);
     dd->click[DWELL_CLICK_TYPE_DOUBLE] =
-	gdk_pixbuf_new_from_file (DATADIR "/human-double.png", NULL);
+	gdk_pixbuf_new_from_file (DATADIR "/double-click.png", NULL);
     dd->click[DWELL_CLICK_TYPE_DRAG] =
-	gdk_pixbuf_new_from_file (DATADIR "/human-drag.png", NULL);
+	gdk_pixbuf_new_from_file (DATADIR "/drag-click.png", NULL);
     dd->click[DWELL_CLICK_TYPE_RIGHT] =
-	gdk_pixbuf_new_from_file (DATADIR "/human-right.png", NULL);
+	gdk_pixbuf_new_from_file (DATADIR "/right-click.png", NULL);
 
     panel_applet_set_flags (applet,
 			    PANEL_APPLET_EXPAND_MINOR |