summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2002-05-08 18:53:29 +0000
committerAlexander Larsson <alexl@src.gnome.org>2002-05-08 18:53:29 +0000
commit6b93b00894c9f4dd4f2b1d001940c83535ed228b (patch)
tree66a060e0891b1d4382fdfafb0369d16d58ddf8f0
parentce80b3f59ed4b3df83ab0c99b7e9311d85663257 (diff)
downloadnautilus-6b93b00894c9f4dd4f2b1d001940c83535ed228b.tar.gz
Add some new emblems from tigert's set.
2002-05-08 Alex Larsson <alexl@redhat.com> * data/browser.xml: * data/emblems/Makefile.am: * data/emblems/art.png: * data/emblems/camera.png: * data/emblems/mail.png: * data/emblems/pictures.png: * data/emblems/sound.png: * icons/default/Makefile.am: * icons/default/emblem-art.png: * icons/default/emblem-camera.png: * icons/default/emblem-mail.png: * icons/default/emblem-pictures.png: * icons/default/emblem-sound.png: Add some new emblems from tigert's set.
-rw-r--r--ChangeLog17
-rw-r--r--data/browser.xml5
-rw-r--r--data/emblems/Makefile.am5
-rw-r--r--data/emblems/art.pngbin0 -> 2795 bytes
-rw-r--r--data/emblems/camera.pngbin0 -> 2027 bytes
-rw-r--r--data/emblems/mail.pngbin0 -> 1788 bytes
-rw-r--r--data/emblems/pictures.pngbin0 -> 2807 bytes
-rw-r--r--data/emblems/sound.pngbin0 -> 2322 bytes
-rw-r--r--icons/default/Makefile.am5
-rw-r--r--icons/default/emblem-art.pngbin0 -> 2795 bytes
-rw-r--r--icons/default/emblem-camera.pngbin0 -> 2027 bytes
-rw-r--r--icons/default/emblem-mail.pngbin0 -> 1788 bytes
-rw-r--r--icons/default/emblem-pictures.pngbin0 -> 2807 bytes
-rw-r--r--icons/default/emblem-sound.pngbin0 -> 2322 bytes
14 files changed, 32 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 47cb524c1..db68d2280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2002-05-08 Alex Larsson <alexl@redhat.com>
+ * data/browser.xml:
+ * data/emblems/Makefile.am:
+ * data/emblems/art.png:
+ * data/emblems/camera.png:
+ * data/emblems/mail.png:
+ * data/emblems/pictures.png:
+ * data/emblems/sound.png:
+ * icons/default/Makefile.am:
+ * icons/default/emblem-art.png:
+ * icons/default/emblem-camera.png:
+ * icons/default/emblem-mail.png:
+ * icons/default/emblem-pictures.png:
+ * icons/default/emblem-sound.png:
+ Add some new emblems from tigert's set.
+
+2002-05-08 Alex Larsson <alexl@redhat.com>
+
* src/file-manager/nautilus-directory-view-ui.xml:
* src/nautilus-shell-ui.xml:
Use gtk-new icon for new document.
diff --git a/data/browser.xml b/data/browser.xml
index fbd9c6923..78e2e75c3 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -68,17 +68,22 @@
</category>
<category name="emblems" _display_name="Emblems" image="emblems.png" columns="6" mode="directory" path="nautilus/emblems" type="property/keyword" _description="Drag an emblem to an object to add it to the object">
+ <emblem _display_name="Art" filename="art"/>
+ <emblem _display_name="Camera" filename="camera"/>
<emblem _display_name="Certified" filename="certified"/>
<emblem _display_name="Cool" filename="cool"/>
<emblem _display_name="Distinguished" filename="distinguished"/>
<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="New" filename="new"/>
<emblem _display_name="Oh No" filename="ohno"/>
<emblem _display_name="OK" filename="OK"/>
<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="Erase" filename="erase"/>
diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am
index f4cf42807..7974ce079 100644
--- a/data/emblems/Makefile.am
+++ b/data/emblems/Makefile.am
@@ -3,6 +3,8 @@ NULL=
emblemsdir = $(datadir)/nautilus/emblems
emblems_DATA = \
+ art.png \
+ camera.png \
certified.png \
cool.png \
danger.png \
@@ -11,11 +13,14 @@ emblems_DATA = \
erase.png \
favorite.png \
important.png \
+ mail.png \
new.png \
ohno.png \
OK.png \
personal.png \
+ pictures.png \
special.png \
+ sound.png \
urgent.png \
$(NULL)
diff --git a/data/emblems/art.png b/data/emblems/art.png
new file mode 100644
index 000000000..752b54f81
--- /dev/null
+++ b/data/emblems/art.png
Binary files differ
diff --git a/data/emblems/camera.png b/data/emblems/camera.png
new file mode 100644
index 000000000..f94ce75a0
--- /dev/null
+++ b/data/emblems/camera.png
Binary files differ
diff --git a/data/emblems/mail.png b/data/emblems/mail.png
new file mode 100644
index 000000000..6f6718e29
--- /dev/null
+++ b/data/emblems/mail.png
Binary files differ
diff --git a/data/emblems/pictures.png b/data/emblems/pictures.png
new file mode 100644
index 000000000..fd47892b1
--- /dev/null
+++ b/data/emblems/pictures.png
Binary files differ
diff --git a/data/emblems/sound.png b/data/emblems/sound.png
new file mode 100644
index 000000000..2a2cbd385
--- /dev/null
+++ b/data/emblems/sound.png
Binary files differ
diff --git a/icons/default/Makefile.am b/icons/default/Makefile.am
index 3eda91ed8..2581e6e7e 100644
--- a/icons/default/Makefile.am
+++ b/icons/default/Makefile.am
@@ -7,6 +7,11 @@ icon_DATA =\
decrement.png \
default.xml \
desktop-home.png \
+ emblem-art.png \
+ emblem-camera.png \
+ emblem-mail.png \
+ emblem-pictures.png \
+ emblem-sound.png \
emblem-OK.svg \
emblem-broken-link.png \
emblem-certified.svg \
diff --git a/icons/default/emblem-art.png b/icons/default/emblem-art.png
new file mode 100644
index 000000000..752b54f81
--- /dev/null
+++ b/icons/default/emblem-art.png
Binary files differ
diff --git a/icons/default/emblem-camera.png b/icons/default/emblem-camera.png
new file mode 100644
index 000000000..f94ce75a0
--- /dev/null
+++ b/icons/default/emblem-camera.png
Binary files differ
diff --git a/icons/default/emblem-mail.png b/icons/default/emblem-mail.png
new file mode 100644
index 000000000..6f6718e29
--- /dev/null
+++ b/icons/default/emblem-mail.png
Binary files differ
diff --git a/icons/default/emblem-pictures.png b/icons/default/emblem-pictures.png
new file mode 100644
index 000000000..fd47892b1
--- /dev/null
+++ b/icons/default/emblem-pictures.png
Binary files differ
diff --git a/icons/default/emblem-sound.png b/icons/default/emblem-sound.png
new file mode 100644
index 000000000..2a2cbd385
--- /dev/null
+++ b/icons/default/emblem-sound.png
Binary files differ