GNOME.org
 

[hitori/15-docs: 2/2] help: Update header bar buttons mentioned in the help

commit fab7083d5702e88c495b35aaa294c4347af0ae1e
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Mar 11 14:27:12 2020 +0000

    help: Update header bar buttons mentioned in the help
    
    Since we moved to a header bar, the buttons in it use icons rather than
    text. Update the documentation to do so too.
    
    Unfortunately we have to ship the icons ourselves, rather than being
    able to load them from the system theme (see
    https://gitlab.gnome.org/GNOME/yelp/issues/154). The three icons come
    from adwaita-icon-theme.git
    (https://gitlab.gnome.org/GNOME/adwaita-icon-theme/, commit a7a71ea4f),
    and are licensed as LGPL-3.0 or CC-BY-SA-3.0-US.
    
    They have been edited to add a copyright comment.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>
    
    Fixes: #15

 help/C/customization.page                   | 2 +-
 help/C/figures/dialog-question-symbolic.svg | 2 ++
 help/C/figures/edit-redo-symbolic.svg       | 2 ++
 help/C/figures/edit-undo-symbolic.svg       | 2 ++
 help/C/game.page                            | 2 +-
 help/C/index.page                           | 2 +-
 help/C/playing.page                         | 9 +++++----
 help/C/strategy.page                        | 2 +-
 help/meson.build                            | 3 +++
 9 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/help/C/customization.page b/help/C/customization.page
index 51de5fc..d991595 100644
--- a/help/C/customization.page
+++ b/help/C/customization.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="customization">
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its"; type="topic" 
id="customization">
        <info>
                <link type="guide" xref="index#play"/>
                <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
diff --git a/help/C/figures/dialog-question-symbolic.svg b/help/C/figures/dialog-question-symbolic.svg
new file mode 100644
index 0000000..216bfef
--- /dev/null
+++ b/help/C/figures/dialog-question-symbolic.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"><path d="M8 .031c-.4 0-.815.16-1.125.469L.5 
6.875c-.62.62-.62 1.63 0 2.25L6.875 15.5c.62.62 1.63.62 2.25 0L15.5 9.125c.62-.62.62-1.63 
0-2.25L9.125.5A1.604 1.604 0 008 .031zm.152 2.975a3.001 3.001 0 011.97.873 3.006 3.006 0 01.65 3.27A2.998 
2.998 0 019 8.82V10H7V8a1 1 0 011-1c.407 0 .768-.24.924-.617a.994.994 0 00-.217-1.09.994.994 0 
00-1.09-.217A.994.994 0 007 6H5c0-1.21.733-2.308 1.852-2.771a2.98 2.98 0 011.3-.223zM8 11a1 1 0 011 1 1 1 0 
01-1 1 1 1 0 01-1-1 1 1 0 011-1z" style="marker:none" color="#bebebe" overflow="visible" 
fill="#2e3436"/></svg>
+<!-- Copied from adwaita-icon-theme, licensed under LGPL-3.0 or CC-BY-SA-3.0-US. See 
https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/master/COPYING. -->
diff --git a/help/C/figures/edit-redo-symbolic.svg b/help/C/figures/edit-redo-symbolic.svg
new file mode 100644
index 0000000..41d7485
--- /dev/null
+++ b/help/C/figures/edit-redo-symbolic.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"><path d="M5.5 6A3.515 3.515 0 002 9.5C2 
11.421 3.58 13 5.5 13H6v-2h-.5C4.66 11 4 10.34 4 9.5S4.66 8 5.5 8H12V6z" 
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none"
 color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#474747"/><path d="M9 3v1c0 
.257.13.528.313.719L11.593 7l-2.28 2.281C9.13 9.471 9 9.743 9 10v1h1c.31 0 .552-.09.75-.281L14.406 7 10.75 
3.281C10.552 3.091 10.31 3 10 3z" style="line-height:normal;-inkscape-font-specification:'Bitstream Vera 
Sans';text-indent:0;text-align:start;text-decoration-line:none;text-trans
 form:non
 e;marker:none" color="#bebebe" font-weight="400" font-family="Bitstream Vera Sans" overflow="visible" 
fill="#474747"/></svg>
+<!-- Copied from adwaita-icon-theme, licensed under LGPL-3.0 or CC-BY-SA-3.0-US. See 
https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/master/COPYING. -->
diff --git a/help/C/figures/edit-undo-symbolic.svg b/help/C/figures/edit-undo-symbolic.svg
new file mode 100644
index 0000000..c5da7dc
--- /dev/null
+++ b/help/C/figures/edit-undo-symbolic.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg"; width="16" height="16"><path d="M4 6v2h6.5c.84 0 1.5.66 1.5 1.5s-.66 
1.5-1.5 1.5H10v2h.5c1.921 0 3.5-1.579 3.5-3.5S12.421 6 10.5 6z" 
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none"
 color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#474747"/><path d="M7 
3.022v1c0 .257-.13.529-.313.719l-2.28 2.281 2.28 2.281c.183.19.313.462.313.72v1H6c-.31 
0-.552-.091-.75-.282L1.594 7.022 5.25 3.303c.198-.19.44-.28.75-.28z" 
style="line-height:normal;-inkscape-font-specification:'Bitstream Vera 
Sans';text-indent:0;text-align:start;text-decoration-line:none;text
 -transfo
 rm:none;marker:none" color="#bebebe" font-weight="400" font-family="Bitstream Vera Sans" overflow="visible" 
fill="#474747"/></svg>
+<!-- Copied from adwaita-icon-theme, licensed under LGPL-3.0 or CC-BY-SA-3.0-US. See 
https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/blob/master/COPYING. -->
diff --git a/help/C/game.page b/help/C/game.page
index 6f7587b..7a5bc14 100644
--- a/help/C/game.page
+++ b/help/C/game.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="game">
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its"; type="topic" 
id="game">
        <info>
                <link type="guide" xref="index#play"/>
                <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
diff --git a/help/C/index.page b/help/C/index.page
index 532b0ed..85e32c4 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="index">
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its"; type="guide" 
id="index">
        <info>
                <revision pkgversion="0.2.4" version="0.2" date="2010-07-14" status="final"/>
                <revision pkgversion="3.31.0" version="0.3" date="2019-02-20" status="final"/>
diff --git a/help/C/playing.page b/help/C/playing.page
index db2e1be..b0544a2 100644
--- a/help/C/playing.page
+++ b/help/C/playing.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="playing">
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its"; type="topic" 
id="playing">
        <info>
                <link type="guide" xref="index#play"/>
                <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
@@ -16,10 +16,11 @@
                <key>Ctrl</key> or <key>Shift</key> and clicking on a cell. They both highlight cells 
differently, and cells can be highlighted in
                both manners at the same time. Highlighted cells can be de-highlighted by clicking on them 
again while holding either <key>Ctrl</key>
                or <key>Shift</key> again.</p>
-       <p>To undo or redo a move, press <gui style="button">Undo</gui> or
-               <gui style="button">Redo</gui> in the header bar. You may undo or redo as many moves as you 
like without
+       <p>To undo or redo a move, press <gui style="button"><media its:translate="no" type="image" 
src="figures/edit-undo-symbolic.svg"><span its:translate="yes">Undo</span></media></gui> or
+               <gui style="button"><media its:translate="no" type="image" 
src="figures/edit-redo-symbolic.svg"><span its:translate="yes">Redo</span></media></gui>
+               in the header bar. You may undo or redo as many moves as you like without
                restriction.</p>
-       <p>To get a hint on which cells to paint out, press <gui style="button">Hint</gui> in the header bar. 
A cell
+       <p>To get a hint on which cells to paint out, press <gui style="button"><media its:translate="no" 
type="image" src="figures/dialog-question-symbolic.svg"><span its:translate="yes">Hint</span></media></gui> 
in the header bar. A cell
                will be hinted with a flashing red outline. This shows that the current status of the cell 
(painted or unpainted) is incorrect,
                and should be changed for the game to be won.</p>
 </page>
diff --git a/help/C/strategy.page b/help/C/strategy.page
index 6a5edd7..e6df035 100644
--- a/help/C/strategy.page
+++ b/help/C/strategy.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="strategy">
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its"; type="topic" 
id="strategy">
        <info>
                <link type="guide" xref="index#tips"/>
                <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
diff --git a/help/meson.build b/help/meson.build
index 883d739..d0bfa9f 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,4 +1,7 @@
 help_media = [
+  'figures/dialog-question-symbolic.svg',
+  'figures/edit-redo-symbolic.svg',
+  'figures/edit-undo-symbolic.svg',
   'figures/hitori_main_window.png',
 ]
 help_files = [
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]