callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M!163 - Fullname: Use GtkGrid instead of GtkTable

Browse Source 
GtkTable is now long deprecated.

Closes: https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/163
This commit is contained in:
Corentin Noël
2025-01-21 11:20:11 +01:00
parent b2c7c941c6
commit bb45be24e4
2 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/addressbook/gui/contact-editor/e-contact-editor-fullname.c
View File

@ -225,7 +225,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
title = gtk_window_get_title (GTK_WINDOW (widget));
gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname), title);
widget = e_builder_get_widget (builder, "table-checkfullname");
widget = e_builder_get_widget (builder, "grid-checkfullname");
parent = gtk_widget_get_parent (widget);
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (parent), widget);

53
src/addressbook/gui/contact-editor/fullname.ui
View File

@ -111,17 +111,12 @@
</packing>
</child>
<child>
<object class="GtkTable" id="table-checkfullname">
<object class="GtkGrid" id="grid-checkfullname">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkEntry" id="entry-first">
<property name="visible">True</property>
@ -129,13 +124,12 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
<property name="width">2</property>
</packing>
</child>
<child>
@ -145,13 +139,12 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"/>
<property name="width">2</property>
</packing>
</child>
<child>
@ -161,18 +154,14 @@
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"/>
<property name="width">2</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label-first">
<property name="visible">True</property>
@ -184,10 +173,8 @@
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -201,8 +188,8 @@
<property name="xalign">1</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -216,10 +203,8 @@
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -233,10 +218,8 @@
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -250,10 +233,8 @@
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -266,9 +247,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -281,11 +260,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>