[iagno/arnaudb/wip/gtk4: 20/54] Adapt UI files.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno/arnaudb/wip/gtk4: 20/54] Adapt UI files.
- Date: Thu, 30 Apr 2020 13:19:06 +0000 (UTC)
commit b3f5de67c965a1300477e023ed12d8ad086e7e11
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri Feb 14 19:40:37 2020 +0100
Adapt UI files.
data/ui/adaptative-window.ui | 2 +-
data/ui/base-headerbar.ui | 41 +++++++++++++++--------------------
data/ui/base-view.ui | 22 +++++++++----------
data/ui/base-window.ui | 5 +----
data/ui/game-actionbar-placeholder.ui | 7 ++----
data/ui/game-actionbar.ui | 6 +----
data/ui/game-headerbar.ui | 8 +++----
data/ui/help-overlay.ui | 19 +---------------
data/ui/history-button.ui | 24 ++++++++++----------
data/ui/new-game-screen.ui | 9 +-------
data/ui/notifications-revealer.ui | 11 ++--------
data/ui/overlayed-list.ui | 7 +-----
data/ui/registry-placeholder.ui | 5 +----
13 files changed, 55 insertions(+), 111 deletions(-)
---
diff --git a/data/ui/adaptative-window.ui b/data/ui/adaptative-window.ui
index d3cd244..165410e 100644
--- a/data/ui/adaptative-window.ui
+++ b/data/ui/adaptative-window.ui
@@ -16,7 +16,7 @@
along with GNOME Reversi. 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/base-headerbar.ui b/data/ui/base-headerbar.ui
index 32eef08..34fdc80 100644
--- a/data/ui/base-headerbar.ui
+++ b/data/ui/base-headerbar.ui
@@ -16,7 +16,7 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="BaseHeaderBar" parent="NightTimeAwareHeaderBar">
<property name="show-title-buttons">True</property>
<property name="has-subtitle">False</property>
@@ -30,7 +30,6 @@
</style>
<child>
<object class="GtkImage">
- <property name="visible">True</property>
<property name="icon-name">go-previous-symbolic</property> <!-- TODO 3/3
dialog-information-symbolic -->
<property name="icon-size">1</property>
</object>
@@ -44,8 +43,6 @@
</child>
<child type="title">
<object class="GtkBox" id="center_box">
- <property name="visible">True</property>
- <property name="valign">fill</property>
<property name="spacing">6</property>
<property name="hexpand">False</property> <!-- or "hexpand-set">true... that's horrible -->
<style>
@@ -62,25 +59,25 @@
<object class="GtkStack" id="quit_button_stack">
<property name="visible">False</property>
<child>
- <object class="GtkButton">
- <property name="visible">True</property>
- <property name="valign">center</property>
- <property name="action-name">app.quit</property>
- <style>
- <class name="titlebutton"/>
- <class name="close"/>
- </style>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="icon-name">window-close-symbolic</property>
- <property name="icon-size">1</property>
+ <object class="GtkStackPage">
+ <property name="name">quit-button</property>
+ <property name="child">
+ <object class="GtkButton">
+ <property name="valign">center</property>
+ <property name="action-name">app.quit</property>
+ <style>
+ <class name="titlebutton"/>
+ <class name="close"/>
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">window-close-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
</object>
- </child>
+ </property>
</object>
- <packing>
- <property name="name">quit-button</property>
- </packing>
</child>
</object>
<packing>
@@ -101,7 +98,6 @@
</child>
<child>
<object class="GtkMenuButton" id="info_button">
- <property name="visible">True</property>
<property name="valign">center</property>
<property name="focus-on-click">False</property>
<style>
@@ -117,7 +113,6 @@
</child>
<child>
<object class="GtkImage">
- <property name="visible">True</property>
<property name="icon-name">open-menu-symbolic</property>
<property name="icon-size">1</property>
</object>
diff --git a/data/ui/base-view.ui b/data/ui/base-view.ui
index bfc1cac..e5236d4 100644
--- a/data/ui/base-view.ui
+++ b/data/ui/base-view.ui
@@ -16,23 +16,23 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="BaseView" parent="GtkStack">
<property name="transition-type">over-down-up</property>
<property name="transition-duration">300</property>
<child>
- <object class="GtkOverlay" id="notifications_overlay"> <!-- or "main-view", see packing -->
- <property name="visible">True</property>
- <child>
- <object class="GtkGrid" id="main_grid">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <object class="GtkStackPage">
+ <property name="name">main-view</property>
+ <property name="child">
+ <object class="GtkOverlay" id="notifications_overlay">
+ <child>
+ <object class="GtkGrid" id="main_grid">
+ <property name="orientation">vertical</property>
+ </object>
+ </child>
</object>
- </child>
+ </property>
</object>
- <packing>
- <property name="name">main-view</property>
- </packing>
</child>
</template>
</interface>
diff --git a/data/ui/base-window.ui b/data/ui/base-window.ui
index 260827f..09528ce 100644
--- a/data/ui/base-window.ui
+++ b/data/ui/base-window.ui
@@ -16,15 +16,13 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="BaseWindow" parent="AdaptativeWindow">
<property name="visible">False</property>
<child>
<object class="GtkOverlay" id="main_overlay">
- <property name="visible">True</property>
<child>
<object class="GtkGrid" id="main_grid">
- <property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
</child>
@@ -42,7 +40,6 @@
<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>
diff --git a/data/ui/game-actionbar-placeholder.ui b/data/ui/game-actionbar-placeholder.ui
index 2b69eee..bb59262 100644
--- a/data/ui/game-actionbar-placeholder.ui
+++ b/data/ui/game-actionbar-placeholder.ui
@@ -18,13 +18,10 @@
with this application. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="GameActionBarPlaceHolder" parent="GtkRevealer">
- <property name="visible">True</property>
<child>
- <object class="GtkDrawingArea" id="placeholder_child">
- <property name="visible">True</property>
- </object>
+ <object class="GtkDrawingArea" id="placeholder_child"/>
</child>
</template>
</interface>
diff --git a/data/ui/game-actionbar.ui b/data/ui/game-actionbar.ui
index e5b640b..c791dab 100644
--- a/data/ui/game-actionbar.ui
+++ b/data/ui/game-actionbar.ui
@@ -18,16 +18,12 @@
with this application. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="GameActionBar" parent="GtkRevealer">
- <property name="visible">True</property>
- <property name="reveal-child">True</property>
<child>
<object class="GtkActionBar" id="action_bar">
- <property name="visible">True</property>
<child>
<object class="GtkLabel" id="game_label">
- <property name="visible">True</property>
<style>
<class name="game-name-label"/>
</style>
diff --git a/data/ui/game-headerbar.ui b/data/ui/game-headerbar.ui
index 0878f6a..0f13b26 100644
--- a/data/ui/game-headerbar.ui
+++ b/data/ui/game-headerbar.ui
@@ -20,11 +20,12 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="GameHeaderBar" parent="BaseHeaderBar">
<property name="show-title-buttons">True</property>
<child>
<object class="GtkButton" id="new_game_button">
+ <property name="visible">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="action-name">ui.new-game</property>
@@ -36,8 +37,8 @@
<class name="new-game-button"/>
</style>
<child>
- <object class="GtkLabel"> <!-- for ellipsizing, if the text shows a moves count that can grow -->
- <property name="visible">True</property>
+ <!-- for ellipsizing, if the text shows a moves count that can grow -->
+ <object class="GtkLabel">
<!-- 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>
<property name="ellipsize">end</property>
@@ -63,7 +64,6 @@
<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>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 2149980..2e7f9bc 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -18,26 +18,22 @@
along with GNOME Reversi. 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>
<property name="title" translatable="yes" context="shortcut window">During game
selection</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Start new game</property>
<property name="accelerator"><Primary><Shift>n</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Go back</property>
<property name="accelerator">Escape</property>
</object>
@@ -46,32 +42,27 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Play with keyboard</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Select where to
play</property>
<property name="accelerator">Left Right Up Down</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Select the given
row</property>
<property name="accelerator">1...8</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Select the given
column</property>
<property name="accelerator">a...h</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Play on selected
tile</property>
<property name="accelerator">Return space</property>
</object>
@@ -80,18 +71,15 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">During a game</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">New game</property>
<property name="accelerator"><Primary>n</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Undo last move</property>
<property name="accelerator"><Primary>z</property>
</object>
@@ -100,32 +88,27 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Generic</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Keyboard
shortcuts</property>
<property name="accelerator"><Primary>question <Primary>F1</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Help</property>
<property name="accelerator">F1</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">About</property>
<property name="accelerator"><Shift>F1</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Quit</property>
<property name="accelerator"><Primary>q</property>
</object>
diff --git a/data/ui/history-button.ui b/data/ui/history-button.ui
index 28ff6a7..c207830 100644
--- a/data/ui/history-button.ui
+++ b/data/ui/history-button.ui
@@ -20,7 +20,7 @@
along with GNOME Reversi. 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="GtkMenuButton">
<property name="valign">center</property>
<property name="can-focus">True</property>
@@ -28,23 +28,21 @@
<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>
- <property name="ellipsize">end</property>
- <!-- Translators: label of the game status button (in the headerbar, next to the hamburger
button), when the game is finished; 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">
+ <property name="ellipsize">end</property>
+ <!-- Translators: label of the game status button (in the headerbar, next to the hamburger
button), when the game is finished; please keep the string as small as possible (3~5 characters) -->
+ <property name="label" translatable="yes">End!</property>
+ </object>
+ </property>
+ </object>
</child>
</object>
</child>
diff --git a/data/ui/new-game-screen.ui b/data/ui/new-game-screen.ui
index abe1dd6..8806647 100644
--- a/data/ui/new-game-screen.ui
+++ b/data/ui/new-game-screen.ui
@@ -16,10 +16,9 @@
with this application. 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="spacing">6</property>
<style>
<class name="new-game-screen"/>
@@ -39,12 +38,10 @@
<child>
<object class="GtkBox" id="games_box">
<property name="orientation">horizontal</property>
- <property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkModelButton" id="modelbutton_one">
- <property name="visible">True</property>
<property name="name">radio-one</property>
<style>
<class name="radio-like-toggle"/>
@@ -57,7 +54,6 @@
</child>
<child>
<object class="GtkModelButton" id="modelbutton_two">
- <property name="visible">True</property>
<property name="name">radio-two</property>
<style>
<class name="radio-like-toggle"/>
@@ -95,12 +91,10 @@
<child>
<object class="GtkBox" id="options_box">
<property name="orientation">horizontal</property>
- <property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkMenuButton" id="menubutton_one">
- <property name="visible">True</property>
<property name="use-underline">True</property>
<style>
<class name="menubutton-like-combo"/>
@@ -114,7 +108,6 @@
</child>
<child>
<object class="GtkMenuButton" id="menubutton_two">
- <property name="visible">True</property>
<property name="use-underline">True</property>
<style>
<class name="menubutton-like-combo"/>
diff --git a/data/ui/notifications-revealer.ui b/data/ui/notifications-revealer.ui
index f5e9434..9078c3a 100644
--- a/data/ui/notifications-revealer.ui
+++ b/data/ui/notifications-revealer.ui
@@ -16,36 +16,30 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="NotificationsRevealer" parent="GtkRevealer">
<property name="halign">center</property>
<property name="valign">start</property>
<child>
<object class="GtkFrame">
- <property name="visible">True</property>
<style>
<class name="app-notification"/>
</style>
<child>
<object class="GtkGrid">
- <property name="visible">True</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="notification_label">
- <property name="visible">True</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
</object>
</child>
<child>
- <object class="GtkSeparator">
- <property name="visible">True</property>
- </object>
+ <object class="GtkSeparator"/>
</child>
<child>
<object class="GtkButton">
- <property name="visible">True</property>
<property name="valign">center</property>
<property name="focus-on-click">False</property>
<property name="relief">none</property>
@@ -55,7 +49,6 @@
</style>
<child>
<object class="GtkImage">
- <property name="visible">True</property>
<property name="icon-name">window-close-symbolic</property>
<property name="icon-size">1</property>
</object>
diff --git a/data/ui/overlayed-list.ui b/data/ui/overlayed-list.ui
index 26fb7c5..4076538 100644
--- a/data/ui/overlayed-list.ui
+++ b/data/ui/overlayed-list.ui
@@ -16,17 +16,15 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="OverlayedList" parent="GtkOverlay">
<property name="expand">True</property>
- <property name="valign">fill</property>
<style>
<class name="overlayed-list"/>
<class name="vertical"/>
</style>
<child>
<object class="GtkScrolledWindow" id="scrolled">
- <property name="visible">True</property>
<property name="expand">True</property>
<property name="hscrollbar-policy">never</property>
<property name="max-content-height">300</property>
@@ -34,7 +32,6 @@
<property name="propagate-natural-height">True</property>
<child>
<object class="GtkListBox" id="main_list_box">
- <property name="visible">True</property>
<signal name="selected-rows-changed" handler="on_selection_changed"/>
</object>
</child>
@@ -52,7 +49,6 @@
</style>
<child>
<object class="GtkModelButton" id="leave_edit_mode_button">
- <property name="visible">True</property>
<property name="hexpand">True</property>
<property name="centered">True</property>
<property name="iconic">True</property>
@@ -64,7 +60,6 @@
</child>
<child>
<object class="GtkModelButton" id="enter_edit_mode_button">
- <property name="visible">True</property>
<property name="hexpand">True</property>
<property name="centered">True</property>
<property name="iconic">True</property>
diff --git a/data/ui/registry-placeholder.ui b/data/ui/registry-placeholder.ui
index c54a4f0..fce0a5e 100644
--- a/data/ui/registry-placeholder.ui
+++ b/data/ui/registry-placeholder.ui
@@ -16,9 +16,8 @@
along with GNOME Reversi. If not, see <https://www.gnu.org/licenses/>.
-->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.96"/>
<template class="RegistryPlaceholder" parent="GtkGrid"> <!-- see
nautilus/src/resources/ui/nautilus-folder-is-empty.ui -->
- <property name="visible">True</property>
<property name="row-spacing">12</property>
<property name="expand">True</property>
<property name="halign">center</property>
@@ -29,7 +28,6 @@
</style>
<child>
<object class="GtkImage" id="placeholder_image">
- <property name="visible">True</property>
<style>
<class name="dim-label"/>
</style>
@@ -37,7 +35,6 @@
</child>
<child>
<object class="GtkLabel" id="placeholder_label">
- <property name="visible">True</property>
<property name="justify">center</property>
<attributes>
<attribute name="weight" value="bold"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
