@@ -1,3 +1,41 @@ +2001-12-13 Darin Adler <darin@bentspoon.com> + + * components/Makefile.am: + * components/help/*: + * nautilus.spec.in: + Deleted help component as it is not slated to be part of Gnome 2. + + * RENAMING: No need to rename hyperbola if it's gone. + + * configure.in: Removed ScrollKeeper check. Took a cut at making + the medusa check use pkg-config, it's probably messed up but at + least we won't define HAVE_MEDUSA if we see the Gnome 1 medusa. + + * libnautilus-private/nautilus-icon-canvas-item.c: + (nautilus_icon_canvas_item_init), + (nautilus_icon_canvas_item_finalize), + (nautilus_icon_canvas_item_set_arg), + (nautilus_icon_canvas_item_get_arg), + (draw_or_measure_label_text_aa), (draw_label_text_aa), + (nautilus_icon_canvas_item_class_init): + Quick cut at porting to Pango from Eel font code. It's all under + ifdef USE_EEL_TEXT because it's not working well yet. At the moment + the text looks bad, and it's very slow, and it's not centered. + + * libnautilus-private/nautilus-icon-factory.c: (embed_text): + Baby steps at doing the port to Pango here too. + + * src/file-manager/fm-directory-view.c: (real_update_menus): + Add a check for NULL that seems required. This change was + suggested by the backtrace in bug 66809, but it's not clear + if this really fixes anything. (Rolled from stable branch.) + + * src/file-manager/fm-icon-view.c: (icon_view_handle_uri_list): + Fix code that passed a path instead of a URI when creating a + desktop file. (Rolled from stable branch.) + + * TODO: Minor updates. + 2001-12-12 Michael Meeks <michael@ximian.com> * src/file-manager/fm-icon-view.c @@ -1144,6 +1182,8 @@ Tue Nov 20 21:45:43 2001 Owen Taylor <otaylor@redhat.com> (nautilus_link_desktop_file_get_link_name_from_desktop): Use the localized string +=== Gnome 1 Nautilus development continues on nautilus-gnome-1 stable branch === + === nautilus 1.0.5 === 2001-10-19 Darin Adler <darin@bentspoon.com> ChangeLog @@ -28,7 +28,6 @@ file names ---------- *-ui.xml -> *.ui src/file-manager/fm-* -> ? -hyperbola -> nautilus-help-system nautilus-authn-manager.c -> nautilus-authentication-manager.c ---------------------------- RENAMING @@ -2,7 +2,6 @@ For tasks outside the porting effort, we track them as bugs in http://bugzilla.gnome.org. - Make closing a window work (Bonobo fix needed). -- Get embedded controls working (back and forward buttons and throbber). - Get list view working. - Visit all the destroy and move things into finalize or dispose and make them callable twice as appropriate. @@ -12,5 +11,5 @@ http://bugzilla.gnome.org. dialog comes up. - Get EelLabel working and switch back to it on the sidebar. -- Get rid of all the direct freetype use and switch to using +- Get rid of the direct freetype use and switch to using Pango instead. TODO @@ -1,7 +1,6 @@ NULL= SUBDIRS = \ - help \ history \ image-viewer \ news \ components/Makefile.am @@ -25,7 +25,6 @@ MEDUSA_REQUIRED=0.5.1 ORBIT_REQUIRED=2.3.97 POPT_REQUIRED=1.5 RSVG_REQUIRED=1.1 -SCROLLKEEPER_REQUIRED=0.1.4 XML_REQUIRED=2.4.6 AC_SUBST(EEL_REQUIRED) @@ -36,7 +35,6 @@ AC_SUBST(MEDUSA_REQUIRED) AC_SUBST(ORBIT_REQUIRED) AC_SUBST(POPT_REQUIRED) AC_SUBST(RSVG_REQUIRED) -AC_SUBST(SCROLLKEEPER_REQUIRED) AC_SUBST(XML_REQUIRED) dnl =========================================================================== @@ -183,15 +181,6 @@ AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [ dnl ========================================================================== -dnl scrollkeeper - -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga) -fi - -dnl ========================================================================== - dnl jw (for doc build) AC_PATH_PROG(JW,jw,no) @@ -205,25 +194,13 @@ AC_SUBST(HAVE_JW) dnl ========================================================================== -AC_MSG_CHECKING(for Medusa) +dnl medusa checking (this is the Gnome 1 version -- change to pkg-config) -case "`medusa-config --libs 2>/dev/null | cut -d ' ' -f1`" in -'') - MEDUSA_CFLAGS="" - MEDUSA_LIBS="" - AC_MSG_RESULT(no) -;; - -*) - MEDUSA_CFLAGS=`medusa-config --cflags` - MEDUSA_LIBS=`medusa-config --libs` - AC_DEFINE(HAVE_MEDUSA) - AC_MSG_RESULT(yes) -;; -esac +AC_MSG_CHECKING(for Medusa) -AC_SUBST(MEDUSA_CFLAGS) -AC_SUBST(MEDUSA_LIBS) +PKG_CHECK_MODULES(MEDUSA, medusa-2.0 >= $MEDUSA_REQUIRED, have_medusa=yes, have_medusa=no) +AM_CONDITIONAL(HAVE_MEDUSA, test x$have_medusa = xyes) +AC_SUBST(HAVE_MEDUSA) dnl ========================================================================== @@ -362,7 +339,6 @@ components/Makefile components/adapter/Makefile components/hardware/Makefile components/hardware/icons/Makefile -components/help/Makefile components/history/Makefile components/image-viewer/Makefile components/loser/Makefile configure.in @@ -25,37 +25,39 @@ #include <config.h> #include "nautilus-icon-canvas-item.h" -#include <math.h> -#include <string.h> -#include <stdio.h> -#include <gtk/gtksignal.h> -#include <gdk-pixbuf/gdk-pixbuf.h> -#include <libgnome/gnome-i18n.h> -#include <libgnomecanvas/gnome-canvas-util.h> -#include <libart_lgpl/art_rgb.h> -#include <libart_lgpl/art_rgb_affine.h> -#include <libart_lgpl/art_rgb_rgba_affine.h> -#include <libart_lgpl/art_svp_vpath.h> +#include "nautilus-file-utilities.h" +#include "nautilus-global-preferences.h" +#include "nautilus-icon-factory.h" #include "nautilus-icon-private.h" -#include <eel/eel-string.h> +#include "nautilus-theme.h" #include <eel/eel-art-extensions.h> -#include <eel/eel-glib-extensions.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-font-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> -#include "nautilus-global-preferences.h" -#include <eel/eel-gtk-macros.h> +#include <eel/eel-glib-extensions.h> #include <eel/eel-gnome-extensions.h> #include <eel/eel-graphic-effects.h> -#include "nautilus-file-utilities.h" -#include "nautilus-icon-factory.h" -#include "nautilus-theme.h" -#include <eel/eel-smooth-text-layout.h> +#include <eel/eel-gtk-macros.h> +#include <eel/eel-string.h> +#include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtksignal.h> +#include <libart_lgpl/art_rgb.h> +#include <libart_lgpl/art_rgb_affine.h> +#include <libart_lgpl/art_rgb_rgba_affine.h> +#include <libart_lgpl/art_svp_vpath.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomecanvas/gnome-canvas-util.h> +#include <math.h> +#include <stdio.h> +#include <string.h> + +#define USE_EEL_TEXT + +#ifdef USE_EEL_TEXT #include <eel/eel-smooth-text-layout-cache.h> +#include <eel/eel-smooth-text-layout.h> +#endif -/* Comment this out if the new smooth fonts code give you problems - * This isnt meant to be permanent. Its just a precaution. - */ #define EMBLEM_SPACING 2 /* gap between bottom of icon and start of text box */ @@ -101,9 +103,11 @@ struct NautilusIconCanvasItemDetails { gboolean is_renaming; +#ifdef USE_EEL_TEXT /* Font stuff whilst in smooth mode */ int smooth_font_size; EelScalableFont *smooth_font; +#endif /* Cached rectangle in canvas coordinates */ ArtIRect canvas_rect; @@ -121,8 +125,10 @@ enum { ARG_HIGHLIGHTED_AS_KEYBOARD_FOCUS, ARG_HIGHLIGHTED_FOR_DROP, ARG_MODIFIER, +#ifdef USE_EEL_TEXT ARG_SMOOTH_FONT_SIZE, ARG_SMOOTH_FONT +#endif }; typedef enum { @@ -192,6 +198,8 @@ EEL_CLASS_BOILERPLATE (NautilusIconCanvasItem, nautilus_icon_canvas_item, GNOME_TYPE_CANVAS_ITEM) +#ifdef USE_EEL_TEXT + static EelSmoothTextLayoutCache *layout_cache; static void @@ -200,6 +208,8 @@ free_layout_cache (void) g_object_unref (layout_cache); } +#endif + /* Object initialization function for the icon item. */ static void nautilus_icon_canvas_item_init (NautilusIconCanvasItem *icon_item) @@ -215,9 +225,11 @@ nautilus_icon_canvas_item_init (NautilusIconCanvasItem *icon_item) /* invalidate cached text dimensions initially */ nautilus_icon_canvas_item_invalidate_label_size (icon_item); +#ifdef USE_EEL_TEXT /* set up the default font and size */ icon_item->details->smooth_font_size = 12; icon_item->details->smooth_font = eel_scalable_font_get_default_font (); +#endif } static void @@ -241,7 +253,9 @@ nautilus_icon_canvas_item_finalize (GObject *object) gdk_font_unref (details->font); } +#ifdef USE_EEL_TEXT g_object_unref (details->smooth_font); +#endif if (details->rendered_pixbuf != NULL) { g_object_unref (details->rendered_pixbuf); @@ -348,6 +362,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) details->is_highlighted_for_drop = GTK_VALUE_BOOL (*arg); break; +#ifdef USE_EEL_TEXT case ARG_SMOOTH_FONT: nautilus_icon_canvas_item_set_smooth_font (NAUTILUS_ICON_CANVAS_ITEM (object), EEL_SCALABLE_FONT (GTK_VALUE_OBJECT (*arg))); @@ -358,6 +373,7 @@ nautilus_icon_canvas_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) nautilus_icon_canvas_item_set_smooth_font_size (NAUTILUS_ICON_CANVAS_ITEM (object), GTK_VALUE_INT (*arg)); break; +#endif default: g_warning ("nautilus_icons_view_item_item_set_arg on unknown argument"); @@ -401,6 +417,7 @@ nautilus_icon_canvas_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) GTK_VALUE_BOOL (*arg) = details->is_highlighted_for_drop; break; +#ifdef USE_EEL_TEXT case ARG_SMOOTH_FONT: g_object_ref (details->smooth_font); GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (details->smooth_font); @@ -409,6 +426,7 @@ nautilus_icon_canvas_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_SMOOTH_FONT_SIZE: GTK_VALUE_INT (*arg) = details->smooth_font_size; break; +#endif default: arg->type = G_TYPE_INVALID; @@ -1313,13 +1331,21 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, int icon_bottom) { NautilusIconCanvasItemDetails *details; - guint width_so_far, height_so_far; + int width_so_far, height_so_far; guint32 label_name_color; guint32 label_info_color; GnomeCanvasItem *canvas_item; int max_text_width; int icon_width, text_left, box_left; +#ifdef USE_EEL_TEXT EelSmoothTextLayout *smooth_text_layout; +#else + PangoContext *context; + PangoLayout *layout; + int layout_width, layout_height; + PangoAttrList *attr_list; + PangoAttribute *attr; +#endif char **pieces; const char *text_piece; int i; @@ -1411,6 +1437,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, text_piece = " "; } +#ifdef USE_EEL_TEXT smooth_text_layout = eel_smooth_text_layout_cache_render (layout_cache, text_piece, strlen (text_piece), @@ -1418,16 +1445,45 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, details->smooth_font_size, TRUE, LABEL_LINE_SPACING, max_text_width); - +#else + context = eel_gnome_canvas_get_pango_context (canvas_item->canvas); + + layout = pango_layout_new (context); + pango_layout_set_text (layout, text_piece, -1); + pango_layout_set_width (layout, max_text_width * PANGO_SCALE); +#if GNOME2_CONVERSION_COMPLETE + pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); +#endif + pango_layout_set_spacing (layout, LABEL_LINE_SPACING); + + pango_layout_get_pixel_size (layout, &layout_width, &layout_height); +#endif + /* Draw text if we are not in user rename mode */ if (destination_pixbuf != NULL && !details->is_renaming) { - gboolean underlined; ArtIRect destination_area; +#ifdef USE_EEL_TEXT + gboolean underlined; + text_left = icon_left + (icon_width - eel_smooth_text_layout_get_width (smooth_text_layout)) / 2; /* if it's prelit, and we're in click-to-activate mode, underline the text */ - underlined = (details->is_prelit && in_single_click_mode ()); + underlined = details->is_prelit && in_single_click_mode (); +#else + text_left = icon_left + (icon_width - layout_width) / 2; + + /* if it's prelit, and we're in click-to-activate mode, underline the text */ + if (details->is_prelit && in_single_click_mode ()) { + attr_list = pango_attr_list_new (); + attr = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE); + attr->start_index = 0; + attr->end_index = strlen (text_piece); + pango_attr_list_insert (attr_list, attr); + pango_layout_set_attributes (layout, attr_list); + pango_attr_list_unref (attr_list); + } +#endif /* draw the shadow in black */ if (needs_highlight) { @@ -1436,6 +1492,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, destination_area.x0 = text_left + 2; destination_area.y0 = icon_bottom + height_so_far + 1; +#ifdef USE_EEL_TEXT destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout); destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout); eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout, @@ -1447,10 +1504,20 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, underlined, EEL_RGB_COLOR_BLACK, 0xff); +#else + destination_area.x1 = destination_area.x0 + layout_width; + destination_area.y1 = destination_area.y0 + layout_height; + eel_draw_layout_to_pixbuf (layout, + destination_pixbuf, + 0, 0, + destination_area, + EEL_RGB_COLOR_BLACK); +#endif } destination_area.x0 = text_left; destination_area.y0 = icon_bottom + height_so_far; +#ifdef USE_EEL_TEXT destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout); destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout); eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout, @@ -1462,11 +1529,21 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, underlined, label_color, 0xff); +#else + destination_area.x1 = destination_area.x0 + layout_width; + destination_area.y1 = destination_area.y0 + layout_height; + eel_draw_layout_to_pixbuf (layout, + destination_pixbuf, + 0, 0, + destination_area, + label_color); +#endif /* if it's highlighted, embolden by drawing twice */ if (needs_highlight) { destination_area.x0 = text_left + 1; destination_area.y0 = icon_bottom + height_so_far; +#ifdef USE_EEL_TEXT destination_area.x1 = destination_area.x0 + eel_smooth_text_layout_get_width (smooth_text_layout); destination_area.y1 = destination_area.y0 + eel_smooth_text_layout_get_height (smooth_text_layout); eel_smooth_text_layout_draw_to_pixbuf (smooth_text_layout, @@ -1478,14 +1555,30 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, underlined, label_color, 0xff); +#else + destination_area.x1 = destination_area.x0 + layout_width; + destination_area.y1 = destination_area.y0 + layout_height; + eel_draw_layout_to_pixbuf (layout, + destination_pixbuf, + 0, 0, + destination_area, + label_color); +#endif } } - width_so_far = MAX (width_so_far, (guint) eel_smooth_text_layout_get_width (smooth_text_layout)); +#ifdef USE_EEL_TEXT + width_so_far = MAX (width_so_far, eel_smooth_text_layout_get_width (smooth_text_layout)); height_so_far += eel_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING; g_object_unref (smooth_text_layout); +#else + width_so_far = MAX (width_so_far, layout_width); + height_so_far += layout_height + LABEL_LINE_SPACING; + + g_object_unref (layout); +#endif } g_strfreev (pieces); @@ -1500,8 +1593,8 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item, * differently and change these asserts. */ #if (defined PERFORMANCE_TEST_MEASURE_DISABLE || defined PERFORMANCE_TEST_DRAW_DISABLE) - g_assert ((int) height_so_far == details->text_height); - g_assert ((int) width_so_far == details->text_width); + g_assert (height_so_far == details->text_height); + g_assert (width_so_far == details->text_width); #endif box_left = icon_left + (icon_width - width_so_far) / 2; @@ -1573,8 +1666,14 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int && icon_item->details->additional_text[0] != '\0'; /* No font or no text, then do no work. */ - if (icon_item->details->smooth_font == NULL - || (!have_editable && !have_additional)) { +#ifdef USE_EEL_TEXT + if (icon_item->details->smooth_font == NULL) { + icon_item->details->text_height = 0; + icon_item->details->text_width = 0; + return; + } +#endif + if (!have_editable && !have_additional) { icon_item->details->text_height = 0; icon_item->details->text_width = 0; return; @@ -2095,6 +2194,8 @@ nautilus_icon_canvas_item_get_max_text_width (NautilusIconCanvasItem *item) } +#ifdef USE_EEL_TEXT + void nautilus_icon_canvas_item_set_smooth_font (NautilusIconCanvasItem *icon_item, EelScalableFont *font) @@ -2133,6 +2234,8 @@ nautilus_icon_canvas_item_set_smooth_font_size (NautilusIconCanvasItem *icon_ite } } +#endif + /* Class initialization function for the icon canvas item. */ static void nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class) @@ -2140,10 +2243,12 @@ nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class) GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; +#ifdef USE_EEL_TEXT if (layout_cache == NULL) { layout_cache = eel_smooth_text_layout_cache_new (); g_atexit (free_layout_cache); } +#endif object_class = GTK_OBJECT_CLASS (class); item_class = GNOME_CANVAS_ITEM_CLASS (class); @@ -2160,10 +2265,12 @@ nautilus_icon_canvas_item_class_init (NautilusIconCanvasItemClass *class) G_TYPE_BOOLEAN, GTK_ARG_READWRITE, ARG_HIGHLIGHTED_AS_KEYBOARD_FOCUS); gtk_object_add_arg_type ("NautilusIconCanvasItem::highlighted_for_drop", G_TYPE_BOOLEAN, GTK_ARG_READWRITE, ARG_HIGHLIGHTED_FOR_DROP); +#ifdef USE_EEL_TEXT gtk_object_add_arg_type ("NautilusIconCanvasItem::smooth_font_size", G_TYPE_INT, GTK_ARG_READWRITE, ARG_SMOOTH_FONT_SIZE); gtk_object_add_arg_type ("NautilusIconCanvasItem::smooth_font", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SMOOTH_FONT); +#endif G_OBJECT_CLASS (class)->finalize = nautilus_icon_canvas_item_finalize; libnautilus-private/nautilus-icon-canvas-item.c @@ -45,7 +45,6 @@ #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-scalable-font.h> -#include <eel/eel-smooth-text-layout.h> #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> #include <gtk/gtksignal.h> @@ -60,6 +59,12 @@ #include <stdio.h> #include <string.h> +#define USE_EEL_TEXT + +#ifdef USE_EEL_TEXT +#include <eel/eel-smooth-text-layout.h> +#endif + #define ICON_NAME_BLOCK_DEVICE "i-blockdev" #define ICON_NAME_BROKEN_SYMBOLIC_LINK "i-symlink" #define ICON_NAME_CHARACTER_DEVICE "i-chardev" @@ -2278,8 +2283,8 @@ embed_text (GdkPixbuf *pixbuf_without_text, embedded_text_preferences_callbacks_added = TRUE; eel_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, - embedded_text_font_changed_callback, - GINT_TO_POINTER (TRUE)); + embedded_text_font_changed_callback, + GINT_TO_POINTER (TRUE)); embedded_text_font_changed_callback (GINT_TO_POINTER (FALSE)); g_atexit (embedded_text_font_free); libnautilus-private/nautilus-icon-factory.c @@ -33,7 +33,6 @@ Requires: librsvg >= @LIBRSVG_REQUIRED@ Requires: libxml >= @LIBXML_REQUIRED@ Requires: medusa >= @MEDUSA_REQUIRED@ Requires: popt >= @POPT_REQUIRED@ -Requires: scrollkeeper >= @SCROLLKEEPER_REQUIRED@ BuildRequires: GConf-devel >= @GCONF_REQUIRED@ BuildRequires: ORBit-devel >= @ORBIT_REQUIRED@ @@ -52,7 +51,6 @@ BuildRequires: librsvg-devel >= @LIBRSVG_REQUIRED@ BuildRequires: libxml-devel >= @LIBXML_REQUIRED@ BuildRequires: medusa-devel >= @MEDUSA_REQUIRED@ BuildRequires: popt >= @POPT_REQUIRED@ -BuildRequires: scrollkeeper >= @SCROLLKEEPER_REQUIRED@ BuildRequires: xpdf >= 0.90 %description @@ -140,7 +138,6 @@ scrollkeeper-update %defattr(0555, bin, bin) %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB TRADEMARK_NOTICE ChangeLog NEWS README -%{_bindir}/hyperbola %{_bindir}/nautilus %{_bindir}/nautilus-adapter %{_bindir}/nautilus-error-dialog @@ -177,8 +174,6 @@ scrollkeeper-update %{_datadir}/gnome/apps/Applications/*.desktop %{_datadir}/locale/*/LC_MESSAGES/*.mo %{_datadir}/nautilus/*.xml -%{_datadir}/nautilus/components/hyperbola/*.xml -%{_datadir}/nautilus/components/hyperbola/maps/*.map %{_datadir}/nautilus/emblems/*.png %{_datadir}/nautilus/linksets/*.xml %{_datadir}/nautilus/patterns/*.jpg @@ -212,7 +207,6 @@ scrollkeeper-update %{_libdir}/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server %{_libdir}/bonobo/servers/Nautilus_Control_throbber.server %{_libdir}/bonobo/servers/Nautilus_View_hardware.server -%{_libdir}/bonobo/servers/Nautilus_View_help.server %{_libdir}/bonobo/servers/Nautilus_View_history.server %{_libdir}/bonobo/servers/Nautilus_View_image.server %{_libdir}/bonobo/servers/Nautilus_View_music.server nautilus.spec.in @@ -1,3 +1,8 @@ +2001-12-13 Darin Adler <darin@bentspoon.com> + + * POTFILES.in: Removed translations for the help component. + If we ever revive it, we can get the translations from here. + 2001-12-06 Darin Adler <darin@bentspoon.com> * POTFILES.in: Moved mozilla component into its own module. po/ChangeLog @@ -1,12 +1,6 @@ components/adapter/Nautilus_ComponentAdapterFactory_std.server.in components/hardware/Nautilus_View_hardware.server.in components/hardware/nautilus-hardware-view.c -components/help/Nautilus_View_help.server.in -components/help/hyperbola-filefmt.c -components/help/hyperbola-nav-index.c -components/help/hyperbola-nav-tree.c -components/help/hyperbola-types.h -components/help/nautilus-hyperbola-ui.xml components/history/Nautilus_View_history.server.in components/history/nautilus-history-view.c components/image-viewer/Nautilus_View_image.server.in po/POTFILES.in @@ -4173,6 +4173,10 @@ real_update_menus (FMDirectoryView *view) gboolean can_duplicate_files; gboolean show_separate_delete_command; EelBackground *background; + + if (view->details->ui == NULL) { + return; + } selection = fm_directory_view_get_selection (view); selection_count = g_list_length (selection); src/file-manager/fm-directory-view.c @@ -2556,6 +2556,7 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur GnomeDesktopEntry *entry; #endif GdkPoint point; + char *uri; char *local_path; char *stripped_uri; char *container_uri_string; @@ -2650,12 +2651,12 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur container_path = gnome_vfs_get_local_path_from_uri (container_uri_string); for (node = real_uri_list; node != NULL; node = node->next) { /* Make a link using the desktop file contents? */ - local_path = gnome_vfs_get_local_path_from_uri (node->data); + uri = node->data; + local_path = gnome_vfs_get_local_path_from_uri (uri); if (local_path != NULL) { #if GNOME2_CONVERSION_COMPLETE entry = gnome_desktop_entry_load (local_path); if (entry != NULL) { - /* FIXME: Handle name conflicts? */ nautilus_link_local_create_from_gnome_entry (entry, container_path, &point); gnome_desktop_entry_free (entry); @@ -2673,20 +2674,19 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur /* FIXME: This should be using eel_uri_get_basename * instead of a "roll our own" solution. */ - stripped_uri = eel_str_strip_trailing_chr ((char *)node->data, '/'); - g_print ("local_path:%s\nstripped_uri:%s\n", (char *)node->data, stripped_uri); + stripped_uri = eel_str_strip_trailing_chr (uri, '/'); + g_print ("local_path:%s\nstripped_uri:%s\n", local_path, stripped_uri); last_slash = strrchr (stripped_uri, '/'); link_name = last_slash == NULL ? NULL : last_slash + 1; if (!eel_str_is_empty (link_name)) { /* FIXME: Handle name conflicts? */ nautilus_link_local_create (container_path, link_name, - "gnome-http-url", local_path, + "gnome-http-url", uri, &point, NAUTILUS_LINK_GENERIC); } g_free (stripped_uri); - break; } g_free (container_path); src/file-manager/fm-icon-view.c components/help/.cvsignore components/help/Makefile.am components/help/Nautilus_View_help.server.in components/help/ScrollKeeper-TODO components/help/help-method.c components/help/help-method.h components/help/help-methods.conf components/help/hyperbola-filefmt.c components/help/hyperbola-filefmt.h components/help/hyperbola-main.c components/help/hyperbola-nav-index.c components/help/hyperbola-nav-search.c components/help/hyperbola-nav-tree.c components/help/hyperbola-nav.h components/help/hyperbola-types.h components/help/nautilus-hyperbola-ui.xml components/help/pages.map components/help/test-help-method.c components/help/topleveldocs.xml 612ed122c7aa457410fb14279e90ab161a4bc15c Darin Adler darin@src.gnome.org http://github.com/hb/nautilus/commit/22ac93ef82dc881990c535f0432cb139ce36ccd5 22ac93ef82dc881990c535f0432cb139ce36ccd5 2001-12-13T15:37:55-08:00 2001-12-13T15:37:55-08:00 Deleted help component as it is not slated to be part of Gnome 2. * components/Makefile.am: * components/help/*: * nautilus.spec.in: Deleted help component as it is not slated to be part of Gnome 2. * RENAMING: No need to rename hyperbola if it's gone. * configure.in: Removed ScrollKeeper check. Took a cut at making the medusa check use pkg-config, it's probably messed up but at least we won't define HAVE_MEDUSA if we see the Gnome 1 medusa. * libnautilus-private/nautilus-icon-canvas-item.c: (nautilus_icon_canvas_item_init), (nautilus_icon_canvas_item_finalize), (nautilus_icon_canvas_item_set_arg), (nautilus_icon_canvas_item_get_arg), (draw_or_measure_label_text_aa), (draw_label_text_aa), (nautilus_icon_canvas_item_class_init): Quick cut at porting to Pango from Eel font code. It's all under ifdef USE_EEL_TEXT because it's not working well yet. At the moment the text looks bad, and it's very slow, and it's not centered. * libnautilus-private/nautilus-icon-factory.c: (embed_text): Baby steps at doing the port to Pango here too. * src/file-manager/fm-directory-view.c: (real_update_menus): Add a check for NULL that seems required. This change was suggested by the backtrace in bug 66809, but it's not clear if this really fixes anything. (Rolled from stable branch.) * src/file-manager/fm-icon-view.c: (icon_view_handle_uri_list): Fix code that passed a path instead of a URI when creating a desktop file. (Rolled from stable branch.) * TODO: Minor updates. 9afd5e7c38022d663a645bc0796edff5b2c7f411 Darin Adler darin@src.gnome.org