[gtk/matthiasc/for-master] builder-tool: Translate GtkImage:pixbuf
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/for-master] builder-tool: Translate GtkImage:pixbuf
- Date: Wed, 27 Jan 2021 22:03:27 +0000 (UTC)
commit 06321511ad7cf336539d07113f15cafb54ad364b
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jan 27 17:01:51 2021 -0500
builder-tool: Translate GtkImage:pixbuf
The pixbuf property doesn't exist anymore. It is
commonly set to a path in ui files, so translate it
to the file property.
gtk/tools/gtk-builder-tool-simplify.c | 3 ++-
testsuite/tools/simplify-data-3to4/image.expected | 12 ++++++++++++
testsuite/tools/simplify-data-3to4/image.ui | 10 ++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c
index b61487c537..990377bd21 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/gtk/tools/gtk-builder-tool-simplify.c
@@ -719,7 +719,8 @@ maybe_rename_property (Element *element, MyParserData *data)
{ "GtkWidget", "margin-right", GTK_TYPE_WIDGET, PROP_KIND_OBJECT, "margin-end", { NULL, NULL, NULL } },
{ "GtkHeaderBar", "show-close-button", GTK_TYPE_HEADER_BAR, PROP_KIND_OBJECT, "show-title-buttons", {
NULL, NULL, NULL } },
{ "GtkHeaderBar", "custom-title", GTK_TYPE_HEADER_BAR, PROP_KIND_OBJECT, "title-widget", { NULL, NULL,
NULL } },
- { "GtkStack", "homogeneous", GTK_TYPE_STACK, PROP_KIND_OBJECT, "hhomogeneous", { "vhomogeneous", NULL,
NULL } }
+ { "GtkStack", "homogeneous", GTK_TYPE_STACK, PROP_KIND_OBJECT, "hhomogeneous", { "vhomogeneous", NULL,
NULL } },
+ { "GtkImage", "pixbuf", GTK_TYPE_IMAGE, PROP_KIND_OBJECT, "file", { NULL, NULL, NULL } },
};
int i, k, l;
PropKind kind;
diff --git a/testsuite/tools/simplify-data-3to4/image.expected
b/testsuite/tools/simplify-data-3to4/image.expected
new file mode 100644
index 0000000000..ccb3491832
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/image.expected
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk" version="4.0"/>
+ <object class="GtkWindow">
+ <property name="child">
+ <object class="GtkImage">
+ <property name="visible">0</property>
+ <property name="file">test.svg</property>
+ </object>
+ </property>
+ </object>
+</interface>
diff --git a/testsuite/tools/simplify-data-3to4/image.ui b/testsuite/tools/simplify-data-3to4/image.ui
new file mode 100644
index 0000000000..0aebe4e862
--- /dev/null
+++ b/testsuite/tools/simplify-data-3to4/image.ui
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <object class="GtkWindow">
+ <child>
+ <object class="GtkImage">
+ <property name="pixbuf">test.svg</property>
+ </object>
+ </child>
+ </object>
+</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]