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

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Feb 27 11:49:28 2009
New Revision: 44
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=44&view=rev

Log:
added trackpoint image.

Added:
   trunk/data/trackpoint.png
   trunk/data/trackpoint.ui.in
      - copied, changed from r43, /trunk/data/trackpoint.ui
Modified:
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/touchpad.ui.in
   trunk/data/trackpoint.ui

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 27 11:49:28 2009
@@ -139,6 +139,7 @@
 src/Makefile
 modules/Makefile
 data/Makefile
+data/trackpoint.ui
 data/touchpad.ui
 test/Makefile
 po/Makefile.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Feb 27 11:49:28 2009
@@ -3,9 +3,10 @@
 	touchpad.ui
 
 gpds_icon_DATA = 	\
+	trackpoint.png	\
 	touchpad.png
 
-EXTRA_DIST = 		\
-	trackpoint.ui	\
-	touchpad.ui.in	\
+EXTRA_DIST = 			\
+	trackpoint.ui.in	\
+	touchpad.ui.in		\
 	$(gpds_icon_DATA)

Modified: trunk/data/touchpad.ui.in
==============================================================================
--- trunk/data/touchpad.ui.in	(original)
+++ trunk/data/touchpad.ui.in	Fri Feb 27 11:49:28 2009
@@ -76,7 +76,7 @@
     <child>
       <object class="GtkLabel" id ="main-widget-label-text">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">TouchPad</property>
+        <property name="label" translatable="yes">Touchpad</property>
       </object>
     </child>
   </object>

Added: trunk/data/trackpoint.png
==============================================================================
Binary files (empty file) and trunk/data/trackpoint.png	Fri Feb 27 11:49:28 2009 differ

Modified: trunk/data/trackpoint.ui
==============================================================================
--- trunk/data/trackpoint.ui	(original)
+++ trunk/data/trackpoint.ui	Fri Feb 27 11:49:28 2009
@@ -1,8 +1,19 @@
 <?xml version="1.0" standalone="no"?>
 <interface>
-  <object class="GtkLabel" id ="main-widget-label">
+  <object class="GtkHBox" id ="main-widget-label">
     <property name="visible">True</property>
-    <property name="label" translatable="yes">TrackPoint</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/trackpoint.png</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id ="main-widget-label-text">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">TrackPoint</property>
+      </object>
+    </child>
   </object>
   <object class="GtkVBox" id="main-widget">
     <property name="visible">True</property>

Copied: trunk/data/trackpoint.ui.in (from r43, /trunk/data/trackpoint.ui)
==============================================================================
--- /trunk/data/trackpoint.ui	(original)
+++ trunk/data/trackpoint.ui.in	Fri Feb 27 11:49:28 2009
@@ -2,7 +2,18 @@
 <interface>
   <object class="GtkLabel" id ="main-widget-label">
     <property name="visible">True</property>
-    <property name="label" translatable="yes">TrackPoint</property>
+    <child>
+      <object class="GtkImage" id ="main-widget-label-icon">
+        <property name="visible">True</property>
+        <property name="file">@prefix@/share/gpointing-device-settings/icon/trackpoint.png</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id ="main-widget-label-text">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">TrackPoint</property>
+      </object>
+    </child>
   </object>
   <object class="GtkVBox" id="main-widget">
     <property name="visible">True</property>