[recipes] Update the cooking mode help overlay



commit 2530d6e6e6cb21341f0015e1628dea8d4d570767
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 23 16:57:23 2017 -0500

    Update the cooking mode help overlay
    
    Remove the mouse navigation, split out the arrow keys, use
    better images provided by Jakub, and generally follow the
    latest mockup.

 src/gr-cooking-page.ui                      |   85 +++++++--------------------
 src/help-cursor-keys.png                    |  Bin 0 -> 2080 bytes
 src/help-esc-key.png                        |  Bin 0 -> 1240 bytes
 src/help-key-double-press.png               |  Bin 0 -> 1059 bytes
 src/help-key-press.png                      |  Bin 0 -> 1014 bytes
 src/icons/48x48/apps/press-any-key.png      |  Bin 1064 -> 0 bytes
 src/icons/48x48/apps/press-escape-key.png   |  Bin 1317 -> 0 bytes
 src/icons/48x48/apps/press-left-button.png  |  Bin 1665 -> 0 bytes
 src/icons/48x48/apps/press-right-button.png |  Bin 1630 -> 0 bytes
 src/recipes-images.gresource.xml            |    8 +-
 10 files changed, 26 insertions(+), 67 deletions(-)
---
diff --git a/src/gr-cooking-page.ui b/src/gr-cooking-page.ui
index a645770..9d4fef9 100644
--- a/src/gr-cooking-page.ui
+++ b/src/gr-cooking-page.ui
@@ -167,7 +167,7 @@
               <object class="GtkGrid" id="cooking_overlay">
                 <property name="visible">1</property>
                 <property name="row-spacing">20</property>
-                <property name="column-spacing">6</property>
+                <property name="column-spacing">20</property>
                 <style>
                   <class name="cooking"/>
                   <class name="overlay"/>
@@ -175,7 +175,7 @@
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">1</property>
-                    <property name="label" translatable="yes">Cook Now</property>
+                    <property name="label" translatable="yes">Controls</property>
                     <style>
                       <class name="heading"/>
                     </style>
@@ -183,15 +183,14 @@
                   <packing>
                     <property name="left-attach">0</property>
                     <property name="top-attach">0</property>
-                    <property name="width">5</property>
+                    <property name="width">2</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkImage">
                     <property name="visible">1</property>
                     <property name="halign">start</property>
-                    <property name="icon-name">press-any-key</property>
-                    <property name="pixel-size">48</property>
+                    <property name="resource">/org/gnome/Recipes/help-key-press.png</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -199,26 +198,14 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkImage">
-                    <property name="visible">1</property>
-                    <property name="halign">start</property>
-                    <property name="icon-name">press-left-button</property>
-                    <property name="pixel-size">48</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkLabel">
                     <property name="visible">1</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">To advance to the next step, press any key on 
the
-keyboard or click the left mouse button.</property>
+keyboard.</property>
                   </object>
                   <packing>
-                    <property name="left-attach">4</property>
+                    <property name="left-attach">1</property>
                     <property name="top-attach">1</property>
                   </packing>
                 </child>
@@ -226,8 +213,7 @@ keyboard or click the left mouse button.</property>
                   <object class="GtkImage">
                     <property name="visible">1</property>
                     <property name="halign">start</property>
-                    <property name="icon-name">press-any-key</property>
-                    <property name="pixel-size">48</property>
+                    <property name="resource">/org/gnome/Recipes/help-key-double-press.png</property>
                   </object>
                   <packing>
                     <property name="left-attach">0</property>
@@ -235,11 +221,10 @@ keyboard or click the left mouse button.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkImage">
+                  <object class="GtkLabel">
                     <property name="visible">1</property>
-                    <property name="halign">start</property>
-                    <property name="icon-name">press-any-key</property>
-                    <property name="pixel-size">48</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">To go back to the previous step, doubletap any 
key.</property>
                   </object>
                   <packing>
                     <property name="left-attach">1</property>
@@ -250,47 +235,22 @@ keyboard or click the left mouse button.</property>
                   <object class="GtkImage">
                     <property name="visible">1</property>
                     <property name="halign">start</property>
-                    <property name="icon-name">press-left-button</property>
-                    <property name="pixel-size">48</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">1</property>
-                    <property name="halign">start</property>
-                    <property name="icon-name">press-left-button</property>
-                    <property name="pixel-size">48</property>
+                    <property name="resource">/org/gnome/Recipes/help-cursor-keys.png</property>
                   </object>
                   <packing>
-                    <property name="left-attach">3</property>
-                    <property name="top-attach">2</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">1</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">To go back to the previous step, doubletap any 
key
-or double click the left mouse button.</property>
-                  </object>
-                  <packing>
-                    <property name="left-attach">4</property>
-                    <property name="top-attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">1</property>
-                    <property name="halign">start</property>
-                    <property name="icon-name">press-escape-key</property>
-                    <property name="pixel-size">48</property>
+                    <property name="label" translatable="yes">Alternatively, you can use the cursor keys to
+quickly seek within the directions.</property>
                   </object>
                   <packing>
-                    <property name="left-attach">0</property>
+                    <property name="left-attach">1</property>
                     <property name="top-attach">3</property>
                   </packing>
                 </child>
@@ -298,24 +258,23 @@ or double click the left mouse button.</property>
                   <object class="GtkImage">
                     <property name="visible">1</property>
                     <property name="halign">start</property>
-                    <property name="icon-name">press-right-button</property>
+                    <property name="resource">/org/gnome/Recipes/help-esc-key.png</property>
                     <property name="pixel-size">48</property>
                   </object>
                   <packing>
-                    <property name="left-attach">2</property>
-                    <property name="top-attach">3</property>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">1</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">To exit the process, press the Escape key or 
click
-the right mouse button.</property>
+                    <property name="label" translatable="yes">To exit the process, press the Escape 
key.</property>
                   </object>
                   <packing>
-                    <property name="left-attach">4</property>
-                    <property name="top-attach">3</property>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">4</property>
                   </packing>
                 </child>
               </object>
diff --git a/src/help-cursor-keys.png b/src/help-cursor-keys.png
new file mode 100644
index 0000000..2d4441c
Binary files /dev/null and b/src/help-cursor-keys.png differ
diff --git a/src/help-esc-key.png b/src/help-esc-key.png
new file mode 100644
index 0000000..e845b2b
Binary files /dev/null and b/src/help-esc-key.png differ
diff --git a/src/help-key-double-press.png b/src/help-key-double-press.png
new file mode 100644
index 0000000..0840206
Binary files /dev/null and b/src/help-key-double-press.png differ
diff --git a/src/help-key-press.png b/src/help-key-press.png
new file mode 100644
index 0000000..3db7a32
Binary files /dev/null and b/src/help-key-press.png differ
diff --git a/src/recipes-images.gresource.xml b/src/recipes-images.gresource.xml
index e3cf2d6..8f8f3af 100644
--- a/src/recipes-images.gresource.xml
+++ b/src/recipes-images.gresource.xml
@@ -35,9 +35,9 @@
     <file>icons/48x48/apps/shopping-list-symbolic.symbolic.png</file>
     <file>icons/symbolic/apps/shopping-list-symbolic.svg</file>
     <file>built-with-builder-symbolic.symbolic.png</file>
-    <file>icons/48x48/apps/press-any-key.png</file>
-    <file>icons/48x48/apps/press-escape-key.png</file>
-    <file>icons/48x48/apps/press-left-button.png</file>
-    <file>icons/48x48/apps/press-right-button.png</file>
+    <file>help-cursor-keys.png</file>
+    <file>help-esc-key.png</file>
+    <file>help-key-double-press.png</file>
+    <file>help-key-press.png</file>
   </gresource>
 </gresources>


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