97 lines
4.1 KiB
Diff
97 lines
4.1 KiB
Diff
|
From 429bbe0564f8c129717635e8979fa6fa761a0f1c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
|
||
|
|
Date: Tue, 23 Feb 2021 10:24:49 -0300
|
||
|
|
Subject: [PATCH] common: Add missing <child> tag to CcLanguageChooser
|
||
|
|
|
||
|
|
The UI file is not wrapping the <object> tag with <child>, which
|
||
|
|
fails to parse and blanks the dialog.
|
||
|
|
|
||
|
|
Add the missing <child> tag around the "More" row object.
|
||
|
|
|
||
|
|
Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1270
|
||
|
|
|
||
|
|
common: Rename 'check' to 'check_image'
|
||
|
|
|
||
|
|
The C code tries to fetch and use 'check_image', but the UI definition
|
||
|
|
calls it 'check', which throws a few warnings. Renaming it in the UI file
|
||
|
|
is easier than in the C file, so I went with the former.
|
||
|
|
---
|
||
|
|
panels/common/cc-language-chooser.ui | 47 +++++++++++++++-------------
|
||
|
|
panels/common/cc-language-row.ui | 2 +-
|
||
|
|
2 files changed, 27 insertions(+), 22 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/panels/common/cc-language-chooser.ui b/panels/common/cc-language-chooser.ui
|
||
|
|
index 5449fb3dd..885eb437a 100644
|
||
|
|
--- a/panels/common/cc-language-chooser.ui
|
||
|
|
+++ b/panels/common/cc-language-chooser.ui
|
||
|
|
@@ -70,27 +70,32 @@
|
||
|
|
<property name="sensitive">False</property>
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
- <object class="GtkListBoxRow" id="more_row">
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkBox">
|
||
|
|
- <property name="visible">True</property>
|
||
|
|
- <property name="spacing">10</property>
|
||
|
|
- <property name="tooltip_markup" translatable="yes">More…</property>
|
||
|
|
- <child>
|
||
|
|
- <object class="GtkImage">
|
||
|
|
- <property name="visible">False</property>
|
||
|
|
- <property name="icon-name">view-more-symbolic</property>
|
||
|
|
- <property name="icon-size">1</property>
|
||
|
|
- <property name="margin-top">10</property>
|
||
|
|
- <property name="margin-bottom">10</property>
|
||
|
|
- <style>
|
||
|
|
- <class name="dim-label"/>
|
||
|
|
- </style>
|
||
|
|
- </object>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
- </child>
|
||
|
|
- </object>
|
||
|
|
+
|
||
|
|
+ <!-- "More" row -->
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkListBoxRow" id="more_row">
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkBox">
|
||
|
|
+ <property name="visible">True</property>
|
||
|
|
+ <property name="spacing">10</property>
|
||
|
|
+ <property name="tooltip_markup" translatable="yes">More…</property>
|
||
|
|
+ <child>
|
||
|
|
+ <object class="GtkImage">
|
||
|
|
+ <property name="visible">False</property>
|
||
|
|
+ <property name="icon-name">view-more-symbolic</property>
|
||
|
|
+ <property name="icon-size">1</property>
|
||
|
|
+ <property name="margin-top">10</property>
|
||
|
|
+ <property name="margin-bottom">10</property>
|
||
|
|
+ <style>
|
||
|
|
+ <class name="dim-label"/>
|
||
|
|
+ </style>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+ </object>
|
||
|
|
+ </child>
|
||
|
|
+
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
</object>
|
||
|
|
diff --git a/panels/common/cc-language-row.ui b/panels/common/cc-language-row.ui
|
||
|
|
index 3f2d67b68..957df54ab 100644
|
||
|
|
--- a/panels/common/cc-language-row.ui
|
||
|
|
+++ b/panels/common/cc-language-row.ui
|
||
|
|
@@ -18,7 +18,7 @@
|
||
|
|
</object>
|
||
|
|
</child>
|
||
|
|
<child>
|
||
|
|
- <object class="GtkImage" id="check">
|
||
|
|
+ <object class="GtkImage" id="check_image">
|
||
|
|
<property name="visible">False</property>
|
||
|
|
<property name="icon-name">object-select-symbolic</property>
|
||
|
|
<property name="icon-size">1</property>
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|