[gnome-taquin: 4/5] Merge branch: Move "Start Over" button to header bar



commit 8eaf039ee4ed06e77849b0d036097c8d2a10b542
Merge: 94fef78 8580272
Author: Arnaud B <arnaud bonatti gmail com>
Date:   Fri Jan 11 14:49:16 2019 +0000

    Merge branch: Move "Start Over" button to header bar
    
    Trying to make Taquin run on a small screen requires
    to move the button in the headerbar, for a starting.
    
    # Conflicts:
    #   data/taquin.ui
    #   src/game-window.vala

 NEWS                                 |  28 ++
 configure.ac                         |   3 +-
 data/Makefile.am                     |   1 -
 data/org.gnome.taquin.appdata.xml.in |   2 +-
 data/taquin-menus.ui                 |  28 --
 data/taquin.ui                       |  43 ++-
 gnome-taquin.doap                    |   9 +-
 help/C/15-Puzzle.page                |   2 +-
 help/C/16-Puzzle.page                |   2 +-
 help/Makefile.am                     |   2 +-
 help/cs/cs.po                        |  10 +-
 help/de/de.po                        |  13 +-
 help/hu/hu.po                        |  55 +--
 help/pl/pl.po                        |   4 +-
 help/pt_BR/pt_BR.po                  | 626 +++++++++++++++++++++++++++++++++++
 help/sv/sv.po                        |  11 +-
 org.gnome.taquin.json                |   2 +-
 po/LINGUAS                           |   1 +
 po/POTFILES.in                       |   1 -
 po/es.po                             |  67 ++--
 po/fr.po                             |  29 +-
 po/ml.po                             | 221 +++++++++++++
 src/game-window.vala                 |  17 +-
 src/taquin-main.vala                 |  18 +-
 src/taquin.gresource.xml             |   3 -
 25 files changed, 1055 insertions(+), 143 deletions(-)
---
diff --cc data/taquin.ui
index 8147f8c,434bbce..0530a00
--- a/data/taquin.ui
+++ b/data/taquin.ui
@@@ -30,21 -30,30 +30,44 @@@
                </object>
              </child>
            </object>
+           <packing>
+             <property name="pack_type">start</property>
+             <property name="position">1</property>
+           </packing>
          </child>
 +        <child>
 +          <object class="GtkButton" id="new_game_button">
 +            <property name="visible">True</property>
 +            <property name="halign">center</property>
 +            <property name="valign">center</property>
 +            <property name="label" translatable="yes">_Start Over</property>
 +            <property name="use-underline">True</property>
 +            <property name="action-name">win.new-game</property>
 +            <property name="tooltip-text" translatable="yes">Start a new game</property>
 +          </object>
 +          <packing>
 +            <property name="pack-type">end</property>
 +          </packing>
 +        </child>
+         <child>
+           <object class="GtkMenuButton" id="info_button">
+             <property name="visible">True</property>
+             <property name="can_focus">False</property>
+             <property name="receives_default">False</property>
+             <property name="menu_model">window-menu</property>
+             <child>
+               <object class="GtkImage">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+                 <property name="icon_name">open-menu-symbolic</property>
+               </object>
+             </child>
+           </object>
+           <packing>
+             <property name="pack_type">end</property>
+             <property name="position">2</property>
+           </packing>
 -         </child>
++        </child>
        </object>
      </child>
      <child>


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