gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-02 14:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added search icon to the sidebar for search results

Browse source 
2000-09-11  Rebecca Schulman  <rebecka@eazel.com>

	* icons/Makefile.am:
	* icons/i-search-72.png:
	* libnautilus-extensions/nautilus-icon-factory.c:
	(nautilus_icon_factory_get_icon_name_for_directory),
	(nautilus_icon_factory_get_icon_name_for_file):
	Added search icon to the sidebar for search results
This commit is contained in:
Rebecca Schulman 2000-09-12 00:02:27 +00:00 committed by Rebecca Schulman
parent 0b50f0a562
commit 89f01c9a50
5 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2000-09-11 Rebecca Schulman <rebecka@eazel.com>
* icons/Makefile.am:
* icons/i-search-72.png:
* libnautilus-extensions/nautilus-icon-factory.c:
(nautilus_icon_factory_get_icon_name_for_directory),
(nautilus_icon_factory_get_icon_name_for_file):
Added search icon to the sidebar for search results
2000-09-11 Mathieu Lacage <mathieu@eazel.com>
Fix nautilus part of bug 2906. There are still issues

1
icons/Makefile.am
View file

@ -149,6 +149,7 @@ icon_DATA =\
i-regular-72.png \
i-regular-96.png \
i-regular.png \
i-search-72.png \
i-sock.png \
i-stalled.png \
i-symlink.png \

BIN
icons/i-search-72.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

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

@ -79,6 +79,7 @@ static const char *icon_file_name_suffixes[] =
#define ICON_NAME_DIRECTORY_CLOSED "i-dirclosed"
#define ICON_NAME_EXECUTABLE "i-executable"
#define ICON_NAME_REGULAR "i-regular"
#define ICON_NAME_SEARCH_RESULTS "i-search"
#define ICON_NAME_WEB "i-web"
#define ICON_NAME_SOCKET "i-sock"
#define ICON_NAME_FIFO "i-fifo"
@ -517,6 +518,7 @@ nautilus_icon_factory_set_theme (const char *theme_name)
signals[ICONS_CHANGED]);
}
/* Use the MIME type to get the icon name. */
static const char *
nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
@ -552,6 +554,25 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
return is_http_uri ? ICON_NAME_WEB : ICON_NAME_REGULAR;
}
/* Use the MIME type to get the icon name. */
static const char *
nautilus_icon_factory_get_icon_name_for_directory (NautilusFile *file)
{
char *mime_type;
mime_type = nautilus_file_get_mime_type (file);
if (mime_type != NULL && !nautilus_strcasecmp (mime_type, "x-directory/search")) {
g_free (mime_type);
return ICON_NAME_SEARCH_RESULTS;
}
else {
g_free (mime_type);
return ICON_NAME_DIRECTORY;
}
}
/* Get the icon name for a file. */
static const char *
nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
@ -559,7 +580,7 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
/* Get an icon name based on the file's type. */
switch (nautilus_file_get_file_type (file)) {
case GNOME_VFS_FILE_TYPE_DIRECTORY:
return ICON_NAME_DIRECTORY;
return nautilus_icon_factory_get_icon_name_for_directory (file);
case GNOME_VFS_FILE_TYPE_FIFO:
return ICON_NAME_FIFO;
case GNOME_VFS_FILE_TYPE_SOCKET:

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

@ -79,6 +79,7 @@ static const char *icon_file_name_suffixes[] =
#define ICON_NAME_DIRECTORY_CLOSED "i-dirclosed"
#define ICON_NAME_EXECUTABLE "i-executable"
#define ICON_NAME_REGULAR "i-regular"
#define ICON_NAME_SEARCH_RESULTS "i-search"
#define ICON_NAME_WEB "i-web"
#define ICON_NAME_SOCKET "i-sock"
#define ICON_NAME_FIFO "i-fifo"
@ -517,6 +518,7 @@ nautilus_icon_factory_set_theme (const char *theme_name)
signals[ICONS_CHANGED]);
}
/* Use the MIME type to get the icon name. */
static const char *
nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
@ -552,6 +554,25 @@ nautilus_icon_factory_get_icon_name_for_regular_file (NautilusFile *file)
return is_http_uri ? ICON_NAME_WEB : ICON_NAME_REGULAR;
}
/* Use the MIME type to get the icon name. */
static const char *
nautilus_icon_factory_get_icon_name_for_directory (NautilusFile *file)
{
char *mime_type;
mime_type = nautilus_file_get_mime_type (file);
if (mime_type != NULL && !nautilus_strcasecmp (mime_type, "x-directory/search")) {
g_free (mime_type);
return ICON_NAME_SEARCH_RESULTS;
}
else {
g_free (mime_type);
return ICON_NAME_DIRECTORY;
}
}
/* Get the icon name for a file. */
static const char *
nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
@ -559,7 +580,7 @@ nautilus_icon_factory_get_icon_name_for_file (NautilusFile *file)
/* Get an icon name based on the file's type. */
switch (nautilus_file_get_file_type (file)) {
case GNOME_VFS_FILE_TYPE_DIRECTORY:
return ICON_NAME_DIRECTORY;
return nautilus_icon_factory_get_icon_name_for_directory (file);
case GNOME_VFS_FILE_TYPE_FIFO:
return ICON_NAME_FIFO;
case GNOME_VFS_FILE_TYPE_SOCKET: