diff options
author | Darin Adler <darin@src.gnome.org> | 2001-02-27 18:47:19 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2001-02-27 18:47:19 +0000 |
commit | 2f9d6bc25f77e3457b1d280e35f2f6c605ee8cdb (patch) | |
tree | ef47826a265334b265656ab7717540a91fd4c1ee /eazel-logos | |
parent | 5fb838913a88f1d88f43617beb350ed54e5ef61f (diff) | |
download | nautilus-2f9d6bc25f77e3457b1d280e35f2f6c605ee8cdb.tar.gz |
reviewed by: John Sullivan <sullivan@eazel.com>
Fixed bug 6725 (Crash on Refresh if viewed file/folder is deleted
outside of Nautilus):
* src/nautilus-window-manage-views.c: (free_location_change):
Reorder so we cancel the callbacks before more I/O has the chance
to happen.
* libnautilus-extensions/nautilus-directory-async.c:
(nautilus_directory_async_state_changed): Don't do any I/O for a
NautilusDirectory object once it's destroyed. Unfortunately, it's
still possible for destroying one NautilusDirectory object to
cause I/O to happen on another, so this doesn't fix the bug (which
is why we also need the change above).
Fixed bug 7080 (Nautilus build failure on Red Hat 7.)
* libnautilus-extensions/nautilus-medusa-support.c: Fixed the bad
#endif with non-comment text after it.
Worked on bug 6928 (create fallback mechanism so eazel-logos
version of each graphic is found if present). We still need a
separate fallback mechanism for the theme XML file, since the
throbber has a different number of frames.
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_get_pixmap_directory): Simplify.
(nautilus_pixmap_file): Look in eazel-logos directory first, so we
will pick up logo graphics if there, and non-logo graphics otherwise.
* test/test-nautilus-image-simple.c: (main): Remove a reference to
a logo graphic.
* eazel-logos/.cvsignore:
* eazel-logos/About_Image.png:
* eazel-logos/about_background.png:
* eazel-logos/druid_header.png:
* eazel-logos/eazel-logo-right-side-logo.png:
* eazel-logos/throbber/.cvsignore:
* eazel-logos/throbber/001.png:
* eazel-logos/throbber/002.png:
* eazel-logos/throbber/003.png:
* eazel-logos/throbber/004.png:
* eazel-logos/throbber/005.png:
* eazel-logos/throbber/006.png:
* eazel-logos/throbber/007.png:
* eazel-logos/throbber/008.png:
* eazel-logos/throbber/009.png:
* eazel-logos/throbber/010.png:
* eazel-logos/throbber/011.png:
* eazel-logos/throbber/012.png:
* eazel-logos/throbber/013.png:
* eazel-logos/throbber/014.png:
* eazel-logos/throbber/015.png:
* eazel-logos/throbber/rest.png:
* eazel-logos/default.xml:
Added a new directory with copies of all graphics with the Eazel
logo in them. Next we have to make this directory actually build
and install these logos. Then Non-Eazel-logo'd graphics suitable
for GPL will replace the original copies and these will keep the
Eazel logo versions. The directory also contains the XML file for
the default theme, since we need to change the throbber frames for
the logo vs. non-logo version of the throbber.
* components/services/nautilus-dependent-shared/icons/Makefile.am:
* components/services/nautilus-dependent-shared/icons/eazel-cloud-logo.png:
* components/services/nautilus-dependent-shared/icons/eazel-services-logo.png:
* components/services/nautilus-dependent-shared/icons/service-summary-logo-top.png:
* components/services/nautilus-dependent-shared/icons/startup-logo.png:
* icons/Makefile.am:
* icons/eazel-logo.gif:
* icons/nautilus-logo.png:
Removed unused graphics with the Eazel logo in them. There are a
lot more unused graphics and someone should go through and remove
them. I'm thinking of writing a script to do it.
Other changes.
* components/services/install/nautilus-view/.cvsignore:
* components/services/vault/.cvsignore:
* components/services/vault/command-line/.cvsignore:
* data/top/.cvsignore:
Re-removed .cvsignore files for empty directories.
* THANKS: Corrected one email address.
* check-THANKS.pl: Updated for the latest ChangeLog typos.
Diffstat (limited to 'eazel-logos')
23 files changed, 34 insertions, 0 deletions
diff --git a/eazel-logos/.cvsignore b/eazel-logos/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/eazel-logos/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/eazel-logos/About_Image.png b/eazel-logos/About_Image.png Binary files differnew file mode 100644 index 000000000..eb3a9ff9e --- /dev/null +++ b/eazel-logos/About_Image.png diff --git a/eazel-logos/about_background.png b/eazel-logos/about_background.png Binary files differnew file mode 100644 index 000000000..a96d69598 --- /dev/null +++ b/eazel-logos/about_background.png diff --git a/eazel-logos/default.xml b/eazel-logos/default.xml new file mode 100644 index 000000000..f424f46ab --- /dev/null +++ b/eazel-logos/default.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> + +<theme _name="Default" _description="This is the default theme for Nautilus."> + + <sidebar sidebar_background_tile_image="./side_bar_image.png" + sidebar_background_color="rgb:4747/4A4A/7C7C-rgb:2222/2323/3A3A:h" + title_color="rgb:FFFF/FFFF/FFFF" + title_info_color="rgb:FFFF/FFFF/FFFF" + title_shadow_color="rgb:0000/0000/0000" + tab_piece_images="sidebar_tab_pieces" combine="true" + left_offset="0" shadow_offset="1" text_h_offset="-4" label_color="rgb:FFFF/FFFF/FFFF" + tab_font="-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*" /> + + <desktop background_tile_image="patterns/brushed_metal.png" background_color="rgb:FFFF/FFFF/FFFF"/> + + <directory background_color="rgb:CFFF/D333/D999" + selection_box_color_rgba="0x727D974C" + selection_box_color="rgb:7222/7DDD/9777" /> + + <icon highlight_background_color="rgb:0000/0000/0000" + highlight_text_color="rgb:FFFF/FFFF/FFFF" + text_fill_color="rgb:FFFF/FFFF/FFFF"/> + + <thumbnails frame_offsets="3,3,6,6"/> + + <throbber frame_count="15" url="http://www.eazel.com" delay="75"/> + + <zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/> + +</theme> diff --git a/eazel-logos/druid_header.png b/eazel-logos/druid_header.png Binary files differnew file mode 100644 index 000000000..e34a2f14a --- /dev/null +++ b/eazel-logos/druid_header.png diff --git a/eazel-logos/eazel-logo-right-side-logo.png b/eazel-logos/eazel-logo-right-side-logo.png Binary files differnew file mode 100644 index 000000000..ff76d7d2f --- /dev/null +++ b/eazel-logos/eazel-logo-right-side-logo.png diff --git a/eazel-logos/throbber/.cvsignore b/eazel-logos/throbber/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/eazel-logos/throbber/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/eazel-logos/throbber/001.png b/eazel-logos/throbber/001.png Binary files differnew file mode 100644 index 000000000..187bcd7c4 --- /dev/null +++ b/eazel-logos/throbber/001.png diff --git a/eazel-logos/throbber/002.png b/eazel-logos/throbber/002.png Binary files differnew file mode 100644 index 000000000..8acae28b4 --- /dev/null +++ b/eazel-logos/throbber/002.png diff --git a/eazel-logos/throbber/003.png b/eazel-logos/throbber/003.png Binary files differnew file mode 100644 index 000000000..00342738e --- /dev/null +++ b/eazel-logos/throbber/003.png diff --git a/eazel-logos/throbber/004.png b/eazel-logos/throbber/004.png Binary files differnew file mode 100644 index 000000000..49a9271ba --- /dev/null +++ b/eazel-logos/throbber/004.png diff --git a/eazel-logos/throbber/005.png b/eazel-logos/throbber/005.png Binary files differnew file mode 100644 index 000000000..a6c518661 --- /dev/null +++ b/eazel-logos/throbber/005.png diff --git a/eazel-logos/throbber/006.png b/eazel-logos/throbber/006.png Binary files differnew file mode 100644 index 000000000..b45bfcd76 --- /dev/null +++ b/eazel-logos/throbber/006.png diff --git a/eazel-logos/throbber/007.png b/eazel-logos/throbber/007.png Binary files differnew file mode 100644 index 000000000..58004a43a --- /dev/null +++ b/eazel-logos/throbber/007.png diff --git a/eazel-logos/throbber/008.png b/eazel-logos/throbber/008.png Binary files differnew file mode 100644 index 000000000..1702ced20 --- /dev/null +++ b/eazel-logos/throbber/008.png diff --git a/eazel-logos/throbber/009.png b/eazel-logos/throbber/009.png Binary files differnew file mode 100644 index 000000000..a2830eaad --- /dev/null +++ b/eazel-logos/throbber/009.png diff --git a/eazel-logos/throbber/010.png b/eazel-logos/throbber/010.png Binary files differnew file mode 100644 index 000000000..483d3c6ac --- /dev/null +++ b/eazel-logos/throbber/010.png diff --git a/eazel-logos/throbber/011.png b/eazel-logos/throbber/011.png Binary files differnew file mode 100644 index 000000000..00fe8457e --- /dev/null +++ b/eazel-logos/throbber/011.png diff --git a/eazel-logos/throbber/012.png b/eazel-logos/throbber/012.png Binary files differnew file mode 100644 index 000000000..2daaa4680 --- /dev/null +++ b/eazel-logos/throbber/012.png diff --git a/eazel-logos/throbber/013.png b/eazel-logos/throbber/013.png Binary files differnew file mode 100644 index 000000000..cf9745eb3 --- /dev/null +++ b/eazel-logos/throbber/013.png diff --git a/eazel-logos/throbber/014.png b/eazel-logos/throbber/014.png Binary files differnew file mode 100644 index 000000000..54954fa52 --- /dev/null +++ b/eazel-logos/throbber/014.png diff --git a/eazel-logos/throbber/015.png b/eazel-logos/throbber/015.png Binary files differnew file mode 100644 index 000000000..e5aabdadc --- /dev/null +++ b/eazel-logos/throbber/015.png diff --git a/eazel-logos/throbber/rest.png b/eazel-logos/throbber/rest.png Binary files differnew file mode 100644 index 000000000..785bf3f4a --- /dev/null +++ b/eazel-logos/throbber/rest.png |