summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2002-05-08 22:34:12 +0000
committerAlexander Larsson <alexl@src.gnome.org>2002-05-08 22:34:12 +0000
commite7833472a12ca5e4b13f05565d8d04aed8b1141e (patch)
tree4ad6b1ab12ca7e1d66509266f0b2522d51c3f6e1
parent93008154e5e638fdc2db71300d7c536425a3a08e (diff)
downloadnautilus-e7833472a12ca5e4b13f05565d8d04aed8b1141e.tar.gz
More emblems from jimmac.
2002-05-08 Alex Larsson <alexl@redhat.com> * data/browser.xml: * data/emblems/Makefile.am: * data/emblems/documents.png: * data/emblems/multimedia.png: * data/emblems/package.png: * data/emblems/web.png: * icons/default/Makefile.am: * icons/default/emblem-documents.png: * icons/default/emblem-multimedia.png: * icons/default/emblem-package.png: * icons/default/emblem-web.png: More emblems from jimmac.
-rw-r--r--ChangeLog15
-rw-r--r--data/browser.xml6
-rw-r--r--data/emblems/Makefile.am4
-rw-r--r--data/emblems/documents.pngbin0 -> 1395 bytes
-rw-r--r--data/emblems/multimedia.pngbin0 -> 2590 bytes
-rw-r--r--data/emblems/package.pngbin0 -> 2675 bytes
-rw-r--r--data/emblems/web.pngbin0 -> 3003 bytes
-rw-r--r--icons/default/Makefile.am4
-rw-r--r--icons/default/emblem-documents.pngbin0 -> 1395 bytes
-rw-r--r--icons/default/emblem-multimedia.pngbin0 -> 2590 bytes
-rw-r--r--icons/default/emblem-package.pngbin0 -> 2675 bytes
-rw-r--r--icons/default/emblem-web.pngbin0 -> 3003 bytes
12 files changed, 28 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6346b0d9e..1cc34338c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2002-05-08 Alex Larsson <alexl@redhat.com>
+ * data/browser.xml:
+ * data/emblems/Makefile.am:
+ * data/emblems/documents.png:
+ * data/emblems/multimedia.png:
+ * data/emblems/package.png:
+ * data/emblems/web.png:
+ * icons/default/Makefile.am:
+ * icons/default/emblem-documents.png:
+ * icons/default/emblem-multimedia.png:
+ * icons/default/emblem-package.png:
+ * icons/default/emblem-web.png:
+ More emblems from jimmac.
+
+2002-05-08 Alex Larsson <alexl@redhat.com>
+
* src/file-manager/fm-directory-view.c:
* src/file-manager/nautilus-directory-view-ui.xml:
Show Properties -> Properties.
diff --git a/data/browser.xml b/data/browser.xml
index 78e2e75c3..cfb981743 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -72,20 +72,24 @@
<emblem _display_name="Camera" filename="camera"/>
<emblem _display_name="Certified" filename="certified"/>
<emblem _display_name="Cool" filename="cool"/>
+ <emblem _display_name="Danger" filename="danger"/>
<emblem _display_name="Distinguished" filename="distinguished"/>
+ <emblem _display_name="Documents" filename="documents"/>
<emblem _display_name="Draft" filename="draft"/>
<emblem _display_name="Favorite" filename="favorite"/>
<emblem _display_name="Important" filename="important"/>
<emblem _display_name="Mail" filename="mail"/>
+ <emblem _display_name="Multimedia" filename="multimedia"/>
<emblem _display_name="New" filename="new"/>
<emblem _display_name="Oh No" filename="ohno"/>
<emblem _display_name="OK" filename="OK"/>
+ <emblem _display_name="Package" filename="package"/>
<emblem _display_name="Personal" filename="personal"/>
<emblem _display_name="Pictures" filename="pictures"/>
<emblem _display_name="Special" filename="special"/>
<emblem _display_name="Sound" filename="sound"/>
<emblem _display_name="Urgent" filename="urgent"/>
- <emblem _display_name="Danger" filename="danger"/>
+ <emblem _display_name="Web" filename="web"/>
<emblem _display_name="Erase" filename="erase"/>
</category>
</categories>
diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am
index 7974ce079..a78a91d90 100644
--- a/data/emblems/Makefile.am
+++ b/data/emblems/Makefile.am
@@ -9,19 +9,23 @@ emblems_DATA = \
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/documents.png b/data/emblems/documents.png
new file mode 100644
index 000000000..f05ed0f38
--- /dev/null
+++ b/data/emblems/documents.png
Binary files differ
diff --git a/data/emblems/multimedia.png b/data/emblems/multimedia.png
new file mode 100644
index 000000000..2bf2946d3
--- /dev/null
+++ b/data/emblems/multimedia.png
Binary files differ
diff --git a/data/emblems/package.png b/data/emblems/package.png
new file mode 100644
index 000000000..7c402084e
--- /dev/null
+++ b/data/emblems/package.png
Binary files differ
diff --git a/data/emblems/web.png b/data/emblems/web.png
new file mode 100644
index 000000000..3b987fade
--- /dev/null
+++ b/data/emblems/web.png
Binary files differ
diff --git a/icons/default/Makefile.am b/icons/default/Makefile.am
index 2581e6e7e..6774b9bd0 100644
--- a/icons/default/Makefile.am
+++ b/icons/default/Makefile.am
@@ -12,6 +12,10 @@ icon_DATA =\
emblem-mail.png \
emblem-pictures.png \
emblem-sound.png \
+ emblem-documents.png \
+ emblem-multimedia.png \
+ emblem-package.png \
+ emblem-web.png \
emblem-OK.svg \
emblem-broken-link.png \
emblem-certified.svg \
diff --git a/icons/default/emblem-documents.png b/icons/default/emblem-documents.png
new file mode 100644
index 000000000..f05ed0f38
--- /dev/null
+++ b/icons/default/emblem-documents.png
Binary files differ
diff --git a/icons/default/emblem-multimedia.png b/icons/default/emblem-multimedia.png
new file mode 100644
index 000000000..2bf2946d3
--- /dev/null
+++ b/icons/default/emblem-multimedia.png
Binary files differ
diff --git a/icons/default/emblem-package.png b/icons/default/emblem-package.png
new file mode 100644
index 000000000..7c402084e
--- /dev/null
+++ b/icons/default/emblem-package.png
Binary files differ
diff --git a/icons/default/emblem-web.png b/icons/default/emblem-web.png
new file mode 100644
index 000000000..3b987fade
--- /dev/null
+++ b/icons/default/emblem-web.png
Binary files differ