[nautilus/wip/antoniof/new_open_with: 4/31] properties-window: remove volume information
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/new_open_with: 4/31] properties-window: remove volume information
- Date: Thu, 28 Jul 2022 18:21:25 +0000 (UTC)
commit 86856efaa6df10f903b35bda8812f4b4a82c2a6c
Author: Peter Eisenmann <p3732 getgoogleoff me>
Date: Thu Feb 3 02:19:21 2022 +0100
properties-window: remove volume information
The displayed information was the label of the mounted location. As
it was only shown for the top-level folder of the mount itself, it
was just displaying a duplicate of the name.
Part of #1326
src/nautilus-properties-window.c | 46 --------------------------
src/resources/ui/nautilus-properties-window.ui | 28 ----------------
2 files changed, 74 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 518f351d5..fdb90f11f 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -111,9 +111,6 @@ struct _NautilusPropertiesWindow
GtkWidget *original_folder_title_label;
GtkWidget *original_folder_value_label;
- GtkWidget *volume_title_label;
- GtkWidget *volume_value_label;
-
GtkWidget *trashed_on_title_label;
GtkWidget *trashed_on_value_label;
@@ -2047,36 +2044,6 @@ should_show_free_space (NautilusPropertiesWindow *self)
return FALSE;
}
-static gboolean
-should_show_volume_info (NautilusPropertiesWindow *self)
-{
- NautilusFile *file;
-
- if (is_multi_file_window (self))
- {
- return FALSE;
- }
-
- file = get_original_file (self);
-
- if (file == NULL)
- {
- return FALSE;
- }
-
- if (is_root_directory (file) && nautilus_application_is_sandboxed ())
- {
- return FALSE;
- }
-
- if (nautilus_file_can_unmount (file))
- {
- return TRUE;
- }
-
- return FALSE;
-}
-
static gboolean
should_show_volume_usage (NautilusPropertiesWindow *self)
{
@@ -2421,17 +2388,6 @@ setup_basic_page (NautilusPropertiesWindow *self)
self->original_folder_value_label);
}
- if (should_show_volume_info (self))
- {
- gtk_widget_show (self->volume_title_label);
- gtk_widget_show (self->volume_value_label);
- g_object_set_data_full (G_OBJECT (self->volume_value_label), "file_attribute",
- g_strdup ("volume"), g_free);
-
- self->value_fields = g_list_prepend (self->value_fields,
- self->volume_value_label);
- }
-
if (should_show_trashed_on (self))
{
gtk_widget_show (self->trashed_on_title_label);
@@ -5039,8 +4995,6 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, parent_folder_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow,
original_folder_title_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow,
original_folder_value_label);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, volume_title_label);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, volume_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, trashed_on_title_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, trashed_on_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, accessed_title_label);
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index d2d92c463..d6ddfec96 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -293,34 +293,6 @@
</layout>
</object>
</child>
- <child>
- <object class="GtkLabel" id="volume_title_label">
- <property name="visible">False</property>
- <property name="label" translatable="yes">Volume</property>
- <property name="xalign">1</property>
- <style>
- <class name="dim-label"/>
- </style>
- <layout>
- <property name="column">0</property>
- <property name="row">7</property>
- </layout>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="volume_value_label">
- <property name="visible">False</property>
- <property name="hexpand">True</property>
- <property name="selectable">True</property>
- <property name="ellipsize">end</property>
- <property name="max_width_chars">24</property>
- <property name="xalign">0</property>
- <layout>
- <property name="column">1</property>
- <property name="row">7</property>
- </layout>
- </object>
- </child>
<child>
<object class="GtkLabel" id="trashed_on_title_label">
<property name="visible">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]