[gtk/matthiasc/for-master: 24/24] widget-factory: Put a video widget in



commit fa75035fa3f8bfe7fa5cc42c41ebdcabea95c836
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 26 11:39:26 2020 -0400

    widget-factory: Put a video widget in
    
    The designers wanted the frame column gone for a long
    time, since inset/outset/groove etc are not the coolest
    features anymore.
    
    Keep one frame, and put a GtkVideo in it.
    
    This opens up some real estate on page 1. Suggestions
    welcome for how to fill it.

 demos/widget-factory/gtk-logo.webm                | Bin 0 -> 288388 bytes
 demos/widget-factory/widget-factory.gresource.xml |   3 ++
 demos/widget-factory/widget-factory.ui            |  55 +++++-----------------
 3 files changed, 16 insertions(+), 42 deletions(-)
---
diff --git a/demos/widget-factory/gtk-logo.webm b/demos/widget-factory/gtk-logo.webm
new file mode 100644
index 0000000000..7baa0588d6
Binary files /dev/null and b/demos/widget-factory/gtk-logo.webm differ
diff --git a/demos/widget-factory/widget-factory.gresource.xml 
b/demos/widget-factory/widget-factory.gresource.xml
index 39d665da06..3a5c2e9c29 100644
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -35,4 +35,7 @@
     <file>icons/16x16/emotes/face-monkey-symbolic.symbolic.png</file>
     <file>icons/16x16/apps/preferences-desktop-locale-symbolic.symbolic.png</file>
   </gresource>
+  <gresource prefix="/org/gtk/WidgetFactory4">
+    <file>gtk-logo.webm</file>
+  </gresource>
 </gresources>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 3c20be450a..7ed8edf1d8 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1042,57 +1042,28 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkBox" id="box26">
                             <property name="orientation">vertical</property>
-                            <property name="homogeneous">1</property>
                             <property name="spacing">6</property>
                             <property name="hexpand">1</property>
                             <child>
                               <object class="GtkFrame" id="frame1">
-                                <style>
-                                  <class name="border-inset"/>
-                                </style>
+                                <property name="valign">start</property>
                                 <child type="label">
                                   <object class="GtkLabel" id="label1">
-                                    <property name="label" 
translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
-                                    <property name="use-markup">1</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkFrame" id="frame2">
-                                <style>
-                                  <class name="border-outset"/>
-                                </style>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label2">
-                                    <property name="label" 
translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
-                                    <property name="use-markup">1</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkFrame" id="frame3">
-                                <style>
-                                  <class name="border-groove"/>
-                                </style>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label17">
-                                    <property name="label" 
translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                    <property name="label" 
translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
                                     <property name="use-markup">1</property>
                                   </object>
                                 </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkFrame" id="frame4">
-                                <style>
-                                  <class name="border-ridge"/>
-                                </style>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label18">
-                                    <property name="label" 
translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
-                                    <property name="use-markup">1</property>
+                                <child>
+                                  <object class="GtkVideo">
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">6</property>
+                                    <property name="margin-end">6</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <property name="autoplay">0</property>
+                                    <property name="loop">1</property>
+                                    <property 
name="file">resource:///org/gtk/WidgetFactory4/gtk-logo.webm</property>
                                   </object>
                                 </child>
                               </object>


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