Add composition Matrix Two-by-two.

4 files changed, 118 insertions, 2 deletions

diff --git a/voctogui/lib/shortcuts.py b/voctogui/lib/shortcuts.py
index d5fbc91..5ad2bbf 100644
--- a/voctogui/lib/shortcuts.py
+++ b/voctogui/lib/shortcuts.py
@@ -25,7 +25,8 @@ if hasattr(Gtk, "ShortcutsWindow"):
             for accel, desc in [("F1", "Select fullscreen mode"),
                                 ("F2", "Select Picture in Picture mode"),
                                 ("F3", "Select  Side-by-Side Equal mode"),
-                                ("F4", "Select  Side-by-Side Preview mode")]:
+                                ("F4", "Select  Side-by-Side Preview mode"),
+                                ("F5", "Select  Matrix Two-by-two mode")]:
                 short = Gtk.ShortcutsShortcut(title=desc, accelerator=accel)
                 short.show()
                 compose_group.add(short)
diff --git a/voctogui/lib/toolbar/composition.py b/voctogui/lib/toolbar/composition.py
index b55254a..3cf5797 100644
--- a/voctogui/lib/toolbar/composition.py
+++ b/voctogui/lib/toolbar/composition.py
@@ -17,7 +17,8 @@ class CompositionToolbarController(object):
             'fullscreen',
             'picture_in_picture',
             'side_by_side_equal',
-            'side_by_side_preview'
+            'side_by_side_preview',
+            'matrix_two_by_two'
         ]
 
         self.composite_btns = {}
diff --git a/voctogui/ui/composite-matrix-two-by-two.svg b/voctogui/ui/composite-matrix-two-by-two.svg
new file mode 100644
index 0000000..2086be2
--- /dev/null
+++ b/voctogui/ui/composite-matrix-two-by-two.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3052"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="composite-matrix-two-by-two.svg">
+  <defs
+     id="defs3054" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.440484"
+     inkscape:cx="12.946897"
+     inkscape:cy="15.006196"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3943"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="1005"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3057">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <rect
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.10000000000000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3062"
+       width="30"
+       height="16.875"
+       x="1"
+       y="1027.9247" />
+    <g
+       id="g3943"
+       transform="matrix(0.9768158,0,0,0.9768158,0.70836066,24.02723)">
+      <rect
+         y="1027.8325"
+         x="0.37704754"
+         height="8.57582"
+         width="15.245902"
+         id="rect3062-3"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.25409836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="1027.8325"
+         x="15.686207"
+         height="8.57582"
+         width="15.245902"
+         id="rect3062-3-8"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.25409836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.25409836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect3690"
+         width="15.245902"
+         height="8.57582"
+         x="0.37704754"
+         y="1036.4083" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.25409836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect3692"
+         width="15.245902"
+         height="8.57582"
+         x="15.686207"
+         y="1036.4083" />
+    </g>
+  </g>
+</svg>
diff --git a/voctogui/ui/voctogui.ui b/voctogui/ui/voctogui.ui
index 0e0c447..53e3129 100644
--- a/voctogui/ui/voctogui.ui
+++ b/voctogui/ui/voctogui.ui
@@ -12,6 +12,11 @@
     <property name="can_focus">False</property>
     <property name="pixbuf">composite-fullscreen.svg</property>
   </object>
+  <object class="GtkImage" id="img-composite-matrix-two-by-two">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">composite-matrix-two-by-two.svg</property>
+  </object>
   <object class="GtkImage" id="img-composite-picture-in-picture">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -103,6 +108,20 @@
               </packing>
             </child>
             <child>
+              <object class="GtkRadioToolButton" id="composite-matrix-two-by-two">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Matrix Two-by-two</property>
+                <property name="use_underline">True</property>
+                <property name="icon_widget">img-composite-matrix-two-by-two</property>
+                <property name="group">composite-fullscreen</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkSeparatorToolItem" id="s1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>