diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | components/emblem/Makefile.am | 1 | ||||
| -rw-r--r-- | components/emblem/nautilus-emblem-view.c | 66 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/emblems/.cvsignore | 2 | ||||
| -rw-r--r-- | data/emblems/Makefile.am | 31 | ||||
| -rw-r--r-- | data/emblems/OK.png | bin | 2187 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/art.png | bin | 2795 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/camera.png | bin | 2027 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/certified.png | bin | 2621 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/cool.png | bin | 2111 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/danger.png | bin | 2206 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/distinguished.png | bin | 3136 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/documents.png | bin | 1395 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/draft.png | bin | 2399 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/favorite.png | bin | 1663 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/important.png | bin | 2152 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/mail.png | bin | 1788 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/multimedia.png | bin | 2590 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/new.png | bin | 2078 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/ohno.png | bin | 2189 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/package.png | bin | 2675 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/personal.png | bin | 2319 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/pictures.png | bin | 2807 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/sound.png | bin | 2322 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/special.png | bin | 2004 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/urgent.png | bin | 1990 -> 0 bytes | |||
| -rw-r--r-- | data/emblems/web.png | bin | 3003 -> 0 bytes | |||
| -rw-r--r-- | icons/Makefile.am | 1 | ||||
| -rw-r--r-- | icons/erase.png (renamed from data/emblems/erase.png) | bin | 3441 -> 3441 bytes |
31 files changed, 60 insertions, 53 deletions
@@ -1,3 +1,13 @@ +2002-10-07 James Willcox <jwillcox@gnome.org> + + * components/emblem/Makefile.am: define DATADIR + * components/emblem/nautilus-emblem-view.c: + (create_emblem_widget_with_pixbuf), (create_emblem_widget), + (nautilus_emblem_view_populate): Add erase emblem + * configure.in: Remove data/emblems + * data/Makefile.am: ditto + * icons/Makefile.am: install erase.png + 2002-10-05 Dave Camp <dave@ximian.com> * libnautilus-private/nautilus-icon-canvas-item.c: diff --git a/components/emblem/Makefile.am b/components/emblem/Makefile.am index 65edca8ca..c95b6bb39 100644 --- a/components/emblem/Makefile.am +++ b/components/emblem/Makefile.am @@ -3,6 +3,7 @@ NULL = INCLUDES = \ -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ -DG_LOG_DOMAIN=\"Nautilus-Emblem-Sidebar\" \ + -DDATADIR=\""$(datadir)"\" \ -I$(top_srcdir) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(EMBLEM_COMPONENT_CFLAGS) \ diff --git a/components/emblem/nautilus-emblem-view.c b/components/emblem/nautilus-emblem-view.c index 589e4441f..2061fd6a3 100644 --- a/components/emblem/nautilus-emblem-view.c +++ b/components/emblem/nautilus-emblem-view.c @@ -57,6 +57,7 @@ #include <libnautilus-private/nautilus-icon-factory.h> #include <libnautilus-private/nautilus-icon-dnd.h> #include <libnautilus-private/nautilus-emblem-utils.h> +#include <libnautilus-private/nautilus-file-utilities.h> struct NautilusEmblemViewDetails { GConfClient *client; @@ -141,25 +142,16 @@ nautilus_emblem_view_leave_notify_cb (GtkWidget *widget, } static GtkWidget * -create_emblem_widget (NautilusEmblemView *emblem_view, - const char *name) +create_emblem_widget_with_pixbuf (NautilusEmblemView *emblem_view, + const char *keyword, + const char *display_name, + GdkPixbuf *pixbuf) { GtkWidget *image, *event_box; - GdkPixbuf *pixbuf; GdkPixbuf *prelight_pixbuf; - char *display_name, *keyword; - - pixbuf = nautilus_icon_factory_get_pixbuf_from_name (name, NULL, - NAUTILUS_ICON_SIZE_STANDARD, - &display_name); - keyword = nautilus_emblem_get_keyword_from_icon_name (name); - if (display_name == NULL) { - display_name = g_strdup (keyword); - } image = eel_labeled_image_new (display_name, pixbuf); - g_free (display_name); eel_labeled_image_set_fixed_image_height (EEL_LABELED_IMAGE (image), STANDARD_EMBLEM_HEIGHT); @@ -189,7 +181,7 @@ create_emblem_widget (NautilusEmblemView *emblem_view, g_object_set_data_full (G_OBJECT (event_box), "emblem-keyword", - keyword, g_free); + g_strdup (keyword), g_free); g_object_set_data_full (G_OBJECT (event_box), "original-pixbuf", pixbuf, g_object_unref); @@ -200,6 +192,32 @@ create_emblem_widget (NautilusEmblemView *emblem_view, "labeled-image", image); return event_box; + +} + +static GtkWidget * +create_emblem_widget (NautilusEmblemView *emblem_view, + const char *name) +{ + GtkWidget *ret; + char *display_name, *keyword; + GdkPixbuf *pixbuf; + + pixbuf = nautilus_icon_factory_get_pixbuf_from_name (name, NULL, + NAUTILUS_ICON_SIZE_STANDARD, + &display_name); + + keyword = nautilus_emblem_get_keyword_from_icon_name (name); + if (display_name == NULL) { + display_name = g_strdup (keyword); + } + + ret = create_emblem_widget_with_pixbuf (emblem_view, keyword, + display_name, pixbuf); + g_free (keyword); + g_free (display_name); + + return ret; } static void @@ -527,12 +545,24 @@ nautilus_emblem_view_populate (NautilusEmblemView *emblem_view) GList *icons, *l; GtkWidget *emblem_widget; char *name; + char *path; + GdkPixbuf *erase_pixbuf; - /* FIXME: need to get the erase emblem somehow - emblem_widget = create_emblem_widget (emblem_view, "erase", FALSE); - gtk_container_add (GTK_CONTAINER (emblems_table), emblem_widget); - */ + path = nautilus_pixmap_file ("erase.png"); + erase_pixbuf = gdk_pixbuf_new_from_file (path, NULL); + g_free (path); + + if (erase_pixbuf != NULL) { + emblem_widget = create_emblem_widget_with_pixbuf (emblem_view, + ERASE_EMBLEM_KEYWORD, + _("Erase"), + erase_pixbuf); + gtk_container_add (GTK_CONTAINER + (emblem_view->details->emblems_table), + emblem_widget); + } + icons = nautilus_emblem_list_availible (); diff --git a/configure.in b/configure.in index dd9febcf7..1011e648c 100644 --- a/configure.in +++ b/configure.in @@ -358,7 +358,6 @@ cut-n-paste-code/Makefile cut-n-paste-code/widgets/Makefile cut-n-paste-code/widgets/gimphwrapbox/Makefile data/Makefile -data/emblems/Makefile data/patterns/Makefile docs/Makefile icons/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 60b1c097c..a2b564a56 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -47,7 +47,6 @@ EXTRA_DIST = $(nautilusdata_DATA) \ $(NULL) SUBDIRS = \ - emblems \ patterns \ $(NULL) diff --git a/data/emblems/.cvsignore b/data/emblems/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/data/emblems/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am deleted file mode 100644 index a78a91d90..000000000 --- a/data/emblems/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -NULL= - -emblemsdir = $(datadir)/nautilus/emblems - -emblems_DATA = \ - art.png \ - camera.png \ - certified.png \ - cool.png \ - danger.png \ - distinguished.png \ - documents.png \ - draft.png \ - erase.png \ - favorite.png \ - important.png \ - mail.png \ - multimedia.png \ - new.png \ - ohno.png \ - OK.png \ - package.png \ - personal.png \ - pictures.png \ - special.png \ - sound.png \ - urgent.png \ - web.png \ - $(NULL) - -EXTRA_DIST = $(emblems_DATA) diff --git a/data/emblems/OK.png b/data/emblems/OK.png Binary files differdeleted file mode 100644 index 0d16b7e51..000000000 --- a/data/emblems/OK.png +++ /dev/null diff --git a/data/emblems/art.png b/data/emblems/art.png Binary files differdeleted file mode 100644 index 752b54f81..000000000 --- a/data/emblems/art.png +++ /dev/null diff --git a/data/emblems/camera.png b/data/emblems/camera.png Binary files differdeleted file mode 100644 index f94ce75a0..000000000 --- a/data/emblems/camera.png +++ /dev/null diff --git a/data/emblems/certified.png b/data/emblems/certified.png Binary files differdeleted file mode 100644 index 921435d99..000000000 --- a/data/emblems/certified.png +++ /dev/null diff --git a/data/emblems/cool.png b/data/emblems/cool.png Binary files differdeleted file mode 100644 index b9605d8cc..000000000 --- a/data/emblems/cool.png +++ /dev/null diff --git a/data/emblems/danger.png b/data/emblems/danger.png Binary files differdeleted file mode 100644 index ab9443233..000000000 --- a/data/emblems/danger.png +++ /dev/null diff --git a/data/emblems/distinguished.png b/data/emblems/distinguished.png Binary files differdeleted file mode 100644 index f6641bb38..000000000 --- a/data/emblems/distinguished.png +++ /dev/null diff --git a/data/emblems/documents.png b/data/emblems/documents.png Binary files differdeleted file mode 100644 index f05ed0f38..000000000 --- a/data/emblems/documents.png +++ /dev/null diff --git a/data/emblems/draft.png b/data/emblems/draft.png Binary files differdeleted file mode 100644 index 1d03a97fd..000000000 --- a/data/emblems/draft.png +++ /dev/null diff --git a/data/emblems/favorite.png b/data/emblems/favorite.png Binary files differdeleted file mode 100644 index afe161c56..000000000 --- a/data/emblems/favorite.png +++ /dev/null diff --git a/data/emblems/important.png b/data/emblems/important.png Binary files differdeleted file mode 100644 index 1a55fba3c..000000000 --- a/data/emblems/important.png +++ /dev/null diff --git a/data/emblems/mail.png b/data/emblems/mail.png Binary files differdeleted file mode 100644 index 6f6718e29..000000000 --- a/data/emblems/mail.png +++ /dev/null diff --git a/data/emblems/multimedia.png b/data/emblems/multimedia.png Binary files differdeleted file mode 100644 index 2bf2946d3..000000000 --- a/data/emblems/multimedia.png +++ /dev/null diff --git a/data/emblems/new.png b/data/emblems/new.png Binary files differdeleted file mode 100644 index 7ae668458..000000000 --- a/data/emblems/new.png +++ /dev/null diff --git a/data/emblems/ohno.png b/data/emblems/ohno.png Binary files differdeleted file mode 100644 index b6ea1b52d..000000000 --- a/data/emblems/ohno.png +++ /dev/null diff --git a/data/emblems/package.png b/data/emblems/package.png Binary files differdeleted file mode 100644 index 7c402084e..000000000 --- a/data/emblems/package.png +++ /dev/null diff --git a/data/emblems/personal.png b/data/emblems/personal.png Binary files differdeleted file mode 100644 index 6c437190f..000000000 --- a/data/emblems/personal.png +++ /dev/null diff --git a/data/emblems/pictures.png b/data/emblems/pictures.png Binary files differdeleted file mode 100644 index fd47892b1..000000000 --- a/data/emblems/pictures.png +++ /dev/null diff --git a/data/emblems/sound.png b/data/emblems/sound.png Binary files differdeleted file mode 100644 index 2a2cbd385..000000000 --- a/data/emblems/sound.png +++ /dev/null diff --git a/data/emblems/special.png b/data/emblems/special.png Binary files differdeleted file mode 100644 index 1b6d969a7..000000000 --- a/data/emblems/special.png +++ /dev/null diff --git a/data/emblems/urgent.png b/data/emblems/urgent.png Binary files differdeleted file mode 100644 index 4e9d9f18c..000000000 --- a/data/emblems/urgent.png +++ /dev/null diff --git a/data/emblems/web.png b/data/emblems/web.png Binary files differdeleted file mode 100644 index 3b987fade..000000000 --- a/data/emblems/web.png +++ /dev/null diff --git a/icons/Makefile.am b/icons/Makefile.am index c2da889ae..b0721384f 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -30,6 +30,7 @@ icon_DATA =\ text-selection-frame.png \ thumbnail_frame.png \ zoom_body.png \ + erase.png \ $(NULL) EXTRA_DIST = $(icon_DATA) diff --git a/data/emblems/erase.png b/icons/erase.png Binary files differindex ce7938795..ce7938795 100644 --- a/data/emblems/erase.png +++ b/icons/erase.png |
