summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-bonobo-extensions.c
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug 3787 (If location bar is turned off, user cannotJohn Sullivan2001-04-071-20/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change viewer) Now the "View as" choices, including "View as...", appear at the bottom of the View menu as well as in the location bar. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (add_numbered_menu_item_internal): Handle radio item case; change signature to support this. (nautilus_bonobo_add_numbered_menu_item), (nautilus_bonobo_add_numbered_toggle_menu_item): Updated for change to add_numbered_menu_item_internal. (nautilus_bonobo_add_numbered_radio_menu_item): New function, just like its fellows but creates a one-of-many menu item. (nautilus_bonobo_get_numbered_menu_item_index_from_command), (nautilus_bonobo_get_numbered_menu_item_container_path_from_command): New functions that return info given one of the numbered-menu-item generated commands. Useful for callbacks when all you have in hand is the command itself. * src/nautilus-shell-ui.xml: Add "View as" command; add placeholders and separators and "View as" menu item to View menu. Also removed pixmap from Close Window menu item because it was silly to have a pixmap on exactly one item in the File menu. * src/nautilus-window-manage-views.c: Took "static" off of nautilus_window_content_matches_iid so I could make it public and use it in nautilus-window.c. * src/nautilus-window-private.h: Added fields to Details struct and prototypes for functions needed by View As stuff. * src/nautilus-window-menus.c: (view_menu_view_as_callback): New callback function used by "View as" verb. (nautilus_window_initialize_menus_part_1): Wire up "View as" verb; register for Bonobo UI events to catch radio items being selected. * src/nautilus-window.c: (set_dummy_initial_view_as_menu): Changed "View as ..." to "View as...", which matches the new name of "View as Other..." (free_stored_viewers): New function, frees and nulls out the view identifiers stored in the Details struct for the "View as" menus. (nautilus_window_destroy): Call free_stored_viewers. (activate_nth_short_list_item): New function, switches viewers by viewer index. (activate_extra_viewer): New function, switches to sometimes- present extra viewer (used when current viewer isn't in short list). (handle_view_as_item_from_bonobo_menu): If item whose state has changed is a "View as" item, dispatch accordingly. (nautilus_window_handle_ui_event_callback): Call handle_view_as_item_from_bonobo_menu if UI event was state changing to TRUE. (view_as_menu_switch_views_callback), (create_view_as_menu_item): Changed to store viewer index and whether viewer is "extra viewer" rather than storing NautilusViewIdentifier. This is used for option menu in location bar and now closely matches the mechanism used for the View menu. (add_view_as_bonobo_menu_item): New function used by View menu View As items. (replace_extra_viewer_in_view_as_menus), (nautilus_window_synch_view_as_menus): (load_view_as_menus_callback): Renamed and cleaned up to separate information gathering from widget updating; now handle View As items in View menu also. (chose_component_callback): Added FIXME for pre-existing bug 8000. (nautilus_window_show_view_as_dialog): New function, extracted from view_as_menu_choose_view_callback. (view_as_menu_choose_view_callback): Now calls extracted function. (refresh_stored_viewers): New function, updates the list of viewers stored in the Details struct.
* Remove librsvg.Ramiro Estrugo2001-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.am: Remove librsvg. * librsvg/.cvsignore: * librsvg/Makefile.am: * librsvg/art_render.c: * librsvg/art_render.h: * librsvg/art_render_gradient.c: * librsvg/art_render_gradient.h: * librsvg/art_render_mask.c: * librsvg/art_render_mask.h: * librsvg/art_render_svp.c: * librsvg/art_render_svp.h: * librsvg/art_rgba.c: * librsvg/art_rgba.h: * librsvg/example-nested-transform.svg: * librsvg/makefile-simple: * librsvg/opacity.svg: * librsvg/rsvg-bpath-util.c: * librsvg/rsvg-bpath-util.h: * librsvg/rsvg-css.c: * librsvg/rsvg-css.h: * librsvg/rsvg-defs.c: * librsvg/rsvg-defs.h: * librsvg/rsvg-ft.c: * librsvg/rsvg-ft.h: * librsvg/rsvg-paint-server.c: * librsvg/rsvg-paint-server.h: * librsvg/rsvg-path.c: * librsvg/rsvg-path.h: * librsvg/rsvg.c: * librsvg/rsvg.h: * librsvg/subpixel-text-test: * librsvg/test-ft-gtk.c: * librsvg/test-ft.c: * librsvg/test-rsvg.c: * librsvg/test.svg: Move librsvg to its own top level GNOME CVS module. * configure.in: Add librsvg and eel dependencies. Remove librsvg and font entries. * nautilus.spec.in: Remove font entries. Add librsvg and eel requirements. * data/Makefile.am: * data/fonts/.cvsignore: * data/fonts/Makefile.am: * data/fonts/urw/.cvsignore: * data/fonts/urw/Makefile.am: * data/fonts/urw/README: * data/fonts/urw/fonts.dir: * data/fonts/urw/n019003l.afm: * data/fonts/urw/n019003l.pfb: * data/fonts/urw/n019003l.pfm: * data/fonts/urw/n019004l.afm: * data/fonts/urw/n019004l.pfb: * data/fonts/urw/n019004l.pfm: * data/fonts/urw/n019023l.afm: * data/fonts/urw/n019023l.pfb: * data/fonts/urw/n019023l.pfm: * data/fonts/urw/n019024l.afm: * data/fonts/urw/n019024l.pfb: * data/fonts/urw/n019024l.pfm: Retire default fonts. These now live in eel. * libnautilus/nautilus-undo-transaction.c: (nautilus_undo_transaction_destroy): * libnautilus/nautilus-view.c: (nautilus_view_destroy): Update for eel changes. Use eel-gtk-macros. * nautilus-installer/src/nautilus-druid-page-eazel.c: (nautilus_druid_page_eazel_destroy), (nautilus_druid_page_eazel_finalize), (nautilus_druid_page_eazel_size_allocate), (nautilus_druid_page_eazel_size_request): Update for eel changes. Use eel-gtk-macros. * libnautilus-extensions/Makefile.am: * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bookmark.c: * libnautilus-extensions/nautilus-ctree.c: * libnautilus-extensions/nautilus-customization-data.c: * libnautilus-extensions/nautilus-dateedit-extensions.c: * libnautilus-extensions/nautilus-dateedit-extensions.h: * libnautilus-extensions/nautilus-directory-async.c: * libnautilus-extensions/nautilus-directory-background.c: * libnautilus-extensions/nautilus-directory-background.h: * libnautilus-extensions/nautilus-directory-metafile-monitor.c: * libnautilus-extensions/nautilus-directory-metafile.c: * libnautilus-extensions/nautilus-directory.c: * libnautilus-extensions/nautilus-drag-window.c: * libnautilus-extensions/nautilus-drag.c: * libnautilus-extensions/nautilus-druid-page-eazel.c: * libnautilus-extensions/nautilus-druid.c: * libnautilus-extensions/nautilus-entry.c: * libnautilus-extensions/nautilus-file-changes-queue.c: * libnautilus-extensions/nautilus-file-operations-progress.c: * libnautilus-extensions/nautilus-file-operations.c: * libnautilus-extensions/nautilus-file-private.h: * libnautilus-extensions/nautilus-file-utilities.c: * libnautilus-extensions/nautilus-file.c: * libnautilus-extensions/nautilus-font-factory.c: * libnautilus-extensions/nautilus-gconf-extensions.c: * libnautilus-extensions/nautilus-generous-bin.c: * libnautilus-extensions/nautilus-global-preferences.c: * libnautilus-extensions/nautilus-global-preferences.h: * libnautilus-extensions/nautilus-horizontal-splitter.c: * libnautilus-extensions/nautilus-icon-canvas-item.c: * libnautilus-extensions/nautilus-icon-canvas-item.h: * libnautilus-extensions/nautilus-icon-container.c: * libnautilus-extensions/nautilus-icon-container.h: * libnautilus-extensions/nautilus-icon-dnd.c: * libnautilus-extensions/nautilus-icon-factory.c: * libnautilus-extensions/nautilus-icon-factory.h: * libnautilus-extensions/nautilus-icon-private.h: * libnautilus-extensions/nautilus-icon-text-item.c: * libnautilus-extensions/nautilus-keep-last-vertical-box.c: * libnautilus-extensions/nautilus-lib-self-check-functions.c: * libnautilus-extensions/nautilus-lib-self-check-functions.h: * libnautilus-extensions/nautilus-link-set.c: * libnautilus-extensions/nautilus-link.c: * libnautilus-extensions/nautilus-list-column-title.c: * libnautilus-extensions/nautilus-list.c: * libnautilus-extensions/nautilus-medusa-support.c: * libnautilus-extensions/nautilus-merged-directory.c: * libnautilus-extensions/nautilus-metafile-factory.c: * libnautilus-extensions/nautilus-metafile.c: * libnautilus-extensions/nautilus-mime-actions.c: * libnautilus-extensions/nautilus-preferences-box.c: * libnautilus-extensions/nautilus-preferences-dialog.c: * libnautilus-extensions/nautilus-preferences-group.c: * libnautilus-extensions/nautilus-preferences-item.c: * libnautilus-extensions/nautilus-preferences-pane.c: * libnautilus-extensions/nautilus-preferences.c: * libnautilus-extensions/nautilus-preferences.h: * libnautilus-extensions/nautilus-program-chooser.c: * libnautilus-extensions/nautilus-program-choosing.c: * libnautilus-extensions/nautilus-program-choosing.h: * libnautilus-extensions/nautilus-search-uri.c: * libnautilus-extensions/nautilus-sidebar-functions.c: * libnautilus-extensions/nautilus-tabs.c: * libnautilus-extensions/nautilus-theme.c: * libnautilus-extensions/nautilus-thumbnails.c: * libnautilus-extensions/nautilus-trash-directory.c: * libnautilus-extensions/nautilus-trash-file.c: * libnautilus-extensions/nautilus-trash-monitor.c: * libnautilus-extensions/nautilus-undo-context.c: * libnautilus-extensions/nautilus-undo-manager.c: * libnautilus-extensions/nautilus-undo-signal-handlers.c: * libnautilus-extensions/nautilus-vfs-directory.c: * libnautilus-extensions/nautilus-vfs-file.c: * libnautilus-extensions/nautilus-view-identifier.c: * libnautilus-extensions/nautilus-volume-monitor.c: Use new eel library. * libnautilus-extensions/nautilus-art-extensions.c: * libnautilus-extensions/nautilus-art-extensions.h: * libnautilus-extensions/nautilus-art-gtk-extensions.c: * libnautilus-extensions/nautilus-art-gtk-extensions.h: * libnautilus-extensions/nautilus-background-canvas-group.c: * libnautilus-extensions/nautilus-background-canvas-group.h: * libnautilus-extensions/nautilus-background.c: * libnautilus-extensions/nautilus-background.h: * libnautilus-extensions/nautilus-caption-table.c: * libnautilus-extensions/nautilus-caption-table.h: * libnautilus-extensions/nautilus-caption.c: * libnautilus-extensions/nautilus-caption.h: * libnautilus-extensions/nautilus-clickable-image.c: * libnautilus-extensions/nautilus-clickable-image.h: * libnautilus-extensions/nautilus-debug-drawing.c: * libnautilus-extensions/nautilus-debug-drawing.h: * libnautilus-extensions/nautilus-debug.c: * libnautilus-extensions/nautilus-debug.h: * libnautilus-extensions/nautilus-ellipsizing-label.c: * libnautilus-extensions/nautilus-ellipsizing-label.h: * libnautilus-extensions/nautilus-enumeration.c: * libnautilus-extensions/nautilus-enumeration.h: * libnautilus-extensions/nautilus-font-manager.c: * libnautilus-extensions/nautilus-font-manager.h: * libnautilus-extensions/nautilus-font-picker.c: * libnautilus-extensions/nautilus-font-picker.h: * libnautilus-extensions/nautilus-gdk-extensions.c: * libnautilus-extensions/nautilus-gdk-extensions.h: * libnautilus-extensions/nautilus-gdk-font-extensions.c: * libnautilus-extensions/nautilus-gdk-font-extensions.h: * libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c: * libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h: * libnautilus-extensions/nautilus-glib-extensions.c: * libnautilus-extensions/nautilus-glib-extensions.h: * libnautilus-extensions/nautilus-glyph.c: * libnautilus-extensions/nautilus-glyph.h: * libnautilus-extensions/nautilus-gnome-extensions.c: * libnautilus-extensions/nautilus-gnome-extensions.h: * libnautilus-extensions/nautilus-graphic-effects.c: * libnautilus-extensions/nautilus-graphic-effects.h: * libnautilus-extensions/nautilus-gtk-extensions.c: * libnautilus-extensions/nautilus-gtk-extensions.h: * libnautilus-extensions/nautilus-gtk-macros.h: * libnautilus-extensions/nautilus-image-table.c: * libnautilus-extensions/nautilus-image-table.h: * libnautilus-extensions/nautilus-image-with-background.c: * libnautilus-extensions/nautilus-image-with-background.h: * libnautilus-extensions/nautilus-image.c: * libnautilus-extensions/nautilus-image.h: * libnautilus-extensions/nautilus-label-with-background.c: * libnautilus-extensions/nautilus-label-with-background.h: * libnautilus-extensions/nautilus-label.c: * libnautilus-extensions/nautilus-label.h: * libnautilus-extensions/nautilus-labeled-image.c: * libnautilus-extensions/nautilus-labeled-image.h: * libnautilus-extensions/nautilus-lib-self-check-functions.c: * libnautilus-extensions/nautilus-lib-self-check-functions.h: * libnautilus-extensions/nautilus-password-dialog.c: * libnautilus-extensions/nautilus-password-dialog.h: * libnautilus-extensions/nautilus-radio-button-group.c: * libnautilus-extensions/nautilus-radio-button-group.h: * libnautilus-extensions/nautilus-region.c: * libnautilus-extensions/nautilus-region.h: * libnautilus-extensions/nautilus-scalable-font-private.h: * libnautilus-extensions/nautilus-scalable-font.c: * libnautilus-extensions/nautilus-scalable-font.h: * libnautilus-extensions/nautilus-self-checks.c: * libnautilus-extensions/nautilus-self-checks.h: * libnautilus-extensions/nautilus-smooth-text-layout-cache.c: * libnautilus-extensions/nautilus-smooth-text-layout-cache.h: * libnautilus-extensions/nautilus-smooth-text-layout.c: * libnautilus-extensions/nautilus-smooth-text-layout.h: * libnautilus-extensions/nautilus-smooth-widget.c: * libnautilus-extensions/nautilus-smooth-widget.h: * libnautilus-extensions/nautilus-stock-dialogs.c: * libnautilus-extensions/nautilus-stock-dialogs.h: * libnautilus-extensions/nautilus-string-list.c: * libnautilus-extensions/nautilus-string-list.h: * libnautilus-extensions/nautilus-string-map.c: * libnautilus-extensions/nautilus-string-map.h: * libnautilus-extensions/nautilus-string-picker.c: * libnautilus-extensions/nautilus-string-picker.h: * libnautilus-extensions/nautilus-string.c: * libnautilus-extensions/nautilus-string.h: * libnautilus-extensions/nautilus-text-caption.c: * libnautilus-extensions/nautilus-text-caption.h: * libnautilus-extensions/nautilus-viewport.c: * libnautilus-extensions/nautilus-viewport.h: * libnautilus-extensions/nautilus-wrap-table.c: * libnautilus-extensions/nautilus-wrap-table.h: * libnautilus-extensions/nautilus-xml-extensions.c: * libnautilus-extensions/nautilus-xml-extensions.h: Remove these files. These are all part of eel now. * applets/launcher/nautilus-launcher-applet.c: * applets/preferences-applet/nautilus-preferences-applet.c: * components/adapter/Makefile.am: * components/adapter/main.c: * components/adapter/nautilus-adapter-control-embed-strategy.c: * components/adapter/nautilus-adapter-embed-strategy.c: * components/adapter/nautilus-adapter-embeddable-embed-strategy.c: * components/adapter/nautilus-adapter-factory-server.c: * components/adapter/nautilus-adapter-file-load-strategy.c: * components/adapter/nautilus-adapter-load-strategy.c: * components/adapter/nautilus-adapter-progressive-load-strategy.c: * components/adapter/nautilus-adapter-stream-load-strategy.c: * components/adapter/nautilus-adapter.c: * components/hardware/Makefile.am: * components/hardware/nautilus-hardware-view.c: * components/help/Makefile.am: * components/help/help-method.c: * components/help/hyperbola-filefmt.c: * components/help/hyperbola-nav-tree.c: * components/history/Makefile.am: * components/history/nautilus-history-view.c: * components/image-viewer/Makefile.am: * components/image-viewer/nautilus-image-view.c: * components/loser/content/Makefile.am: * components/loser/content/nautilus-content-loser.c: * components/loser/sidebar/Makefile.am: * components/loser/sidebar/nautilus-sidebar-loser.c: * components/mozilla/Makefile.am: * components/mozilla/bonobo-extensions.c: * components/mozilla/nautilus-mozilla-content-view.c: * components/music/Makefile.am: * components/music/nautilus-music-view.c: * components/notes/Makefile.am: * components/notes/nautilus-notes.c: * components/rpmview/Makefile.am: * components/rpmview/nautilus-rpm-verify-window.c: * components/rpmview/nautilus-rpm-view-install.c: * components/rpmview/nautilus-rpm-view.c: * components/sample/nautilus-sample-content-view.c: * components/services/install-view/Makefile.am: * components/services/install-view/callbacks.c: * components/services/install-view/forms.c: * components/services/install-view/nautilus-service-install-view.c: * components/services/install/lib/eazel-install-logic2.c: * components/services/install/server/main.c: * components/services/inventory-view/Makefile.am: * components/services/inventory-view/nautilus-inventory-config-page .c: * components/services/inventory-view/nautilus-inventory-disable-pag * components/services/inventory-view/nautilus-inventory-enable-page * components/services/inventory-view/nautilus-inventory-view.c: * components/services/inventory/Makefile.am: * components/services/inventory/eazel-inventory-upload-callback.c: * components/services/inventory/eazel-inventory.c: * components/services/inventory/main.c: * components/services/login/nautilus-view/Makefile.am: * components/services/login/nautilus-view/nautilus-change-password- view.c: * components/services/login/nautilus-view/password-box.c: * components/services/nautilus-dependent-shared/Makefile.am: * components/services/nautilus-dependent-shared/eazel-services-exte nsions.c: * components/services/nautilus-dependent-shared/eazel-services-exte nsions.h: * components/services/nautilus-dependent-shared/eazel-services-foot er.c: * components/services/nautilus-dependent-shared/eazel-services-head er.c: * components/services/nautilus-dependent-shared/test-footer-header. c: * components/services/summary/Makefile.am: * components/services/summary/nautilus-summary-callbacks.c: * components/services/summary/nautilus-summary-dialogs.c: * components/services/summary/nautilus-summary-dialogs.h: * components/services/summary/nautilus-summary-footer.c: * components/services/summary/nautilus-summary-menu-items.c: * components/services/summary/nautilus-summary-view-private.h: * components/services/summary/nautilus-summary-view.c: * components/services/time/nautilus-view/main.c: * components/services/time/nautilus-view/trilobite-eazel-time-view. c: * components/services/trilobite/sample/nautilus-view/Makefile.am: * components/text/Makefile.am: * components/text/nautilus-text-view.c: * components/throbber/Makefile.am: * components/throbber/main.c: * components/throbber/nautilus-throbber.c: * components/tree/Makefile.am: * components/tree/nautilus-tree-change-queue.c: * components/tree/nautilus-tree-expansion-state.c: * components/tree/nautilus-tree-model.c: * components/tree/nautilus-tree-node.c: * components/tree/nautilus-tree-view-dnd.c: * components/tree/nautilus-tree-view.c: * helper-utilities/authenticate/Makefile.am: * helper-utilities/authenticate/nautilus-authenticate.c: * nautilus-installer/src/nautilus-druid.c: * src/Makefile.am: * src/file-manager/fm-desktop-icon-view.c: * src/file-manager/fm-directory-view.c: * src/file-manager/fm-directory-view.h: * src/file-manager/fm-error-reporting.c: * src/file-manager/fm-icon-text-window.c: * src/file-manager/fm-icon-view.c: * src/file-manager/fm-list-view.c: * src/file-manager/fm-properties-window.c: * src/file-manager/fm-search-list-view.c: * src/file-manager/nautilus-indexing-info.c: * src/nautilus-about.c: * src/nautilus-application.c: * src/nautilus-bookmark-list.c: * src/nautilus-bookmark-parsing.c: * src/nautilus-bookmarks-window.c: * src/nautilus-complex-search-bar.c: * src/nautilus-component-adapter-factory.c: * src/nautilus-desktop-window.c: * src/nautilus-first-time-druid.c: * src/nautilus-link-set-window.c: * src/nautilus-location-bar.c: * src/nautilus-main.c: * src/nautilus-navigation-bar.c: * src/nautilus-profiler.c: * src/nautilus-property-browser.c: * src/nautilus-search-bar-criterion.c: * src/nautilus-search-bar.c: * src/nautilus-shell.c: * src/nautilus-sidebar-tabs.c: * src/nautilus-sidebar-title.c: * src/nautilus-sidebar.c: * src/nautilus-signaller.c: * src/nautilus-simple-search-bar.c: * src/nautilus-switchable-navigation-bar.c: * src/nautilus-switchable-search-bar.c: * src/nautilus-theme-selector.c: * src/nautilus-view-frame-corba.c: * src/nautilus-view-frame.c: * src/nautilus-window-manage-views.c: * src/nautilus-window-menus.c: * src/nautilus-window-toolbars.c: * src/nautilus-window.c: * src/nautilus-window.h: * src/nautilus-zoom-control.c: Update for new eel library usage. * test/test-nautilus-background.c: * test/test-nautilus-clickable-image.c: * test/test-nautilus-font-manager.c: * test/test-nautilus-font-picker.c: * test/test-nautilus-font-simple.c: * test/test-nautilus-font.c: * test/test-nautilus-glyph-simple.c: * test/test-nautilus-glyph.c: * test/test-nautilus-image-background.c: * test/test-nautilus-image-scrolled.c: * test/test-nautilus-image-simple.c: * test/test-nautilus-image-table.c: * test/test-nautilus-image-tile.c: * test/test-nautilus-image.c: * test/test-nautilus-label-background.c: * test/test-nautilus-label-flavorful.c: * test/test-nautilus-label-offset.c: * test/test-nautilus-label-scrolled.c: * test/test-nautilus-label-simple.c: * test/test-nautilus-label-wrapped.c: * test/test-nautilus-label.c: * test/test-nautilus-labeled-image.c: * test/test-nautilus-password-dialog.c: * test/test-nautilus-pixbuf-tile.c: * test/test-nautilus-smooth-text-layout.c: * test/test-nautilus-viewport-constraint.c: * test/test-nautilus-widgets.c: Remove these. They live in eel now. * test/vsignore: * test/kefile.am: * test/st-nautilus-preferences-change.c: * test/st-nautilus-preferences-display.c: * test/st-nautilus-wrap-table.c: * test/st.c: * test/st.h: Update for new eel library usage.
* reviewed by: Darin Adler <darin@eazel.com>John Sullivan2001-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 3321 (Finalize contents of Help menu for 1.0). Actually there's still an open issue about the Customer Service item, which I've left in for now. * src/nautilus-shell-ui.xml: Added Quick Reference, removed License, put About last after a separator. * src/nautilus-window-menus.c: (help_menu_nautilus_quick_reference_callback): New callback. (help_menu_nautilus_license_callback): Removed this. (nautilus_window_initialize_menus): Install callback for Quick Reference, remove for License. Also removed the space from "tool bar" everywhere, per the final decision of Vera & Rhoda. I grepped and replaced everywhere for "tool bar", "Tool Bar", "TOOL_BAR", and "tool_bar". * components/loser/content/nautilus-content-loser-ui.xml: * components/loser/sidebar/nautilus-sidebar-loser-ui.xml: * components/mozilla/bonobo-extensions.c: * components/sample/nautilus-sample-content-view-ui.xml: * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_install_descriptions), (global_preferences_install_defaults), (global_preferences_install_visibility), (global_preferences_create_dialog): * libnautilus-extensions/nautilus-global-preferences.h: * src/nautilus-service-ui.xml: * src/nautilus-shell-ui.xml: * src/nautilus-window-menus.c: (view_menu_show_hide_toolbar_callback), (nautilus_window_update_show_hide_menu_items), (help_menu_nautilus_quick_reference_callback), (nautilus_window_initialize_menus): * src/nautilus-window-toolbars.c: (set_up_special_bonobo_button), (set_up_toolbar_images), (theme_changed_callback), (set_up_back_or_forward_toolbar_item), (nautilus_window_initialize_toolbars): * src/nautilus-window.c: (nautilus_window_constructed), (nautilus_window_hide_toolbar), (nautilus_window_show_toolbar), (nautilus_window_toolbar_showing), (nautilus_window_show): * src/nautilus-window.h: Made toolbar one word.
* reviewed by: Gene Ragan <gzr@eazel.com>Darin Adler2001-02-161-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish fixing bug 6286 (need to re-apply optimization where we do a single directory load): * src/nautilus-window-manage-views.c: (begin_location_change): Do the force_reload work in here. We want it on all 4 kinds of location change (forward, back, new location, reload). Other browsers don't do reload on back, so we may want to change this at some point. (nautilus_window_reload): Remove the old code to invalidate from here now that it's done in begin_location_change. * src/file-manager/fm-directory-view.c: (load_location_callback), (load_directory), (finish_loading), (filtering_changed_callback): Remove the old code to do force_reload. The NautilusDirectory part of triggering a reload is now handled by the shell. * libnautilus-extensions/nautilus-directory.h: * libnautilus-extensions/nautilus-directory.c: (nautilus_directory_file_monitor_add): No force_reload parameter any more. (nautilus_directory_force_reload): New separate call used to force a reload. A method call so subclasses can implement. (nautilus_self_check_directory): Removed the FALSE force_reload argument to file_monitor_add. * libnautilus-extensions/nautilus-vfs-directory.c: (vfs_file_monitor_add): No force_reload parameter any more. (vfs_force_reload): Call through to nautilus_directory_force_reload_internal to do the real work. (nautilus_vfs_directory_initialize_class): Install the new force_reload function. * libnautilus-extensions/nautilus-merged-directory.c: (merged_file_monitor_add): No force_reload parameter any more. (merged_force_reload): Tell all of the real directories to force a reload. (monitor_add_directory): No force_reload to track any more. (nautilus_merged_directory_initialize_class): Install the new force_reload function. * libnautilus-extensions/nautilus-directory-private.h: * libnautilus-extensions/nautilus-directory-async.c: (nautilus_directory_force_reload_internal): Change the name of this function, since there's now a public function that is named nautilus_directory_force_reload. * libnautilus-extensions/nautilus-file-private.h: * libnautilus-extensions/nautilus-file.c: (nautilus_file_get_all_attributes): Made a separate call so other parts of the framework can use it. (nautilus_file_invalidate_all_attributes): Use the new call. * components/tree/nautilus-tree-model.c: (nautilus_tree_model_monitor_add), (nautilus_tree_model_node_begin_monitoring_no_connect): Use the new force_reload call. The old one had more granularity and thus forced less to be reloaded, but it's OK to do a little more here. * libnautilus-extensions/nautilus-trash-monitor.c: (nautilus_trash_monitor_initialize): Removed the FALSE force_reload argument to file_monitor_add. Other stuff: * libnautilus-extensions/nautilus-directory-metafile.c: (get_metafile), (nautilus_directory_get_file_metadata), (nautilus_directory_get_file_metadata_list), (nautilus_directory_set_file_metadata), (nautilus_directory_set_file_metadata_list), (nautilus_directory_copy_file_metadata), (nautilus_directory_remove_file_metadata), (nautilus_directory_rename_file_metadata): Moved FIXMEs around. Pass NULL instead of &ev when calling bonobo_object_release_unref since we don't really want to do anything different if there's some kind of error. * nautilus-installer/install-lib/.cvsignore: * nautilus-installer/libtrilobite/.cvsignore: Gotta create these files when you make new directories. * README: Change xml-i18n-tools to mention the correct branch.
* reviewed by: Maciej Stachowiak <mjs@eazel.com>Darin Adler2001-01-301-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 2131 (Change Nautilus to use OAF asynchronous activation interface). In making view activation work right, I also eliminated the state machine that was almost gone from NautilusWindow. There's still some additional simplification we can do, but it's simpler than it was. At the same time, made sure all incoming CORBA calls are deferred until idle time. This is most of what the old state machine was accomplishing, believe it or not, although it didn't do it 100%. Also fixes bug 2457 (Silent error loading content view), bug 2461 (progress from old and new content view sometimes confused), and bug 6109 (Assertion hit on clicking the refresh button many times very quickly). Perhaps others too, we need to test some old bugs to see if they have changed behavior. * libnautilus-extensions/nautilus-bonobo-extensions.c: (activation_handle_done), (activation_idle_callback), (activation_cancel), (oaf_activation_callback), (nautilus_bonobo_activate_cancel): Change implementation so that the actual callback happens at idle time, since CORBA callbacks can happen at almost any time. * libnautilus/Makefile.am: * libnautilus/nautilus-idle-queue.h: * libnautilus/nautilus-idle-queue.c: (execute_queued_functions), (nautilus_idle_queue_new), (nautilus_idle_queue_add), (nautilus_idle_queue_destroy): Factored out the idle queueing that I added to NautilusView so we can use it on the NautilusViewFrame side too. * libnautilus/nautilus-view.c: (queue_incoming_call), (nautilus_view_initialize), (nautilus_view_destroy): Change to use the new NautilusIdleQueue so we can share code. * src/nautilus-view-frame-private.h: * src/nautilus-view-frame-corba.c: (list_free_deep_callback), (free_location_and_selection_callback), (open_in_this_window), (open_prefer_existing_window), (open_force_new_window), (report_selection_change), (report_status), (report_load_underway), (report_load_progress), (report_load_complete), (report_load_failed), (set_title), (impl_Nautilus_ViewFrame_open_location_in_this_window), (impl_Nautilus_ViewFrame_open_location_prefer_existing_window), (impl_Nautilus_ViewFrame_open_location_force_new_window), (impl_Nautilus_ViewFrame_report_selection_change), (impl_Nautilus_ViewFrame_report_status), (impl_Nautilus_ViewFrame_report_load_underway), (impl_Nautilus_ViewFrame_report_load_progress), (impl_Nautilus_ViewFrame_report_load_complete), (impl_Nautilus_ViewFrame_report_load_failed), (impl_Nautilus_ViewFrame_set_title): Deal with all incoming CORBA calls through the idle queue. * src/nautilus-view-frame.h: Moved all the fields into details. Renamed client_loaded to view_loaded. Renamed load_client to load_view. Eliminated load_client_sync. Renamed get_iid to get_view_iid. Eliminated get_is_underway. Added get_is_view_loaded. * src/nautilus-view-frame.c: (nautilus_view_frame_queue_incoming_call): Simple cover for putting an incoming CORBA call on the idle queue. (nautilus_view_frame_initialize_class): Change client_loaded signal name to view_loaded. (nautilus_view_frame_initialize): Allocate the idle queue. (stop_activation): New function that stops a load_view that is underway. (destroy_view): Use the "view" field to tell if a view was loaded. The old code used the "iid" field, but now we set that even before the load is completed. (nautilus_view_frame_destroy): Destroy the idle queue. Also put the view into "failed" state once it's destroyed so additional calls are harmless. (nautilus_view_frame_finalize): Check that we're in the failed state. (emit_zoom_parameters_changed): New function so we can share more code. (view_frame_activated): Emit the zoom_parameters_changed signal here since a new view should always should get this signal. (view_frame_underway): Make this do nothing in the failed case instead of complaining. (view_frame_loaded): Make this do nothing in the failed case instead of complaining. (view_frame_failed): Stop whatever's in progress when the view fails. Also, allow calling this on a view that's already failed. (check_if_view_is_gone): Consolidate the calls to deregister_dead_components so we don't need an explicit call here. (emit_zoom_parameters_changed_callback), (zoom_parameters_changed_callback), (emit_zoom_level_changed_callback), (zoom_level_changed_callback): Redo these so they queue onto the idle queue, since they are triggered by incoming CORBA calls that can happen at any time. (create_corba_objects): Factor out the part of the code that makes the CORBA objects. Make error handling more complete and keep around pointers to the Bonobo objects for various parts of the aggregate so we can connect the appropriate signal handlers. (attach_view): Change code so it no longer connects signals to the BonoboObjectClient, since the signals won't go out on that GtkObject. Connect to the exception signals for all objects in the aggregate (any failure means "view failed"). Also connect to the "destroy" signal for one object (doesn't matter which since the entire aggregate goes away at once) and to the zoom-related signals. Report errors with signals rather than returning a boolean. (activation_callback): Add code to handle failure case. (nautilus_view_frame_load_view): Renamed. Got rid of "sync." version. (nautilus_view_frame_stop): Stop OAF activation of the view if it's in progress. (nautilus_view_frame_selection_changed): Make it a quiet no-op to send a selection change notice if no view is loaded. This helps keep the code simple for sidebars. Later we may make the view frame responsible for sending the selection on once the view is loaded. (nautilus_view_frame_title_changed): Same change as for selection, same idea. (nautilus_view_frame_get_is_zoomable), (nautilus_view_frame_get_zoom_level), (nautilus_view_frame_set_zoom_level), (nautilus_view_frame_get_min_zoom_level), (nautilus_view_frame_get_max_zoom_level), (nautilus_view_frame_get_has_min_zoom_level), (nautilus_view_frame_get_has_max_zoom_level), (nautilus_view_frame_get_is_continuous), (nautilus_view_frame_get_preferred_zoom_levels), (nautilus_view_frame_zoom_in), (nautilus_view_frame_zoom_out), (nautilus_view_frame_zoom_to_fit): Since a failed view has a zoomable_frame field set to NULL, got rid of all the explicit failure-case code for these functions. (nautilus_view_frame_get_view_iid): Renamed from get_iid. (nautilus_view_frame_report_load_underway), (nautilus_view_frame_report_load_complete), (nautilus_view_frame_report_load_failed): Moved the "quiet" handling of failed views down into the underlying functions, so these no longer need explicit failure-case code. (nautilus_view_frame_set_label): It's OK to allow this even for a failed view. (nautilus_view_frame_map): Use a kept-around reference to the control frame instead of relying on query_local_interface. (nautilus_view_frame_get_is_view_loaded): Add this so callers can tell when a sidebar view is not yet loaded. Might not need this when we clean things up more, but it's no big deal either way. * src/nautilus-window-manage-views.c: (update_title): No need to send the title change to the new content view -- it gets a title change once it comes up "for real". (set_displayed_location): Handle location of NULL here so we don't need to worry about it elsewhere. (check_bookmark_location_matches): Remove "uri" from name. (location_has_really_changed): Now that the state machine is gone, it's easy to see that this is never called with pending_ni equal to cancel_tag, so remove the code for that and add an assert. (set_view_location_and_selection): New name for what was called update_view. (set_sidebar_panels_location_and_selection): Cover since this loop occurs in two places. (update_for_new_location_and_selection): New name for what was called set_view_location_and_selection. Since it's now clear this can't be called with new_content_view equal to NULL, remove the code to handle that (fixes bug 2457). (load_content_view): Use async. view loading here. Get rid of "Avoid being fooled by extra done notifications from the last view. This is a HACK because the state machine SUCKS." by eliminating the "cv_progress_done" and "cv_progress_error" flags altogether. In the case where we reuse the same view, just call update_for_new_location_and_selection -- the old code set "view_activation_complete", but I eliminated that flag. (handle_view_failure): Remove the old view using nautilus_window_set_content_view_widget instead of having duplicate code here. Use a call to cancel_location_change instead of setting the "reset_to_idle" and "cv_progress_error" flags (both gone now). (free_location_change): No need to clean up "error_views" any more, because that field is gone. (end_location_change): New helper to stop the throbber from throbbing and then free the location change state. (cancel_location_change): Get rid of special case for NULL location now that set_displayed_location can handle it. (nautilus_window_end_location_change_callback): Remove "superstitiously" added call to update_state and call load_content_view_for_new_location directly. (nautilus_window_begin_location_change): Use a call to cancel_location_change to deal with the possibility that we may have a change already in progress. (nautilus_window_stop_loading): Use cancel_location_change to stop the loading. (nautilus_window_set_content_view): Remove calls to update_state -- there's no state to update any more. (nautilus_window_set_sidebar_panels): Do an async. load here and finish the setup in the view_loaded callback. (failed_callback): Do a handle_view_failed right here, now that we have no state machine to satisfy. (load_underway_callback): Change code to handle the two interesting cases separately without a state machine. When the new content view says "underway", it's time for location_has_really_changed. When an existing content view says "underway", we restart the throbber (fixes 1/2 of bug 2461). (load_complete_callback): Since view frames now ensure we get an underway call before a complete call, we can simplify the logic. If the main content view says "complete", it's time to stop the throbber (fixes other 1/2 of bug 2461). (view_loaded_callback): Renamed the client_loaded callback. Also made it update location and selection for sidebar panels when they are loaded. Also made it update the title for any view when it's loaded. * src/nautilus-window.h: * src/nautilus-window.c: (nautilus_window_synch_view_as_menu): Handle case of NULL content view. (nautilus_window_set_content_view_widget): Destroy the view when it's going away instead of removing it from the parent. Also make this function handle the NULL case so we can use it to remove the old view, not just to add the new one. * libnautilus-extensions/nautilus-bonobo-extensions.h: Whitespace tweak. * src/nautilus-sidebar.c: (nautilus_sidebar_active_panel_matches_id): Update for nautilus_view_frame_get_view_iid name change.
* reviewed by: John Sullivan <sullivan@eazel.com>Darin Adler2001-01-261-73/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some preparation work for doing async. activation. This amounts to another pass cleaning up the legendary "state machine" as well as some other cleanups in the async. activation code. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (oaf_activation_callback), (nautilus_bonobo_activate_from_id), (nautilus_bonobo_activate_cancel): Fix interface of activation to be cleaner. Also handle case where callback is called right away. Add queuing to NautilusView so that all incoming CORBA calls are dispatched at idle time. This can fix some otherwise-difficult re-entrancy problems. The widget destroy call can still come in at any time though. Also this same fix may be needed for the NautilusViewFrame side. * libnautilus/nautilus-view.h: * libnautilus/nautilus-view.c: (execute_queued_calls): Function to dequeue and execute calls. (dequeue_calls_at_idle): Cover to call it at idle time. (discard_queued_calls): Discard calls without executing them, for use at destroy time. (queue_incoming_call): Simple cover to queue and schedule an idle-time dequeue pass. (nautilus_g_list_from_uri_list): Need to make a full copy, not a shallow copy, now that we are queuing things for a hile. (call_load_location), (call_stop_loading), (call_selection_changed), (call_title_changed), (call_history_changed): Simple functions that get queued. (list_deep_free_cover): GDestroyNotify-compatible function for one destroy case. (history_dup): Function to copy the history list, since that is now queued instead of used right away. (impl_Nautilus_View_load_location), (impl_Nautilus_View_stop_loading), (impl_Nautilus_View_selection_changed), (impl_Nautilus_View_title_changed), (impl_Nautilus_View_history_changed): Change these all to queue the incoming call instead of doing work right away. (nautilus_view_destroy): Discard the queue. * src/nautilus-view-frame-corba.c: (impl_Nautilus_ViewFrame_open_location_force_new_window), (impl_Nautilus_ViewFrame_report_selection_change): These calls now use the deep copy, since the shallow one is no longer available. This is good since we probably will be doing queuing here later, so we'll need the deep copy. * src/nautilus-view-frame.h: * src/nautilus-view-frame.c: (nautilus_view_frame_initialize_class): Set up a map default signal handler to activate the control. This is better than the old way, where we had an explicit call to do it. (nautilus_view_frame_destroy_client): Remove unused CORBA_Environment. (view_frame_activated): Remove unneeded ACTIVATING state. Also send the client_loaded signal in here, so you can't "forget". (view_frame_wait), (view_frame_underway), (view_frame_wait_is_over), (view_frame_loaded), (view_frame_failed): Remove unneeded ACTIVATING state. (check_if_view_is_gone): Simplify logic and make sure to check the value of the exception and not just the function result. (attach_client): Fix CORBA_Exception that was allocated twice and that could also be allocated and not freed in some cases. (activation_callback), (nautilus_view_frame_load_client_async): Better names, use new API, still not tested. (nautilus_view_frame_load_client): Get rid of function result and use unified interface for telling about success and failure so that sync. and async. interfaces will be the same. (nautilus_view_frame_stop): Renamed this single function, which will soon stop either activation that's in process or loading that's in process with a single call. For now it's just the same as the old stop_loading call. (nautilus_view_frame_map): New override to activate the control. This replaces the old explicit activate call. (send_history), (nautilus_view_frame_get_is_underway): Remove unneeded ACTIVATING state. * src/nautilus-window.h: * src/nautilus-window-manage-views.c: (location_has_really_changed): Assume that new_content_view is not NULL. The old code was trying to be inappropriately "general". (disconnect_destroy_unref_view): Remove now-unused function. (load_content_view): Don't use a return value any more, since it's important to set up new_content_view before any signals happen. Get rid of code that handles failure right at the start, since we now get all failures through the signal handler. (handle_view_failure): Add FIXME comments. Minor refactoring. (cancel_location_change): Eliminated now-uneeded views_shown and view_bombed_out booleans. (load_view_for_new_location): New load_content_view doesn't return a value any more. (update_state): Changed this to be a loop instead of returning a boolean and always being called in a loop. Also simplified logic so that views_shown and view_bombed_out aren't needed any more. (nautilus_window_end_location_change_callback): Use update_state directly instead of calling the old clunky change_state cover. (nautilus_window_begin_location_change): Use update_state directly instead of calling the old clunky change_state cover. (stop_loading): Call the new simple nautilus_view_frame_stop instead of nautilus_view_frame_stop_loading. (natuilus_window_stop_loading): Use update_state directly instead of calling the old clunky change_state cover. (nautilus_window_set_content_view): Use update_state directly instead of calling the old clunky change_state cover. (nautilus_window_set_sidebar_panels): Handle failures with callback instead of looking at return value (which no longer exists). (client_loaded_callback): Add this new callback that's done when the view is activated and ready to go. (failed_callback): Use update_state directly instead of calling the old clunky change_state cover. (load_underway_callback): Use update_state directly instead of calling the old clunky change_state cover. (load_complete_callback): Use update_state directly instead of calling the old clunky change_state cover. * src/nautilus-window.c: (nautilus_window_set_content_view_widget): Get rid of explicit activation, no longer needed now that NautilusViewFrame handles it directly. * test/test-nautilus-async-activation.c: (activation_callback), (main): Change to use new async. API. * user-guide/gnufdl/.cvsignore: Add to ignore some missing files.
* reviewed by: John Sullivan <sullivan@eazel.com>Darin Adler2000-12-111-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 5112 (Segfault on startup using non C locale). The error was caused by localized text making it through bonobo to gnome-xml, which only happened because we were using an incorrect attribute name. * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: Removed nautilus_bonobo_set_description because there is no attribute named "description" any more. It's now "tip". * src/file-manager/fm-directory-view.c: (real_update_menus): Use set_tip instead of set_description. Another cut at the placeholder changes. I caught one problem and John caught some others when he reviewed my last check-in. * src/file-manager/nautilus-directory-view-ui.xml: * src/file-manager/nautilus-icon-view-ui.xml: * src/nautilus-service-ui.xml: Removed some "delimit" and added others. Only the file that actually defines a placeholder should use a delimit, and you must always use a delimit when defining the placeholder.
* reviewed by: Darin Adler <darin@eazel.com>John Sullivan2000-11-171-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Final changes to kill off the legendary bug 3579 (Convert directory view context menus to use Bonobo) * libnautilus/nautilus-bonobo-ui.h: #define for zoom items placeholder in popup. Remove #defines for popup-specific zooming commands, since now we don't need distinct popup-specific ones. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_label_for_menu_item_and_command): Moved this here and commented; it had been a private function in fm-directory-view.c. * src/file-manager/fm-directory-view.c: (real_merge_menus): Just hide the placeholder for the zoom items, which is now sufficient due to a Bonobo fix Darin made. (real_update_menus): Update for API name change. (set_label_for_menu_and_command): Moved this to another file and renamed it. * src/file-manager/fm-icon-view.c: (fm_icon_view_update_menus): Update the dynamic menu items in-line here, as was done with fm-directory-view.c in an earlier checkin. (compute_menu_item_info), (update_one_menu_item): Removed these obsolete functions. * src/nautilus-shell-ui.xml: Eliminated special pop-up versions of zoom commands. They existed only to allow hiding without affecting the menu-bar versions, but now that placeholders can be hidden these aren't necessary. * src/nautilus-window-menus.c: (nautilus_window_initialize_menus): Removed verb installation for pop-up versions of zoom commands.
* reviewed by: Darin Adler <darin@eazel.com>John Sullivan2000-11-151-45/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More work towards using Bonobo for context menus. All context menu items should now appear and be correctly hooked up. The Bonobo context menus are still not quite enabled, awaiting a couple of Bonobo fixes. Redid the API for creating dynamic sets of Bonobo menu items (as used by bookmarks, application & viewer lists), and added support for lists of toggle items (needed for Disks submenu in desktop context menu). Also, added "Show Trash" menu item in File menu, just above Empty Trash, after discussing with Andy and Arlo. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (get_numbered_menu_item_name): New helper function, returns generated menu item name given parent path and index. (nautilus_bonobo_get_numbered_menu_item_command): New function, returns generated command name given parent path and index. (nautilus_bonobo_get_numbered_menu_item_path): New function, returns generated menu item path given parent path and index. (add_numbered_menu_item_internal): New helper function, creates menu item using these other new calls. Mostly extracted and rewritten from nautilus_bonobo_add_menu_item. (nautilus_bonobo_add_numbered_menu_item): Renamed from nautilus_bonobo_add_menu_item, and reimplemented to call add_numbered_menu_item_internal. (nautilus_bonobo_add_numbered_toggle_menu_item): New function, like _add_numbered_menu_item but creates a toggle menu item. (remove_commands): Renamed from remove_verbs; now handles ids as well as verbs. (nautilus_bonobo_remove_menu_items_and_commands): Renamed from ..._items_and_verbs; now handles ids as well as verbs. (nautilus_bonobo_get_menu_item_verb_name): Removed; replaced by _get_numbered_menu_item_command. * src/file-manager/nautilus-desktop-icon-view-ui.xml: New file, Bonobo-style version of desktop context menus. * src/file-manager/Makefile.am: Include new file in build. * src/file-manager/fm-desktop-icon-view.c: Add BonoboUIComponent to details struct. (fm_desktop_icon_view_destroy): Dispose of BonoboUIComponent. (fm_desktop_icon_view_initialize_class): wire up overrides for merge_menus and update_menus. (new_terminal_callback), (change_background_callback), (empty_trash_callback), (reset_background_callback), (quit_desktop_callback): New Bonobo-style menu callbacks. (empty_trash_menu_item_callback): Renamed so I could use the old simpler name for new Bonobo callback; this one will be deleted when the Bonobo conversion is completed. (fm_desktop_icon_view_create_selection_context_menu_items): Reflect name change. (mount_or_unmount_removable_volume): New Bonobo listener callback used by Disks items. (update_disks_menu): New function, recreates the Disks menu. (real_update_menus): New function, updates the dynamic desktop context menu items. (real_merge_menus): New function, wires up the BonoboUIComponent and verbs. * src/file-manager/fm-directory-view.c: (fm_directory_view_pop_up_background_context_menu), (fm_directory_view_pop_up_selection_context_menu): Change TRUE to FALSE to enable the Bonobo context menus. (show_trash_callback): New function, navigates to "trash:" (add_open_with_program_menu_item), (reset_bonobo_open_with_menu): Reworked for new API. (real_merge_menus): Add verb for "Show Trash" * src/file-manager/nautilus-directory-view-ui.xml: Added "Show Trash"; added placeholders in background popup used for desktop view. * src/nautilus-window-menus.c: (append_bookmark_to_menu): Updated for new numbered_menu_item API; deleted unused parameter. (create_menu_item_from_node), (append_dynamic_bookmarks), (refresh_go_menu): Updated append_bookmark_to_menu callers for API changes. (nautilus_window_remove_bookmarks_menu_items), (nautilus_window_remove_go_menu_items): Updated for API name changes.
* small fix: replace NULL with CORBA_OBJECT_NIL add new test.Mathieu Lacage2000-11-071-4/+5
| | | | | | | | | | 2000-11-06 Mathieu Lacage <mathieu@eazel.com> * libnautilus-extensions/nautilus-bonobo-extensions.c: (oaf_activation_callback): small fix: replace NULL with CORBA_OBJECT_NIL * test/Makefile.am: add new test. * test/test-nautilus-async-activation.{c|h}
* Fixed 3568: Bonobo verbs and data leak when menus rebuiltJohn Sullivan2000-10-231-7/+42
| | | | | | | | | | | | | | | | | | | | Michael Meeks added verb-removing support to Bonobo, which I have now deployed in Nautilus. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (remove_verbs): New function, walks through the XML nodes beneath a specified path and removes each verb it finds. (nautilus_bonobo_remove_menu_items_and_verbs): Now calls remove_verbs; also changed name from _remove_menu_items for clarity. * src/file-manager/fm-directory-view.c: (reset_bonobo_open_with_menu): * src/nautilus-window-menus.c: (nautilus_window_remove_bookmarks_menu_items), (nautilus_window_remove_go_menu_items): Removed FIXMEs and updated for name change.
* Fixed bug 3705, Bookmark icons do not appear in the menu itemGene Z. Ragan2000-10-191-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-18 Gene Z. Ragan <gzr@eazel.com> Fixed bug 3705, Bookmark icons do not appear in the menu item This was caused by a strange precedence issue in the setting of UI component pixbuf data. If a menu item has alread been created, setting the pixbuf data will have no effect. Either the verb for the item has to be set with the data or the item has to have its XML contructed with the pixbuf type and data included in it at creation time. I have opted for the latter choice. * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_add_menu_item): Added setting of bitmap data if it is present as a valid argument passed into the function. * src/file-manager/fm-directory-view.c: (add_open_with_app_bonobo_menu_item), (add_open_with_viewer_bonobo_menu_item): Call nautilus_bonobo_add_menu_item * src/nautilus-window-menus.c: (append_bookmark_to_menu): Call nautilus_bonobo_add_menu_item * src/nautilus-window.c: (nautilus_window_filter), (nautilus_window_realize), (view_menu_choose_view_callback), (nautilus_window_show): Work in progress to handle focus issues when performing click drag operations in background windows. * libnautilus-extensions/nautilus-gdk-extensions.c: * libnautilus-extensions/nautilus-gdk-extensions.h: (nautilus_gdk_window_set_wm_hints_input): New function set input files of WM_HINTS. This will be used later to handle click drag in background windows.
* Fixed an error where I was escaping the wrong item to create a unique verbGene Z. Ragan2000-10-161-1/+1
| | | | | | | | | | | | 2000-10-16 Gene Z. Ragan <gzr@eazel.com> Fixed an error where I was escaping the wrong item to create a unique verb name. * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_add_menu_item): * src/nautilus-window-menus.c: (append_bookmark_to_menu):
* Work in progress on creating unique ideas for menu items added to theGene Z. Ragan2000-10-131-10/+15
| | | | | | | | | | | | | | | | | | | | 2000-10-13 Gene Z. Ragan <gzr@eazel.com> Work in progress on creating unique ideas for menu items added to the bookmarks menu. * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_add_menu_item), (nautilus_bonobo_get_menu_item_verb_name): * src/file-manager/fm-directory-view.c: (add_open_with_app_bonobo_menu_item), (add_open_with_viewer_bonobo_menu_item): * src/nautilus-window-menus.c: (append_bookmark_to_menu), (create_menu_item_from_node), (append_dynamic_bookmarks), (refresh_go_menu):
* new design for the state machine taking into account the new async states.Mathieu Lacage2000-10-131-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-13 Mathieu Lacage <mathieu@eazel.com> * docs/state-machines.txt: new design for the state machine taking into account the new async states. * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_icon), (oaf_activation_callback), (nautilus_bonobo_activate_from_id), (nautilus_bonobo_activate_stop), (nautilus_bonobo_activate_free): add async activation call. * libnautilus-extensions/nautilus-bonobo-extensions.h: add prototypes. * src/nautilus-view-frame.c: (nautilus_view_frame_initialize_class), (view_frame_activating), (view_frame_not_activated), (view_frame_activated), (view_frame_stop_activation), (view_frame_wait), (view_frame_underway), (view_frame_wait_is_over), (view_frame_loaded), (view_frame_failed), (nautilus_view_frame_set_to_component), (activation_callback), (nautilus_view_frame_load_client_async), (nautilus_view_frame_load_client), (nautilus_view_frame_stop_activation), (nautilus_view_frame_load_location): implement new state machine. add comments to explain by which stimulus the state-chaging functions are triggered. * src/nautilus-view-frame.h: add prototype for new async activation function of ViewFrames.
* Fixed storage leak. (nautilus_bonobo_get_hidden): Fixed bug where an itemDarin Adler2000-10-111-88/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_get_label): Fixed storage leak. (nautilus_bonobo_get_hidden): Fixed bug where an item without a hidden property would say it was hidden, but the default is to not be hidden. Also fixed a storage leak. (nautilus_bonobo_add_menu_item), (nautilus_bonobo_add_submenu): Added code to encode the label. This is due to the hack added to bonobo so we can handle 8-bit characters in labels without updgrading to gnome-xml 2. (nautilus_bonobo_set_icon): Removed the code to get the old value of the icon before setting the new value. Also improved return_if_fail checks a bit. If we're going to have them, they should check the type, not just != NULL. * libnautilus-extensions/nautilus-bonobo-extensions.h: Fixed the formatting and removed the old code in ifdef UIH. * po/XMLFILES.in: Added a bunch of XML files that will one-day need localization. * src/file-manager/fm-icon-view.c: (update_layout_menus): Set up the toggle state using the command rather than the menu item. * src/nautilus-shell-ui.xml: First cut at making the location bar expand rather than * src/nautilus-window.c: (nautilus_window_destroy): * components/services/install/command-line/Makefile.am: Added a bunch of unused files to this makefile to quiet down the check-headers-in-Makefile.pl script. This is the one directory where we had dead C code that's not mentioned in the makefile.
* New function to set the "tip" property of a bonobo UI component.Gene Z. Ragan2000-10-111-0/+12
| | | | | | | | | | | | | 2000-10-11 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_set_tip): New function to set the "tip" property of a bonobo UI component. * src/nautilus-window-menus.c: (append_bookmark_to_menu): Call new function above to set tip of bookmark menu items.
* New function, does the obvious. (nautilus_bonobo_get_hidden): Check forJohn Sullivan2000-10-111-5/+11
| | | | | | | | | | | | | | | | | | | | | * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_get_label): New function, does the obvious. (nautilus_bonobo_get_hidden): Check for "0" for FALSE rather than "1" for TRUE, since anything non-"0" is more TRUE than it is FALSE. * src/nautilus-about.c: (nautilus_about_draw_info): Fixed build-breakage where MAX_AUTHOR_COUNT wasn't #defined, by replacing it with "-1" for g_strsplit. * src/nautilus-window-menus.c: (remove_underline_accelerator_from_menu_title), (nautilus_window_disable_keyboard_navigation_for_menus): Modernized this code to try to fix bug 2327, but it seems there is some new Bonobo bug in the way. (update_user_level_menu_items): Removed obsolete comment.
* s2000-10-10 Gene Z. Ragan <gzr@eazel.com>Gene Ragan2000-10-101-7/+44
| | | | | | | | | | | | | | | | | | | | | | Work on making bookmarks and history work with new bonobo UI code. * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_add_menu_item), (nautilus_bonobo_add_submenu), (nautilus_bonobo_add_menu_separator), (nautilus_bonobo_get_menu_item_verb_name): New utility funcitons to make menu manipulation easier. * src/nautilus-window-menus.c: (activate_bookmark_in_menu_item), (append_bookmark_to_menu), (append_separator), (create_menu_item_from_node), (append_static_bookmarks), (refresh_bookmarks_menu), (nautilus_window_initialize_menus), (nautilus_window_remove_bookmarks_menu_items), (nautilus_window_remove_go_menu_items), (append_dynamic_bookmarks), (refresh_go_menu): Modified functions and removed code in an effort to make bookmarks and history be happy once more.
* Fixed bug 3587 ("Close All Windows" doesn't work)John Sullivan2000-10-101-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 3556 (Find button and Find menu item states aren't synchronized) * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_accelerator), (nautilus_bonobo_set_description), (nautilus_bonobo_set_label), (nautilus_bonobo_set_sensitive), (nautilus_bonobo_set_hidden), (nautilus_bonobo_get_hidden), (nautilus_bonobo_set_icon): Changed g_asserts to g_return_if_fails when checking parameters. (nautilus_bonobo_set_toggle_state): New cover function for setting a boolean state on a Bonobo item. * libnautilus-extensions/nautilus-bonobo-extensions.h: Prototype for nautilus_bonobo_set_toggle_state. * src/nautilus-shell-ui.xml: Use different verb for Find button than for Find menu item to work around bug 3590. * src/nautilus-window-private.h: Add updating_bonobo_state boolean to work around design flaw where there's no way to set menu item or toggle button state without activating its callback. * src/nautilus-window-menus.c: Removed #defines for unused MENU_PATHs (file_menu_toggle_find_mode_callback): Bail out if updating_bonobo_state. (nautilus_window_initialize_menus): Fix verb name for Close All Windows; add new verb for Find toggle button. (nautilus_window_update_find_menu_item): Use #define for path; remove now-used unused-function from hack. * src/nautilus-window.c: (navigation_bar_mode_changed_callback): Set Find toggle button state, inside updating_bonobo_state = TRUE block.
* Changed prototype to take only label as argument. Name is now derived formGene Z. Ragan2000-10-101-3/+2
| | | | | | | | | | | | | | | 2000-10-10 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_add_menu_item): Changed prototype to take only label as argument. Name is now derived form the label. * src/file-manager/fm-directory-view.c: (add_open_with_app_bonobo_menu_item), (add_open_with_viewer_bonobo_menu_item): Call modified nautilus_bonobo_add_menu_item.
* Fixed bug 3513, No applications or viewers appear in "Open With" menu inGene Z. Ragan2000-10-101-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-09 Gene Z. Ragan <gzr@eazel.com> Fixed bug 3513, No applications or viewers appear in "Open With" menu in menu bar * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: (nautilus_bonobo_add_menu_item), (nautilus_bonobo_remove_menu_items): New functions to add a menu items and remove multiple menu items from a submenu. * src/file-manager/fm-directory-view.c: * src/file-manager/fm-directory-view.h: (bonobo_launch_application_callback), (bonobo_open_location_with_viewer_callback), (add_open_with_app_bonobo_menu_item), (add_open_with_viewer_bonobo_menu_item), (add_application_to_bonobo_menu), (add_component_to_bonobo_menu), (reset_bonobo_open_with_menu), (fm_directory_view_real_update_menus): Call new nautilus bonobo functions to add applications and viewers to Open With... menu. Also add verbs in addition to creating the menu items.
* Fix bugs 3498, 3523 and the nautilus part of 3497 3497 bug fix is disabledMathieu Lacage2000-10-091-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-09 Mathieu Lacage <mathieu@eazel.com> Fix bugs 3498, 3523 and the nautilus part of 3497 3497 bug fix is disabled because there is a bug in bonobo. bug you can try it if you set BONOBO_WORKAROUND to 1. * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_accelerator), (nautilus_bonobo_set_description), (nautilus_bonobo_set_label), (nautilus_bonobo_set_sensitive), (nautilus_bonobo_set_hidden), (nautilus_bonobo_get_hidden), (nautilus_bonobo_set_icon): add g_asserts. add (nautilus_bonobo_set_icon) * libnautilus-extensions/nautilus-bonobo-extensions.h: add (nautilus_bonobo_set_icon) prototype * src/Makefile.am: beautification. * src/file-manager/fm-desktop-icon-view.c: (fm_desktop_icon_view_initialize_class): a space... * src/file-manager/fm-directory-view.c: (fm_directory_view_real_merge_menus): a space too... * src/nautilus-shell-ui.xml: mainly a few spaces. * src/nautilus-window-manage-views.c: (load_content_view): use bonobo_ui_component_freeze/thaw * src/nautilus-window-menus.c: (nautilus_window_update_show_hide_menu_items), (get_user_level_icon_name), (switch_to_user_level), (add_user_level_menu_item), (nautilus_window_initialize_menus), (nautilus_window_update_find_menu_item), (update_user_level_menu_items), (convert_user_level_to_path): use bonobo_ui_component_freeze/thaw and add the corect calls to nautilus_bonobo_set_icon * src/nautilus-window.c: (nautilus_window_constructed), (show_dock_item): add calls to nautilus_bonobo_set_hidden to remove the toolbars for the desktop case.
* Fix bug 3125. new bonbo ui handler.Mathieu Lacage2000-10-061-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-06 Mathieu Lacage <mathieu@eazel.com> Fix bug 3125. new bonbo ui handler. * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_hidden), (nautilus_bonobo_get_hidden): add new functions. * libnautilus-extensions/nautilus-bonobo-extensions.h: add prototypes. * src/nautilus-window-menus.c: (nautilus_window_update_show_hide_menu_items): switch to new bonobo code to hide/show toolbars. change menu paths too. * src/nautilus-window-private.h: change menu paths. * src/nautilus-window.c: (show_dock_item), (hide_dock_item), (dock_item_showing), (nautilus_window_hide_location_bar), (nautilus_window_show_location_bar), (nautilus_window_location_bar_showing), (nautilus_window_hide_tool_bar), (nautilus_window_show_tool_bar), (nautilus_window_tool_bar_showing), (nautilus_window_hide_status_bar), (nautilus_window_show_status_bar), (nautilus_window_status_bar_showing): switch to new bonobo code for toolbar hiding/showing
* Work on bug 3496 (labels in menu items never change)John Sullivan2000-10-061-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work on bug 3495 (menu item sensitivity never changes) Fixed bug 3503 ("Delete from Trash" never appears) * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_accelerator), (nautilus_bonobo_set_description): More new wrappers for xml shenanigans. * libnautilus/nautilus-bonobo-ui.h: * src/file-manager/fm-directory-view.h: Updated #defines for menu paths to match new syntax (start with "/menu", include placeholder names) * src/file-manager/fm-directory-view.c: Store the BonoboUIComponent in FMDirectoryViewDetails. (fm_directory_view_real_create_selection_context_menu_items), (reset_bonobo_trash_delete_menu), (compute_menu_item_info): merge "Move to Trash" and "Delete from Trash" into single item. (update_one_menu_item): Use new-style Bonobo calls. (fm_directory_view_real_merge_menus): Remove old #ifddeffed code. (fm_directory_view_real_update_menus): #ifdef guts back in, and remove UIHandler references. * src/file-manager/nautilus-directory-view-ui.xml: Fixed typo in "Open in New Window" label. * src/nautilus-window-menus.c: (nautilus_window_update_find_menu_item): Removed stray debugging comment.
* Work on bug 3496 (labels in menu bar items never change)John Sullivan2000-10-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Finished bug 3505 (tool bar & location bar don't extend across window) * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_label): New cover for bonobo xml shenanigans to change the displayed label of an item (menu item, toolbar item, whatever). * src/nautilus-shell-ui.xml: Set behavior attributes on tool bar and location bar so they fill the width of the window and so the location bar can't be made vertical. (Requires bonobo update to see this work.) * src/nautilus-window-menus.c: (append_separator): New not-yet-implemented function called by other not-yet-working-again code. (nautilus_window_initialize_menus): Took out a bunch of the old #ifdeffed code now that the replacement code works. (nautilus_window_update_find_menu_item): Toggle the label of the Find menu item. * src/nautilus-window.c: (nautilus_window_constructed): Removed some #ifdeffed code.
* Change required versions.Darin Adler2000-10-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | * README: Change required versions. * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_set_sensitive): Added new function that works with the new UI framework. * libnautilus-extensions/nautilus-druid-page-eazel.h: * libnautilus-extensions/nautilus-druid.h: * src/nautilus-shell-ui.xml: Make Select All insensitive. * src/nautilus-window.c: (nautilus_window_constructed): Get rid of some more of the old status bar code. (nautilus_window_allow_back), (nautilus_window_allow_forward), (nautilus_window_allow_up), (nautilus_window_allow_reload), (nautilus_window_allow_stop), (nautilus_window_zoom_level_changed_callback): Set shell menu item sensitivity with the new API. * src/nautilus-window.h: Remove status_bar_context_id.
* Cut over to HEAD of Bonobo. This check-in includes all the changesDarin Adler2000-10-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed to compile and run, but there are many things wrong visually that may take a while to get fixed. * src/nautilus-window-menus.c: (file_menu_new_window_callback), (file_menu_close_window_callback), (file_menu_close_all_windows_callback), (file_menu_toggle_find_mode_callback), (file_menu_web_search_callback), (edit_menu_undo_callback), (edit_menu_cut_callback), (edit_menu_copy_callback), (edit_menu_paste_callback), (edit_menu_clear_callback), (go_menu_back_callback), (go_menu_forward_callback), (go_menu_up_callback), (go_menu_home_callback), (go_menu_forget_history_callback), (view_menu_reload_callback), (view_menu_show_hide_sidebar_callback), (view_menu_show_hide_tool_bar_callback), (view_menu_show_hide_location_bar_callback), (view_menu_show_hide_status_bar_callback), (nautilus_window_update_show_hide_menu_items), (view_menu_zoom_in_callback), (view_menu_zoom_out_callback), (view_menu_zoom_normal_callback), (bookmarks_menu_add_bookmark_callback), (bookmarks_menu_edit_bookmarks_callback), (user_level_customize_callback), (customize_callback), (change_appearance_callback), (help_menu_about_nautilus_callback), (help_menu_nautilus_feedback_callback), (switch_to_user_level), (user_level_menu_item_callback), (append_placeholder), (append_separator), (append_bookmark_to_menu), (create_menu_item_from_node), (remove_bookmarks_after), (remove_underline_accelerator_from_menu_title), (new_top_level_menu), (add_user_level_menu_item), (nautilus_window_initialize_menus), (nautilus_window_update_find_menu_item), (update_user_level_menu_items), (convert_verb_to_user_level), (convert_user_level_to_verb), (update_preferences_dialog_title): * src/nautilus-window.c: (nautilus_window_clear_status), (nautilus_window_set_status), (install_status_bar), (nautilus_window_constructed), (nautilus_window_set_arg), (nautilus_window_get_arg), (nautilus_window_destroy), (nautilus_window_allow_back), (nautilus_window_allow_forward), (nautilus_window_allow_up), (nautilus_window_allow_reload), (nautilus_window_zoom_level_changed_callback), (nautilus_window_set_content_view_widget), (show_dock_item), (hide_dock_item), (dock_item_showing), (nautilus_window_hide_tool_bar), (nautilus_window_show_tool_bar), (nautilus_window_tool_bar_showing), (nautilus_window_hide_status_bar), (nautilus_window_show_status_bar), (nautilus_window_status_bar_showing): Convert to new API. Some is disabled with #ifdef UIH. * Makefile.am: * configure.in: Turned off build of the idl directory, build components after src. * components/adapter/main.c: * components/notes/nautilus-notes.c: * components/sample/main.c: * libnautilus-extensions/nautilus-font-picker.c: * libnautilus-extensions/nautilus-global-preferences.c: * libnautilus-extensions/nautilus-password-dialog.c: * libnautilus-extensions/nautilus-preferences-item.c: * libnautilus/nautilus-undo-transaction.c: * libnautilus/nautilus-undo.c: * src/nautilus-application.c: * src/nautilus-history-frame.c: * src/nautilus-link-set-window.c: * src/nautilus-main.c: * src/nautilus-shell.c: * src/nautilus-sidebar.c: * src/nautilus-view-frame-corba.c: * src/nautilus-zoomable-frame-corba.c: * test/test-nautilus-font-picker.c: * test/test-nautilus-image.c: (create_font_picker_frame): * test/test-nautilus-label.c: (create_font_picker_frame): * test/test-nautilus-preferences.c: * test/test-nautilus-widgets.c: (radio_group_load_it_up): Fixed includes. * test/test-nautilus-image.c: (create_font_picker_frame): * test/test-nautilus-label.c: (create_font_picker_frame): * test/test-nautilus-widgets.c: (radio_group_load_it_up): Turned off localization of some strings in tests. * components/adapter/nautilus-adapter-control-embed-strategy.c: (nautilus_adapter_control_embed_strategy_new): * components/adapter/nautilus-adapter-control-embed-strategy.h: * components/adapter/nautilus-adapter-embed-strategy.c: (nautilus_adapter_embed_strategy_get): * components/adapter/nautilus-adapter-embed-strategy.h: * components/adapter/nautilus-adapter-embeddable-embed-strategy.c: (nautilus_adapter_embeddable_embed_strategy_new): * components/adapter/nautilus-adapter-embeddable-embed-strategy.h: Embedding code now deals with Bonobo_UIContainer, not Bonobo_UIHandler. * components/adapter/nautilus-adapter.c: (nautilus_adapter_new): This code not only had to be changed to deal with the Bonobo_UIContainer instead of Bonobo_UIHandler, but it also needed to deal with the containing item (was remote_ui_handler), not the local component. * components/adapter/nautilus-adapter-embeddable-embed-strategy.c: (nautilus_adapter_embeddable_embed_strategy_new): * components/adapter/nautilus-adapter.c: BonoboContainer was renamed BonoboItemContainer. * components/history/nautilus-history-view.c: Remove unused BonoboUIHandler * field. * components/loser/content/Makefile.am: * components/loser/sidebar/Makefile.am: * components/mozilla/Makefile.am: * components/sample/Makefile.am: * src/Makefile.am: * src/file-manager/Makefile.am: Added the necessary defines and build rules to install ui.xml files and locate them from the C code. * src/file-manager/nautilus-directory-view-ui.xml: * src/file-manager/nautilus-icon-view-ui.xml: * src/file-manager/nautilus-search-list-view-ui.xml: * src/nautilus-shell-ui.xml: Added definitions of user interface. * components/loser/content/nautilus-content-loser-ui.xml: * components/loser/sidebar/nautilus-sidebar-loser-ui.xml: * components/mozilla/nautilus-mozilla-ui.xml: * components/sample/nautilus-sample-content-view-ui.xml: Added empty placeholders for user interface. * components/loser/content/nautilus-content-loser.c: (loser_merge_bonobo_items_callback): * components/loser/sidebar/nautilus-sidebar-loser.c: (loser_merge_bonobo_items_callback): * components/mozilla/nautilus-mozilla-content-view.c: (mozilla_merge_bonobo_items_callback): * components/sample/nautilus-sample-content-view.c: (sample_merge_bonobo_items_callback): Use nautilus_view_set_up_ui to get the user interface from a ui.xml file. Put #ifdef UIH around old code to make the items work that still needs to be visited. * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-undo-manager.c: * libnautilus-extensions/nautilus-undo-manager.h: * libnautilus/nautilus-clipboard.c: (add_menu_items_callback), (remove_menu_items_callback), (nautilus_clipboard_set_up_editable_from_bonobo_control): * libnautilus/nautilus-clipboard.h: Wrapped code in ifdef UIH to disable it until it can be converted to the new Bonobo. * libnautilus-extensions/nautilus-caption-table.h: * libnautilus-extensions/nautilus-caption.h: * libnautilus-extensions/nautilus-font-picker.h: * libnautilus-extensions/nautilus-preferences-group.h: * libnautilus-extensions/nautilus-preferences-item.h: * libnautilus-extensions/nautilus-radio-button-group.h: * src/nautilus-about.h: Got rid of any cases where headers include the omnibus header <gnome.h>. These made the conversion process harder, which is why we fixed them. * libnautilus/libnautilus.h: Got rid of cases where headers include the omnibus header <bonobo.h>. * libnautilus/nautilus-view.h: * libnautilus/nautilus-view.c: (nautilus_view_set_up_ui): Added a helper function to make it easy for Nautilus components to load their UI and get it attached to the Nautilus:View object. * nautilus.spec.in: Install the nautilus-*-ui.xml files too. * src/file-manager/fm-directory-view.h: * src/file-manager/fm-directory-view.c: (bonobo_menu_select_all_callback), (bonobo_menu_empty_trash_callback), (bonobo_control_activate_callback): Convert to new API. (fm_directory_view_get_bonobo_ui_container): Name and purpose changed slightly for new API. (fm_directory_view_real_merge_menus): Merge with new API. (fm_directory_view_real_update_menus): Disabled this code for now. * src/file-manager/fm-icon-view.c: (fm_icon_view_destroy): Destroy icon view's own component at destroy time. (context_menu_layout_radio_item_callback), (append_one_context_menu_layout_item), (fm_icon_view_create_background_context_menu_items), (update_layout_menus): Convert to new API, disable some with #ifdef UIH. (get_sort_criterion_by_verb), (set_sort_criterion_by_verb), (sort_callback): Convert to new API. (fm_icon_view_merge_menus): Merge with new API, creating our own UI component separate from the directory view's. (fm_icon_view_update_menus): Disable with #ifdef UIH. * src/file-manager/fm-search-list-view.h: * src/file-manager/fm-search-list-view.c: (fm_search_list_view_initialize_class), (fm_search_list_view_initialize), (real_destroy), (indexing_info_callback), (real_merge_menus), (real_update_menus): Add code necessary to use a separate UI component, and disabled the actual menu set-up code with #ifdef UIH. This required adding a details struct. * src/nautilus-desktop-window.c: (realize): Turned off the code that hides the desktop elements. * src/nautilus-window-private.h: * src/nautilus-view-frame.h: * src/nautilus-view-frame.c: (nautilus_view_frame_destroy), (nautilus_view_frame_new), (nautilus_view_frame_load_client): * src/nautilus-window-manage-views.c: (load_content_view), (nautilus_window_set_sidebar_panels): Change to use Bonobo_UIContainer instead of Bonobo_UIHandler. * src/nautilus-window-toolbars.c: (remember_buttons), (nautilus_window_initialize_toolbars): Leave this code around and change it enough to compile and run, even though it's creating a second, invisible toolbar. * src/nautilus-window.h: Change to be a BonoboWin subclass instead of a GnomeApp subclass.
* Updated code affected by destroy-notify addition to bonobo. Requires newDarin Adler2000-06-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated code affected by destroy-notify addition to bonobo. Requires new bonobo. * libnautilus-extensions/nautilus-bonobo-extensions.c: (nautilus_bonobo_ui_handler_menu_set_toggle_appearance): Save and restore the destroy notify function as well as the callback. This requires using the new function bonobo_ui_handler_menu_remove_callback_no_notify to do right. * src/file-manager/fm-directory-view.c: (application_launch_parameters_new), (application_launch_parameters_free): Ref and unref the directory view object now that we correctly free this as needed. (viewer_launch_parameters_new), (viewer_launch_parameters_free): Ref and unref the directory view object now that we correctly free this as needed. (add_open_with_bonobo_menu_item): Add a destroy-notify function parameters and apply it using bonobo_ui_handler_menu_set_callback. (add_application_to_bonobo_menu): Free the launch parmaeters using a destroy-notify function. (add_component_to_bonobo_menu): Free the launch parmaeters using a destroy-notify function. * src/nautilus-window-menus.c: (append_bookmark_to_menu): Use a destroy-notify function to destroy the bookmark holder. (clear_appended_bookmark_items): Get rid of the code that gets the callback data and destroys it explicitly. * libnautilus/nautilus-clipboard.c: (add_menu_item): * src/file-manager/fm-directory-view.c: (insert_bonobo_menu_item), (fm_directory_view_real_merge_menus): * src/file-manager/fm-icon-view.c: (append_bonobo_menu_item), (fm_icon_view_merge_menus): Rename BonoboUIHandlerCallbackFunc -> BonoboUIHandlerCallback. * HACKING: Some reformatting.
* Wrote a script to check for files that forget to include <config.h> andDarin Adler2000-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * check-config-h.pl: Wrote a script to check for files that forget to include <config.h> and optionally edit to add it. * src/nautilus-zoom-control.c (set_zoom_level): Fixed the bug number in a FIXME. * docs/style-guide.html: Added one more tip. * check-FIXME.pl: Use my newfound Perl knowledge to spruce it up. * components/help/converters/gnome-db2html2/gdb3html.c: * components/help/converters/gnome-db2html2/sect-elements.c: * components/help/converters/gnome-db2html2/sect-preparse.c: * components/help/converters/gnome-db2html2/toc-elements.c: * components/help/converters/gnome-info2html2/html.c: * components/help/converters/gnome-info2html2/main.c: * components/help/converters/gnome-info2html2/parse.c: * components/help/converters/gnome-info2html2/utils.c: * components/help/converters/gnome-man2html2/gnome-man2html.c: * components/help/hyperbola-filefmt.c: * components/help/hyperbola-nav-index.c: * components/help/hyperbola-nav-search.c: * components/help/hyperbola-nav-tree.c: * components/html/glibwww-callbacks.c: * components/html/glibwww-init.c: * components/html/glibwww-trans.c: * components/html/gnome-dialogs.c: * components/html/ntl-web-browser.c: * components/services/install/eazel-install-metadata.c: * components/services/install/eazel-install-protocols.c: * components/services/install/eazel-install-rpm-glue.c: * components/services/install/eazel-install-tests.c: * components/services/install/eazel-install-utils.c: * components/services/install/eazel-install-xml-package-list.c: * components/services/install/eazel-install.c: * components/services/install/helixcode-install-utils.c: * components/services/startup/eazel-register.c: * components/websearch/ntl-web-search.c: * helper-utilities/authenticate/nautilus-authenticate-fork.c: * helper-utilities/authenticate/nautilus-authenticate-pam.c: * helper-utilities/authenticate/nautilus-authenticate.c: * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-file-utilities.c: * libnautilus-extensions/nautilus-glib-extensions.c: * libnautilus-extensions/nautilus-link.c: * libnautilus-extensions/nautilus-mime-type.c: * libnautilus-extensions/nautilus-undo-transaction.c: * librsvg/art_rgba.c: * librsvg/art_rgba_svp.c: * librsvg/rsvg-bpath-util.c: * librsvg/rsvg-path.c: * librsvg/rsvg.c: * librsvg/test-rsvg.c: * nautilus-widgets/nautilus-caption-table.c: * nautilus-widgets/nautilus-password-dialog.c: * nautilus-widgets/nautilus-preferences-box.c: * nautilus-widgets/nautilus-preferences-dialog.c: * nautilus-widgets/nautilus-preferences-group.c: * nautilus-widgets/nautilus-preferences-item.c: * nautilus-widgets/nautilus-preferences-pane.c: * nautilus-widgets/nautilus-radio-button-group.c: * nautilus-widgets/test-nautilus-widgets.c: * nautilus-widgets/test-preferences.c: * src/file-manager/desktop-item.c: * src/file-manager/desktop-layout.c: * src/file-manager/desktop-menu.c: * src/nautilus-bookmarks-window.c: * src/nautilus-gconf.c: * src/nautilus-window-menus.c: * src/nautilus-window-toolbars.c: * src/nautilus-zoom-control.c * src/nautilus-zoomable-frame-svr.c: * src/ntl-app.c: * src/ntl-content-view.c: * src/ntl-main.c: * src/ntl-meta-view.c: * src/ntl-miniicon.c: * src/ntl-uri-map.c: * src/ntl-view-frame-svr.c: * src/ntl-view.c: * src/ntl-window-state.c: Added includes of <config.h>.
* Moved a couple of utility functions into the right libnautilus homes.John Sullivan2000-03-161-0/+55
View Lorry Controller Status