gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 10:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

added modifier parameter to high level icon factory calls used open folder

Browse source 
added modifier parameter to high level icon factory calls
	used open folder in sidebar
	new folder icons from Susan
This commit is contained in:
Andy Hertzfeld 2000-07-05 19:41:59 +00:00
parent 60652175ba
commit f29a020672
23 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,3 +1,24 @@
2000-07-05 Andy Hertzfeld <andy@eazel.com>
* libnautilus-extensions/nautilus-icon-factory.c,h:
(nautilus_icon_factory_get_pixbuf_for_file),
(nautilus_icon_factory_get_pixmap_and_mask_for_file):
added modifier parameter to icon factory high level routines
* components/tree/nautilus-tree-view.c:
(nautilus_tree_view_insert_file):
added extra parameter to get_pixmap call
* src/file-manager/fm-list-view.c: (install_row_images):
added extra parameter to get_pixmap call
* src/file-manager/fm-properties-window.c:
(get_pixmap_and_mask_for_properties_window):
added extra parameter to get_pixmap call
* icons/eazel/Makefile.am:
* icons/eazel/i-directory-accept.svg:
removed the .svg open folder, added bitmap ones
changed the folder icons in eazel theme to Susan's new one
* src/nautilus-sidebar-title.c: (update_icon):
use the open folder in the sidebar
2000-07-05 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus-extensions/nautilus-global-preferences.c:

1
components/tree/nautilus-tree-view.c
View file

@ -566,6 +566,7 @@ nautilus_tree_view_insert_file (NautilusTreeView *view, NautilusFile *file)
nautilus_icon_factory_get_pixmap_and_mask_for_file (file,
NULL,
NAUTILUS_ICON_SIZE_FOR_MENUS,
&pixmap,
&mask);

5
icons/eazel/Makefile.am
View file

@ -6,14 +6,17 @@ eazel_DATA = \
Forward.png \
Home.png \
i-directory.png \
i-directory-12.png \
i-directory-24.png \
i-directory-36.png \
i-directory-72.png \
i-directory-96.png \
i-directory-accept.png \
i-directory-accept-12.png \
i-directory-accept-24.png \
i-directory-accept-36.png \
i-directory-accept-72.png \
i-directory-accept.svg \
i-directory-accept-96.png \
i-regular.png \
i-regular.xml \
i-regular-12.png \

BIN
icons/eazel/i-directory-12.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 329 B

BIN
icons/eazel/i-directory-24.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 966 B

After

Width:  |  Height:  |  Size: 406 B

BIN
icons/eazel/i-directory-36.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 594 B

BIN
icons/eazel/i-directory-72.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 992 B

BIN
icons/eazel/i-directory-96.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
icons/eazel/i-directory-accept-12.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 435 B

BIN
icons/eazel/i-directory-accept-24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 685 B

BIN
icons/eazel/i-directory-accept-36.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 927 B

BIN
icons/eazel/i-directory-accept-72.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/eazel/i-directory-accept-96.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
icons/eazel/i-directory-accept.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

34
icons/eazel/i-directory-accept.svg
View file

@ -1,34 +0,0 @@
<svg width="70" height="42">
<!-- Open folder 1.eps converted by ill2svg.pl -->
<defs>
<linearGradient id="Red_Yellow_copy__1"
x1="47.335" y1="45.742" x2="32.272" y2="6.498"
>
<stop offset="6%" style="stop-color:#f2cc0c"/>
<stop offset="83%" style="stop-color:#fff2ea"/>
</linearGradient>
<linearGradient id="Red_Yellow_copy__2"
x1="32.045" y1="25.082" x2="15.103" y2="-4.263"
>
<stop offset="6%" style="stop-color:#f2cc0c"/>
<stop offset="83%" style="stop-color:#fff2ea"/>
</linearGradient>
</defs>
<g> <!-- Layer: Layer 1 -->
<g style="fill: #000000">
<path d="M9.54 41.4L60.9 41.4C60.9 41.4 69.156 12.216 69.348 11.544C69.54 10.872 69.924 9.816 68.916 9.048C68.366 8.628 66.852 8.568 65.316 8.664C63.78 8.76 52.26 8.664 52.26 8.664C52.26 8.664 52.452 6.552 51.684 5.88C50.916 5.208 50.244 4.728 46.884 4.824C43.524 4.92 22.884 4.824 22.884 4.824C22.884 4.824 22.404 5.4 21.54 4.056C20.676 2.712 19.908 0.792 18.948 0.696C17.988 0.6 6.468 0.696 6.468 0.696C6.468 0.696 5.06 0.696 4.772 2.04C4.484 3.384 4.459 4.253 4.164 4.632C3.716 5.208 3.14 4.984 2.468 5.08C1.796 5.176 0.196 4.92 0.132 6.552C0.076 7.994 2.148 14.616 2.244 15.288C2.34 15.96 9.54 41.4 9.54 41.4z"/>
<!-- 0 -1660.0518 4325.0081 61.8255 23.7303 1894.5632 -3953.2794 Bc -->
<!-- -11.5986 30.2183 61.8255 23.7303 234.5114 371.7286 Bm -->
<!-- -1660.0518 4325.0081 61.8255 23.7303 222.9128 401.947 Bc -->
</g>
<g style="fill: url(#Red_Yellow_copy__1); stroke: #000000; stroke-width: 0.6; stroke-miterlimit: 4">
<path d="M10.5 40.056L17.86 13.88C17.86 13.88 18.228 12.504 19.588 12.6C20.61 12.672 37.38 12.664 37.892 12.664C38.404 12.664 38.9 12.081 40.068 10.936C41.652 9.384 42.308 9.848 43.396 9.784C44.355 9.728 67.012 9.848 67.012 9.848C67.012 9.848 68.292 10.104 68.036 11.064C67.78 12.024 59.716 40.184 59.716 40.184L10.5 40.056"/>
<!-- 2 -2316.3048 4012.0694 45.1913 26.0905 2543.7461 -3621.4498 Bc -->
<!-- -13.0458 22.5966 45.1913 26.0905 227.4413 390.6196 Bm -->
<!-- -2316.3048 4012.0694 45.1913 26.0905 214.3955 413.2162 Bc -->
</g>
<g style="fill: url(#Red_Yellow_copy__2); stroke: #000000; stroke-width: 0.6; stroke-miterlimit: 4">
<path d="M9.732 37.08C9.732 37.08 16.26 13.656 16.452 13.272C16.644 12.888 17.268 11.352 18.468 11.256C19.138 11.202 37.476 11.256 37.476 11.256C37.476 11.256 37.956 11.544 39.3 10.008C40.644 8.472 40.932 8.472 45.348 8.472C49.764 8.472 51.012 8.568 51.012 8.568C51.012 8.568 51.108 7.608 50.82 7.032C50.532 6.456 50.244 6.072 48.228 6.072C46.212 6.072 23.076 6.072 22.5 6.072C21.924 6.072 20.868 6.264 20.1 4.92C19.332 3.576 19.236 1.944 17.412 1.944C15.588 1.944 6.756 1.944 6.756 1.944C6.756 1.944 6.116 1.976 5.924 2.552C5.732 3.128 5.732 4.728 5.156 5.4C4.58 6.072 4.563 5.978 3.62 6.072C2.66 6.168 1.476 6.04 1.476 7.224C1.476 8.664 9.732 37.08 9.732 37.08"/>
</g>
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
icons/eazel/i-directory.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 732 B

6
libnautilus-extensions/nautilus-icon-factory.c
View file

@ -1965,13 +1965,14 @@ 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)
{
NautilusScalableIcon *icon;
GdkPixbuf *pixbuf;
/* Get the pixbuf for this file. */
icon = nautilus_icon_factory_get_icon_for_file (file, NULL);
icon = nautilus_icon_factory_get_icon_for_file (file, modifer);
if (icon == NULL) {
return NULL;
}
@ -1990,6 +1991,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
*/
void
nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask)
@ -2002,7 +2004,7 @@ nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
*pixmap = NULL;
*mask = NULL;
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, size_in_pixels);
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, modifer, size_in_pixels);
if (pixbuf == NULL) {
return;
}

2
libnautilus-extensions/nautilus-icon-factory.h
View file

@ -115,12 +115,14 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (Nautil
* and render the icon into a pixbuf all at once.
*/
GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels);
/* Convenience functions for legacy interfaces that require a pixmap and
* bitmap. Maybe we can get rid of these one day.
*/
void nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask);

6
libnautilus-private/nautilus-icon-factory.c
View file

@ -1965,13 +1965,14 @@ 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)
{
NautilusScalableIcon *icon;
GdkPixbuf *pixbuf;
/* Get the pixbuf for this file. */
icon = nautilus_icon_factory_get_icon_for_file (file, NULL);
icon = nautilus_icon_factory_get_icon_for_file (file, modifer);
if (icon == NULL) {
return NULL;
}
@ -1990,6 +1991,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
*/
void
nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask)
@ -2002,7 +2004,7 @@ nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
*pixmap = NULL;
*mask = NULL;
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, size_in_pixels);
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, modifer, size_in_pixels);
if (pixbuf == NULL) {
return;
}

2
libnautilus-private/nautilus-icon-factory.h
View file

@ -115,12 +115,14 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_icon (Nautil
* and render the icon into a pixbuf all at once.
*/
GdkPixbuf * nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels);
/* Convenience functions for legacy interfaces that require a pixmap and
* bitmap. Maybe we can get rid of these one day.
*/
void nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
const char *modifer,
guint size_in_pixels,
GdkPixmap **pixmap,
GdkBitmap **mask);

1
src/file-manager/fm-list-view.c
View file

@ -1377,6 +1377,7 @@ install_row_images (FMListView *list_view, guint row)
/* Install the icon for this file. */
nautilus_icon_factory_get_pixmap_and_mask_for_file
(file,
NULL,
fm_list_view_get_icon_size (list_view),
&pixmap, &bitmap);
gtk_clist_set_pixmap (clist, row, LIST_VIEW_COLUMN_ICON, pixmap, bitmap);

2
src/file-manager/fm-properties-window.c
View file

@ -174,7 +174,7 @@ get_pixmap_and_mask_for_properties_window (NautilusFile *file,
g_assert (NAUTILUS_IS_FILE (file));
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, NAUTILUS_ICON_SIZE_STANDARD);
pixbuf = nautilus_icon_factory_get_pixbuf_for_file (file, NULL, NAUTILUS_ICON_SIZE_STANDARD);
gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, 128);
gdk_pixbuf_unref (pixbuf);
}

1
src/nautilus-sidebar-title.c
View file

@ -221,6 +221,7 @@ update_icon (NautilusSidebarTitle *sidebar_title)
if (nautilus_icon_factory_is_icon_ready_for_file (sidebar_title->details->file)) {
nautilus_icon_factory_get_pixmap_and_mask_for_file
(sidebar_title->details->file,
"accept",
NAUTILUS_ICON_SIZE_STANDARD,
&pixmap, &mask);
} else {