diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-01-21 22:49:40 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-01-21 22:49:40 +0000 |
| commit | aaf205789a7294e70db3209a31438296cba415a8 (patch) | |
| tree | 7370222068f28f0a2ed91c690527daed1f812de7 | |
| parent | c66ad8c74e2f845d0f02f22bcedc7126913a418b (diff) | |
| download | nautilus-aaf205789a7294e70db3209a31438296cba415a8.tar.gz | |
Get rid of code that passes around the "optimize for AA" flag.
* components/tree/nautilus-tree-view.c:
(nautilus_tree_view_insert_model_node),
(nautilus_tree_view_update_model_node):
* libnautilus-private/nautilus-bookmark.c:
(nautilus_bookmark_get_pixbuf):
* libnautilus-private/nautilus-find-icon-image.c: (read_details),
(get_themed_icon_file_path), (theme_has_icon),
(nautilus_get_icon_file_name):
* libnautilus-private/nautilus-find-icon-image.h:
* libnautilus-private/nautilus-icon-container.c:
(nautilus_icon_container_update_icon):
* libnautilus-private/nautilus-icon-factory-private.h:
* libnautilus-private/nautilus-icon-factory.c:
(load_thumbnail_frame), (nautilus_icon_factory_init),
(nautilus_icon_factory_destroy), (icon_theme_changed_callback),
(should_display_image_file_as_itself),
(nautilus_icon_factory_get_icon_for_file), (load_icon_from_path),
(load_named_icon), (load_specific_icon), (load_icon_for_scaling),
(load_icon_scale_if_necessary), (get_icon_from_cache),
(nautilus_icon_factory_get_pixbuf_for_icon), (cache_key_hash),
(cache_key_equal), (nautilus_icon_factory_get_pixbuf_for_file),
(nautilus_icon_factory_get_pixbuf_from_name),
(nautilus_icon_factory_get_thumbnail_frame):
* libnautilus-private/nautilus-icon-factory.h:
* libnautilus-private/nautilus-thumbnails.c:
(nautilus_thumbnail_load_framed_image):
* libnautilus-private/nautilus-thumbnails.h:
* src/file-manager/fm-directory-view.c:
(add_script_to_script_menus), (add_submenu_to_script_menus):
* src/file-manager/fm-list-model.c: (fm_list_model_get_value):
* src/file-manager/fm-properties-window.c:
(get_pixbuf_for_properties_window):
* src/nautilus-sidebar-title.c: (update_icon), (update_emblems):
Get rid of code that passes around the "optimize for AA" flag.
* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c:
* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h:
* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c:
* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h:
Roll in the latest version from gimp source tree.
* icons: Overwrite all the non-aa versions with the aa versions.
Remove all the aa versions.
144 files changed, 341 insertions, 452 deletions
@@ -1,5 +1,51 @@ 2002-01-21 Darin Adler <darin@bentspoon.com> + * components/tree/nautilus-tree-view.c: + (nautilus_tree_view_insert_model_node), + (nautilus_tree_view_update_model_node): + * libnautilus-private/nautilus-bookmark.c: + (nautilus_bookmark_get_pixbuf): + * libnautilus-private/nautilus-find-icon-image.c: (read_details), + (get_themed_icon_file_path), (theme_has_icon), + (nautilus_get_icon_file_name): + * libnautilus-private/nautilus-find-icon-image.h: + * libnautilus-private/nautilus-icon-container.c: + (nautilus_icon_container_update_icon): + * libnautilus-private/nautilus-icon-factory-private.h: + * libnautilus-private/nautilus-icon-factory.c: + (load_thumbnail_frame), (nautilus_icon_factory_init), + (nautilus_icon_factory_destroy), (icon_theme_changed_callback), + (should_display_image_file_as_itself), + (nautilus_icon_factory_get_icon_for_file), (load_icon_from_path), + (load_named_icon), (load_specific_icon), (load_icon_for_scaling), + (load_icon_scale_if_necessary), (get_icon_from_cache), + (nautilus_icon_factory_get_pixbuf_for_icon), (cache_key_hash), + (cache_key_equal), (nautilus_icon_factory_get_pixbuf_for_file), + (nautilus_icon_factory_get_pixbuf_from_name), + (nautilus_icon_factory_get_thumbnail_frame): + * libnautilus-private/nautilus-icon-factory.h: + * libnautilus-private/nautilus-thumbnails.c: + (nautilus_thumbnail_load_framed_image): + * libnautilus-private/nautilus-thumbnails.h: + * src/file-manager/fm-directory-view.c: + (add_script_to_script_menus), (add_submenu_to_script_menus): + * src/file-manager/fm-list-model.c: (fm_list_model_get_value): + * src/file-manager/fm-properties-window.c: + (get_pixbuf_for_properties_window): + * src/nautilus-sidebar-title.c: (update_icon), (update_emblems): + Get rid of code that passes around the "optimize for AA" flag. + + * cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c: + * cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h: + * cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c: + * cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h: + Roll in the latest version from gimp source tree. + + * icons: Overwrite all the non-aa versions with the aa versions. + Remove all the aa versions. + +2002-01-21 Darin Adler <darin@bentspoon.com> + * check-signals.pl: Remove. * components/adapter/bonobo-stream-vfs.c: Remove. * components/adapter/bonobo-stream-vfs.h: Remove. diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index 4cd1cbd3a..15858fef0 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -237,11 +237,9 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode * if (nautilus_tree_view_model_node_to_view_node (view, node) == NULL) { closed_pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS, - is_anti_aliased (view)); + (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS); open_pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, "accept", NAUTILUS_ICON_SIZE_FOR_MENUS, - is_anti_aliased (view)); + (file, "accept", NAUTILUS_ICON_SIZE_FOR_MENUS); view->details->inserting_node = TRUE; EEL_CLIST_UNSET_FLAG (EEL_CLIST (view->details->tree), @@ -431,11 +429,9 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode * link_view_node_with_uri (view, view_node, nautilus_file_get_uri (file)); closed_pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS, - is_anti_aliased (view)); + (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS); open_pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, "accept", NAUTILUS_ICON_SIZE_FOR_MENUS, - is_anti_aliased (view)); + (file, "accept", NAUTILUS_ICON_SIZE_FOR_MENUS); name = nautilus_file_get_display_name (file); diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c index e6de3af41..8c78bafc6 100644 --- a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c +++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c @@ -19,9 +19,12 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#include "config.h" + +#include <gtk/gtk.h> + #include "gtkhwrapbox.h" -#include <gtk/gtksignal.h> -#include <math.h> /* --- prototypes --- */ @@ -94,7 +97,6 @@ gtk_hwrap_box_init (GtkHWrapBox *hwbox) { hwbox->max_child_width = 0; hwbox->max_child_height = 0; - hwbox->request_stored_height = FALSE; } GtkWidget* @@ -125,55 +127,6 @@ get_child_requisition (GtkWrapBox *wbox, gtk_widget_get_child_requisition (child, child_requisition); } -#if 0 -static void -_gtk_hwrap_box_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkHWrapBox *this = GTK_HWRAP_BOX (widget); - GtkWrapBox *wbox = GTK_WRAP_BOX (widget); - GtkWrapBoxChild *child; - guint area = 0; - - g_return_if_fail (requisition != NULL); - - /*<h2v-off>*/ - requisition->width = 0; - requisition->height = 0; - this->max_child_width = 0; - this->max_child_height = 0; - - for (child = wbox->children; child; child = child->next) - if (GTK_WIDGET_VISIBLE (child->widget)) - { - GtkRequisition child_requisition; - - gtk_widget_size_request (child->widget, &child_requisition); - - area += child_requisition.width * child_requisition.height; - this->max_child_width = MAX (this->max_child_width, child_requisition.width); - this->max_child_height = MAX (this->max_child_height, child_requisition.height); - } - if (wbox->homogeneous) - area = this->max_child_width * this->max_child_height * wbox->n_children; - - if (area) - { - requisition->width = sqrt (area * wbox->aspect_ratio); - requisition->height = area / requisition->width; - } - else - { - requisition->width = 0; - requisition->height = 0; - } - - requisition->width += GTK_CONTAINER (wbox)->border_width * 2; - requisition->height += GTK_CONTAINER (wbox)->border_width * 2; - /*<h2v-on>*/ -} -#endif - static gfloat get_layout_size (GtkHWrapBox *this, guint max_width, @@ -226,7 +179,6 @@ get_layout_size (GtkHWrapBox *this, return MAX (total_height, 1); } - static void gtk_hwrap_box_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -236,7 +188,7 @@ gtk_hwrap_box_size_request (GtkWidget *widget, GtkWrapBoxChild *child; gfloat ratio_dist, layout_width = 0; guint row_inc = 0; - + g_return_if_fail (requisition != NULL); requisition->width = 0; @@ -244,7 +196,6 @@ gtk_hwrap_box_size_request (GtkWidget *widget, this->max_child_width = 0; this->max_child_height = 0; - /* size_request all children */ for (child = wbox->children; child; child = child->next) if (GTK_WIDGET_VISIBLE (child->widget)) @@ -253,8 +204,8 @@ gtk_hwrap_box_size_request (GtkWidget *widget, gtk_widget_size_request (child->widget, &child_requisition); - this->max_child_width = MAX (this->max_child_width, child_requisition.width); - this->max_child_height = MAX (this->max_child_height, child_requisition.height); + this->max_child_width = MAX (this->max_child_width, (guint) child_requisition.width); + this->max_child_height = MAX (this->max_child_height, (guint) child_requisition.height); } /* figure all possible layouts */ @@ -264,27 +215,32 @@ gtk_hwrap_box_size_request (GtkWidget *widget, { gfloat layout_height; gfloat ratio, dist; - GtkRequisition *saved_requisition; layout_width += row_inc; layout_height = get_layout_size (this, layout_width, &row_inc); ratio = layout_width / layout_height; /*<h2v-skip>*/ dist = MAX (ratio, wbox->aspect_ratio) - MIN (ratio, wbox->aspect_ratio); - if (dist < ratio_dist || - (this->request_stored_height && - layout_height == this->request_this_height_next_time)) + if (dist < ratio_dist) { ratio_dist = dist; requisition->width = layout_width; requisition->height = layout_height; } - saved_requisition = g_new0 (GtkRequisition, 1); - saved_requisition->width = layout_width; - saved_requisition->height = layout_height; + + /* g_print ("ratio for width %d height %d = %f\n", + (gint) layout_width, + (gint) layout_height, + ratio); + */ } while (row_inc); + requisition->width += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/ requisition->height += GTK_CONTAINER (wbox)->border_width * 2; /*<h2v-skip>*/ + /* g_print ("choosen: width %d, height %d\n", + requisition->width, + requisition->height); + */ } static GSList* @@ -326,7 +282,7 @@ reverse_list_row_children (GtkWrapBox *wbox, { get_child_requisition (wbox, child->widget, &child_requisition); if (width + wbox->hspacing + child_requisition.width > row_width || - child->forced_break) + child->wrapped) break; width += wbox->hspacing + child_requisition.width; *max_child_size = MAX (*max_child_size, (guint) child_requisition.height); @@ -350,7 +306,8 @@ layout_row (GtkWrapBox *wbox, gboolean vexpand) { GSList *slist; - guint n_children = 0, n_expand_children = 0, have_expand_children = 0, total_width = 0; + guint n_children = 0, n_expand_children = 0, have_expand_children = 0; + gint total_width = 0; gfloat x, width, extra; GtkAllocation child_allocation; @@ -493,7 +450,6 @@ struct _Line Line *next; }; - static void layout_rows (GtkWrapBox *wbox, GtkAllocation *area) @@ -502,11 +458,10 @@ layout_rows (GtkWrapBox *wbox, guint min_height; gboolean vexpand; GSList *slist; + Line *line_list = NULL; + guint total_height = 0, n_expand_lines = 0, n_lines = 0; gfloat shrink_height; guint children_per_line; - Line *line_list = NULL; - int total_height = 0; - guint n_expand_lines = 0, n_lines = 0; next_child = wbox->children; slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox, @@ -538,18 +493,11 @@ layout_rows (GtkWrapBox *wbox, &vexpand); slist = g_slist_reverse (slist); } - GTK_HWRAP_BOX (wbox)->request_this_height_next_time = total_height; - if (!(GTK_HWRAP_BOX (wbox)->request_stored_height )) { - g_signal_emit_by_name (wbox, "need_reallocation", NULL); - GTK_HWRAP_BOX (wbox)->request_stored_height = TRUE; - } - if (total_height > area->height) { - shrink_height = total_height - area->height; - g_signal_emit_by_name (wbox, "need_reallocation", NULL); - } + + if (total_height > (guint) area->height) + shrink_height = total_height - area->height; else shrink_height = 0; - if (1) /* reverse lines and shrink */ { @@ -645,7 +593,7 @@ gtk_hwrap_box_size_allocate (GtkWidget *widget, { GtkWrapBox *wbox = GTK_WRAP_BOX (widget); GtkAllocation area; - guint border = GTK_CONTAINER (wbox)->border_width; /*<h2v-skip>*/ + gint border = GTK_CONTAINER (wbox)->border_width; /*<h2v-skip>*/ widget->allocation = *allocation; area.x = allocation->x + border; @@ -659,6 +607,6 @@ gtk_hwrap_box_size_allocate (GtkWidget *widget, allocation->height); */ /*<h2v-on>*/ - + layout_rows (wbox, &area); } diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h index b7b43ec71..cb894836d 100644 --- a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h +++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h @@ -19,16 +19,14 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_HWRAP_BOX_H__ #define __GTK_HWRAP_BOX_H__ #include "gtkwrapbox.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* --- type macros --- */ @@ -37,7 +35,7 @@ extern "C" { #define GTK_HWRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HWRAP_BOX, GtkHWrapBoxClass)) #define GTK_IS_HWRAP_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HWRAP_BOX)) #define GTK_IS_HWRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HWRAP_BOX)) -#define GTK_HWRAP_BOX_GET_CLASS(obj) (GTK_HWRAP_BOX_CLASS (((GtkObject*) (obj))->klass)) +#define GTK_HWRAP_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_HWRAP_BOX, GtkHWrapBoxClass)) /* --- typedefs --- */ @@ -51,12 +49,9 @@ struct _GtkHWrapBox GtkWrapBox parent_widget; /*<h2v-off>*/ - guint16 max_child_width; - guint16 max_child_height; + guint max_child_width; + guint max_child_height; /*<h2v-on>*/ - - gboolean request_stored_height; - guint16 request_this_height_next_time; }; struct _GtkHWrapBoxClass @@ -66,13 +61,10 @@ struct _GtkHWrapBoxClass /* --- prototypes --- */ -GtkType gtk_hwrap_box_get_type (void); -GtkWidget* gtk_hwrap_box_new (gboolean homogeneous); - +GtkType gtk_hwrap_box_get_type (void) G_GNUC_CONST; +GtkWidget * gtk_hwrap_box_new (gboolean homogeneous); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GTK_HWRAP_BOX_H__ */ diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c index 220d8f448..49daa3405 100644 --- a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c +++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c @@ -19,10 +19,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include <math.h> -#include <gtk/gtksignal.h> -#include "gtkwrapbox.h" +#include "config.h" + +#include "gtkwrapbox.h" /* --- arguments --- */ @@ -38,21 +38,15 @@ enum { ARG_CHILD_LIMIT }; enum { - CHILD_ARG_0, - CHILD_ARG_POSITION, - CHILD_ARG_HEXPAND, - CHILD_ARG_HFILL, - CHILD_ARG_VEXPAND, - CHILD_ARG_VFILL, - CHILD_ARG_FORCED_BREAK -}; - -enum { - NEED_REALLOCATION, - LAST_SIGNAL + CHILD_PROP_0, + CHILD_PROP_POSITION, + CHILD_PROP_HEXPAND, + CHILD_PROP_HFILL, + CHILD_PROP_VEXPAND, + CHILD_PROP_VFILL, + CHILD_PROP_WRAPPED }; -static guint signals[LAST_SIGNAL]; /* --- prototypes --- */ static void gtk_wrap_box_class_init (GtkWrapBoxClass *klass); @@ -63,10 +57,18 @@ static void gtk_wrap_box_get_arg (GtkObject *object, static void gtk_wrap_box_set_arg (GtkObject *object, GtkArg *arg, guint arg_id); +static void gtk_wrap_box_set_child_property (GtkContainer *container, + GtkWidget *child, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_wrap_box_get_child_property (GtkContainer *container, + GtkWidget *child, + guint property_id, + GValue *value, + GParamSpec *pspec); static void gtk_wrap_box_map (GtkWidget *widget); static void gtk_wrap_box_unmap (GtkWidget *widget); -static gint gtk_wrap_box_expose (GtkWidget *widget, - GdkEventExpose *event); static void gtk_wrap_box_add (GtkContainer *container, GtkWidget *widget); static void gtk_wrap_box_remove (GtkContainer *container, @@ -119,48 +121,64 @@ gtk_wrap_box_class_init (GtkWrapBoxClass *class) widget_class = GTK_WIDGET_CLASS (class); container_class = GTK_CONTAINER_CLASS (class); - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + parent_class = g_type_class_peek_parent (class); object_class->set_arg = gtk_wrap_box_set_arg; object_class->get_arg = gtk_wrap_box_get_arg; widget_class->map = gtk_wrap_box_map; widget_class->unmap = gtk_wrap_box_unmap; - widget_class->expose_event = gtk_wrap_box_expose; container_class->add = gtk_wrap_box_add; container_class->remove = gtk_wrap_box_remove; container_class->forall = gtk_wrap_box_forall; container_class->child_type = gtk_wrap_box_child_type; + container_class->set_child_property = gtk_wrap_box_set_child_property; + container_class->get_child_property = gtk_wrap_box_get_child_property; class->rlist_line_children = NULL; gtk_object_add_arg_type ("GtkWrapBox::homogeneous", - G_TYPE_BOOLEAN, GTK_ARG_READWRITE, ARG_HOMOGENEOUS); + GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HOMOGENEOUS); gtk_object_add_arg_type ("GtkWrapBox::justify", GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_JUSTIFY); gtk_object_add_arg_type ("GtkWrapBox::hspacing", - G_TYPE_UINT, GTK_ARG_READWRITE, ARG_HSPACING); + GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_HSPACING); gtk_object_add_arg_type ("GtkWrapBox::vspacing", - G_TYPE_UINT, GTK_ARG_READWRITE, ARG_VSPACING); + GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_VSPACING); gtk_object_add_arg_type ("GtkWrapBox::line_justify", GTK_TYPE_JUSTIFICATION, GTK_ARG_READWRITE, ARG_LINE_JUSTIFY); gtk_object_add_arg_type ("GtkWrapBox::aspect_ratio", - G_TYPE_FLOAT, GTK_ARG_READWRITE, ARG_ASPECT_RATIO); + GTK_TYPE_FLOAT, GTK_ARG_READWRITE, ARG_ASPECT_RATIO); gtk_object_add_arg_type ("GtkWrapBox::current_ratio", - G_TYPE_FLOAT, GTK_ARG_READABLE, ARG_CURRENT_RATIO); + GTK_TYPE_FLOAT, GTK_ARG_READABLE, ARG_CURRENT_RATIO); gtk_object_add_arg_type ("GtkWrapBox::max_children_per_line", - G_TYPE_UINT, GTK_ARG_READWRITE, ARG_CHILD_LIMIT); - - signals[NEED_REALLOCATION] = g_signal_new - ("need_reallocation", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkWrapBoxClass, - need_reallocation), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_CHILD_LIMIT); + + gtk_container_class_install_child_property (container_class, CHILD_PROP_POSITION, + g_param_spec_int ("position", NULL, NULL, + -1, G_MAXINT, 0, + G_PARAM_READWRITE)); + gtk_container_class_install_child_property (container_class, CHILD_PROP_HEXPAND, + g_param_spec_boolean ("hexpand", NULL, NULL, + FALSE, + G_PARAM_READWRITE)); + gtk_container_class_install_child_property (container_class, CHILD_PROP_HFILL, + g_param_spec_boolean ("hfill", NULL, NULL, + FALSE, + G_PARAM_READWRITE)); + gtk_container_class_install_child_property (container_class, CHILD_PROP_VEXPAND, + g_param_spec_boolean ("vexpand", NULL, NULL, + FALSE, + G_PARAM_READWRITE)); + gtk_container_class_install_child_property (container_class, CHILD_PROP_VFILL, + g_param_spec_boolean ("vfill", NULL, NULL, + FALSE, + G_PARAM_READWRITE)); + gtk_container_class_install_child_property (container_class, CHILD_PROP_VFILL, + g_param_spec_boolean ("wrapped", NULL, NULL, + FALSE, + G_PARAM_READWRITE)); } static void @@ -252,7 +270,109 @@ gtk_wrap_box_get_arg (GtkObject *object, GTK_VALUE_UINT (*arg) = wbox->child_limit; break; default: - arg->type = G_TYPE_INVALID; + arg->type = GTK_TYPE_INVALID; + break; + } +} + +static void +gtk_wrap_box_set_child_property (GtkContainer *container, + GtkWidget *child, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkWrapBox *wbox = GTK_WRAP_BOX (container); + gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE, wrapped = FALSE; + + if (property_id != CHILD_PROP_POSITION) + gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill, &wrapped); + + switch (property_id) + { + case CHILD_PROP_POSITION: + gtk_wrap_box_reorder_child (wbox, child, g_value_get_int (value)); + break; + case CHILD_PROP_HEXPAND: + gtk_wrap_box_set_child_packing (wbox, child, + g_value_get_boolean (value), hfill, + vexpand, vfill, + wrapped); + break; + case CHILD_PROP_HFILL: + gtk_wrap_box_set_child_packing (wbox, child, + hexpand, g_value_get_boolean (value), + vexpand, vfill, + wrapped); + break; + case CHILD_PROP_VEXPAND: + gtk_wrap_box_set_child_packing (wbox, child, + hexpand, hfill, + g_value_get_boolean (value), vfill, + wrapped); + break; + case CHILD_PROP_VFILL: + gtk_wrap_box_set_child_packing (wbox, child, + hexpand, hfill, + vexpand, g_value_get_boolean (value), + wrapped); + break; + case CHILD_PROP_WRAPPED: + gtk_wrap_box_set_child_packing (wbox, child, + hexpand, hfill, + vexpand, vfill, + g_value_get_boolean (value)); + break; + default: + GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); + break; + } +} + +static void +gtk_wrap_box_get_child_property (GtkContainer *container, + GtkWidget *child, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GtkWrapBox *wbox = GTK_WRAP_BOX (container); + gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE, wrapped = FALSE; + + if (property_id != CHILD_PROP_POSITION) + gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill, &wrapped); + + switch (property_id) + { + GtkWrapBoxChild *child_info; + int i; + case CHILD_PROP_POSITION: + i = 0; + for (child_info = wbox->children; child_info; child_info = child_info->next) + { + if (child_info->widget == child) + break; + i += 1; + } + g_value_set_int (value, child_info ? i : -1); + break; + case CHILD_PROP_HEXPAND: + g_value_set_boolean (value, hexpand); + break; + case CHILD_PROP_HFILL: + g_value_set_boolean (value, hfill); + break; + case CHILD_PROP_VEXPAND: + g_value_set_boolean (value, vexpand); + break; + case CHILD_PROP_VFILL: + g_value_set_boolean (value, vfill); + break; + case CHILD_PROP_WRAPPED: + g_value_set_boolean (value, wrapped); + break; + default: + GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); break; } } @@ -354,6 +474,22 @@ gtk_wrap_box_pack (GtkWrapBox *wbox, gboolean vexpand, gboolean vfill) { + g_return_if_fail (GTK_IS_WRAP_BOX (wbox)); + g_return_if_fail (GTK_IS_WIDGET (child)); + g_return_if_fail (child->parent == NULL); + + gtk_wrap_box_pack_wrapped (wbox, child, hexpand, hfill, vexpand, vfill, FALSE); +} + +void +gtk_wrap_box_pack_wrapped (GtkWrapBox *wbox, + GtkWidget *child, + gboolean hexpand, + gboolean hfill, + gboolean vexpand, + gboolean vfill, + gboolean wrapped) +{ GtkWrapBoxChild *child_info; g_return_if_fail (GTK_IS_WRAP_BOX (wbox)); @@ -366,7 +502,7 @@ gtk_wrap_box_pack (GtkWrapBox *wbox, child_info->hfill = hfill ? TRUE : FALSE; child_info->vexpand = vexpand ? TRUE : FALSE; child_info->vfill = vfill ? TRUE : FALSE; - child_info->forced_break = FALSE; + child_info->wrapped = wrapped ? TRUE : FALSE; child_info->next = NULL; if (wbox->children) { @@ -451,7 +587,8 @@ gtk_wrap_box_query_child_packing (GtkWrapBox *wbox, gboolean *hexpand, gboolean *hfill, gboolean *vexpand, - gboolean *vfill) + gboolean *vfill, + gboolean *wrapped) { GtkWrapBoxChild *child_info; @@ -472,27 +609,8 @@ gtk_wrap_box_query_child_packing (GtkWrapBox *wbox, *vexpand = child_info->vexpand; if (vfill) *vfill = child_info->vfill; - } -} - -void -gtk_wrap_box_query_child_forced_break (GtkWrapBox *wbox, - GtkWidget *child, - gboolean *forced_break) -{ - GtkWrapBoxChild *child_info; - - g_return_if_fail (GTK_IS_WRAP_BOX (wbox)); - g_return_if_fail (GTK_IS_WIDGET (child)); - - for (child_info = wbox->children; child_info; child_info = child_info->next) - if (child_info->widget == child) - break; - - if (child_info) - { - if (forced_break) - *forced_break = child_info->forced_break; + if (wrapped) + *wrapped = child_info->wrapped; } } @@ -502,7 +620,8 @@ gtk_wrap_box_set_child_packing (GtkWrapBox *wbox, gboolean hexpand, gboolean hfill, gboolean vexpand, - gboolean vfill) + gboolean vfill, + gboolean wrapped) { GtkWrapBoxChild *child_info; @@ -513,45 +632,22 @@ gtk_wrap_box_set_child_packing (GtkWrapBox *wbox, hfill = hfill != FALSE; vexpand = vexpand != FALSE; vfill = vfill != FALSE; - + wrapped = wrapped != FALSE; + for (child_info = wbox->children; child_info; child_info = child_info->next) if (child_info->widget == child) break; if (child_info && (child_info->hexpand != hexpand || child_info->vexpand != vexpand || - child_info->hfill != hfill || child_info->vfill != vfill)) + child_info->hfill != hfill || child_info->vfill != vfill || + child_info->wrapped != wrapped)) { child_info->hexpand = hexpand; child_info->hfill = hfill; child_info->vexpand = vexpand; child_info->vfill = vfill; - - if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (wbox)) - gtk_widget_queue_resize (child); - } -} - -void -gtk_wrap_box_set_child_forced_break (GtkWrapBox *wbox, - GtkWidget *child, - gboolean forced_break) -{ - GtkWrapBoxChild *child_info; - - g_return_if_fail (GTK_IS_WRAP_BOX (wbox)); - g_return_if_fail (GTK_IS_WIDGET (child)); - - forced_break = forced_break != FALSE; - - for (child_info = wbox->children; child_info; child_info = child_info->next) - if (child_info->widget == child) - break; - - if (child_info && - (child_info->forced_break != forced_break)) - { - child_info->forced_break = forced_break; + child_info->wrapped = wrapped; if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (wbox)) gtk_widget_queue_resize (child); @@ -634,27 +730,6 @@ gtk_wrap_box_unmap (GtkWidget *widget) gtk_widget_unmap (child->widget); } -static gint -gtk_wrap_box_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkWrapBox *wbox = GTK_WRAP_BOX (widget); - GtkWrapBoxChild *child; - GdkEvent child_event; - - g_return_val_if_fail (event != NULL, FALSE); - - child_event.expose = *event; - if (GTK_WIDGET_DRAWABLE (widget)) - for (child = wbox->children; child; child = child->next) - if (GTK_WIDGET_DRAWABLE (child->widget) && - GTK_WIDGET_NO_WINDOW (child->widget) && - gtk_widget_intersect (child->widget, &event->area, &child_event.expose.area)) - gtk_widget_event (child->widget, &child_event); - - return TRUE; -} - static void gtk_wrap_box_add (GtkContainer *container, GtkWidget *widget) diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h index 04d71fc68..de204449f 100644 --- a/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h +++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h @@ -19,16 +19,14 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_WRAP_BOX_H__ #define __GTK_WRAP_BOX_H__ #include <gtk/gtkcontainer.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* --- type macros --- */ @@ -37,7 +35,7 @@ extern "C" { #define GTK_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass)) #define GTK_IS_WRAP_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_WRAP_BOX)) #define GTK_IS_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WRAP_BOX)) -#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_WRAP_BOX_CLASS (G_OBJECT_GET_CLASS (obj))) +#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass)) /* --- typedefs --- */ @@ -45,9 +43,6 @@ typedef struct _GtkWrapBox GtkWrapBox; typedef struct _GtkWrapBoxClass GtkWrapBoxClass; typedef struct _GtkWrapBoxChild GtkWrapBoxChild; - - /* For nautilus usage, we should remove the - aspect ratio capability */ /* --- GtkWrapBox --- */ struct _GtkWrapBox { @@ -72,12 +67,6 @@ struct _GtkWrapBoxClass GtkAllocation *area, guint *max_child_size, gboolean *expand_line); - - /* This signal is added to tell parent widgets that - the box doesn't have enough space in the new configuration, - and that a resize is recommended. This can happen when a - layout changes the box's allocation. */ - void (*need_reallocation) (GtkWrapBox *wbox); }; struct _GtkWrapBoxChild { @@ -86,7 +75,7 @@ struct _GtkWrapBoxChild guint hfill : 1; guint vexpand : 1; guint vfill : 1; - guint forced_break : 1; + guint wrapped : 1; GtkWrapBoxChild *next; }; @@ -95,7 +84,7 @@ struct _GtkWrapBoxChild /* --- prototypes --- */ -GtkType gtk_wrap_box_get_type (void); +GtkType gtk_wrap_box_get_type (void) G_GNUC_CONST; void gtk_wrap_box_set_homogeneous (GtkWrapBox *wbox, gboolean homogeneous); void gtk_wrap_box_set_hspacing (GtkWrapBox *wbox, @@ -114,6 +103,13 @@ void gtk_wrap_box_pack (GtkWrapBox *wbox, gboolean hfill, gboolean vexpand, gboolean vfill); +void gtk_wrap_box_pack_wrapped (GtkWrapBox *wbox, + GtkWidget *child, + gboolean hexpand, + gboolean hfill, + gboolean vexpand, + gboolean vfill, + gboolean wrapped); void gtk_wrap_box_reorder_child (GtkWrapBox *wbox, GtkWidget *child, gint position); @@ -122,27 +118,19 @@ void gtk_wrap_box_query_child_packing (GtkWrapBox *wbox, gboolean *hexpand, gboolean *hfill, gboolean *vexpand, - gboolean *vfill); -void gtk_wrap_box_query_child_forced_break (GtkWrapBox *wbox, - GtkWidget *child, - gboolean *forced_break); + gboolean *vfill, + gboolean *wrapped); void gtk_wrap_box_set_child_packing (GtkWrapBox *wbox, GtkWidget *child, gboolean hexpand, gboolean hfill, gboolean vexpand, - gboolean vfill); -void gtk_wrap_box_set_child_forced_break (GtkWrapBox *wbox, - GtkWidget *child, - gboolean forced_break); + gboolean vfill, + gboolean wrapped); guint* gtk_wrap_box_query_line_lengths (GtkWrapBox *wbox, guint *n_lines); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GTK_WRAP_BOX_H__ */ diff --git a/icons/Makefile.am b/icons/Makefile.am index 7b0d0af00..1eb105162 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -154,66 +154,41 @@ icon_DATA =\ i-device.png \ i-dirclosed.png \ i-directory-12.png \ - i-directory-12-aa.png \ i-directory-24.png \ - i-directory-24-aa.png \ i-directory-36.png \ - i-directory-36-aa.png \ i-directory-72.png \ - i-directory-72-aa.png \ i-directory-96.png \ - i-directory-96-aa.png \ i-directory.png \ - i-directory-aa.png \ i-directory-accept-12.png \ - i-directory-accept-12-aa.png \ i-directory-accept-24.png \ - i-directory-accept-24-aa.png \ i-directory-accept-36.png \ - i-directory-accept-36-aa.png \ i-directory-accept-72.png \ - i-directory-accept-72-aa.png \ i-directory-accept-96.png \ - i-directory-accept-96-aa.png \ i-directory-accept.png \ - i-directory-accept-aa.png \ i-directory.xml \ i-directory-accept.xml \ - i-executable-aa.png \ i-executable.png \ i-fifo.png \ i-floppy.png \ i-harddisk.png \ i-music-12.png \ - i-music-12-aa.png \ i-music-24.png \ - i-music-24-aa.png \ i-music-36.png \ - i-music-36-aa.png \ - i-music-aa.png \ i-music.png \ i-nfs.png \ i-printer.png \ - i-regular-12-aa.png \ i-regular-12.png \ - i-regular-24-aa.png \ i-regular-24.png \ - i-regular-36-aa.png \ i-regular-36.png \ - i-regular-72-aa.png \ i-regular-72.png \ - i-regular-96-aa.png \ i-regular-96.png \ - i-regular-aa.png \ i-regular.png \ i-regular.xml \ i-search-72.png \ i-sock.png \ - i-spreadsheet-aa.png \ i-spreadsheet.png \ i-stalled.png \ i-symlink.png \ - i-symlink-aa.png \ i-web-72.png \ i-zipdisk.png \ i-zipdisk2.png \ @@ -223,7 +198,6 @@ icon_DATA =\ knob.png \ leftarrow.png \ loading.png \ - loading-aa.png \ manual.png \ multi-ok.png \ nautilus-mini-logo.png \ @@ -239,9 +213,7 @@ icon_DATA =\ side_bar_image.png \ temp-home.png \ text-selection-frame.png \ - text-selection-frame-aa.png \ theme_preview.png \ - thumbnail_frame.aa.png \ thumbnail_frame.png \ tiny-alert.png \ trash-empty.png \ diff --git a/icons/crux_eggplant/Makefile.am b/icons/crux_eggplant/Makefile.am index cc061989f..3a84a3add 100644 --- a/icons/crux_eggplant/Makefile.am +++ b/icons/crux_eggplant/Makefile.am @@ -17,14 +17,6 @@ crux_eggplant_DATA = \ emblem-nowrite.png \ emblem-nowrite-72.png \ emblem-nowrite-96.png \ - i-directory-12-aa.png \ - i-directory-20-aa.png \ - i-directory-24-aa.png \ - i-directory-36-aa.png \ - i-directory-aa.png \ - i-directory-72-aa.png \ - i-directory-96-aa.png \ - i-directory-192-aa.png \ i-directory-12.png \ i-directory-20.png \ i-directory-24.png \ diff --git a/icons/crux_eggplant/i-directory-12-aa.png b/icons/crux_eggplant/i-directory-12-aa.png Binary files differdeleted file mode 100644 index b4c33c47a..000000000 --- a/icons/crux_eggplant/i-directory-12-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-192-aa.png b/icons/crux_eggplant/i-directory-192-aa.png Binary files differdeleted file mode 100644 index 224cfa17f..000000000 --- a/icons/crux_eggplant/i-directory-192-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-192.png b/icons/crux_eggplant/i-directory-192.png Binary files differindex 224472606..224cfa17f 100644 --- a/icons/crux_eggplant/i-directory-192.png +++ b/icons/crux_eggplant/i-directory-192.png diff --git a/icons/crux_eggplant/i-directory-20-aa.png b/icons/crux_eggplant/i-directory-20-aa.png Binary files differdeleted file mode 100644 index 949dd0d44..000000000 --- a/icons/crux_eggplant/i-directory-20-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-24-aa.png b/icons/crux_eggplant/i-directory-24-aa.png Binary files differdeleted file mode 100644 index f06cfceb6..000000000 --- a/icons/crux_eggplant/i-directory-24-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-36-aa.png b/icons/crux_eggplant/i-directory-36-aa.png Binary files differdeleted file mode 100644 index 79b91b1aa..000000000 --- a/icons/crux_eggplant/i-directory-36-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-72-aa.png b/icons/crux_eggplant/i-directory-72-aa.png Binary files differdeleted file mode 100644 index fdca9d483..000000000 --- a/icons/crux_eggplant/i-directory-72-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-96-aa.png b/icons/crux_eggplant/i-directory-96-aa.png Binary files differdeleted file mode 100644 index 37fcf38a2..000000000 --- a/icons/crux_eggplant/i-directory-96-aa.png +++ /dev/null diff --git a/icons/crux_eggplant/i-directory-96.png b/icons/crux_eggplant/i-directory-96.png Binary files differindex 40eb0da23..37fcf38a2 100644 --- a/icons/crux_eggplant/i-directory-96.png +++ b/icons/crux_eggplant/i-directory-96.png diff --git a/icons/crux_eggplant/i-directory-aa.png b/icons/crux_eggplant/i-directory-aa.png Binary files differdeleted file mode 100644 index 7d629d43b..000000000 --- a/icons/crux_eggplant/i-directory-aa.png +++ /dev/null diff --git a/icons/crux_teal/Makefile.am b/icons/crux_teal/Makefile.am index 26a2c9449..1e8f5a41b 100644 --- a/icons/crux_teal/Makefile.am +++ b/icons/crux_teal/Makefile.am @@ -17,14 +17,6 @@ crux_teal_DATA = \ emblem-nowrite.png \ emblem-nowrite-72.png \ emblem-nowrite-96.png \ - i-directory-12-aa.png \ - i-directory-20-aa.png \ - i-directory-24-aa.png \ - i-directory-36-aa.png \ - i-directory-aa.png \ - i-directory-72-aa.png \ - i-directory-96-aa.png \ - i-directory-192-aa.png \ i-directory-12.png \ i-directory-20.png \ i-directory-24.png \ @@ -42,14 +34,6 @@ crux_teal_DATA = \ i-regular-72.png \ i-regular-96.png \ i-regular-192.png \ - i-regular-12-aa.png \ - i-regular-20-aa.png \ - i-regular-24-aa.png \ - i-regular-36-aa.png \ - i-regular-aa.png \ - i-regular-72-aa.png \ - i-regular-96-aa.png \ - i-regular-192-aa.png \ i-regular.xml \ increment.png \ increment-i.png \ diff --git a/icons/crux_teal/i-directory-12-aa.png b/icons/crux_teal/i-directory-12-aa.png Binary files differdeleted file mode 100644 index ee7812ab7..000000000 --- a/icons/crux_teal/i-directory-12-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-192-aa.png b/icons/crux_teal/i-directory-192-aa.png Binary files differdeleted file mode 100644 index ef8e2657f..000000000 --- a/icons/crux_teal/i-directory-192-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-20-aa.png b/icons/crux_teal/i-directory-20-aa.png Binary files differdeleted file mode 100644 index 1c4dbc789..000000000 --- a/icons/crux_teal/i-directory-20-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-24-aa.png b/icons/crux_teal/i-directory-24-aa.png Binary files differdeleted file mode 100644 index 4369b1d99..000000000 --- a/icons/crux_teal/i-directory-24-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-36-aa.png b/icons/crux_teal/i-directory-36-aa.png Binary files differdeleted file mode 100644 index 1e2a77fbf..000000000 --- a/icons/crux_teal/i-directory-36-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-72-aa.png b/icons/crux_teal/i-directory-72-aa.png Binary files differdeleted file mode 100644 index 771aa311a..000000000 --- a/icons/crux_teal/i-directory-72-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-96-aa.png b/icons/crux_teal/i-directory-96-aa.png Binary files differdeleted file mode 100644 index 68dfe568b..000000000 --- a/icons/crux_teal/i-directory-96-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-directory-aa.png b/icons/crux_teal/i-directory-aa.png Binary files differdeleted file mode 100644 index 7f074cfaf..000000000 --- a/icons/crux_teal/i-directory-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-12-aa.png b/icons/crux_teal/i-regular-12-aa.png Binary files differdeleted file mode 100644 index 0bce557d2..000000000 --- a/icons/crux_teal/i-regular-12-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-192-aa.png b/icons/crux_teal/i-regular-192-aa.png Binary files differdeleted file mode 100644 index 05bc6bad4..000000000 --- a/icons/crux_teal/i-regular-192-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-20-aa.png b/icons/crux_teal/i-regular-20-aa.png Binary files differdeleted file mode 100644 index 1ed5641a8..000000000 --- a/icons/crux_teal/i-regular-20-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-24-aa.png b/icons/crux_teal/i-regular-24-aa.png Binary files differdeleted file mode 100644 index 14e410f69..000000000 --- a/icons/crux_teal/i-regular-24-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-36-aa.png b/icons/crux_teal/i-regular-36-aa.png Binary files differdeleted file mode 100644 index 79527461b..000000000 --- a/icons/crux_teal/i-regular-36-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-72-aa.png b/icons/crux_teal/i-regular-72-aa.png Binary files differdeleted file mode 100644 index 114bb6ff7..000000000 --- a/icons/crux_teal/i-regular-72-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-96-aa.png b/icons/crux_teal/i-regular-96-aa.png Binary files differdeleted file mode 100644 index a360e5688..000000000 --- a/icons/crux_teal/i-regular-96-aa.png +++ /dev/null diff --git a/icons/crux_teal/i-regular-aa.png b/icons/crux_teal/i-regular-aa.png Binary files differdeleted file mode 100644 index a8a5d16b4..000000000 --- a/icons/crux_teal/i-regular-aa.png +++ /dev/null diff --git a/icons/gnome/Makefile.am b/icons/gnome/Makefile.am index 4d567b2ca..9daa530ec 100644 --- a/icons/gnome/Makefile.am +++ b/icons/gnome/Makefile.am @@ -14,43 +14,26 @@ gnome_DATA = \ emblem-nowrite.png \ i-core.png \ i-dirclosed.png \ - i-directory-12-aa.png \ i-directory-12.png \ - i-directory-192-aa.png \ i-directory-192.png \ - i-directory-20-aa.png \ i-directory-20.png \ - i-directory-24-aa.png \ i-directory-24.png \ - i-directory-36-aa.png \ i-directory-36.png \ - i-directory-72-aa.png \ i-directory-72.png \ - i-directory-96-aa.png \ i-directory-96.png \ - i-directory-aa.png \ - i-directory-accept-12-aa.png \ i-directory-accept-12.png \ - i-directory-accept-192-aa.png \ i-directory-accept-192.png \ - i-directory-accept-20-aa.png \ i-directory-accept-20.png \ - i-directory-accept-24-aa.png \ i-directory-accept-24.png \ - i-directory-accept-36-aa.png \ i-directory-accept-36.png \ - i-directory-accept-72-aa.png \ i-directory-accept-72.png \ - i-directory-accept-96-aa.png \ i-directory-accept-96.png \ - i-directory-accept-aa.png \ i-directory-accept.png \ i-directory.png \ i-executable.png \ i-music-192.png \ i-music.png \ i-nfs.png \ - i-regular-96-aa.png \ i-regular.png \ i-regular.xml \ i-stalled.png \ diff --git a/icons/gnome/i-directory-12-aa.png b/icons/gnome/i-directory-12-aa.png Binary files differdeleted file mode 100644 index f84834e37..000000000 --- a/icons/gnome/i-directory-12-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-12.png b/icons/gnome/i-directory-12.png Binary files differindex 1a1508fb4..f84834e37 100644 --- a/icons/gnome/i-directory-12.png +++ b/icons/gnome/i-directory-12.png diff --git a/icons/gnome/i-directory-192-aa.png b/icons/gnome/i-directory-192-aa.png Binary files differdeleted file mode 100644 index c103e9188..000000000 --- a/icons/gnome/i-directory-192-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-192.png b/icons/gnome/i-directory-192.png Binary files differindex ff6b0ebeb..c103e9188 100644 --- a/icons/gnome/i-directory-192.png +++ b/icons/gnome/i-directory-192.png diff --git a/icons/gnome/i-directory-20-aa.png b/icons/gnome/i-directory-20-aa.png Binary files differdeleted file mode 100644 index 9237b732c..000000000 --- a/icons/gnome/i-directory-20-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-24-aa.png b/icons/gnome/i-directory-24-aa.png Binary files differdeleted file mode 100644 index 8cb3f57ff..000000000 --- a/icons/gnome/i-directory-24-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-24.png b/icons/gnome/i-directory-24.png Binary files differindex 5956dd9b4..8cb3f57ff 100644 --- a/icons/gnome/i-directory-24.png +++ b/icons/gnome/i-directory-24.png diff --git a/icons/gnome/i-directory-36-aa.png b/icons/gnome/i-directory-36-aa.png Binary files differdeleted file mode 100644 index dd86244f8..000000000 --- a/icons/gnome/i-directory-36-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-36.png b/icons/gnome/i-directory-36.png Binary files differindex 66f4e64c6..dd86244f8 100644 --- a/icons/gnome/i-directory-36.png +++ b/icons/gnome/i-directory-36.png diff --git a/icons/gnome/i-directory-72-aa.png b/icons/gnome/i-directory-72-aa.png Binary files differdeleted file mode 100644 index 683a84d15..000000000 --- a/icons/gnome/i-directory-72-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-72.png b/icons/gnome/i-directory-72.png Binary files differindex 05b5216ec..683a84d15 100644 --- a/icons/gnome/i-directory-72.png +++ b/icons/gnome/i-directory-72.png diff --git a/icons/gnome/i-directory-96-aa.png b/icons/gnome/i-directory-96-aa.png Binary files differdeleted file mode 100644 index e366311a4..000000000 --- a/icons/gnome/i-directory-96-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-96.png b/icons/gnome/i-directory-96.png Binary files differindex 153f59101..e366311a4 100644 --- a/icons/gnome/i-directory-96.png +++ b/icons/gnome/i-directory-96.png diff --git a/icons/gnome/i-directory-aa.png b/icons/gnome/i-directory-aa.png Binary files differdeleted file mode 100644 index 943d14663..000000000 --- a/icons/gnome/i-directory-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-12-aa.png b/icons/gnome/i-directory-accept-12-aa.png Binary files differdeleted file mode 100644 index 99effc446..000000000 --- a/icons/gnome/i-directory-accept-12-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-192-aa.png b/icons/gnome/i-directory-accept-192-aa.png Binary files differdeleted file mode 100644 index 3355c8776..000000000 --- a/icons/gnome/i-directory-accept-192-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-20-aa.png b/icons/gnome/i-directory-accept-20-aa.png Binary files differdeleted file mode 100644 index d713746be..000000000 --- a/icons/gnome/i-directory-accept-20-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-24-aa.png b/icons/gnome/i-directory-accept-24-aa.png Binary files differdeleted file mode 100644 index c393d7449..000000000 --- a/icons/gnome/i-directory-accept-24-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-36-aa.png b/icons/gnome/i-directory-accept-36-aa.png Binary files differdeleted file mode 100644 index 23d4090c6..000000000 --- a/icons/gnome/i-directory-accept-36-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-72-aa.png b/icons/gnome/i-directory-accept-72-aa.png Binary files differdeleted file mode 100644 index 1ec83cad2..000000000 --- a/icons/gnome/i-directory-accept-72-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-96-aa.png b/icons/gnome/i-directory-accept-96-aa.png Binary files differdeleted file mode 100644 index 9b704b671..000000000 --- a/icons/gnome/i-directory-accept-96-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory-accept-aa.png b/icons/gnome/i-directory-accept-aa.png Binary files differdeleted file mode 100644 index 0891a90f0..000000000 --- a/icons/gnome/i-directory-accept-aa.png +++ /dev/null diff --git a/icons/gnome/i-directory.png b/icons/gnome/i-directory.png Binary files differindex 08e704b82..943d14663 100644 --- a/icons/gnome/i-directory.png +++ b/icons/gnome/i-directory.png diff --git a/icons/gnome/i-regular-96-aa.png b/icons/gnome/i-regular-96-aa.png Binary files differdeleted file mode 100644 index e54a769bd..000000000 --- a/icons/gnome/i-regular-96-aa.png +++ /dev/null diff --git a/icons/gnome/i-regular-96.png b/icons/gnome/i-regular-96.png Binary files differindex ff2b03692..e54a769bd 100644 --- a/icons/gnome/i-regular-96.png +++ b/icons/gnome/i-regular-96.png diff --git a/icons/i-directory-12-aa.png b/icons/i-directory-12-aa.png Binary files differdeleted file mode 100644 index ed67cd6f7..000000000 --- a/icons/i-directory-12-aa.png +++ /dev/null diff --git a/icons/i-directory-12.png b/icons/i-directory-12.png Binary files differindex d8864a65c..ed67cd6f7 100644 --- a/icons/i-directory-12.png +++ b/icons/i-directory-12.png diff --git a/icons/i-directory-24-aa.png b/icons/i-directory-24-aa.png Binary files differdeleted file mode 100644 index f0892a743..000000000 --- a/icons/i-directory-24-aa.png +++ /dev/null diff --git a/icons/i-directory-24.png b/icons/i-directory-24.png Binary files differindex 8e3f5194b..f0892a743 100644 --- a/icons/i-directory-24.png +++ b/icons/i-directory-24.png diff --git a/icons/i-directory-36-aa.png b/icons/i-directory-36-aa.png Binary files differdeleted file mode 100644 index b42f39af7..000000000 --- a/icons/i-directory-36-aa.png +++ /dev/null diff --git a/icons/i-directory-36.png b/icons/i-directory-36.png Binary files differindex 2322545cf..b42f39af7 100644 --- a/icons/i-directory-36.png +++ b/icons/i-directory-36.png diff --git a/icons/i-directory-72-aa.png b/icons/i-directory-72-aa.png Binary files differdeleted file mode 100644 index 0d9f50445..000000000 --- a/icons/i-directory-72-aa.png +++ /dev/null diff --git a/icons/i-directory-72.png b/icons/i-directory-72.png Binary files differindex 3340c6c1c..0d9f50445 100644 --- a/icons/i-directory-72.png +++ b/icons/i-directory-72.png diff --git a/icons/i-directory-96-aa.png b/icons/i-directory-96-aa.png Binary files differdeleted file mode 100644 index d89079200..000000000 --- a/icons/i-directory-96-aa.png +++ /dev/null diff --git a/icons/i-directory-96.png b/icons/i-directory-96.png Binary files differindex 388417761..d89079200 100644 --- a/icons/i-directory-96.png +++ b/icons/i-directory-96.png diff --git a/icons/i-directory-aa.png b/icons/i-directory-aa.png Binary files differdeleted file mode 100644 index ef8d05234..000000000 --- a/icons/i-directory-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-12-aa.png b/icons/i-directory-accept-12-aa.png Binary files differdeleted file mode 100644 index 189cdb30c..000000000 --- a/icons/i-directory-accept-12-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-12.png b/icons/i-directory-accept-12.png Binary files differindex 10b2b5171..189cdb30c 100644 --- a/icons/i-directory-accept-12.png +++ b/icons/i-directory-accept-12.png diff --git a/icons/i-directory-accept-24-aa.png b/icons/i-directory-accept-24-aa.png Binary files differdeleted file mode 100644 index b55b60782..000000000 --- a/icons/i-directory-accept-24-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-24.png b/icons/i-directory-accept-24.png Binary files differindex ebb33e4a1..b55b60782 100644 --- a/icons/i-directory-accept-24.png +++ b/icons/i-directory-accept-24.png diff --git a/icons/i-directory-accept-36-aa.png b/icons/i-directory-accept-36-aa.png Binary files differdeleted file mode 100644 index bac639213..000000000 --- a/icons/i-directory-accept-36-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-36.png b/icons/i-directory-accept-36.png Binary files differindex 4fdb09a2e..bac639213 100644 --- a/icons/i-directory-accept-36.png +++ b/icons/i-directory-accept-36.png diff --git a/icons/i-directory-accept-72-aa.png b/icons/i-directory-accept-72-aa.png Binary files differdeleted file mode 100644 index e3d3226d8..000000000 --- a/icons/i-directory-accept-72-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-72.png b/icons/i-directory-accept-72.png Binary files differindex 682a1aa6f..e3d3226d8 100644 --- a/icons/i-directory-accept-72.png +++ b/icons/i-directory-accept-72.png diff --git a/icons/i-directory-accept-96-aa.png b/icons/i-directory-accept-96-aa.png Binary files differdeleted file mode 100644 index 375ae0688..000000000 --- a/icons/i-directory-accept-96-aa.png +++ /dev/null diff --git a/icons/i-directory-accept-96.png b/icons/i-directory-accept-96.png Binary files differindex 370a8e4e6..375ae0688 100644 --- a/icons/i-directory-accept-96.png +++ b/icons/i-directory-accept-96.png diff --git a/icons/i-directory-accept-aa.png b/icons/i-directory-accept-aa.png Binary files differdeleted file mode 100644 index 8d11c0c23..000000000 --- a/icons/i-directory-accept-aa.png +++ /dev/null diff --git a/icons/i-directory-accept.png b/icons/i-directory-accept.png Binary files differindex d4b9b3118..8d11c0c23 100644 --- a/icons/i-directory-accept.png +++ b/icons/i-directory-accept.png diff --git a/icons/i-directory.png b/icons/i-directory.png Binary files differindex 6096b644a..ef8d05234 100644 --- a/icons/i-directory.png +++ b/icons/i-directory.png diff --git a/icons/i-executable-aa.png b/icons/i-executable-aa.png Binary files differdeleted file mode 100644 index 187eb940c..000000000 --- a/icons/i-executable-aa.png +++ /dev/null diff --git a/icons/i-executable.png b/icons/i-executable.png Binary files differindex 78c9fb9c9..187eb940c 100644 --- a/icons/i-executable.png +++ b/icons/i-executable.png diff --git a/icons/i-music-12-aa.png b/icons/i-music-12-aa.png Binary files differdeleted file mode 100644 index 37d1f25b0..000000000 --- a/icons/i-music-12-aa.png +++ /dev/null diff --git a/icons/i-music-12.png b/icons/i-music-12.png Binary files differindex 38b0cd60f..37d1f25b0 100644 --- a/icons/i-music-12.png +++ b/icons/i-music-12.png diff --git a/icons/i-music-24-aa.png b/icons/i-music-24-aa.png Binary files differdeleted file mode 100644 index 3397725ab..000000000 --- a/icons/i-music-24-aa.png +++ /dev/null diff --git a/icons/i-music-24.png b/icons/i-music-24.png Binary files differindex 0847d3cb4..3397725ab 100644 --- a/icons/i-music-24.png +++ b/icons/i-music-24.png diff --git a/icons/i-music-36-aa.png b/icons/i-music-36-aa.png Binary files differdeleted file mode 100644 index ad548104f..000000000 --- a/icons/i-music-36-aa.png +++ /dev/null diff --git a/icons/i-music-36.png b/icons/i-music-36.png Binary files differindex ab3305da4..ad548104f 100644 --- a/icons/i-music-36.png +++ b/icons/i-music-36.png diff --git a/icons/i-music-aa.png b/icons/i-music-aa.png Binary files differdeleted file mode 100644 index bbd55c6ed..000000000 --- a/icons/i-music-aa.png +++ /dev/null diff --git a/icons/i-music.png b/icons/i-music.png Binary files differindex 6af424f35..bbd55c6ed 100644 --- a/icons/i-music.png +++ b/icons/i-music.png diff --git a/icons/i-regular-12-aa.png b/icons/i-regular-12-aa.png Binary files differdeleted file mode 100644 index 0147b0c49..000000000 --- a/icons/i-regular-12-aa.png +++ /dev/null diff --git a/icons/i-regular-12.png b/icons/i-regular-12.png Binary files differindex 6c7bb8cec..0147b0c49 100644 --- a/icons/i-regular-12.png +++ b/icons/i-regular-12.png diff --git a/icons/i-regular-24-aa.png b/icons/i-regular-24-aa.png Binary files differdeleted file mode 100644 index cd2d3ab7d..000000000 --- a/icons/i-regular-24-aa.png +++ /dev/null diff --git a/icons/i-regular-24.png b/icons/i-regular-24.png Binary files differindex b488e961c..cd2d3ab7d 100644 --- a/icons/i-regular-24.png +++ b/icons/i-regular-24.png diff --git a/icons/i-regular-36-aa.png b/icons/i-regular-36-aa.png Binary files differdeleted file mode 100644 index 467cca90a..000000000 --- a/icons/i-regular-36-aa.png +++ /dev/null diff --git a/icons/i-regular-36.png b/icons/i-regular-36.png Binary files differindex 2f02728ce..467cca90a 100644 --- a/icons/i-regular-36.png +++ b/icons/i-regular-36.png diff --git a/icons/i-regular-72-aa.png b/icons/i-regular-72-aa.png Binary files differdeleted file mode 100644 index ae4d26037..000000000 --- a/icons/i-regular-72-aa.png +++ /dev/null diff --git a/icons/i-regular-72.png b/icons/i-regular-72.png Binary files differindex 6024dae6e..ae4d26037 100644 --- a/icons/i-regular-72.png +++ b/icons/i-regular-72.png diff --git a/icons/i-regular-96-aa.png b/icons/i-regular-96-aa.png Binary files differdeleted file mode 100644 index 2367f5c4d..000000000 --- a/icons/i-regular-96-aa.png +++ /dev/null diff --git a/icons/i-regular-96.png b/icons/i-regular-96.png Binary files differindex 58ba35950..2367f5c4d 100644 --- a/icons/i-regular-96.png +++ b/icons/i-regular-96.png diff --git a/icons/i-regular-aa.png b/icons/i-regular-aa.png Binary files differdeleted file mode 100644 index 557d746e6..000000000 --- a/icons/i-regular-aa.png +++ /dev/null diff --git a/icons/i-regular.png b/icons/i-regular.png Binary files differindex f80f60e10..557d746e6 100644 --- a/icons/i-regular.png +++ b/icons/i-regular.png diff --git a/icons/i-regular.xml b/icons/i-regular.xml index f0981ae64..99c92409c 100644 --- a/icons/i-regular.xml +++ b/icons/i-regular.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <icon_set> - <icon size="36" embedded_text_rectangle_aa="3,3,29,37" embedded_text_rectangle="2,2,28,36"/> - <icon size="48" embedded_text_rectangle_aa="5,5,39,48" embedded_text_rectangle="3,3,39,48"/> - <icon size="72" embedded_text_rectangle_aa="6,6,62,75" embedded_text_rectangle="4,4,59,72"/> - <icon size="96" embedded_text_rectangle_aa="7,7,74,94" embedded_text_rectangle="5,5,72,93"/> + <icon size="36" embedded_text_rectangle="3,3,29,37"/> + <icon size="48" embedded_text_rectangle="5,5,39,48"/> + <icon size="72" embedded_text_rectangle="6,6,62,75"/> + <icon size="96" embedded_text_rectangle="7,7,74,94"/> </icon_set> diff --git a/icons/i-spreadsheet-aa.png b/icons/i-spreadsheet-aa.png Binary files differdeleted file mode 100644 index bb4ea39b3..000000000 --- a/icons/i-spreadsheet-aa.png +++ /dev/null diff --git a/icons/i-spreadsheet.png b/icons/i-spreadsheet.png Binary files differindex 853aaa292..bb4ea39b3 100644 --- a/icons/i-spreadsheet.png +++ b/icons/i-spreadsheet.png diff --git a/icons/i-symlink-aa.png b/icons/i-symlink-aa.png Binary files differdeleted file mode 100644 index 0cc746ce1..000000000 --- a/icons/i-symlink-aa.png +++ /dev/null diff --git a/icons/i-symlink.png b/icons/i-symlink.png Binary files differindex 7525b4e77..0cc746ce1 100644 --- a/icons/i-symlink.png +++ b/icons/i-symlink.png diff --git a/icons/loading-aa.png b/icons/loading-aa.png Binary files differdeleted file mode 100644 index 505c805e4..000000000 --- a/icons/loading-aa.png +++ /dev/null diff --git a/icons/loading.png b/icons/loading.png Binary files differindex 912c2b289..505c805e4 100644 --- a/icons/loading.png +++ b/icons/loading.png diff --git a/icons/sierra/Makefile.am b/icons/sierra/Makefile.am index ac64786c2..b2348d1af 100644 --- a/icons/sierra/Makefile.am +++ b/icons/sierra/Makefile.am @@ -3,28 +3,16 @@ sierradir = $(datadir)/pixmaps/nautilus/sierra sierra_DATA = \ green_weave.png \ i-directory-12.png \ - i-directory-12-aa.png \ i-directory-24.png \ - i-directory-24-aa.png \ i-directory-36.png \ - i-directory-36-aa.png \ i-directory-72.png \ - i-directory-72-aa.png \ i-directory-96.png \ - i-directory-96-aa.png \ i-directory.png \ - i-directory-aa.png \ - i-directory-accept-12-aa.png \ i-directory-accept-12.png \ - i-directory-accept-24-aa.png \ i-directory-accept-24.png \ - i-directory-accept-36-aa.png \ i-directory-accept-36.png \ - i-directory-accept-72-aa.png \ i-directory-accept-72.png \ - i-directory-accept-96-aa.png \ i-directory-accept-96.png \ - i-directory-accept-aa.png \ i-directory-accept.png \ number_strip.png \ Sierra_desktop.png \ diff --git a/icons/sierra/i-directory-12-aa.png b/icons/sierra/i-directory-12-aa.png Binary files differdeleted file mode 100644 index 81bcf18cb..000000000 --- a/icons/sierra/i-directory-12-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-24-aa.png b/icons/sierra/i-directory-24-aa.png Binary files differdeleted file mode 100644 index 6a1ed3e63..000000000 --- a/icons/sierra/i-directory-24-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-36-aa.png b/icons/sierra/i-directory-36-aa.png Binary files differdeleted file mode 100644 index 117500ff1..000000000 --- a/icons/sierra/i-directory-36-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-72-aa.png b/icons/sierra/i-directory-72-aa.png Binary files differdeleted file mode 100644 index 740ef7c53..000000000 --- a/icons/sierra/i-directory-72-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-96-aa.png b/icons/sierra/i-directory-96-aa.png Binary files differdeleted file mode 100644 index 9cd5efa86..000000000 --- a/icons/sierra/i-directory-96-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-aa.png b/icons/sierra/i-directory-aa.png Binary files differdeleted file mode 100644 index d865d0feb..000000000 --- a/icons/sierra/i-directory-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-12-aa.png b/icons/sierra/i-directory-accept-12-aa.png Binary files differdeleted file mode 100644 index 0dddfd0a5..000000000 --- a/icons/sierra/i-directory-accept-12-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-24-aa.png b/icons/sierra/i-directory-accept-24-aa.png Binary files differdeleted file mode 100644 index 5c57ad2b5..000000000 --- a/icons/sierra/i-directory-accept-24-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-36-aa.png b/icons/sierra/i-directory-accept-36-aa.png Binary files differdeleted file mode 100644 index 590d4960b..000000000 --- a/icons/sierra/i-directory-accept-36-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-72-aa.png b/icons/sierra/i-directory-accept-72-aa.png Binary files differdeleted file mode 100644 index 9b7e560eb..000000000 --- a/icons/sierra/i-directory-accept-72-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-96-aa.png b/icons/sierra/i-directory-accept-96-aa.png Binary files differdeleted file mode 100644 index cc4e02c9f..000000000 --- a/icons/sierra/i-directory-accept-96-aa.png +++ /dev/null diff --git a/icons/sierra/i-directory-accept-aa.png b/icons/sierra/i-directory-accept-aa.png Binary files differdeleted file mode 100644 index 062254fb7..000000000 --- a/icons/sierra/i-directory-accept-aa.png +++ /dev/null diff --git a/icons/text-selection-frame-aa.png b/icons/text-selection-frame-aa.png Binary files differdeleted file mode 100644 index fea3e2b5f..000000000 --- a/icons/text-selection-frame-aa.png +++ /dev/null diff --git a/icons/text-selection-frame.png b/icons/text-selection-frame.png Binary files differindex 4b0e01af5..fea3e2b5f 100644 --- a/icons/text-selection-frame.png +++ b/icons/text-selection-frame.png diff --git a/icons/thumbnail_frame.aa.png b/icons/thumbnail_frame.aa.png Binary files differdeleted file mode 100644 index c2605d584..000000000 --- a/icons/thumbnail_frame.aa.png +++ /dev/null diff --git a/icons/thumbnail_frame.png b/icons/thumbnail_frame.png Binary files differindex 03ed074e5..c2605d584 100644 --- a/icons/thumbnail_frame.png +++ b/icons/thumbnail_frame.png diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 5461f66cf..27d12cbaa 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -241,7 +241,6 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark, result = nautilus_icon_factory_get_pixbuf_for_icon (icon, icon_size, icon_size, icon_size, icon_size, - optimize_for_anti_aliasing, NULL, TRUE); nautilus_scalable_icon_unref (icon); diff --git a/libnautilus-private/nautilus-find-icon-image.c b/libnautilus-private/nautilus-find-icon-image.c index 071c15904..7412427c3 100644 --- a/libnautilus-private/nautilus-find-icon-image.c +++ b/libnautilus-private/nautilus-find-icon-image.c @@ -118,13 +118,13 @@ parse_attach_points (NautilusEmblemAttachPoints *attach_points, static void read_details (const char *path, guint icon_size, - gboolean for_aa, NautilusIconDetails *details) { xmlDocPtr doc; xmlNodePtr node; char *size_as_string, *property; ArtIRect parsed_rect; + char c; memset (&details->text_rect, 0, sizeof (details->text_rect)); @@ -139,33 +139,22 @@ read_details (const char *path, (doc, "icon", "size", size_as_string); g_free (size_as_string); - property = NULL; - if (for_aa) { - property = xmlGetProp (node, "embedded_text_rectangle_aa"); - } - if (property == NULL) { - property = xmlGetProp (node, "embedded_text_rectangle"); - } + property = xmlGetProp (node, "embedded_text_rectangle"); if (property != NULL) { if (sscanf (property, - " %d , %d , %d , %d %*s", + " %d , %d , %d , %d %c", &parsed_rect.x0, &parsed_rect.y0, &parsed_rect.x1, - &parsed_rect.y1) == 4) { + &parsed_rect.y1, + &c) == 4) { details->text_rect = parsed_rect; } xmlFree (property); } - property = NULL; - if (for_aa) { - property = xmlGetProp (node, "attach_points_aa"); - } - if (property == NULL) { - property = xmlGetProp (node, "attach_points"); - } + property = xmlGetProp (node, "attach_points"); parse_attach_points (&details->attach_points, property); xmlFree (property); @@ -180,12 +169,11 @@ static char * get_themed_icon_file_path (const NautilusIconTheme *icon_theme, const char *icon_name, guint icon_size, - gboolean for_aa, NautilusIconDetails *details) { guint i; gboolean include_size, in_user_directory; - char *themed_icon_name, *partial_path, *path, *aa_path, *xml_path; + char *themed_icon_name, *partial_path, *path, *xml_path; g_assert (icon_name != NULL); @@ -210,24 +198,6 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme, partial_path = g_strdup (themed_icon_name); } - /* if we're in anti-aliased mode, try for an optimized one first */ - if (for_aa) { - aa_path = g_strconcat (partial_path, "-aa", NULL); - path = make_full_icon_path (aa_path, - icon_file_name_suffixes[i], - in_user_directory); - g_free (aa_path); - - /* Return the path if the file exists. */ - if (path != NULL) { - g_free (partial_path); - break; - } - - g_free (path); - path = NULL; - } - path = make_full_icon_path (partial_path, icon_file_name_suffixes[i], in_user_directory); @@ -247,7 +217,7 @@ get_themed_icon_file_path (const NautilusIconTheme *icon_theme, xml_path = make_full_icon_path (themed_icon_name, ".xml", in_user_directory); - read_details (xml_path, icon_size, for_aa, details); + read_details (xml_path, icon_size, details); g_free (xml_path); } @@ -268,7 +238,7 @@ theme_has_icon (const NautilusIconTheme *theme, path = get_themed_icon_file_path (theme, name, NAUTILUS_ICON_SIZE_STANDARD, - FALSE, NULL); + NULL); g_free (path); return path != NULL; @@ -342,7 +312,6 @@ nautilus_get_icon_file_name (const NautilusIconThemeSpecifications *theme_specs, const char *name, const char *modifier, guint size, - gboolean for_aa, NautilusIconDetails *details) { const NautilusIconTheme *theme; @@ -362,7 +331,7 @@ nautilus_get_icon_file_name (const NautilusIconThemeSpecifications *theme_specs, /* If there's a modifier, try the modified icon first. */ if (modifier != NULL && modifier[0] != '\0') { name_with_modifier = g_strconcat (name, "-", modifier, NULL); - path = get_themed_icon_file_path (theme, name_with_modifier, size, for_aa, details); + path = get_themed_icon_file_path (theme, name_with_modifier, size, details); g_free (name_with_modifier); if (path != NULL) { return path; @@ -370,7 +339,7 @@ nautilus_get_icon_file_name (const NautilusIconThemeSpecifications *theme_specs, } /* Check for a normal icon. */ - path = get_themed_icon_file_path (theme, name, size, for_aa, details); + path = get_themed_icon_file_path (theme, name, size, details); if (path != NULL) { return path; } diff --git a/libnautilus-private/nautilus-find-icon-image.h b/libnautilus-private/nautilus-find-icon-image.h index 47d706f8f..f44e03f61 100644 --- a/libnautilus-private/nautilus-find-icon-image.h +++ b/libnautilus-private/nautilus-find-icon-image.h @@ -52,7 +52,6 @@ char *nautilus_get_icon_file_name (const NautilusIconThemeSpecificatio const char *name, const char *modifier, guint size_in_pixels, - gboolean optimized_for_aa, NautilusIconDetails *details); char *nautilus_remove_icon_file_name_suffix (const char *name); diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 12c5c89e4..7ea2c682c 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3782,7 +3782,6 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, icon_size_y, max_image_size * icon->scale_x, max_image_size * icon->scale_y, - nautilus_icon_container_get_anti_aliased_mode (container), &attach_points, TRUE); @@ -3818,7 +3817,6 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, icon_size_y, MAXIMUM_EMBLEM_SIZE, MAXIMUM_EMBLEM_SIZE, - nautilus_icon_container_get_anti_aliased_mode (container), NULL, FALSE); if (emblem_pixbuf != NULL) { diff --git a/libnautilus-private/nautilus-icon-factory-private.h b/libnautilus-private/nautilus-icon-factory-private.h index 1dd8fd716..2cb61deb9 100644 --- a/libnautilus-private/nautilus-icon-factory-private.h +++ b/libnautilus-private/nautilus-icon-factory-private.h @@ -38,6 +38,6 @@ void nautilus_icon_factory_remove_by_uri (const char *uri); /* Convenience routine to return the appropriate thumbnail frame */ -GdkPixbuf * nautilus_icon_factory_get_thumbnail_frame (gboolean anti_aliased); +GdkPixbuf * nautilus_icon_factory_get_thumbnail_frame (void); #endif /* NAUTILUS_ICON_FACTORY_PRIVATE_H */ diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index a328c640f..6fb3ce3a6 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -148,7 +148,6 @@ typedef struct { /* frames to use for thumbnail icons */ GdkPixbuf *thumbnail_frame; - GdkPixbuf *thumbnail_frame_aa; } NautilusIconFactory; #define NAUTILUS_ICON_FACTORY(obj) \ @@ -190,7 +189,6 @@ typedef struct { guint nominal_height; guint maximum_width; guint maximum_height; - gboolean optimized_for_aa; } IconSizeRequest; /* The key to a hash table that holds the scaled icons as pixbufs. */ @@ -332,9 +330,9 @@ check_recently_used_list (void) g_assert (count == factory->recently_used_count); } -/* load the thumbnail frames for both the anti-aliased and non-aa cases */ +/* load the thumbnail frame */ static void -load_thumbnail_frames (NautilusIconFactory *factory) +load_thumbnail_frame (NautilusIconFactory *factory) { char *image_path; @@ -344,13 +342,6 @@ load_thumbnail_frames (NautilusIconFactory *factory) } factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path, NULL); g_free (image_path); - - image_path = nautilus_theme_get_image_path ("thumbnail_frame.aa.png"); - if (factory->thumbnail_frame_aa != NULL) { - g_object_unref (factory->thumbnail_frame_aa); - } - factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path, NULL); - g_free (image_path); } static void @@ -366,7 +357,7 @@ nautilus_icon_factory_init (NautilusIconFactory *factory) factory->recently_used_dummy_head.next = &factory->recently_used_dummy_head; factory->recently_used_dummy_head.prev = &factory->recently_used_dummy_head; - load_thumbnail_frames (factory); + load_thumbnail_frame (factory); } static void @@ -588,9 +579,6 @@ nautilus_icon_factory_destroy (GtkObject *object) if (factory->thumbnail_frame != NULL) { g_object_unref (factory->thumbnail_frame); } - if (factory->thumbnail_frame_aa != NULL) { - g_object_unref (factory->thumbnail_frame_aa); - } g_free (factory->theme.current.name); g_free (factory->theme.fallback.name); @@ -855,7 +843,7 @@ icon_theme_changed_callback (gpointer user_data) set_theme_name (&factory->theme.fallback, icon_fallback_theme); nautilus_icon_factory_clear (); - load_thumbnail_frames (factory); + load_thumbnail_frame (factory); g_signal_emit (factory, signals[ICONS_CHANGED], 0); } @@ -1059,7 +1047,7 @@ nautilus_scalable_icon_equal (gconstpointer a, } static gboolean -should_display_image_file_as_itself (NautilusFile *file, gboolean optimized_for_aa) +should_display_image_file_as_itself (NautilusFile *file) { static int show_thumbnails_auto_value; static gboolean show_thumbnail_auto_value_registered; @@ -1168,7 +1156,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie file_size = nautilus_file_get_size (file); if (eel_istr_has_prefix (mime_type, "image/") && is_supported_mime_type (mime_type) - && should_display_image_file_as_itself (file, TRUE)) { + && should_display_image_file_as_itself (file)) { if (file_size < SELF_THUMBNAIL_SIZE_THRESHOLD && is_local) { uri = nautilus_file_get_uri (file); } else if (strstr (file_uri, "/.thumbnails/") == NULL @@ -1506,8 +1494,7 @@ static GdkPixbuf * load_icon_from_path (const char *path, guint size_in_pixels, gboolean custom, - gboolean is_emblem, /* for emblem scaling hack only */ - gboolean optimized_for_aa) + gboolean is_emblem /* for emblem scaling hack only */) { /* Get the icon. */ if (path == NULL) { @@ -1526,7 +1513,7 @@ load_icon_from_path (const char *path, /* if it's a thumbnail, frame it if necessary */ if (strstr (path, "/.thumbnails/") != NULL) { - return nautilus_thumbnail_load_framed_image (path, optimized_for_aa); + return nautilus_thumbnail_load_framed_image (path); } return gdk_pixbuf_new_from_file (path, NULL); @@ -1536,19 +1523,17 @@ static GdkPixbuf * load_named_icon (const char *name, const char *modifier, guint size_in_pixels, - gboolean optimized_for_aa, NautilusIconDetails *details) { char *path; GdkPixbuf *pixbuf; - path = nautilus_get_icon_file_name (&get_icon_factory ()->theme, name, modifier, - size_in_pixels, optimized_for_aa, + path = nautilus_get_icon_file_name (&get_icon_factory ()->theme, + name, modifier, size_in_pixels, details); pixbuf = load_icon_from_path (path, size_in_pixels, FALSE, - eel_str_has_prefix (name, NAUTILUS_EMBLEM_NAME_PREFIX), - optimized_for_aa); + eel_str_has_prefix (name, NAUTILUS_EMBLEM_NAME_PREFIX)); g_free (path); @@ -1571,7 +1556,6 @@ is_generic_icon_name (const char *name) static CacheIcon * load_specific_icon (NautilusScalableIcon *scalable_icon, guint size_in_pixels, - gboolean optimized_for_aa, IconRequest type) { NautilusIconDetails details; @@ -1587,7 +1571,7 @@ load_specific_icon (NautilusScalableIcon *scalable_icon, if (type == REQUEST_PICKY_CUSTOM_ONLY) { /* We don't support custom icons that are not local here. */ path = gnome_vfs_get_local_path_from_uri (scalable_icon->uri); - pixbuf = load_icon_from_path (path, size_in_pixels, TRUE, FALSE, optimized_for_aa); + pixbuf = load_icon_from_path (path, size_in_pixels, TRUE, FALSE); g_free (path); } else { mime_type_icon_name = get_mime_type_icon_without_suffix (scalable_icon->mime_type); @@ -1605,8 +1589,7 @@ load_specific_icon (NautilusScalableIcon *scalable_icon, ((type == REQUEST_PICKY_BY_NAME_FIRST_CHOICE) ? first_choice_name : second_choice_name, scalable_icon->modifier, - size_in_pixels, - optimized_for_aa, &details); + size_in_pixels, &details); g_free (mime_type_icon_name); } @@ -1638,7 +1621,6 @@ destroy_fallback_icon (void) static CacheIcon * load_icon_for_scaling (NautilusScalableIcon *scalable_icon, guint requested_size, - gboolean optimized_for_aa, guint *actual_size_result) { CacheIcon *icon; @@ -1654,7 +1636,6 @@ load_icon_for_scaling (NautilusScalableIcon *scalable_icon, size_request.maximum_width = MAXIMUM_ICON_SIZE * requested_size / NAUTILUS_ZOOM_LEVEL_STANDARD; size_request.maximum_height = size_request.maximum_width; - size_request.optimized_for_aa = optimized_for_aa; for (i = 0; i < G_N_ELEMENTS (requests); i++) { actual_size = 0; @@ -1805,7 +1786,6 @@ load_icon_scale_if_necessary (NautilusScalableIcon *scalable_icon, /* Load the icon that's closest in size to what we want. */ icon = load_icon_for_scaling (scalable_icon, size->nominal_width, - size->optimized_for_aa, &nominal_actual_size); /* Scale the pixbuf to the size we want. */ @@ -1969,7 +1949,6 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon, /* Get the image. */ icon = load_specific_icon (scalable_icon, size->nominal_width, - size->optimized_for_aa, type); if (icon == NULL) { return NULL; @@ -2024,7 +2003,6 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon, guint nominal_height, guint maximum_width, guint maximum_height, - gboolean optimized_for_aa, NautilusEmblemAttachPoints *attach_points, gboolean wants_default) { @@ -2036,7 +2014,6 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon, size.nominal_height = nominal_width; size.maximum_width = maximum_width; size.maximum_height = maximum_height; - size.optimized_for_aa = optimized_for_aa; icon = get_icon_from_cache (scalable_icon, &size, REQUEST_NORMAL); if (attach_points != NULL) { @@ -2073,12 +2050,11 @@ cache_key_hash (gconstpointer p) const CacheKey *key; key = p; - return (((((((((GPOINTER_TO_UINT (key->scalable_icon) << 4) - ^ key->size.nominal_width) << 4) - ^ key->size.nominal_height) << 4) - ^ key->size.maximum_width) << 4) - ^ key->size.maximum_height) << 1) - | key->size.optimized_for_aa; + return ((((((((GPOINTER_TO_UINT (key->scalable_icon) << 4) + ^ key->size.nominal_width) << 4) + ^ key->size.nominal_height) << 4) + ^ key->size.maximum_width) << 4) + ^ key->size.maximum_height); } static gboolean @@ -2093,8 +2069,7 @@ cache_key_equal (gconstpointer a, gconstpointer b) && key_a->size.nominal_width == key_b->size.nominal_width && key_a->size.nominal_height == key_b->size.nominal_height && key_a->size.maximum_width == key_b->size.maximum_width - && key_a->size.maximum_height == key_b->size.maximum_height - && key_a->size.optimized_for_aa == key_b->size.optimized_for_aa; + && key_a->size.maximum_height == key_b->size.maximum_height; } /* Return nominal icon size for given zoom level. @@ -2131,8 +2106,7 @@ nautilus_get_icon_size_for_zoom_level (NautilusZoomLevel zoom_level) GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file, const char *modifer, - guint size_in_pixels, - gboolean optimized_for_aa) + guint size_in_pixels) { NautilusScalableIcon *icon; GdkPixbuf *pixbuf; @@ -2146,7 +2120,6 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file, (icon, size_in_pixels, size_in_pixels, size_in_pixels, size_in_pixels, - optimized_for_aa, NULL, TRUE); nautilus_scalable_icon_unref (icon); @@ -2157,8 +2130,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file, GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name, const char *modifier, - guint size_in_pixels, - gboolean optimized_for_aa) + guint size_in_pixels) { GdkPixbuf *pixbuf; NautilusScalableIcon *icon; @@ -2167,22 +2139,15 @@ nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name, pixbuf = nautilus_icon_factory_get_pixbuf_for_icon (icon, size_in_pixels, size_in_pixels, size_in_pixels, size_in_pixels, - optimized_for_aa, NULL, TRUE); nautilus_scalable_icon_unref (icon); return pixbuf; } GdkPixbuf * -nautilus_icon_factory_get_thumbnail_frame (gboolean anti_aliased) +nautilus_icon_factory_get_thumbnail_frame (void) { - NautilusIconFactory *icon_factory; - icon_factory = get_icon_factory (); - if (anti_aliased) { - return icon_factory->thumbnail_frame_aa; - } else { - return icon_factory->thumbnail_frame; - } + return get_icon_factory ()->thumbnail_frame; } static gboolean diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h index 07ed3c996..e8188ddd6 100644 --- a/libnautilus-private/nautilus-icon-factory.h +++ b/libnautilus-private/nautilus-icon-factory.h @@ -128,7 +128,6 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (Nautil guint nominal_size_in_pixels_y, guint maximum_size_in_pixels_x, guint maximum_size_in_pixels_y, - gboolean optimized_for_anti_aliasing, NautilusEmblemAttachPoints *attach_points, gboolean wants_default); @@ -137,15 +136,13 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (Nautil */ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file, const char *modifer, - guint size_in_pixels, - gboolean optimized_for_anti_aliasing); + guint size_in_pixels); /* Convenience routine for getting a pixbuf from an icon name */ GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name, const char *modifer, - guint size_in_pixels, - gboolean optimized_for_anti_aliasing); + guint size_in_pixels); /* Manage a scalable icon. * Since the factory always passes out references to the same scalable * icon, you can compare two scalable icons to see if they are the same diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index b0da92f2b..aab729fd6 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -675,7 +675,7 @@ pixbuf_is_framed (GdkPixbuf *pixbuf) * a frame if necessary */ GdkPixbuf * -nautilus_thumbnail_load_framed_image (const char *path, gboolean anti_aliased_frame) +nautilus_thumbnail_load_framed_image (const char *path) { GdkPixbuf *pixbuf, *pixbuf_with_frame, *frame; gboolean got_frame_offsets; @@ -692,7 +692,7 @@ nautilus_thumbnail_load_framed_image (const char *path, gboolean anti_aliased_fr * an old Nautilus), so we must embed it in a frame. */ - frame = nautilus_icon_factory_get_thumbnail_frame (anti_aliased_frame); + frame = nautilus_icon_factory_get_thumbnail_frame (); if (frame == NULL) { return pixbuf; } diff --git a/libnautilus-private/nautilus-thumbnails.h b/libnautilus-private/nautilus-thumbnails.h index 3bf1f84bd..eb6d6223e 100644 --- a/libnautilus-private/nautilus-thumbnails.h +++ b/libnautilus-private/nautilus-thumbnails.h @@ -31,8 +31,7 @@ /* Returns NULL if there's no thumbnail yet. */ char * nautilus_get_thumbnail_uri (NautilusFile *file); gboolean nautilus_thumbnail_has_invalid_thumbnail (NautilusFile *file); -GdkPixbuf *nautilus_thumbnail_load_framed_image (const char *path, - gboolean anti_alias_frame_edges); +GdkPixbuf *nautilus_thumbnail_load_framed_image (const char *path); void nautilus_update_thumbnail_file_renamed (const char *old_file_uri, const char *new_file_uri); void nautilus_remove_thumbnail_for_file (const char *old_file_uri); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 976dedefe..cc6d00467 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3679,7 +3679,7 @@ add_script_to_script_menus (FMDirectoryView *directory_view, launch_parameters = script_launch_parameters_new (file, directory_view); pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE); + (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS); add_numbered_menu_item (directory_view->details->ui, menu_path, @@ -3720,7 +3720,7 @@ add_submenu_to_script_menus (FMDirectoryView *directory_view, name = nautilus_file_get_display_name (file); pixbuf = nautilus_icon_factory_get_pixbuf_for_file - (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE); + (file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS); add_submenu (directory_view->details->ui, menu_path, name, pixbuf); add_submenu (directory_view->details->ui, popup_path, name, pixbuf); g_object_unref (pixbuf); diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index 9cb3a2da0..d2b1935d4 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -298,7 +298,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column case FM_LIST_MODEL_ICON_COLUMN: g_value_init (value, GDK_TYPE_PIXBUF); - icon = nautilus_icon_factory_get_pixbuf_for_file (file, NULL, NAUTILUS_ICON_SIZE_SMALLER, TRUE); + icon = nautilus_icon_factory_get_pixbuf_for_file (file, NULL, NAUTILUS_ICON_SIZE_SMALLER); g_value_set_object (value, icon); g_object_unref (icon); break; diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index f79729c66..5fa55d3af 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -245,7 +245,7 @@ get_pixbuf_for_properties_window (NautilusFile *file) { g_assert (NAUTILUS_IS_FILE (file)); - return nautilus_icon_factory_get_pixbuf_for_file (file, NULL, NAUTILUS_ICON_SIZE_STANDARD, TRUE); + return nautilus_icon_factory_get_pixbuf_for_file (file, NULL, NAUTILUS_ICON_SIZE_STANDARD); } static void diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index 80da63796..35723f2a0 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -469,12 +469,11 @@ update_icon (NautilusSidebarTitle *sidebar_title) pixbuf = NULL; if (icon_name != NULL && strlen (icon_name) > 0) { - pixbuf = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL, NAUTILUS_ICON_SIZE_LARGE, TRUE); + pixbuf = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL, NAUTILUS_ICON_SIZE_LARGE); } else if (nautilus_icon_factory_is_icon_ready_for_file (sidebar_title->details->file)) { pixbuf = nautilus_icon_factory_get_pixbuf_for_file (sidebar_title->details->file, "accept", - NAUTILUS_ICON_SIZE_LARGE, - TRUE); + NAUTILUS_ICON_SIZE_LARGE); } else if (sidebar_title->details->determined_icon) { /* We used to know the icon for this file, but now the file says it isn't * ready. This means that some file info has been invalidated, which @@ -714,7 +713,7 @@ update_emblems (NautilusSidebarTitle *sidebar_title) (p->data, NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD, NAUTILUS_ICON_SIZE_STANDARD, - FALSE, NULL, FALSE); + NULL, FALSE); if (pixbuf != NULL) { add_emblem (sidebar_title, pixbuf); g_object_unref (pixbuf); |
