[four-in-a-row/arnaudb/wip/gtk4: 21/27] Adapt UI files.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [four-in-a-row/arnaudb/wip/gtk4: 21/27] Adapt UI files.
- Date: Mon, 27 Apr 2020 15:42:35 +0000 (UTC)
commit e4a8e1617d8f61f21b5e3e2ab8d7a04c3faaa53e
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Sun Apr 19 23:55:15 2020 +0200
Adapt UI files.
data/ui/adaptative-window.ui | 2 +-
data/ui/fiar-screens.ui | 25 +-----------
data/ui/four-in-a-row.ui | 91 +++++++++++++++-----------------------------
data/ui/help-overlay.ui | 19 +--------
data/ui/history-button.ui | 24 +++++-------
5 files changed, 43 insertions(+), 118 deletions(-)
---
diff --git a/data/ui/adaptative-window.ui b/data/ui/adaptative-window.ui
index 383b4f9..87979c4 100644
--- a/data/ui/adaptative-window.ui
+++ b/data/ui/adaptative-window.ui
@@ -18,7 +18,7 @@
with GNOME Four-in-a-row. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="AdaptativeWindow" parent="GtkApplicationWindow">
<property name="height-request">284</property> <!-- 288px max for Purism Librem 5 landscape, for 720px
width; update gschema also -->
<property name="width-request">350</property> <!-- 360px max for Purism Librem 5 portrait, for 648px
height; update gschema also -->
diff --git a/data/ui/fiar-screens.ui b/data/ui/fiar-screens.ui
index 3a599cd..7ad4009 100644
--- a/data/ui/fiar-screens.ui
+++ b/data/ui/fiar-screens.ui
@@ -18,10 +18,9 @@
with GNOME Four-in-a-row. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="NewGameScreen" parent="GtkBox">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="valign">fill</property>
<property name="spacing">18</property>
@@ -30,11 +29,9 @@
<child>
<object class="GtkBox" id="infos_section">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
<property name="halign">start</property>
<!-- Translators: when configuring a new game, on a thin window, header of the row for choosing
the number of players -->
<property name="label" translatable="yes">Game type</property>
@@ -45,7 +42,6 @@
</child>
<child>
<object class="GtkBox">
- <property name="visible">True</property>
<property name="vexpand">True</property>
<property name="homogeneous">True</property>
<property name="spacing">0</property>
@@ -55,7 +51,6 @@
</style>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, on a thin window, group "Game type", label of
the button to choose to play first (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">Play _first</property>
@@ -67,7 +62,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, on a thin window, group "Game type", label of
the button to choose to play second (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">Play _second</property>
@@ -79,7 +73,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, on a thin window, group "Game type", label of
the button to choose a two-players game (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_Two players</property>
@@ -99,11 +92,9 @@
<child>
<object class="GtkBox" id="users_section">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
<property name="halign">start</property>
<!-- Translators: when configuring a new game, header of the row for choosing the number of
players -->
<property name="label" translatable="yes">Players</property>
@@ -114,13 +105,11 @@
</child>
<child>
<object class="GtkBox" id="users_box">
- <property name="visible">True</property>
<property name="vexpand">True</property>
<property name="homogeneous">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Players", label of the button to choose
a one-player game (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_One</property>
@@ -132,7 +121,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Players", label of the button to choose
a one-player game (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_Two</property>
@@ -152,11 +140,9 @@
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
<property name="halign">start</property>
<!-- Translators: when configuring a new game, header of the row for choosing the level of the
artificial intelligence -->
<property name="label" translatable="yes">Difficulty</property>
@@ -167,13 +153,11 @@
</child>
<child>
<object class="GtkBox" id="level_box">
- <property name="visible">True</property>
<property name="vexpand">True</property>
<property name="homogeneous">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Difficulty", label of the button to
choose an easy-level computer adversary (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_Easy</property>
@@ -185,7 +169,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Difficulty", label of the button to
choose a medium-level computer adversary (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_Medium</property>
@@ -197,7 +180,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Difficulty", label of the button to
choose a hard-level computer adversary (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">_Hard</property>
@@ -217,11 +199,9 @@
<child>
<object class="GtkBox" id="start_section">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
<property name="halign">start</property>
<!-- Translators: when configuring a new game, header of the row for choosing whether to start
or not -->
<property name="label" translatable="yes">Game start</property>
@@ -232,13 +212,11 @@
</child>
<child>
<object class="GtkBox" id="start_box">
- <property name="visible">True</property>
<property name="vexpand">True</property>
<property name="homogeneous">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Game start", label of the button to
start (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">Play _first</property>
@@ -250,7 +228,6 @@
</child>
<child>
<object class="GtkModelButton">
- <property name="visible">True</property>
<property name="use_underline">True</property>
<!-- Translators: when configuring a new game, row "Game start", label of the button to play
after the computer (with a mnemonic that appears pressing Alt) -->
<property name="text" translatable="yes">Play _second</property>
diff --git a/data/ui/four-in-a-row.ui b/data/ui/four-in-a-row.ui
index 43ab012..efcb899 100644
--- a/data/ui/four-in-a-row.ui
+++ b/data/ui/four-in-a-row.ui
@@ -16,16 +16,14 @@
with GNOME Four-in-a-row. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="GameWindow" parent="AdaptativeWindow">
<!-- <initial-focus name="view"/> -->
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
- <property name="visible">True</property>
- <property name="show-close-button">True</property>
- <child>
+ <property name="show-title-buttons">True</property>
+ <child type="start">
<object class="GtkButton" id="new_game_button">
- <property name="visible">True</property>
<property name="use-underline">True</property>
<!-- Translators: during a game, label of the New Game button (with a mnemonic that appears
pressing Alt) -->
<property name="label" translatable="yes">_New Game</property>
@@ -35,12 +33,8 @@
<!-- Translators: during a game, tooltip text of the New Game button -->
<property name="tooltip-text" translatable="yes">Start a new game</property>
</object>
- <packing>
- <property name="pack-type">start</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
+ <child type="start">
<object class="GtkButton" id="back_button">
<property name="visible">False</property>
<property name="halign">center</property>
@@ -50,35 +44,17 @@
<property name="use-underline">True</property>
<property name="action-name">ui.back</property>
<property name="focus-on-click">False</property>
+ <property name="icon-name">go-previous-symbolic</property>
<style>
<class name="image-button"/>
</style>
- <child>
- <object class="GtkImage">
- <property name="icon-name">go-previous-symbolic</property>
- <property name="visible">True</property>
- <property name="icon-size">1</property>
- </object>
- </child>
</object>
- <packing>
- <property name="pack-type">start</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
+ <child type="end">
<object class="GtkMenuButton" id="info_button">
- <property name="visible">True</property>
<property name="valign">center</property>
- <property name="can-focus">True</property>
<property name="focus-on-click">False</property>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="icon-name">open-menu-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
+ <property name="icon-name">open-menu-symbolic</property>
</object>
<packing>
<property name="pack-type">end</property>
@@ -89,38 +65,37 @@
</child>
<child>
<object class="GtkOverlay" id="overlay">
- <property name="visible">True</property>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="game_box">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <style>
- <class name="game-box"/>
- </style>
- </object>
- <packing>
+ <object class="GtkStackPage">
<property name="name">game-box</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow">
- <property name="visible">True</property>
- <child>
- <object class="GtkBox" id="new_game_box">
+ <property name="child">
+ <object class="GtkBox" id="game_box">
<property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <style>
+ <class name="game-box"/>
+ </style>
</object>
- </child>
+ </property>
</object>
- <packing>
+ </child>
+ <child>
+ <object class="GtkStackPage">
<property name="name">start-box</property>
- </packing>
+ <property name="child">
+ <object class="GtkScrolledWindow">
+ <child>
+ <object class="GtkBox" id="new_game_box">
+ <property name="orientation">vertical</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ </object>
+ </child>
+ </object>
+ </property>
+ </object>
</child>
</object>
</child>
@@ -130,18 +105,12 @@
<property name="halign">end</property>
<property name="valign">start</property>
<property name="action-name">ui.unfullscreen</property>
+ <property name="icon-name">view-restore-symbolic</property>
<style>
<class name="image-button"/>
<class name="unfullscreen-button"/>
<class name="flat"/>
</style>
- <child>
- <object class="GtkImage">
- <property name="icon-name">view-restore-symbolic</property>
- <property name="visible">True</property>
- <property name="icon-size">1</property>
- </object>
- </child>
</object>
</child>
</object>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 0a0331c..b4d0242 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -18,20 +18,17 @@
with GNOME Four-in-a-row. If not, see <https://www.gnu.org/licenses/>.
-->
<interface domain="iagno">
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<object class="GtkShortcutsWindow" id="help_overlay">
<child>
<object class="GtkShortcutsSection">
- <property name="visible">True</property>
<property name="max-height">8</property>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<!-- Translators: section of the Keyboard Shortcuts window; contains shortcuts available during
a game: "New game", "Undo last move"... -->
<property name="title" translatable="yes" context="shortcut window">During a game</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
<property name="title" translatable="yes" context="shortcut window">New game</property>
<property name="accelerator"><Primary>n</property>
@@ -39,7 +36,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
<property name="title" translatable="yes" context="shortcut window">Undo last move</property>
<property name="accelerator"><Primary>z</property>
@@ -47,7 +43,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "During a game" -->
<property name="title" translatable="yes" context="shortcut window">Show a hint</property>
<property name="accelerator"><Primary>h</property>
@@ -57,12 +52,10 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<!-- Translators: section of the Keyboard Shortcuts window; contains shortucts for playing:
Left/Right/Down -->
<property name="title" translatable="yes" context="shortcut window">Play with keyboard</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; using
arrows is the usual way select where to play -->
<property name="title" translatable="yes" context="shortcut window">Select where to
play</property>
<property name="accelerator">Left Right</property>
@@ -70,7 +63,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; hitting
number moves directly to the nth column -->
<property name="title" translatable="yes" context="shortcut window">Select the given
column</property>
<property name="accelerator">1...7</property>
@@ -78,7 +70,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; shortcut
for dropping the tile -->
<property name="title" translatable="yes" context="shortcut window">Play in selected
column</property>
<property name="accelerator">Down Return space</property>
@@ -88,12 +79,10 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<!-- Translators: section of the Keyboard Shortcuts window; contains shortcuts available when
configuring a new game -->
<property name="title" translatable="yes" context="shortcut window">During game
selection</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "During game selection"; how to
launch a new game -->
<property name="title" translatable="yes" context="shortcut window">Start new game</property>
<property name="accelerator"><Primary><Shift>n</property>
@@ -101,7 +90,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "During game selection"; how to
go back to a running game, if any -->
<property name="title" translatable="yes" context="shortcut window">Go back</property>
<property name="accelerator">Escape</property>
@@ -111,12 +99,10 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<!-- Translators: section of the Keyboard Shortcuts window; contains "Help", "About", "Quit"...
-->
<property name="title" translatable="yes" context="shortcut window">Generic</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
<property name="title" translatable="yes" context="shortcut window">Keyboard
shortcuts</property>
<property name="accelerator"><Primary>question <Primary>F1</property>
@@ -124,7 +110,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
<property name="title" translatable="yes" context="shortcut window">Help</property>
<property name="accelerator">F1</property>
@@ -132,7 +117,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
<property name="title" translatable="yes" context="shortcut window">About</property>
<property name="accelerator"><Shift>F1</property>
@@ -140,7 +124,6 @@
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
<property name="title" translatable="yes" context="shortcut window">Quit</property>
<property name="accelerator"><Primary>q</property>
diff --git a/data/ui/history-button.ui b/data/ui/history-button.ui
index 731e6bc..1e4f200 100644
--- a/data/ui/history-button.ui
+++ b/data/ui/history-button.ui
@@ -18,31 +18,27 @@
with GNOME Four-in-a-row. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="HistoryButton" parent="GtkToggleButton">
- <property name="visible">True</property>
<property name="valign">center</property>
- <property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="width-request">56</property>
<child>
<object class="GtkStack" id="stack">
- <property name="visible">True</property>
<property name="visible-child">drawing</property>
<child>
- <object class="GtkDrawingArea" id="drawing">
- <property name="visible">True</property>
- </object>
+ <object class="GtkDrawingArea" id="drawing"/>
</child>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <!-- Translators: label of the game status button (in the headerbar, next to the hamburger
button); please keep the string as small as possible (3~5 characters) -->
- <property name="label" translatable="yes">End!</property>
- </object>
- <packing>
+ <object class="GtkStackPage">
<property name="name">label</property>
- </packing>
+ <property name="child">
+ <object class="GtkLabel">
+ <!-- Translators: label of the game status button (in the headerbar, next to the hamburger
button); please keep the string as small as possible (3~5 characters) -->
+ <property name="label" translatable="yes">End!</property>
+ </object>
+ </property>
+ </object>
</child>
</object>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
