gpointing-device-settings r35 - in trunk: . data

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Feb 27 09:41:01 2009
New Revision: 35
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=35&view=rev

Log:
Use touchpad icon on tab label.

Added:
   trunk/data/touchpad.ui.in
      - copied, changed from r34, /trunk/data/touchpad.ui
Modified:
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/touchpad.ui
   trunk/libgpointing-device-settings.pc.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 27 09:41:01 2009
@@ -96,6 +96,8 @@
 AC_SUBST(gpds_datadir)
 gpds_uidir="\${datadir}/\$(PACKAGE)/ui"
 AC_SUBST(gpds_uidir)
+gpds_icondir="\${datadir}/\$(PACKAGE)/icon"
+AC_SUBST(gpds_icondir)
 gpds_help_datadir="\${datadir}"
 AC_SUBST(gpds_help_datadir)
 
@@ -122,6 +124,7 @@
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""
+GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_ICONDIR=\\\"\"\$(gpds_icondir)\"\\\""
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_HELP_DATADIR=\\\"\"\$(gpds_help_datadir)\"\\\""
 AC_SUBST(GPDS_CFLAGS)
 
@@ -134,6 +137,7 @@
 src/Makefile
 modules/Makefile
 data/Makefile
+data/touchpad.ui
 test/Makefile
 po/Makefile.in
 libgpointing-device-settings.pc

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Feb 27 09:41:01 2009
@@ -2,4 +2,10 @@
 	trackpoint.ui	\
 	touchpad.ui
 
-EXTRA_DIST = $(gpds_ui_DATA)
+gpds_icon_DATA = 	\
+	touchpad.png
+
+EXTRA_DIST = 		\
+	trackpoint.ui	\
+	touchpad.ui.in	\
+	$(gpds_icon_DATA)

Modified: trunk/data/touchpad.ui
==============================================================================
--- trunk/data/touchpad.ui	(original)
+++ trunk/data/touchpad.ui	Fri Feb 27 09:41:01 2009
@@ -65,9 +65,20 @@
     <property name="page_size">0</property>
     <property name="value">900</property>
   </object>
-  <object class="GtkLabel" id ="main-widget-label">
+  <object class="GtkHBox" id ="main-widget-label">
     <property name="visible">True</property>
-    <property name="label" translatable="yes">TouchPad</property>
+    <child>
+      <object class="GtkImage" id ="main-widget-label-icon">
+        <property name="visible">True</property>
+        <property name="file">/home/zoe/GPDS/share/gpointing-device-settings/icon/touchpad.png</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id ="main-widget-label-text">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">TouchPad</property>
+      </object>
+    </child>
   </object>
   <object class="GtkVBox" id="main-widget">
     <property name="visible">True</property>

Copied: trunk/data/touchpad.ui.in (from r34, /trunk/data/touchpad.ui)
==============================================================================
--- /trunk/data/touchpad.ui	(original)
+++ trunk/data/touchpad.ui.in	Fri Feb 27 09:41:01 2009
@@ -65,9 +65,20 @@
     <property name="page_size">0</property>
     <property name="value">900</property>
   </object>
-  <object class="GtkLabel" id ="main-widget-label">
+  <object class="GtkHBox" id ="main-widget-label">
     <property name="visible">True</property>
-    <property name="label" translatable="yes">TouchPad</property>
+    <child>
+      <object class="GtkImage" id ="main-widget-label-icon">
+        <property name="visible">True</property>
+        <property name="file">@prefix@/share/gpointing-device-settings/icon/touchpad.png</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id ="main-widget-label-text">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">TouchPad</property>
+      </object>
+    </child>
   </object>
   <object class="GtkVBox" id="main-widget">
     <property name="visible">True</property>

Modified: trunk/libgpointing-device-settings.pc.in
==============================================================================
--- trunk/libgpointing-device-settings.pc.in	(original)
+++ trunk/libgpointing-device-settings.pc.in	Fri Feb 27 09:41:01 2009
@@ -6,6 +6,7 @@
 datadir= datadir@
 moduledir= libdir@/gpointing-device-settings/module
 uidir= datadir@/gpointing-device-settings/ui
+icondir= datadir@/gpointing-device-settings/icon
 
 Name: LibGPointingDeviceSettings
 Description: Library to create dynamic module of UI for pointing device settings