removed intrinsic property emblem images from browser; added Susan's new

removed intrinsic property emblem images from browser; added
	Susan's new user level images, used new sidebar tab edge piece
	in the arlo theme, and made web search force local search off.
This commit is contained in:
Andy Hertzfeld 2000-07-11 20:11:46 +00:00
parent 36213cc911
commit 897e22a4a4
14 changed files with 36 additions and 16 deletions

View file

@ -1,3 +1,19 @@
2000-07-11 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-sidebar-tabs.c: (draw_or_hit_test_all_tabs):
made the Arlo tabs use a new right edge when appropriate
* icons/arlo/arlo.xml:
added rectangle for new tab edge piece
* src/nautilus-window-toolbars.c: (toolbar_search_web_callback):
made it disable local search mode before invoking web search
* data/emblems/Makefile.am:
removed emblems that represent intrinisc properties from browser
* icons/Makefile.am:
* icons/novice.png:
* icons/intermediate.png:
* icons/expert.png:
added Susan's user level images
2000-07-11 Robin * Slomkowski <rslomkow@eazel.com>
* components/hardware/Makefile.am: chaned to LDADD

View file

@ -3,16 +3,12 @@ NULL=
emblemsdir = $(datadir)/nautilus/emblems
emblems_DATA = \
certified.gif \
changed.gif \
confidential.gif \
draft.png \
encrypted.gif \
favorite.png \
important.gif \
new.gif \
personal.png \
remote.gif \
$(NULL)
EXTRA_DIST = $(emblems_DATA)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 969 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -28,6 +28,7 @@ icon_DATA =\
emblem-remote.gif \
emblem-symbolic-link.png \
emblems.png \
expert.png \
gnome-application-encapsulated_postscript.png \
gnome-application-pdf.png \
gnome-application-pgp.png \
@ -139,13 +140,16 @@ icon_DATA =\
i-stalled.png \
i-zipdisk.png \
i-zipdisk2.png \
intermediate.png \
knob.png \
leftarrow.png \
loading.png \
multi-ok.png \
nautilus-logo.png \
nautilus-mini-logo.png \
netscape.png \
not.png \
novice.png \
rightarrow.png \
search.png \
tableft.png \

View file

@ -2,7 +2,8 @@
<theme name="arlo">
<directory BACKGROUND_TILE_IMAGE="backgrounds/white_ribs.png"/>
<sidebar SIDEBAR_BACKGROUND_COLOR="rgb:6666/9999/9999-rgb:0000/3333/3333|90-rgb:0000/0000/0000:h" SIDEBAR_BACKGROUND_TILE_IMAGE="backgrounds/.striated.png" TAB_PIECE_IMAGE="sidebar_tab_pieces.png" COMBINE="TRUE"
PIECE_OFFSETS="1,1,20,4:1,13,20,13:1,47,20,61:1,123,20,139:1,5,20,8:1,14,20,14:1,62,20,76:1,140,20,156:1,9,20,12:1,15,24,15:1,93,24,107:1,157,20,173:1,194,20,194"
PIECE_OFFSETS="1,1,20,4:1,13,20,13:1,47,20,61:1,123,20,139:1,212,20,220:1,5,20,8:1,14,20,14:1,62,20,76:1,140,20,156:1,221,20,229:1,9,20,12:1,15,24,15:1,93,24,107:1,157,20,173:1,194,20,194"
LEFT_OFFSET="0" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" />
</theme>

BIN
icons/expert.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
icons/intermediate.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
icons/novice.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -43,16 +43,18 @@
#define TAB_NORMAL_FILL 1
#define TAB_NORMAL_NEXT 2
#define TAB_NORMAL_RIGHT 3
#define TAB_PRELIGHT_LEFT 4
#define TAB_PRELIGHT_FILL 5
#define TAB_PRELIGHT_NEXT 6
#define TAB_PRELIGHT_RIGHT 7
#define TAB_ACTIVE_LEFT 8
#define TAB_ACTIVE_FILL 9
#define TAB_ACTIVE_NEXT 10
#define TAB_ACTIVE_RIGHT 11
#define TAB_BACKGROUND 12
#define LAST_TAB_OFFSET 13
#define TAB_NORMAL_EDGE 4
#define TAB_PRELIGHT_LEFT 5
#define TAB_PRELIGHT_FILL 6
#define TAB_PRELIGHT_NEXT 7
#define TAB_PRELIGHT_RIGHT 8
#define TAB_PRELIGHT_EDGE 9
#define TAB_ACTIVE_LEFT 10
#define TAB_ACTIVE_FILL 11
#define TAB_ACTIVE_NEXT 12
#define TAB_ACTIVE_RIGHT 13
#define TAB_BACKGROUND 14
#define LAST_TAB_OFFSET 15
/* data structures */
@ -651,7 +653,7 @@ draw_or_hit_test_all_tabs (NautilusSidebarTabs *sidebar_tabs, gboolean draw_flag
if (is_themed && draw_flag) {
tab_select = TAB_NORMAL_NEXT;
if ((y_pos != last_y_pos) || (this_item == NULL) || !this_item->visible)
tab_select += 1;
tab_select = prev_item->prelit ? TAB_PRELIGHT_EDGE : TAB_NORMAL_EDGE;
if (!prev_item->visible)
tab_select = TAB_NORMAL_LEFT;

View file

@ -103,6 +103,7 @@ toolbar_search_local_callback (GtkWidget *widget, NautilusWindow *window)
static void
toolbar_search_web_callback (GtkWidget *widget, NautilusWindow *window)
{
toolbar_clear_search_mode (window);
nautilus_window_go_web_search (window);
}