[nautilus/wip/antoniof/gtk4-preparation-step-properties-cleanup: 1/9] general: Stop using GtkBox padding, fill and expand child properties
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/gtk4-preparation-step-properties-cleanup: 1/9] general: Stop using GtkBox padding, fill and expand child properties
- Date: Sun, 15 Aug 2021 19:16:00 +0000 (UTC)
commit db502abaf348d9d35740d6a52168877a0c78010b
Author: António Fernandes <antoniof gnome org>
Date: Tue Jan 12 21:42:02 2021 +0000
general: Stop using GtkBox padding, fill and expand child properties
In preparation for porting to GTK4, where child properties are no more.
Based on patch by Ernestas: d4b5c02ee9b2f1870f6b2e5e5bcf6b8d65ea2b85
src/nautilus-column-chooser.c | 3 +-
src/nautilus-file-conflict-dialog.c | 10 +++-
src/nautilus-floating-bar.c | 3 +-
src/nautilus-list-view.c | 6 +-
src/nautilus-properties-window.c | 3 +-
src/nautilus-search-popover.c | 3 +-
src/nautilus-view-icon-item-ui.c | 3 +-
src/resources/ui/nautilus-compress-dialog.ui | 18 +-----
src/resources/ui/nautilus-create-folder-dialog.ui | 6 --
src/resources/ui/nautilus-properties-window.ui | 33 +----------
src/resources/ui/nautilus-search-popover.ui | 12 ----
src/resources/ui/nautilus-toolbar-view-menu.ui | 39 +------------
src/resources/ui/nautilus-toolbar.ui | 70 -----------------------
src/resources/ui/nautilus-window.ui | 6 +-
14 files changed, 31 insertions(+), 184 deletions(-)
---
diff --git a/src/nautilus-column-chooser.c b/src/nautilus-column-chooser.c
index 43d95c6bc..2d1f57795 100644
--- a/src/nautilus-column-chooser.c
+++ b/src/nautilus-column-chooser.c
@@ -309,10 +309,11 @@ add_tree_view (NautilusColumnChooser *chooser)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ gtk_widget_set_vexpand (scrolled, TRUE);
gtk_widget_show (GTK_WIDGET (scrolled));
gtk_container_add (GTK_CONTAINER (scrolled), view);
- gtk_box_pack_start (GTK_BOX (chooser->main_box), scrolled, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (chooser->main_box), scrolled, FALSE, TRUE, 0);
}
static void
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
index 678f96323..a27a5be88 100644
--- a/src/nautilus-file-conflict-dialog.c
+++ b/src/nautilus-file-conflict-dialog.c
@@ -332,7 +332,10 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
gtk_container_add (GTK_CONTAINER (fcd->expander), hbox);
widget = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
+ gtk_widget_set_margin_end (widget, 6);
+ gtk_widget_set_margin_start (widget, 6);
+ gtk_widget_set_hexpand (widget, TRUE);
fcd->entry = widget;
g_signal_connect (widget, "changed",
G_CALLBACK (entry_text_changed_cb), dialog);
@@ -342,7 +345,10 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
gtk_button_set_image (GTK_BUTTON (widget),
gtk_image_new_from_icon_name ("edit-undo",
GTK_ICON_SIZE_MENU));
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+ gtk_widget_set_margin_end (widget, 6);
+ gtk_widget_set_margin_start (widget, 6);
+
g_signal_connect (widget, "clicked",
G_CALLBACK (reset_button_clicked_cb), dialog);
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index fdb76fb95..4ca9200a4 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -411,8 +411,9 @@ nautilus_floating_bar_constructed (GObject *obj)
gtk_widget_set_margin_start (w, 8);
labels_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_box_pack_start (GTK_BOX (box), labels_box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), labels_box, FALSE, TRUE, 0);
g_object_set (labels_box,
+ "hexpand", TRUE,
"margin-top", 2,
"margin-bottom", 2,
"margin-start", 12,
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 0ee93f640..2af647d7d 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -3425,9 +3425,10 @@ create_column_editor (NautilusListView *view)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
gtk_widget_set_hexpand (box, TRUE);
+ gtk_widget_set_vexpand (box, TRUE);
gtk_widget_show (box);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), box,
- TRUE, TRUE, 0);
+ FALSE, TRUE, 0);
label_text = _("Choose the order of information to appear in this folder:");
str = g_strconcat ("<b>", label_text, "</b>", NULL);
@@ -3442,8 +3443,9 @@ create_column_editor (NautilusListView *view)
g_free (str);
column_chooser = nautilus_column_chooser_new (file);
+ gtk_widget_set_vexpand (column_chooser, TRUE);
gtk_widget_show (column_chooser);
- gtk_box_pack_start (GTK_BOX (box), column_chooser, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), column_chooser, FALSE, TRUE, 0);
g_signal_connect (column_chooser, "changed",
G_CALLBACK (column_chooser_changed_callback),
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index a841eed97..fe04079b7 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -4639,7 +4639,8 @@ setup_app_chooser_area (NautilusPropertiesWindow *self)
g_autoptr (GAppInfo) info = NULL;
self->app_chooser_widget = gtk_app_chooser_widget_new (self->content_type);
- gtk_box_pack_start (GTK_BOX (self->app_chooser_widget_box), self->app_chooser_widget, TRUE, TRUE, 0);
+ gtk_widget_set_vexpand (self->app_chooser_widget, TRUE);
+ gtk_box_pack_start (GTK_BOX (self->app_chooser_widget_box), self->app_chooser_widget, FALSE, TRUE, 0);
gtk_app_chooser_widget_set_show_default (GTK_APP_CHOOSER_WIDGET (self->app_chooser_widget), TRUE);
gtk_app_chooser_widget_set_show_fallback (GTK_APP_CHOOSER_WIDGET (self->app_chooser_widget), TRUE);
diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
index 37e18d889..4ab345608 100644
--- a/src/nautilus-search-popover.c
+++ b/src/nautilus-search-popover.c
@@ -590,9 +590,10 @@ show_other_types_dialog (NautilusSearchPopover *popover)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ gtk_widget_set_vexpand (scrolled, TRUE);
gtk_widget_show (scrolled);
gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 0);
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled, TRUE, TRUE,
0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled, FALSE, TRUE,
0);
treeview = gtk_tree_view_new ();
gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c
index 837dc54a9..259badfa8 100644
--- a/src/nautilus-view-icon-item-ui.c
+++ b/src/nautilus-view-icon-item-ui.c
@@ -148,6 +148,7 @@ constructed (GObject *object)
gtk_box_pack_start (container, GTK_WIDGET (self->icon), FALSE, FALSE, 0);
label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
+ gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE);
gtk_widget_show (GTK_WIDGET (label));
#if PANGO_VERSION_CHECK (1, 44, 4)
@@ -165,7 +166,7 @@ constructed (GObject *object)
gtk_label_set_lines (label, 3);
gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);
gtk_widget_set_valign (GTK_WIDGET (label), GTK_ALIGN_START);
- gtk_box_pack_end (container, GTK_WIDGET (label), TRUE, TRUE, 0);
+ gtk_box_pack_end (container, GTK_WIDGET (label), FALSE, TRUE, 0);
style_context = gtk_widget_get_style_context (GTK_WIDGET (item_selection_background));
gtk_style_context_add_class (style_context, "icon-item-background");
diff --git a/src/resources/ui/nautilus-compress-dialog.ui b/src/resources/ui/nautilus-compress-dialog.ui
index a57765eed..ea0357436 100644
--- a/src/resources/ui/nautilus-compress-dialog.ui
+++ b/src/resources/ui/nautilus-compress-dialog.ui
@@ -115,8 +115,6 @@
</attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -128,11 +126,9 @@
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="width-chars">30</property>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkMenuButton" id="extension_button">
@@ -143,6 +139,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkStack" id="extension_stack">
+ <property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="zip_label">
<property name="label" translatable="no">.zip</property>
@@ -171,9 +168,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- </packing>
</child>
<child>
<object class="GtkImage">
@@ -186,8 +180,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -203,8 +195,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -215,8 +205,6 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -230,8 +218,6 @@
<signal name="icon-press" handler="passphrase_entry_on_icon_press"/>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-create-folder-dialog.ui
b/src/resources/ui/nautilus-create-folder-dialog.ui
index 818ae0874..75b9aa94d 100644
--- a/src/resources/ui/nautilus-create-folder-dialog.ui
+++ b/src/resources/ui/nautilus-create-folder-dialog.ui
@@ -23,8 +23,6 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -34,8 +32,6 @@
<property name="can_focus">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -51,8 +47,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index 4ffc5932e..7ab085a73 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -21,6 +21,7 @@
</child>
<child>
<object class="GtkNotebook" id="notebook">
+ <property name="hexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_border">False</property>
@@ -67,8 +68,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -671,8 +670,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -740,15 +737,11 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -781,8 +774,6 @@
<property name="max_width_chars">40</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -792,8 +783,6 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">12</property>
<property name="pack_type">end</property>
<property name="position">1</property>
@@ -808,8 +797,6 @@
<property name="max_width_chars">40</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -817,6 +804,7 @@
<object class="GtkGrid" id="permissions_grid">
<property name="can_focus">False</property>
<property name="halign">center</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
@@ -1202,8 +1190,6 @@
<property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -1263,8 +1249,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -1301,13 +1285,12 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="app_chooser_widget_box">
+ <property name="vexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -1316,8 +1299,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1335,8 +1316,6 @@
<property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
@@ -1350,8 +1329,6 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -1363,15 +1340,11 @@
<property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-search-popover.ui b/src/resources/ui/nautilus-search-popover.ui
index 1d03b484d..37de70206 100644
--- a/src/resources/ui/nautilus-search-popover.ui
+++ b/src/resources/ui/nautilus-search-popover.ui
@@ -55,8 +55,6 @@
<signal name="clicked" handler="select_date_button_clicked"
object="NautilusSearchPopover" swapped="no" />
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -75,8 +73,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -277,8 +273,6 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -289,8 +283,6 @@
<property name="icon_name">pan-down-symbolic</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -369,8 +361,6 @@
<signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover"
swapped="no" />
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -389,8 +379,6 @@
<signal name="toggled" handler="search_fts_mode_changed" object="NautilusSearchPopover"
swapped="no" />
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-toolbar-view-menu.ui b/src/resources/ui/nautilus-toolbar-view-menu.ui
index ff9a1c59e..760820f40 100644
--- a/src/resources/ui/nautilus-toolbar-view-menu.ui
+++ b/src/resources/ui/nautilus-toolbar-view-menu.ui
@@ -20,8 +20,6 @@
<property name="margin_bottom">6</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -37,8 +35,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -52,8 +48,6 @@
<property name="text" translatable="yes" context="Sort Criterion" comments="This is used to sort
by name in the toolbar view menu">_A-Z</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -67,8 +61,6 @@
<property name="text" translatable="yes" context="Sort Criterion" comments="This is used to sort
by name, in descending order in the toolbar view menu">_Z-A</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -82,8 +74,6 @@
<property name="text" translatable="yes">Last _Modified</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -97,8 +87,6 @@
<property name="text" translatable="yes">_First Modified</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -112,8 +100,6 @@
<property name="text" translatable="yes">_Size</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
@@ -127,8 +113,6 @@
<property name="text" translatable="yes">_Type</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
@@ -141,15 +125,11 @@
<property name="text" translatable="yes">Last _Trashed</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">8</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -161,8 +141,6 @@
<property name="margin_bottom">6</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -174,8 +152,6 @@
<property name="text" translatable="yes">_Visible Columns…</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -188,8 +164,6 @@
<property name="text" translatable="yes">R_eload</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -201,8 +175,6 @@
<property name="text" translatable="yes">St_op</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -219,6 +191,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="zoom-out">
+ <property name="hexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
@@ -234,13 +207,12 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="zoom-default">
+ <property name="hexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
@@ -255,13 +227,12 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="zoom-in">
+ <property name="hexpand">True</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
@@ -277,8 +248,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -287,8 +256,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index 4bf6e3621..cde9d0e70 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -36,8 +36,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -58,8 +56,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -80,15 +76,11 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -98,8 +90,6 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -120,8 +110,6 @@
<property name="label" translatable="yes">Edit</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -144,8 +132,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -167,8 +153,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -190,15 +174,11 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -208,8 +188,6 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -224,8 +202,6 @@
<property name="text" translatable="yes">Select All</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -235,8 +211,6 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -250,8 +224,6 @@
<property name="text" translatable="yes">Show _Hidden Files</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
@@ -265,8 +237,6 @@
<property name="text" translatable="yes">Show _Sidebar</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
@@ -276,8 +246,6 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">8</property>
</packing>
</child>
@@ -291,8 +259,6 @@
<property name="text" translatable="yes">_Preferences</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">9</property>
</packing>
</child>
@@ -305,8 +271,6 @@
<property name="text" translatable="yes">_Keyboard Shortcuts</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">10</property>
</packing>
</child>
@@ -319,8 +283,6 @@
<property name="text" translatable="yes">_Help</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">11</property>
</packing>
</child>
@@ -333,8 +295,6 @@
<property name="text" translatable="yes">_About Files</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">12</property>
</packing>
</child>
@@ -364,8 +324,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -382,8 +340,6 @@
<property name="margin_bottom">6</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -396,8 +352,6 @@
<property name="text" translatable="yes">_Undo</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -410,15 +364,11 @@
<property name="text" translatable="yes">_Redo</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -432,8 +382,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -497,8 +445,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -524,8 +470,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -560,8 +504,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -587,8 +529,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -636,8 +576,6 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -667,8 +605,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -693,8 +629,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -703,8 +637,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -729,8 +661,6 @@
</style>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/src/resources/ui/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
index e554696ca..853a693ca 100644
--- a/src/resources/ui/nautilus-window.ui
+++ b/src/resources/ui/nautilus-window.ui
@@ -22,6 +22,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkPlacesSidebar" id="places_sidebar">
+ <property name="vexpand">True</property>
<property name="visible">True</property>
<property name="populate-all">True</property>
<property name="show-other-locations">True</property>
@@ -29,11 +30,6 @@
<signal name="show-other-locations-with-flags"
handler="places_sidebar_show_other_locations_with_flags" object="NautilusWindow" swapped="yes" />
<signal name="show-starred-location" handler="places_sidebar_show_starred_location"
object="NautilusWindow" swapped="yes" />
</object>
- <packing>
- <property name="pack_type">start</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
