Merge lp:~fullname1/ginn/luke-hd2-approved into lp:ginn

[Mohamed IKBEL Boulabiar]

add more configurations to wishes.xml file.

evince: Use Page Up, Page Down instead of Up Down; add Left, Right.
eog: Initial support: Rotate; zoom in, out; scroll up, down
fennec: Initial support: Zoom in, out
firefox: Initial support: Scroll up, down, left, right

All changes are successfully tested on the HTC HD2 touchscreen.

[Mohamed IKBEL Boulabiar (boulabiar)]

Some wishes contain small typing errors.

As your first patch, I'll accept them then I'll correct missing points.
The attributes, keys and buttons are described in files inside the ginn/etc/ directory.

Thanks for adding this !

review: Approve

=== modified file 'etc/wishes.xml'
--- etc/wishes.xml	2010-11-25 17:10:28 +0000
+++ etc/wishes.xml	2010-11-29 21:34:53 +0000
@@ -99,13 +99,13 @@
     <wish gesture="Drag" fingers="2">
       <action name="action5" when="update">
         <trigger prop="delta y" min="20" max="80"/>
-        <key>Up</key>
+        <key>Page Up</key>
       </action>
     </wish>
     <wish gesture="Drag" fingers="2">
       <action name="action6" when="update">
         <trigger prop="delta y" min="-80" max="-20"/>
-        <key>Down</key>
+        <key>Page Down</key>
       </action>
     </wish>
     <wish gesture="Pinch" fingers="2">
@@ -120,6 +120,18 @@
         <key>KP_Add</key>
       </action>
     </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action5" when="update">
+        <trigger prop="delta x" min="20" max="80"/>
+        <key>Left</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action6" when="update">
+        <trigger prop="delta x" min="-80" max="-20"/>
+        <key>Right</key>
+      </action>
+    </wish>
     </application>
     <application name="okular">
     <wish gesture="Pinch" fingers="2">
@@ -149,6 +161,82 @@
       </action>
     </wish>
     </application>
+    <application name="eog">
+    <wish gesture="Pinch" fingers="2">
+      <action name="action1" when="update">
+        <trigger prop="radius delta" min="-200" max="-40"/>
+        <key>KP_Subtract</key>
+      </action>
+    </wish>
+    <wish gesture="Pinch" fingers="2">
+      <action name="action1" when="update">
+        <trigger prop="radius delta" min="40" max="200"/>
+        <key>KP_Add</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action5" when="update">
+        <trigger prop="delta y" min="20" max="80"/>
+        <key>Page Up</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action6" when="update">
+        <trigger prop="delta y" min="-80" max="-20"/>
+        <key>Page Down</key>
+      </action>
+    </wish>
+    <wish gesture="Rotate" fingers="2">
+	<action name="rotatecw" when="update">
+	<key modifier1="Control_L">R</key>     
+        </action>
+    </wish>
+    <wish gesture="Rotate" fingers="2">
+	<action name="rotateccw" when="update">
+	<key modifier1="Control_L" modifier2="Shift_L">R</key>     
+        </action>
+    </wish>
+    </application>
+    <application name="fennec">
+    <wish gesture="Pinch" fingers="2">
+      <action name="action1" when="update">
+        <trigger prop="radius delta" min="-200" max="-40"/>
+        <key modifier1="Control_L">Down</key>
+      </action>
+    </wish>
+    <wish gesture="Pinch" fingers="2">
+      <action name="action1" when="update">
+        <trigger prop="radius delta" min="40" max="200"/>
+        <key modifier1="Control_L">Up</key>
+      </action>
+    </wish>
+    </application>
+    <application name="firefox">
+    <wish gesture="Drag" fingers="2">
+      <action name="action5" when="update">
+        <trigger prop="delta y" min="20" max="80"/>
+        <key>Page Up</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action6" when="update">
+        <trigger prop="delta y" min="-80" max="-20"/>
+        <key>Page Down</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action5" when="update">
+        <trigger prop="delta x" min="20" max="80"/>
+        <key>Left</key>
+      </action>
+    </wish>
+    <wish gesture="Drag" fingers="2">
+      <action name="action6" when="update">
+        <trigger prop="delta x" min="-80" max="-20"/>
+        <key>Right</key>
+      </action>
+    </wish>
+    </application>
   </applications>
 </ginn>