From 135f0b2259aa77956b1c135ec4a9f3e5f8e767b8 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Fri, 11 Feb 2022 14:36:02 +0100 Subject: Revert "general: Rename 'canvas' to 'grid' in enums" This reverts commit 5830de7f41f2f92e60d84ec561720e1f3bc1aae6. --- data/org.gnome.nautilus.gschema.xml | 4 ++-- src/nautilus-debug.c | 2 +- src/nautilus-debug.h | 2 +- src/nautilus-directory-async.c | 2 +- src/nautilus-enums.h | 24 ++++++++++---------- src/nautilus-file.c | 6 ++--- src/nautilus-icon-info.h | 2 +- src/nautilus-operations-ui-manager.c | 4 ++-- src/nautilus-properties-window.c | 8 +++---- src/nautilus-view-icon-controller.c | 44 ++++++++++++++++++------------------ src/nautilus-view-icon-item-ui.c | 2 +- src/nautilus-view-item-model.c | 6 ++--- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml index aa4306aea..75f736e38 100644 --- a/data/org.gnome.nautilus.gschema.xml +++ b/data/org.gnome.nautilus.gschema.xml @@ -36,7 +36,7 @@ - + @@ -219,7 +219,7 @@ List of possible captions on icons A list of captions below an icon in the icon view. The actual number of captions shown depends on the zoom level. Some possible values are: “size”, “type”, “date_modified”, “owner”, “group”, “permissions”, and “mime_type”. - + 'large' Default icon view zoom level diff --git a/src/nautilus-debug.c b/src/nautilus-debug.c index d189a6f9a..59093f974 100644 --- a/src/nautilus-debug.c +++ b/src/nautilus-debug.c @@ -42,7 +42,7 @@ static GDebugKey keys[] = { "DirectoryView", NAUTILUS_DEBUG_DIRECTORY_VIEW }, { "File", NAUTILUS_DEBUG_FILE }, { "CanvasContainer", NAUTILUS_DEBUG_CANVAS_CONTAINER }, - { "IconView", NAUTILUS_DEBUG_GRID_VIEW }, + { "IconView", NAUTILUS_DEBUG_CANVAS_VIEW }, { "ListView", NAUTILUS_DEBUG_LIST_VIEW }, { "Mime", NAUTILUS_DEBUG_MIME }, { "Places", NAUTILUS_DEBUG_PLACES }, diff --git a/src/nautilus-debug.h b/src/nautilus-debug.h index c277f37a5..4d890e664 100644 --- a/src/nautilus-debug.h +++ b/src/nautilus-debug.h @@ -36,7 +36,7 @@ typedef enum { NAUTILUS_DEBUG_DIRECTORY_VIEW = 1 << 5, NAUTILUS_DEBUG_FILE = 1 << 6, NAUTILUS_DEBUG_CANVAS_CONTAINER = 1 << 7, - NAUTILUS_DEBUG_GRID_VIEW = 1 << 8, + NAUTILUS_DEBUG_CANVAS_VIEW = 1 << 8, NAUTILUS_DEBUG_LIST_VIEW = 1 << 9, NAUTILUS_DEBUG_MIME = 1 << 10, NAUTILUS_DEBUG_PLACES = 1 << 11, diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c index 901f5a38f..d5b93b5ac 100644 --- a/src/nautilus-directory-async.c +++ b/src/nautilus-directory-async.c @@ -3684,7 +3684,7 @@ thumbnail_loader_size_prepared (GdkPixbufLoader *loader, aspect_ratio = ((double) width) / height; /* cf. nautilus_file_get_icon() */ - max_thumbnail_size = NAUTILUS_GRID_ICON_SIZE_LARGEST * NAUTILUS_GRID_ICON_SIZE_STANDARD / NAUTILUS_GRID_ICON_SIZE_SMALL; + max_thumbnail_size = NAUTILUS_CANVAS_ICON_SIZE_LARGEST * NAUTILUS_CANVAS_ICON_SIZE_STANDARD / NAUTILUS_CANVAS_ICON_SIZE_SMALL; if (MAX (width, height) > max_thumbnail_size) { if (width > height) diff --git a/src/nautilus-enums.h b/src/nautilus-enums.h index 4145ed386..9f43800ca 100644 --- a/src/nautilus-enums.h +++ b/src/nautilus-enums.h @@ -30,21 +30,21 @@ typedef enum { - NAUTILUS_GRID_ICON_SIZE_SMALL = 48, - NAUTILUS_GRID_ICON_SIZE_STANDARD = 64, - NAUTILUS_GRID_ICON_SIZE_LARGE = 96, - NAUTILUS_GRID_ICON_SIZE_LARGER = 128, - NAUTILUS_GRID_ICON_SIZE_LARGEST = 256, -} NautilusGridIconSize; + NAUTILUS_CANVAS_ICON_SIZE_SMALL = 48, + NAUTILUS_CANVAS_ICON_SIZE_STANDARD = 64, + NAUTILUS_CANVAS_ICON_SIZE_LARGE = 96, + NAUTILUS_CANVAS_ICON_SIZE_LARGER = 128, + NAUTILUS_CANVAS_ICON_SIZE_LARGEST = 256, +} NautilusCanvasIconSize; typedef enum { - NAUTILUS_GRID_ZOOM_LEVEL_SMALL, - NAUTILUS_GRID_ZOOM_LEVEL_STANDARD, - NAUTILUS_GRID_ZOOM_LEVEL_LARGE, - NAUTILUS_GRID_ZOOM_LEVEL_LARGER, - NAUTILUS_GRID_ZOOM_LEVEL_LARGEST, -} NautilusGridZoomLevel; + NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL, + NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD, + NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE, + NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER, + NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST, +} NautilusCanvasZoomLevel; typedef enum { diff --git a/src/nautilus-file.c b/src/nautilus-file.c index ca5a5cc1b..f2102884d 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -5208,7 +5208,7 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, } else { - modified_size = size * scale * NAUTILUS_GRID_ICON_SIZE_STANDARD / NAUTILUS_GRID_ICON_SIZE_SMALL; + modified_size = size * scale * NAUTILUS_CANVAS_ICON_SIZE_STANDARD / NAUTILUS_CANVAS_ICON_SIZE_SMALL; } if (file->details->thumbnail) @@ -5218,9 +5218,9 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, s = MAX (w, h); /* Don't scale up small thumbnails in the standard view */ - if (s <= NAUTILUS_GRID_ICON_SIZE_STANDARD) + if (s <= NAUTILUS_CANVAS_ICON_SIZE_STANDARD) { - thumb_scale = (double) size / NAUTILUS_GRID_ICON_SIZE_SMALL; + thumb_scale = (double) size / NAUTILUS_CANVAS_ICON_SIZE_SMALL; } else { diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h index ed321dbfa..64f643651 100644 --- a/src/nautilus-icon-info.h +++ b/src/nautilus-icon-info.h @@ -9,7 +9,7 @@ G_BEGIN_DECLS #define NAUTILUS_LIST_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_LIST_ZOOM_LEVEL_LARGER + 1) -#define NAUTILUS_GRID_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_GRID_ZOOM_LEVEL_LARGEST + 1) +#define NAUTILUS_CANVAS_ZOOM_LEVEL_N_ENTRIES (NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST + 1) /* Maximum size of an icon that the icon factory will ever produce */ #define NAUTILUS_ICON_MAXIMUM_SIZE 320 diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c index 4641a49f1..be6badcbe 100644 --- a/src/nautilus-operations-ui-manager.c +++ b/src/nautilus-operations-ui-manager.c @@ -227,13 +227,13 @@ set_images (FileConflictDialogData *data) GdkPixbuf *destination_pixbuf; destination_pixbuf = nautilus_file_get_icon_pixbuf (data->destination, - NAUTILUS_GRID_ICON_SIZE_SMALL, + NAUTILUS_CANVAS_ICON_SIZE_SMALL, TRUE, 1, NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS); source_pixbuf = nautilus_file_get_icon_pixbuf (data->source, - NAUTILUS_GRID_ICON_SIZE_SMALL, + NAUTILUS_CANVAS_ICON_SIZE_SMALL, TRUE, 1, NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS); diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index 3d75bee7d..320501feb 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -411,13 +411,13 @@ get_image_for_properties_window (NautilusPropertiesWindow *self, if (!icon) { - icon = nautilus_file_get_icon (file, NAUTILUS_GRID_ICON_SIZE_STANDARD, icon_scale, + icon = nautilus_file_get_icon (file, NAUTILUS_CANVAS_ICON_SIZE_STANDARD, icon_scale, NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS | NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING); } else { - new_icon = nautilus_file_get_icon (file, NAUTILUS_GRID_ICON_SIZE_STANDARD, icon_scale, + new_icon = nautilus_file_get_icon (file, NAUTILUS_CANVAS_ICON_SIZE_STANDARD, icon_scale, NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS | NAUTILUS_FILE_ICON_FLAGS_IGNORE_VISITING); if (!new_icon || new_icon != icon) @@ -432,7 +432,7 @@ get_image_for_properties_window (NautilusPropertiesWindow *self, if (!icon) { icon = nautilus_icon_info_lookup_from_name ("text-x-generic", - NAUTILUS_GRID_ICON_SIZE_STANDARD, + NAUTILUS_CANVAS_ICON_SIZE_STANDARD, icon_scale); } @@ -443,7 +443,7 @@ get_image_for_properties_window (NautilusPropertiesWindow *self, if (icon_pixbuf != NULL) { - *icon_pixbuf = nautilus_icon_info_get_pixbuf_at_size (icon, NAUTILUS_GRID_ICON_SIZE_STANDARD); + *icon_pixbuf = nautilus_icon_info_get_pixbuf_at_size (icon, NAUTILUS_CANVAS_ICON_SIZE_STANDARD); } } diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c index d85bb2805..1045a63d6 100644 --- a/src/nautilus-view-icon-controller.c +++ b/src/nautilus-view-icon-controller.c @@ -117,7 +117,7 @@ static const SortConstants sorts_constants[] = } }; -static guint get_icon_size_for_zoom_level (NautilusGridZoomLevel zoom_level); +static guint get_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level); static const SortConstants * get_sorts_constants_from_action_target_name (const gchar *action_target_name) @@ -499,12 +499,12 @@ real_bump_zoom_level (NautilusFilesView *files_view, int zoom_increment) { NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); - NautilusGridZoomLevel new_level; + NautilusCanvasZoomLevel new_level; new_level = self->zoom_level + zoom_increment; - if (new_level >= NAUTILUS_GRID_ZOOM_LEVEL_SMALL && - new_level <= NAUTILUS_GRID_ZOOM_LEVEL_LARGEST) + if (new_level >= NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL && + new_level <= NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST) { g_action_group_change_action_state (self->action_group, "zoom-to-level", @@ -513,47 +513,47 @@ real_bump_zoom_level (NautilusFilesView *files_view, } static guint -get_icon_size_for_zoom_level (NautilusGridZoomLevel zoom_level) +get_icon_size_for_zoom_level (NautilusCanvasZoomLevel zoom_level) { switch (zoom_level) { - case NAUTILUS_GRID_ZOOM_LEVEL_SMALL: + case NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL: { - return NAUTILUS_GRID_ICON_SIZE_SMALL; + return NAUTILUS_CANVAS_ICON_SIZE_SMALL; } break; - case NAUTILUS_GRID_ZOOM_LEVEL_STANDARD: + case NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD: { - return NAUTILUS_GRID_ICON_SIZE_STANDARD; + return NAUTILUS_CANVAS_ICON_SIZE_STANDARD; } break; - case NAUTILUS_GRID_ZOOM_LEVEL_LARGE: + case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE: { - return NAUTILUS_GRID_ICON_SIZE_LARGE; + return NAUTILUS_CANVAS_ICON_SIZE_LARGE; } break; - case NAUTILUS_GRID_ZOOM_LEVEL_LARGER: + case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER: { - return NAUTILUS_GRID_ICON_SIZE_LARGER; + return NAUTILUS_CANVAS_ICON_SIZE_LARGER; } break; - case NAUTILUS_GRID_ZOOM_LEVEL_LARGEST: + case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST: { - return NAUTILUS_GRID_ICON_SIZE_LARGEST; + return NAUTILUS_CANVAS_ICON_SIZE_LARGEST; } break; } - g_return_val_if_reached (NAUTILUS_GRID_ICON_SIZE_STANDARD); + g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD); } static gint get_default_zoom_level (void) { - NautilusGridZoomLevel default_zoom_level; + NautilusCanvasZoomLevel default_zoom_level; default_zoom_level = g_settings_get_enum (nautilus_icon_view_preferences, NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL); @@ -631,7 +631,7 @@ real_restore_standard_zoom_level (NautilusFilesView *files_view) self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); g_action_group_change_action_state (self->action_group, "zoom-to-level", - g_variant_new_int32 (NAUTILUS_GRID_ZOOM_LEVEL_LARGE)); + g_variant_new_int32 (NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE)); } static gfloat @@ -640,7 +640,7 @@ real_get_zoom_level_percentage (NautilusFilesView *files_view) NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); return (gfloat) get_icon_size_for_zoom_level (self->zoom_level) / - NAUTILUS_GRID_ICON_SIZE_LARGE; + NAUTILUS_CANVAS_ICON_SIZE_LARGE; } static gboolean @@ -652,7 +652,7 @@ real_is_zoom_level_default (NautilusFilesView *files_view) self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); icon_size = get_icon_size_for_zoom_level (self->zoom_level); - return icon_size == NAUTILUS_GRID_ICON_SIZE_LARGE; + return icon_size == NAUTILUS_CANVAS_ICON_SIZE_LARGE; } static gboolean @@ -660,7 +660,7 @@ real_can_zoom_in (NautilusFilesView *files_view) { NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); - return self->zoom_level < NAUTILUS_GRID_ZOOM_LEVEL_LARGEST; + return self->zoom_level < NAUTILUS_CANVAS_ZOOM_LEVEL_LARGEST; } static gboolean @@ -668,7 +668,7 @@ real_can_zoom_out (NautilusFilesView *files_view) { NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view); - return self->zoom_level > NAUTILUS_GRID_ZOOM_LEVEL_SMALL; + return self->zoom_level > NAUTILUS_CANVAS_ZOOM_LEVEL_SMALL; } static GdkRectangle * diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c index dc2a2b90b..cdbffcf10 100644 --- a/src/nautilus-view-icon-item-ui.c +++ b/src/nautilus-view-icon-item-ui.c @@ -51,7 +51,7 @@ update_icon (NautilusViewIconItemUi *self) gtk_image_set_from_pixbuf (GTK_IMAGE (self->icon), icon_pixbuf); gtk_widget_set_size_request (self->fixed_height_box, icon_size, icon_size); - if (icon_size < NAUTILUS_GRID_ICON_SIZE_LARGEST) + if (icon_size < NAUTILUS_CANVAS_ICON_SIZE_LARGEST) { int extra_margins = 0.5 * EXTRA_WIDTH_FOR_TEXT; gtk_widget_set_margin_start (self->fixed_height_box, extra_margins); diff --git a/src/nautilus-view-item-model.c b/src/nautilus-view-item-model.c index 40e3ce9f1..98d3de4a7 100644 --- a/src/nautilus-view-item-model.c +++ b/src/nautilus-view-item-model.c @@ -138,9 +138,9 @@ nautilus_view_item_model_class_init (NautilusViewItemModelClass *klass) g_param_spec_int ("icon-size", "Icon size", "The size in pixels of the icon", - NAUTILUS_GRID_ICON_SIZE_SMALL, - NAUTILUS_GRID_ICON_SIZE_LARGEST, - NAUTILUS_GRID_ICON_SIZE_LARGE, + NAUTILUS_CANVAS_ICON_SIZE_SMALL, + NAUTILUS_CANVAS_ICON_SIZE_LARGEST, + NAUTILUS_CANVAS_ICON_SIZE_LARGE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_FILE, -- cgit v1.2.1