[gtk/matthiasc/for-master: 3/4] Simplify our ui files
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master: 3/4] Simplify our ui files
- Date: Wed, 29 Sep 2021 11:59:18 +0000 (UTC)
commit f473f28d8688e46cf9fdba0b737ea62db50e6b7e
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 29 07:51:53 2021 -0400
Simplify our ui files
This is a run of gtk4-builder-tool simplify
over our ui files, since the tool does some
more simplification now.
gtk/ui/gtkaboutdialog.ui | 58 ++++-----
gtk/ui/gtkappchooserdialog.ui | 22 ++--
gtk/ui/gtkappchooserwidget.ui | 28 ++---
gtk/ui/gtkassistant.ui | 46 +++----
gtk/ui/gtkcolorchooserdialog.ui | 8 +-
gtk/ui/gtkcoloreditor.ui | 50 +++-----
gtk/ui/gtkcombobox.ui | 30 ++---
gtk/ui/gtkdialog.ui | 16 +--
gtk/ui/gtkdropdown.ui | 69 +++++------
gtk/ui/gtkemojichooser.ui | 144 +++++++++-------------
gtk/ui/gtkemojicompletion.ui | 6 +-
gtk/ui/gtkfilechooserdialog.ui | 6 +-
gtk/ui/gtkfilechooserwidget.ui | 98 +++++++--------
gtk/ui/gtkfontchooserdialog.ui | 8 +-
gtk/ui/gtkfontchooserwidget.ui | 81 ++++++-------
gtk/ui/gtklockbutton.ui | 8 +-
gtk/ui/gtkmediacontrols.ui | 9 +-
gtk/ui/gtkmessagedialog.ui | 12 +-
gtk/ui/gtkpagesetupunixdialog.ui | 34 +++---
gtk/ui/gtkplacesview.ui | 82 +++++--------
gtk/ui/gtkplacesviewrow.ui | 30 ++---
gtk/ui/gtkprintunixdialog.ui | 254 +++++++++++++++++++--------------------
gtk/ui/gtkscalebutton.ui | 17 ++-
gtk/ui/gtksidebarrow.ui | 40 +++---
gtk/ui/gtkstatusbar.ui | 6 +-
gtk/ui/gtktooltipwindow.ui | 4 +-
gtk/ui/gtkvideo.ui | 22 ++--
gtk/ui/gtkvolumebutton.ui | 6 +-
28 files changed, 516 insertions(+), 678 deletions(-)
---
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 5382941c81..28763d8988 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkAboutDialog" parent="GtkWindow">
+ <property name="css-classes">aboutdialog</property>
<property name="resizable">0</property>
- <style>
- <class name="aboutdialog"/>
- </style>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar1">
<child type="title">
@@ -17,7 +15,7 @@
</child>
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@@ -25,7 +23,7 @@
<property name="margin-bottom">5</property>
<child>
<object class="GtkBox" id="box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@@ -34,17 +32,15 @@
<property name="vexpand">1</property>
<child>
<object class="GtkImage" id="logo_image">
+ <property name="css-classes">icon-dropshadow</property>
<property name="icon-name">image-missing</property>
- <property name="icon-size">large</property>
- <style>
- <class name="icon-dropshadow"/>
- </style>
+ <property name="icon-size">2</property>
</object>
</child>
<child>
<object class="GtkLabel" id="name_label">
<property name="label">name label</property>
- <property name="justify">center</property>
+ <property name="justify">2</property>
<property name="selectable">1</property>
</object>
</child>
@@ -52,23 +48,23 @@
<object class="GtkStack" id="stack">
<property name="width-request">400</property>
<property name="height-request">100</property>
- <property name="transition-type">over-up-down</property>
+ <property name="transition-type">16</property>
<property name="transition-duration">600</property>
<property name="vexpand">1</property>
<signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/>
<child>
<object class="GtkStackPage">
<property name="name">main</property>
- <property name="title" translatable="yes">About</property>
+ <property name="title" translatable="1">About</property>
<property name="child">
<object class="GtkBox" id="page_vbox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel" id="version_label">
<property name="visible">0</property>
<property name="label">version 1.0</property>
- <property name="justify">center</property>
+ <property name="justify">2</property>
<property name="selectable">1</property>
</object>
</child>
@@ -76,7 +72,7 @@
<object class="GtkLabel" id="comments_label">
<property name="visible">0</property>
<property name="label">comments</property>
- <property name="justify">center</property>
+ <property name="justify">2</property>
<property name="wrap">1</property>
<property name="selectable">1</property>
<property name="max-width-chars">60</property>
@@ -94,7 +90,7 @@
<object class="GtkLabel" id="copyright_label">
<property name="visible">0</property>
<property name="label">copyright</property>
- <property name="justify">center</property>
+ <property name="justify">2</property>
<property name="wrap">1</property>
<property name="selectable">1</property>
<property name="max-width-chars">60</property>
@@ -105,7 +101,7 @@
<property name="visible">0</property>
<property name="label">license</property>
<property name="use-markup">1</property>
- <property name="justify">center</property>
+ <property name="justify">2</property>
<property name="wrap">1</property>
<property name="selectable">1</property>
<property name="max-width-chars">60</property>
@@ -120,26 +116,24 @@
<object class="GtkStackPage">
<property name="name">credits</property>
<property name="visible">0</property>
- <property name="title" translatable="yes">Credits</property>
+ <property name="title" translatable="1">Credits</property>
<property name="child">
<object class="GtkBox" id="credits_page">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">8</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkViewport" id="viewport1">
- <style>
- <class name="view"/>
- </style>
+ <property name="css-classes">view</property>
<child>
<object class="GtkGrid" id="credits_grid">
- <property name="halign">center</property>
- <property name="valign">start</property>
- <property name="orientation">vertical</property>
+ <property name="halign">3</property>
+ <property name="valign">1</property>
+ <property name="orientation">1</property>
<property name="row-spacing">2</property>
<property name="column-spacing">8</property>
<property name="margin-start">5</property>
@@ -160,14 +154,14 @@
<object class="GtkStackPage">
<property name="name">license</property>
<property name="visible">0</property>
- <property name="title" translatable="yes">License</property>
+ <property name="title" translatable="1">License</property>
<property name="child">
<object class="GtkBox" id="license_page">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">8</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
@@ -203,14 +197,14 @@
<object class="GtkStackPage">
<property name="name">system</property>
<property name="visible">0</property>
- <property name="title" translatable="yes">System</property>
+ <property name="title" translatable="1">System</property>
<property name="child">
<object class="GtkBox" id="system_page">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">8</property>
<child>
<object class="GtkScrolledWindow">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
<child>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 654bb31d30..dece4176c6 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkAppChooserDialog" parent="GtkDialog">
- <property name="title" translatable="yes">Select Application</property>
+ <property name="title" translatable="1">Select Application</property>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
<child>
<object class="GtkSearchBar" id="search_bar">
@@ -19,17 +19,17 @@
<child internal-child="action_area">
<object class="GtkBox" id="dialog-action_area1">
<property name="hexpand">1</property>
- <property name="halign">end</property>
+ <property name="halign">2</property>
</object>
</child>
<child>
<object class="GtkBox" id="inner_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label">
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="label">label</property>
<property name="wrap">1</property>
<property name="vexpand">1</property>
@@ -42,12 +42,12 @@
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="use-underline">1</property>
- <property name="label" translatable="yes">_Cancel</property>
+ <property name="label" translatable="1">_Cancel</property>
</object>
</child>
<child type="action">
<object class="GtkButton" id="ok_button">
- <property name="label" translatable="yes">_Select</property>
+ <property name="label" translatable="1">_Select</property>
<property name="use-underline">1</property>
</object>
</child>
@@ -57,19 +57,19 @@
</action-widgets>
</template>
<object class="GtkButton" id="show_more_button">
- <property name="label" translatable="yes">_View All Applications</property>
+ <property name="label" translatable="1">_View All Applications</property>
<property name="use-underline">1</property>
<property name="receives-default">1</property>
<signal name="clicked" handler="show_more_button_clicked_cb" swapped="no"/>
</object>
<object class="GtkButton" id="software_button">
- <property name="label" translatable="yes">_Find New Applications</property>
+ <property name="label" translatable="1">_Find New Applications</property>
<property name="use-underline">1</property>
<property name="receives-default">1</property>
<signal name="clicked" handler="software_button_clicked_cb" swapped="no"/>
</object>
<object class="GtkSizeGroup" id="buttons">
- <property name="mode">vertical</property>
+ <property name="mode">2</property>
<widgets>
<widget name="cancel_button"/>
<widget name="ok_button"/>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index cfce252c1a..2da996947f 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -24,7 +24,7 @@
<object class="GtkScrolledWindow" id="scrolled_window">
<property name="width-request">400</property>
<property name="height-request">300</property>
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<child>
<object class="GtkTreeView" id="program_list">
@@ -33,7 +33,7 @@
<signal name="row-activated" handler="program_list_selection_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2">
- <property name="mode">browse</property>
+ <property name="mode">2</property>
<signal name="changed" handler="refresh_and_emit_app_selected"
object="GtkAppChooserWidget" swapped="yes"/>
</object>
</child>
@@ -45,7 +45,7 @@
<child>
<object class="GtkCellRendererText" id="heading">
<property name="ypad">6</property>
- <property name="wrap-mode">word</property>
+ <property name="wrap-mode">0</property>
<property name="wrap-width">350</property>
</object>
<attributes>
@@ -64,7 +64,7 @@
</child>
<child>
<object class="GtkCellRendererText" id="app_name">
- <property name="ellipsize">end</property>
+ <property name="ellipsize">3</property>
</object>
<attributes>
<attribute name="markup">3</attribute>
@@ -79,34 +79,30 @@
<child type="overlay">
<object class="GtkBox" id="no_apps">
<property name="visible">0</property>
- <property name="orientation">vertical</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="orientation">1</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<child>
<object class="GtkImage">
+ <property name="css-classes">dim-label</property>
<property name="icon-name">application-x-executable-symbolic</property>
<property name="pixel-size">48</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-top">12</property>
<property name="margin-bottom">12</property>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkLabel" id="no_apps_label">
- <property name="label" translatable="yes">No applications found.</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="css-classes">dim-label</property>
+ <property name="label" translatable="1">No applications found.</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="wrap">1</property>
<attributes>
<attribute name="scale" value="1.2"></attribute>
</attributes>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
</object>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index f8742b5f0a..3048e4a067 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -10,15 +10,13 @@
<object class="GtkBox" id="main_box">
<child>
<object class="GtkBox" id="sidebar">
- <property name="orientation">vertical</property>
- <style>
- <class name="sidebar"/>
- </style>
+ <property name="css-classes">sidebar</property>
+ <property name="orientation">1</property>
</object>
</child>
<child>
<object class="GtkBox" id="content_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="hexpand">1</property>
<child>
<object class="GtkStack" id="content">
@@ -28,7 +26,7 @@
</child>
<child>
<object class="GtkBox" id="action_area">
- <property name="halign">end</property>
+ <property name="halign">2</property>
<property name="spacing">6</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
@@ -36,71 +34,59 @@
<property name="margin-bottom">6</property>
<child>
<object class="GtkButton" id="close">
+ <property name="css-classes">text-button</property>
<property name="visible">0</property>
- <property name="label" translatable="yes">_Close</property>
+ <property name="label" translatable="1">_Close</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_close" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="cancel">
+ <property name="css-classes">text-button</property>
<property name="visible">0</property>
- <property name="label" translatable="yes">_Cancel</property>
+ <property name="label" translatable="1">_Cancel</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_cancel" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="last">
+ <property name="css-classes">text-button</property>
<property name="visible">0</property>
- <property name="label" translatable="yes">_Finish</property>
+ <property name="label" translatable="1">_Finish</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_last" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="back">
- <property name="label" translatable="yes">_Back</property>
+ <property name="css-classes">text-button</property>
+ <property name="label" translatable="1">_Back</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_back" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="forward">
- <property name="label" translatable="yes">_Next</property>
+ <property name="css-classes">text-button</property>
+ <property name="label" translatable="1">_Next</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_forward" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="apply">
+ <property name="css-classes">text-button</property>
<property name="visible">0</property>
- <property name="label" translatable="yes">_Apply</property>
+ <property name="label" translatable="1">_Apply</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
- <style>
- <class name="text-button"/>
- </style>
<signal name="clicked" handler="on_assistant_apply" swapped="no"/>
</object>
</child>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 65b23b51ab..6cf8eac1cb 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkColorChooserDialog" parent="GtkDialog">
- <property name="title" translatable="yes">Select a Color</property>
+ <property name="title" translatable="1">Select a Color</property>
<property name="resizable">0</property>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@@ -30,12 +30,12 @@
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="use-underline">1</property>
- <property name="label" translatable="yes">_Cancel</property>
+ <property name="label" translatable="1">_Cancel</property>
</object>
</child>
<child type="action">
<object class="GtkButton" id="ok_button">
- <property name="label" translatable="yes">_Select</property>
+ <property name="label" translatable="1">_Select</property>
<property name="use-underline">1</property>
</object>
</child>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index c34f6a008a..2bb72e51d1 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -37,20 +37,18 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkButton" id="picker_button">
+ <property name="css-classes">circular</property>
<property name="icon-name">color-select-symbolic</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="tooltip-text" translatable="yes">Pick a color from the screen</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
+ <property name="tooltip-text" translatable="1">Pick a color from the screen</property>
<signal name="clicked" handler="pick_color"/>
- <style>
- <class name="circular"/>
- </style>
<layout>
<property name="column">0</property>
<property name="row">0</property>
</layout>
<accessibility>
- <property name="label" translatable="yes">Pick a color from the screen</property>
+ <property name="label" translatable="1">Pick a color from the screen</property>
</accessibility>
</object>
</child>
@@ -77,7 +75,7 @@
<property name="row">0</property>
</layout>
<accessibility>
- <property name="label" translatable="yes">Hexadecimal color or color name</property>
+ <property name="label" translatable="1">Hexadecimal color or color name</property>
</accessibility>
</object>
</child>
@@ -92,26 +90,24 @@
<property name="row">1</property>
</layout>
<accessibility>
- <property name="label" translatable="yes">Hue</property>
+ <property name="label" translatable="1">Hue</property>
</accessibility>
</object>
</child>
<child>
<object class="GtkColorScale" id="a_slider">
+ <property name="css-classes">marks-before</property>
<property name="name">a</property>
<property name="adjustment">a_adj</property>
<property name="scale-type">1</property>
<property name="has-origin">False</property>
- <style>
- <class name="marks-before"/>
- </style>
<layout>
<property name="column">1</property>
<property name="row">2</property>
<property name="column-span">2</property>
</layout>
<accessibility>
- <property name="label" translatable="yes">Alpha value</property>
+ <property name="label" translatable="1">Alpha value</property>
</accessibility>
</object>
</child>
@@ -129,7 +125,7 @@
<property name="column-span">2</property>
</layout>
<accessibility>
- <property name="label" translatable="yes">Saturation and value</property>
+ <property name="label" translatable="1">Saturation and value</property>
</accessibility>
</object>
</child>
@@ -139,11 +135,9 @@
</child>
</template>
<object class="GtkBox" id="a_popup">
+ <property name="css-classes">popover
+osd</property>
<property name="visible">0</property>
- <style>
- <class name="popover"/>
- <class name="osd"/>
- </style>
<child>
<object class="GtkGrid" id="grid4">
<property name="margin-start">12</property>
@@ -153,7 +147,7 @@
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="label4">
- <property name="label" translatable="yes" context="Color channel">A</property>
+ <property name="label" translatable="1" context="Color channel">A</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -175,11 +169,9 @@
</child>
</object>
<object class="GtkBox" id="h_popup">
+ <property name="css-classes">popover
+osd</property>
<property name="visible">0</property>
- <style>
- <class name="popover"/>
- <class name="osd"/>
- </style>
<child>
<object class="GtkGrid" id="grid3">
<property name="margin-start">12</property>
@@ -189,7 +181,7 @@
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="label3">
- <property name="label" translatable="yes" context="Color channel">H</property>
+ <property name="label" translatable="1" context="Color channel">H</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -211,11 +203,9 @@
</child>
</object>
<object class="GtkBox" id="sv_popup">
+ <property name="css-classes">popover
+osd</property>
<property name="visible">0</property>
- <style>
- <class name="popover"/>
- <class name="osd"/>
- </style>
<child>
<object class="GtkGrid" id="grid2">
<property name="margin-start">12</property>
@@ -226,7 +216,7 @@
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
- <property name="label" translatable="yes" context="Color Channel">S</property>
+ <property name="label" translatable="1" context="Color Channel">S</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -235,7 +225,7 @@
</child>
<child>
<object class="GtkLabel" id="label2">
- <property name="label" translatable="yes" context="Color Channel">V</property>
+ <property name="label" translatable="1" context="Color Channel">V</property>
<layout>
<property name="column">0</property>
<property name="row">1</property>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index c502fc8529..31daec54b3 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -3,9 +3,7 @@
<template class="GtkComboBox" parent="GtkWidget">
<child>
<object class="GtkBox" id="box">
- <style>
- <class name="linked"/>
- </style>
+ <property name="css-classes">linked</property>
<child>
<object class="GtkToggleButton" id="button">
<signal name="toggled" handler="gtk_combo_box_button_toggled" swapped="no"/>
@@ -23,19 +21,21 @@
</object>
</child>
<child>
- <object class="GtkTreePopover" id="popup_widget">
- <property name="cell-area"><object class="GtkCellAreaBox" id="area"/></property>
- <property name="has-arrow">0</property>
- <signal name="menu-activate" handler="gtk_combo_box_menu_activate" swapped="no"/>
- <signal name="show" handler="gtk_combo_box_menu_show" swapped="no"/>
- <signal name="hide" handler="gtk_combo_box_menu_hide" swapped="no"/>
- <child>
- <object class="GtkEventControllerKey">
- <signal name="key-pressed" handler="gtk_combo_box_menu_key" swapped="no"/>
- <signal name="key-released" handler="gtk_combo_box_menu_key" swapped="no"/>
+ <object class="GtkTreePopover" id="popup_widget">
+ <property name="cell-area">
+ <object class="GtkCellAreaBox" id="area"/>
+ </property>
+ <property name="has-arrow">0</property>
+ <signal name="menu-activate" handler="gtk_combo_box_menu_activate" swapped="no"/>
+ <signal name="show" handler="gtk_combo_box_menu_show" swapped="no"/>
+ <signal name="hide" handler="gtk_combo_box_menu_hide" swapped="no"/>
+ <child>
+ <object class="GtkEventControllerKey">
+ <signal name="key-pressed" handler="gtk_combo_box_menu_key" swapped="no"/>
+ <signal name="key-released" handler="gtk_combo_box_menu_key" swapped="no"/>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
</template>
</interface>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 2b25d79192..7e64dcf994 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -6,25 +6,19 @@
</child>
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
- <style>
- <class name="dialog-vbox"/>
- </style>
+ <property name="css-classes">dialog-vbox</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkBox" id="content_area"/>
</child>
<child>
<object class="GtkBox" id="action_box">
- <style>
- <class name="dialog-action-box"/>
- </style>
+ <property name="css-classes">dialog-action-box</property>
<child>
<object class="GtkBox" id="action_area">
+ <property name="css-classes">dialog-action-area</property>
<property name="hexpand">1</property>
- <property name="halign">end</property>
- <style>
- <class name="dialog-action-area"/>
- </style>
+ <property name="halign">2</property>
</object>
</child>
</object>
diff --git a/gtk/ui/gtkdropdown.ui b/gtk/ui/gtkdropdown.ui
index 16e55b5b3d..7049bf96bf 100644
--- a/gtk/ui/gtkdropdown.ui
+++ b/gtk/ui/gtkdropdown.ui
@@ -9,7 +9,6 @@
<property name="can-focus">0</property>
<child>
<object class="GtkStack" id="button_stack">
- <property name="halign">fill</property>
<property name="hexpand">1</property>
<property name="hhomogeneous">0</property>
<child>
@@ -17,7 +16,7 @@
<property name="name">empty</property>
<property name="child">
<object class="GtkLabel">
- <property name="label" translatable="yes">(None)</property>
+ <property name="label" translatable="1">(None)</property>
<property name="xalign">0</property>
</object>
</property>
@@ -43,52 +42,46 @@
</object>
</child>
<child>
- <object class="GtkPopover" id="popup">
- <signal name="closed" handler="popover_closed"/>
- <property name="halign">start</property>
- <property name="has-arrow">0</property>
- <property name="autohide">1</property>
- <style>
- <class name="menu"/>
- </style>
- <child>
- <object class="GtkBox">
- <property name="orientation">vertical</property>
+ <object class="GtkPopover" id="popup">
+ <property name="css-classes">menu</property>
+ <signal name="closed" handler="popover_closed"/>
+ <property name="halign">1</property>
+ <property name="has-arrow">0</property>
<child>
- <object class="GtkBox" id="search_box">
- <property name="visible">0</property>
- <style>
- <class name="dropdown-searchbar"/>
- </style>
+ <object class="GtkBox">
+ <property name="orientation">1</property>
<child>
- <object class="GtkSearchEntry" id="search_entry">
- <signal name="search-changed" handler="search_changed"/>
- <signal name="stop-search" handler="search_stop"/>
- <property name="hexpand">1</property>
- <property name="max-width-chars">6</property>
- <property name="width-chars">6</property>
- <property name="placeholder-text" translatable="yes">Search…</property>
+ <object class="GtkBox" id="search_box">
+ <property name="css-classes">dropdown-searchbar</property>
+ <property name="visible">0</property>
+ <child>
+ <object class="GtkSearchEntry" id="search_entry">
+ <signal name="search-changed" handler="search_changed"/>
+ <signal name="stop-search" handler="search_stop"/>
+ <property name="hexpand">1</property>
+ <property name="max-width-chars">6</property>
+ <property name="width-chars">6</property>
+ <property name="placeholder-text" translatable="1">Search…</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkScrolledWindow">
- <property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">automatic</property>
- <property name="max-content-height">400</property>
- <property name="propagate-natural-height">1</property>
<child>
- <object class="GtkListView" id="popup_list">
- <signal name="activate" handler="row_activated"/>
- <property name="single-click-activate">1</property>
+ <object class="GtkScrolledWindow">
+ <property name="hscrollbar-policy">2</property>
+ <property name="max-content-height">400</property>
+ <property name="propagate-natural-height">1</property>
+ <child>
+ <object class="GtkListView" id="popup_list">
+ <signal name="activate" handler="row_activated"/>
+ <property name="single-click-activate">1</property>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
</object>
</child>
- </object>
- </child>
</template>
</interface>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index 4a2dc407fa..3a2b5e4310 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkEmojiChooser" parent="GtkPopover">
+ <property name="css-classes">emoji-picker</property>
<property name="height-request">410</property>
- <style>
- <class name="emoji-picker"/>
- </style>
<child>
<object class="GtkBox" id="box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkBox">
- <style>
- <class name="emoji-searchbar"/>
- </style>
+ <property name="css-classes">emoji-searchbar</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="hexpand">1</property>
@@ -29,17 +25,15 @@
<property name="name">list</property>
<property name="child">
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
+ <property name="css-classes">view</property>
<property name="vexpand">1</property>
- <property name="hscrollbar-policy">never</property>
- <style>
- <class name="view"/>
- </style>
+ <property name="hscrollbar-policy">2</property>
<child>
<object class="GtkBox" id="emoji_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
@@ -48,7 +42,7 @@
<child>
<object class="GtkFlowBox" id="recent.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
<child>
@@ -66,14 +60,14 @@
</child>
<child>
<object class="GtkLabel" id="people.heading">
- <property name="label" translatable="yes" context="emoji category">Smileys
& People</property>
+ <property name="label" translatable="1" context="emoji category">Smileys
& People</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="people.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
<child>
@@ -91,14 +85,14 @@
</child>
<child>
<object class="GtkLabel" id="body.heading">
- <property name="label" translatable="yes" context="emoji category">Body
& Clothing</property>
+ <property name="label" translatable="1" context="emoji category">Body &
Clothing</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="body.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
<child>
@@ -116,98 +110,98 @@
</child>
<child>
<object class="GtkLabel" id="nature.heading">
- <property name="label" translatable="yes" context="emoji category">Animals
& Nature</property>
+ <property name="label" translatable="1" context="emoji category">Animals
& Nature</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="nature.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="food.heading">
- <property name="label" translatable="yes" context="emoji category">Food
& Drink</property>
+ <property name="label" translatable="1" context="emoji category">Food &
Drink</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="food.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="travel.heading">
- <property name="label" translatable="yes" context="emoji category">Travel
& Places</property>
+ <property name="label" translatable="1" context="emoji category">Travel
& Places</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="travel.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="activities.heading">
- <property name="label" translatable="yes" context="emoji
category">Activities</property>
+ <property name="label" translatable="1" context="emoji
category">Activities</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="activities.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="objects.heading">
- <property name="label" translatable="yes" context="emoji
category">Objects</property>
+ <property name="label" translatable="1" context="emoji
category">Objects</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="objects.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="symbols.heading">
- <property name="label" translatable="yes" context="emoji
category">Symbols</property>
+ <property name="label" translatable="1" context="emoji
category">Symbols</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="symbols.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
</child>
<child>
<object class="GtkLabel" id="flags.heading">
- <property name="label" translatable="yes" context="emoji
category">Flags</property>
+ <property name="label" translatable="1" context="emoji
category">Flags</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkFlowBox" id="flags.box">
<property name="homogeneous">1</property>
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="child-activated" handler="emoji_activated"/>
<signal name="keynav-failed" handler="keynav_failed"/>
</object>
@@ -218,100 +212,78 @@
</child>
<child>
<object class="GtkFlowBox">
+ <property name="css-classes">emoji-toolbar</property>
<property name="min-children-per-line">3</property>
<property name="max-children-per-line">10</property>
- <property name="selection-mode">none</property>
- <style>
- <class name="emoji-toolbar"/>
- </style>
+ <property name="selection-mode">0</property>
<child>
<object class="GtkButton" id="recent.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Recent</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji
category">Recent</property>
</object>
</child>
<child>
<object class="GtkButton" id="people.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Smileys & People</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji category">Smileys
& People</property>
</object>
</child>
<child>
<object class="GtkButton" id="body.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji category">Body
& Clothing</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji category">Body
& Clothing</property>
</object>
</child>
<child>
<object class="GtkButton" id="nature.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Animals & Nature</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji category">Animals
& Nature</property>
</object>
</child>
<child>
<object class="GtkButton" id="food.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji category">Food
& Drink</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji category">Food
& Drink</property>
</object>
</child>
<child>
<object class="GtkButton" id="travel.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji category">Travel
& Places</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji category">Travel
& Places</property>
</object>
</child>
<child>
<object class="GtkButton" id="activities.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Activities</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji
category">Activities</property>
</object>
</child>
<child>
<object class="GtkButton" id="objects.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Objects</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji
category">Objects</property>
</object>
</child>
<child>
<object class="GtkButton" id="symbols.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Symbols</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji
category">Symbols</property>
</object>
</child>
<child>
<object class="GtkButton" id="flags.button">
+ <property name="css-classes">emoji-section</property>
<property name="has-frame">0</property>
- <property name="tooltip-text" translatable="yes" context="emoji
category">Flags</property>
- <style>
- <class name="emoji-section"/>
- </style>
+ <property name="tooltip-text" translatable="1" context="emoji
category">Flags</property>
</object>
</child>
</object>
@@ -325,19 +297,15 @@
<property name="name">empty</property>
<property name="child">
<object class="GtkGrid">
+ <property name="css-classes">dim-label</property>
<property name="row-spacing">12</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<child>
<object class="GtkImage">
+ <property name="css-classes">dim-label</property>
<property name="icon-name">edit-find-symbolic</property>
<property name="pixel-size">72</property>
- <style>
- <class name="dim-label"/>
- </style>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -346,7 +314,7 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">No Results Found</property>
+ <property name="label" translatable="1">No Results Found</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
<attribute name="scale" value="1.44"></attribute>
@@ -359,10 +327,8 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Try a different search</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="css-classes">dim-label</property>
+ <property name="label" translatable="1">Try a different search</property>
<layout>
<property name="column">0</property>
<property name="row">2</property>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui
index 5d975abefe..02995b8a84 100644
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkEmojiCompletion" parent="GtkPopover">
+ <property name="css-classes">emoji-completion</property>
<property name="autohide">0</property>
<property name="has-arrow">0</property>
- <style>
- <class name="emoji-completion"/>
- </style>
<child>
<object class="GtkListBox" id="list">
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="row-activated" handler="row_activated"/>
</object>
</child>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index c48e07f2b5..53ed506135 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -5,7 +5,7 @@
<signal name="response" handler="response_cb" swapped="no"/>
<child internal-child="content_area">
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child internal-child="action_area">
<object class="GtkBox" id="dialog-action_area1">
<property name="margin-start">6</property>
@@ -13,7 +13,7 @@
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="hexpand">1</property>
- <property name="halign">end</property>
+ <property name="halign">2</property>
</object>
</child>
<child>
@@ -26,6 +26,6 @@
</child>
</template>
<object class="GtkSizeGroup" id="buttons">
- <property name="mode">vertical</property>
+ <property name="mode">2</property>
</object>
</interface>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 9346afd767..f3c9635cd6 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -3,10 +3,10 @@
<template class="GtkFileChooserWidget" parent="GtkWidget">
<child>
<object class="GtkBox" id="box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkBox" id="browse_widgets_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkPaned" id="browse_widgets_hpaned">
@@ -16,11 +16,9 @@
<property name="vexpand">1</property>
<child>
<object class="GtkPlacesSidebar" id="places_sidebar">
+ <property name="css-classes">sidebar</property>
<property name="show-other-locations">1</property>
<property name="show-trash">0</property>
- <style>
- <class name="sidebar"/>
- </style>
<signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/>
<signal name="show-error-message" handler="places_sidebar_show_error_message_cb"
swapped="no"/>
<signal name="show-other-locations-with-flags"
handler="places_sidebar_show_other_locations_with_flags_cb" swapped="no"/>
@@ -28,21 +26,19 @@
</child>
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkRevealer" id="browse_header_revealer">
<property name="hexpand">1</property>
<child>
<object class="GtkBox">
+ <property name="css-classes">view</property>
<property name="name">pathbarbox</property>
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
- <style>
- <class name="view"/>
- </style>
<child>
<object class="GtkStack" id="browse_header_stack">
- <property name="transition-type">crossfade</property>
+ <property name="transition-type">1</property>
<child>
<object class="GtkStackPage">
<property name="name">pathbar</property>
@@ -61,7 +57,7 @@
</child>
<child>
<object class="GtkMenuButton" id="browse_new_folder_button">
- <property name="tooltip-text" translatable="yes">Create
Folder</property>
+ <property name="tooltip-text" translatable="1">Create
Folder</property>
<property name="popover">new_folder_popover</property>
<property name="icon-name">folder-new-symbolic</property>
</object>
@@ -97,7 +93,7 @@
<object class="GtkSearchEntry" id="search_entry">
<property name="width-chars">45</property>
<property name="hexpand">1</property>
- <property name="halign">center</property>
+ <property name="halign">3</property>
<signal name="search-changed" handler="search_entry_activate_cb"
swapped="yes"/>
<signal name="stop-search" handler="search_entry_stop_cb"
swapped="yes"/>
</object>
@@ -123,21 +119,19 @@
<property name="vexpand">1</property>
<child>
<object class="GtkStack" id="browse_files_stack">
- <property name="transition-type">crossfade</property>
+ <property name="css-classes">view</property>
+ <property name="transition-type">1</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
- <style>
- <class name="view"/>
- </style>
<child>
<object class="GtkStackPage">
<property name="name">list</property>
<property name="child">
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkScrolledWindow" id="browse_files_swin">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="vexpand">1</property>
<child>
<object class="GtkTreeView" id="browse_files_tree_view">
@@ -165,7 +159,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="list_name_column">
- <property name="title" translatable="yes">Name</property>
+ <property name="title" translatable="1">Name</property>
<property name="resizable">1</property>
<property name="expand">1</property>
<child>
@@ -176,14 +170,14 @@
<child>
<object class="GtkCellRendererText"
id="list_name_renderer">
<property name="width-chars">10</property>
- <property name="ellipsize">end</property>
+ <property name="ellipsize">3</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="list_location_column">
- <property name="title" translatable="yes">Location</property>
+ <property name="title" translatable="1">Location</property>
<property name="resizable">1</property>
<property name="visible">0</property>
<property name="expand">1</property>
@@ -191,7 +185,7 @@
<object class="GtkCellRendererText"
id="list_location_renderer">
<property name="xalign">0</property>
<property name="width-chars">10</property>
- <property name="ellipsize">start</property>
+ <property name="ellipsize">1</property>
<property name="xpad">6</property>
</object>
</child>
@@ -199,8 +193,8 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="list_size_column">
- <property name="title" translatable="yes">Size</property>
- <property name="sizing">fixed</property>
+ <property name="title" translatable="1">Size</property>
+ <property name="sizing">2</property>
<child>
<object class="GtkCellRendererText"
id="list_size_renderer">
<property name="xalign">0</property>
@@ -211,7 +205,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="list_type_column">
- <property name="title" translatable="yes">Type</property>
+ <property name="title" translatable="1">Type</property>
<property name="resizable">1</property>
<child>
<object class="GtkCellRendererText"
id="list_type_renderer">
@@ -223,8 +217,8 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="list_time_column">
- <property name="title" translatable="yes">Modified</property>
- <property name="sizing">fixed</property>
+ <property name="title" translatable="1">Modified</property>
+ <property name="sizing">2</property>
<child>
<object class="GtkCellRendererText"
id="list_date_renderer">
<property name="xpad">6</property>
@@ -246,7 +240,7 @@
<property name="visible">0</property>
<child type="center">
<object class="GtkLabel">
- <property name="label" translatable="yes">Remote location — only
searching the current folder</property>
+ <property name="label" translatable="1">Remote location — only
searching the current folder</property>
</object>
</child>
</object>
@@ -271,21 +265,17 @@
<property name="name">empty</property>
<property name="child">
<object class="GtkGrid">
+ <property name="css-classes">dim-label</property>
<property name="row-spacing">12</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<child>
<object class="GtkImage">
+ <property name="css-classes">dim-label</property>
<property name="icon-name">edit-find-symbolic</property>
<property name="pixel-size">72</property>
- <style>
- <class name="dim-label"/>
- </style>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -294,7 +284,7 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">No Results Found</property>
+ <property name="label" translatable="1">No Results Found</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
<attribute name="scale" value="1.44"></attribute>
@@ -307,10 +297,8 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Try a different
search</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="css-classes">dim-label</property>
+ <property name="label" translatable="1">Try a different
search</property>
<layout>
<property name="column">0</property>
<property name="row">2</property>
@@ -343,9 +331,9 @@
<object class="GtkBox" id="filter_combo_hbox">
<child>
<object class="GtkDropDown" id="filter_combo">
- <property name="tooltip-text" translatable="yes">Select which types of files are
shown</property>
+ <property name="tooltip-text" translatable="1">Select which types of files are
shown</property>
<property name="focus-on-click">0</property>
- <property name="valign">start</property>
+ <property name="valign">1</property>
<signal name="notify::selected" handler="filter_combo_changed" swapped="no"/>
</object>
</child>
@@ -357,7 +345,7 @@
</child>
</template>
<object class="GtkSizeGroup" id="browse_path_bar_size_group">
- <property name="mode">vertical</property>
+ <property name="mode">2</property>
<widgets>
<widget name="browse_path_bar"/>
<widget name="browse_new_folder_button"/>
@@ -375,8 +363,8 @@
<property name="row-spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Folder Name</property>
- <property name="halign">start</property>
+ <property name="label" translatable="1">Folder Name</property>
+ <property name="halign">1</property>
<property name="mnemonic-widget">new_folder_name_entry</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
@@ -400,13 +388,11 @@
</child>
<child>
<object class="GtkButton" id="new_folder_create_button">
+ <property name="css-classes">suggested-action</property>
<property name="sensitive">0</property>
- <property name="label" translatable="yes">_Create</property>
+ <property name="label" translatable="1">_Create</property>
<property name="use-underline">1</property>
<signal name="clicked" handler="new_folder_create_clicked"/>
- <style>
- <class name="suggested-action"/>
- </style>
<layout>
<property name="column">1</property>
<property name="row">1</property>
@@ -437,8 +423,8 @@
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Name</property>
- <property name="halign">start</property>
+ <property name="label" translatable="1">Name</property>
+ <property name="halign">1</property>
<property name="mnemonic-widget">rename_file_name_entry</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
@@ -461,13 +447,11 @@
</child>
<child>
<object class="GtkButton" id="rename_file_rename_button">
+ <property name="css-classes">suggested-action</property>
<property name="sensitive">0</property>
- <property name="label" translatable="yes">_Rename</property>
+ <property name="label" translatable="1">_Rename</property>
<property name="use-underline">1</property>
<signal name="clicked" handler="rename_file_rename_clicked"/>
- <style>
- <class name="suggested-action"/>
- </style>
<layout>
<property name="column">1</property>
<property name="row">1</property>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index c7fd9086db..b99ed11ba8 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkFontChooserDialog" parent="GtkDialog">
- <property name="title" translatable="yes">Select Font</property>
+ <property name="title" translatable="1">Select Font</property>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@@ -21,12 +21,12 @@
<child type="action">
<object class="GtkButton" id="cancel_button">
<property name="use-underline">1</property>
- <property name="label" translatable="yes">_Cancel</property>
+ <property name="label" translatable="1">_Cancel</property>
</object>
</child>
<child type="action">
<object class="GtkButton" id="select_button">
- <property name="label" translatable="yes">_Select</property>
+ <property name="label" translatable="1">_Select</property>
<property name="use-underline">1</property>
</object>
</child>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 1070cc7e45..d3d72b077a 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<object class="GtkSingleSelection" id="selection">
- <signal name="notify::selected-item" handler="selection_changed_cb" object="GtkFontChooserWidget"
swapped="0" />
- <signal name="items-changed" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
+ <signal name="notify::selected-item" handler="selection_changed_cb" object="GtkFontChooserWidget"
swapped="0"/>
+ <signal name="items-changed" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1"/>
<property name="model">
<object class="GtkFilterListModel" id="filter_model">
- <signal name="notify::pending" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1" />
+ <signal name="notify::pending" handler="rows_changed_cb" object="GtkFontChooserWidget" swapped="1"/>
<property name="incremental">1</property>
<property name="filter">
<object class="GtkEveryFilter">
@@ -15,7 +15,7 @@
<lookup name="text">search_entry</lookup>
</binding>
<property name="expression">
- <closure type="gchararray" swapped="1" function="get_font_name" />
+ <closure type="gchararray" swapped="1" function="get_font_name"/>
</property>
</object>
</child>
@@ -54,14 +54,12 @@
<property name="column-spacing">6</property>
<child>
<object class="GtkBox">
- <style>
- <class name="linked"/>
- </style>
+ <property name="css-classes">linked</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="hexpand">1</property>
<property name="activates-default">1</property>
- <property name="placeholder-text" translatable="yes">Search font name</property>
+ <property name="placeholder-text" translatable="1">Search font name</property>
<signal name="stop-search" handler="stop_search_cb" swapped="no"/>
</object>
</child>
@@ -72,27 +70,25 @@
<object class="GtkPopover">
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Filter by</property>
+ <property name="css-classes">title-4</property>
+ <property name="label" translatable="1">Filter by</property>
<property name="width-chars">20</property>
<property name="margin-bottom">10</property>
- <style>
- <class name="title-4"/>
- </style>
</object>
</child>
<child>
<object class="GtkCheckButton" id="monospace_button">
- <property name="label" translatable="yes">Monospace</property>
+ <property name="label" translatable="1">Monospace</property>
<signal name="notify::active" handler="monospace_check_changed"/>
</object>
</child>
<child>
<object class="GtkCheckButton" id="language_button">
- <property name="label" translatable="yes">Language</property>
+ <property name="label" translatable="1">Language</property>
<signal name="notify::active" handler="language_check_changed"/>
</object>
</child>
@@ -102,11 +98,9 @@
<child>
<object class="GtkScrolledWindow">
<property name="min-content-height">200</property>
- <property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">automatic</property>
+ <property name="hscrollbar-policy">2</property>
<child>
- <object class="GtkListView" id="language_list">
- </object>
+ <object class="GtkListView" id="language_list"/>
</child>
</object>
</child>
@@ -139,11 +133,10 @@
<property name="height-request">300</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<child>
<object class="GtkListView" id="family_face_list">
- <property name="can-focus">1</property>
<property name="model">selection</property>
<signal name="activate" handler="row_activated_cb" swapped="no"/>
<property name="factory">
@@ -188,10 +181,10 @@
</child>
<child>
<object class="GtkEntry" id="preview">
- <property name="placeholder-text" translatable="yes">Preview text</property>
+ <property name="placeholder-text" translatable="1">Preview text</property>
<child>
<object class="GtkEventControllerScroll">
- <property name="flags" translatable="yes">horizontal</property>
+ <property name="flags" translatable="1">horizontal</property>
<signal name="scroll" handler="resize_by_scroll_cb"/>
</object>
</child>
@@ -204,9 +197,9 @@
</child>
<child>
<object class="GtkLabel" id="size_label">
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="1">Size</property>
<property name="xalign">0</property>
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">0</property>
<property name="row">3</property>
@@ -217,11 +210,10 @@
<object class="GtkScale" id="size_slider">
<property name="hexpand">1</property>
<property name="adjustment">slider_adjustment</property>
- <property name="draw-value">0</property>
<property name="round-digits">0</property>
<child>
<object class="GtkEventControllerScroll">
- <property name="flags" translatable="yes">horizontal</property>
+ <property name="flags" translatable="1">horizontal</property>
<signal name="scroll" handler="resize_by_scroll_cb"/>
</object>
</child>
@@ -234,7 +226,7 @@
<child>
<object class="GtkSpinButton" id="size_spin">
<property name="adjustment">spin_adjustment</property>
- <property name="valign">center</property>
+ <property name="valign">3</property>
<signal name="output" handler="output_cb"/>
<layout>
<property name="column">2</property>
@@ -251,14 +243,12 @@
<property name="name">empty</property>
<property name="child">
<object class="GtkGrid">
+ <property name="css-classes">dim-label</property>
<property name="row-spacing">12</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<child>
<object class="GtkImage">
<property name="gicon">fonticon</property>
@@ -271,7 +261,7 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">No Fonts Found</property>
+ <property name="label" translatable="1">No Fonts Found</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
<attribute name="scale" value="1.2"></attribute>
@@ -301,7 +291,7 @@
<property name="name">tweaks</property>
<property name="child">
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="font_name_label">
@@ -309,7 +299,7 @@
<property name="margin-bottom">6</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
- <property name="ellipsize">end</property>
+ <property name="ellipsize">3</property>
<property name="xalign">0</property>
<binding name="label" object="GtkFontChooserWidget">
<closure type="gchararray" function="get_font_name">
@@ -325,22 +315,20 @@
</child>
<child>
<object class="GtkEntry" id="preview2">
- <property name="placeholder-text" translatable="yes">Preview text</property>
+ <property name="placeholder-text" translatable="1">Preview text</property>
<property name="text" bind-source="preview" bind-property="text"
bind-flags="bidirectional"/>
<property name="attributes" bind-source="preview" bind-property="attributes"
bind-flags="bidirectional"/>
</object>
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="hscrollbar-policy">never</property>
+ <property name="css-classes">view</property>
+ <property name="hscrollbar-policy">2</property>
<property name="has-frame">1</property>
<property name="vexpand">1</property>
- <style>
- <class name="view"/>
- </style>
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
@@ -352,9 +340,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="size_label2">
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="1">Size</property>
<property name="xalign">0</property>
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
@@ -365,7 +353,6 @@
<object class="GtkScale" id="size_slider2">
<property name="hexpand">1</property>
<property name="adjustment">slider_adjustment</property>
- <property name="draw-value">0</property>
<property name="round-digits">0</property>
<layout>
<property name="column">1</property>
@@ -376,7 +363,7 @@
<child>
<object class="GtkSpinButton" id="size_spin2">
<property name="adjustment">spin_adjustment</property>
- <property name="valign">center</property>
+ <property name="valign">3</property>
<signal name="output" handler="output_cb"/>
<layout>
<property name="column">2</property>
@@ -388,7 +375,7 @@
</child>
<child>
<object class="GtkBox" id="feature_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
</object>
</child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index a5bb4538f6..9cf27e7389 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -4,8 +4,8 @@
<property name="receives-default">1</property>
<child>
<object class="GtkBox" id="box">
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image">
@@ -17,13 +17,13 @@
<child>
<object class="GtkLabel" id="label_lock">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Lock</property>
+ <property name="label" translatable="1">Lock</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label_unlock">
<property name="xalign">0</property>
- <property name="label" translatable="yes">Unlock</property>
+ <property name="label" translatable="1">Unlock</property>
</object>
</child>
</object>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index eaca2ae17c..08799d64e6 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -21,8 +21,8 @@
<child>
<object class="GtkButton" id="play_button">
<property name="receives-default">1</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="has-frame">0</property>
<property name="icon-name">media-playback-start-symbolic</property>
<signal name="clicked" handler="play_button_clicked" object="GtkMediaControls" swapped="no"/>
@@ -33,14 +33,13 @@
<child>
<object class="GtkLabel" id="time_label">
<attributes>
- <attribute name="font-features" value="tnum=1"/>
+ <attribute name="font-features" value="tnum=1"></attribute>
</attributes>
</object>
</child>
<child>
<object class="GtkScale" id="seek_scale">
<property name="adjustment">time_adjustment</property>
- <property name="draw_value">0</property>
<property name="restrict-to-fill-level">0</property>
<property name="hexpand">1</property>
</object>
@@ -48,7 +47,7 @@
<child>
<object class="GtkLabel" id="duration_label">
<attributes>
- <attribute name="font-features" value="tnum=1"/>
+ <attribute name="font-features" value="tnum=1"></attribute>
</attributes>
</object>
</child>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 42c6528b4a..5d0a760f74 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -10,7 +10,7 @@
</child>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">20</property>
<child>
<object class="GtkBox" id="box">
@@ -19,13 +19,13 @@
<property name="spacing">30</property>
<child>
<object class="GtkBox" id="message_area">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">10</property>
<property name="hexpand">1</property>
<child>
<object class="GtkLabel" id="label">
- <property name="halign">center</property>
- <property name="valign">start</property>
+ <property name="halign">3</property>
+ <property name="valign">1</property>
<property name="wrap">1</property>
<property name="max-width-chars">60</property>
</object>
@@ -34,8 +34,8 @@
<object class="GtkLabel" id="secondary_label">
<property name="visible">0</property>
<property name="margin-bottom">2</property>
- <property name="halign">center</property>
- <property name="valign">start</property>
+ <property name="halign">3</property>
+ <property name="valign">1</property>
<property name="vexpand">1</property>
<property name="wrap">1</property>
<property name="max-width-chars">60</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 1fe89e5575..79b5edce16 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -2,10 +2,10 @@
<interface domain="gtk40">
<template class="GtkPageSetupUnixDialog" parent="GtkDialog">
<property name="resizable">0</property>
- <property name="title" translatable="yes">Page Setup</property>
+ <property name="title" translatable="1">Page Setup</property>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
@@ -22,9 +22,9 @@
<property name="vexpand">1</property>
<child>
<object class="GtkLabel" id="printer_combo_label">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">_Format for:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">_Format for:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">printer_combo</property>
<layout>
@@ -46,9 +46,9 @@
</child>
<child>
<object class="GtkLabel" id="paper_size_combo_label">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">_Paper size:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">_Paper size:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">paper_size_combo</property>
<layout>
@@ -70,8 +70,8 @@
</child>
<child>
<object class="GtkLabel" id="paper_size_label">
- <property name="halign">start</property>
- <property name="valign">center</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
<layout>
<property name="column">1</property>
<property name="row">2</property>
@@ -81,9 +81,9 @@
</child>
<child>
<object class="GtkLabel" id="orientation_label">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">_Orientation:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">_Orientation:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">portrait_radio</property>
<layout>
@@ -95,7 +95,7 @@
<child>
<object class="GtkCheckButton" id="portrait_radio">
<property name="active">1</property>
- <property name="label" translatable="yes">Portrait</property>
+ <property name="label" translatable="1">Portrait</property>
<layout>
<property name="column">1</property>
<property name="row">3</property>
@@ -106,7 +106,7 @@
<object class="GtkCheckButton" id="reverse_portrait_radio">
<property name="active">1</property>
<property name="group">portrait_radio</property>
- <property name="label" translatable="yes">Reverse portrait</property>
+ <property name="label" translatable="1">Reverse portrait</property>
<layout>
<property name="column">2</property>
<property name="row">3</property>
@@ -118,7 +118,7 @@
<property name="hexpand">1</property>
<property name="active">1</property>
<property name="group">portrait_radio</property>
- <property name="label" translatable="yes">Landscape</property>
+ <property name="label" translatable="1">Landscape</property>
<layout>
<property name="column">1</property>
<property name="row">4</property>
@@ -129,7 +129,7 @@
<object class="GtkCheckButton" id="reverse_landscape_radio">
<property name="hexpand">1</property>
<property name="group">portrait_radio</property>
- <property name="label" translatable="yes">Reverse landscape</property>
+ <property name="label" translatable="1">Reverse landscape</property>
<layout>
<property name="column">2</property>
<property name="row">4</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 7c5a927ae2..2ceb154755 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -13,10 +13,10 @@
<property name="popup-completion">0</property>
</object>
<object class="GtkPopover" id="server_adresses_popover">
- <property name="position">top</property>
+ <property name="position">2</property>
<child>
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<property name="margin-start">18</property>
<property name="margin-end">18</property>
@@ -24,20 +24,18 @@
<property name="margin-bottom">18</property>
<child>
<object class="GtkLabel">
+ <property name="css-classes">dim-label</property>
<property name="hexpand">1</property>
- <property name="label" translatable="yes">Server Addresses</property>
+ <property name="label" translatable="1">Server Addresses</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
- <property name="label" translatable="yes">Server addresses are made up of a protocol prefix and
an address. Examples:</property>
+ <property name="label" translatable="1">Server addresses are made up of a protocol prefix and an
address. Examples:</property>
<property name="wrap">1</property>
<property name="width-chars">40</property>
<property name="max-width-chars">40</property>
@@ -63,7 +61,7 @@
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
- <property name="label" translatable="yes">Available Protocols</property>
+ <property name="label" translatable="1">Available Protocols</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
@@ -76,7 +74,7 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Prefix</property>
+ <property name="label" translatable="1">Prefix</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
@@ -101,24 +99,20 @@
<property name="child">
<object class="GtkBox">
<property name="vexpand">1</property>
- <property name="valign">center</property>
- <property name="orientation">vertical</property>
+ <property name="valign">3</property>
+ <property name="orientation">1</property>
<property name="spacing">18</property>
<child>
<object class="GtkImage">
+ <property name="css-classes">dim-label</property>
<property name="pixel-size">48</property>
<property name="icon-name">network-server-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes" comments="Translators: Server as any
successfully connected network address">No recent servers found</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="css-classes">dim-label</property>
+ <property name="label" translatable="1" comments="Translators: Server as any
successfully connected network address">No recent servers found</property>
</object>
</child>
</object>
@@ -130,7 +124,7 @@
<property name="name">list</property>
<property name="child">
<object class="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
@@ -138,7 +132,7 @@
<property name="margin-bottom">12</property>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Recent Servers</property>
+ <property name="label" translatable="1">Recent Servers</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -154,7 +148,7 @@
<object class="GtkViewport">
<child>
<object class="GtkListBox" id="recent_servers_listbox">
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="row-activated" handler="on_recent_servers_listbox_row_activated"
object="GtkPlacesView" swapped="yes"/>
</object>
</child>
@@ -170,11 +164,11 @@
</child>
</object>
<template class="GtkPlacesView" parent="GtkBox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<child>
<object class="GtkStack" id="stack">
<property name="vhomogeneous">0</property>
- <property name="transition-type">crossfade</property>
+ <property name="transition-type">1</property>
<child>
<object class="GtkStackPage">
<property name="name">browse</property>
@@ -186,7 +180,7 @@
<object class="GtkViewport">
<child>
<object class="GtkListBox" id="listbox">
- <property name="selection-mode">none</property>
+ <property name="selection-mode">0</property>
<signal name="row-activated" handler="on_listbox_row_activated"
object="GtkPlacesView" swapped="yes"/>
</object>
</child>
@@ -201,24 +195,22 @@
<property name="name">empty-search</property>
<property name="child">
<object class="GtkBox">
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage">
+ <property name="css-classes">dim-label</property>
<property name="pixel-size">72</property>
<property name="icon-name">edit-find-symbolic</property>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">No results found</property>
+ <property name="label" translatable="1">No results found</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
<attribute name="scale" value="1.44"></attribute>
@@ -227,10 +219,8 @@
</child>
<child>
<object class="GtkLabel">
- <property name="label" translatable="yes">Try a different search</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <property name="css-classes">dim-label</property>
+ <property name="label" translatable="1">Try a different search</property>
</object>
</child>
</object>
@@ -241,15 +231,13 @@
</child>
<child>
<object class="GtkActionBar" id="actionbar">
+ <property name="css-classes">background</property>
<property name="hexpand">1</property>
- <style>
- <class name="background"/>
- </style>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Connect to _Server</property>
+ <property name="label" translatable="1">Connect to _Server</property>
<property name="mnemonic-widget">address_entry</property>
<property name="use-underline">1</property>
<attributes>
@@ -259,22 +247,23 @@
</child>
<child type="end">
<object class="GtkButton" id="connect_button">
- <property name="label" translatable="yes">Con_nect</property>
+ <property name="label" translatable="1">Con_nect</property>
<property name="use-underline">1</property>
<property name="sensitive">0</property>
<property name="receives-default">1</property>
- <property name="valign">center</property>
+ <property name="valign">3</property>
<signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
</object>
</child>
<child type="end">
<object class="GtkBox">
+ <property name="css-classes">linked</property>
<property name="hexpand">1</property>
<child>
<object class="GtkEntry" id="address_entry">
<property name="hexpand">1</property>
<property name="width-chars">20</property>
- <property name="placeholder-text" translatable="yes">Enter server address…</property>
+ <property name="placeholder-text" translatable="1">Enter server address…</property>
<property name="secondary-icon-name">dialog-question-symbolic</property>
<property name="completion">address_entry_completion</property>
<signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView"
swapped="yes"/>
@@ -284,18 +273,13 @@
</child>
<child>
<object class="GtkMenuButton" id="server_list_button">
+ <property name="css-classes">server-list-button</property>
<property name="receives-default">1</property>
- <property name="direction">up</property>
+ <property name="direction">0</property>
<property name="popover">recent_servers_popover</property>
<property name="icon-name">pan-down-symbolic</property>
- <style>
- <class name="server-list-button"/>
- </style>
</object>
</child>
- <style>
- <class name="linked"/>
- </style>
</object>
</child>
</object>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 1941c222a3..2029ae0f7d 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -18,26 +18,22 @@
<object class="GtkLabel" id="name_label">
<property name="hexpand">1</property>
<property name="xalign">0</property>
- <property name="ellipsize">end</property>
+ <property name="ellipsize">3</property>
</object>
</child>
<child>
<object class="GtkLabel" id="available_space_label">
+ <property name="css-classes">dim-label</property>
<property name="xalign">1</property>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkLabel" id="path_label">
- <property name="justify">right</property>
- <property name="ellipsize">middle</property>
+ <property name="css-classes">dim-label</property>
+ <property name="justify">1</property>
+ <property name="ellipsize">2</property>
<property name="xalign">0</property>
<property name="max-width-chars">15</property>
- <style>
- <class name="dim-label"/>
- </style>
</object>
</child>
<child>
@@ -47,19 +43,17 @@
<property name="name">button</property>
<property name="child">
<object class="GtkButton" id="eject_button">
+ <property name="css-classes">image-button
+sidebar-button</property>
<property name="visible">0</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="tooltip-text" translatable="yes">Unmount</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
+ <property name="tooltip-text" translatable="1">Unmount</property>
<child>
<object class="GtkImage" id="eject_icon">
<property name="icon-name">media-eject-symbolic</property>
</object>
</child>
- <style>
- <class name="image-button"/>
- <class name="sidebar-button"/>
- </style>
</object>
</property>
</object>
@@ -69,8 +63,8 @@
<property name="name">spinner</property>
<property name="child">
<object class="GtkSpinner" id="busy_spinner">
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
</object>
</property>
</object>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index eecc472628..92706cc8c8 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -17,14 +17,12 @@
<signal name="response" handler="error_dialogs" swapped="no"/>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="orientation">vertical</property>
+ <property name="css-classes">view</property>
+ <property name="orientation">1</property>
<property name="spacing">2</property>
- <style>
- <class name="view"/>
- </style>
<child>
<object class="GtkBox" id="box1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="vexpand">1</property>
<child>
<object class="GtkNotebook" id="notebook">
@@ -33,7 +31,7 @@
<object class="GtkNotebookPage">
<property name="child">
<object class="GtkBox" id="general_main_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">18</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
@@ -41,7 +39,7 @@
<property name="margin-bottom">12</property>
<child>
<object class="GtkBox" id="box2">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="printer_swin">
@@ -49,8 +47,6 @@
<property name="vexpand">1</property>
<child>
<object class="GtkColumnView" id="printer_list">
- <property name="can-focus">1</property>
- <property name="halign">fill</property>
<child>
<object class="GtkColumnViewColumn">
<property name="factory">
@@ -82,7 +78,7 @@
</child>
<child>
<object class="GtkColumnViewColumn">
- <property name="title" translatable="yes">Name</property>
+ <property name="title" translatable="1">Name</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
@@ -113,7 +109,7 @@
</child>
<child>
<object class="GtkColumnViewColumn">
- <property name="title" translatable="yes" comments="this is the
header for the location column in the print dialog">Location</property>
+ <property name="title" translatable="1" comments="this is the header
for the location column in the print dialog">Location</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
<property name="bytes"><![CDATA[
@@ -144,7 +140,7 @@
</child>
<child>
<object class="GtkColumnViewColumn">
- <property name="title" translatable="yes" comments="this is the
header for the printer status column in the print dialog">Status</property>
+ <property name="title" translatable="1" comments="this is the header
for the printer status column in the print dialog">Status</property>
<property name="expand">1</property>
<property name="factory">
<object class="GtkBuilderListItemFactory">
@@ -191,14 +187,14 @@
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="frame_template1">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<property name="hexpand">1</property>
<child>
<object class="GtkLabel" id="label_widget1">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Range</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Range</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -211,7 +207,7 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkCheckButton" id="all_pages_radio">
- <property name="label" translatable="yes">_All Pages</property>
+ <property name="label" translatable="1">_All Pages</property>
<property name="use-underline">1</property>
<property name="active">1</property>
<layout>
@@ -223,7 +219,7 @@
</child>
<child>
<object class="GtkCheckButton" id="current_page_radio">
- <property name="label" translatable="yes">C_urrent Page</property>
+ <property name="label" translatable="1">C_urrent Page</property>
<property name="sensitive">0</property>
<property name="use-underline">1</property>
<property name="group">all_pages_radio</property>
@@ -236,7 +232,7 @@
</child>
<child>
<object class="GtkCheckButton" id="selection_radio">
- <property name="label" translatable="yes">Se_lection</property>
+ <property name="label" translatable="1">Se_lection</property>
<property name="sensitive">0</property>
<property name="use-underline">1</property>
<property name="group">all_pages_radio</property>
@@ -249,8 +245,8 @@
</child>
<child>
<object class="GtkCheckButton" id="page_range_radio">
- <property name="label" translatable="yes">Pag_es:</property>
- <property name="tooltip-text" translatable="yes">Specify one or more
page ranges,
+ <property name="label" translatable="1">Pag_es:</property>
+ <property name="tooltip-text" translatable="1">Specify one or more
page ranges,
e.g. 1–3, 7, 11</property>
<property name="use-underline">1</property>
<property name="group">all_pages_radio</property>
@@ -263,7 +259,7 @@
</child>
<child>
<object class="GtkEntry" id="page_range_entry">
- <property name="tooltip-text" translatable="yes">Specify one or more
page ranges,
+ <property name="tooltip-text" translatable="1">Specify one or more
page ranges,
e.g. 1–3, 7, 11</property>
<property name="activates-default">1</property>
<signal name="notify::has-focus"
handler="page_range_entry_focus_changed" swapped="no"/>
@@ -279,14 +275,14 @@
</child>
<child>
<object class="GtkBox" id="frame_template2">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<property name="hexpand">1</property>
<child>
<object class="GtkLabel" id="label_widget2">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Copies</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Copies</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -299,9 +295,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label4">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Copie_s:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Copie_s:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">copies_spin</property>
<layout>
@@ -312,7 +308,7 @@
</child>
<child>
<object class="GtkSpinButton" id="copies_spin">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<property name="adjustment">copies_spin_adjustment</property>
<signal name="changed" handler="update_dialog_from_capabilities"
object="GtkPrintUnixDialog" swapped="yes"/>
<signal name="value-changed"
handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
@@ -324,7 +320,7 @@
</child>
<child>
<object class="GtkCheckButton" id="collate_check">
- <property name="label" translatable="yes">C_ollate</property>
+ <property name="label" translatable="1">C_ollate</property>
<property name="use-underline">1</property>
<signal name="toggled" handler="update_collate_icon" swapped="no"/>
<layout>
@@ -335,7 +331,7 @@
</child>
<child>
<object class="GtkCheckButton" id="reverse_check">
- <property name="label" translatable="yes">_Reverse</property>
+ <property name="label" translatable="1">_Reverse</property>
<property name="use-underline">1</property>
<signal name="toggled" handler="update_collate_icon" swapped="no"/>
<layout>
@@ -365,7 +361,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label1">
- <property name="label" translatable="yes">General</property>
+ <property name="label" translatable="1">General</property>
</object>
</property>
</object>
@@ -374,7 +370,7 @@
<object class="GtkNotebookPage">
<property name="child">
<object class="GtkBox" id="page_setup_main_box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">18</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
@@ -385,14 +381,14 @@
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="frame_template3">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<property name="hexpand">1</property>
<child>
<object class="GtkLabel" id="label_widget3">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Layout</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Layout</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -405,9 +401,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label5">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">T_wo-sided:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">T_wo-sided:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">duplex</property>
<layout>
@@ -418,7 +414,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="duplex">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">1</property>
<property name="row">0</property>
@@ -427,9 +423,9 @@
</child>
<child>
<object class="GtkLabel" id="label6">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Pages per _side:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Pages per _side:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">pages_per_sheet</property>
<layout>
@@ -440,7 +436,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="pages_per_sheet">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<signal name="changed" handler="redraw_page_layout_preview"
object="GtkPrintUnixDialog" swapped="yes"/>
<signal name="changed" handler="update_number_up_layout"
object="GtkPrintUnixDialog" swapped="yes"/>
<layout>
@@ -451,9 +447,9 @@
</child>
<child>
<object class="GtkLabel" id="label7">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Page or_dering:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Page or_dering:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">number_up_layout</property>
<layout>
@@ -464,7 +460,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="number_up_layout">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<signal name="changed" handler="redraw_page_layout_preview"
object="GtkPrintUnixDialog" swapped="yes"/>
<layout>
<property name="column">1</property>
@@ -474,9 +470,9 @@
</child>
<child>
<object class="GtkLabel" id="label8">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">_Only print:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">_Only print:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">page_set_combo</property>
<layout>
@@ -487,7 +483,7 @@
</child>
<child>
<object class="GtkDropDown" id="page_set_combo">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<property name="selected">0</property>
<property name="model">
<object class="GtkStringList">
@@ -506,9 +502,9 @@
</child>
<child>
<object class="GtkLabel" id="label9">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Sc_ale:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Sc_ale:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">scale_spin</property>
<layout>
@@ -520,17 +516,17 @@
<child>
<object class="GtkBox" id="box5">
<property name="spacing">6</property>
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<child>
<object class="GtkSpinButton" id="scale_spin">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<property name="adjustment">scale_spin_adjustment</property>
<property name="digits">1</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label10">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<property name="label">%</property>
</object>
</child>
@@ -546,14 +542,14 @@
</child>
<child>
<object class="GtkBox" id="frame_template4">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<property name="hexpand">1</property>
<child>
<object class="GtkLabel" id="label_widget4">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Paper</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Paper</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -566,9 +562,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label11">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Paper _type:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Paper _type:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">paper_type</property>
<layout>
@@ -579,7 +575,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="paper_type">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">1</property>
<property name="row">0</property>
@@ -588,9 +584,9 @@
</child>
<child>
<object class="GtkLabel" id="label12">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Paper _source:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Paper _source:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">paper_source</property>
<layout>
@@ -601,7 +597,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="paper_source">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">1</property>
<property name="row">1</property>
@@ -610,9 +606,9 @@
</child>
<child>
<object class="GtkLabel" id="label13">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Output t_ray:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Output t_ray:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">output_tray</property>
<layout>
@@ -623,7 +619,7 @@
</child>
<child>
<object class="GtkPrinterOptionWidget" id="output_tray">
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">1</property>
<property name="row">2</property>
@@ -632,9 +628,9 @@
</child>
<child>
<object class="GtkLabel" id="paper_size_combo_label">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">_Paper size:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">_Paper size:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">paper_size_combo</property>
<layout>
@@ -646,7 +642,7 @@
<child>
<object class="GtkDropDown" id="paper_size_combo">
<property name="sensitive">0</property>
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<layout>
<property name="column">1</property>
<property name="row">3</property>
@@ -655,9 +651,9 @@
</child>
<child>
<object class="GtkLabel" id="orientation_combo_label">
- <property name="halign">start</property>
- <property name="valign">baseline</property>
- <property name="label" translatable="yes">Or_ientation:</property>
+ <property name="halign">1</property>
+ <property name="valign">4</property>
+ <property name="label" translatable="1">Or_ientation:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">orientation_combo</property>
<layout>
@@ -670,7 +666,7 @@
<object class="GtkDropDown" id="orientation_combo">
<property name="sensitive">0</property>
<property name="selected">0</property>
- <property name="valign">baseline</property>
+ <property name="valign">4</property>
<property name="model">
<object class="GtkStringList">
<items>
@@ -708,7 +704,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label2">
- <property name="label" translatable="yes">Page Setup</property>
+ <property name="label" translatable="1">Page Setup</property>
</object>
</property>
</object>
@@ -725,13 +721,13 @@
<property name="margin-bottom">12</property>
<child>
<object class="GtkBox" id="frame_template5">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_widget5">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Job Details</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Job Details</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -744,9 +740,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label16">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Pri_ority:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Pri_ority:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">job_prio</property>
<layout>
@@ -765,9 +761,9 @@
</child>
<child>
<object class="GtkLabel" id="label17">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">_Billing info:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">_Billing info:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">billing_info</property>
<layout>
@@ -794,13 +790,13 @@
</child>
<child>
<object class="GtkBox" id="frame_template6">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_widget6">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Print Document</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Print Document</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -813,7 +809,7 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkCheckButton" id="print_now_radio">
- <property name="label" translatable="yes" comments="this is one of the
choices for the print at option in the print dialog">_Now</property>
+ <property name="label" translatable="1" comments="this is one of the
choices for the print at option in the print dialog">_Now</property>
<property name="use-underline">1</property>
<property name="active">1</property>
<signal name="toggled" handler="update_print_at_option"
object="GtkPrintUnixDialog" swapped="yes"/>
@@ -827,11 +823,11 @@
<child>
<object class="GtkCheckButton" id="print_at_radio">
<property name="sensitive">0</property>
- <property name="label" translatable="yes" comments="this is one of the
choices for the print at option in the print dialog. It also serves as the label for an entry that allows the
user to enter a time.">A_t:</property>
+ <property name="label" translatable="1" comments="this is one of the
choices for the print at option in the print dialog. It also serves as the label for an entry that allows the
user to enter a time.">A_t:</property>
<property name="has-tooltip">1</property>
- <property name="tooltip-markup" translatable="yes">Specify the time of
print,
+ <property name="tooltip-markup" translatable="1">Specify the time of
print,
e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
- <property name="tooltip-text" translatable="yes" comments="Ability to
parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if
they are not supported.">Specify the time of print,
+ <property name="tooltip-text" translatable="1" comments="Ability to
parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if
they are not supported.">Specify the time of print,
e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
<property name="use-underline">1</property>
<property name="group">print_now_radio</property>
@@ -847,9 +843,9 @@
<object class="GtkEntry" id="print_at_entry">
<property name="sensitive">0</property>
<property name="has-tooltip">1</property>
- <property name="tooltip-markup" translatable="yes">Specify the time of
print,
+ <property name="tooltip-markup" translatable="1">Specify the time of
print,
e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
- <property name="tooltip-text" translatable="yes" comments="Ability to
parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if
they are not supported.">Specify the time of print,
+ <property name="tooltip-text" translatable="1" comments="Ability to
parse the am/pm format depends on actual locale. You can remove the am/pm values below for your locale if
they are not supported.">Specify the time of print,
e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
<signal name="changed" handler="update_print_at_option"
object="GtkPrintUnixDialog" swapped="yes"/>
<layout>
@@ -861,10 +857,10 @@
<child>
<object class="GtkCheckButton" id="print_hold_radio">
<property name="sensitive">0</property>
- <property name="label" translatable="yes" comments="this is one of the
choices for the print at option in the print dialog. It means that the print job will not be printed until it
explicitly gets 'released'.">On _hold</property>
+ <property name="label" translatable="1" comments="this is one of the
choices for the print at option in the print dialog. It means that the print job will not be printed until it
explicitly gets 'released'.">On _hold</property>
<property name="has-tooltip">1</property>
- <property name="tooltip-markup" translatable="yes">Hold the job until it
is explicitly released</property>
- <property name="tooltip-text" translatable="yes">Hold the job until it
is explicitly released</property>
+ <property name="tooltip-markup" translatable="1">Hold the job until it
is explicitly released</property>
+ <property name="tooltip-text" translatable="1">Hold the job until it is
explicitly released</property>
<property name="use-underline">1</property>
<property name="group">print_now_radio</property>
<signal name="toggled" handler="update_print_at_option"
object="GtkPrintUnixDialog" swapped="yes"/>
@@ -885,13 +881,13 @@
</child>
<child>
<object class="GtkBox" id="frame_template7">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label_widget7">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes">Add Cover Page</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1">Add Cover Page</property>
<attributes>
<attribute name="weight" value="bold"></attribute>
</attributes>
@@ -904,9 +900,9 @@
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="label18">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes" comments="this is the label
used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1" comments="this is the label used
for the option in the print dialog that controls the front cover page.">Be_fore:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">cover_before</property>
<layout>
@@ -925,9 +921,9 @@
</child>
<child>
<object class="GtkLabel" id="label19">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="label" translatable="yes" comments="this is the label
used for the option in the print dialog that controls the back cover page.">_After:</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="label" translatable="1" comments="this is the label used
for the option in the print dialog that controls the back cover page.">_After:</property>
<property name="use-underline">1</property>
<property name="mnemonic-widget">cover_after</property>
<layout>
@@ -956,7 +952,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label3">
- <property name="label" translatable="yes">Job</property>
+ <property name="label" translatable="1">Job</property>
</object>
</property>
</object>
@@ -966,7 +962,7 @@
<property name="position">3</property>
<property name="child">
<object class="GtkScrolledWindow" id="image_quality_page">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<property name="hexpand">1</property>
<child>
<object class="GtkViewport" id="viewport1">
@@ -986,7 +982,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label20">
- <property name="label" translatable="yes" comments="This will appear as a tab label
in the print dialog.">Image Quality</property>
+ <property name="label" translatable="1" comments="This will appear as a tab label in
the print dialog.">Image Quality</property>
</object>
</property>
</object>
@@ -996,7 +992,7 @@
<property name="position">4</property>
<property name="child">
<object class="GtkScrolledWindow" id="color_page">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<child>
<object class="GtkViewport" id="viewport2">
<child>
@@ -1015,7 +1011,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label21">
- <property name="label" translatable="yes" comments="This will appear as a tab label
in the print dialog.">Color</property>
+ <property name="label" translatable="1" comments="This will appear as a tab label in
the print dialog.">Color</property>
</object>
</property>
</object>
@@ -1025,7 +1021,7 @@
<property name="position">5</property>
<property name="child">
<object class="GtkScrolledWindow" id="finishing_page">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<child>
<object class="GtkViewport" id="viewport3">
<child>
@@ -1044,7 +1040,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label22">
- <property name="label" translatable="yes" comments="This will appear as a tab label
in the print dialog. It's a typographical term, as in "Binding and
finishing"">Finishing</property>
+ <property name="label" translatable="1" comments="This will appear as a tab label in
the print dialog. It's a typographical term, as in "Binding and
finishing"">Finishing</property>
</object>
</property>
</object>
@@ -1054,12 +1050,12 @@
<property name="position">6</property>
<property name="child">
<object class="GtkScrolledWindow" id="advanced_page">
- <property name="hscrollbar-policy">never</property>
+ <property name="hscrollbar-policy">2</property>
<child>
<object class="GtkViewport" id="viewport4">
<child>
<object class="GtkBox" id="advanced_vbox">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="spacing">18</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
@@ -1073,7 +1069,7 @@
</property>
<property name="tab">
<object class="GtkLabel" id="label23">
- <property name="label" translatable="yes">Advanced</property>
+ <property name="label" translatable="1">Advanced</property>
</object>
</property>
</object>
@@ -1089,7 +1085,7 @@
</child>
<child>
<object class="GtkLabel" id="label24">
- <property name="label" translatable="yes">Some of the settings in the dialog
conflict</property>
+ <property name="label" translatable="1">Some of the settings in the dialog
conflict</property>
</object>
</child>
</object>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index f95045e62d..f5006d40a3 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -11,13 +11,11 @@
</child>
</template>
<object class="GtkPopover" id="dock">
+ <property name="css-classes">scale-popup</property>
<signal name="map" handler="cb_popup_mapped" swapped="no"/>
- <style>
- <class name="scale-popup"/>
- </style>
<child>
<object class="GtkBox" id="box">
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="margin-start">4</property>
<property name="margin-end">4</property>
<property name="margin-top">4</property>
@@ -27,8 +25,8 @@
<object class="GtkButton" id="plus_button">
<property name="receives-default">1</property>
<property name="has-frame">0</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="icon-name">list-add-symbolic</property>
<signal name="clicked" handler="cb_button_clicked" swapped="no"/>
</object>
@@ -36,10 +34,9 @@
<child>
<object class="GtkScale" id="scale">
<property name="height-request">100</property>
- <property name="orientation">vertical</property>
+ <property name="orientation">1</property>
<property name="inverted">1</property>
<property name="round-digits">1</property>
- <property name="draw-value">0</property>
<signal name="value-changed" handler="cb_scale_value_changed" swapped="no"/>
</object>
</child>
@@ -47,8 +44,8 @@
<object class="GtkButton" id="minus_button">
<property name="receives-default">1</property>
<property name="has-frame">0</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="icon-name">list-remove-symbolic</property>
<signal name="clicked" handler="cb_button_clicked" swapped="no"/>
</object>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 787a478276..4524fdf980 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,63 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkSidebarRow" parent="GtkListBoxRow">
- <property name="focus-on-click">False</property>
- <style>
- <class name="sidebar-row"/>
- </style>
+ <property name="css-classes">sidebar-row</property>
+ <property name="focus-on-click">0</property>
<property name="child">
<object class="GtkRevealer" id="revealer">
+ <property name="css-classes">sidebar-revealer</property>
<property name="reveal-child">1</property>
<signal name="notify::child-revealed" handler="on_child_revealed"/>
- <style>
- <class name="sidebar-revealer"/>
- </style>
<child>
<object class="GtkBox">
<child>
<object class="GtkImage" id="start_icon_widget">
- <style>
- <class name="sidebar-icon"/>
- </style>
+ <property name="css-classes">sidebar-icon</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label_widget">
+ <property name="css-classes">sidebar-label</property>
<property name="hexpand">1</property>
<property name="xalign">0</property>
- <style>
- <class name="sidebar-label"/>
- </style>
</object>
</child>
<child>
<object class="GtkImage" id="end_icon_widget">
+ <property name="css-classes">sidebar-icon</property>
<property name="visible">0</property>
<property name="hexpand">1</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- <style>
- <class name="sidebar-icon"/>
- </style>
+ <property name="halign">2</property>
+ <property name="valign">3</property>
</object>
</child>
<child>
<object class="GtkButton" id="eject_button">
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="css-classes">sidebar-button</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="margin-start">4px</property>
<property name="icon-name">media-eject-symbolic</property>
- <property name="tooltip-text" translatable="yes">Unmount</property>
- <style>
- <class name="sidebar-button"/>
- </style>
+ <property name="tooltip-text" translatable="1">Unmount</property>
</object>
</child>
<child>
<object class="GtkSpinner" id="busy_spinner">
<property name="spinning">1</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="margin-start">4px</property>
<property name="visible">0</property>
</object>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index 86a8148d3c..a50e2d3d6c 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -7,9 +7,9 @@
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label">
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="ellipsize">end</property>
+ <property name="halign">1</property>
+ <property name="valign">3</property>
+ <property name="ellipsize">3</property>
<property name="single-line-mode">1</property>
</object>
</child>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 127fa045e4..74b8427d5e 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<template class="GtkTooltipWindow" parent="GtkWidget">
- <style>
- <class name="background"/>
- </style>
+ <property name="css-classes">background</property>
<child>
<object class="GtkBox" id="box">
<child>
diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui
index ce70bb6e23..bbbdd91f4b 100644
--- a/gtk/ui/gtkvideo.ui
+++ b/gtk/ui/gtkvideo.ui
@@ -8,14 +8,12 @@
</child>
<child type="overlay">
<object class="GtkImage" id="overlay_icon">
- <style>
- <class name="osd"/>
- <class name="circular"/>
- </style>
- <property name="halign">center</property>
- <property name="valign">center</property>
+ <property name="css-classes">osd
+circular</property>
+ <property name="halign">3</property>
+ <property name="valign">3</property>
<property name="icon-name">media-playback-start-symbolic</property>
- <property name="icon-size">large</property>
+ <property name="icon-size">2</property>
<layout>
<property name="measure">1</property>
</layout>
@@ -23,14 +21,12 @@
</child>
<child type="overlay">
<object class="GtkRevealer" id="controls_revealer">
- <property name="valign">end</property>
- <property name="transition-type">crossfade</property>
+ <property name="valign">2</property>
+ <property name="transition-type">1</property>
<child>
<object class="GtkMediaControls" id="controls">
- <style>
- <class name="osd"/>
- <class name="bottom"/>
- </style>
+ <property name="css-classes">osd
+bottom</property>
</object>
</child>
<layout>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index 7b065d251e..4180574c90 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -16,12 +16,10 @@ audio-volume-medium</property>
<signal name="query-tooltip" handler="cb_query_tooltip" swapped="no"/>
<signal name="value-changed" handler="cb_value_changed" swapped="no"/>
<child internal-child="plus_button">
- <object class="GtkButton" id="scalebutton-plus_button1">
- </object>
+ <object class="GtkButton" id="scalebutton-plus_button1"/>
</child>
<child internal-child="minus_button">
- <object class="GtkButton" id="scalebutton-minus_button1">
- </object>
+ <object class="GtkButton" id="scalebutton-minus_button1"/>
</child>
</template>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
