Use new action option types in rotate plugin.

1 files changed, 40 insertions, 85 deletions

diff --git a/metadata/rotate.xml.in b/metadata/rotate.xml.in
index 8ed4d755..f3e9fd70 100644
--- a/metadata/rotate.xml.in
+++ b/metadata/rotate.xml.in
@@ -11,45 +11,30 @@
 	    </relation>
 	</deps>
 	<display>
-	    <option name="initiate" type="action">
+	    <option name="initiate_button" type="button">
 		<_short>Initiate</_short>
 		<_long>Start Rotation</_long>
-		<allowed key="true" button="true"/>
-		<default>
-		    <button>&lt;Control&gt;&lt;Alt&gt;Button1</button>
-		</default>
+		<default>&lt;Control&gt;&lt;Alt&gt;Button1</default>
 	    </option>
-	    <option name="rotate_left" type="action">
+	    <option name="rotate_left_key" type="key">
 		<_short>Rotate Left</_short>
 		<_long>Rotate left</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <key>&lt;Control&gt;&lt;Alt&gt;Left</key>
-		</default>
+		<default>&lt;Control&gt;&lt;Alt&gt;Left</default>
 	    </option>
-	    <option name="rotate_right" type="action">
+	    <option name="rotate_right_key" type="key">
 		<_short>Rotate Right</_short>
 		<_long>Rotate right</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <key>&lt;Control&gt;&lt;Alt&gt;Right</key>
-		</default>
+		<default>&lt;Control&gt;&lt;Alt&gt;Right</default>
 	    </option>
-	    <option name="rotate_left_window" type="action">
+	    <option name="rotate_left_window_key" type="key">
 		<_short>Rotate Left with Window</_short>
 		<_long>Rotate left and brind active window along</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <key>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Left</key>
-		</default>
+		<default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Left</default>
 	    </option>
-	    <option name="rotate_right_window" type="action">
+	    <option name="rotate_right_window_key" type="key">
 		<_short>Rotate Right with Window</_short>
 		<_long>Rotate right and brind active window along</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <key>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Right</key>
-		</default>
+		<default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Right</default>
 	    </option>
 	    <option name="edge_flip_pointer" type="bool">
 		<_short>Edge Flip Pointer</_short>
@@ -73,149 +58,119 @@
 		<min>0</min>
 		<max>1000</max>
 	    </option>
-	    <option name="rotate_to_1" type="action">
+	    <option name="rotate_to_1_key" type="key">
 		<_short>Rotate To Face 1</_short>
 		<_long>Rotate to face 1</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_2" type="action">
+	    <option name="rotate_to_2_key" type="key">
 		<_short>Rotate To Face 2</_short>
 		<_long>Rotate to face 2</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_3" type="action">
+	    <option name="rotate_to_3_key" type="key">
 		<_short>Rotate To Face 3</_short>
 		<_long>Rotate to face 3</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_4" type="action">
+	    <option name="rotate_to_4_key" type="key">
 		<_short>Rotate To Face 4</_short>
 		<_long>Rotate to face 4</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_5" type="action">
+	    <option name="rotate_to_5_key" type="key">
 		<_short>Rotate To Face 5</_short>
 		<_long>Rotate to face 5</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_6" type="action">
+	    <option name="rotate_to_6_key" type="key">
 		<_short>Rotate To Face 6</_short>
 		<_long>Rotate to face 6</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_7" type="action">
+	    <option name="rotate_to_7_key" type="key">
 		<_short>Rotate To Face 7</_short>
 		<_long>Rotate to face 7</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_8" type="action">
+	    <option name="rotate_to_8_key" type="key">
 		<_short>Rotate To Face 8</_short>
 		<_long>Rotate to face 8</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_9" type="action">
+	    <option name="rotate_to_9_key" type="key">
 		<_short>Rotate To Face 9</_short>
 		<_long>Rotate to face 9</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_10" type="action">
+	    <option name="rotate_to_10_key" type="key">
 		<_short>Rotate To Face 10</_short>
 		<_long>Rotate to face 10</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_11" type="action">
+	    <option name="rotate_to_11_key" type="key">
 		<_short>Rotate To Face 11</_short>
 		<_long>Rotate to face 11</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_12" type="action">
+	    <option name="rotate_to_12_key" type="key">
 		<_short>Rotate To Face 12</_short>
 		<_long>Rotate to face 12</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_1_window" type="action">
+	    <option name="rotate_to_1_window_key" type="key">
 		<_short>Rotate To Face 1 with Window</_short>
 		<_long>Rotate to face 1 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_2_window" type="action">
+	    <option name="rotate_to_2_window_key" type="key">
 		<_short>Rotate To Face 2 with Window</_short>
 		<_long>Rotate to face 2 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_3_window" type="action">
+	    <option name="rotate_to_3_window_key" type="key">
 		<_short>Rotate To Face 3 with Window</_short>
 		<_long>Rotate to face 3 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_4_window" type="action">
+	    <option name="rotate_to_4_window_key" type="key">
 		<_short>Rotate To Face 4 with Window</_short>
 		<_long>Rotate to face 4 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_5_window" type="action">
+	    <option name="rotate_to_5_window_key" type="key">
 		<_short>Rotate To Face 5 with Window</_short>
 		<_long>Rotate to face 5 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_6_window" type="action">
+	    <option name="rotate_to_6_window_key" type="key">
 		<_short>Rotate To Face 6 with Window</_short>
 		<_long>Rotate to face 6 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_7_window" type="action">
+	    <option name="rotate_to_7_window_key" type="key">
 		<_short>Rotate To Face 7 with Window</_short>
 		<_long>Rotate to face 7 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_8_window" type="action">
+	    <option name="rotate_to_8_window_key" type="key">
 		<_short>Rotate To Face 8 with Window</_short>
 		<_long>Rotate to face 8 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_9_window" type="action">
+	    <option name="rotate_to_9_window_key" type="key">
 		<_short>Rotate To Face 9 with Window</_short>
 		<_long>Rotate to face 9 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_10_window" type="action">
+	    <option name="rotate_to_10_window_key" type="key">
 		<_short>Rotate To Face 10 with Window</_short>
 		<_long>Rotate to face 10 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_11_window" type="action">
+	    <option name="rotate_to_11_window_key" type="key">
 		<_short>Rotate To Face 11 with Window</_short>
 		<_long>Rotate to face 11 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to_12_window" type="action">
+	    <option name="rotate_to_12_window_key" type="key">
 		<_short>Rotate To Face 12 with Window</_short>
 		<_long>Rotate to face 12 and bring active window along</_long>
-		<allowed key="true" button="true"/>
 	    </option>
-	    <option name="rotate_to" type="action">
+	    <option name="rotate_to_key" type="key">
 		<_short>Rotate To</_short>
 		<_long>Rotate to viewport</_long>
 	    </option>
-	    <option name="rotate_window" type="action">
+	    <option name="rotate_window_key" type="key">
 		<_short>Rotate window</_short>
 		<_long>Rotate with window</_long>
 	    </option>
-	    <option name="rotate_flip_left" type="action">
+	    <option name="rotate_flip_left_edge" type="edge">
 		<_short>Rotate Flip Left</_short>
 		<_long>Flip to left viewport and warp pointer</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <edges left="true"/>
-		</default>
+		<default>Left</default>
 	    </option>
-	    <option name="rotate_flip_right" type="action">
+	    <option name="rotate_flip_right_edge" type="edge">
 		<_short>Rotate Flip Right</_short>
 		<_long>Flip to right viewport and warp pointer</_long>
-		<allowed key="true" button="true" edge="true" edgednd="true"/>
-		<default>
-		    <edges right="true"/>
-		</default>
+		<default>Right</default>
 	    </option>
 	    <option name="raise_on_rotate" type="bool">
 		<_short>Raise on rotate</_short>