[nautilus/wip/antoniof/new_open_with: 22/31] properties-window: use level bar to visualize disk
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/new_open_with: 22/31] properties-window: use level bar to visualize disk
- Date: Thu, 28 Jul 2022 18:21:26 +0000 (UTC)
commit 468b5394c6bfa9d570c6a76063d960b6782fa5af
Author: Peter Eisenmann <p3732 getgoogleoff me>
Date: Sun Feb 6 04:39:36 2022 +0100
properties-window: use level bar to visualize disk
For filesystems replace the previous pie chart widget with a GtkLevelBar
and show it on the top. Reserved space is now included under 'used'
without a separate representation. Total, used and free disk space are
indicated as a legend under the bar, with used and free being
color-mapped through a respectively colored dot.
The 'Open in Disks' button is replaced with an inline row action,
indicated by a newly added 'external-link-symbolic' icon.
Filesystems no longer display 'Folder' as a type, but instead the actual
filesystem type.
Part of #1326
src/nautilus-properties-window.c | 199 +++++--------------------
src/resources/css/Adwaita.css | 37 +----
src/resources/icons/external-link-symbolic.svg | 2 +
src/resources/nautilus.gresource.xml | 1 +
src/resources/ui/nautilus-properties-window.ui | 155 +++++++++++++++++++
5 files changed, 198 insertions(+), 196 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 7fa0fecbe..1d749b3f6 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -89,6 +89,13 @@ struct _NautilusPropertiesWindow
GtkLabel *name_value_label;
GtkWidget *type_value_label;
+ GtkLabel *type_file_system_label;
+
+ GtkWidget *disk_list_box;
+ GtkLevelBar *disk_space_level_bar;
+ GtkWidget *disk_space_used_value;
+ GtkWidget *disk_space_free_value;
+ GtkWidget *disk_space_capacity_value;
GtkWidget *link_target_row;
GtkWidget *link_target_value_label;
@@ -117,16 +124,6 @@ struct _NautilusPropertiesWindow
GtkWidget *free_space_list_box;
GtkWidget *free_space_value_label;
- GtkWidget *volume_widget_box;
- GtkWidget *open_in_disks_button;
-
- GtkWidget *pie_chart;
- GtkWidget *used_color;
- GtkWidget *used_value;
- GtkWidget *free_color;
- GtkWidget *free_value;
- GtkWidget *total_capacity_value;
- GtkWidget *file_system_value;
/* Permissions tab Widgets */
@@ -477,7 +474,7 @@ static void remove_pending (StartupData *data,
gboolean cancel_timed_wait);
static void append_extension_pages (NautilusPropertiesWindow *self);
-static void setup_pie_widget (NautilusPropertiesWindow *self);
+static void setup_volume_information (NautilusPropertiesWindow *self);
G_DEFINE_TYPE (NautilusPropertiesWindow, nautilus_properties_window, ADW_TYPE_WINDOW);
@@ -2283,122 +2280,7 @@ should_show_volume_usage (NautilusPropertiesWindow *self)
}
static void
-paint_legend (GtkDrawingArea *drawing_area,
- cairo_t *cr,
- int width,
- int height,
- gpointer data)
-{
- GtkWidget *widget = GTK_WIDGET (drawing_area);
- GtkStyleContext *context;
- GtkAllocation allocation;
-
- gtk_widget_get_allocation (widget, &allocation);
- context = gtk_widget_get_style_context (widget);
-
- gtk_render_background (context, cr, 0, 0, allocation.width, allocation.height);
- gtk_render_frame (context, cr, 0, 0, allocation.width, allocation.height);
-}
-
-static void
-paint_slice (GtkWidget *widget,
- cairo_t *cr,
- double percent_start,
- double percent_width,
- const gchar *style_class)
-{
- double angle1;
- double angle2;
- gboolean full;
- double offset = G_PI / 2.0;
- GdkRGBA fill;
- GdkRGBA stroke;
- GtkBorder border;
- GtkStyleContext *context;
- double x, y, radius;
- gint width, height;
-
- if (percent_width < .01)
- {
- return;
- }
-
- context = gtk_widget_get_style_context (widget);
- gtk_style_context_get_border (context, &border);
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, style_class);
- gtk_style_context_get_color (context, &fill);
- gtk_style_context_add_class (context, "border");
- gtk_style_context_get_color (context, &stroke);
- gtk_style_context_restore (context);
-
- width = gtk_widget_get_allocated_width (widget);
- height = gtk_widget_get_allocated_height (widget);
- x = width / 2;
- y = height / 2;
-
- if (width < height)
- {
- radius = (width - border.left) / 2;
- }
- else
- {
- radius = (height - border.top) / 2;
- }
-
- angle1 = (percent_start * 2 * G_PI) - offset;
- angle2 = angle1 + (percent_width * 2 * G_PI);
-
- full = (percent_width > .99);
-
- if (!full)
- {
- cairo_move_to (cr, x, y);
- }
- cairo_arc (cr, x, y, radius, angle1, angle2);
-
- if (!full)
- {
- cairo_line_to (cr, x, y);
- }
-
- cairo_set_line_width (cr, border.top);
- gdk_cairo_set_source_rgba (cr, &fill);
- cairo_fill_preserve (cr);
-
- gdk_cairo_set_source_rgba (cr, &stroke);
- cairo_stroke (cr);
-}
-
-static void
-paint_pie_chart (GtkDrawingArea *drawing_area,
- cairo_t *cr,
- int width,
- int height,
- gpointer data)
-{
- NautilusPropertiesWindow *self;
- GtkWidget *widget = GTK_WIDGET (drawing_area);
- double free, used, reserved;
-
- self = NAUTILUS_PROPERTIES_WINDOW (data);
-
- free = (double) self->volume_free / (double) self->volume_capacity;
- used = (double) self->volume_used / (double) self->volume_capacity;
- reserved = 1.0 - (used + free);
-
- paint_slice (widget, cr,
- 0, free, "free");
- paint_slice (widget, cr,
- free + used, reserved, "unknown");
- /* paint the used last so its slice strokes are on top */
- paint_slice (widget, cr,
- free, used, "used");
-}
-
-static void
-setup_pie_widget (NautilusPropertiesWindow *self)
+setup_volume_information (NautilusPropertiesWindow *self)
{
NautilusFile *file;
g_autofree gchar *capacity = NULL;
@@ -2417,15 +2299,9 @@ setup_pie_widget (NautilusPropertiesWindow *self)
uri = nautilus_file_get_activation_uri (file);
- /* Translators: "used" refers to the capacity of the filesystem */
- gtk_label_set_text (GTK_LABEL (self->used_value), used);
-
- /* Translators: "free" refers to the capacity of the filesystem */
- gtk_label_set_text (GTK_LABEL (self->free_value), free);
-
- gtk_label_set_text (GTK_LABEL (self->total_capacity_value), capacity);
-
- gtk_label_set_text (GTK_LABEL (self->file_system_value), NULL);
+ gtk_label_set_text (GTK_LABEL (self->disk_space_used_value), used);
+ gtk_label_set_text (GTK_LABEL (self->disk_space_free_value), free);
+ gtk_label_set_text (GTK_LABEL (self->disk_space_capacity_value), capacity);
location = g_file_new_for_uri (uri);
info = g_file_query_filesystem_info (location, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
@@ -2435,16 +2311,16 @@ setup_pie_widget (NautilusPropertiesWindow *self)
fs_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
if (fs_type != NULL)
{
- gtk_label_set_text (GTK_LABEL (self->file_system_value), fs_type);
+ /* Translators: %s will be filled with a filesystem type, such as 'ext4' or 'msdos'. */
+ g_autofree gchar *fs_label = g_strdup_printf (_("%s Filesystem"), fs_type);
+ gtk_label_set_text (self->type_file_system_label, fs_label);
+ gtk_widget_show (GTK_WIDGET (self->type_file_system_label));
}
}
- gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (self->pie_chart),
- paint_pie_chart, self, NULL);
- gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (self->used_color),
- paint_legend, self, NULL);
- gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (self->free_color),
- paint_legend, self, NULL);
+ gtk_level_bar_set_value (self->disk_space_level_bar, (double) self->volume_used / (double)
self->volume_capacity);
+ /* display color changing based on filled level */
+ gtk_level_bar_add_offset_value (self->disk_space_level_bar, GTK_LEVEL_BAR_OFFSET_FULL, 0.0);
}
static void
@@ -2484,13 +2360,12 @@ setup_volume_usage_widget (NautilusPropertiesWindow *self)
if (self->volume_capacity > 0)
{
- setup_pie_widget (self);
+ setup_volume_information (self);
}
}
static void
-open_in_disks (GtkButton *button,
- NautilusPropertiesWindow *self)
+open_in_disks (NautilusPropertiesWindow *self)
{
NautilusDBusLauncher *launcher = nautilus_dbus_launcher_get ();
g_autoptr (GMount) mount = NULL;
@@ -2535,7 +2410,13 @@ setup_basic_page (NautilusPropertiesWindow *self)
update_name_field (self);
- if (should_show_file_type (self))
+ if (should_show_volume_usage (self))
+ {
+ gtk_widget_show (self->disk_list_box);
+ setup_volume_usage_widget (self);
+ }
+ /* don't show file type for volumes */
+ else if (should_show_file_type (self))
{
gtk_widget_show (self->type_value_label);
add_updatable_label (self, self->type_value_label, "detailed_type");
@@ -2599,13 +2480,6 @@ setup_basic_page (NautilusPropertiesWindow *self)
gtk_widget_show (self->free_space_list_box);
add_updatable_label (self, self->free_space_value_label, "free_space");
}
-
- if (should_show_volume_usage (self))
- {
- gtk_widget_show (self->volume_widget_box);
- g_signal_connect (self->open_in_disks_button, "clicked", G_CALLBACK (open_in_disks), self);
- setup_volume_usage_widget (self);
- }
}
static FilterType
@@ -4675,6 +4549,12 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, icon_button_image);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, name_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, type_value_label);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, type_file_system_label);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, disk_list_box);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, disk_space_level_bar);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, disk_space_used_value);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, disk_space_free_value);
+ gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, disk_space_capacity_value);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, link_target_row);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, link_target_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, size_row);
@@ -4696,15 +4576,6 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, accessed_value_label);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, free_space_list_box);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, free_space_value_label);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, volume_widget_box);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, open_in_disks_button);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, pie_chart);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, used_color);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, used_value);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, free_color);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, free_value);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, total_capacity_value);
- gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, file_system_value);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, permissions_stack);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, bottom_prompt_seperator);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, not_the_owner_label);
@@ -4735,6 +4606,8 @@ nautilus_properties_window_class_init (NautilusPropertiesWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, forget_button);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, add_button);
gtk_widget_class_bind_template_child (widget_class, NautilusPropertiesWindow, set_as_default_button);
+
+ gtk_widget_class_bind_template_callback (widget_class, open_in_disks);
}
static void
diff --git a/src/resources/css/Adwaita.css b/src/resources/css/Adwaita.css
index 97cf3bb7f..6723554bd 100644
--- a/src/resources/css/Adwaita.css
+++ b/src/resources/css/Adwaita.css
@@ -125,40 +125,11 @@
padding: 0px;
}
-@define-color disk_space_unknown #888a85;
-@define-color disk_space_used #729fcf;
-@define-color disk_space_free #eeeeec;
-
-.disk-space-display {
- border-style: solid;
- border-width: 2px;
-}
-
-.disk-space-display.unknown {
- background-color: @disk_space_unknown;
- border-color: shade(@disk_space_unknown, 0.7);
- color: @disk_space_unknown;
-}
-.disk-space-display.unknown.border {
- color: shade(@disk_space_unknown, 0.7);
-}
-
-.disk-space-display.used {
- background-color: @disk_space_used;
- border-color: shade(@disk_space_used, 0.7);
- color: @disk_space_used;
-}
-.disk-space-display.used.border {
- color: shade(@disk_space_used, 0.7);
-}
-
-.disk-space-display.free {
- background-color: @disk_space_free;
- border-color: shade(@disk_space_free, 0.7);
- color: @disk_space_free;
+.disk-space-free {
+ color: alpha(@dark_5, 0.12);
}
-.disk-space-display.free.border {
- color: shade(@disk_space_free, 0.7);
+.disk-space-used {
+ color: @accent_bg_color;
}
.search-information {
diff --git a/src/resources/icons/external-link-symbolic.svg b/src/resources/icons/external-link-symbolic.svg
new file mode 100644
index 000000000..a24ed4b05
--- /dev/null
+++ b/src/resources/icons/external-link-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; height="16px" viewBox="0 0 16 16" width="16px"><g
fill="#2e3436"><path d="m 2 3 v 11 h 11 v -4 h -2 v 2 h -7 v -7 h 2 v -2 z m 0 0"/><path d="m 9 2 c -0.550781
0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 3 v 3 c 0 0.550781 0.449219 1 1 1 s 1 -0.449219 1 -1 v -4 c 0 -0.550781
-0.449219 -1 -1 -1 z m 0 0"/><path d="m 13 2 h 1 v 1 h -1 z m 0 0"/><path d="m 12.292969 2.289062 l -4.5
4.46875 c -0.390625 0.390626 -0.390625 1.027344 0 1.414063 c 0.390625 0.394531 1.023437 0.394531 1.414062
0.007813 l 4.5 -4.46875 c 0.390625 -0.390626 0.390625 -1.027344 0 -1.414063 c -0.386719 -0.394531 -1.019531
-0.394531 -1.414062 -0.007813 z m 0 0"/><path d="m 13 7 h 1 v 1 h -1 z m 0 0"/><path d="m 8 2 h 1 v 1 h -1 z
m 0 0"/></g></svg>
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 0b36a989a..ba2b4a43e 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -35,5 +35,6 @@
</gresource>
<gresource prefix="/org/gnome/nautilus/icons/scalable/actions/">
<file alias="funnel-symbolic.svg" preprocess="xml-stripblanks">icons/funnel-symbolic.svg</file>
+ <file alias="external-link-symbolic.svg"
preprocess="xml-stripblanks">icons/external-link-symbolic.svg</file>
</gresource>
</gresources>
diff --git a/src/resources/ui/nautilus-properties-window.ui b/src/resources/ui/nautilus-properties-window.ui
index ca9cd4d71..1644dd196 100644
--- a/src/resources/ui/nautilus-properties-window.ui
+++ b/src/resources/ui/nautilus-properties-window.ui
@@ -83,6 +83,161 @@
</style>
</object>
</child>
+ <child>
+ <object class="GtkLabel" id="type_file_system_label">
+ <property name="ellipsize">end</property>
+ <property name="label" translatable="yes">Unknown Filesystem</property>
+ <property name="max-width-chars">24</property>
+ <property name="selectable">True</property>
+ <property name="visible">False</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkListBox" id="disk_list_box">
+ <property name="selection-mode">none</property>
+ <property name="visible">False</property>
+ <signal name="row-activated" handler="open_in_disks"
object="NautilusPropertiesWindow" swapped="yes"/>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="activatable">False</property>
+ <property name="selectable">False</property>
+ <child>
+ <object class="GtkBox">
+ <property name="margin-bottom">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">18</property>
+ <property name="spacing">12</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLevelBar" id="disk_space_level_bar">
+ <property name="hexpand">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">12</property>
+ <property name="halign">center</property>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="disk_space_capacity_value">
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes">total</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label">●</property>
+ <style>
+ <class name="disk-space-used"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="disk_space_used_value">
+ <style>
+ <class name="caption-style"/>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes" comments="Refers to
the capacity of the filesystem">used</property>
+ <style>
+ <class name="caption-style"/>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label">●</property>
+ <style>
+ <class name="disk-space-free"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="disk_space_free_value">
+ <style>
+ <class name="caption-style"/>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes" comments="Refers to
the capacity of the filesystem">free</property>
+ <style>
+ <class name="caption-style"/>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="activatable">True</property>
+ <property name="selectable">False</property>
+ <child>
+ <object class="GtkBox">
+ <property name="margin-bottom">12</property>
+ <property name="margin-end">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">12</property>
+ <property name="halign">center</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="label" translatable="yes" comments="Disks refers to
GNOME Disks.">Open in Disks</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">external-link-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <style>
+ <class name="boxed-list"/>
+ </style>
</object>
</child>
<child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
