[gnome-taquin/arnaudb/wip/gtk4: 16/43] Adapt UI files.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-taquin/arnaudb/wip/gtk4: 16/43] Adapt UI files.
- Date: Thu, 30 Apr 2020 13:23:04 +0000 (UTC)
commit d59dea6b876713cb529b8fc5cdfd5cb6a0b8748c
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Feb 19 22:38:55 2020 +0100
Adapt UI files.
data/ui/base-headerbar.ui | 67 ++++++++++-------------------------
data/ui/base-view.ui | 22 ++++++------
data/ui/base-window.ui | 12 ++-----
data/ui/game-actionbar-placeholder.ui | 9 ++---
data/ui/game-actionbar.ui | 8 ++---
data/ui/game-headerbar.ui | 16 +++------
data/ui/help-overlay.ui | 23 +-----------
data/ui/history-button.ui | 2 +-
data/ui/notifications-revealer.ui | 18 ++--------
data/ui/registry-placeholder.ui | 5 +--
10 files changed, 48 insertions(+), 134 deletions(-)
---
diff --git a/data/ui/base-headerbar.ui b/data/ui/base-headerbar.ui
index 818b044..fbeca4e 100644
--- a/data/ui/base-headerbar.ui
+++ b/data/ui/base-headerbar.ui
@@ -16,36 +16,28 @@
along with GNOME Taquin. 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>
- <child>
+ <child type="start">
<object class="GtkButton" id="go_back_button">
<property name="visible">False</property>
<property name="valign">center</property>
<property name="action-name">base.show-default-view</property>
+ <property name="icon-name">go-previous-symbolic</property> <!-- TODO 3/3 dialog-information-symbolic
-->
<style>
<class name="image-button"/>
</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>
- </child>
</object>
</child>
- <child>
+ <child type="start">
<object class="GtkSeparator" id="ltr_left_separator">
<property name="visible">False</property>
</object>
</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>
@@ -58,36 +50,28 @@
</child>
</object>
</child>
- <child>
+ <child type="end">
<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>
+ <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>
<property name="icon-name">window-close-symbolic</property>
- <property name="icon-size">1</property>
+ <style>
+ <class name="titlebutton"/>
+ <class name="close"/>
+ </style>
</object>
- </child>
+ </property>
</object>
- <packing>
- <property name="name">quit-button</property>
- </packing>
</child>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
- <child>
+ <child type="end">
<object class="GtkSeparator" id="ltr_right_separator">
<property name="visible">False</property>
<property name="orientation">vertical</property>
@@ -95,15 +79,12 @@
<class name="titlebutton"/>
</style>
</object>
- <packing>
- <property name="pack-type">end</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="focus-on-click">False</property>
+ <property name="icon-name">open-menu-symbolic</property>
<style>
<class name="image-button"/>
</style>
@@ -115,17 +96,7 @@
<property name="AtkObject::accessible-description" translatable="yes">Current view
actions</property>
</object>
</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>
- </child>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</template>
</interface>
diff --git a/data/ui/base-view.ui b/data/ui/base-view.ui
index 850cf9b..324edb0 100644
--- a/data/ui/base-view.ui
+++ b/data/ui/base-view.ui
@@ -16,23 +16,23 @@
along with GNOME Taquin. 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 dba8665..a7f0fd9 100644
--- a/data/ui/base-window.ui
+++ b/data/ui/base-window.ui
@@ -16,15 +16,13 @@
along with GNOME Taquin. 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>
@@ -34,18 +32,12 @@
<property name="halign">end</property>
<property name="valign">start</property>
<property name="action-name">base.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/game-actionbar-placeholder.ui b/data/ui/game-actionbar-placeholder.ui
index 2b69eee..9bb622d 100644
--- a/data/ui/game-actionbar-placeholder.ui
+++ b/data/ui/game-actionbar-placeholder.ui
@@ -2,7 +2,7 @@
<!--
This file is part of a GNOME game
- Copyright (C) 2019 – Arnaud Bonatti <arnaud bonatti gmail com>
+ Copyright (C) 2019-2020 – Arnaud Bonatti <arnaud bonatti gmail com>
This application is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -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..484b546 100644
--- a/data/ui/game-actionbar.ui
+++ b/data/ui/game-actionbar.ui
@@ -2,7 +2,7 @@
<!--
This file is part of a GNOME game
- Copyright (C) 2019 – Arnaud Bonatti <arnaud bonatti gmail com>
+ Copyright (C) 2019-2020 – Arnaud Bonatti <arnaud bonatti gmail com>
This application is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -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 263a7e6..40d3bf0 100644
--- a/data/ui/game-headerbar.ui
+++ b/data/ui/game-headerbar.ui
@@ -16,15 +16,15 @@
along with GNOME Taquin. 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>
- <property name="can-default">True</property>
<!-- Translators: during a game, tooltip text of the New Game button -->
<property name="tooltip-text" translatable="yes">Start a new game</property>
<style>
@@ -32,8 +32,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>
@@ -53,16 +53,10 @@
<property name="use-underline">True</property>
<property name="action-name">base.escape</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>
</child>
</template>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index c7f1a15..3284347 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -16,26 +16,22 @@
along with GNOME Taquin. If not, see <https://www.gnu.org/licenses/>.
-->
<interface domain="gnome-taquin">
- <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">11</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>
@@ -44,25 +40,21 @@
</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">Restart 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">Undo last move</property>
<property name="accelerator"><Primary>z</property>
</object>
@@ -71,18 +63,15 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">15-Puzzle</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Select tile to push
on</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">Push on selected
tile</property>
<property name="accelerator">Return space</property>
</object>
@@ -91,32 +80,27 @@
</child>
<child>
<object class="GtkShortcutsGroup">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">16-Puzzle</property>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Change selected
column</property>
<property name="accelerator">Left Right</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Change selected
row</property>
<property name="accelerator">Up Down</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Swipe selected
row</property>
<property name="accelerator"><Shift>Left <Shift>Right</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
- <property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Swipe selected
column</property>
<property name="accelerator"><Shift>Up <Shift>Down</property>
</object>
@@ -125,32 +109,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 2c6e232..1e22ce9 100644
--- a/data/ui/history-button.ui
+++ b/data/ui/history-button.ui
@@ -16,7 +16,7 @@
along with GNOME Taquin. 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>
diff --git a/data/ui/notifications-revealer.ui b/data/ui/notifications-revealer.ui
index 2c9e007..fede461 100644
--- a/data/ui/notifications-revealer.ui
+++ b/data/ui/notifications-revealer.ui
@@ -16,50 +16,38 @@
along with GNOME Taquin. 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>
<property name="action-name">notification.hide</property>
+ <property name="icon-name">window-close-symbolic</property>
<style>
<class name="image-button"/>
</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>
- </child>
</object>
</child>
</object>
diff --git a/data/ui/registry-placeholder.ui b/data/ui/registry-placeholder.ui
index 2be926f..5c8393c 100644
--- a/data/ui/registry-placeholder.ui
+++ b/data/ui/registry-placeholder.ui
@@ -16,9 +16,8 @@
along with GNOME Taquin. 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]
