summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAndy Hertzfeld <andy@src.gnome.org>2001-02-27 20:14:10 +0000
committerAndy Hertzfeld <andy@src.gnome.org>2001-02-27 20:14:10 +0000
commit47310e619939e8f0f10ad6f2ed3c8e78ab32188a (patch)
treed9a5570086504dcbaf56cc165d828744c66bc382 /data
parent5cdb065a014f895f29a70722c86563baf86bb777 (diff)
downloadnautilus-47310e619939e8f0f10ad6f2ed3c8e78ab32188a.tar.gz
fixed bug 7019, emblem names are not aligned vertically in show properties
fixed bug 7019, emblem names are not aligned vertically in show properties or the property browser. Fixed by adding a "fixed image height" attribute to nautilus-labeled-image, and set it in the properties window and properties browser. * libnautilus-extensions/nautilus-labeled-image.c: (nautilus_labeled_image_initialize), (is_fixed_height), (labeled_image_get_image_dimensions), (nautilus_labeled_image_get_image_bounds), (nautilus_labeled_image_get_show_image), (nautilus_labeled_image_set_fixed_image_height): added a fixed_image_height instance variable, and used it when appropriate * libnautilus-extensions/nautilus-labeled-image.h: added setter for the fixed image height attribute * src/file-manager/fm-properties-window.c: (create_emblems_page): set the fixed image height attribute on the emblems * src/nautilus-property-browser.c: (make_properties_from_directories), (property_browser_category_button_new): set the fixed image height attribute for the emblems and also the category buttons fixed bug 7022, users are confused by the "shared" and "secret" emblems; fixed by removing them. * data/browser.xml: removed secret and shared emblem references * data/emblems/Makefile.am: removed the emblem .pngs from the makefile * data/emblems/secret.png: * data/emblems/shared.png: removed the emblem .pngs * icons/Makefile.am: removed the emblem .svgs from the makefile * icons/emblem-secret.svg: * icons/emblem-shared.svg: removed the .svgs
Diffstat (limited to 'data')
-rw-r--r--data/browser.xml2
-rw-r--r--data/emblems/Makefile.am2
-rw-r--r--data/emblems/secret.pngbin1659 -> 0 bytes
-rw-r--r--data/emblems/shared.pngbin2353 -> 0 bytes
4 files changed, 0 insertions, 4 deletions
diff --git a/data/browser.xml b/data/browser.xml
index e57b1598d..4b8c165f4 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -78,9 +78,7 @@
<emblem _display_name="Oh No" filename="ohno"/>
<emblem _display_name="OK" filename="OK"/>
<emblem _display_name="Personal" filename="personal"/>
- <emblem _display_name="Secret" filename="secret"/>
<emblem _display_name="Special" filename="special"/>
- <emblem _display_name="Shared" filename="shared"/>
<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 a8b6101d7..f4cf42807 100644
--- a/data/emblems/Makefile.am
+++ b/data/emblems/Makefile.am
@@ -15,9 +15,7 @@ emblems_DATA = \
ohno.png \
OK.png \
personal.png \
- secret.png \
special.png \
- shared.png \
urgent.png \
$(NULL)
diff --git a/data/emblems/secret.png b/data/emblems/secret.png
deleted file mode 100644
index b25780673..000000000
--- a/data/emblems/secret.png
+++ /dev/null
Binary files differ
diff --git a/data/emblems/shared.png b/data/emblems/shared.png
deleted file mode 100644
index e94bdaa25..000000000
--- a/data/emblems/shared.png
+++ /dev/null
Binary files differ