mousetweaks r368 - in trunk: . data



Author: gerdk
Date: Tue Jan  6 23:33:06 2009
New Revision: 368
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=368&view=rev

Log:
2009-01-07  Gerd Kohlberger  <gerdk svn gnome org>

	* data/pointer-capture-applet.ui:
	* data/mousetweaks.ui:
	
	Use standard icon name. Bug #545059



Modified:
   trunk/ChangeLog
   trunk/data/mousetweaks.ui
   trunk/data/pointer-capture-applet.ui

Modified: trunk/data/mousetweaks.ui
==============================================================================
--- trunk/data/mousetweaks.ui	(original)
+++ trunk/data/mousetweaks.ui	Tue Jan  6 23:33:06 2009
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkUIManager" id="uimanager"/>
   <object class="GtkMenu" id="popup">
     <property name="visible">True</property>
@@ -10,8 +11,8 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">4</property>
     <property name="title" translatable="yes">Dwell Click Type</property>
-    <property name="icon_name">gnome-dev-mouse-optical</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="icon_name">input-mouse</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkHBox" id="box">
         <property name="visible">True</property>
@@ -22,9 +23,10 @@
           <object class="GtkRadioButton" id="single">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="relief">GTK_RELIEF_NONE</property>
-            <property name="image_position">GTK_POS_TOP</property>
+            <property name="relief">none</property>
+            <property name="image_position">top</property>
             <property name="active">True</property>
             <property name="draw_indicator">False</property>
             <child>
@@ -38,7 +40,7 @@
                     <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">single-click.png</property>
-                    <property name="icon_size">5</property>
+                    <property name="icon-size">5</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -66,9 +68,10 @@
           <object class="GtkRadioButton" id="double">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="relief">GTK_RELIEF_NONE</property>
-            <property name="image_position">GTK_POS_TOP</property>
+            <property name="relief">none</property>
+            <property name="image_position">top</property>
             <property name="draw_indicator">False</property>
             <property name="group">single</property>
             <child>
@@ -82,7 +85,7 @@
                     <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">double-click.png</property>
-                    <property name="icon_size">5</property>
+                    <property name="icon-size">5</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -110,9 +113,10 @@
           <object class="GtkRadioButton" id="drag">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="relief">GTK_RELIEF_NONE</property>
-            <property name="image_position">GTK_POS_TOP</property>
+            <property name="relief">none</property>
+            <property name="image_position">top</property>
             <property name="draw_indicator">False</property>
             <property name="group">single</property>
             <child>
@@ -126,7 +130,7 @@
                     <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">drag-click.png</property>
-                    <property name="icon_size">5</property>
+                    <property name="icon-size">5</property>
                   </object>
                   <packing>
                     <property name="position">0</property>
@@ -154,9 +158,10 @@
           <object class="GtkRadioButton" id="right">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="relief">GTK_RELIEF_NONE</property>
-            <property name="image_position">GTK_POS_TOP</property>
+            <property name="relief">none</property>
+            <property name="image_position">top</property>
             <property name="draw_indicator">False</property>
             <property name="group">single</property>
             <child>
@@ -170,7 +175,7 @@
                     <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">right-click.png</property>
-                    <property name="icon_size">5</property>
+                    <property name="icon-size">5</property>
                   </object>
                   <packing>
                     <property name="position">0</property>

Modified: trunk/data/pointer-capture-applet.ui
==============================================================================
--- trunk/data/pointer-capture-applet.ui	(original)
+++ trunk/data/pointer-capture-applet.ui	Tue Jan  6 23:33:06 2009
@@ -1,38 +1,35 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Sun Jul  6 13:51:35 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">1</property>
     <property name="upper">3</property>
-    <property name="lower">0</property>
-    <property name="page_increment">1</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">3</property>
+    <property name="value">1</property>
     <property name="lower">1</property>
-    <property name="page_increment">1</property>
+    <property name="upper">3</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">1</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">200</property>
+    <property name="value">20</property>
     <property name="lower">20</property>
-    <property name="page_increment">1</property>
+    <property name="upper">200</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">20</property>
+    <property name="page_increment">1</property>
   </object>
   <object class="GtkAboutDialog" id="about">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title">Info zu</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="icon_name">gnome-dev-mouse-optical</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="icon_name">input-mouse</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
     <property name="copyright">Copyright 2007-2008 &#xA9; Gerd Kohlberger</property>
     <property name="comments" translatable="yes">Area to freeze the mouse pointer on the panel.
@@ -40,7 +37,7 @@
     <property name="authors">Gerd Kohlberger &lt;lowfi chello at&gt;</property>
     <property name="documenters">Francesco Fumanti &lt;francesco fumanti gmx net&gt;</property>
     <property name="translator_credits">GNOME Translation Team</property>
-    <property name="logo_icon_name">gnome-dev-mouse-optical</property>
+    <property name="logo_icon_name">input-mouse</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -53,11 +50,12 @@
           <object class="GtkHButtonBox" id="dialog-action_area2">
             <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="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -69,7 +67,7 @@
     <property name="title" translatable="yes">Pointer Capture Preferences</property>
     <property name="resizable">False</property>
     <property name="icon_name">gnome-dev-mouse-optical</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
@@ -85,7 +83,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="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
@@ -109,14 +107,15 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">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="tooltip-text" translatable="yes">Selecting Button 0 will capture the pointer immediately</property>
+                                <property name="tooltip_text" translatable="yes">Selecting Button 0 will capture the pointer immediately</property>
                                 <property name="max_length">1</property>
                                 <property name="adjustment">adjustment1</property>
                                 <property name="numeric">True</property>
-                                <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+                                <property name="update_policy">if-valid</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -141,23 +140,26 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="cap_ctrl">
+                                <property name="label" translatable="yes">C_trl</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">C_trl</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cap_alt">
+                                <property name="label" translatable="yes">_Alt</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">_Alt</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -168,10 +170,11 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="cap_shift">
+                                <property name="label" translatable="yes">S_hift</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">S_hift</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -230,6 +233,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -237,7 +241,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="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
@@ -264,10 +268,11 @@
                                 <property name="max_length">1</property>
                                 <property name="adjustment">adjustment2</property>
                                 <property name="numeric">True</property>
-                                <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+                                <property name="update_policy">if-valid</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -292,23 +297,26 @@
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkCheckButton" id="rel_ctrl">
+                                <property name="label" translatable="yes">Ct_rl</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Ct_rl</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="rel_alt">
+                                <property name="label" translatable="yes">A_lt</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">A_lt</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -319,10 +327,11 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="rel_shift">
+                                <property name="label" translatable="yes">Sh_ift</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Sh_ift</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -389,7 +398,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="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
@@ -412,6 +421,7 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -428,10 +438,11 @@
                                 <property name="adjustment">adjustment3</property>
                                 <property name="snap_to_ticks">True</property>
                                 <property name="numeric">True</property>
-                                <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+                                <property name="update_policy">if-valid</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -471,30 +482,34 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <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="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <property name="layout_style">edge</property>
             <child>
               <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">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="label">gtk-help</property>
                 <property name="use_stock">True</property>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="close">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">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="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]