diff options
| -rw-r--r-- | ChangeLog-20000414 | 12 | ||||
| -rw-r--r-- | components/services/startup/nautilus-service-startup-view.c | 6 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-icon-canvas-item.c | 4 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 4 | ||||
| -rw-r--r-- | libnautilus/nautilus-icon-canvas-item.c | 4 |
5 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index 6710d2bd9..ac21ee8e5 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,3 +1,15 @@ +2000-04-07 Andy Hertzfeld <andy@eazel.com> + + * components/services/startup/nautilus-service-startup-view.c: + switched over to using Jonathan's prototype service, which is only + accessible from eazel's intranet for now. Registration now works with + the service. + * libnautilus/nautilus-icon-canvas-item.c: + first, simple version of drag/swallow highliting - it just darkens the + icon and emboldens the text, exactly like selection highlighting. + Pavel's going to set the flag during dragging soon, so this will help + him see what he's doing. Soon, we'll have a more elaborate approach. + 2000-04-06 Andy Hertzfeld <andy@eazel.com> * components/services/startup/nautilus-service-startup-view.c: diff --git a/components/services/startup/nautilus-service-startup-view.c b/components/services/startup/nautilus-service-startup-view.c index e46af3652..fb357a6b9 100644 --- a/components/services/startup/nautilus-service-startup-view.c +++ b/components/services/startup/nautilus-service-startup-view.c @@ -56,7 +56,7 @@ struct _NautilusServicesContentViewDetails { #define SERVICE_VIEW_DEFAULT_BACKGROUND_COLOR "rgb:BBBB/DDDD/FFFF" /* FIXME: the service domain name should be settable and kept with the other preferences. */ -#define SERVICE_DOMAIN_NAME "hippie.eazel.com" +#define SERVICE_DOMAIN_NAME "eazel24.eazel.com" static void nautilus_service_startup_view_initialize_class (NautilusServicesContentViewClass *klass); static void nautilus_service_startup_view_initialize (NautilusServicesContentView *view); @@ -277,13 +277,13 @@ register_button_cb (GtkWidget *button, NautilusServicesContentView *view) /* FIXME: need to url-encode the arguments here */ body = g_strdup_printf("email=%s&pwd=%s", email, password); - uri = g_strdup_printf("http://%s/new.pl", SERVICE_DOMAIN_NAME); + uri = g_strdup_printf("http://%s/member/new.pl", SERVICE_DOMAIN_NAME); request = make_http_post_request(uri, body); response_str = ghttp_get_body(request); /* handle the error response */ - if (strstr(response_str, "<ERROR field=") == response_str) { + if (response_str && (strstr(response_str, "<ERROR field=") == response_str)) { if (strstr(response_str, "email")) { if (strstr(response_str, "taken")) show_feedback(view, "That email address is already registered! Please change it and try again."); diff --git a/libnautilus-extensions/nautilus-icon-canvas-item.c b/libnautilus-extensions/nautilus-icon-canvas-item.c index 607392d2d..a8446fa46 100644 --- a/libnautilus-extensions/nautilus-icon-canvas-item.c +++ b/libnautilus-extensions/nautilus-icon-canvas-item.c @@ -598,7 +598,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, text_left, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); /* if it's selected, embolden the text by drawing again offset by one pixel */ - if (details->is_highlighted_for_selection) + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) gnome_icon_paint_text (icon_text_info, drawable, gc, text_left + 1, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); @@ -948,7 +948,7 @@ nautilus_icon_canvas_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, temp_pixbuf = nautilus_create_spotlight_pixbuf (details->pixbuf); } - if (details->is_highlighted_for_selection) { + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) { old_pixbuf = temp_pixbuf; temp_pixbuf = nautilus_create_darkened_pixbuf (temp_pixbuf, 0.8 * 255, diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 607392d2d..a8446fa46 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -598,7 +598,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, text_left, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); /* if it's selected, embolden the text by drawing again offset by one pixel */ - if (details->is_highlighted_for_selection) + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) gnome_icon_paint_text (icon_text_info, drawable, gc, text_left + 1, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); @@ -948,7 +948,7 @@ nautilus_icon_canvas_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, temp_pixbuf = nautilus_create_spotlight_pixbuf (details->pixbuf); } - if (details->is_highlighted_for_selection) { + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) { old_pixbuf = temp_pixbuf; temp_pixbuf = nautilus_create_darkened_pixbuf (temp_pixbuf, 0.8 * 255, diff --git a/libnautilus/nautilus-icon-canvas-item.c b/libnautilus/nautilus-icon-canvas-item.c index 607392d2d..a8446fa46 100644 --- a/libnautilus/nautilus-icon-canvas-item.c +++ b/libnautilus/nautilus-icon-canvas-item.c @@ -598,7 +598,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, text_left, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); /* if it's selected, embolden the text by drawing again offset by one pixel */ - if (details->is_highlighted_for_selection) + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) gnome_icon_paint_text (icon_text_info, drawable, gc, text_left + 1, icon_bottom + height_so_far, GTK_JUSTIFY_CENTER); @@ -948,7 +948,7 @@ nautilus_icon_canvas_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, temp_pixbuf = nautilus_create_spotlight_pixbuf (details->pixbuf); } - if (details->is_highlighted_for_selection) { + if (details->is_highlighted_for_selection || details->is_highlighted_for_drop) { old_pixbuf = temp_pixbuf; temp_pixbuf = nautilus_create_darkened_pixbuf (temp_pixbuf, 0.8 * 255, |