diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-05-23 20:13:57 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-05-23 20:13:57 +0000 |
| commit | 8ce35298c3fb3f64f865a6d326fb4c5d846dd26b (patch) | |
| tree | 89607240a9671ea230ed5bc7bd57a266224d02f7 | |
| parent | f469d19b6b8f5dde7f7b1fa44c6cfcca54a0ea5d (diff) | |
| download | nautilus-8ce35298c3fb3f64f865a6d326fb4c5d846dd26b.tar.gz | |
The ViewFrame <-> View renaming.
We still have to rename the files.
* RENAMING: Put in explicit cases for file name renaming.
* src/Makefile.am:
* src/nautilus-desktop-window.c:
* src/nautilus-desktop-window.h:
Added placeholders. I'll be putting code in here soon.
* src/ntl-app.c: (display_prototype_caveat):
Changed to use nautilus_simple_dialog again since otherwise it
comes up behind the main window. Perhaps someone will resolve
that issue and change it back.
* libnautilus-extensions/nautilus-gnome-extensions.h:
* libnautilus-extensions/nautilus-gnome-extensions.c:
(nautilus_warning_dialog), (nautilus_warning_dialog_parented):
Added centered version of the warning dialog as well, since
Eskil was using gnome_warning_dialog in a case where he really
wanted lines wrapped.
* components/loser/.cvsignore:
* components/loser/content/.cvsignore:
* components/loser/sidebar/.cvsignore:
Ignore some generated files.
* components/hardware/main.c: (hardware_view_make_object):
* components/hardware/nautilus-hardware-view.c:
(nautilus_hardware_view_initialize),
(nautilus_hardware_view_destroy),
(nautilus_hardware_view_get_nautilus_view),
(hardware_view_notify_location_change_callback):
* components/hardware/nautilus-hardware-view.h:
* components/help/hyperbola-nav-index.c:
(hyperbola_navigation_index_select_row),
(hyperbola_navigation_index_new):
* components/help/hyperbola-nav-search.c:
(hyperbola_navigation_search_select_row),
(hyperbola_navigation_search_new):
* components/help/hyperbola-nav-tree.c:
(hyperbola_navigation_tree_new),
(hyperbola_navigation_tree_notify_location_change),
(hyperbola_navigation_tree_select_row):
* components/history/ntl-history-view.c:
(hyperbola_navigation_history_notify_location_change),
(hyperbola_navigation_history_select_row), (make_obj):
* components/html/ntl-web-browser.c: (browser_url_load_done),
(browser_vfs_callback), (browser_goto_url_real),
(browser_goto_url), (browser_select_url), (browser_title_changed),
(browser_notify_location_change), (make_obj):
* components/loser/content/main.c: (loser_make_object):
* components/loser/content/nautilus-content-loser.c:
(nautilus_content_loser_initialize),
(nautilus_content_loser_destroy),
(nautilus_content_loser_get_nautilus_view),
(nautilus_content_loser_load_uri),
(loser_notify_location_change_callback), (bonobo_loser_callback):
* components/loser/content/nautilus-content-loser.h:
* components/loser/sidebar/main.c: (loser_make_object):
* components/loser/sidebar/nautilus-sidebar-loser.c:
(nautilus_sidebar_loser_initialize),
(nautilus_sidebar_loser_destroy),
(nautilus_sidebar_loser_get_nautilus_view),
(loser_notify_location_change_callback):
* components/loser/sidebar/nautilus-sidebar-loser.h:
* components/music/main.c: (music_view_make_object):
* components/music/nautilus-music-view.c:
(nautilus_music_view_initialize), (nautilus_music_view_destroy),
(nautilus_music_view_get_nautilus_view),
(music_view_notify_location_change_callback):
* components/music/nautilus-music-view.h:
* components/notes/ntl-notes.c: (notes_notify_location_change),
(make_notes_view):
* components/rpmview/main.c: (rpm_view_make_object):
* components/rpmview/nautilus-rpm-view.c:
(nautilus_rpm_view_initialize), (nautilus_rpm_view_destroy),
(nautilus_rpm_view_get_nautilus_view),
(rpm_view_notify_location_change_callback):
* components/rpmview/nautilus-rpm-view.h:
* components/sample/main.c: (sample_make_object):
* components/sample/nautilus-sample-content-view.c:
(nautilus_sample_content_view_initialize),
(nautilus_sample_content_view_destroy),
(nautilus_sample_content_view_get_nautilus_view),
(sample_notify_location_change_callback):
* components/sample/nautilus-sample-content-view.h:
* components/services/startup/nautilus-view/main.c:
(services_make_object):
* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(go_to_uri), (nautilus_service_startup_view_initialize),
(nautilus_service_startup_view_get_nautilus_view),
(service_main_notify_location_change_cb):
* components/services/startup/nautilus-view/nautilus-service-startup-view.h:
* components/websearch/ntl-web-search.c:
(web_search_notify_location_change), (do_search), (make_obj):
* libnautilus/nautilus-clipboard.c:
(nautilus_clipboard_info_set_view),
(nautilus_clipboard_info_get_view),
(nautilus_clipboard_info_get_bonobo_control):
* libnautilus/nautilus-clipboard.h:
* src/file-manager/fm-directory-view.c:
(bonobo_menu_move_to_trash_callback), (get_bonobo_control),
(fm_directory_view_initialize), (display_selection_info),
(fm_directory_view_send_selection_change),
(notify_location_change_callback),
(notify_selection_change_callback),
(stop_location_change_callback), (done_loading),
(fm_directory_view_get_nautilus_view),
(fm_directory_view_activate_file_internal), (finish_loading_uri):
* src/file-manager/fm-directory-view.h:
Updated for new libnautilus where the NautilusViewFrame
classes are now named NautilusView.
* libnautilus/nautilus-content-view-frame.c:
(nautilus_content_view_initialize), (nautilus_content_view_new),
(nautilus_content_view_new_from_bonobo_control),
(nautilus_content_view_destroy),
(nautilus_content_view_initialize_class),
(nautilus_content_view_request_title_change):
* libnautilus/nautilus-content-view-frame.h:
* libnautilus/nautilus-meta-view-frame.c:
(nautilus_meta_view_initialize), (nautilus_meta_view_new),
(nautilus_meta_view_new_from_bonobo_control),
(nautilus_meta_view_destroy),
(nautilus_meta_view_initialize_class):
* libnautilus/nautilus-meta-view-frame.h:
Changed Nautilus*ViewFrame classes to Nautilus*View. This is
something we had in RENAMING for some time, and it's consistent
with Bonobo's naming of BonoboControl and BonoboControlFrame.
Also changed interfaces to use actual BonoboControl * instead of
using BonobObject * and query_interface.
* libnautilus/nautilus-undo-manager.c:
(nautilus_undo_setup_bonobo_control):
* libnautilus/nautilus-undo-manager.h:
Changed the BonoboControl parameter to actually be of type
BonoboControl * instead of BonoboObject *.
* libnautilus/nautilus-view-frame-private.h:
* libnautilus/nautilus-view-frame.c:
(impl_Nautilus_View_save_state), (impl_Nautilus_View_load_state),
(impl_Nautilus_View_notify_location_change),
(impl_Nautilus_View_show_properties),
(impl_Nautilus_View_notify_selection_change),
(impl_Nautilus_View_stop_location_change),
(impl_Nautilus_View__destroy), (impl_Nautilus_View__create),
(nautilus_view_initialize_class), (nautilus_view_set_arg),
(nautilus_view_get_arg), (nautilus_view_initialize),
(nautilus_view_new), (nautilus_view_new_from_bonobo_control),
(nautilus_view_destroy), (nautilus_view_ensure_view_frame),
(nautilus_view_request_location_change),
(nautilus_view_request_selection_change),
(nautilus_view_request_status_change),
(nautilus_view_request_progress_change),
(nautilus_view_get_bonobo_control),
(nautilus_view_get_main_window),
(nautilus_view_real_set_bonobo_control):
* libnautilus/nautilus-view-frame.h:
* libnautilus/nautilus-zoomable.c:
(impl_Nautilus_Zoomable__get_zoom_level),
(impl_Nautilus_Zoomable__set_zoom_level),
(impl_Nautilus_Zoomable__get_min_zoom_level),
(impl_Nautilus_Zoomable__get_max_zoom_level),
(impl_Nautilus_Zoomable__get_is_continuous),
(impl_Nautilus_Zoomable_zoom_in),
(impl_Nautilus_Zoomable_zoom_out),
(impl_Nautilus_Zoomable_zoom_to_fit),
(impl_Nautilus_Zoomable__destroy),
(impl_Nautilus_Zoomable__create), (marshal_NONE__DOUBLE),
(nautilus_zoomable_initialize_class), (nautilus_zoomable_set_arg),
(nautilus_zoomable_get_arg), (nautilus_zoomable_initialize),
(nautilus_zoomable_new),
(nautilus_zoomable_new_from_bonobo_control),
(nautilus_zoomable_destroy),
(nautilus_zoomable_ensure_zoomable_frame),
(nautilus_zoomable_set_zoom_level),
(nautilus_zoomable_get_bonobo_control),
(nautilus_zoomable_real_set_bonobo_control):
* libnautilus/nautilus-zoomable.h:
* src/nautilus-zoomable-frame-svr.c:
(impl_Nautilus_ZoomableFrame__destroy),
(impl_Nautilus_ZoomableFrame__create),
(impl_Nautilus_ZoomableFrame_notify_zoom_level):
* src/ntl-app.c: (impl_Nautilus_Application_create_object),
* src/ntl-content-view.c:
(impl_Nautilus_ContentViewFrame_request_title_change),
(nautilus_content_view_frame_get_type),
(nautilus_content_view_frame_class_init),
(nautilus_content_view_frame_init),
(nautilus_content_view_frame_set_active),
(nautilus_content_view_frame_request_title_change):
* src/ntl-content-view.h:
* src/ntl-index-panel.c: (nautilus_index_panel_add_meta_view),
(nautilus_index_panel_remove_meta_view):
* src/ntl-index-panel.h:
* src/ntl-meta-view.c: (nautilus_meta_view_frame_initialize_class),
(nautilus_meta_view_frame_initialize),
(nautilus_meta_view_frame_set_label),
(nautilus_meta_view_frame_get_label):
* src/ntl-meta-view.h:
* src/ntl-view-bonobo-control.c: (destroy_bonobo_control_view),
(nautilus_view_frame_activate_uri),
(bonobo_control_try_load_client),
(bonobo_control_notify_location_change):
* src/ntl-view-bonobo-subdoc.c: (destroy_bonobo_subdoc_view),
(bonobo_subdoc_notify_location_change),
(bonobo_subdoc_try_load_client):
* src/ntl-view-frame-svr.c: (impl_Nautilus_ViewFrame__destroy),
(impl_Nautilus_ViewFrame__create),
(impl_Nautilus_ViewFrame_request_location_change),
(impl_Nautilus_ViewFrame_request_selection_change),
(impl_Nautilus_ViewFrame_request_status_change),
(impl_Nautilus_ViewFrame_request_progress_change):
* src/ntl-view-nautilus.c: (nautilus_view_try_load_client),
(destroy_nautilus_view), (nv_show_properties), (nv_save_state),
(nv_load_state), (nv_notify_location_change),
(nv_notify_selection_change), (nv_stop_location_change):
* src/ntl-view-private.h:
* src/ntl-view.c: (nautilus_view_frame_get_type),
(nautilus_view_frame_class_init), (nautilus_view_frame_set_arg),
(nautilus_view_frame_get_arg), (nautilus_view_frame_init),
(nautilus_view_frame_destroy_client),
(nautilus_view_frame_destroy), (nautilus_view_frame_constructed),
(nautilus_view_frame_construct_arg_set),
(nautilus_view_frame_size_request),
(nautilus_view_frame_size_allocate),
(nautilus_view_frame_handle_client_destroy),
(nautilus_view_frame_handle_client_destroy_2),
(nautilus_view_frame_load_client),
(nautilus_view_frame_notify_location_change),
(nautilus_view_frame_notify_selection_change),
(nautilus_view_frame_load_state), (nautilus_view_frame_save_state),
(nautilus_view_frame_show_properties),
(nautilus_view_frame_stop_location_change),
(nautilus_view_frame_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_is_continuous),
(nautilus_view_frame_zoom_in), (nautilus_view_frame_zoom_out),
(nautilus_view_frame_zoom_to_fit), (nautilus_view_frame_get_iid),
(nautilus_view_frame_get_client_objref),
(nautilus_view_frame_get_objref),
(nautilus_view_frame_request_location_change),
(nautilus_view_frame_request_selection_change),
(nautilus_view_frame_request_status_change),
(nautilus_view_frame_request_progress_change),
(nautilus_view_frame_notify_zoom_level), (check_object),
(nautilus_view_frame_set_active_errors):
* src/ntl-view.h:
* src/ntl-window-msgs.c: (nautilus_window_notify_selection_change),
(nautilus_window_request_selection_change),
(nautilus_window_request_status_change),
(nautilus_window_request_progress_change),
(nautilus_window_request_title_change),
(nautilus_window_update_internals), (nautilus_window_update_view),
(nautilus_window_view_destroyed), (nautilus_window_load_meta_view),
(nautilus_window_request_location_change),
(nautilus_window_load_content_view),
(nautilus_window_update_state), (nautilus_window_set_state_info),
(nautilus_window_begin_location_change):
* src/ntl-window-msgs.h:
* src/ntl-window-private.h:
* src/ntl-window.c: (zoom_in_cb), (zoom_out_cb),
(nautilus_window_set_arg), (nautilus_window_send_show_properties),
(view_menu_switch_views_callback),
(nautilus_window_set_content_view),
(nautilus_window_add_meta_view),
(nautilus_window_remove_meta_view_real),
(nautilus_window_remove_meta_view),
(nautilus_window_request_location_change_cb),
(nautilus_window_request_selection_change_cb),
(nautilus_window_request_status_change_cb),
(nautilus_window_request_progress_change_cb),
(nautilus_window_request_title_change_callback),
(nautilus_window_connect_view),
(nautilus_window_connect_content_view),
(nautilus_window_real_set_content_view):
* src/ntl-window.h:
Changed Nautilus*View classes to Nautilus*ViewFrame. This is
something we had in RENAMING for some time, and it's consistent
with Bonobo's naming of BonoboControl and BonoboControlFrame.
Also changed interfaces to use actual BonoboControl * instead of
using BonoboObject * and query_interface.
107 files changed, 2931 insertions, 2603 deletions
@@ -1,3 +1,292 @@ +2000-05-23 Darin Adler <darin@eazel.com> + + The ViewFrame <-> View renaming. + We still have to rename the files. + + * RENAMING: Put in explicit cases for file name renaming. + + * src/Makefile.am: + * src/nautilus-desktop-window.c: + * src/nautilus-desktop-window.h: + Added placeholders. I'll be putting code in here soon. + + * src/ntl-app.c: (display_prototype_caveat): + Changed to use nautilus_simple_dialog again since otherwise it + comes up behind the main window. Perhaps someone will resolve + that issue and change it back. + + * libnautilus-extensions/nautilus-gnome-extensions.h: + * libnautilus-extensions/nautilus-gnome-extensions.c: + (nautilus_warning_dialog), (nautilus_warning_dialog_parented): + Added centered version of the warning dialog as well, since + Eskil was using gnome_warning_dialog in a case where he really + wanted lines wrapped. + + * components/loser/.cvsignore: + * components/loser/content/.cvsignore: + * components/loser/sidebar/.cvsignore: + Ignore some generated files. + + * components/hardware/main.c: (hardware_view_make_object): + * components/hardware/nautilus-hardware-view.c: + (nautilus_hardware_view_initialize), + (nautilus_hardware_view_destroy), + (nautilus_hardware_view_get_nautilus_view), + (hardware_view_notify_location_change_callback): + * components/hardware/nautilus-hardware-view.h: + * components/help/hyperbola-nav-index.c: + (hyperbola_navigation_index_select_row), + (hyperbola_navigation_index_new): + * components/help/hyperbola-nav-search.c: + (hyperbola_navigation_search_select_row), + (hyperbola_navigation_search_new): + * components/help/hyperbola-nav-tree.c: + (hyperbola_navigation_tree_new), + (hyperbola_navigation_tree_notify_location_change), + (hyperbola_navigation_tree_select_row): + * components/history/ntl-history-view.c: + (hyperbola_navigation_history_notify_location_change), + (hyperbola_navigation_history_select_row), (make_obj): + * components/html/ntl-web-browser.c: (browser_url_load_done), + (browser_vfs_callback), (browser_goto_url_real), + (browser_goto_url), (browser_select_url), (browser_title_changed), + (browser_notify_location_change), (make_obj): + * components/loser/content/main.c: (loser_make_object): + * components/loser/content/nautilus-content-loser.c: + (nautilus_content_loser_initialize), + (nautilus_content_loser_destroy), + (nautilus_content_loser_get_nautilus_view), + (nautilus_content_loser_load_uri), + (loser_notify_location_change_callback), (bonobo_loser_callback): + * components/loser/content/nautilus-content-loser.h: + * components/loser/sidebar/main.c: (loser_make_object): + * components/loser/sidebar/nautilus-sidebar-loser.c: + (nautilus_sidebar_loser_initialize), + (nautilus_sidebar_loser_destroy), + (nautilus_sidebar_loser_get_nautilus_view), + (loser_notify_location_change_callback): + * components/loser/sidebar/nautilus-sidebar-loser.h: + * components/music/main.c: (music_view_make_object): + * components/music/nautilus-music-view.c: + (nautilus_music_view_initialize), (nautilus_music_view_destroy), + (nautilus_music_view_get_nautilus_view), + (music_view_notify_location_change_callback): + * components/music/nautilus-music-view.h: + * components/notes/ntl-notes.c: (notes_notify_location_change), + (make_notes_view): + * components/rpmview/main.c: (rpm_view_make_object): + * components/rpmview/nautilus-rpm-view.c: + (nautilus_rpm_view_initialize), (nautilus_rpm_view_destroy), + (nautilus_rpm_view_get_nautilus_view), + (rpm_view_notify_location_change_callback): + * components/rpmview/nautilus-rpm-view.h: + * components/sample/main.c: (sample_make_object): + * components/sample/nautilus-sample-content-view.c: + (nautilus_sample_content_view_initialize), + (nautilus_sample_content_view_destroy), + (nautilus_sample_content_view_get_nautilus_view), + (sample_notify_location_change_callback): + * components/sample/nautilus-sample-content-view.h: + * components/services/startup/nautilus-view/main.c: + (services_make_object): + * components/services/startup/nautilus-view/nautilus-service-startup-view.c: + (go_to_uri), (nautilus_service_startup_view_initialize), + (nautilus_service_startup_view_get_nautilus_view), + (service_main_notify_location_change_cb): + * components/services/startup/nautilus-view/nautilus-service-startup-view.h: + * components/websearch/ntl-web-search.c: + (web_search_notify_location_change), (do_search), (make_obj): + * libnautilus/nautilus-clipboard.c: + (nautilus_clipboard_info_set_view), + (nautilus_clipboard_info_get_view), + (nautilus_clipboard_info_get_bonobo_control): + * libnautilus/nautilus-clipboard.h: + * src/file-manager/fm-directory-view.c: + (bonobo_menu_move_to_trash_callback), (get_bonobo_control), + (fm_directory_view_initialize), (display_selection_info), + (fm_directory_view_send_selection_change), + (notify_location_change_callback), + (notify_selection_change_callback), + (stop_location_change_callback), (done_loading), + (fm_directory_view_get_nautilus_view), + (fm_directory_view_activate_file_internal), (finish_loading_uri): + * src/file-manager/fm-directory-view.h: + Updated for new libnautilus where the NautilusViewFrame + classes are now named NautilusView. + + * libnautilus/nautilus-content-view-frame.c: + (nautilus_content_view_initialize), (nautilus_content_view_new), + (nautilus_content_view_new_from_bonobo_control), + (nautilus_content_view_destroy), + (nautilus_content_view_initialize_class), + (nautilus_content_view_request_title_change): + * libnautilus/nautilus-content-view-frame.h: + * libnautilus/nautilus-meta-view-frame.c: + (nautilus_meta_view_initialize), (nautilus_meta_view_new), + (nautilus_meta_view_new_from_bonobo_control), + (nautilus_meta_view_destroy), + (nautilus_meta_view_initialize_class): + * libnautilus/nautilus-meta-view-frame.h: + Changed Nautilus*ViewFrame classes to Nautilus*View. This is + something we had in RENAMING for some time, and it's consistent + with Bonobo's naming of BonoboControl and BonoboControlFrame. + Also changed interfaces to use actual BonoboControl * instead of + using BonobObject * and query_interface. + + * libnautilus/nautilus-undo-manager.c: + (nautilus_undo_setup_bonobo_control): + * libnautilus/nautilus-undo-manager.h: + Changed the BonoboControl parameter to actually be of type + BonoboControl * instead of BonoboObject *. + + * libnautilus/nautilus-view-frame-private.h: + * libnautilus/nautilus-view-frame.c: + (impl_Nautilus_View_save_state), (impl_Nautilus_View_load_state), + (impl_Nautilus_View_notify_location_change), + (impl_Nautilus_View_show_properties), + (impl_Nautilus_View_notify_selection_change), + (impl_Nautilus_View_stop_location_change), + (impl_Nautilus_View__destroy), (impl_Nautilus_View__create), + (nautilus_view_initialize_class), (nautilus_view_set_arg), + (nautilus_view_get_arg), (nautilus_view_initialize), + (nautilus_view_new), (nautilus_view_new_from_bonobo_control), + (nautilus_view_destroy), (nautilus_view_ensure_view_frame), + (nautilus_view_request_location_change), + (nautilus_view_request_selection_change), + (nautilus_view_request_status_change), + (nautilus_view_request_progress_change), + (nautilus_view_get_bonobo_control), + (nautilus_view_get_main_window), + (nautilus_view_real_set_bonobo_control): + * libnautilus/nautilus-view-frame.h: + * libnautilus/nautilus-zoomable.c: + (impl_Nautilus_Zoomable__get_zoom_level), + (impl_Nautilus_Zoomable__set_zoom_level), + (impl_Nautilus_Zoomable__get_min_zoom_level), + (impl_Nautilus_Zoomable__get_max_zoom_level), + (impl_Nautilus_Zoomable__get_is_continuous), + (impl_Nautilus_Zoomable_zoom_in), + (impl_Nautilus_Zoomable_zoom_out), + (impl_Nautilus_Zoomable_zoom_to_fit), + (impl_Nautilus_Zoomable__destroy), + (impl_Nautilus_Zoomable__create), (marshal_NONE__DOUBLE), + (nautilus_zoomable_initialize_class), (nautilus_zoomable_set_arg), + (nautilus_zoomable_get_arg), (nautilus_zoomable_initialize), + (nautilus_zoomable_new), + (nautilus_zoomable_new_from_bonobo_control), + (nautilus_zoomable_destroy), + (nautilus_zoomable_ensure_zoomable_frame), + (nautilus_zoomable_set_zoom_level), + (nautilus_zoomable_get_bonobo_control), + (nautilus_zoomable_real_set_bonobo_control): + * libnautilus/nautilus-zoomable.h: + * src/nautilus-zoomable-frame-svr.c: + (impl_Nautilus_ZoomableFrame__destroy), + (impl_Nautilus_ZoomableFrame__create), + (impl_Nautilus_ZoomableFrame_notify_zoom_level): + * src/ntl-app.c: (impl_Nautilus_Application_create_object), + * src/ntl-content-view.c: + (impl_Nautilus_ContentViewFrame_request_title_change), + (nautilus_content_view_frame_get_type), + (nautilus_content_view_frame_class_init), + (nautilus_content_view_frame_init), + (nautilus_content_view_frame_set_active), + (nautilus_content_view_frame_request_title_change): + * src/ntl-content-view.h: + * src/ntl-index-panel.c: (nautilus_index_panel_add_meta_view), + (nautilus_index_panel_remove_meta_view): + * src/ntl-index-panel.h: + * src/ntl-meta-view.c: (nautilus_meta_view_frame_initialize_class), + (nautilus_meta_view_frame_initialize), + (nautilus_meta_view_frame_set_label), + (nautilus_meta_view_frame_get_label): + * src/ntl-meta-view.h: + * src/ntl-view-bonobo-control.c: (destroy_bonobo_control_view), + (nautilus_view_frame_activate_uri), + (bonobo_control_try_load_client), + (bonobo_control_notify_location_change): + * src/ntl-view-bonobo-subdoc.c: (destroy_bonobo_subdoc_view), + (bonobo_subdoc_notify_location_change), + (bonobo_subdoc_try_load_client): + * src/ntl-view-frame-svr.c: (impl_Nautilus_ViewFrame__destroy), + (impl_Nautilus_ViewFrame__create), + (impl_Nautilus_ViewFrame_request_location_change), + (impl_Nautilus_ViewFrame_request_selection_change), + (impl_Nautilus_ViewFrame_request_status_change), + (impl_Nautilus_ViewFrame_request_progress_change): + * src/ntl-view-nautilus.c: (nautilus_view_try_load_client), + (destroy_nautilus_view), (nv_show_properties), (nv_save_state), + (nv_load_state), (nv_notify_location_change), + (nv_notify_selection_change), (nv_stop_location_change): + * src/ntl-view-private.h: + * src/ntl-view.c: (nautilus_view_frame_get_type), + (nautilus_view_frame_class_init), (nautilus_view_frame_set_arg), + (nautilus_view_frame_get_arg), (nautilus_view_frame_init), + (nautilus_view_frame_destroy_client), + (nautilus_view_frame_destroy), (nautilus_view_frame_constructed), + (nautilus_view_frame_construct_arg_set), + (nautilus_view_frame_size_request), + (nautilus_view_frame_size_allocate), + (nautilus_view_frame_handle_client_destroy), + (nautilus_view_frame_handle_client_destroy_2), + (nautilus_view_frame_load_client), + (nautilus_view_frame_notify_location_change), + (nautilus_view_frame_notify_selection_change), + (nautilus_view_frame_load_state), (nautilus_view_frame_save_state), + (nautilus_view_frame_show_properties), + (nautilus_view_frame_stop_location_change), + (nautilus_view_frame_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_is_continuous), + (nautilus_view_frame_zoom_in), (nautilus_view_frame_zoom_out), + (nautilus_view_frame_zoom_to_fit), (nautilus_view_frame_get_iid), + (nautilus_view_frame_get_client_objref), + (nautilus_view_frame_get_objref), + (nautilus_view_frame_request_location_change), + (nautilus_view_frame_request_selection_change), + (nautilus_view_frame_request_status_change), + (nautilus_view_frame_request_progress_change), + (nautilus_view_frame_notify_zoom_level), (check_object), + (nautilus_view_frame_set_active_errors): + * src/ntl-view.h: + * src/ntl-window-msgs.c: (nautilus_window_notify_selection_change), + (nautilus_window_request_selection_change), + (nautilus_window_request_status_change), + (nautilus_window_request_progress_change), + (nautilus_window_request_title_change), + (nautilus_window_update_internals), (nautilus_window_update_view), + (nautilus_window_view_destroyed), (nautilus_window_load_meta_view), + (nautilus_window_request_location_change), + (nautilus_window_load_content_view), + (nautilus_window_update_state), (nautilus_window_set_state_info), + (nautilus_window_begin_location_change): + * src/ntl-window-msgs.h: + * src/ntl-window-private.h: + * src/ntl-window.c: (zoom_in_cb), (zoom_out_cb), + (nautilus_window_set_arg), (nautilus_window_send_show_properties), + (view_menu_switch_views_callback), + (nautilus_window_set_content_view), + (nautilus_window_add_meta_view), + (nautilus_window_remove_meta_view_real), + (nautilus_window_remove_meta_view), + (nautilus_window_request_location_change_cb), + (nautilus_window_request_selection_change_cb), + (nautilus_window_request_status_change_cb), + (nautilus_window_request_progress_change_cb), + (nautilus_window_request_title_change_callback), + (nautilus_window_connect_view), + (nautilus_window_connect_content_view), + (nautilus_window_real_set_content_view): + * src/ntl-window.h: + Changed Nautilus*View classes to Nautilus*ViewFrame. This is + something we had in RENAMING for some time, and it's consistent + with Bonobo's naming of BonoboControl and BonoboControlFrame. + Also changed interfaces to use actual BonoboControl * instead of + using BonoboObject * and query_interface. + 2000-05-23 Gene Z. Ragan <gzr@eazel.com> * libnautilus/nautilus-undo-context.c: @@ -38,29 +327,30 @@ 2000-05-23 Andy Hertzfeld <andy@eazel.com> - made a preference for the anti-aliased canvas, and hooked it up so you can - switch on the fly. Anti-aliased drawing is still only partially implemented, so - it defaults off. + Made a preference for the anti-aliased canvas, and hooked it up so + you can switch on the fly. Anti-aliased drawing is still only + partially implemented, so it defaults off. * libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_create_dialog), (global_preferences_register_for_ui): - added a preference category "Appearance" and an entry for "smoother but slower" + added a preference category "Appearance" and an entry for + "smoother but slower" * libnautilus-extensions/nautilus-global-preferences.h: added NAUTILUS_PREFERENCE_ANTI_ALIASED_CANVAS * libnautilus-extensions/nautilus-icon-canvas-item.c: (draw_pixbuf_aa), (map_pixbuf), (nautilus_icon_canvas_item_draw), (nautilus_icon_canvas_item_render): - made the render method draw right at different scales, partially implemented - emblems + made the render method draw right at different scales, partially + implemented emblems * libnautilus-extensions/nautilus-icon-container.c: (destroy), (nautilus_icon_container_initialize), (nautilus_icon_container_new), (nautilus_icon_container_set_anti_aliased_mode), (click_policy_changed_callback), (anti_aliased_preferences_changed): - receive notification when the anti-aliased preference changes, - and update the canvas + receive notification when the anti-aliased preference changes, and + update the canvas * libnautilus-extensions/nautilus-icon-container.h: added nautilus_icon_container_set_anti_aliased_mode @@ -114,7 +404,6 @@ * nautilus-installer/nautilus-installer.c: (show_usage), (show_license), (init_default_iopts), (init_default_topts), (create_temporary_directory), (fetch_remote_package_list), (main): - Adding a simple implementation of the nautilus-installer. Beginning of the fix for Bug # 863. This is a statically linked command line implementation only right now. @@ -2,9 +2,44 @@ We put plans for renaming in here so we can think about them for a while. Note that when we rename a class, it usually involves renaming some files too. --- -ntl* -> nautilus* (1) -NautilusViewFrame <--> NautilusView (2) -ntl-view-bonobo-subdoc -> ntl-view-bonobo-embeddable (see also 1, 2) +src/ntl-app.c -> src/nautilus-application.c +src/ntl-app.h -> src/nautilus-application.h +src/ntl-content-view.c -> src/nautilus-content-view-frame.c +src/ntl-content-view.h -> src/nautilus-content-view-frame.h +src/ntl-main.c -> src/nautilus-main.c +src/ntl-meta-view.c -> src/nautilus-meta-view-frame.c +src/ntl-meta-view.h -> src/nautilus-meta-view-frame.h +src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c +src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c +src/ntl-view-private.h -> src/nautilus-view-frame-private.h +src/ntl-view.c -> src/nautilus-view-frame.c +src/ntl-view.h -> src/nautilus-view-frame.h +src/ntl-window-private.h -> src/nautilus-window-private.h +src/ntl-window-state.c -> src/nautilus-window-state.c +src/ntl-window-state.h -> src/nautilus-window-state.h +src/ntl-window.c -> src/nautilus-window.c +src/ntl-window.h -> src/nautilus-window.h +libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c +libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h +libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c +libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h +libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c +libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h + +src/ntl-types.h -> (delete this file) + +src/ntl-index-panel.c -> ? +src/ntl-index-panel.h -> ? +src/ntl-miniicon.c -> ? +src/ntl-miniicon.h -> ? +src/ntl-uri-map.c -> ? +src/ntl-uri-map.h -> ? +src/ntl-view-frame-svr.c -> ? +src/ntl-view-nautilus.c -> ? +src/ntl-window-msgs.c -> ? +src/ntl-window-msgs.h -> ? + +ntl* -> nautilus* GtkScrollFrame -> NautilusScrollFrame @@ -17,10 +52,7 @@ GtkScrollFrame -> NautilusScrollFrame NavigationRequestInfo -> NavigationRequest NavigationInfo -> Location - SelectionInfo -> Selection SelectionRequestInfo -> SelectionRequest - StatusRequestInfo -> Status (or StatusRequest) - diff --git a/components/hardware/main.c b/components/hardware/main.c index b15ed3453..8eb19f61d 100644 --- a/components/hardware/main.c +++ b/components/hardware/main.c @@ -48,7 +48,6 @@ hardware_view_make_object (BonoboGenericFactory *factory, void *closure) { NautilusHardwareView *hardware_view; - NautilusViewFrame *view_frame; if (strcmp (goad_id, "OAFIID:nautilus_hardware_view:20000422-2250")) { return NULL; @@ -60,8 +59,7 @@ hardware_view_make_object (BonoboGenericFactory *factory, gtk_signal_connect (GTK_OBJECT (hardware_view), "destroy", hardware_view_object_destroyed, NULL); - view_frame = NAUTILUS_VIEW_FRAME (nautilus_hardware_view_get_view_frame (hardware_view)); - return BONOBO_OBJECT (view_frame); + return BONOBO_OBJECT (nautilus_hardware_view_get_nautilus_view (hardware_view)); } int main(int argc, char *argv[]) diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c index b04bda562..262f8b4e9 100644 --- a/components/hardware/nautilus-hardware-view.c +++ b/components/hardware/nautilus-hardware-view.c @@ -51,7 +51,7 @@ struct _NautilusHardwareViewDetails { char *uri; - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; GtkWidget *form; }; @@ -81,7 +81,7 @@ static void nautilus_hardware_view_initialize_class (NautilusHardwareViewCla static void nautilus_hardware_view_initialize (NautilusHardwareView *view); static void nautilus_hardware_view_destroy (GtkObject *object); -static void hardware_view_notify_location_change_callback (NautilusContentViewFrame *view, +static void hardware_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusHardwareView *hardware_view); @@ -110,9 +110,9 @@ nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view) NautilusBackground *background; hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1); - hardware_view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (hardware_view)); + hardware_view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (hardware_view)); - gtk_signal_connect (GTK_OBJECT (hardware_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (hardware_view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (hardware_view_notify_location_change_callback), hardware_view); @@ -135,7 +135,7 @@ nautilus_hardware_view_destroy (GtkObject *object) { NautilusHardwareView *hardware_view = NAUTILUS_HARDWARE_VIEW (object); - bonobo_object_unref (BONOBO_OBJECT (hardware_view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (hardware_view->details->nautilus_view)); g_free (hardware_view->details->uri); g_free (hardware_view->details); @@ -144,10 +144,10 @@ nautilus_hardware_view_destroy (GtkObject *object) } /* Component embedding support */ -NautilusContentViewFrame * -nautilus_hardware_view_get_view_frame (NautilusHardwareView *hardware_view) +NautilusContentView * +nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *hardware_view) { - return hardware_view->details->view_frame; + return hardware_view->details->nautilus_view; } static char* @@ -446,7 +446,7 @@ nautilus_hardware_view_load_uri (NautilusHardwareView *view, const char *uri) } static void -hardware_view_notify_location_change_callback (NautilusContentViewFrame *view, +hardware_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusHardwareView *hardware_view) { @@ -458,7 +458,7 @@ hardware_view_notify_location_change_callback (NautilusContentViewFrame *view, progress.type = Nautilus_PROGRESS_UNDERWAY; progress.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (hardware_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (hardware_view->details->nautilus_view), &progress); /* do the actual work here */ nautilus_hardware_view_load_uri (hardware_view, navinfo->actual_uri); @@ -466,7 +466,7 @@ hardware_view_notify_location_change_callback (NautilusContentViewFrame *view, /* send the required PROGRESS_DONE signal */ progress.type = Nautilus_PROGRESS_DONE_OK; progress.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (hardware_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (hardware_view->details->nautilus_view), &progress); } /* handle drag and drop */ diff --git a/components/hardware/nautilus-hardware-view.h b/components/hardware/nautilus-hardware-view.h index aa7af4069..62e5b8b2d 100644 --- a/components/hardware/nautilus-hardware-view.h +++ b/components/hardware/nautilus-hardware-view.h @@ -36,7 +36,7 @@ typedef struct _NautilusHardwareViewClass NautilusHardwareViewClass; #define NAUTILUS_HARDWARE_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_HARDWARE_VIEW, NautilusHardwareView)) #define NAUTILUS_HARDWARE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_HARDWARE_VIEW, NautilusHardwareViewClass)) #define NAUTILUS_IS_HARDWARE_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_HARDWARE_VIEW)) -#define NAUTILUS_IS_HARDWARE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_HARDWARE_VIEW)) +#define NAUTILUS_IS_HARDWARE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_HARDWARE_VIEW)) typedef struct _NautilusHardwareViewDetails NautilusHardwareViewDetails; @@ -49,16 +49,14 @@ struct _NautilusHardwareViewClass { GtkEventBoxClass parent_class; }; - /* GtkObject support */ -GtkType nautilus_hardware_view_get_type (void); +GtkType nautilus_hardware_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *nautilus_hardware_view_get_view_frame (NautilusHardwareView *view); +NautilusContentView *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *view); /* URI handling */ -void nautilus_hardware_view_load_uri (NautilusHardwareView *view, - const char *uri); - +void nautilus_hardware_view_load_uri (NautilusHardwareView *view, + const char *uri); #endif /* NAUTILUS_HARDWARE_VIEW_H */ diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c index bffb88978..6b3857dc2 100644 --- a/components/help/hyperbola-nav-index.c +++ b/components/help/hyperbola-nav-index.c @@ -10,7 +10,7 @@ #include <ctype.h> typedef struct { - NautilusViewFrame *view_frame; + NautilusView*view_frame; GtkWidget *clist, *ent; @@ -243,7 +243,7 @@ hyperbola_navigation_index_select_row(GtkWidget *clist, gint row, gint column, G memset(&loc, 0, sizeof(loc)); loc.requested_uri = ii->uri; loc.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(NAUTILUS_VIEW_FRAME(hni->view_frame), &loc); + nautilus_view_request_location_change(NAUTILUS_VIEW(hni->view_frame), &loc); } typedef struct { @@ -717,7 +717,7 @@ BonoboObject *hyperbola_navigation_index_new(void) gtk_clist_thaw(GTK_CLIST(hni->clist)); gtk_widget_show_all(vbox); - hni->view_frame = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (vbox)); + hni->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); return BONOBO_OBJECT (hni->view_frame); } diff --git a/components/help/hyperbola-nav-search.c b/components/help/hyperbola-nav-search.c index 769b6f7d0..c1eb3389f 100644 --- a/components/help/hyperbola-nav-search.c +++ b/components/help/hyperbola-nav-search.c @@ -10,7 +10,7 @@ #include <ctype.h> typedef struct { - NautilusViewFrame *view_frame; + NautilusView *view_frame; GtkWidget *clist, *ent; @@ -140,7 +140,7 @@ hyperbola_navigation_search_select_row(GtkWidget *clist, gint row, gint column, memset(&loc, 0, sizeof(loc)); loc.requested_uri = uri; loc.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(NAUTILUS_VIEW_FRAME(hns->view_frame), &loc); + nautilus_view_request_location_change(NAUTILUS_VIEW(hns->view_frame), &loc); } BonoboObject *hyperbola_navigation_search_new(void) @@ -174,7 +174,7 @@ BonoboObject *hyperbola_navigation_search_new(void) gtk_clist_thaw(GTK_CLIST(hns->clist)); gtk_widget_show_all(vbox); - hns->view_frame = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (vbox)); + hns->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); return BONOBO_OBJECT (hns->view_frame); } diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c index 7a58331ab..e47066abd 100644 --- a/components/help/hyperbola-nav-tree.c +++ b/components/help/hyperbola-nav-tree.c @@ -4,7 +4,7 @@ #include <gtk/gtk.h> typedef struct { - NautilusViewFrame *view_frame; + NautilusView *view_frame; GtkWidget *ctree; HyperbolaDocTree *doc_tree; @@ -18,7 +18,7 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree, GtkCTreeNode *node, gint column, HyperbolaNavigationTree *view); -static void hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame, +static void hyperbola_navigation_tree_notify_location_change (NautilusView *view_frame, Nautilus_NavigationInfo *navi, HyperbolaNavigationTree *hview); @@ -91,16 +91,16 @@ hyperbola_navigation_tree_new(void) gtk_widget_show(view->ctree); gtk_widget_show(wtmp); - view->view_frame = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (wtmp)); - gtk_signal_connect(GTK_OBJECT(view->view_frame), "notify_location_change", - hyperbola_navigation_tree_notify_location_change, - view); + view->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); + gtk_signal_connect (GTK_OBJECT(view->view_frame), "notify_location_change", + hyperbola_navigation_tree_notify_location_change, + view); return BONOBO_OBJECT (view->view_frame); } static void -hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame, +hyperbola_navigation_tree_notify_location_change (NautilusView *view_frame, Nautilus_NavigationInfo *navi, HyperbolaNavigationTree *hview) { @@ -138,7 +138,7 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree, GtkCTreeNode * memset(&nri, 0, sizeof(nri)); nri.requested_uri = tnode->uri; nri.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(view->view_frame, &nri); + nautilus_view_request_location_change(view->view_frame, &nri); view->notify_count--; } diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index 395038e9c..f77569d61 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -36,7 +36,7 @@ #include <liboaf/liboaf.h> typedef struct { - NautilusViewFrame *view; + NautilusView *view; GtkCList *clist; @@ -98,7 +98,7 @@ history_view_update_icons (GtkCList *clist) } static void -hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view, +hyperbola_navigation_history_notify_location_change (NautilusView *view, Nautilus_NavigationInfo *loci, HistoryView *hview) { @@ -194,7 +194,7 @@ hyperbola_navigation_history_select_row(GtkCList *clist, gint row, gint column, reqi.requested_uri = (char *)get_uri_from_row (clist, row); reqi.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(hview->view, &reqi); + nautilus_view_request_location_change(hview->view, &reqi); gtk_clist_thaw(clist); } @@ -236,7 +236,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) gtk_widget_show_all(wtmp); /* create object */ - hview->view = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (wtmp)); + hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); gtk_signal_connect (GTK_OBJECT (hview->view), "destroy", do_destroy, hview); object_count++; diff --git a/components/history/ntl-history-view.c b/components/history/ntl-history-view.c index 395038e9c..f77569d61 100644 --- a/components/history/ntl-history-view.c +++ b/components/history/ntl-history-view.c @@ -36,7 +36,7 @@ #include <liboaf/liboaf.h> typedef struct { - NautilusViewFrame *view; + NautilusView *view; GtkCList *clist; @@ -98,7 +98,7 @@ history_view_update_icons (GtkCList *clist) } static void -hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view, +hyperbola_navigation_history_notify_location_change (NautilusView *view, Nautilus_NavigationInfo *loci, HistoryView *hview) { @@ -194,7 +194,7 @@ hyperbola_navigation_history_select_row(GtkCList *clist, gint row, gint column, reqi.requested_uri = (char *)get_uri_from_row (clist, row); reqi.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(hview->view, &reqi); + nautilus_view_request_location_change(hview->view, &reqi); gtk_clist_thaw(clist); } @@ -236,7 +236,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) gtk_widget_show_all(wtmp); /* create object */ - hview->view = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (wtmp)); + hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); gtk_signal_connect (GTK_OBJECT (hview->view), "destroy", do_destroy, hview); object_count++; diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c index baafd9185..a0da704a4 100644 --- a/components/html/ntl-web-browser.c +++ b/components/html/ntl-web-browser.c @@ -29,7 +29,7 @@ #include <libnautilus-extensions/nautilus-debug.h> typedef struct { - NautilusViewFrame *view_frame; + NautilusView *view_frame; GtkWidget *htmlw; char *base_url, *base_target_url; @@ -185,7 +185,7 @@ browser_url_load_done(GtkWidget *htmlw, BrowserInfo *bi) pri.type = Nautilus_PROGRESS_DONE_OK; pri.amount = 100.0; - nautilus_view_frame_request_progress_change(bi->view_frame, &pri); + nautilus_view_request_progress_change(bi->view_frame, &pri); } struct _HTStream { @@ -362,7 +362,7 @@ browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data) memset(&pri, 0, sizeof(pri)); pri.type = Nautilus_PROGRESS_DONE_ERROR; - nautilus_view_frame_request_progress_change(vfsh->bi->view_frame, &pri); + nautilus_view_request_progress_change(vfsh->bi->view_frame, &pri); gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR); g_free(vfsh); @@ -469,9 +469,9 @@ browser_goto_url_real(GtkWidget *htmlw, const char *url, BrowserInfo *bi) stream = gtk_html_begin(GTK_HTML(bi->htmlw)); - browser_url_requested(GTK_HTML(bi->htmlw), url, stream, bi); + browser_url_requested(bi->htmlw, url, stream, bi); - nautilus_view_frame_request_progress_change(bi->view_frame, &pri); + nautilus_view_request_progress_change(bi->view_frame, &pri); } static void @@ -486,7 +486,7 @@ browser_goto_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi) memset(&nri, 0, sizeof(nri)); nri.requested_uri = real_url; - nautilus_view_frame_request_location_change(bi->view_frame, &nri); + nautilus_view_request_location_change(bi->view_frame, &nri); browser_goto_url_real(htmlw, real_url, bi); g_free(real_url); } @@ -511,9 +511,9 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi) si.selected_uris._length = 0; } - nautilus_view_frame_request_selection_change(bi->view_frame, &si); + nautilus_view_request_selection_change(bi->view_frame, &si); if(sri.status_string) - nautilus_view_frame_request_status_change(bi->view_frame, &sri); + nautilus_view_request_status_change(bi->view_frame, &sri); g_free(real_url); bi->prevsel = url?1:0; } @@ -521,7 +521,7 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi) static void browser_title_changed(GtkWidget *htmlw, const char *new_title, BrowserInfo *bi) { - nautilus_content_view_frame_request_title_change (NAUTILUS_CONTENT_VIEW_FRAME (bi->view_frame), new_title); + nautilus_content_view_request_title_change (NAUTILUS_CONTENT_VIEW (bi->view_frame), new_title); } static void @@ -555,7 +555,7 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char } static void -browser_notify_location_change(NautilusViewFrame *view_frame, +browser_notify_location_change(NautilusView *view_frame, Nautilus_NavigationInfo *ni, BrowserInfo *bi) { @@ -603,7 +603,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure) gtk_widget_show(bi->htmlw); gtk_widget_show(wtmp); - bi->view_frame = NAUTILUS_VIEW_FRAME (nautilus_content_view_frame_new (wtmp)); + bi->view_frame = NAUTILUS_VIEW (nautilus_content_view_new (wtmp)); gtk_signal_connect(GTK_OBJECT(bi->view_frame), "notify_location_change", browser_notify_location_change, bi); diff --git a/components/loser/.cvsignore b/components/loser/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/components/loser/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/components/loser/content/.cvsignore b/components/loser/content/.cvsignore new file mode 100644 index 000000000..c4132b841 --- /dev/null +++ b/components/loser/content/.cvsignore @@ -0,0 +1,5 @@ +.deps +.libs +Makefile +Makefile.in +nautilus-content-loser diff --git a/components/loser/content/main.c b/components/loser/content/main.c index a99df8691..911489ee0 100644 --- a/components/loser/content/main.c +++ b/components/loser/content/main.c @@ -48,7 +48,7 @@ loser_make_object (BonoboGenericFactory *factory, void *closure) { NautilusContentLoser *view; - NautilusViewFrame *view_frame; + NautilusView *nautilus_view; nautilus_content_loser_maybe_fail ("pre-make-object"); @@ -64,13 +64,13 @@ loser_make_object (BonoboGenericFactory *factory, object_count++; - view_frame = NAUTILUS_VIEW_FRAME (nautilus_content_loser_get_view_frame (view)); + nautilus_view = NAUTILUS_VIEW (nautilus_content_loser_get_nautilus_view (view)); - gtk_signal_connect (GTK_OBJECT (view_frame), "destroy", loser_object_destroyed, NULL); + gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL); nautilus_content_loser_maybe_fail ("post-make-object"); - return BONOBO_OBJECT (view_frame); + return BONOBO_OBJECT (nautilus_view); } int main(int argc, char *argv[]) diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c index c20558d6d..5cb5e3722 100644 --- a/components/loser/content/nautilus-content-loser.c +++ b/components/loser/content/nautilus-content-loser.c @@ -38,30 +38,25 @@ #include <stdio.h> #include <stdlib.h> - -/* A NautilusContentViewFrame's private information. */ struct NautilusContentLoserDetails { char *uri; - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; }; static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass); static void nautilus_content_loser_initialize (NautilusContentLoser *view); -static void nautilus_content_loser_destroy (GtkObject *object); +static void nautilus_content_loser_destroy (GtkObject *object); NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL) -static void loser_notify_location_change_callback (NautilusContentViewFrame *view_frame, - Nautilus_NavigationInfo *navinfo, - NautilusContentLoser *view); -static void loser_merge_bonobo_items_callback (BonoboObject *control, - gboolean state, - gpointer user_data); - - -static void nautilus_content_loser_fail (void); -static void ensure_fail_env (void); - +static void loser_notify_location_change_callback (NautilusContentView *nautilus_view, + Nautilus_NavigationInfo *navinfo, + NautilusContentLoser *view); +static void loser_merge_bonobo_items_callback (BonoboObject *control, + gboolean state, + gpointer user_data); +static void nautilus_content_loser_fail (void); +static void ensure_fail_env (void); static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass) @@ -80,19 +75,18 @@ nautilus_content_loser_initialize (NautilusContentLoser *view) gtk_label_set_text (GTK_LABEL (view), g_strdup ("(none)")); - view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (view)); + view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (view)); - gtk_signal_connect (GTK_OBJECT (view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (loser_notify_location_change_callback), view); - /* - * Get notified when our bonobo control is activated so we + /* Get notified when our bonobo control is activated so we * can merge menu & toolbar items into Nautilus's UI. */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_frame_get_bonobo_control - (NAUTILUS_VIEW_FRAME (view->details->view_frame))), + gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control + (NAUTILUS_VIEW (view->details->nautilus_view))), "activate", loser_merge_bonobo_items_callback, view); @@ -107,7 +101,7 @@ nautilus_content_loser_destroy (GtkObject *object) view = NAUTILUS_CONTENT_LOSER (object); - bonobo_object_unref (BONOBO_OBJECT (view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (view->details->nautilus_view)); g_free (view->details->uri); g_free (view->details); @@ -116,24 +110,24 @@ nautilus_content_loser_destroy (GtkObject *object) } /** - * nautilus_content_loser_get_view_frame: + * nautilus_content_loser_get_nautilus_view: * - * Return the NautilusViewFrame object associated with this view; this + * Return the NautilusView object associated with this view; this * is needed to export the view via CORBA/Bonobo. - * @view: NautilusContentLoser to get the view_frame from.. + * @view: NautilusContentLoser to get the nautilus_view from.. * **/ -NautilusContentViewFrame * -nautilus_content_loser_get_view_frame (NautilusContentLoser *view) +NautilusContentView * +nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view) { - return view->details->view_frame; + return view->details->nautilus_view; } /** * nautilus_content_loser_load_uri: * * Load the resource pointed to by the specified URI. - * @view: NautilusContentLoser to get the view_frame from. + * @view: NautilusContentLoser to get the nautilus_view from. * **/ void @@ -144,27 +138,26 @@ nautilus_content_loser_load_uri (NautilusContentLoser *view, g_free (view->details->uri); view->details->uri = g_strdup (uri); - + label_text = g_strdup_printf (_("%s\n\nThis is a Nautilus content view that fails on demand."), uri); gtk_label_set_text (GTK_LABEL (view), label_text); g_free (label_text); } static void -loser_notify_location_change_callback (NautilusContentViewFrame *view_frame, +loser_notify_location_change_callback (NautilusContentView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusContentLoser *view) { Nautilus_ProgressRequestInfo request; - g_assert (view_frame == view->details->view_frame); + g_assert (nautilus_view == view->details->nautilus_view); memset(&request, 0, sizeof(request)); nautilus_content_loser_maybe_fail ("pre-underway"); - /* - * It's mandatory to send a PROGRESS_UNDERWAY message once the + /* It's mandatory to send a PROGRESS_UNDERWAY message once the * component starts loading, otherwise nautilus will assume it * failed. In a real component, this will probably happen in * some sort of callback from whatever loading mechanism it is @@ -174,15 +167,14 @@ loser_notify_location_change_callback (NautilusContentViewFrame *view_frame, request.type = Nautilus_PROGRESS_UNDERWAY; request.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); nautilus_content_loser_maybe_fail ("pre-load"); /* Do the actual load. */ nautilus_content_loser_load_uri (view, navinfo->actual_uri); - /* - * It's mandatory to send a PROGRESS_DONE_OK message once the + /* It's mandatory to send a PROGRESS_DONE_OK message once the * component is done loading successfully, or * PROGRESS_DONE_ERROR if it completes unsuccessfully. In a * real component, this will probably happen in some sort of @@ -190,13 +182,13 @@ loser_notify_location_change_callback (NautilusContentViewFrame *view_frame, * load the data; this component loads no data, so it gives * the progrss upodate here. */ - + nautilus_content_loser_maybe_fail ("pre-done"); - + request.type = Nautilus_PROGRESS_DONE_OK; request.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); - + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); + nautilus_content_loser_maybe_fail ("post-done"); } @@ -213,11 +205,11 @@ bonobo_loser_callback (BonoboUIHandler *ui_handler, gpointer user_data, const ch if (strcmp (path, "/File/Kill Content View") == 0) { label_text = g_strdup_printf ("%s\n\nYou selected the Kill Content View menu item.", view->details->uri); nautilus_content_loser_fail (); - + } else { g_assert (strcmp (path, "/Main/Kill Content View") == 0); label_text = g_strdup_printf (_("%s\n\nYou clicked the Kill Content View toolbar button."), view->details->uri); - + nautilus_content_loser_fail (); } diff --git a/components/loser/content/nautilus-content-loser.h b/components/loser/content/nautilus-content-loser.h index 3bb809897..66d667723 100644 --- a/components/loser/content/nautilus-content-loser.h +++ b/components/loser/content/nautilus-content-loser.h @@ -52,17 +52,17 @@ struct NautilusContentLoserClass { }; /* GtkObject support */ -GtkType nautilus_content_loser_get_type (void); +GtkType nautilus_content_loser_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *nautilus_content_loser_get_view_frame (NautilusContentLoser *view); +NautilusContentView *nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view); /* URI handling */ -void nautilus_content_loser_load_uri (NautilusContentLoser *view, - const char *uri); +void nautilus_content_loser_load_uri (NautilusContentLoser *view, + const char *uri); /* Failing on command. */ -void nautilus_content_loser_maybe_fail (const char *location); +void nautilus_content_loser_maybe_fail (const char *location); #endif /* NAUTILUS_CONTENT_LOSER_H */ diff --git a/components/loser/sidebar/.cvsignore b/components/loser/sidebar/.cvsignore new file mode 100644 index 000000000..8ff625658 --- /dev/null +++ b/components/loser/sidebar/.cvsignore @@ -0,0 +1,5 @@ +.deps +.libs +Makefile +Makefile.in +nautilus-sidebar-loser diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c index 83be634f7..8ab7272c2 100644 --- a/components/loser/sidebar/main.c +++ b/components/loser/sidebar/main.c @@ -48,7 +48,7 @@ loser_make_object (BonoboGenericFactory *factory, void *closure) { NautilusSidebarLoser *view; - NautilusViewFrame *view_frame; + NautilusView *nautilus_view; nautilus_sidebar_loser_maybe_fail ("pre-make-object"); @@ -64,13 +64,13 @@ loser_make_object (BonoboGenericFactory *factory, object_count++; - view_frame = NAUTILUS_VIEW_FRAME (nautilus_sidebar_loser_get_view_frame (view)); + nautilus_view = NAUTILUS_VIEW (nautilus_sidebar_loser_get_nautilus_view (view)); - gtk_signal_connect (GTK_OBJECT (view_frame), "destroy", loser_object_destroyed, NULL); + gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL); nautilus_sidebar_loser_maybe_fail ("post-make-object"); - return BONOBO_OBJECT (view_frame); + return BONOBO_OBJECT (nautilus_view); } int main(int argc, char *argv[]) diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c index f4a0f359e..e908885f0 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.c +++ b/components/loser/sidebar/nautilus-sidebar-loser.c @@ -42,7 +42,7 @@ /* A NautilusSidebarLoser's private information. */ struct NautilusSidebarLoserDetails { char *uri; - NautilusMetaViewFrame *view_frame; + NautilusMetaView *nautilus_view; }; static void nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *klass); @@ -51,7 +51,7 @@ static void nautilus_sidebar_loser_destroy (GtkObject NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL) -static void loser_notify_location_change_callback (NautilusMetaViewFrame *view_frame, +static void loser_notify_location_change_callback (NautilusMetaView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSidebarLoser *view); static void loser_merge_bonobo_items_callback (BonoboObject *control, @@ -80,9 +80,9 @@ nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view) gtk_label_set_text (GTK_LABEL (view), g_strdup ("(none)")); - view->details->view_frame = nautilus_meta_view_frame_new (GTK_WIDGET (view)); + view->details->nautilus_view = nautilus_meta_view_new (GTK_WIDGET (view)); - gtk_signal_connect (GTK_OBJECT (view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (loser_notify_location_change_callback), view); @@ -91,8 +91,8 @@ nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view) * Get notified when our bonobo control is activated so we * can merge menu & toolbar items into Nautilus's UI. */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_frame_get_bonobo_control - (NAUTILUS_VIEW_FRAME (view->details->view_frame))), + gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control + (NAUTILUS_VIEW (view->details->nautilus_view))), "activate", loser_merge_bonobo_items_callback, view); @@ -107,7 +107,7 @@ nautilus_sidebar_loser_destroy (GtkObject *object) view = NAUTILUS_SIDEBAR_LOSER (object); - bonobo_object_unref (BONOBO_OBJECT (view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (view->details->nautilus_view)); g_free (view->details->uri); g_free (view->details); @@ -116,24 +116,24 @@ nautilus_sidebar_loser_destroy (GtkObject *object) } /** - * nautilus_sidebar_loser_get_view_frame: + * nautilus_sidebar_loser_get_nautilus_view: * - * Return the NautilusViewFrame object associated with this view; this + * Return the NautilusView object associated with this view; this * is needed to export the view via CORBA/Bonobo. - * @view: NautilusSidebarLoser to get the view_frame from.. + * @view: NautilusSidebarLoser to get the nautilus_view from.. * **/ -NautilusMetaViewFrame * -nautilus_sidebar_loser_get_view_frame (NautilusSidebarLoser *view) +NautilusMetaView * +nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view) { - return view->details->view_frame; + return view->details->nautilus_view; } /** * nautilus_sidebar_loser_load_uri: * * Load the resource pointed to by the specified URI. - * @view: NautilusSidebarLoser to get the view_frame from. + * @view: NautilusSidebarLoser to get the nautilus_view from. * **/ void @@ -151,13 +151,13 @@ nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, } static void -loser_notify_location_change_callback (NautilusMetaViewFrame *view_frame, +loser_notify_location_change_callback (NautilusMetaView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSidebarLoser *view) { Nautilus_ProgressRequestInfo request; - g_assert (view_frame == view->details->view_frame); + g_assert (nautilus_view == view->details->nautilus_view); memset(&request, 0, sizeof(request)); @@ -174,7 +174,7 @@ loser_notify_location_change_callback (NautilusMetaViewFrame *view_frame, request.type = Nautilus_PROGRESS_UNDERWAY; request.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); nautilus_sidebar_loser_maybe_fail ("pre-load"); @@ -195,7 +195,7 @@ loser_notify_location_change_callback (NautilusMetaViewFrame *view_frame, request.type = Nautilus_PROGRESS_DONE_OK; request.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); nautilus_sidebar_loser_maybe_fail ("post-done"); } diff --git a/components/loser/sidebar/nautilus-sidebar-loser.h b/components/loser/sidebar/nautilus-sidebar-loser.h index 4af7d8d7d..98c486939 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.h +++ b/components/loser/sidebar/nautilus-sidebar-loser.h @@ -52,17 +52,17 @@ struct NautilusSidebarLoserClass { }; /* GtkObject support */ -GtkType nautilus_sidebar_loser_get_type (void); +GtkType nautilus_sidebar_loser_get_type (void); /* Component embedding support */ -NautilusMetaViewFrame *nautilus_sidebar_loser_get_view_frame (NautilusSidebarLoser *view); +NautilusMetaView *nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view); /* URI handling */ -void nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, - const char *uri); +void nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, + const char *uri); /* Failing on command. */ -void nautilus_sidebar_loser_maybe_fail (const char *location); +void nautilus_sidebar_loser_maybe_fail (const char *location); #endif /* NAUTILUS_SIDEBAR_LOSER_H */ diff --git a/components/music/main.c b/components/music/main.c index 328e0f4dd..bc126b212 100644 --- a/components/music/main.c +++ b/components/music/main.c @@ -48,7 +48,7 @@ music_view_make_object (BonoboGenericFactory *factory, void *closure) { NautilusMusicView *music_view; - NautilusViewFrame *view_frame; + NautilusView *nautilus_view; if (strcmp (goad_id, "OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391")) { return NULL; @@ -60,8 +60,8 @@ music_view_make_object (BonoboGenericFactory *factory, gtk_signal_connect (GTK_OBJECT (music_view), "destroy", music_view_object_destroyed, NULL); - view_frame = NAUTILUS_VIEW_FRAME (nautilus_music_view_get_view_frame (music_view)); - return BONOBO_OBJECT (view_frame); + nautilus_view = NAUTILUS_VIEW (nautilus_music_view_get_nautilus_view (music_view)); + return BONOBO_OBJECT (nautilus_view); } int main(int argc, char *argv[]) diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index b7b93a6c3..40751099f 100644 --- a/components/music/nautilus-music-view.c +++ b/components/music/nautilus-music-view.c @@ -55,7 +55,7 @@ struct _NautilusMusicViewDetails { char *uri; - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; int background_connection; int sort_mode; @@ -155,7 +155,7 @@ static void nautilus_music_view_initialize (NautilusMusicView static void nautilus_music_view_destroy (GtkObject *object); static void nautilus_music_view_update_from_uri (NautilusMusicView *music_view, const char *uri); -static void music_view_notify_location_change_callback (NautilusContentViewFrame *view, +static void music_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusMusicView *music_view); static void selection_callback (GtkCList *clist, @@ -197,9 +197,9 @@ nautilus_music_view_initialize (NautilusMusicView *music_view) music_view->details = g_new0 (NautilusMusicViewDetails, 1); - music_view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (music_view)); + music_view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (music_view)); - gtk_signal_connect (GTK_OBJECT (music_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (music_view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (music_view_notify_location_change_callback), music_view); @@ -287,7 +287,7 @@ nautilus_music_view_destroy (GtkObject *object) { NautilusMusicView *music_view = NAUTILUS_MUSIC_VIEW (object); - bonobo_object_unref (BONOBO_OBJECT (music_view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (music_view->details->nautilus_view)); g_free (music_view->details->uri); g_free (music_view->details); @@ -383,10 +383,10 @@ static void click_column_callback (GtkCList * clist, gint column, NautilusMusicV } /* Component embedding support */ -NautilusContentViewFrame * -nautilus_music_view_get_view_frame (NautilusMusicView *music_view) +NautilusContentView * +nautilus_music_view_get_nautilus_view (NautilusMusicView *music_view) { - return music_view->details->view_frame; + return music_view->details->nautilus_view; } /* here are some utility routines for reading ID3 tags from mp3 files */ @@ -1419,7 +1419,7 @@ nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri) } static void -music_view_notify_location_change_callback (NautilusContentViewFrame *view, +music_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusMusicView *music_view) { @@ -1431,7 +1431,7 @@ music_view_notify_location_change_callback (NautilusContentViewFrame *view, progress.type = Nautilus_PROGRESS_UNDERWAY; progress.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (music_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (music_view->details->nautilus_view), &progress); /* do the actual work here */ nautilus_music_view_load_uri (music_view, navinfo->actual_uri); @@ -1439,7 +1439,7 @@ music_view_notify_location_change_callback (NautilusContentViewFrame *view, /* send the required PROGRESS_DONE signal */ progress.type = Nautilus_PROGRESS_DONE_OK; progress.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (music_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (music_view->details->nautilus_view), &progress); } /* handle receiving dropped objects */ diff --git a/components/music/nautilus-music-view.h b/components/music/nautilus-music-view.h index 1e2d427ca..ce1305b31 100644 --- a/components/music/nautilus-music-view.h +++ b/components/music/nautilus-music-view.h @@ -52,14 +52,13 @@ struct _NautilusMusicViewClass { /* GtkObject support */ -GtkType nautilus_music_view_get_type (void); +GtkType nautilus_music_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *nautilus_music_view_get_view_frame (NautilusMusicView *view); +NautilusContentView *nautilus_music_view_get_nautilus_view (NautilusMusicView *view); /* URI handling */ -void nautilus_music_view_load_uri (NautilusMusicView *view, - const char *uri); - +void nautilus_music_view_load_uri (NautilusMusicView *view, + const char *uri); #endif /* NAUTILUS_MUSIC_VIEW_H */ diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c index 1b31e080e..9387fd0fb 100644 --- a/components/notes/nautilus-notes.c +++ b/components/notes/nautilus-notes.c @@ -44,7 +44,7 @@ typedef struct { - NautilusViewFrame *view; + NautilusView *view; GtkWidget *note_text_field; char *uri; NautilusFile *file; @@ -111,7 +111,7 @@ notes_save_metainfo (Notes *notes) } static void -notes_notify_location_change (NautilusViewFrame *view, +notes_notify_location_change (NautilusView *view, Nautilus_NavigationInfo *loci, Notes *notes) { @@ -132,7 +132,7 @@ notes_notify_location_change (NautilusViewFrame *view, CORBA_exception_init(&ev); - view_control = nautilus_view_frame_get_bonobo_control (view); + view_control = nautilus_view_get_bonobo_control (view); g_assert (view_control); undo_manager = bonobo_object_query_interface (view_control, @@ -195,7 +195,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl gtk_widget_show_all (vbox); /* Create CORBA object. */ - notes->view = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (vbox)); + notes->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes); notes_object_count++; @@ -206,7 +206,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl /* handle selections */ info = nautilus_clipboard_info_new (); - nautilus_clipboard_info_set_view_frame (info, notes->view); + nautilus_clipboard_info_set_view (info, notes->view); nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (notes->note_text_field)); nautilus_clipboard_info_set_component_name (info, _("Notes")); gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_in_event", diff --git a/components/notes/ntl-notes.c b/components/notes/ntl-notes.c index 1b31e080e..9387fd0fb 100644 --- a/components/notes/ntl-notes.c +++ b/components/notes/ntl-notes.c @@ -44,7 +44,7 @@ typedef struct { - NautilusViewFrame *view; + NautilusView *view; GtkWidget *note_text_field; char *uri; NautilusFile *file; @@ -111,7 +111,7 @@ notes_save_metainfo (Notes *notes) } static void -notes_notify_location_change (NautilusViewFrame *view, +notes_notify_location_change (NautilusView *view, Nautilus_NavigationInfo *loci, Notes *notes) { @@ -132,7 +132,7 @@ notes_notify_location_change (NautilusViewFrame *view, CORBA_exception_init(&ev); - view_control = nautilus_view_frame_get_bonobo_control (view); + view_control = nautilus_view_get_bonobo_control (view); g_assert (view_control); undo_manager = bonobo_object_query_interface (view_control, @@ -195,7 +195,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl gtk_widget_show_all (vbox); /* Create CORBA object. */ - notes->view = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (vbox)); + notes->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes); notes_object_count++; @@ -206,7 +206,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl /* handle selections */ info = nautilus_clipboard_info_new (); - nautilus_clipboard_info_set_view_frame (info, notes->view); + nautilus_clipboard_info_set_view (info, notes->view); nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (notes->note_text_field)); nautilus_clipboard_info_set_component_name (info, _("Notes")); gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_in_event", diff --git a/components/rpmview/main.c b/components/rpmview/main.c index a98898cae..de6a29293 100644 --- a/components/rpmview/main.c +++ b/components/rpmview/main.c @@ -48,7 +48,7 @@ rpm_view_make_object (BonoboGenericFactory *factory, void *closure) { NautilusRPMView *rpm_view; - NautilusViewFrame *view_frame; + NautilusView *nautilus_view; if (strcmp (goad_id, "OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70")) { return NULL; @@ -60,8 +60,8 @@ rpm_view_make_object (BonoboGenericFactory *factory, gtk_signal_connect (GTK_OBJECT (rpm_view), "destroy", rpm_view_object_destroyed, NULL); - view_frame = NAUTILUS_VIEW_FRAME (nautilus_rpm_view_get_view_frame (rpm_view)); - return BONOBO_OBJECT (view_frame); + nautilus_view = NAUTILUS_VIEW (nautilus_rpm_view_get_nautilus_view (rpm_view)); + return BONOBO_OBJECT (nautilus_view); } int main(int argc, char *argv[]) diff --git a/components/rpmview/nautilus-rpm-view.c b/components/rpmview/nautilus-rpm-view.c index da3a5cfd4..eeeac4792 100644 --- a/components/rpmview/nautilus-rpm-view.c +++ b/components/rpmview/nautilus-rpm-view.c @@ -52,7 +52,7 @@ struct _NautilusRPMViewDetails { char *current_uri; - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; GtkWidget *package_image; GtkWidget *package_title; @@ -106,7 +106,7 @@ static void nautilus_rpm_view_drag_data_received (GtkWidget * static void nautilus_rpm_view_initialize_class (NautilusRPMViewClass *klass); static void nautilus_rpm_view_initialize (NautilusRPMView *view); static void nautilus_rpm_view_destroy (GtkObject *object); -static void rpm_view_notify_location_change_callback (NautilusContentViewFrame *view, +static void rpm_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusRPMView *rpm_view); static gint check_installed (gchar *package_name, gchar *package_version, gchar *package_release); @@ -139,9 +139,9 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view) rpm_view->details = g_new0 (NautilusRPMViewDetails, 1); - rpm_view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (rpm_view)); + rpm_view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (rpm_view)); - gtk_signal_connect (GTK_OBJECT (rpm_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (rpm_view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (rpm_view_notify_location_change_callback), rpm_view); @@ -348,7 +348,7 @@ nautilus_rpm_view_destroy (GtkObject *object) { NautilusRPMView *rpm_view = NAUTILUS_RPM_VIEW (object); - bonobo_object_unref (BONOBO_OBJECT (rpm_view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (rpm_view->details->nautilus_view)); g_free (rpm_view->details->current_uri); g_free (rpm_view->details); @@ -357,10 +357,10 @@ nautilus_rpm_view_destroy (GtkObject *object) } /* Component embedding support */ -NautilusContentViewFrame * -nautilus_rpm_view_get_view_frame (NautilusRPMView *rpm_view) +NautilusContentView * +nautilus_rpm_view_get_nautilus_view (NautilusRPMView *rpm_view) { - return rpm_view->details->view_frame; + return rpm_view->details->nautilus_view; } @@ -593,7 +593,7 @@ nautilus_rpm_view_load_uri (NautilusRPMView *rpm_view, const char *uri) } static void -rpm_view_notify_location_change_callback (NautilusContentViewFrame *view, +rpm_view_notify_location_change_callback (NautilusContentView *view, Nautilus_NavigationInfo *navinfo, NautilusRPMView *rpm_view) { @@ -605,7 +605,7 @@ rpm_view_notify_location_change_callback (NautilusContentViewFrame *view, progress.type = Nautilus_PROGRESS_UNDERWAY; progress.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (rpm_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (rpm_view->details->nautilus_view), &progress); /* do the actual work here */ nautilus_rpm_view_load_uri (rpm_view, navinfo->actual_uri); @@ -613,7 +613,7 @@ rpm_view_notify_location_change_callback (NautilusContentViewFrame *view, /* send the required PROGRESS_DONE signal */ progress.type = Nautilus_PROGRESS_DONE_OK; progress.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (rpm_view->details->view_frame), &progress); + nautilus_view_request_progress_change (NAUTILUS_VIEW (rpm_view->details->nautilus_view), &progress); } /* handle drag and drop */ diff --git a/components/rpmview/nautilus-rpm-view.h b/components/rpmview/nautilus-rpm-view.h index 2340fbf82..f09e2bfd7 100644 --- a/components/rpmview/nautilus-rpm-view.h +++ b/components/rpmview/nautilus-rpm-view.h @@ -51,13 +51,13 @@ struct _NautilusRPMViewClass { /* GtkObject support */ -GtkType nautilus_rpm_view_get_type (void); +GtkType nautilus_rpm_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *nautilus_rpm_view_get_view_frame (NautilusRPMView *view); +NautilusContentView *nautilus_rpm_view_get_nautilus_view (NautilusRPMView *view); /* URI handling */ -void nautilus_rpm_view_load_uri (NautilusRPMView *view, - const char *uri); +void nautilus_rpm_view_load_uri (NautilusRPMView *view, + const char *uri); #endif /* NAUTILUS_RPM_VIEW_H */ diff --git a/components/sample/main.c b/components/sample/main.c index 26a3244cf..327b8d795 100644 --- a/components/sample/main.c +++ b/components/sample/main.c @@ -48,7 +48,7 @@ sample_make_object (BonoboGenericFactory *factory, void *closure) { NautilusSampleContentView *view; - NautilusViewFrame *view_frame; + NautilusView *nautilus_view; puts ("Checking IID!"); @@ -62,11 +62,11 @@ sample_make_object (BonoboGenericFactory *factory, object_count++; - view_frame = NAUTILUS_VIEW_FRAME (nautilus_sample_content_view_get_view_frame (view)); + nautilus_view = NAUTILUS_VIEW (nautilus_sample_content_view_get_nautilus_view (view)); - gtk_signal_connect (GTK_OBJECT (view_frame), "destroy", sample_object_destroyed, NULL); + gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", sample_object_destroyed, NULL); - return BONOBO_OBJECT (view_frame); + return BONOBO_OBJECT (nautilus_view); } int main(int argc, char *argv[]) diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c index 3b449d802..69c9f57af 100644 --- a/components/sample/nautilus-sample-content-view.c +++ b/components/sample/nautilus-sample-content-view.c @@ -38,10 +38,10 @@ #include <libnautilus/nautilus-bonobo-ui.h> #include <libnautilus-extensions/nautilus-gtk-macros.h> -/* A NautilusContentViewFrame's private information. */ +/* A NautilusContentView's private information. */ struct NautilusSampleContentViewDetails { char *uri; - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; }; static void nautilus_sample_content_view_initialize_class (NautilusSampleContentViewClass *klass); @@ -50,7 +50,7 @@ static void nautilus_sample_content_view_destroy (GtkObject NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView, nautilus_sample_content_view, GTK_TYPE_LABEL) -static void sample_notify_location_change_callback (NautilusContentViewFrame *view_frame, +static void sample_notify_location_change_callback (NautilusContentView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSampleContentView *view); static void sample_merge_bonobo_items_callback (BonoboObject *control, @@ -74,9 +74,9 @@ nautilus_sample_content_view_initialize (NautilusSampleContentView *view) gtk_label_set_text (GTK_LABEL (view), g_strdup ("(none)")); - view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (view)); + view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (view)); - gtk_signal_connect (GTK_OBJECT (view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (sample_notify_location_change_callback), view); @@ -85,8 +85,8 @@ nautilus_sample_content_view_initialize (NautilusSampleContentView *view) * Get notified when our bonobo control is activated so we * can merge menu & toolbar items into Nautilus's UI. */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_frame_get_bonobo_control - (NAUTILUS_VIEW_FRAME (view->details->view_frame))), + gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control + (NAUTILUS_VIEW (view->details->nautilus_view))), "activate", sample_merge_bonobo_items_callback, view); @@ -101,7 +101,7 @@ nautilus_sample_content_view_destroy (GtkObject *object) view = NAUTILUS_SAMPLE_CONTENT_VIEW (object); - bonobo_object_unref (BONOBO_OBJECT (view->details->view_frame)); + bonobo_object_unref (BONOBO_OBJECT (view->details->nautilus_view)); g_free (view->details->uri); g_free (view->details); @@ -110,24 +110,23 @@ nautilus_sample_content_view_destroy (GtkObject *object) } /** - * nautilus_sample_content_view_get_view_frame: + * nautilus_sample_content_view_get_nautilus_view: * - * Return the NautilusViewFrame object associated with this view; this + * Return the NautilusView object associated with this view; this * is needed to export the view via CORBA/Bonobo. - * @view: NautilusSampleContentView to get the view_frame from.. + * @view: NautilusSampleContentView to get the nautilus_view from.. * **/ -NautilusContentViewFrame * -nautilus_sample_content_view_get_view_frame (NautilusSampleContentView *view) +NautilusContentView * +nautilus_sample_content_view_get_nautilus_view (NautilusSampleContentView *view) { - return view->details->view_frame; + return view->details->nautilus_view; } /** * nautilus_sample_content_view_load_uri: * * Load the resource pointed to by the specified URI. - * @view: NautilusSampleContentView to get the view_frame from. * **/ void @@ -145,13 +144,13 @@ nautilus_sample_content_view_load_uri (NautilusSampleContentView *view, } static void -sample_notify_location_change_callback (NautilusContentViewFrame *view_frame, +sample_notify_location_change_callback (NautilusContentView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSampleContentView *view) { Nautilus_ProgressRequestInfo request; - g_assert (view_frame == view->details->view_frame); + g_assert (nautilus_view == view->details->nautilus_view); memset(&request, 0, sizeof(request)); @@ -166,7 +165,7 @@ sample_notify_location_change_callback (NautilusContentViewFrame *view_frame, request.type = Nautilus_PROGRESS_UNDERWAY; request.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); /* Do the actual load. */ nautilus_sample_content_view_load_uri (view, navinfo->actual_uri); @@ -183,7 +182,7 @@ sample_notify_location_change_callback (NautilusContentViewFrame *view_frame, request.type = Nautilus_PROGRESS_DONE_OK; request.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (view_frame), &request); + nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request); } static void diff --git a/components/sample/nautilus-sample-content-view.h b/components/sample/nautilus-sample-content-view.h index ecc6b3b03..fdc10afc2 100644 --- a/components/sample/nautilus-sample-content-view.h +++ b/components/sample/nautilus-sample-content-view.h @@ -32,14 +32,14 @@ #include <libnautilus/nautilus-content-view-frame.h> #include <gtk/gtklabel.h> -typedef struct NautilusSampleContentView NautilusSampleContentView; +typedef struct NautilusSampleContentView NautilusSampleContentView; typedef struct NautilusSampleContentViewClass NautilusSampleContentViewClass; -#define NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW (nautilus_sample_content_view_get_type ()) -#define NAUTILUS_SAMPLE_CONTENT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW, NautilusSampleContentView)) -#define NAUTILUS_SAMPLE_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW, NautilusSampleContentViewClass)) -#define NAUTILUS_IS_SAMPLE_CONTENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW)) -#define NAUTILUS_IS_SAMPLE_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW)) +#define NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW (nautilus_sample_content_view_get_type ()) +#define NAUTILUS_SAMPLE_CONTENT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW, NautilusSampleContentView)) +#define NAUTILUS_SAMPLE_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW, NautilusSampleContentViewClass)) +#define NAUTILUS_IS_SAMPLE_CONTENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW)) +#define NAUTILUS_IS_SAMPLE_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW)) typedef struct NautilusSampleContentViewDetails NautilusSampleContentViewDetails; @@ -53,13 +53,13 @@ struct NautilusSampleContentViewClass { }; /* GtkObject support */ -GtkType nautilus_sample_content_view_get_type (void); +GtkType nautilus_sample_content_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *nautilus_sample_content_view_get_view_frame (NautilusSampleContentView *view); +NautilusContentView *nautilus_sample_content_view_get_nautilus_view (NautilusSampleContentView *view); /* URI handling */ -void nautilus_sample_content_view_load_uri (NautilusSampleContentView *view, - const char *uri); +void nautilus_sample_content_view_load_uri (NautilusSampleContentView *view, + const char *uri); #endif /* NAUTILUS_SAMPLE_CONTENT_VIEW_H */ diff --git a/components/services/startup/nautilus-view/main.c b/components/services/startup/nautilus-view/main.c index bfaed4171..c1e8b5c09 100644 --- a/components/services/startup/nautilus-view/main.c +++ b/components/services/startup/nautilus-view/main.c @@ -47,7 +47,7 @@ services_make_object (BonoboGenericFactory* factory, void* closure) { NautilusServicesContentView* view; - NautilusViewFrame* view_frame; + NautilusView* nautilus_view; puts ("Trying to create object."); @@ -61,11 +61,11 @@ services_make_object (BonoboGenericFactory* factory, gtk_signal_connect (GTK_OBJECT (view), "destroy", services_object_destroyed, NULL); - view_frame = NAUTILUS_VIEW_FRAME (nautilus_service_startup_view_get_view_frame (view)); + nautilus_view = NAUTILUS_VIEW (nautilus_service_startup_view_get_nautilus_view (view)); - printf ("Returning new object %x\n", (unsigned) view_frame); + printf ("Returning new object %p\n", nautilus_view); - return BONOBO_OBJECT (view_frame); + return BONOBO_OBJECT (nautilus_view); } int diff --git a/components/services/startup/nautilus-view/nautilus-service-startup-view.c b/components/services/startup/nautilus-view/nautilus-service-startup-view.c index 649ccccc8..4b7f00432 100644 --- a/components/services/startup/nautilus-view/nautilus-service-startup-view.c +++ b/components/services/startup/nautilus-view/nautilus-service-startup-view.c @@ -46,7 +46,7 @@ struct _NautilusServicesContentViewDetails { char* uri; char* auth_token; - NautilusContentViewFrame* view_frame; + NautilusContentView* nautilus_view; GtkWidget* form; GtkWidget* form_title; GtkWidget* account_name; @@ -67,7 +67,7 @@ static void nautilus_service_startup_view_destroy (GtkObject* object); NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusServicesContentView, nautilus_service_startup_view, GTK_TYPE_EVENT_BOX) -static void service_main_notify_location_change_cb (NautilusContentViewFrame* view, +static void service_main_notify_location_change_cb (NautilusContentView* view, Nautilus_NavigationInfo* navinfo, NautilusServicesContentView* services); static gboolean is_location (char* document_str, const char* place_str); @@ -75,12 +75,13 @@ static gboolean is_location (char* document_str, const char* place_str); /* utility routine to go to another uri */ static void -go_to_uri(NautilusServicesContentView* view, char* uri) { +go_to_uri(NautilusServicesContentView* view, char* uri) +{ Nautilus_NavigationRequestInfo nri; memset (&nri, 0, sizeof(nri)); nri.requested_uri = uri; - nautilus_view_frame_request_location_change ((NautilusViewFrame*)view->details->view_frame, &nri); + nautilus_view_request_location_change (NAUTILUS_VIEW (view->details->nautilus_view), &nri); } /* temporary callback to handle the configuration button */ @@ -760,8 +761,8 @@ nautilus_service_startup_view_initialize (NautilusServicesContentView* view) { NautilusBackground* background; view->details = g_new0 (NautilusServicesContentViewDetails, 1); - view->details->view_frame = nautilus_content_view_frame_new (GTK_WIDGET (view)); - gtk_signal_connect (GTK_OBJECT (view->details->view_frame), + view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (view)); + gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (service_main_notify_location_change_cb), view); @@ -792,9 +793,9 @@ nautilus_service_startup_view_destroy (GtkObject* object) { } /* Component embedding support */ -NautilusContentViewFrame* -nautilus_service_startup_view_get_view_frame (NautilusServicesContentView* view) { - return view->details->view_frame; +NautilusContentView * +nautilus_service_startup_view_get_nautilus_view (NautilusServicesContentView* view) { + return view->details->nautilus_view; } /* utility for checking uri */ @@ -843,7 +844,7 @@ nautilus_service_startup_view_load_uri (NautilusServicesContentView* view, } static void -service_main_notify_location_change_cb (NautilusContentViewFrame* view, +service_main_notify_location_change_cb (NautilusContentView* view, Nautilus_NavigationInfo* navinfo, NautilusServicesContentView* services) { @@ -854,12 +855,12 @@ service_main_notify_location_change_cb (NautilusContentViewFrame* view, /* we must send a PROGRESS_UNDERWAY message */ pri.type = Nautilus_PROGRESS_UNDERWAY; pri.amount = 0.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (services->details->view_frame), &pri); + nautilus_view_request_progress_change (NAUTILUS_VIEW (services->details->nautilus_view), &pri); nautilus_service_startup_view_load_uri (services, navinfo->actual_uri); /* likewise, we must send a PROGRESS_DONE message */ pri.type = Nautilus_PROGRESS_DONE_OK; pri.amount = 100.0; - nautilus_view_frame_request_progress_change (NAUTILUS_VIEW_FRAME (services->details->view_frame), &pri); + nautilus_view_request_progress_change (NAUTILUS_VIEW (services->details->nautilus_view), &pri); } diff --git a/components/services/startup/nautilus-view/nautilus-service-startup-view.h b/components/services/startup/nautilus-view/nautilus-service-startup-view.h index 53aa9c3e0..2d6d5f5e5 100644 --- a/components/services/startup/nautilus-view/nautilus-service-startup-view.h +++ b/components/services/startup/nautilus-view/nautilus-service-startup-view.h @@ -52,12 +52,13 @@ struct _NautilusServicesContentViewClass { }; /* GtkObject support */ -GtkType nautilus_service_startup_view_get_type (void); +GtkType nautilus_service_startup_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame* nautilus_service_startup_view_get_view_frame (NautilusServicesContentView* view); +NautilusContentView *nautilus_service_startup_view_get_nautilus_view (NautilusServicesContentView *view); /* URI handling */ -void nautilus_service_startup_view_load_uri (NautilusServicesContentView* view, const char* uri); +void nautilus_service_startup_view_load_uri (NautilusServicesContentView *view, + const char *uri); #endif /* NAUTILUS_SERVICE_STARTUP_VIEW_H */ diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c index 0937d4796..fd31a7a30 100644 --- a/components/websearch/ntl-web-search.c +++ b/components/websearch/ntl-web-search.c @@ -37,7 +37,7 @@ typedef struct { } EngineInfo; typedef struct { - NautilusViewFrame *view; + NautilusView *view; GtkCList *clist; @@ -54,9 +54,9 @@ typedef struct { static int object_count = 0; static void -web_search_notify_location_change (NautilusViewFrame *view, - Nautilus_NavigationInfo *loci, - WebSearchView *hview) +web_search_notify_location_change (NautilusView *view, + Nautilus_NavigationInfo *loci, + WebSearchView *hview) { } @@ -92,7 +92,7 @@ do_search(GtkWidget *widget, WebSearchView *hview) nri.requested_uri = uri; nri.new_window_requested = FALSE; - nautilus_view_frame_request_location_change(hview->view, &nri); + nautilus_view_request_location_change(hview->view, &nri); } static void @@ -214,7 +214,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) /* create CORBA object */ - hview->view = NAUTILUS_VIEW_FRAME (nautilus_meta_view_frame_new (vbox)); + hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); gtk_signal_connect(GTK_OBJECT (hview->view), "destroy", do_destroy, NULL); object_count++; @@ -223,7 +223,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) /* handle selections */ info = nautilus_clipboard_info_new (); - nautilus_clipboard_info_set_view_frame (info, hview->view); + nautilus_clipboard_info_set_view (info, hview->view); nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (hview->ent_params)); nautilus_clipboard_info_set_component_name (info, _("WebSearch")); gtk_signal_connect (GTK_OBJECT (hview->ent_params), "focus_in_event", diff --git a/libnautilus-extensions/nautilus-gnome-extensions.c b/libnautilus-extensions/nautilus-gnome-extensions.c index fb5725385..0d28b7c64 100644 --- a/libnautilus-extensions/nautilus-gnome-extensions.c +++ b/libnautilus-extensions/nautilus-gnome-extensions.c @@ -303,6 +303,19 @@ show_ok_box (const char *message, } GtkWidget * +nautilus_warning_dialog (const char *warning) +{ + return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, NULL); +} + +GtkWidget * +nautilus_warning_dialog_parented (const char *warning, + GtkWindow *parent) +{ + return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, parent); +} + +GtkWidget * nautilus_error_dialog (const char *error) { return show_ok_box (error, GNOME_MESSAGE_BOX_ERROR, NULL); diff --git a/libnautilus-extensions/nautilus-gnome-extensions.h b/libnautilus-extensions/nautilus-gnome-extensions.h index 9e9d2df3e..80732bf28 100644 --- a/libnautilus-extensions/nautilus-gnome-extensions.h +++ b/libnautilus-extensions/nautilus-gnome-extensions.h @@ -80,6 +80,9 @@ int nautilus_simple_dialog (GtkWidget ...); /* Variations on gnome dialogs that use text with line-wrapping turned on. */ +GtkWidget *nautilus_warning_dialog (const char *warning); +GtkWidget *nautilus_warning_dialog_parented (const char *warning, + GtkWindow *parent); GtkWidget *nautilus_error_dialog (const char *error); GtkWidget *nautilus_error_dialog_parented (const char *error, GtkWindow *parent); diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c index a8c53f6ec..a226f8d6f 100644 --- a/libnautilus-extensions/nautilus-undo-manager.c +++ b/libnautilus-extensions/nautilus-undo-manager.c @@ -676,7 +676,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, */ void -nautilus_undo_setup_bonobo_control (BonoboObject *control) +nautilus_undo_setup_bonobo_control (BonoboControl *control) { /* NautilusUndoContext *undo_context; @@ -705,4 +705,4 @@ static void set_frame () { } -*/
\ No newline at end of file +*/ diff --git a/libnautilus-extensions/nautilus-undo-manager.h b/libnautilus-extensions/nautilus-undo-manager.h index 8b86e359f..bdaeb9430 100644 --- a/libnautilus-extensions/nautilus-undo-manager.h +++ b/libnautilus-extensions/nautilus-undo-manager.h @@ -25,7 +25,7 @@ #ifndef NAUTILUS_UNDO_MANAGER_H #define NAUTILUS_UNDO_MANAGER_H -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include "nautilus-undo-transaction.h" #include "nautilus-undo.h" @@ -77,6 +77,6 @@ void nautilus_share_undo_manager /* FIXME: This should not be a public function. */ Nautilus_Undo_Manager nautilus_get_undo_manager (GtkObject *start_object); -void nautilus_undo_setup_bonobo_control (BonoboObject *control); +void nautilus_undo_setup_bonobo_control (BonoboControl *control); #endif diff --git a/libnautilus-private/nautilus-gnome-extensions.c b/libnautilus-private/nautilus-gnome-extensions.c index fb5725385..0d28b7c64 100644 --- a/libnautilus-private/nautilus-gnome-extensions.c +++ b/libnautilus-private/nautilus-gnome-extensions.c @@ -303,6 +303,19 @@ show_ok_box (const char *message, } GtkWidget * +nautilus_warning_dialog (const char *warning) +{ + return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, NULL); +} + +GtkWidget * +nautilus_warning_dialog_parented (const char *warning, + GtkWindow *parent) +{ + return show_ok_box (warning, GNOME_MESSAGE_BOX_WARNING, parent); +} + +GtkWidget * nautilus_error_dialog (const char *error) { return show_ok_box (error, GNOME_MESSAGE_BOX_ERROR, NULL); diff --git a/libnautilus-private/nautilus-gnome-extensions.h b/libnautilus-private/nautilus-gnome-extensions.h index 9e9d2df3e..80732bf28 100644 --- a/libnautilus-private/nautilus-gnome-extensions.h +++ b/libnautilus-private/nautilus-gnome-extensions.h @@ -80,6 +80,9 @@ int nautilus_simple_dialog (GtkWidget ...); /* Variations on gnome dialogs that use text with line-wrapping turned on. */ +GtkWidget *nautilus_warning_dialog (const char *warning); +GtkWidget *nautilus_warning_dialog_parented (const char *warning, + GtkWindow *parent); GtkWidget *nautilus_error_dialog (const char *error); GtkWidget *nautilus_error_dialog_parented (const char *error, GtkWindow *parent); diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index a8c53f6ec..a226f8d6f 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/nautilus-undo-manager.c @@ -676,7 +676,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, */ void -nautilus_undo_setup_bonobo_control (BonoboObject *control) +nautilus_undo_setup_bonobo_control (BonoboControl *control) { /* NautilusUndoContext *undo_context; @@ -705,4 +705,4 @@ static void set_frame () { } -*/
\ No newline at end of file +*/ diff --git a/libnautilus-private/nautilus-undo-manager.h b/libnautilus-private/nautilus-undo-manager.h index 8b86e359f..bdaeb9430 100644 --- a/libnautilus-private/nautilus-undo-manager.h +++ b/libnautilus-private/nautilus-undo-manager.h @@ -25,7 +25,7 @@ #ifndef NAUTILUS_UNDO_MANAGER_H #define NAUTILUS_UNDO_MANAGER_H -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include "nautilus-undo-transaction.h" #include "nautilus-undo.h" @@ -77,6 +77,6 @@ void nautilus_share_undo_manager /* FIXME: This should not be a public function. */ Nautilus_Undo_Manager nautilus_get_undo_manager (GtkObject *start_object); -void nautilus_undo_setup_bonobo_control (BonoboObject *control); +void nautilus_undo_setup_bonobo_control (BonoboControl *control); #endif diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c index 86bf1da79..8a5ebc667 100644 --- a/libnautilus/nautilus-clipboard.c +++ b/libnautilus/nautilus-clipboard.c @@ -71,7 +71,7 @@ static void nautilus_component_bonobo_menu_clear_cb struct NautilusClipboardDetails { char *component_name; GtkWidget *clipboard_owner; - NautilusViewFrame *view; + NautilusView *view; }; @@ -159,19 +159,19 @@ nautilus_clipboard_info_set_clipboard_owner (NautilusClipboardInfo *info, GtkWid gtk_widget_ref (clipboard_owner); } -GtkWidget* +GtkWidget * nautilus_clipboard_info_get_clipboard_owner (NautilusClipboardInfo *info) { return info->details->clipboard_owner; } void -nautilus_clipboard_info_set_view_frame (NautilusClipboardInfo *info, NautilusViewFrame *view) +nautilus_clipboard_info_set_view (NautilusClipboardInfo *info, NautilusView *view) { g_return_if_fail (info != NULL); g_return_if_fail (NAUTILUS_CLIPBOARD_INFO (info)); g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); bonobo_object_ref (BONOBO_OBJECT (view)); @@ -179,8 +179,8 @@ nautilus_clipboard_info_set_view_frame (NautilusClipboardInfo *info, NautilusVie } -NautilusViewFrame* -nautilus_clipboard_info_get_view_frame (NautilusClipboardInfo *info) +NautilusView * +nautilus_clipboard_info_get_view (NautilusClipboardInfo *info) { return info->details->view; } @@ -197,7 +197,7 @@ nautilus_clipboard_info_get_bonobo_ui_handler (NautilusClipboardInfo *info) static BonoboControl * nautilus_clipboard_info_get_bonobo_control (NautilusClipboardInfo *info) { - return BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (info->details->view)); + return nautilus_view_get_bonobo_control (info->details->view); } diff --git a/libnautilus/nautilus-clipboard.h b/libnautilus/nautilus-clipboard.h index 50939dbf2..cc7623851 100644 --- a/libnautilus/nautilus-clipboard.h +++ b/libnautilus/nautilus-clipboard.h @@ -62,38 +62,27 @@ struct NautilusClipboardInfoClass { }; /* GtkObject support */ -GtkType nautilus_clipboard_info_get_type (void); +GtkType nautilus_clipboard_info_get_type (void); +void nautilus_clipboard_info_initialize (NautilusClipboardInfo *info); +void nautilus_clipboard_info_destroy (NautilusClipboardInfo *info); +void nautilus_clipboard_info_destroy_cb (GtkObject *object, + gpointer user_data); +NautilusClipboardInfo *nautilus_clipboard_info_new (void); +void nautilus_clipboard_info_set_component_name (NautilusClipboardInfo *info, + char *component_name); +char * nautilus_clipboard_info_get_component_name (NautilusClipboardInfo *info); +void nautilus_clipboard_info_set_clipboard_owner (NautilusClipboardInfo *info, + GtkWidget *clipboard_owner); +GtkWidget * nautilus_clipboard_info_get_clipboard_owner (NautilusClipboardInfo *info); +void nautilus_clipboard_info_set_view (NautilusClipboardInfo *info, + NautilusView *view); +NautilusView * nautilus_clipboard_info_get_view (NautilusClipboardInfo *info); +void nautilus_clipboard_info_free (NautilusClipboardInfo *info); +void nautilus_component_merge_bonobo_items_cb (GtkWidget *widget, + GdkEventAny *event, + gpointer user_data); +void nautilus_component_unmerge_bonobo_items_cb (GtkWidget *widget, + GdkEventAny *event, + gpointer user_data); - -void nautilus_clipboard_info_initialize (NautilusClipboardInfo *info); - -void nautilus_clipboard_info_destroy (NautilusClipboardInfo *info); - -void nautilus_clipboard_info_destroy_cb (GtkObject *object, gpointer user_data); - -NautilusClipboardInfo* nautilus_clipboard_info_new (void); - -void nautilus_clipboard_info_set_component_name (NautilusClipboardInfo *info, char *component_name); -char* nautilus_clipboard_info_get_component_name (NautilusClipboardInfo *info); - -void nautilus_clipboard_info_set_clipboard_owner (NautilusClipboardInfo *info, GtkWidget *clipboard_owner); -GtkWidget* nautilus_clipboard_info_get_clipboard_owner (NautilusClipboardInfo *info); - -void nautilus_clipboard_info_set_view_frame (NautilusClipboardInfo *info, NautilusViewFrame *view); -NautilusViewFrame* nautilus_clipboard_info_get_view_frame (NautilusClipboardInfo *info); - - -void nautilus_clipboard_info_free (NautilusClipboardInfo *info) ; - - -void nautilus_component_merge_bonobo_items_cb (GtkWidget *widget, - GdkEventAny *event, - gpointer user_data); -void nautilus_component_unmerge_bonobo_items_cb (GtkWidget *widget, - GdkEventAny *event, - gpointer user_data); #endif - - - - diff --git a/libnautilus/nautilus-content-view-frame.c b/libnautilus/nautilus-content-view-frame.c index 9e7633207..d2dbf635e 100644 --- a/libnautilus/nautilus-content-view-frame.c +++ b/libnautilus/nautilus-content-view-frame.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -35,55 +35,51 @@ typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; + POA_Nautilus_View servant; + gpointer bonobo_object; - NautilusContentViewFrame *view; + NautilusContentView *view; } impl_POA_Nautilus_ContentView; extern POA_Nautilus_View__epv libnautilus_Nautilus_View_epv; - -static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = { - NULL /* _private */ -}; - -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; +static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv; +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv = { - &base_epv, - NULL, - &libnautilus_Nautilus_View_epv, - &impl_Nautilus_ContentView_epv + &base_epv, + NULL, + &libnautilus_Nautilus_View_epv, + &impl_Nautilus_ContentView_epv }; -static void nautilus_content_view_frame_initialize (NautilusContentViewFrame *view); -static void nautilus_content_view_frame_destroy (NautilusContentViewFrame *view); -static void nautilus_content_view_frame_initialize_class (NautilusContentViewFrameClass *klass); +static void nautilus_content_view_initialize (NautilusContentView *view); +static void nautilus_content_view_destroy (NautilusContentView *view); +static void nautilus_content_view_initialize_class (NautilusContentViewClass *klass); -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentViewFrame, nautilus_content_view_frame, NAUTILUS_TYPE_VIEW_FRAME) +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentView, nautilus_content_view, NAUTILUS_TYPE_VIEW) static void -nautilus_content_view_frame_initialize (NautilusContentViewFrame *view) +nautilus_content_view_initialize (NautilusContentView *view) { } -NautilusContentViewFrame * -nautilus_content_view_frame_new (GtkWidget *widget) +NautilusContentView * +nautilus_content_view_new (GtkWidget *widget) { - BonoboObject *control; + BonoboControl *control; - control = BONOBO_OBJECT (bonobo_control_new (widget)); + control = bonobo_control_new (widget); - return nautilus_content_view_frame_new_from_bonobo_control (control); + return nautilus_content_view_new_from_bonobo_control (control); } -NautilusContentViewFrame * -nautilus_content_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control) +NautilusContentView * +nautilus_content_view_new_from_bonobo_control (BonoboControl *bonobo_control) { - NautilusContentViewFrame *view; + NautilusContentView *view; - view = NAUTILUS_CONTENT_VIEW_FRAME (gtk_object_new (NAUTILUS_TYPE_CONTENT_VIEW_FRAME, + view = NAUTILUS_CONTENT_VIEW (gtk_object_new (NAUTILUS_TYPE_CONTENT_VIEW, "bonobo_control", bonobo_control, NULL)); @@ -91,43 +87,43 @@ nautilus_content_view_frame_new_from_bonobo_control (BonoboObject *bonobo_contro } static void -nautilus_content_view_frame_destroy (NautilusContentViewFrame *view) +nautilus_content_view_destroy (NautilusContentView *view) { NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } static void -nautilus_content_view_frame_initialize_class (NautilusContentViewFrameClass *klass) +nautilus_content_view_initialize_class (NautilusContentViewClass *klass) { - NautilusViewFrameClass *view_class; + NautilusViewClass *view_class; GtkObjectClass *object_class; object_class = (GtkObjectClass*) klass; - object_class->destroy = (void (*)(GtkObject *))nautilus_content_view_frame_destroy; + object_class->destroy = (void (*)(GtkObject *))nautilus_content_view_destroy; - view_class = (NautilusViewFrameClass *) klass; + view_class = (NautilusViewClass *) klass; view_class->servant_init_func = POA_Nautilus_ContentView__init; view_class->servant_destroy_func = POA_Nautilus_ContentView__fini; view_class->vepv = &impl_Nautilus_ContentView_vepv; } void -nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view, +nautilus_content_view_request_title_change (NautilusContentView *view, const char *new_title) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_CONTENT_VIEW_FRAME (view)); + g_return_if_fail (NAUTILUS_IS_CONTENT_VIEW (view)); g_return_if_fail (new_title != NULL); CORBA_exception_init(&ev); - if (nautilus_view_frame_ensure_view_frame (NAUTILUS_VIEW_FRAME (view))) { - Nautilus_ContentViewFrame_request_title_change (NAUTILUS_VIEW_FRAME (view)->private->view_frame, new_title, &ev); + if (nautilus_view_ensure_view_frame (NAUTILUS_VIEW (view))) { + Nautilus_ContentViewFrame_request_title_change (NAUTILUS_VIEW (view)->details->view_frame, new_title, &ev); if (ev._major != CORBA_NO_EXCEPTION) { - CORBA_Object_release(NAUTILUS_VIEW_FRAME (view)->private->view_frame, &ev); - NAUTILUS_VIEW_FRAME (view)->private->view_frame = CORBA_OBJECT_NIL; + CORBA_Object_release(NAUTILUS_VIEW (view)->details->view_frame, &ev); + NAUTILUS_VIEW (view)->details->view_frame = CORBA_OBJECT_NIL; } } diff --git a/libnautilus/nautilus-content-view-frame.h b/libnautilus/nautilus-content-view-frame.h index 043ac5222..39d884416 100644 --- a/libnautilus/nautilus-content-view-frame.h +++ b/libnautilus/nautilus-content-view-frame.h @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -27,33 +27,32 @@ /* nautilus-content-view-frame.h: Interface for object that represents a the frame a nautilus content view plugs into. */ -#ifndef NAUTILUS_CONTENT_VIEW_FRAME_H -#define NAUTILUS_CONTENT_VIEW_FRAME_H +#ifndef NAUTILUS_CONTENT_VIEW_H +#define NAUTILUS_CONTENT_VIEW_H #include <libnautilus/nautilus-view-frame.h> -#define NAUTILUS_TYPE_CONTENT_VIEW_FRAME (nautilus_content_view_frame_get_type ()) -#define NAUTILUS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrame)) -#define NAUTILUS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrameClass)) -#define NAUTILUS_IS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME)) -#define NAUTILUS_IS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME)) +#define NAUTILUS_TYPE_CONTENT_VIEW (nautilus_content_view_get_type ()) +#define NAUTILUS_CONTENT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW, NautilusContentView)) +#define NAUTILUS_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW, NautilusContentViewClass)) +#define NAUTILUS_IS_CONTENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW)) +#define NAUTILUS_IS_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW)) -typedef struct _NautilusContentViewFrame NautilusContentViewFrame; -typedef struct _NautilusContentViewFrameClass NautilusContentViewFrameClass; +typedef struct NautilusContentView NautilusContentView; +typedef struct NautilusContentViewClass NautilusContentViewClass; -struct _NautilusContentViewFrameClass { - NautilusViewFrameClass parent_spot; +struct NautilusContentViewClass { + NautilusViewClass parent_spot; }; -struct _NautilusContentViewFrame { - NautilusViewFrame parent; +struct NautilusContentView { + NautilusView parent; }; -GtkType nautilus_content_view_frame_get_type (void); -NautilusContentViewFrame *nautilus_content_view_frame_new (GtkWidget *widget); -NautilusContentViewFrame *nautilus_content_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control); - -void nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view, - const char *new_title); +GtkType nautilus_content_view_get_type (void); +NautilusContentView *nautilus_content_view_new (GtkWidget *widget); +NautilusContentView *nautilus_content_view_new_from_bonobo_control (BonoboControl *bonobo_control); +void nautilus_content_view_request_title_change (NautilusContentView *view, + const char *new_title); #endif diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c index 6143372a2..d97167e10 100644 --- a/libnautilus/nautilus-meta-view-frame.c +++ b/libnautilus/nautilus-meta-view-frame.c @@ -38,7 +38,7 @@ typedef struct { POA_Nautilus_View servant; gpointer bonobo_object; - NautilusMetaViewFrame *view; + NautilusMetaView *view; } impl_POA_Nautilus_MetaView; extern POA_Nautilus_View__epv libnautilus_Nautilus_View_epv; @@ -52,37 +52,37 @@ static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv = &impl_Nautilus_MetaView_epv }; -static void nautilus_meta_view_frame_initialize (NautilusMetaViewFrame *view); -static void nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *view); -static void nautilus_meta_view_frame_initialize_class (NautilusMetaViewFrameClass *klass); +static void nautilus_meta_view_initialize (NautilusMetaView *view); +static void nautilus_meta_view_destroy (NautilusMetaView *view); +static void nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass); -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMetaViewFrame, nautilus_meta_view_frame, NAUTILUS_TYPE_VIEW_FRAME) +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMetaView, nautilus_meta_view, NAUTILUS_TYPE_VIEW) static void -nautilus_meta_view_frame_initialize (NautilusMetaViewFrame *view) +nautilus_meta_view_initialize (NautilusMetaView *view) { } -NautilusMetaViewFrame * -nautilus_meta_view_frame_new (GtkWidget *widget) +NautilusMetaView * +nautilus_meta_view_new (GtkWidget *widget) { BonoboControl *control; g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); control = bonobo_control_new (widget); - return nautilus_meta_view_frame_new_from_bonobo_control (control); + return nautilus_meta_view_new_from_bonobo_control (control); } -NautilusMetaViewFrame * -nautilus_meta_view_frame_new_from_bonobo_control (BonoboControl *bonobo_control) +NautilusMetaView * +nautilus_meta_view_new_from_bonobo_control (BonoboControl *bonobo_control) { - NautilusMetaViewFrame *view; + NautilusMetaView *view; g_return_val_if_fail (BONOBO_IS_CONTROL (bonobo_control), NULL); - view = NAUTILUS_META_VIEW_FRAME (gtk_object_new (NAUTILUS_TYPE_META_VIEW_FRAME, + view = NAUTILUS_META_VIEW (gtk_object_new (NAUTILUS_TYPE_META_VIEW, "bonobo_control", bonobo_control, NULL)); @@ -91,19 +91,19 @@ nautilus_meta_view_frame_new_from_bonobo_control (BonoboControl *bonobo_control) } static void -nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *view) +nautilus_meta_view_destroy (NautilusMetaView *view) { NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } static void -nautilus_meta_view_frame_initialize_class (NautilusMetaViewFrameClass *klass) +nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass) { - NautilusViewFrameClass *view_class; + NautilusViewClass *view_class; - view_class = NAUTILUS_VIEW_FRAME_CLASS (klass); + view_class = NAUTILUS_VIEW_CLASS (klass); - GTK_OBJECT_CLASS (klass)->destroy = (void (*)(GtkObject *)) nautilus_meta_view_frame_destroy; + GTK_OBJECT_CLASS (klass)->destroy = (void (*)(GtkObject *)) nautilus_meta_view_destroy; view_class->servant_init_func = POA_Nautilus_MetaView__init; view_class->servant_destroy_func = POA_Nautilus_MetaView__fini; diff --git a/libnautilus/nautilus-meta-view-frame.h b/libnautilus/nautilus-meta-view-frame.h index 340b4109e..16e39c10e 100644 --- a/libnautilus/nautilus-meta-view-frame.h +++ b/libnautilus/nautilus-meta-view-frame.h @@ -32,25 +32,25 @@ #include <libnautilus/nautilus-view-frame.h> #include <bonobo/bonobo-control.h> -#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ()) -#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame)) -#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass)) -#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME)) -#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME)) +#define NAUTILUS_TYPE_META_VIEW (nautilus_meta_view_get_type ()) +#define NAUTILUS_META_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW, NautilusMetaView)) +#define NAUTILUS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW, NautilusMetaViewClass)) +#define NAUTILUS_IS_META_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW)) +#define NAUTILUS_IS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW)) -typedef struct NautilusMetaViewFrame NautilusMetaViewFrame; -typedef struct NautilusMetaViewFrameClass NautilusMetaViewFrameClass; +typedef struct NautilusMetaView NautilusMetaView; +typedef struct NautilusMetaViewClass NautilusMetaViewClass; -struct NautilusMetaViewFrame { - NautilusViewFrame base; +struct NautilusMetaView { + NautilusView base; }; -struct NautilusMetaViewFrameClass { - NautilusViewFrameClass base; +struct NautilusMetaViewClass { + NautilusViewClass base; }; -GtkType nautilus_meta_view_frame_get_type (void); -NautilusMetaViewFrame *nautilus_meta_view_frame_new (GtkWidget *widget); -NautilusMetaViewFrame *nautilus_meta_view_frame_new_from_bonobo_control (BonoboControl *control); +GtkType nautilus_meta_view_get_type (void); +NautilusMetaView *nautilus_meta_view_new (GtkWidget *widget); +NautilusMetaView *nautilus_meta_view_new_from_bonobo_control (BonoboControl *control); #endif diff --git a/libnautilus/nautilus-undo-manager.c b/libnautilus/nautilus-undo-manager.c index a8c53f6ec..a226f8d6f 100644 --- a/libnautilus/nautilus-undo-manager.c +++ b/libnautilus/nautilus-undo-manager.c @@ -676,7 +676,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, */ void -nautilus_undo_setup_bonobo_control (BonoboObject *control) +nautilus_undo_setup_bonobo_control (BonoboControl *control) { /* NautilusUndoContext *undo_context; @@ -705,4 +705,4 @@ static void set_frame () { } -*/
\ No newline at end of file +*/ diff --git a/libnautilus/nautilus-undo-manager.h b/libnautilus/nautilus-undo-manager.h index 8b86e359f..bdaeb9430 100644 --- a/libnautilus/nautilus-undo-manager.h +++ b/libnautilus/nautilus-undo-manager.h @@ -25,7 +25,7 @@ #ifndef NAUTILUS_UNDO_MANAGER_H #define NAUTILUS_UNDO_MANAGER_H -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include "nautilus-undo-transaction.h" #include "nautilus-undo.h" @@ -77,6 +77,6 @@ void nautilus_share_undo_manager /* FIXME: This should not be a public function. */ Nautilus_Undo_Manager nautilus_get_undo_manager (GtkObject *start_object); -void nautilus_undo_setup_bonobo_control (BonoboObject *control); +void nautilus_undo_setup_bonobo_control (BonoboControl *control); #endif diff --git a/libnautilus/nautilus-view-frame-private.h b/libnautilus/nautilus-view-frame-private.h index e03076fba..584866a37 100644 --- a/libnautilus/nautilus-view-frame-private.h +++ b/libnautilus/nautilus-view-frame-private.h @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -26,11 +26,11 @@ #ifndef NAUTILUS_VIEW_FRAME_PRIVATE_H #define NAUTILUS_VIEW_FRAME_PRIVATE_H -struct _NautilusViewFramePrivate { - BonoboObject *control; - Nautilus_ViewFrame view_frame; +struct NautilusViewDetails { + BonoboControl *control; + Nautilus_ViewFrame view_frame; }; -gboolean nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view); +gboolean nautilus_view_ensure_view_frame (NautilusView *view); #endif diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index 69f741b44..51e2de983 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -39,79 +39,78 @@ #include <libnautilus/nautilus-undo-manager.h> enum { - NOTIFY_LOCATION_CHANGE, - NOTIFY_SELECTION_CHANGE, - LOAD_STATE, - SAVE_STATE, - SHOW_PROPERTIES, - STOP_LOCATION_CHANGE, - LAST_SIGNAL + NOTIFY_LOCATION_CHANGE, + NOTIFY_SELECTION_CHANGE, + LOAD_STATE, + SAVE_STATE, + SHOW_PROPERTIES, + STOP_LOCATION_CHANGE, + LAST_SIGNAL }; enum { - ARG_0, - ARG_CONTROL + ARG_0, + ARG_CONTROL }; -static guint nautilus_view_frame_signals[LAST_SIGNAL]; +static guint signals[LAST_SIGNAL]; typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; - - NautilusViewFrame *view; + POA_Nautilus_View servant; + gpointer bonobo_object; + + NautilusView *view; } impl_POA_Nautilus_View; -void nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control); +void nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control); static void -impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_save_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_load_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, - Nautilus_NavigationInfo * navinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_location_change (impl_POA_Nautilus_View * servant, + Nautilus_NavigationInfo * navinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_stop_location_change (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, - Nautilus_SelectionInfo * selinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_selection_change (impl_POA_Nautilus_View * servant, + Nautilus_SelectionInfo * selinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_show_properties (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = { - NULL, /* _private */ - (gpointer) & impl_Nautilus_View_save_state, - (gpointer) & impl_Nautilus_View_load_state, - (gpointer) & impl_Nautilus_View_notify_location_change, - (gpointer) & impl_Nautilus_View_stop_location_change, - (gpointer) & impl_Nautilus_View_notify_selection_change, - (gpointer) & impl_Nautilus_View_show_properties + NULL, /* _private */ + (gpointer) & impl_Nautilus_View_save_state, + (gpointer) & impl_Nautilus_View_load_state, + (gpointer) & impl_Nautilus_View_notify_location_change, + (gpointer) & impl_Nautilus_View_stop_location_change, + (gpointer) & impl_Nautilus_View_notify_selection_change, + (gpointer) & impl_Nautilus_View_show_properties }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &base_epv, - NULL, - &libnautilus_Nautilus_View_epv + &base_epv, + NULL, + &libnautilus_Nautilus_View_epv }; static void @@ -119,7 +118,7 @@ impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SAVE_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SAVE_STATE], config_path); } static void @@ -127,7 +126,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[LOAD_STATE], config_path); } static void @@ -135,14 +134,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, Nautilus_NavigationInfo * navinfo, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_LOCATION_CHANGE], navinfo); } static void impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SHOW_PROPERTIES]); } static void @@ -150,359 +149,347 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, Nautilus_SelectionInfo * selinfo, CORBA_Environment * ev) { - gtk_signal_emit (GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_SELECTION_CHANGE], selinfo); } static void impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[STOP_LOCATION_CHANGE]); } static void impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { - PortableServer_ObjectId *objid; - CORBA_Environment ev; - void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - - CORBA_exception_init(&ev); - - servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; - objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); - CORBA_free (objid); - obj->servant = NULL; - - servant_destroy_func ((PortableServer_Servant) servant, &ev); - g_free (servant); - CORBA_exception_free(&ev); + PortableServer_ObjectId *objid; + CORBA_Environment ev; + void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); + + CORBA_exception_init(&ev); + + servant_destroy_func = NAUTILUS_VIEW_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; + objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); + PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); + CORBA_free (objid); + obj->servant = NULL; + + servant_destroy_func ((PortableServer_Servant) servant, &ev); + g_free (servant); + CORBA_exception_free(&ev); } static Nautilus_ViewFrame -impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) +impl_Nautilus_View__create(NautilusView *view, CORBA_Environment * ev) { - Nautilus_ViewFrame retval; - - impl_POA_Nautilus_View *newservant; - void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); - NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT(view)->klass); - - servant_init_func = view_class->servant_init_func; - newservant = g_new0 (impl_POA_Nautilus_View, 1); - newservant->servant.vepv = view_class->vepv; - if (!newservant->servant.vepv->Bonobo_Unknown_epv) - newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - servant_init_func ((PortableServer_Servant) newservant, ev); - - newservant->view = view; - - retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); - - gtk_signal_connect (GTK_OBJECT (view), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); - - return retval; + Nautilus_ViewFrame retval; + + impl_POA_Nautilus_View *newservant; + void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusViewClass *view_class = NAUTILUS_VIEW_CLASS (GTK_OBJECT(view)->klass); + + servant_init_func = view_class->servant_init_func; + newservant = g_new0 (impl_POA_Nautilus_View, 1); + newservant->servant.vepv = view_class->vepv; + if (!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); + servant_init_func ((PortableServer_Servant) newservant, ev); + + newservant->view = view; + + retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); + + gtk_signal_connect (GTK_OBJECT (view), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); + + return retval; } -static void nautilus_view_frame_initialize (NautilusViewFrame *view); -static void nautilus_view_frame_destroy (NautilusViewFrame *view); -static void nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass); -static void nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame, nautilus_view_frame, BONOBO_OBJECT_TYPE) +static void nautilus_view_initialize (NautilusView *view); +static void nautilus_view_destroy (NautilusView *view); +static void nautilus_view_initialize_class (NautilusViewClass *klass); +static void nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE) static void -nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass) +nautilus_view_initialize_class (NautilusViewClass *klass) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) klass; - object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy; - object_class->set_arg = nautilus_view_frame_set_arg; - object_class->get_arg = nautilus_view_frame_get_arg; - - klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - klass->servant_init_func = POA_Nautilus_View__init; - klass->servant_destroy_func = POA_Nautilus_View__fini; - klass->vepv = &impl_Nautilus_View_vepv; - - nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] = - gtk_signal_new("notify_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = - gtk_signal_new("notify_selection_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[LOAD_STATE] = - gtk_signal_new("load_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SAVE_STATE] = - gtk_signal_new("save_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SHOW_PROPERTIES] = - gtk_signal_new("show_properties", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - nautilus_view_frame_signals[STOP_LOCATION_CHANGE] = - gtk_signal_new("stop_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL); - - gtk_object_add_arg_type ("NautilusViewFrame::bonobo_control", - GTK_TYPE_OBJECT, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_CONTROL); + GtkObjectClass *object_class; + + object_class = (GtkObjectClass*) klass; + object_class->destroy = (void (*)(GtkObject*))nautilus_view_destroy; + object_class->set_arg = nautilus_view_set_arg; + object_class->get_arg = nautilus_view_get_arg; + + klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); + klass->servant_init_func = POA_Nautilus_View__init; + klass->servant_destroy_func = POA_Nautilus_View__fini; + klass->vepv = &impl_Nautilus_View_vepv; + + signals[NOTIFY_LOCATION_CHANGE] = + gtk_signal_new("notify_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_location_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[NOTIFY_SELECTION_CHANGE] = + gtk_signal_new("notify_selection_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_selection_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[LOAD_STATE] = + gtk_signal_new("load_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, load_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SAVE_STATE] = + gtk_signal_new("save_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, save_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SHOW_PROPERTIES] = + gtk_signal_new("show_properties", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, show_properties), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + signals[STOP_LOCATION_CHANGE] = + gtk_signal_new("stop_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, stop_location_change), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + + gtk_object_add_arg_type ("NautilusView::bonobo_control", + GTK_TYPE_OBJECT, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_CONTROL); } static void -nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - switch(arg_id) { - case ARG_CONTROL: - nautilus_view_frame_real_set_bonobo_control (NAUTILUS_VIEW_FRAME (object), - (BonoboObject *)GTK_VALUE_OBJECT(*arg)); - } + switch(arg_id) { + case ARG_CONTROL: + nautilus_view_real_set_bonobo_control (NAUTILUS_VIEW (object), + BONOBO_CONTROL (GTK_VALUE_OBJECT (*arg))); + } } static void -nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - NautilusViewFrame *view; - - view = NAUTILUS_VIEW_FRAME (object); - - switch(arg_id) { - case ARG_CONTROL: - GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_frame_get_bonobo_control (NAUTILUS_VIEW_FRAME (object))); - } + NautilusView *view; + + view = NAUTILUS_VIEW (object); + + switch(arg_id) { + case ARG_CONTROL: + GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (object))); + } } static void -nautilus_view_frame_initialize (NautilusViewFrame *view) +nautilus_view_initialize (NautilusView *view) { CORBA_Environment ev; - - CORBA_exception_init(&ev); - - view->private = g_new0 (NautilusViewFramePrivate, 1); + CORBA_exception_init (&ev); + + view->details = g_new0 (NautilusViewDetails, 1); + bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev)); - - nautilus_undo_setup_bonobo_control (BONOBO_OBJECT (view)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } -NautilusViewFrame * -nautilus_view_frame_new (GtkWidget *widget) +NautilusView * +nautilus_view_new (GtkWidget *widget) { - BonoboObject *control; - - control = BONOBO_OBJECT (bonobo_control_new (widget)); - - return nautilus_view_frame_new_from_bonobo_control (control); + BonoboControl *control; + + control = bonobo_control_new (widget); + return nautilus_view_new_from_bonobo_control (control); } -NautilusViewFrame * -nautilus_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control) +NautilusView * +nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control) { - NautilusViewFrame *view_frame; - - view_frame = NAUTILUS_VIEW_FRAME (gtk_object_new (NAUTILUS_TYPE_VIEW_FRAME, - "bonobo_control", bonobo_control, - NULL)); - - return view_frame; + NautilusView *view; + + view = NAUTILUS_VIEW (gtk_object_new (NAUTILUS_TYPE_VIEW, + "bonobo_control", bonobo_control, + NULL)); + return view; } static void -nautilus_view_frame_destroy (NautilusViewFrame *view) +nautilus_view_destroy (NautilusView *view) { - NautilusViewFrameClass *klass; - - klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (view)->klass); - - g_free (view->private); - - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); + NautilusViewClass *klass; + + klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (view)->klass); + + g_free (view->details); + + NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } gboolean -nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view) +nautilus_view_ensure_view_frame (NautilusView *view) { CORBA_Environment ev; - - g_assert (view != NULL); - g_assert (NAUTILUS_IS_VIEW_FRAME (view)); - + + g_assert (NAUTILUS_IS_VIEW (view)); + CORBA_exception_init (&ev); - - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - view->private->view_frame = Bonobo_Unknown_query_interface + + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + view->details->view_frame = Bonobo_Unknown_query_interface (bonobo_control_get_control_frame - (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))), - "IDL:Nautilus/ViewFrame:1.0", &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - view->private->view_frame = CORBA_OBJECT_NIL; + (nautilus_view_get_bonobo_control (view)), + "IDL:Nautilus/ViewFrame:1.0", &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + view->details->view_frame = CORBA_OBJECT_NIL; } } - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - CORBA_exception_free (&ev); - - return FALSE; - } else { - + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + CORBA_exception_free (&ev); + return FALSE; + } else { CORBA_exception_free (&ev); return TRUE; } } void -nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc) +nautilus_view_request_location_change (NautilusView *view, + Nautilus_NavigationRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init (&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init (&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_location_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc) +nautilus_view_request_selection_change (NautilusView *view, + Nautilus_SelectionRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_selection_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_selection_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc) +nautilus_view_request_status_change (NautilusView *view, + Nautilus_StatusRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_status_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_status_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_progress_change(NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc) +nautilus_view_request_progress_change(NautilusView *view, + Nautilus_ProgressRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_progress_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_progress_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } -BonoboObject * -nautilus_view_frame_get_bonobo_control (NautilusViewFrame *view) +BonoboControl * +nautilus_view_get_bonobo_control (NautilusView *view) { - return view->private->control; + return view->details->control; } CORBA_Object -nautilus_view_frame_get_main_window (NautilusViewFrame *view) +nautilus_view_get_main_window (NautilusView *view) { CORBA_Environment ev; Nautilus_ViewWindow window; CORBA_exception_init (&ev); - if (nautilus_view_frame_ensure_view_frame (view)) { - window = Nautilus_ViewFrame__get_main_window (view->private->view_frame, &ev); + if (nautilus_view_ensure_view_frame (view)) { + window = Nautilus_ViewFrame__get_main_window (view->details->view_frame, &ev); } else { window = NULL; } @@ -512,23 +499,11 @@ nautilus_view_frame_get_main_window (NautilusViewFrame *view) return window; } - void -nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control) +nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control) { - CORBA_Environment ev; - - CORBA_exception_init(&ev); - - /* FIXME bugzilla.eazel.com 682: - * what if this fails? Create a new control, or bomb somehow? - */ - view->private->control = bonobo_object_query_local_interface (bonobo_control, "IDL:Bonobo/Control:1.0"); - bonobo_object_unref (view->private->control); /* we don't want this spare ref */ - - bonobo_object_add_interface (BONOBO_OBJECT (view), view->private->control); - - CORBA_exception_free(&ev); + view->details->control = bonobo_control; + bonobo_object_add_interface (BONOBO_OBJECT (view), BONOBO_OBJECT (view->details->control)); + nautilus_undo_setup_bonobo_control (bonobo_control); } - diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h index 6f31459b4..aaf9d46ec 100644 --- a/libnautilus/nautilus-view-frame.h +++ b/libnautilus/nautilus-view-frame.h @@ -31,62 +31,60 @@ #define NAUTILUS_VIEW_FRAME_H #include <libnautilus/nautilus-view-component.h> -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include <gtk/gtkwidget.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ()) -#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame)) -#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass)) -#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) -#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) +#define NAUTILUS_TYPE_VIEW (nautilus_view_get_type ()) +#define NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView)) +#define NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass)) +#define NAUTILUS_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW)) +#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW)) -typedef struct _NautilusViewFrame NautilusViewFrame; -typedef struct _NautilusViewFrameClass NautilusViewFrameClass; +typedef struct NautilusView NautilusView; +typedef struct NautilusViewClass NautilusViewClass; -struct _NautilusViewFrameClass +struct NautilusViewClass { BonoboObjectClass parent_spot; - - void (*save_state) (NautilusViewFrame *view, const char *config_path); - void (*load_state) (NautilusViewFrame *view, const char *config_path); - void (*notify_location_change) (NautilusViewFrame *view, + + void (*save_state) (NautilusView *view, const char *config_path); + void (*load_state) (NautilusView *view, const char *config_path); + void (*notify_location_change) (NautilusView *view, Nautilus_NavigationInfo *nav_context); - void (*stop_location_change) (NautilusViewFrame *view); - void (*notify_selection_change) (NautilusViewFrame *view, + void (*stop_location_change) (NautilusView *view); + void (*notify_selection_change) (NautilusView *view, Nautilus_SelectionInfo *nav_context); - void (*show_properties) (NautilusViewFrame *view); - + void (*show_properties) (NautilusView *view); + BonoboObjectClass *parent_class; - + gpointer servant_init_func, servant_destroy_func, vepv; }; -typedef struct _NautilusViewFramePrivate NautilusViewFramePrivate; +typedef struct NautilusViewDetails NautilusViewDetails; -struct _NautilusViewFrame -{ +struct NautilusView { BonoboObject parent; - NautilusViewFramePrivate *private; + NautilusViewDetails *details; }; -GtkType nautilus_view_frame_get_type (void); -NautilusViewFrame *nautilus_view_frame_new (GtkWidget *widget); -NautilusViewFrame *nautilus_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control); -void nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc); -void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc); -void nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc); -void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc); -BonoboObject *nautilus_view_frame_get_bonobo_control (NautilusViewFrame *view); -CORBA_Object nautilus_view_frame_get_main_window (NautilusViewFrame *view); - +GtkType nautilus_view_get_type (void); +NautilusView * nautilus_view_new (GtkWidget *widget); +NautilusView * nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control); +void nautilus_view_request_location_change (NautilusView *view, + Nautilus_NavigationRequestInfo *loc); +void nautilus_view_request_selection_change (NautilusView *view, + Nautilus_SelectionRequestInfo *loc); +void nautilus_view_request_status_change (NautilusView *view, + Nautilus_StatusRequestInfo *loc); +void nautilus_view_request_progress_change (NautilusView *view, + Nautilus_ProgressRequestInfo *loc); +BonoboControl *nautilus_view_get_bonobo_control (NautilusView *view); +CORBA_Object nautilus_view_get_main_window (NautilusView *view); #ifdef __cplusplus } diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 69f741b44..51e2de983 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -39,79 +39,78 @@ #include <libnautilus/nautilus-undo-manager.h> enum { - NOTIFY_LOCATION_CHANGE, - NOTIFY_SELECTION_CHANGE, - LOAD_STATE, - SAVE_STATE, - SHOW_PROPERTIES, - STOP_LOCATION_CHANGE, - LAST_SIGNAL + NOTIFY_LOCATION_CHANGE, + NOTIFY_SELECTION_CHANGE, + LOAD_STATE, + SAVE_STATE, + SHOW_PROPERTIES, + STOP_LOCATION_CHANGE, + LAST_SIGNAL }; enum { - ARG_0, - ARG_CONTROL + ARG_0, + ARG_CONTROL }; -static guint nautilus_view_frame_signals[LAST_SIGNAL]; +static guint signals[LAST_SIGNAL]; typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; - - NautilusViewFrame *view; + POA_Nautilus_View servant; + gpointer bonobo_object; + + NautilusView *view; } impl_POA_Nautilus_View; -void nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control); +void nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control); static void -impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_save_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_load_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, - Nautilus_NavigationInfo * navinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_location_change (impl_POA_Nautilus_View * servant, + Nautilus_NavigationInfo * navinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_stop_location_change (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, - Nautilus_SelectionInfo * selinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_selection_change (impl_POA_Nautilus_View * servant, + Nautilus_SelectionInfo * selinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_show_properties (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = { - NULL, /* _private */ - (gpointer) & impl_Nautilus_View_save_state, - (gpointer) & impl_Nautilus_View_load_state, - (gpointer) & impl_Nautilus_View_notify_location_change, - (gpointer) & impl_Nautilus_View_stop_location_change, - (gpointer) & impl_Nautilus_View_notify_selection_change, - (gpointer) & impl_Nautilus_View_show_properties + NULL, /* _private */ + (gpointer) & impl_Nautilus_View_save_state, + (gpointer) & impl_Nautilus_View_load_state, + (gpointer) & impl_Nautilus_View_notify_location_change, + (gpointer) & impl_Nautilus_View_stop_location_change, + (gpointer) & impl_Nautilus_View_notify_selection_change, + (gpointer) & impl_Nautilus_View_show_properties }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &base_epv, - NULL, - &libnautilus_Nautilus_View_epv + &base_epv, + NULL, + &libnautilus_Nautilus_View_epv }; static void @@ -119,7 +118,7 @@ impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SAVE_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SAVE_STATE], config_path); } static void @@ -127,7 +126,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[LOAD_STATE], config_path); } static void @@ -135,14 +134,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, Nautilus_NavigationInfo * navinfo, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_LOCATION_CHANGE], navinfo); } static void impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SHOW_PROPERTIES]); } static void @@ -150,359 +149,347 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, Nautilus_SelectionInfo * selinfo, CORBA_Environment * ev) { - gtk_signal_emit (GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_SELECTION_CHANGE], selinfo); } static void impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[STOP_LOCATION_CHANGE]); } static void impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { - PortableServer_ObjectId *objid; - CORBA_Environment ev; - void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - - CORBA_exception_init(&ev); - - servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; - objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); - CORBA_free (objid); - obj->servant = NULL; - - servant_destroy_func ((PortableServer_Servant) servant, &ev); - g_free (servant); - CORBA_exception_free(&ev); + PortableServer_ObjectId *objid; + CORBA_Environment ev; + void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); + + CORBA_exception_init(&ev); + + servant_destroy_func = NAUTILUS_VIEW_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; + objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); + PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); + CORBA_free (objid); + obj->servant = NULL; + + servant_destroy_func ((PortableServer_Servant) servant, &ev); + g_free (servant); + CORBA_exception_free(&ev); } static Nautilus_ViewFrame -impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) +impl_Nautilus_View__create(NautilusView *view, CORBA_Environment * ev) { - Nautilus_ViewFrame retval; - - impl_POA_Nautilus_View *newservant; - void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); - NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT(view)->klass); - - servant_init_func = view_class->servant_init_func; - newservant = g_new0 (impl_POA_Nautilus_View, 1); - newservant->servant.vepv = view_class->vepv; - if (!newservant->servant.vepv->Bonobo_Unknown_epv) - newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - servant_init_func ((PortableServer_Servant) newservant, ev); - - newservant->view = view; - - retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); - - gtk_signal_connect (GTK_OBJECT (view), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); - - return retval; + Nautilus_ViewFrame retval; + + impl_POA_Nautilus_View *newservant; + void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusViewClass *view_class = NAUTILUS_VIEW_CLASS (GTK_OBJECT(view)->klass); + + servant_init_func = view_class->servant_init_func; + newservant = g_new0 (impl_POA_Nautilus_View, 1); + newservant->servant.vepv = view_class->vepv; + if (!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); + servant_init_func ((PortableServer_Servant) newservant, ev); + + newservant->view = view; + + retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); + + gtk_signal_connect (GTK_OBJECT (view), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); + + return retval; } -static void nautilus_view_frame_initialize (NautilusViewFrame *view); -static void nautilus_view_frame_destroy (NautilusViewFrame *view); -static void nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass); -static void nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame, nautilus_view_frame, BONOBO_OBJECT_TYPE) +static void nautilus_view_initialize (NautilusView *view); +static void nautilus_view_destroy (NautilusView *view); +static void nautilus_view_initialize_class (NautilusViewClass *klass); +static void nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE) static void -nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass) +nautilus_view_initialize_class (NautilusViewClass *klass) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) klass; - object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy; - object_class->set_arg = nautilus_view_frame_set_arg; - object_class->get_arg = nautilus_view_frame_get_arg; - - klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - klass->servant_init_func = POA_Nautilus_View__init; - klass->servant_destroy_func = POA_Nautilus_View__fini; - klass->vepv = &impl_Nautilus_View_vepv; - - nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] = - gtk_signal_new("notify_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = - gtk_signal_new("notify_selection_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[LOAD_STATE] = - gtk_signal_new("load_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SAVE_STATE] = - gtk_signal_new("save_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SHOW_PROPERTIES] = - gtk_signal_new("show_properties", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - nautilus_view_frame_signals[STOP_LOCATION_CHANGE] = - gtk_signal_new("stop_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL); - - gtk_object_add_arg_type ("NautilusViewFrame::bonobo_control", - GTK_TYPE_OBJECT, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_CONTROL); + GtkObjectClass *object_class; + + object_class = (GtkObjectClass*) klass; + object_class->destroy = (void (*)(GtkObject*))nautilus_view_destroy; + object_class->set_arg = nautilus_view_set_arg; + object_class->get_arg = nautilus_view_get_arg; + + klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); + klass->servant_init_func = POA_Nautilus_View__init; + klass->servant_destroy_func = POA_Nautilus_View__fini; + klass->vepv = &impl_Nautilus_View_vepv; + + signals[NOTIFY_LOCATION_CHANGE] = + gtk_signal_new("notify_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_location_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[NOTIFY_SELECTION_CHANGE] = + gtk_signal_new("notify_selection_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_selection_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[LOAD_STATE] = + gtk_signal_new("load_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, load_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SAVE_STATE] = + gtk_signal_new("save_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, save_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SHOW_PROPERTIES] = + gtk_signal_new("show_properties", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, show_properties), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + signals[STOP_LOCATION_CHANGE] = + gtk_signal_new("stop_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, stop_location_change), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + + gtk_object_add_arg_type ("NautilusView::bonobo_control", + GTK_TYPE_OBJECT, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_CONTROL); } static void -nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - switch(arg_id) { - case ARG_CONTROL: - nautilus_view_frame_real_set_bonobo_control (NAUTILUS_VIEW_FRAME (object), - (BonoboObject *)GTK_VALUE_OBJECT(*arg)); - } + switch(arg_id) { + case ARG_CONTROL: + nautilus_view_real_set_bonobo_control (NAUTILUS_VIEW (object), + BONOBO_CONTROL (GTK_VALUE_OBJECT (*arg))); + } } static void -nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - NautilusViewFrame *view; - - view = NAUTILUS_VIEW_FRAME (object); - - switch(arg_id) { - case ARG_CONTROL: - GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_frame_get_bonobo_control (NAUTILUS_VIEW_FRAME (object))); - } + NautilusView *view; + + view = NAUTILUS_VIEW (object); + + switch(arg_id) { + case ARG_CONTROL: + GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (object))); + } } static void -nautilus_view_frame_initialize (NautilusViewFrame *view) +nautilus_view_initialize (NautilusView *view) { CORBA_Environment ev; - - CORBA_exception_init(&ev); - - view->private = g_new0 (NautilusViewFramePrivate, 1); + CORBA_exception_init (&ev); + + view->details = g_new0 (NautilusViewDetails, 1); + bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev)); - - nautilus_undo_setup_bonobo_control (BONOBO_OBJECT (view)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } -NautilusViewFrame * -nautilus_view_frame_new (GtkWidget *widget) +NautilusView * +nautilus_view_new (GtkWidget *widget) { - BonoboObject *control; - - control = BONOBO_OBJECT (bonobo_control_new (widget)); - - return nautilus_view_frame_new_from_bonobo_control (control); + BonoboControl *control; + + control = bonobo_control_new (widget); + return nautilus_view_new_from_bonobo_control (control); } -NautilusViewFrame * -nautilus_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control) +NautilusView * +nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control) { - NautilusViewFrame *view_frame; - - view_frame = NAUTILUS_VIEW_FRAME (gtk_object_new (NAUTILUS_TYPE_VIEW_FRAME, - "bonobo_control", bonobo_control, - NULL)); - - return view_frame; + NautilusView *view; + + view = NAUTILUS_VIEW (gtk_object_new (NAUTILUS_TYPE_VIEW, + "bonobo_control", bonobo_control, + NULL)); + return view; } static void -nautilus_view_frame_destroy (NautilusViewFrame *view) +nautilus_view_destroy (NautilusView *view) { - NautilusViewFrameClass *klass; - - klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (view)->klass); - - g_free (view->private); - - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); + NautilusViewClass *klass; + + klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (view)->klass); + + g_free (view->details); + + NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } gboolean -nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view) +nautilus_view_ensure_view_frame (NautilusView *view) { CORBA_Environment ev; - - g_assert (view != NULL); - g_assert (NAUTILUS_IS_VIEW_FRAME (view)); - + + g_assert (NAUTILUS_IS_VIEW (view)); + CORBA_exception_init (&ev); - - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - view->private->view_frame = Bonobo_Unknown_query_interface + + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + view->details->view_frame = Bonobo_Unknown_query_interface (bonobo_control_get_control_frame - (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))), - "IDL:Nautilus/ViewFrame:1.0", &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - view->private->view_frame = CORBA_OBJECT_NIL; + (nautilus_view_get_bonobo_control (view)), + "IDL:Nautilus/ViewFrame:1.0", &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + view->details->view_frame = CORBA_OBJECT_NIL; } } - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - CORBA_exception_free (&ev); - - return FALSE; - } else { - + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + CORBA_exception_free (&ev); + return FALSE; + } else { CORBA_exception_free (&ev); return TRUE; } } void -nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc) +nautilus_view_request_location_change (NautilusView *view, + Nautilus_NavigationRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init (&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init (&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_location_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc) +nautilus_view_request_selection_change (NautilusView *view, + Nautilus_SelectionRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_selection_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_selection_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc) +nautilus_view_request_status_change (NautilusView *view, + Nautilus_StatusRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_status_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_status_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_progress_change(NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc) +nautilus_view_request_progress_change(NautilusView *view, + Nautilus_ProgressRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_progress_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_progress_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } -BonoboObject * -nautilus_view_frame_get_bonobo_control (NautilusViewFrame *view) +BonoboControl * +nautilus_view_get_bonobo_control (NautilusView *view) { - return view->private->control; + return view->details->control; } CORBA_Object -nautilus_view_frame_get_main_window (NautilusViewFrame *view) +nautilus_view_get_main_window (NautilusView *view) { CORBA_Environment ev; Nautilus_ViewWindow window; CORBA_exception_init (&ev); - if (nautilus_view_frame_ensure_view_frame (view)) { - window = Nautilus_ViewFrame__get_main_window (view->private->view_frame, &ev); + if (nautilus_view_ensure_view_frame (view)) { + window = Nautilus_ViewFrame__get_main_window (view->details->view_frame, &ev); } else { window = NULL; } @@ -512,23 +499,11 @@ nautilus_view_frame_get_main_window (NautilusViewFrame *view) return window; } - void -nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control) +nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control) { - CORBA_Environment ev; - - CORBA_exception_init(&ev); - - /* FIXME bugzilla.eazel.com 682: - * what if this fails? Create a new control, or bomb somehow? - */ - view->private->control = bonobo_object_query_local_interface (bonobo_control, "IDL:Bonobo/Control:1.0"); - bonobo_object_unref (view->private->control); /* we don't want this spare ref */ - - bonobo_object_add_interface (BONOBO_OBJECT (view), view->private->control); - - CORBA_exception_free(&ev); + view->details->control = bonobo_control; + bonobo_object_add_interface (BONOBO_OBJECT (view), BONOBO_OBJECT (view->details->control)); + nautilus_undo_setup_bonobo_control (bonobo_control); } - diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index 6f31459b4..aaf9d46ec 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -31,62 +31,60 @@ #define NAUTILUS_VIEW_FRAME_H #include <libnautilus/nautilus-view-component.h> -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include <gtk/gtkwidget.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ()) -#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame)) -#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass)) -#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) -#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) +#define NAUTILUS_TYPE_VIEW (nautilus_view_get_type ()) +#define NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView)) +#define NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass)) +#define NAUTILUS_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW)) +#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW)) -typedef struct _NautilusViewFrame NautilusViewFrame; -typedef struct _NautilusViewFrameClass NautilusViewFrameClass; +typedef struct NautilusView NautilusView; +typedef struct NautilusViewClass NautilusViewClass; -struct _NautilusViewFrameClass +struct NautilusViewClass { BonoboObjectClass parent_spot; - - void (*save_state) (NautilusViewFrame *view, const char *config_path); - void (*load_state) (NautilusViewFrame *view, const char *config_path); - void (*notify_location_change) (NautilusViewFrame *view, + + void (*save_state) (NautilusView *view, const char *config_path); + void (*load_state) (NautilusView *view, const char *config_path); + void (*notify_location_change) (NautilusView *view, Nautilus_NavigationInfo *nav_context); - void (*stop_location_change) (NautilusViewFrame *view); - void (*notify_selection_change) (NautilusViewFrame *view, + void (*stop_location_change) (NautilusView *view); + void (*notify_selection_change) (NautilusView *view, Nautilus_SelectionInfo *nav_context); - void (*show_properties) (NautilusViewFrame *view); - + void (*show_properties) (NautilusView *view); + BonoboObjectClass *parent_class; - + gpointer servant_init_func, servant_destroy_func, vepv; }; -typedef struct _NautilusViewFramePrivate NautilusViewFramePrivate; +typedef struct NautilusViewDetails NautilusViewDetails; -struct _NautilusViewFrame -{ +struct NautilusView { BonoboObject parent; - NautilusViewFramePrivate *private; + NautilusViewDetails *details; }; -GtkType nautilus_view_frame_get_type (void); -NautilusViewFrame *nautilus_view_frame_new (GtkWidget *widget); -NautilusViewFrame *nautilus_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control); -void nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc); -void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc); -void nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc); -void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc); -BonoboObject *nautilus_view_frame_get_bonobo_control (NautilusViewFrame *view); -CORBA_Object nautilus_view_frame_get_main_window (NautilusViewFrame *view); - +GtkType nautilus_view_get_type (void); +NautilusView * nautilus_view_new (GtkWidget *widget); +NautilusView * nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control); +void nautilus_view_request_location_change (NautilusView *view, + Nautilus_NavigationRequestInfo *loc); +void nautilus_view_request_selection_change (NautilusView *view, + Nautilus_SelectionRequestInfo *loc); +void nautilus_view_request_status_change (NautilusView *view, + Nautilus_StatusRequestInfo *loc); +void nautilus_view_request_progress_change (NautilusView *view, + Nautilus_ProgressRequestInfo *loc); +BonoboControl *nautilus_view_get_bonobo_control (NautilusView *view); +CORBA_Object nautilus_view_get_main_window (NautilusView *view); #ifdef __cplusplus } diff --git a/libnautilus/nautilus-zoomable.c b/libnautilus/nautilus-zoomable.c index 487927748..bacb30c84 100644 --- a/libnautilus/nautilus-zoomable.c +++ b/libnautilus/nautilus-zoomable.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -35,92 +35,89 @@ NautilusZoomable *foo; -struct _NautilusZoomablePrivate { - BonoboObject *control; - - gdouble zoom_level; - gdouble min_zoom_level; - gdouble max_zoom_level; - gboolean is_continuous; - - Nautilus_ZoomableFrame zoomable_frame; +struct NautilusZoomableDetails { + BonoboControl *control; + + gdouble zoom_level; + gdouble min_zoom_level; + gdouble max_zoom_level; + gboolean is_continuous; + + Nautilus_ZoomableFrame zoomable_frame; }; enum { - SET_ZOOM_LEVEL, - ZOOM_IN, - ZOOM_OUT, - ZOOM_TO_FIT, - LAST_SIGNAL + SET_ZOOM_LEVEL, + ZOOM_IN, + ZOOM_OUT, + ZOOM_TO_FIT, + LAST_SIGNAL }; enum { - ARG_0, - ARG_BONOBO_CONTROL, - ARG_MIN_ZOOM_LEVEL, - ARG_MAX_ZOOM_LEVEL, - ARG_IS_CONTINUOUS + ARG_0, + ARG_BONOBO_CONTROL, + ARG_MIN_ZOOM_LEVEL, + ARG_MAX_ZOOM_LEVEL, + ARG_IS_CONTINUOUS }; -static guint nautilus_zoomable_signals[LAST_SIGNAL]; +static guint signals[LAST_SIGNAL]; typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; - - NautilusZoomable *gtk_object; + POA_Nautilus_View servant; + gpointer bonobo_object; + + NautilusZoomable *gtk_object; } impl_POA_Nautilus_Zoomable; -void nautilus_zoomable_real_set_bonobo_control (NautilusZoomable *view, - BonoboObject *bonobo_control); - -static CORBA_double impl_Nautilus_Zoomable__get_zoom_level (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static void impl_Nautilus_Zoomable__set_zoom_level (impl_POA_Nautilus_Zoomable *servant, - const CORBA_double zoom_level, - CORBA_Environment *ev); -static CORBA_double impl_Nautilus_Zoomable__get_min_zoom_level (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static CORBA_double impl_Nautilus_Zoomable__get_max_zoom_level (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static CORBA_boolean impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static void impl_Nautilus_Zoomable_zoom_in (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static void impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); -static void impl_Nautilus_Zoomable_zoom_to_fit (impl_POA_Nautilus_Zoomable *servant, - CORBA_Environment *ev); - +void nautilus_zoomable_real_set_bonobo_control (NautilusZoomable *view, + BonoboControl *bonobo_control); +static CORBA_double impl_Nautilus_Zoomable__get_zoom_level (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static void impl_Nautilus_Zoomable__set_zoom_level (impl_POA_Nautilus_Zoomable *servant, + const CORBA_double zoom_level, + CORBA_Environment *ev); +static CORBA_double impl_Nautilus_Zoomable__get_min_zoom_level (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static CORBA_double impl_Nautilus_Zoomable__get_max_zoom_level (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static CORBA_boolean impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static void impl_Nautilus_Zoomable_zoom_in (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static void impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); +static void impl_Nautilus_Zoomable_zoom_to_fit (impl_POA_Nautilus_Zoomable *servant, + CORBA_Environment *ev); POA_Nautilus_Zoomable__epv libnautilus_Nautilus_Zoomable_epv = { - NULL, /* _private */ - (gpointer) &impl_Nautilus_Zoomable__get_zoom_level, - (gpointer) &impl_Nautilus_Zoomable__set_zoom_level, - (gpointer) &impl_Nautilus_Zoomable__get_min_zoom_level, - (gpointer) &impl_Nautilus_Zoomable__get_max_zoom_level, - (gpointer) &impl_Nautilus_Zoomable__get_is_continuous, - (gpointer) &impl_Nautilus_Zoomable_zoom_in, - (gpointer) &impl_Nautilus_Zoomable_zoom_out, - (gpointer) &impl_Nautilus_Zoomable_zoom_to_fit + NULL, /* _private */ + (gpointer) &impl_Nautilus_Zoomable__get_zoom_level, + (gpointer) &impl_Nautilus_Zoomable__set_zoom_level, + (gpointer) &impl_Nautilus_Zoomable__get_min_zoom_level, + (gpointer) &impl_Nautilus_Zoomable__get_max_zoom_level, + (gpointer) &impl_Nautilus_Zoomable__get_is_continuous, + (gpointer) &impl_Nautilus_Zoomable_zoom_in, + (gpointer) &impl_Nautilus_Zoomable_zoom_out, + (gpointer) &impl_Nautilus_Zoomable_zoom_to_fit }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Zoomable__vepv impl_Nautilus_Zoomable_vepv = { - &base_epv, - NULL, - &libnautilus_Nautilus_Zoomable_epv + &base_epv, + NULL, + &libnautilus_Nautilus_Zoomable_epv }; static CORBA_double impl_Nautilus_Zoomable__get_zoom_level (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - return servant->gtk_object->private->zoom_level; + return servant->gtk_object->details->zoom_level; } static void @@ -128,190 +125,184 @@ impl_Nautilus_Zoomable__set_zoom_level (impl_POA_Nautilus_Zoomable *servant, const CORBA_double zoom_level, CORBA_Environment *ev) { - gtk_signal_emit (GTK_OBJECT (servant->gtk_object), nautilus_zoomable_signals[SET_ZOOM_LEVEL], zoom_level); - + gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[SET_ZOOM_LEVEL], zoom_level); + } static CORBA_double impl_Nautilus_Zoomable__get_min_zoom_level (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - return servant->gtk_object->private->min_zoom_level; + return servant->gtk_object->details->min_zoom_level; } static CORBA_double impl_Nautilus_Zoomable__get_max_zoom_level (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - return servant->gtk_object->private->max_zoom_level; + return servant->gtk_object->details->max_zoom_level; } static CORBA_boolean impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - return servant->gtk_object->private->is_continuous; + return servant->gtk_object->details->is_continuous; } static void impl_Nautilus_Zoomable_zoom_in (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - gtk_signal_emit (GTK_OBJECT (servant->gtk_object), nautilus_zoomable_signals[ZOOM_IN]); + gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_IN]); } static void impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - gtk_signal_emit (GTK_OBJECT (servant->gtk_object), nautilus_zoomable_signals[ZOOM_OUT]); + gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_OUT]); } static void impl_Nautilus_Zoomable_zoom_to_fit (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { - gtk_signal_emit (GTK_OBJECT (servant->gtk_object), nautilus_zoomable_signals[ZOOM_TO_FIT]); + gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_TO_FIT]); } static void impl_Nautilus_Zoomable__destroy(BonoboObject *obj, impl_POA_Nautilus_Zoomable *servant) { - PortableServer_ObjectId *objid; - CORBA_Environment ev; - void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - - CORBA_exception_init(&ev); - - servant_destroy_func = NAUTILUS_ZOOMABLE_CLASS (GTK_OBJECT (servant->gtk_object)->klass)->servant_destroy_func; - objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); - CORBA_free (objid); - obj->servant = NULL; - - servant_destroy_func ((PortableServer_Servant) servant, &ev); - g_free (servant); - CORBA_exception_free(&ev); + PortableServer_ObjectId *objid; + CORBA_Environment ev; + void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); + + CORBA_exception_init(&ev); + + servant_destroy_func = NAUTILUS_ZOOMABLE_CLASS (GTK_OBJECT (servant->gtk_object)->klass)->servant_destroy_func; + objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); + PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); + CORBA_free (objid); + obj->servant = NULL; + + servant_destroy_func ((PortableServer_Servant) servant, &ev); + g_free (servant); + CORBA_exception_free(&ev); } static Nautilus_Zoomable impl_Nautilus_Zoomable__create(NautilusZoomable *zoomable, CORBA_Environment * ev) { - Nautilus_Zoomable retval; - impl_POA_Nautilus_Zoomable *servant; - void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); - - NautilusZoomableClass *zoomable_class = NAUTILUS_ZOOMABLE_CLASS (GTK_OBJECT(zoomable)->klass); - - servant_init_func = zoomable_class->servant_init_func; - servant = g_new0 (impl_POA_Nautilus_Zoomable, 1); - servant->servant.vepv = zoomable_class->vepv; - if (!servant->servant.vepv->Bonobo_Unknown_epv) - servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - servant_init_func ((PortableServer_Servant) servant, ev); - - servant->gtk_object = zoomable; - - retval = bonobo_object_activate_servant (BONOBO_OBJECT (zoomable), servant); - - gtk_signal_connect (GTK_OBJECT (zoomable), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_Zoomable__destroy), servant); - - return retval; + Nautilus_Zoomable retval; + impl_POA_Nautilus_Zoomable *servant; + void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + + NautilusZoomableClass *zoomable_class = NAUTILUS_ZOOMABLE_CLASS (GTK_OBJECT(zoomable)->klass); + + servant_init_func = zoomable_class->servant_init_func; + servant = g_new0 (impl_POA_Nautilus_Zoomable, 1); + servant->servant.vepv = zoomable_class->vepv; + if (!servant->servant.vepv->Bonobo_Unknown_epv) + servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); + servant_init_func ((PortableServer_Servant) servant, ev); + + servant->gtk_object = zoomable; + + retval = bonobo_object_activate_servant (BONOBO_OBJECT (zoomable), servant); + + gtk_signal_connect (GTK_OBJECT (zoomable), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_Zoomable__destroy), servant); + + return retval; } - -typedef gboolean (*GtkSignal_NONE__DOUBLE) (GtkObject * object, - gdouble arg1, - gpointer user_data); - -static void -gtk_marshal_NONE__DOUBLE (GtkObject * object, - GtkSignalFunc func, - gpointer func_data, GtkArg * args) -{ - GtkSignal_NONE__DOUBLE rfunc; - rfunc = (GtkSignal_NONE__DOUBLE) func; - (*rfunc) (object, - GTK_VALUE_DOUBLE (args[0]), func_data); -} - - static void nautilus_zoomable_initialize_class (NautilusZoomableClass *klass); static void nautilus_zoomable_initialize (NautilusZoomable *zoomable); static void nautilus_zoomable_destroy (NautilusZoomable *view); static void nautilus_zoomable_set_arg (GtkObject *object, GtkArg *arg, - guint arg_id); + guint arg_id); static void nautilus_zoomable_get_arg (GtkObject *object, GtkArg *arg, - guint arg_id); - + guint arg_id); NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusZoomable, nautilus_zoomable, BONOBO_OBJECT_TYPE) - +/* This would go into nautilus-gtk-extensions.c, but we don't want the dependency. */ +static void +marshal_NONE__DOUBLE (GtkObject *object, + GtkSignalFunc func, + gpointer func_data, + GtkArg *args) +{ + (* (void (*)(GtkObject *, double, gpointer)) func) + (object, + GTK_VALUE_DOUBLE (args[0]), + func_data); +} static void nautilus_zoomable_initialize_class (NautilusZoomableClass *klass) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) klass; - object_class->destroy = (void (*)(GtkObject*))nautilus_zoomable_destroy; - object_class->set_arg = nautilus_zoomable_set_arg; - object_class->get_arg = nautilus_zoomable_get_arg; - - parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - - klass->servant_init_func = POA_Nautilus_Zoomable__init; - klass->servant_destroy_func = POA_Nautilus_Zoomable__fini; - klass->vepv = &impl_Nautilus_Zoomable_vepv; - - nautilus_zoomable_signals[SET_ZOOM_LEVEL] = - gtk_signal_new("set_zoom_level", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusZoomableClass, set_zoom_level), - gtk_marshal_NONE__DOUBLE, - GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); - nautilus_zoomable_signals[ZOOM_IN] = - gtk_signal_new("zoom_in", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_in), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - nautilus_zoomable_signals[ZOOM_OUT] = - gtk_signal_new("zoom_out", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_out), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - nautilus_zoomable_signals[ZOOM_TO_FIT] = - gtk_signal_new("zoom_to_fit", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_to_fit), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, nautilus_zoomable_signals, LAST_SIGNAL); - - gtk_object_add_arg_type ("NautilusZoomable::bonobo_control", - GTK_TYPE_OBJECT, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_BONOBO_CONTROL); - gtk_object_add_arg_type ("NautilusZoomable::min_zoom_level", - GTK_TYPE_DOUBLE, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_MIN_ZOOM_LEVEL); - gtk_object_add_arg_type ("NautilusZoomable::max_zoom_level", - GTK_TYPE_DOUBLE, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_MAX_ZOOM_LEVEL); - gtk_object_add_arg_type ("NautilusZoomable::is_continuous", - GTK_TYPE_BOOL, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_IS_CONTINUOUS); + GtkObjectClass *object_class; + + object_class = (GtkObjectClass*) klass; + object_class->destroy = (void (*)(GtkObject*))nautilus_zoomable_destroy; + object_class->set_arg = nautilus_zoomable_set_arg; + object_class->get_arg = nautilus_zoomable_get_arg; + + parent_class = gtk_type_class (gtk_type_parent (object_class->type)); + + klass->servant_init_func = POA_Nautilus_Zoomable__init; + klass->servant_destroy_func = POA_Nautilus_Zoomable__fini; + klass->vepv = &impl_Nautilus_Zoomable_vepv; + + signals[SET_ZOOM_LEVEL] = + gtk_signal_new ("set_zoom_level", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusZoomableClass, set_zoom_level), + marshal_NONE__DOUBLE, + GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); + signals[ZOOM_IN] = + gtk_signal_new ("zoom_in", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_in), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + signals[ZOOM_OUT] = + gtk_signal_new ("zoom_out", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_out), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + signals[ZOOM_TO_FIT] = + gtk_signal_new ("zoom_to_fit", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_to_fit), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + + gtk_object_add_arg_type ("NautilusZoomable::bonobo_control", + GTK_TYPE_OBJECT, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_BONOBO_CONTROL); + gtk_object_add_arg_type ("NautilusZoomable::min_zoom_level", + GTK_TYPE_DOUBLE, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_MIN_ZOOM_LEVEL); + gtk_object_add_arg_type ("NautilusZoomable::max_zoom_level", + GTK_TYPE_DOUBLE, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_MAX_ZOOM_LEVEL); + gtk_object_add_arg_type ("NautilusZoomable::is_continuous", + GTK_TYPE_BOOL, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_IS_CONTINUOUS); } static void @@ -319,55 +310,64 @@ nautilus_zoomable_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - NautilusZoomable *zoomable; - - zoomable = NAUTILUS_ZOOMABLE (object); - - switch(arg_id) { - case ARG_BONOBO_CONTROL: - nautilus_zoomable_real_set_bonobo_control (zoomable, - (BonoboObject *) GTK_VALUE_OBJECT (*arg)); - case ARG_MIN_ZOOM_LEVEL: - zoomable->private->min_zoom_level = GTK_VALUE_DOUBLE (*arg); - case ARG_MAX_ZOOM_LEVEL: - zoomable->private->max_zoom_level = GTK_VALUE_DOUBLE (*arg); - case ARG_IS_CONTINUOUS: - zoomable->private->is_continuous = GTK_VALUE_BOOL (*arg); - } + NautilusZoomable *zoomable; + + zoomable = NAUTILUS_ZOOMABLE (object); + + switch(arg_id) { + case ARG_BONOBO_CONTROL: + nautilus_zoomable_real_set_bonobo_control + (zoomable, + BONOBO_CONTROL (GTK_VALUE_OBJECT (*arg))); + break; + case ARG_MIN_ZOOM_LEVEL: + zoomable->details->min_zoom_level = GTK_VALUE_DOUBLE (*arg); + break; + case ARG_MAX_ZOOM_LEVEL: + zoomable->details->max_zoom_level = GTK_VALUE_DOUBLE (*arg); + break; + case ARG_IS_CONTINUOUS: + zoomable->details->is_continuous = GTK_VALUE_BOOL (*arg); + break; + } } static void nautilus_zoomable_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) + GtkArg *arg, + guint arg_id) { - NautilusZoomable *view; - - view = NAUTILUS_ZOOMABLE (object); - - switch(arg_id) { - case ARG_BONOBO_CONTROL: - GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_zoomable_get_bonobo_control (NAUTILUS_ZOOMABLE (object))); - case ARG_MIN_ZOOM_LEVEL: - GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->private->min_zoom_level; - case ARG_MAX_ZOOM_LEVEL: - GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->private->max_zoom_level; - case ARG_IS_CONTINUOUS: - GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->private->is_continuous; - } + NautilusZoomable *view; + + view = NAUTILUS_ZOOMABLE (object); + + switch(arg_id) { + case ARG_BONOBO_CONTROL: + GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_zoomable_get_bonobo_control (NAUTILUS_ZOOMABLE (object))); + break; + case ARG_MIN_ZOOM_LEVEL: + GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->details->min_zoom_level; + break; + case ARG_MAX_ZOOM_LEVEL: + GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->details->max_zoom_level; + break; + case ARG_IS_CONTINUOUS: + GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->details->is_continuous; + break; + } } static void nautilus_zoomable_initialize (NautilusZoomable *zoomable) { - CORBA_Environment ev; - CORBA_exception_init(&ev); - - zoomable->private = g_new0 (NautilusZoomablePrivate, 1); - - bonobo_object_construct (BONOBO_OBJECT (zoomable), impl_Nautilus_Zoomable__create (zoomable, &ev)); - - CORBA_exception_free(&ev); + CORBA_Environment ev; + CORBA_exception_init(&ev); + + zoomable->details = g_new0 (NautilusZoomableDetails, 1); + + bonobo_object_construct (BONOBO_OBJECT (zoomable), impl_Nautilus_Zoomable__create (zoomable, &ev)); + + CORBA_exception_free(&ev); } NautilusZoomable * @@ -376,118 +376,103 @@ nautilus_zoomable_new (GtkWidget *widget, gdouble max_zoom_level, gboolean is_continuous) { - BonoboObject *control; - - control = BONOBO_OBJECT (bonobo_control_new (widget)); - - return nautilus_zoomable_new_from_bonobo_control (control, - min_zoom_level, - max_zoom_level, - is_continuous); + return nautilus_zoomable_new_from_bonobo_control + (bonobo_control_new (widget), + min_zoom_level, + max_zoom_level, + is_continuous); } NautilusZoomable * -nautilus_zoomable_new_from_bonobo_control (BonoboObject *bonobo_control, +nautilus_zoomable_new_from_bonobo_control (BonoboControl *bonobo_control, gdouble min_zoom_level, gdouble max_zoom_level, gboolean is_continuous) { - NautilusZoomable *zoomable; - - zoomable = NAUTILUS_ZOOMABLE (gtk_object_new (NAUTILUS_TYPE_ZOOMABLE, - "bonobo_control", bonobo_control, - "min_zoom_level", min_zoom_level, - "max_zoom_level", max_zoom_level, - "is_continuous", is_continuous, - NULL)); - - return zoomable; + NautilusZoomable *zoomable; + + zoomable = NAUTILUS_ZOOMABLE (gtk_object_new (NAUTILUS_TYPE_ZOOMABLE, + "bonobo_control", bonobo_control, + "min_zoom_level", min_zoom_level, + "max_zoom_level", max_zoom_level, + "is_continuous", is_continuous, + NULL)); + + return zoomable; } static void nautilus_zoomable_destroy (NautilusZoomable *view) { - g_free (view->private); - - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); + g_free (view->details); + + NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } static gboolean nautilus_zoomable_ensure_zoomable_frame (NautilusZoomable *view) { - CORBA_Environment ev; - - g_assert (view != NULL); - g_assert (NAUTILUS_IS_ZOOMABLE (view)); - - CORBA_exception_init (&ev); - - if (CORBA_Object_is_nil (view->private->zoomable_frame, &ev)) - view->private->zoomable_frame = Bonobo_Unknown_query_interface - (bonobo_control_get_control_frame - (BONOBO_CONTROL (nautilus_zoomable_get_bonobo_control (view))), - "IDL:Nautilus/ZoomableFrame:1.0", &ev); - - if (ev._major != CORBA_NO_EXCEPTION) - view->private->zoomable_frame = CORBA_OBJECT_NIL; - - if (CORBA_Object_is_nil (view->private->zoomable_frame, &ev)) { - CORBA_exception_free (&ev); - return FALSE; - } else { - CORBA_exception_free (&ev); - return TRUE; - } + CORBA_Environment ev; + + g_assert (view != NULL); + g_assert (NAUTILUS_IS_ZOOMABLE (view)); + + CORBA_exception_init (&ev); + + if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) { + view->details->zoomable_frame = Bonobo_Unknown_query_interface + (bonobo_control_get_control_frame + (BONOBO_CONTROL (nautilus_zoomable_get_bonobo_control (view))), + "IDL:Nautilus/ZoomableFrame:1.0", &ev); + } + + if (ev._major != CORBA_NO_EXCEPTION) { + view->details->zoomable_frame = CORBA_OBJECT_NIL; + } + + if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) { + CORBA_exception_free (&ev); + return FALSE; + } else { + CORBA_exception_free (&ev); + return TRUE; + } } void nautilus_zoomable_set_zoom_level (NautilusZoomable *view, gdouble zoom_level) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_ZOOMABLE (view)); - - CORBA_exception_init (&ev); - - view->private->zoom_level = zoom_level; - - if (nautilus_zoomable_ensure_zoomable_frame (view)) { - Nautilus_ZoomableFrame_notify_zoom_level (view->private->zoomable_frame, zoom_level, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->zoomable_frame, &ev); - view->private->zoomable_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free (&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_ZOOMABLE (view)); + + CORBA_exception_init (&ev); + + view->details->zoom_level = zoom_level; + + if (nautilus_zoomable_ensure_zoomable_frame (view)) { + Nautilus_ZoomableFrame_notify_zoom_level (view->details->zoomable_frame, zoom_level, &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release (view->details->zoomable_frame, &ev); + view->details->zoomable_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free (&ev); } -BonoboObject * +BonoboControl * nautilus_zoomable_get_bonobo_control (NautilusZoomable *view) { - return view->private->control; + return view->details->control; } void nautilus_zoomable_real_set_bonobo_control (NautilusZoomable *view, - BonoboObject *bonobo_control) + BonoboControl *bonobo_control) { - CORBA_Environment ev; - - CORBA_exception_init(&ev); - - /* FIXME bugzilla.eazel.com 682: - * what if this fails? Create a new control, or bomb somehow? - */ - view->private->control = bonobo_object_query_local_interface (bonobo_control, "IDL:Bonobo/Control:1.0"); - - /* We don't need the extra ref the above creates. */ - bonobo_object_unref (view->private->control); - - bonobo_object_add_interface (BONOBO_OBJECT (view), view->private->control); - - CORBA_exception_free(&ev); + view->details->control = bonobo_control; + bonobo_object_add_interface (BONOBO_OBJECT (view), BONOBO_OBJECT (view->details->control)); } diff --git a/libnautilus/nautilus-zoomable.h b/libnautilus/nautilus-zoomable.h index 7bebc5df9..b2eabe1eb 100644 --- a/libnautilus/nautilus-zoomable.h +++ b/libnautilus/nautilus-zoomable.h @@ -29,23 +29,23 @@ #define NAUTILUS_ZOOMABLE_H #include <libnautilus/nautilus-view-component.h> -#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-control.h> #include <gtk/gtkwidget.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define NAUTILUS_TYPE_ZOOMABLE (nautilus_zoomable_get_type ()) -#define NAUTILUS_ZOOMABLE(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ZOOMABLE, NautilusZoomable)) -#define NAUTILUS_ZOOMABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ZOOMABLE, NautilusZoomableClass)) -#define NAUTILUS_IS_ZOOMABLE(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ZOOMABLE)) -#define NAUTILUS_IS_ZOOMABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_ZOOMABLE)) +#define NAUTILUS_TYPE_ZOOMABLE (nautilus_zoomable_get_type ()) +#define NAUTILUS_ZOOMABLE(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ZOOMABLE, NautilusZoomable)) +#define NAUTILUS_ZOOMABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ZOOMABLE, NautilusZoomableClass)) +#define NAUTILUS_IS_ZOOMABLE(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ZOOMABLE)) +#define NAUTILUS_IS_ZOOMABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_ZOOMABLE)) -typedef struct _NautilusZoomable NautilusZoomable; -typedef struct _NautilusZoomableClass NautilusZoomableClass; +typedef struct NautilusZoomable NautilusZoomable; +typedef struct NautilusZoomableClass NautilusZoomableClass; -struct _NautilusZoomableClass +struct NautilusZoomableClass { BonoboObjectClass parent_spot; @@ -58,12 +58,12 @@ struct _NautilusZoomableClass gpointer servant_init_func, servant_destroy_func, vepv; }; -typedef struct _NautilusZoomablePrivate NautilusZoomablePrivate; +typedef struct NautilusZoomableDetails NautilusZoomableDetails; -struct _NautilusZoomable +struct NautilusZoomable { BonoboObject parent; - NautilusZoomablePrivate *private; + NautilusZoomableDetails *details; }; GtkType nautilus_zoomable_get_type (void); @@ -71,13 +71,13 @@ NautilusZoomable *nautilus_zoomable_new (GtkWidget gdouble min_zoom_level, gdouble max_zoom_level, gboolean is_continuous); -NautilusZoomable *nautilus_zoomable_new_from_bonobo_control (BonoboObject *bonobo_control, +NautilusZoomable *nautilus_zoomable_new_from_bonobo_control (BonoboControl *bonobo_control, gdouble min_zoom_level, gdouble max_zoom_level, gboolean is_continuous); void nautilus_zoomable_set_zoom_level (NautilusZoomable *view, gdouble zoom_level); -BonoboObject *nautilus_zoomable_get_bonobo_control (NautilusZoomable *view); +BonoboControl *nautilus_zoomable_get_bonobo_control (NautilusZoomable *view); #ifdef __cplusplus } diff --git a/src/Makefile.am b/src/Makefile.am index 8a74f0175..67736cc91 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,6 +40,8 @@ nautilus_SOURCES =\ nautilus-bookmark-list.h \ nautilus-bookmarks-window.c \ nautilus-bookmarks-window.h \ + nautilus-desktop-window.c \ + nautilus-desktop-window.h \ nautilus-index-tabs.c \ nautilus-index-tabs.h \ nautilus-index-title.c \ diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 17bde760b..f73a0399a 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -79,7 +79,7 @@ static guint signals[LAST_SIGNAL]; struct FMDirectoryViewDetails { - NautilusContentViewFrame *view_frame; + NautilusContentView *nautilus_view; NautilusZoomable *zoomable; NautilusDirectory *model; @@ -136,12 +136,12 @@ static void fm_directory_view_real_update_menus static GtkMenu * create_selection_context_menu (FMDirectoryView *view); static GtkMenu * create_background_context_menu (FMDirectoryView *view); static BonoboControl *get_bonobo_control (FMDirectoryView *view); -static void stop_location_change_callback (NautilusViewFrame *view_frame, +static void stop_location_change_callback (NautilusView *nautilus_view, FMDirectoryView *directory_view); -static void notify_location_change_callback (NautilusViewFrame *view_frame, +static void notify_location_change_callback (NautilusView *nautilus_view, Nautilus_NavigationInfo *nav_context, FMDirectoryView *directory_view); -static void notify_selection_change_callback (NautilusViewFrame *view_frame, +static void notify_selection_change_callback (NautilusView *nautilus_view, Nautilus_SelectionInfo *sel_context, FMDirectoryView *directory_view); static void open_callback (GtkMenuItem *item, @@ -312,8 +312,8 @@ bonobo_menu_open_in_new_window_callback (BonoboUIHandler *ui_handler, gpointer u static void bonobo_menu_move_to_trash_callback (BonoboUIHandler *ui_handler, - gpointer user_data, - const char *path) + gpointer user_data, + const char *path) { FMDirectoryView *view; GList *selection; @@ -407,8 +407,8 @@ bonobo_menu_open_properties_window_callback (BonoboUIHandler *ui_handler, gpoint static BonoboControl * get_bonobo_control (FMDirectoryView *view) { - return BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control - (NAUTILUS_VIEW_FRAME (view->details->view_frame))); + return BONOBO_CONTROL (nautilus_view_get_bonobo_control + (NAUTILUS_VIEW (view->details->nautilus_view))); } static void @@ -449,23 +449,21 @@ fm_directory_view_initialize (FMDirectoryView *directory_view) gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (directory_view), NULL); gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (directory_view), NULL); - directory_view->details->view_frame = NAUTILUS_CONTENT_VIEW_FRAME - (nautilus_content_view_frame_new (GTK_WIDGET (directory_view))); + directory_view->details->nautilus_view = NAUTILUS_CONTENT_VIEW + (nautilus_content_view_new (GTK_WIDGET (directory_view))); - directory_view->details->zoomable = - nautilus_zoomable_new_from_bonobo_control (BONOBO_OBJECT - (directory_view->details->view_frame), - .25, 4.0, FALSE); + directory_view->details->zoomable = nautilus_zoomable_new_from_bonobo_control + (get_bonobo_control (directory_view), .25, 4.0, FALSE); - gtk_signal_connect (GTK_OBJECT (directory_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (directory_view->details->nautilus_view), "stop_location_change", GTK_SIGNAL_FUNC (stop_location_change_callback), directory_view); - gtk_signal_connect (GTK_OBJECT (directory_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (directory_view->details->nautilus_view), "notify_location_change", GTK_SIGNAL_FUNC (notify_location_change_callback), directory_view); - gtk_signal_connect (GTK_OBJECT (directory_view->details->view_frame), + gtk_signal_connect (GTK_OBJECT (directory_view->details->nautilus_view), "notify_selection_change", GTK_SIGNAL_FUNC (notify_selection_change_callback), directory_view); @@ -661,8 +659,8 @@ display_selection_info (FMDirectoryView *view) g_free (folder_item_count_str); g_free (non_folder_str); - nautilus_view_frame_request_status_change - (NAUTILUS_VIEW_FRAME (view->details->view_frame), &request); + nautilus_view_request_status_change + (NAUTILUS_VIEW (view->details->nautilus_view), &request); g_free (request.status_string); } @@ -687,8 +685,8 @@ fm_directory_view_send_selection_change (FMDirectoryView *view) nautilus_file_list_free (selection); /* Send the selection change. */ - nautilus_view_frame_request_selection_change - (NAUTILUS_VIEW_FRAME (view->details->view_frame), &request); + nautilus_view_request_selection_change + (NAUTILUS_VIEW (view->details->nautilus_view), &request); /* Free the URIs. */ for (i = 0; i < request.selected_uris._length; i++) { @@ -699,7 +697,7 @@ fm_directory_view_send_selection_change (FMDirectoryView *view) static void -notify_location_change_callback (NautilusViewFrame *view_frame, +notify_location_change_callback (NautilusView *nautilus_view, Nautilus_NavigationInfo *navigation_context, FMDirectoryView *directory_view) { @@ -707,7 +705,7 @@ notify_location_change_callback (NautilusViewFrame *view_frame, } static void -notify_selection_change_callback (NautilusViewFrame *view_frame, +notify_selection_change_callback (NautilusView *nautilus_view, Nautilus_SelectionInfo *selection_context, FMDirectoryView *directory_view) { @@ -746,7 +744,7 @@ notify_selection_change_callback (NautilusViewFrame *view_frame, } static void -stop_location_change_callback (NautilusViewFrame *view_frame, +stop_location_change_callback (NautilusView *nautilus_view, FMDirectoryView *directory_view) { fm_directory_view_stop (directory_view); @@ -766,8 +764,8 @@ done_loading (FMDirectoryView *view) memset (&progress, 0, sizeof (progress)); progress.amount = 100.0; progress.type = Nautilus_PROGRESS_DONE_OK; - nautilus_view_frame_request_progress_change - (NAUTILUS_VIEW_FRAME (view->details->view_frame), &progress); + nautilus_view_request_progress_change + (NAUTILUS_VIEW (view->details->nautilus_view), &progress); view->details->loading = FALSE; } @@ -1197,21 +1195,21 @@ fm_directory_view_get_bonobo_ui_handler (FMDirectoryView *view) } /** - * fm_directory_view_get_view_frame: + * fm_directory_view_get_nautilus_view: * - * Get the NautilusContentViewFrame for this FMDirectoryView. + * Get the NautilusContentView for this FMDirectoryView. * This is normally called only by the embedding framework. * @view: FMDirectoryView of interest. * - * Return value: NautilusContentViewFrame for this view. + * Return value: NautilusContentView for this view. * **/ -NautilusContentViewFrame * -fm_directory_view_get_view_frame (FMDirectoryView *view) +NautilusContentView * +fm_directory_view_get_nautilus_view (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL); - return view->details->view_frame; + return view->details->nautilus_view; } /** @@ -2154,8 +2152,8 @@ fm_directory_view_activate_file_internal (FMDirectoryView *view, request.requested_uri = nautilus_file_get_mapped_uri (file); request.new_window_requested = use_new_window; - nautilus_view_frame_request_location_change - (NAUTILUS_VIEW_FRAME (view->details->view_frame), &request); + nautilus_view_request_location_change + (NAUTILUS_VIEW (view->details->nautilus_view), &request); g_free (request.requested_uri); } @@ -2228,8 +2226,8 @@ finish_loading_uri (FMDirectoryView *view) memset (&progress, 0, sizeof (progress)); progress.type = Nautilus_PROGRESS_UNDERWAY; - nautilus_view_frame_request_progress_change - (NAUTILUS_VIEW_FRAME (view->details->view_frame), &progress); + nautilus_view_request_progress_change + (NAUTILUS_VIEW (view->details->nautilus_view), &progress); /* Tell interested parties that we've begun loading this directory now. * Subclasses use this to know that the new metadata is now available. diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h index 1567de2fa..cab0e948c 100644 --- a/src/file-manager/fm-directory-view.h +++ b/src/file-manager/fm-directory-view.h @@ -188,61 +188,60 @@ struct FMDirectoryViewClass { }; /* GtkObject support */ -GtkType fm_directory_view_get_type (void); +GtkType fm_directory_view_get_type (void); /* Component embedding support */ -NautilusContentViewFrame *fm_directory_view_get_view_frame (FMDirectoryView *view); +NautilusContentView *fm_directory_view_get_nautilus_view (FMDirectoryView *view); /* URI handling */ -void fm_directory_view_load_uri (FMDirectoryView *view, - const char *uri); +void fm_directory_view_load_uri (FMDirectoryView *view, + const char *uri); /* Functions callable from the user interface and elsewhere. */ -char * fm_directory_view_get_container_uri (NautilusIconContainer *container, - FMDirectoryView *view); -gboolean fm_directory_view_can_accept_item (NautilusIconContainer *container, - NautilusFile *target_item, - const char *item_uri, - FMDirectoryView *view); -GList * fm_directory_view_get_selection (FMDirectoryView *view); -void fm_directory_view_stop (FMDirectoryView *view); -gboolean fm_directory_view_can_zoom_in (FMDirectoryView *view); -gboolean fm_directory_view_can_zoom_out (FMDirectoryView *view); -void fm_directory_view_bump_zoom_level (FMDirectoryView *view, - int zoom_increment); -void fm_directory_view_select_all (FMDirectoryView *view); -void fm_directory_view_set_selection (FMDirectoryView *view, - GList *selection); -void fm_directory_view_move_copy_items (NautilusIconContainer *container, - const GList *item_uris, - const GdkPoint *relative_item_points, - const char *target_uri, - int copy_action, - int x, - int y, - FMDirectoryView *view); -gint fm_directory_view_get_context_menu_index (const char *menu_name); +char * fm_directory_view_get_container_uri (NautilusIconContainer *container, + FMDirectoryView *view); +gboolean fm_directory_view_can_accept_item (NautilusIconContainer *container, + NautilusFile *target_item, + const char *item_uri, + FMDirectoryView *view); +GList * fm_directory_view_get_selection (FMDirectoryView *view); +void fm_directory_view_stop (FMDirectoryView *view); +gboolean fm_directory_view_can_zoom_in (FMDirectoryView *view); +gboolean fm_directory_view_can_zoom_out (FMDirectoryView *view); +void fm_directory_view_bump_zoom_level (FMDirectoryView *view, + int zoom_increment); +void fm_directory_view_select_all (FMDirectoryView *view); +void fm_directory_view_set_selection (FMDirectoryView *view, + GList *selection); +void fm_directory_view_move_copy_items (NautilusIconContainer *container, + const GList *item_uris, + const GdkPoint *relative_item_points, + const char *target_uri, + int copy_action, + int x, + int y, + FMDirectoryView *view); +gint fm_directory_view_get_context_menu_index (const char *menu_name); /* Wrappers for signal emitters. These are normally called * only by FMDirectoryView itself. They have corresponding signals * that observers might want to connect with. */ -void fm_directory_view_clear (FMDirectoryView *view); -void fm_directory_view_begin_loading (FMDirectoryView *view); +void fm_directory_view_clear (FMDirectoryView *view); +void fm_directory_view_begin_loading (FMDirectoryView *view); /* Hooks for subclasses to call. These are normally called only by * FMDirectoryView and its subclasses */ -void fm_directory_view_activate_file (FMDirectoryView *view, - NautilusFile *file, - gboolean request_new_window); -void fm_directory_view_notify_selection_changed (FMDirectoryView *view); -BonoboUIHandler * fm_directory_view_get_bonobo_ui_handler (FMDirectoryView *view); -NautilusDirectory * fm_directory_view_get_model (FMDirectoryView *view); -void fm_directory_view_pop_up_background_context_menu (FMDirectoryView *view); -void fm_directory_view_pop_up_selection_context_menu (FMDirectoryView *view); -void fm_directory_view_update_menus (FMDirectoryView *view); - +void fm_directory_view_activate_file (FMDirectoryView *view, + NautilusFile *file, + gboolean request_new_window); +void fm_directory_view_notify_selection_changed (FMDirectoryView *view); +BonoboUIHandler * fm_directory_view_get_bonobo_ui_handler (FMDirectoryView *view); +NautilusDirectory * fm_directory_view_get_model (FMDirectoryView *view); +void fm_directory_view_pop_up_background_context_menu (FMDirectoryView *view); +void fm_directory_view_pop_up_selection_context_menu (FMDirectoryView *view); +void fm_directory_view_update_menus (FMDirectoryView *view); #endif /* FM_DIRECTORY_VIEW_H */ diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 5f08ffb9b..c8d648ea7 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -131,7 +131,7 @@ impl_Nautilus_Application_create_object (impl_POA_Nautilus_Application *servant, CORBA_Environment * ev) { FMDirectoryView *dir_view; - NautilusContentViewFrame *view_frame; + NautilusContentView *view; if (!impl_Nautilus_Application_supports (servant, obj_iid, ev)) { return CORBA_OBJECT_NIL; @@ -147,8 +147,8 @@ impl_Nautilus_Application_create_object (impl_POA_Nautilus_Application *servant, return CORBA_OBJECT_NIL; } - view_frame = fm_directory_view_get_view_frame (dir_view); - return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (view_frame)), ev); + view = fm_directory_view_get_nautilus_view (dir_view); + return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (view)), ev); } @@ -269,14 +269,26 @@ display_prototype_caveat (void) /* Inform the user that Nautilus has a long way to go * before they should be expecting it to work well. */ - if (getenv ("NAUTILUS_NO_CAVEAT_DIALOG")==NULL) { - gnome_warning_dialog ( - _("Thank you for trying Nautilus!" - "\n\nIt is still under development, and many features are" - "\nnot yet implemented or have some degree of instability. " - "\nIf you use this pre-release version of Nautilus, please " - "\nexercise extreme caution." - "\n\nFor more information, visit http://nautilus.eazel.com.")); + if (getenv ("NAUTILUS_NO_CAVEAT_DIALOG") == NULL) { + /* Before you change this code back to use gnome_warning_dialog + * or nautilus_warning_dialog, you better test it. See bug 963. + */ + nautilus_simple_dialog + (NULL, + _("The Nautilus shell is under development; " + "it's not ready for daily use. " + "Many features, including some of the best ones, " + "are not yet done, partly done, or unstable. " + "The program doesn't look or act the way it " + "will in version 1.0." + "\n\n" + "If you do decide to test this version of Nautilus, beware. " + "The program could do something unpredictable and may even " + "delete or overwrite files on your computer." + "\n\n" + "For more information, visit http://nautilus.eazel.com."), + _("Nautilus: caveat"), + GNOME_STOCK_BUTTON_OK, NULL); } } diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c new file mode 100644 index 000000000..7ba720459 --- /dev/null +++ b/src/nautilus-desktop-window.c @@ -0,0 +1,27 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* nautilus-desktop-window.c + + Copyright (C) 2000 Eazel, Inc. + + The Gnome Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The Gnome Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Gnome Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + + Authors: Darin Adler <darin@eazel.com> +*/ + +#include <config.h> +#include "nautilus-desktop-window.h" + diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h new file mode 100644 index 000000000..42b9bd50b --- /dev/null +++ b/src/nautilus-desktop-window.h @@ -0,0 +1,24 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ + +/* nautilus-desktop-window.h + + Copyright (C) 2000 Eazel, Inc. + + The Gnome Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The Gnome Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the Gnome Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + + Authors: Darin Adler <darin@eazel.com> +*/ + diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 5dd9014bc..557b3725a 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -462,7 +462,7 @@ nautilus_index_panel_drag_data_received (GtkWidget *widget, GdkDragContext *cont /* add a new meta-view to the index panel */ void -nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusView *meta_view) +nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusViewFrame *meta_view) { GtkWidget *label; char cbuf[32]; @@ -470,9 +470,9 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); - description = nautilus_meta_view_get_label (NAUTILUS_META_VIEW (meta_view)); + description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { /* FIXME bugzilla.eazel.com 599: * Why is a hex address better than an empty string? @@ -499,7 +499,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie /* remove the passed-in meta-view from the index panel */ void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *index_panel, - NautilusView *meta_view) + NautilusViewFrame *meta_view) { int page_num; diff --git a/src/nautilus-information-panel.h b/src/nautilus-information-panel.h index 0ac4e2fda..6a6dc2ef4 100644 --- a/src/nautilus-information-panel.h +++ b/src/nautilus-information-panel.h @@ -59,9 +59,9 @@ struct NautilusIndexPanelClass GtkType nautilus_index_panel_get_type (void); NautilusIndexPanel *nautilus_index_panel_new (void); void nautilus_index_panel_add_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_set_uri (NautilusIndexPanel *panel, const char *new_uri, const char *initial_title); diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 0e553e634..b23bcd149 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -59,7 +59,7 @@ enum }; static void nautilus_window_realize (GtkWidget *widget); -static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view); +static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view); /* Object framework static variables */ static GnomeAppClass *parent_class = NULL; @@ -343,7 +343,7 @@ zoom_in_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_in (window->content_view); + nautilus_view_frame_zoom_in (window->content_view); } } @@ -352,7 +352,7 @@ zoom_out_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_out (window->content_view); + nautilus_view_frame_zoom_out (window->content_view); } } @@ -491,7 +491,7 @@ nautilus_window_set_arg (GtkObject *object, window->app = BONOBO_OBJECT(GTK_VALUE_OBJECT(*arg)); break; case ARG_CONTENT_VIEW: - nautilus_window_real_set_content_view (window, (NautilusView *)GTK_VALUE_OBJECT(*arg)); + nautilus_window_real_set_content_view (window, (NautilusViewFrame *)GTK_VALUE_OBJECT(*arg)); break; } } @@ -654,7 +654,7 @@ nautilus_window_realize (GtkWidget *widget) #if 0 static gboolean -nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusView *meta_view) +nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusViewFrame *meta_view) { if(event->button != 3) return FALSE; @@ -671,7 +671,7 @@ static void view_menu_switch_views_callback (GtkWidget *widget, gpointer data) { NautilusWindow *window; - NautilusView *view; + NautilusViewFrame *view; NautilusDirectory *directory; char *iid; @@ -768,29 +768,29 @@ nautilus_window_load_content_view_menu (NautilusWindow *window, } void -nautilus_window_set_content_view (NautilusWindow *window, NautilusView *content_view) +nautilus_window_set_content_view (NautilusWindow *window, NautilusViewFrame *content_view) { nautilus_window_real_set_content_view (window, content_view); } void -nautilus_window_add_meta_view(NautilusWindow *window, NautilusView *meta_view) +nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); } void -nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusViewFrame *meta_view) { nautilus_index_panel_remove_meta_view(window->index_panel, meta_view); } void -nautilus_window_remove_meta_view (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view (NautilusWindow *window, NautilusViewFrame *meta_view) { if (!g_list_find(window->meta_views, meta_view)) return; @@ -953,7 +953,7 @@ nautilus_get_history_list () static void -nautilus_window_request_location_change_cb (NautilusView *view, +nautilus_window_request_location_change_cb (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *info, NautilusWindow *window) { @@ -962,7 +962,7 @@ nautilus_window_request_location_change_cb (NautilusView *view, static void -nautilus_window_request_selection_change_cb (NautilusView *view, +nautilus_window_request_selection_change_cb (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *info, NautilusWindow *window) { @@ -970,7 +970,7 @@ nautilus_window_request_selection_change_cb (NautilusView *view, } static void -nautilus_window_request_status_change_cb (NautilusView *view, +nautilus_window_request_status_change_cb (NautilusViewFrame *view, Nautilus_StatusRequestInfo *info, NautilusWindow *window) { @@ -978,7 +978,7 @@ nautilus_window_request_status_change_cb (NautilusView *view, } static void -nautilus_window_request_progress_change_cb (NautilusView *view, +nautilus_window_request_progress_change_cb (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *info, NautilusWindow *window) { @@ -986,7 +986,7 @@ nautilus_window_request_progress_change_cb (NautilusView *view, } static void -nautilus_window_request_title_change_callback (NautilusContentView *view, +nautilus_window_request_title_change_callback (NautilusContentViewFrame *view, const char *new_title, NautilusWindow *window) { @@ -994,7 +994,7 @@ nautilus_window_request_title_change_callback (NautilusContentView *view, } void -nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) +nautilus_window_connect_view(NautilusWindow *window, NautilusViewFrame *view) { GtkObject *view_object; @@ -1022,14 +1022,14 @@ nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) } void -nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentView *view) +nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentViewFrame *view) { GtkObject *view_object; - /* First connect with NautilusView signals. */ - nautilus_window_connect_view (window, NAUTILUS_VIEW (view)); + /* First connect with NautilusViewFrame signals. */ + nautilus_window_connect_view (window, NAUTILUS_VIEW_FRAME (view)); - /* Now connect with NautilusContentView signals. */ + /* Now connect with NautilusContentViewFrame signals. */ view_object = GTK_OBJECT(view); gtk_signal_connect(view_object, "request_title_change", @@ -1051,10 +1051,10 @@ nautilus_window_display_error(NautilusWindow *window, const char *error_msg) } static void -nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view) +nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view) { g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW (new_view)); + g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW_FRAME (new_view)); if (new_view == window->content_view) { @@ -1072,7 +1072,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_show (GTK_WIDGET (new_view)); - nautilus_content_view_set_active (NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_content_view_frame_set_active (NAUTILUS_CONTENT_VIEW_FRAME (new_view)); gtk_paned_pack2(GTK_PANED(window->content_hbox), GTK_WIDGET (new_view), TRUE, FALSE); } diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h index c002e05ed..a79f408b1 100644 --- a/src/nautilus-navigation-window.h +++ b/src/nautilus-navigation-window.h @@ -89,7 +89,7 @@ struct _NautilusWindow { NautilusBookmark *last_location_bookmark; /* Current views stuff */ - NautilusView *content_view; + NautilusViewFrame *content_view; GList *meta_views; /* Widgets to keep track of (for state changes, etc) */ @@ -102,7 +102,7 @@ struct _NautilusWindow { /* Pending changes */ NautilusNavigationInfo *pending_ni; - NautilusView *new_content_view, *new_requesting_view; + NautilusViewFrame *new_content_view, *new_requesting_view; GList *new_meta_views; GList *error_views; @@ -126,30 +126,30 @@ struct _NautilusWindow { nautilus_boolean_bit reset_to_idle : 1; }; -GtkType nautilus_window_get_type (void); -void nautilus_window_close (NautilusWindow *window); -void nautilus_window_set_content_view (NautilusWindow *window, - NautilusView *content_view); -void nautilus_window_add_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_remove_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_goto_uri (NautilusWindow *window, - const char *uri); -void nautilus_window_display_error (NautilusWindow *window, - const char *error_msg); -const char * nautilus_window_get_requested_uri (NautilusWindow *window); -BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); -void nautilus_window_allow_back (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_forward (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_up (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_reload (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_stop (NautilusWindow *window, - gboolean allow); -void nautilus_bookmarks_exiting (void); +GtkType nautilus_window_get_type (void); +void nautilus_window_close (NautilusWindow *window); +void nautilus_window_set_content_view (NautilusWindow *window, + NautilusViewFrame *content_view); +void nautilus_window_add_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_remove_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_goto_uri (NautilusWindow *window, + const char *uri); +void nautilus_window_display_error (NautilusWindow *window, + const char *error_msg); +const char * nautilus_window_get_requested_uri (NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); +void nautilus_window_allow_back (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_forward (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_up (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_reload (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_stop (NautilusWindow *window, + gboolean allow); +void nautilus_bookmarks_exiting (void); #endif diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 0e553e634..b23bcd149 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -59,7 +59,7 @@ enum }; static void nautilus_window_realize (GtkWidget *widget); -static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view); +static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view); /* Object framework static variables */ static GnomeAppClass *parent_class = NULL; @@ -343,7 +343,7 @@ zoom_in_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_in (window->content_view); + nautilus_view_frame_zoom_in (window->content_view); } } @@ -352,7 +352,7 @@ zoom_out_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_out (window->content_view); + nautilus_view_frame_zoom_out (window->content_view); } } @@ -491,7 +491,7 @@ nautilus_window_set_arg (GtkObject *object, window->app = BONOBO_OBJECT(GTK_VALUE_OBJECT(*arg)); break; case ARG_CONTENT_VIEW: - nautilus_window_real_set_content_view (window, (NautilusView *)GTK_VALUE_OBJECT(*arg)); + nautilus_window_real_set_content_view (window, (NautilusViewFrame *)GTK_VALUE_OBJECT(*arg)); break; } } @@ -654,7 +654,7 @@ nautilus_window_realize (GtkWidget *widget) #if 0 static gboolean -nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusView *meta_view) +nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusViewFrame *meta_view) { if(event->button != 3) return FALSE; @@ -671,7 +671,7 @@ static void view_menu_switch_views_callback (GtkWidget *widget, gpointer data) { NautilusWindow *window; - NautilusView *view; + NautilusViewFrame *view; NautilusDirectory *directory; char *iid; @@ -768,29 +768,29 @@ nautilus_window_load_content_view_menu (NautilusWindow *window, } void -nautilus_window_set_content_view (NautilusWindow *window, NautilusView *content_view) +nautilus_window_set_content_view (NautilusWindow *window, NautilusViewFrame *content_view) { nautilus_window_real_set_content_view (window, content_view); } void -nautilus_window_add_meta_view(NautilusWindow *window, NautilusView *meta_view) +nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); } void -nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusViewFrame *meta_view) { nautilus_index_panel_remove_meta_view(window->index_panel, meta_view); } void -nautilus_window_remove_meta_view (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view (NautilusWindow *window, NautilusViewFrame *meta_view) { if (!g_list_find(window->meta_views, meta_view)) return; @@ -953,7 +953,7 @@ nautilus_get_history_list () static void -nautilus_window_request_location_change_cb (NautilusView *view, +nautilus_window_request_location_change_cb (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *info, NautilusWindow *window) { @@ -962,7 +962,7 @@ nautilus_window_request_location_change_cb (NautilusView *view, static void -nautilus_window_request_selection_change_cb (NautilusView *view, +nautilus_window_request_selection_change_cb (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *info, NautilusWindow *window) { @@ -970,7 +970,7 @@ nautilus_window_request_selection_change_cb (NautilusView *view, } static void -nautilus_window_request_status_change_cb (NautilusView *view, +nautilus_window_request_status_change_cb (NautilusViewFrame *view, Nautilus_StatusRequestInfo *info, NautilusWindow *window) { @@ -978,7 +978,7 @@ nautilus_window_request_status_change_cb (NautilusView *view, } static void -nautilus_window_request_progress_change_cb (NautilusView *view, +nautilus_window_request_progress_change_cb (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *info, NautilusWindow *window) { @@ -986,7 +986,7 @@ nautilus_window_request_progress_change_cb (NautilusView *view, } static void -nautilus_window_request_title_change_callback (NautilusContentView *view, +nautilus_window_request_title_change_callback (NautilusContentViewFrame *view, const char *new_title, NautilusWindow *window) { @@ -994,7 +994,7 @@ nautilus_window_request_title_change_callback (NautilusContentView *view, } void -nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) +nautilus_window_connect_view(NautilusWindow *window, NautilusViewFrame *view) { GtkObject *view_object; @@ -1022,14 +1022,14 @@ nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) } void -nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentView *view) +nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentViewFrame *view) { GtkObject *view_object; - /* First connect with NautilusView signals. */ - nautilus_window_connect_view (window, NAUTILUS_VIEW (view)); + /* First connect with NautilusViewFrame signals. */ + nautilus_window_connect_view (window, NAUTILUS_VIEW_FRAME (view)); - /* Now connect with NautilusContentView signals. */ + /* Now connect with NautilusContentViewFrame signals. */ view_object = GTK_OBJECT(view); gtk_signal_connect(view_object, "request_title_change", @@ -1051,10 +1051,10 @@ nautilus_window_display_error(NautilusWindow *window, const char *error_msg) } static void -nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view) +nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view) { g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW (new_view)); + g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW_FRAME (new_view)); if (new_view == window->content_view) { @@ -1072,7 +1072,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_show (GTK_WIDGET (new_view)); - nautilus_content_view_set_active (NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_content_view_frame_set_active (NAUTILUS_CONTENT_VIEW_FRAME (new_view)); gtk_paned_pack2(GTK_PANED(window->content_hbox), GTK_WIDGET (new_view), TRUE, FALSE); } diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h index c002e05ed..a79f408b1 100644 --- a/src/nautilus-object-window.h +++ b/src/nautilus-object-window.h @@ -89,7 +89,7 @@ struct _NautilusWindow { NautilusBookmark *last_location_bookmark; /* Current views stuff */ - NautilusView *content_view; + NautilusViewFrame *content_view; GList *meta_views; /* Widgets to keep track of (for state changes, etc) */ @@ -102,7 +102,7 @@ struct _NautilusWindow { /* Pending changes */ NautilusNavigationInfo *pending_ni; - NautilusView *new_content_view, *new_requesting_view; + NautilusViewFrame *new_content_view, *new_requesting_view; GList *new_meta_views; GList *error_views; @@ -126,30 +126,30 @@ struct _NautilusWindow { nautilus_boolean_bit reset_to_idle : 1; }; -GtkType nautilus_window_get_type (void); -void nautilus_window_close (NautilusWindow *window); -void nautilus_window_set_content_view (NautilusWindow *window, - NautilusView *content_view); -void nautilus_window_add_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_remove_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_goto_uri (NautilusWindow *window, - const char *uri); -void nautilus_window_display_error (NautilusWindow *window, - const char *error_msg); -const char * nautilus_window_get_requested_uri (NautilusWindow *window); -BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); -void nautilus_window_allow_back (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_forward (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_up (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_reload (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_stop (NautilusWindow *window, - gboolean allow); -void nautilus_bookmarks_exiting (void); +GtkType nautilus_window_get_type (void); +void nautilus_window_close (NautilusWindow *window); +void nautilus_window_set_content_view (NautilusWindow *window, + NautilusViewFrame *content_view); +void nautilus_window_add_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_remove_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_goto_uri (NautilusWindow *window, + const char *uri); +void nautilus_window_display_error (NautilusWindow *window, + const char *error_msg); +const char * nautilus_window_get_requested_uri (NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); +void nautilus_window_allow_back (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_forward (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_up (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_reload (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_stop (NautilusWindow *window, + gboolean allow); +void nautilus_bookmarks_exiting (void); #endif diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 5dd9014bc..557b3725a 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -462,7 +462,7 @@ nautilus_index_panel_drag_data_received (GtkWidget *widget, GdkDragContext *cont /* add a new meta-view to the index panel */ void -nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusView *meta_view) +nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusViewFrame *meta_view) { GtkWidget *label; char cbuf[32]; @@ -470,9 +470,9 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); - description = nautilus_meta_view_get_label (NAUTILUS_META_VIEW (meta_view)); + description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { /* FIXME bugzilla.eazel.com 599: * Why is a hex address better than an empty string? @@ -499,7 +499,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie /* remove the passed-in meta-view from the index panel */ void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *index_panel, - NautilusView *meta_view) + NautilusViewFrame *meta_view) { int page_num; diff --git a/src/nautilus-sidebar.h b/src/nautilus-sidebar.h index 0ac4e2fda..6a6dc2ef4 100644 --- a/src/nautilus-sidebar.h +++ b/src/nautilus-sidebar.h @@ -59,9 +59,9 @@ struct NautilusIndexPanelClass GtkType nautilus_index_panel_get_type (void); NautilusIndexPanel *nautilus_index_panel_new (void); void nautilus_index_panel_add_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_set_uri (NautilusIndexPanel *panel, const char *new_uri, const char *initial_title); diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 0e553e634..b23bcd149 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -59,7 +59,7 @@ enum }; static void nautilus_window_realize (GtkWidget *widget); -static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view); +static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view); /* Object framework static variables */ static GnomeAppClass *parent_class = NULL; @@ -343,7 +343,7 @@ zoom_in_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_in (window->content_view); + nautilus_view_frame_zoom_in (window->content_view); } } @@ -352,7 +352,7 @@ zoom_out_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_out (window->content_view); + nautilus_view_frame_zoom_out (window->content_view); } } @@ -491,7 +491,7 @@ nautilus_window_set_arg (GtkObject *object, window->app = BONOBO_OBJECT(GTK_VALUE_OBJECT(*arg)); break; case ARG_CONTENT_VIEW: - nautilus_window_real_set_content_view (window, (NautilusView *)GTK_VALUE_OBJECT(*arg)); + nautilus_window_real_set_content_view (window, (NautilusViewFrame *)GTK_VALUE_OBJECT(*arg)); break; } } @@ -654,7 +654,7 @@ nautilus_window_realize (GtkWidget *widget) #if 0 static gboolean -nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusView *meta_view) +nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusViewFrame *meta_view) { if(event->button != 3) return FALSE; @@ -671,7 +671,7 @@ static void view_menu_switch_views_callback (GtkWidget *widget, gpointer data) { NautilusWindow *window; - NautilusView *view; + NautilusViewFrame *view; NautilusDirectory *directory; char *iid; @@ -768,29 +768,29 @@ nautilus_window_load_content_view_menu (NautilusWindow *window, } void -nautilus_window_set_content_view (NautilusWindow *window, NautilusView *content_view) +nautilus_window_set_content_view (NautilusWindow *window, NautilusViewFrame *content_view) { nautilus_window_real_set_content_view (window, content_view); } void -nautilus_window_add_meta_view(NautilusWindow *window, NautilusView *meta_view) +nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); } void -nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusViewFrame *meta_view) { nautilus_index_panel_remove_meta_view(window->index_panel, meta_view); } void -nautilus_window_remove_meta_view (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view (NautilusWindow *window, NautilusViewFrame *meta_view) { if (!g_list_find(window->meta_views, meta_view)) return; @@ -953,7 +953,7 @@ nautilus_get_history_list () static void -nautilus_window_request_location_change_cb (NautilusView *view, +nautilus_window_request_location_change_cb (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *info, NautilusWindow *window) { @@ -962,7 +962,7 @@ nautilus_window_request_location_change_cb (NautilusView *view, static void -nautilus_window_request_selection_change_cb (NautilusView *view, +nautilus_window_request_selection_change_cb (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *info, NautilusWindow *window) { @@ -970,7 +970,7 @@ nautilus_window_request_selection_change_cb (NautilusView *view, } static void -nautilus_window_request_status_change_cb (NautilusView *view, +nautilus_window_request_status_change_cb (NautilusViewFrame *view, Nautilus_StatusRequestInfo *info, NautilusWindow *window) { @@ -978,7 +978,7 @@ nautilus_window_request_status_change_cb (NautilusView *view, } static void -nautilus_window_request_progress_change_cb (NautilusView *view, +nautilus_window_request_progress_change_cb (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *info, NautilusWindow *window) { @@ -986,7 +986,7 @@ nautilus_window_request_progress_change_cb (NautilusView *view, } static void -nautilus_window_request_title_change_callback (NautilusContentView *view, +nautilus_window_request_title_change_callback (NautilusContentViewFrame *view, const char *new_title, NautilusWindow *window) { @@ -994,7 +994,7 @@ nautilus_window_request_title_change_callback (NautilusContentView *view, } void -nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) +nautilus_window_connect_view(NautilusWindow *window, NautilusViewFrame *view) { GtkObject *view_object; @@ -1022,14 +1022,14 @@ nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) } void -nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentView *view) +nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentViewFrame *view) { GtkObject *view_object; - /* First connect with NautilusView signals. */ - nautilus_window_connect_view (window, NAUTILUS_VIEW (view)); + /* First connect with NautilusViewFrame signals. */ + nautilus_window_connect_view (window, NAUTILUS_VIEW_FRAME (view)); - /* Now connect with NautilusContentView signals. */ + /* Now connect with NautilusContentViewFrame signals. */ view_object = GTK_OBJECT(view); gtk_signal_connect(view_object, "request_title_change", @@ -1051,10 +1051,10 @@ nautilus_window_display_error(NautilusWindow *window, const char *error_msg) } static void -nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view) +nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view) { g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW (new_view)); + g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW_FRAME (new_view)); if (new_view == window->content_view) { @@ -1072,7 +1072,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_show (GTK_WIDGET (new_view)); - nautilus_content_view_set_active (NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_content_view_frame_set_active (NAUTILUS_CONTENT_VIEW_FRAME (new_view)); gtk_paned_pack2(GTK_PANED(window->content_hbox), GTK_WIDGET (new_view), TRUE, FALSE); } diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h index c002e05ed..a79f408b1 100644 --- a/src/nautilus-spatial-window.h +++ b/src/nautilus-spatial-window.h @@ -89,7 +89,7 @@ struct _NautilusWindow { NautilusBookmark *last_location_bookmark; /* Current views stuff */ - NautilusView *content_view; + NautilusViewFrame *content_view; GList *meta_views; /* Widgets to keep track of (for state changes, etc) */ @@ -102,7 +102,7 @@ struct _NautilusWindow { /* Pending changes */ NautilusNavigationInfo *pending_ni; - NautilusView *new_content_view, *new_requesting_view; + NautilusViewFrame *new_content_view, *new_requesting_view; GList *new_meta_views; GList *error_views; @@ -126,30 +126,30 @@ struct _NautilusWindow { nautilus_boolean_bit reset_to_idle : 1; }; -GtkType nautilus_window_get_type (void); -void nautilus_window_close (NautilusWindow *window); -void nautilus_window_set_content_view (NautilusWindow *window, - NautilusView *content_view); -void nautilus_window_add_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_remove_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_goto_uri (NautilusWindow *window, - const char *uri); -void nautilus_window_display_error (NautilusWindow *window, - const char *error_msg); -const char * nautilus_window_get_requested_uri (NautilusWindow *window); -BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); -void nautilus_window_allow_back (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_forward (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_up (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_reload (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_stop (NautilusWindow *window, - gboolean allow); -void nautilus_bookmarks_exiting (void); +GtkType nautilus_window_get_type (void); +void nautilus_window_close (NautilusWindow *window); +void nautilus_window_set_content_view (NautilusWindow *window, + NautilusViewFrame *content_view); +void nautilus_window_add_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_remove_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_goto_uri (NautilusWindow *window, + const char *uri); +void nautilus_window_display_error (NautilusWindow *window, + const char *error_msg); +const char * nautilus_window_get_requested_uri (NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); +void nautilus_window_allow_back (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_forward (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_up (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_reload (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_stop (NautilusWindow *window, + gboolean allow); +void nautilus_bookmarks_exiting (void); #endif diff --git a/src/nautilus-view-frame-bonobo-control.c b/src/nautilus-view-frame-bonobo-control.c index 6991ee4af..bc5cafb4a 100644 --- a/src/nautilus-view-frame-bonobo-control.c +++ b/src/nautilus-view-frame-bonobo-control.c @@ -34,25 +34,25 @@ typedef struct { } BonoboControlInfo; static void -destroy_bonobo_control_view(NautilusView *view, CORBA_Environment *ev) +destroy_bonobo_control_view(NautilusViewFrame *view, CORBA_Environment *ev) { BonoboControlInfo *bci = view->component_data; g_free(bci); } static void -nautilus_view_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) +nautilus_view_frame_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusViewFrame *view) { Nautilus_NavigationRequestInfo nri; g_assert(!relative); memset(&nri, 0, sizeof(nri)); nri.requested_uri = (char *)uri; - nautilus_view_request_location_change(view, &nri); + nautilus_view_frame_request_location_change(view, &nri); } static gboolean -bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +bonobo_control_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { BonoboControlInfo *bci; Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)))); @@ -67,20 +67,20 @@ bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Envir view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); gtk_signal_connect(GTK_OBJECT(bci->control_frame), - "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_activate_uri), view); + "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_frame_activate_uri), view); return TRUE; } static void -bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) +bonobo_control_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { Nautilus_ProgressRequestInfo pri; pri.amount = 0; pri.type = Nautilus_PROGRESS_UNDERWAY; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); pri.type = Nautilus_PROGRESS_DONE_OK; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); } NautilusViewComponentType bonobo_control_component_type = { diff --git a/src/nautilus-view-frame-bonobo-embeddable.c b/src/nautilus-view-frame-bonobo-embeddable.c index 97340e483..1288470ad 100644 --- a/src/nautilus-view-frame-bonobo-embeddable.c +++ b/src/nautilus-view-frame-bonobo-embeddable.c @@ -35,15 +35,14 @@ typedef struct { } BonoboSubdocInfo; static void -destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev) +destroy_bonobo_subdoc_view (NautilusViewFrame *view, CORBA_Environment *ev) { BonoboSubdocInfo *bsi = view->component_data; - g_free(bsi); } static void -bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) +bonobo_subdoc_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { Bonobo_PersistStream persist; @@ -60,7 +59,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo pri.type = Nautilus_PROGRESS_UNDERWAY; else pri.type = Nautilus_PROGRESS_DONE_ERROR; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); if(stream) { Bonobo_PersistStream_load (persist, @@ -69,13 +68,13 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); pri.type = Nautilus_PROGRESS_DONE_OK; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); } } } static gboolean -bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +bonobo_subdoc_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { BonoboSubdocInfo *bsi; Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)))); diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c index 3e1d22ce2..0c025c5a3 100644 --- a/src/nautilus-view-frame-corba.c +++ b/src/nautilus-view-frame-corba.c @@ -75,10 +75,10 @@ impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame { PortableServer_ObjectId *objid; CORBA_Environment ev; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_destroy_func)(PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(servant->view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass); CORBA_exception_init(&ev); @@ -94,14 +94,14 @@ impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame } BonoboObject * -impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) +impl_Nautilus_ViewFrame__create(NautilusViewFrame *view, CORBA_Environment * ev) { BonoboObject *retval; impl_POA_Nautilus_ViewFrame *newservant; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_init_func)(PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); newservant = g_new0(impl_POA_Nautilus_ViewFrame, 1); newservant->servant.vepv = klass->vepv; if(!newservant->servant.vepv->Bonobo_Unknown_epv) @@ -129,7 +129,7 @@ impl_Nautilus_ViewFrame_request_location_change(impl_POA_Nautilus_ViewFrame * se Nautilus_NavigationRequestInfo * navinfo, CORBA_Environment * ev) { - nautilus_view_request_location_change(servant->view, navinfo); + nautilus_view_frame_request_location_change(servant->view, navinfo); } static void @@ -137,7 +137,7 @@ impl_Nautilus_ViewFrame_request_selection_change(impl_POA_Nautilus_ViewFrame * s Nautilus_SelectionRequestInfo * selinfo, CORBA_Environment * ev) { - nautilus_view_request_selection_change(servant->view, + nautilus_view_frame_request_selection_change(servant->view, selinfo); } @@ -146,7 +146,7 @@ impl_Nautilus_ViewFrame_request_status_change(impl_POA_Nautilus_ViewFrame * serv Nautilus_StatusRequestInfo * statinfo, CORBA_Environment * ev) { - nautilus_view_request_status_change(servant->view, statinfo); + nautilus_view_frame_request_status_change(servant->view, statinfo); } static void @@ -154,5 +154,5 @@ impl_Nautilus_ViewFrame_request_progress_change(impl_POA_Nautilus_ViewFrame * se Nautilus_ProgressRequestInfo * proginfo, CORBA_Environment * ev) { - nautilus_view_request_progress_change(servant->view, proginfo); + nautilus_view_frame_request_progress_change(servant->view, proginfo); } diff --git a/src/nautilus-view-frame-nautilus-view.c b/src/nautilus-view-frame-nautilus-view.c index 6205cf592..5e4ca2eed 100644 --- a/src/nautilus-view-frame-nautilus-view.c +++ b/src/nautilus-view-frame-nautilus-view.c @@ -35,7 +35,7 @@ typedef struct { } NautilusViewInfo; static gboolean -nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +nautilus_view_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { Bonobo_Control control; NautilusViewInfo *nvi; @@ -69,7 +69,7 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro } static void -destroy_nautilus_view(NautilusView *view, CORBA_Environment *ev) +destroy_nautilus_view(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -79,7 +79,7 @@ destroy_nautilus_view(NautilusView *view, CORBA_Environment *ev) } static void -nv_show_properties(NautilusView *view, CORBA_Environment *ev) +nv_show_properties(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -89,7 +89,7 @@ nv_show_properties(NautilusView *view, CORBA_Environment *ev) } static void -nv_save_state(NautilusView *view, const char *config_path, CORBA_Environment *ev) +nv_save_state(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -99,7 +99,7 @@ nv_save_state(NautilusView *view, const char *config_path, CORBA_Environment *ev } static void -nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev) +nv_load_state(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -109,7 +109,7 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev } static void -nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev) +nv_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -119,7 +119,7 @@ nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, } static void -nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev) +nv_notify_selection_change(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -130,7 +130,7 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, } static void -nv_stop_location_change(NautilusView *view, CORBA_Environment *ev) +nv_stop_location_change(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h index 8cc345dfd..e1c5a276b 100644 --- a/src/nautilus-view-frame-private.h +++ b/src/nautilus-view-frame-private.h @@ -35,38 +35,38 @@ typedef struct { POA_Nautilus_ViewFrame servant; gpointer bonobo_object; - NautilusView *view; + NautilusViewFrame *view; } impl_POA_Nautilus_ViewFrame; extern POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv; extern POA_Nautilus_ZoomableFrame__vepv impl_Nautilus_ZoomableFrame_vepv; -BonoboObject *impl_Nautilus_ViewFrame__create (NautilusView *view, - CORBA_Environment *ev); -BonoboObject *impl_Nautilus_ZoomableFrame__create (NautilusView *view, - CORBA_Environment *ev); -void nautilus_view_request_location_change (NautilusView *view, - Nautilus_NavigationRequestInfo *loc); -void nautilus_view_request_selection_change (NautilusView *view, - Nautilus_SelectionRequestInfo *loc); -void nautilus_view_request_status_change (NautilusView *view, - Nautilus_StatusRequestInfo *loc); -void nautilus_view_request_progress_change (NautilusView *view, - Nautilus_ProgressRequestInfo *loc); -void nautilus_view_notify_zoom_level (NautilusView *view, - double level); +BonoboObject *impl_Nautilus_ViewFrame__create (NautilusViewFrame *view, + CORBA_Environment *ev); +BonoboObject *impl_Nautilus_ZoomableFrame__create (NautilusViewFrame *view, + CORBA_Environment *ev); +void nautilus_view_frame_request_location_change (NautilusViewFrame *view, + Nautilus_NavigationRequestInfo *loc); +void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, + Nautilus_SelectionRequestInfo *loc); +void nautilus_view_frame_request_status_change (NautilusViewFrame *view, + Nautilus_StatusRequestInfo *loc); +void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, + Nautilus_ProgressRequestInfo *loc); +void nautilus_view_frame_notify_zoom_level (NautilusViewFrame *view, + double level); struct NautilusViewComponentType { const char *primary_repoid; - gboolean (* try_load)(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev); - void (* destroy) (NautilusView *view, CORBA_Environment *ev); - void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev); - void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev); - void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev); - void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev); - void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev); - void (* show_properties)(NautilusView *view, CORBA_Environment *ev); + gboolean (* try_load)(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev); + void (* destroy) (NautilusViewFrame *view, CORBA_Environment *ev); + void (* save_state)(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev); + void (* load_state)(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev); + void (* notify_location_change)(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev); + void (* stop_location_change)(NautilusViewFrame *view, CORBA_Environment *ev); + void (* notify_selection_change)(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev); + void (* show_properties)(NautilusViewFrame *view, CORBA_Environment *ev); }; #endif /* NTL_VIEW_PRIVATE_H */ diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index f090e2f5b..a56755ca0 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -50,40 +50,35 @@ enum { ARG_MAIN_WINDOW }; - - - -static void nautilus_view_init (NautilusView *view); -static void nautilus_view_destroy (GtkObject *view); -static void nautilus_view_constructed(NautilusView *view); -static void nautilus_view_class_init (NautilusViewClass *klass); -static void nautilus_view_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void nautilus_view_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -static guint nautilus_view_signals[LAST_SIGNAL]; - +static void nautilus_view_frame_init (NautilusViewFrame *view); +static void nautilus_view_frame_destroy (GtkObject *view); +static void nautilus_view_frame_constructed (NautilusViewFrame *view); +static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass); +static void nautilus_view_frame_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_frame_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_frame_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void nautilus_view_frame_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + +static guint signals[LAST_SIGNAL]; GtkType -nautilus_view_get_type (void) +nautilus_view_frame_get_type (void) { static GtkType view_type = 0; if (!view_type) { const GtkTypeInfo view_info = { - "NautilusView", - sizeof (NautilusView), - sizeof (NautilusViewClass), - (GtkClassInitFunc) nautilus_view_class_init, - (GtkObjectInitFunc) nautilus_view_init, + "NautilusViewFrame", + sizeof (NautilusViewFrame), + sizeof (NautilusViewFrameClass), + (GtkClassInitFunc) nautilus_view_frame_class_init, + (GtkObjectInitFunc) nautilus_view_frame_init, /* reserved_1 */ NULL, /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, @@ -118,19 +113,19 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object, #endif static void -nautilus_view_class_init (NautilusViewClass *klass) +nautilus_view_frame_class_init (NautilusViewFrameClass *klass) { GtkObjectClass *object_class; GtkWidgetClass *widget_class; object_class = (GtkObjectClass*) klass; - object_class->destroy = nautilus_view_destroy; - object_class->set_arg = nautilus_view_set_arg; - object_class->get_arg = nautilus_view_get_arg; + object_class->destroy = nautilus_view_frame_destroy; + object_class->set_arg = nautilus_view_frame_set_arg; + object_class->get_arg = nautilus_view_frame_get_arg; widget_class = (GtkWidgetClass*) klass; - widget_class->size_request = nautilus_view_size_request; - widget_class->size_allocate = nautilus_view_size_allocate; + widget_class->size_request = nautilus_view_frame_size_request; + widget_class->size_allocate = nautilus_view_frame_size_allocate; klass->servant_init_func = POA_Nautilus_ViewFrame__init; klass->servant_destroy_func = POA_Nautilus_ViewFrame__fini; @@ -145,49 +140,49 @@ nautilus_view_class_init (NautilusViewClass *klass) /* klass->request_selection_change = NULL; */ /* klass->request_status_change = NULL; */ /* klass->request_progress_change = NULL; */ - klass->view_constructed = nautilus_view_constructed; + klass->view_constructed = nautilus_view_frame_constructed; - nautilus_view_signals[REQUEST_LOCATION_CHANGE] = gtk_signal_new("request_location_change", + signals[REQUEST_LOCATION_CHANGE] = gtk_signal_new("request_location_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_location_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_SELECTION_CHANGE] = gtk_signal_new("request_selection_change", + signals[REQUEST_SELECTION_CHANGE] = gtk_signal_new("request_selection_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_selection_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_STATUS_CHANGE] = gtk_signal_new("request_status_change", + signals[REQUEST_STATUS_CHANGE] = gtk_signal_new("request_status_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_status_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_PROGRESS_CHANGE] = gtk_signal_new("request_progress_change", + signals[REQUEST_PROGRESS_CHANGE] = gtk_signal_new("request_progress_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_progress_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[NOTIFY_ZOOM_LEVEL] = gtk_signal_new("notify_zoom_level", + signals[NOTIFY_ZOOM_LEVEL] = gtk_signal_new("notify_zoom_level", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_zoom_level), nautilus_gtk_marshal_NONE__DOUBLE, GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); - gtk_object_class_add_signals (object_class, nautilus_view_signals, LAST_SIGNAL); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); - gtk_object_add_arg_type ("NautilusView::main_window", + gtk_object_add_arg_type ("NautilusViewFrame::main_window", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MAIN_WINDOW); @@ -195,41 +190,41 @@ nautilus_view_class_init (NautilusViewClass *klass) } static void -nautilus_view_set_arg (GtkObject *object, +nautilus_view_frame_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - NautilusView *view; + NautilusViewFrame *view; - view = NAUTILUS_VIEW(object); + view = NAUTILUS_VIEW_FRAME(object); switch(arg_id) { case ARG_MAIN_WINDOW: view->main_window = GTK_WIDGET(GTK_VALUE_OBJECT(*arg)); - nautilus_view_construct_arg_set(view); + nautilus_view_frame_construct_arg_set(view); break; } } static void -nautilus_view_get_arg (GtkObject *object, +nautilus_view_frame_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) { switch(arg_id) { case ARG_MAIN_WINDOW: - GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(NAUTILUS_VIEW(object)->main_window); + GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(NAUTILUS_VIEW_FRAME(object)->main_window); break; } } static void -nautilus_view_init (NautilusView *view) +nautilus_view_frame_init (NautilusViewFrame *view) { GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW); } static void -nautilus_view_destroy_client(NautilusView *view) +nautilus_view_frame_destroy_client(NautilusViewFrame *view) { CORBA_Environment ev; CORBA_exception_init(&ev); @@ -265,10 +260,10 @@ nautilus_view_destroy_client(NautilusView *view) } static void -nautilus_view_destroy(GtkObject *view) +nautilus_view_frame_destroy(GtkObject *view) { - NautilusViewClass *klass = NAUTILUS_VIEW_CLASS(view->klass); - NautilusView *nview = NAUTILUS_VIEW(view); + NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(view->klass); + NautilusViewFrame *nview = NAUTILUS_VIEW_FRAME(view); if(nview->timer_id) { @@ -276,24 +271,24 @@ nautilus_view_destroy(GtkObject *view) nview->timer_id = 0; } - nautilus_view_destroy_client(nview); + nautilus_view_frame_destroy_client(nview); if(GTK_OBJECT_CLASS(klass->parent_class)->destroy) GTK_OBJECT_CLASS(klass->parent_class)->destroy(view); } static void -nautilus_view_constructed(NautilusView *view) +nautilus_view_frame_constructed(NautilusViewFrame *view) { } void -nautilus_view_construct_arg_set(NautilusView *view) +nautilus_view_frame_construct_arg_set(NautilusViewFrame *view) { guint nca; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; - klass = NAUTILUS_VIEW_CLASS(((GtkObject *)view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(((GtkObject *)view)->klass); nca = klass->num_construct_args; if(view->construct_arg_count >= nca) return; @@ -305,7 +300,7 @@ nautilus_view_construct_arg_set(NautilusView *view) } static void -nautilus_view_size_request (GtkWidget *widget, +nautilus_view_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkBin *bin; @@ -327,7 +322,7 @@ nautilus_view_size_request (GtkWidget *widget, } static void -nautilus_view_size_allocate (GtkWidget *widget, +nautilus_view_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkBin *bin; @@ -345,24 +340,24 @@ extern NautilusViewComponentType bonobo_subdoc_component_type; /* ntl-view-bonob extern NautilusViewComponentType bonobo_control_component_type; /* ntl-view-bonobo-control.c */ static gboolean -nautilus_view_handle_client_destroy(GtkWidget *widget, NautilusView *view) +nautilus_view_frame_handle_client_destroy(GtkWidget *widget, NautilusViewFrame *view) { gtk_object_destroy(GTK_OBJECT(view)); return TRUE; } static void -nautilus_view_handle_client_destroy_2(GtkObject *object, CORBA_Object cobject, CORBA_Environment *ev, NautilusView *view) +nautilus_view_frame_handle_client_destroy_2(GtkObject *object, CORBA_Object cobject, CORBA_Environment *ev, NautilusViewFrame *view) { /* ICK! */ - if(NAUTILUS_IS_META_VIEW(view)) + if(NAUTILUS_IS_META_VIEW_FRAME(view)) nautilus_window_remove_meta_view(NAUTILUS_WINDOW(view->main_window), view); - else if(NAUTILUS_IS_CONTENT_VIEW(view)) + else if(NAUTILUS_IS_CONTENT_VIEW_FRAME(view)) nautilus_window_set_content_view(NAUTILUS_WINDOW(view->main_window), NULL); } gboolean /* returns TRUE if successful */ -nautilus_view_load_client(NautilusView *view, const char *iid) +nautilus_view_frame_load_client(NautilusViewFrame *view, const char *iid) { CORBA_Object obj; CORBA_Object zoomable; @@ -376,14 +371,14 @@ nautilus_view_load_client(NautilusView *view, const char *iid) NULL }; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); if (iid == NULL) return FALSE; CORBA_exception_init(&ev); - nautilus_view_destroy_client(view); + nautilus_view_frame_destroy_client(view); view->client_object = bonobo_object_activate(iid, 0); if(!view->client_object) @@ -422,7 +417,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) if (!view->component_class) { /* Nothing matched */ - nautilus_view_destroy_client(view); + nautilus_view_frame_destroy_client(view); return FALSE; } @@ -430,13 +425,13 @@ nautilus_view_load_client(NautilusView *view, const char *iid) view->iid = g_strdup(iid); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "destroy", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy), view, GTK_OBJECT(view)); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "object_gone", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy_2), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy_2), view, GTK_OBJECT(view)); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "system_exception", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy_2), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy_2), view, GTK_OBJECT(view)); gtk_container_add(GTK_CONTAINER(view), view->client_widget); gtk_widget_show(view->client_widget); @@ -446,13 +441,13 @@ nautilus_view_load_client(NautilusView *view, const char *iid) } void -nautilus_view_notify_location_change(NautilusView *view, +nautilus_view_frame_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_context) { Nautilus_NavigationInfo real_nav_ctx; CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); real_nav_ctx = *nav_context; @@ -472,12 +467,12 @@ nautilus_view_notify_location_change(NautilusView *view, } void -nautilus_view_notify_selection_change(NautilusView *view, +nautilus_view_frame_notify_selection_change(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_context) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -489,11 +484,11 @@ nautilus_view_notify_selection_change(NautilusView *view, } void -nautilus_view_load_state(NautilusView *view, const char *config_path) +nautilus_view_frame_load_state(NautilusViewFrame *view, const char *config_path) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -505,11 +500,11 @@ nautilus_view_load_state(NautilusView *view, const char *config_path) } void -nautilus_view_save_state(NautilusView *view, const char *config_path) +nautilus_view_frame_save_state(NautilusViewFrame *view, const char *config_path) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -521,11 +516,11 @@ nautilus_view_save_state(NautilusView *view, const char *config_path) } void -nautilus_view_show_properties(NautilusView *view) +nautilus_view_frame_show_properties(NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -537,11 +532,11 @@ nautilus_view_show_properties(NautilusView *view) } void -nautilus_view_stop_location_change(NautilusView *view) +nautilus_view_frame_stop_location_change(NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -554,12 +549,12 @@ nautilus_view_stop_location_change(NautilusView *view) gboolean -nautilus_view_is_zoomable (NautilusView *view) +nautilus_view_frame_is_zoomable (NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); CORBA_exception_init (&ev); @@ -571,12 +566,12 @@ nautilus_view_is_zoomable (NautilusView *view) } gdouble -nautilus_view_get_zoom_level (NautilusView *view) +nautilus_view_frame_get_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -592,12 +587,12 @@ nautilus_view_get_zoom_level (NautilusView *view) } void -nautilus_view_set_zoom_level (NautilusView *view, +nautilus_view_frame_set_zoom_level (NautilusViewFrame *view, gdouble zoom_level) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -611,12 +606,12 @@ nautilus_view_set_zoom_level (NautilusView *view, } gdouble -nautilus_view_get_min_zoom_level (NautilusView *view) +nautilus_view_frame_get_min_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -632,12 +627,12 @@ nautilus_view_get_min_zoom_level (NautilusView *view) } gdouble -nautilus_view_get_max_zoom_level (NautilusView *view) +nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -653,12 +648,12 @@ nautilus_view_get_max_zoom_level (NautilusView *view) } gboolean -nautilus_view_get_is_continuous (NautilusView *view) +nautilus_view_frame_get_is_continuous (NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); CORBA_exception_init (&ev); @@ -675,11 +670,11 @@ nautilus_view_get_is_continuous (NautilusView *view) void -nautilus_view_zoom_in (NautilusView *view) +nautilus_view_frame_zoom_in (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -694,11 +689,11 @@ nautilus_view_zoom_in (NautilusView *view) void -nautilus_view_zoom_out (NautilusView *view) +nautilus_view_frame_zoom_out (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -713,11 +708,11 @@ nautilus_view_zoom_out (NautilusView *view) void -nautilus_view_zoom_to_fit (NautilusView *view) +nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -732,70 +727,70 @@ nautilus_view_zoom_to_fit (NautilusView *view) const char * -nautilus_view_get_iid(NautilusView *view) +nautilus_view_frame_get_iid(NautilusViewFrame *view) { - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), NULL); return view->iid; } CORBA_Object -nautilus_view_get_client_objref(NautilusView *view) +nautilus_view_frame_get_client_objref(NautilusViewFrame *view) { - g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW_FRAME (view), NULL); return view?bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)):NULL; } CORBA_Object -nautilus_view_get_objref(NautilusView *view) +nautilus_view_frame_get_objref(NautilusViewFrame *view) { - g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW_FRAME (view), NULL); return view?bonobo_object_corba_objref(view->view_frame):NULL; } void -nautilus_view_request_location_change(NautilusView *view, - Nautilus_NavigationRequestInfo *loc) +nautilus_view_frame_request_location_change(NautilusViewFrame *view, + Nautilus_NavigationRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_LOCATION_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_LOCATION_CHANGE], loc); } void -nautilus_view_request_selection_change (NautilusView *view, - Nautilus_SelectionRequestInfo *loc) +nautilus_view_frame_request_selection_change (NautilusViewFrame *view, + Nautilus_SelectionRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_SELECTION_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_SELECTION_CHANGE], loc); } void -nautilus_view_request_status_change (NautilusView *view, - Nautilus_StatusRequestInfo *loc) +nautilus_view_frame_request_status_change (NautilusViewFrame *view, + Nautilus_StatusRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_STATUS_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_STATUS_CHANGE], loc); } void -nautilus_view_request_progress_change(NautilusView *view, - Nautilus_ProgressRequestInfo *loc) +nautilus_view_frame_request_progress_change(NautilusViewFrame *view, + Nautilus_ProgressRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_PROGRESS_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_PROGRESS_CHANGE], loc); } void -nautilus_view_notify_zoom_level (NautilusView *view, - gdouble level) +nautilus_view_frame_notify_zoom_level (NautilusViewFrame *view, + gdouble level) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit (GTK_OBJECT (view), nautilus_view_signals[NOTIFY_ZOOM_LEVEL], level); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit (GTK_OBJECT (view), signals[NOTIFY_ZOOM_LEVEL], level); } static gboolean -check_object(NautilusView *view) +check_object(NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval = TRUE; @@ -819,9 +814,9 @@ check_object(NautilusView *view) } void -nautilus_view_set_active_errors(NautilusView *view, gboolean enabled) +nautilus_view_frame_set_active_errors(NautilusViewFrame *view, gboolean enabled) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); if(enabled) { if(!view->timer_id) diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index 9c6eef774..2be706f6a 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -25,11 +25,11 @@ */ /* ntl-view.h: Interface of the object representing a data - view. NautilusContentView and NautilusMetaView derive from this - class. */ + view. NautilusContentViewFrame and NautilusMetaViewFrame derive from + this class. */ -#ifndef NAUTILUS_VIEW_H -#define NAUTILUS_VIEW_H +#ifndef NTL_VIEW_H +#define NTL_VIEW_H #include <gtk/gtkwidget.h> #include <gtk/gtkbin.h> @@ -40,34 +40,36 @@ extern "C" { #endif /* __cplusplus */ -#define NAUTILUS_TYPE_VIEW (nautilus_view_get_type ()) -#define NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView)) -#define NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass)) -#define NAUTILUS_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW)) -#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW)) +#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ()) +#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame)) +#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass)) +#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) +#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) -typedef struct NautilusView NautilusView; -typedef struct NautilusViewClass NautilusViewClass; +typedef struct NautilusViewFrame NautilusViewFrame; +typedef struct NautilusViewFrameClass NautilusViewFrameClass; -struct NautilusViewClass { +struct NautilusViewFrameClass { GtkBinClass parent_spot; - /* These signals correspond to the Natuilus:ViewFrame CORBA interface. They - are requests that the underlying view may make of the framework. */ - - void (*request_location_change) (NautilusView *view, + /* These signals correspond to the Nautilus::ViewFrame CORBA interface. They + * are requests that the underlying view may make of the shell via the frame. + */ + void (*request_location_change) (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *navinfo); - void (*request_selection_change) (NautilusView *view, + void (*request_selection_change) (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *selinfo); - void (*request_status_change) (NautilusView *view, + void (*request_status_change) (NautilusViewFrame *view, Nautilus_StatusRequestInfo *loc); - void (*request_progress_change) (NautilusView *view, + void (*request_progress_change) (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *loc); - void (*notify_zoom_level) (NautilusView *view, + + /* Part of Nautilus::ZoomableFrame CORBA interface. */ + void (*notify_zoom_level) (NautilusViewFrame *view, gdouble zoom_level); /* Not a signal. Work-around for Gtk+'s lack of a 'constructed' operation */ - void (*view_constructed) (NautilusView *view); + void (*view_constructed) (NautilusViewFrame *view); GtkBinClass *parent_class; guint num_construct_args; @@ -78,7 +80,7 @@ struct NautilusViewClass { typedef struct NautilusViewComponentType NautilusViewComponentType; -struct NautilusView { +struct NautilusViewFrame { GtkBin parent; GtkWidget *main_window; @@ -101,43 +103,43 @@ struct NautilusView { guint checking; }; -GtkType nautilus_view_get_type (void); -gboolean nautilus_view_load_client (NautilusView *view, - const char *iid); -const char * nautilus_view_get_iid (NautilusView *view); -CORBA_Object nautilus_view_get_client_objref (NautilusView *view); -BonoboObject *nautilus_view_get_control_frame (NautilusView *view); -CORBA_Object nautilus_view_get_objref (NautilusView *view); +GtkType nautilus_view_frame_get_type (void); +gboolean nautilus_view_frame_load_client (NautilusViewFrame *view, + const char *iid); +const char * nautilus_view_frame_get_iid (NautilusViewFrame *view); +CORBA_Object nautilus_view_frame_get_client_objref (NautilusViewFrame *view); +BonoboObject *nautilus_view_frame_get_control_frame (NautilusViewFrame *view); +CORBA_Object nautilus_view_frame_get_objref (NautilusViewFrame *view); -/* These functions correspond to methods of the Nautilus:View CORBAinterface */ -void nautilus_view_notify_location_change (NautilusView *view, - Nautilus_NavigationInfo *nav_context); -void nautilus_view_notify_selection_change (NautilusView *view, - Nautilus_SelectionInfo *sel_context); -void nautilus_view_load_state (NautilusView *view, - const char *config_path); -void nautilus_view_save_state (NautilusView *view, - const char *config_path); -void nautilus_view_show_properties (NautilusView *view); -void nautilus_view_stop_location_change (NautilusView *view); -void nautilus_view_set_active_errors (NautilusView *view, - gboolean enabled); -gboolean nautilus_view_is_zoomable (NautilusView *view); -gdouble nautilus_view_get_zoom_level (NautilusView *view); -void nautilus_view_set_zoom_level (NautilusView *view, - gdouble zoom_level); -gdouble nautilus_view_get_min_zoom_level (NautilusView *view); -gdouble nautilus_view_get_max_zoom_level (NautilusView *view); -gboolean nautilus_view_get_is_continuous (NautilusView *view); -void nautilus_view_zoom_in (NautilusView *view); -void nautilus_view_zoom_out (NautilusView *view); -void nautilus_view_zoom_to_fit (NautilusView *view); +/* These functions correspond to methods of the Nautilus:View CORBAinterface. */ +void nautilus_view_frame_notify_location_change (NautilusViewFrame *view, + Nautilus_NavigationInfo *nav_context); +void nautilus_view_frame_notify_selection_change (NautilusViewFrame *view, + Nautilus_SelectionInfo *sel_context); +void nautilus_view_frame_load_state (NautilusViewFrame *view, + const char *config_path); +void nautilus_view_frame_save_state (NautilusViewFrame *view, + const char *config_path); +void nautilus_view_frame_show_properties (NautilusViewFrame *view); +void nautilus_view_frame_stop_location_change (NautilusViewFrame *view); +void nautilus_view_frame_set_active_errors (NautilusViewFrame *view, + gboolean enabled); +gboolean nautilus_view_frame_is_zoomable (NautilusViewFrame *view); +gdouble nautilus_view_frame_get_zoom_level (NautilusViewFrame *view); +void nautilus_view_frame_set_zoom_level (NautilusViewFrame *view, + gdouble zoom_level); +gdouble nautilus_view_frame_get_min_zoom_level (NautilusViewFrame *view); +gdouble nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *view); +gboolean nautilus_view_frame_get_is_continuous (NautilusViewFrame *view); +void nautilus_view_frame_zoom_in (NautilusViewFrame *view); +void nautilus_view_frame_zoom_out (NautilusViewFrame *view); +void nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view); /* This is a "protected" operation */ -void nautilus_view_construct_arg_set (NautilusView *view); +void nautilus_view_frame_construct_arg_set (NautilusViewFrame *view); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* NAUTILUS_VIEW_H */ +#endif /* NTL_VIEW_H */ diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 0ac252cf1..294574c18 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -61,9 +61,9 @@ #endif static void nautilus_window_notify_selection_change (NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_SelectionInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); typedef enum { PROGRESS_INITIAL, PROGRESS_VIEWS, PROGRESS_DONE, PROGRESS_ERROR } ProgressType; @@ -105,18 +105,18 @@ Nautilus_SelectionInfo__copy(Nautilus_SelectionInfo *dest_si, Nautilus_Selection static void nautilus_window_notify_selection_change(NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_SelectionInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { loc->self_originated = (view == requesting_view); - nautilus_view_notify_selection_change(view, loc); + nautilus_view_frame_notify_selection_change(view, loc); } void nautilus_window_request_selection_change(NautilusWindow *window, Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { GList *p; Nautilus_SelectionInfo selinfo; @@ -125,7 +125,7 @@ nautilus_window_request_selection_change(NautilusWindow *window, CORBA_exception_init (&environment); selinfo.selected_uris = loc->selected_uris; selinfo.content_view = CORBA_Object_duplicate - (nautilus_view_get_objref (NAUTILUS_VIEW (window->content_view)), + (nautilus_view_frame_get_objref (NAUTILUS_VIEW_FRAME (window->content_view)), &environment); CORBA_exception_free (&environment); @@ -144,7 +144,7 @@ nautilus_window_request_selection_change(NautilusWindow *window, void nautilus_window_request_status_change(NautilusWindow *window, Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { nautilus_window_set_status(window, loc->status_string); } @@ -156,7 +156,7 @@ nautilus_window_request_status_change(NautilusWindow *window, void nautilus_window_request_progress_change(NautilusWindow *window, Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { NautilusWindowStateItem item; @@ -233,7 +233,7 @@ nautilus_window_get_current_location_title (NautilusWindow *window) /* * nautilus_window_update_title_internal: * - * Update the non-NautilusView objects that use the location's user-displayable + * Update the non-NautilusViewFrame objects that use the location's user-displayable * title in some way. Called when the location or title has changed. * @window: The NautilusWindow in question. * @title: The new user-displayable title. @@ -262,7 +262,7 @@ nautilus_window_update_title_internal (NautilusWindow *window, const char *title /* * nautilus_window_reset_title_internal: * - * Update the non-NautilusView objects that use the location's user-displayable + * Update the non-NautilusViewFrame objects that use the location's user-displayable * title in some way. Called when the location or title has changed. * @window: The NautilusWindow in question. * @title: The new user-displayable title. @@ -292,7 +292,7 @@ nautilus_window_reset_title_internal (NautilusWindow *window, const char *uri) void nautilus_window_request_title_change(NautilusWindow *window, const char *new_title, - NautilusContentView *requesting_view) + NautilusContentViewFrame *requesting_view) { g_return_if_fail (new_title != NULL); @@ -444,7 +444,7 @@ nautilus_window_update_internals (NautilusWindow *window, NautilusNavigationInfo /* Notify the index panel of the location change. */ /* FIXME bugzilla.eazel.com 211: * Eventually, this will not be necessary when we restructure the - * index panel to be a NautilusView. + * index panel to be a NautilusViewFrame. */ current_title = nautilus_window_get_current_location_title (window); nautilus_index_panel_set_uri (window->index_panel, window->ni->requested_uri, current_title); @@ -453,11 +453,11 @@ nautilus_window_update_internals (NautilusWindow *window, NautilusNavigationInfo static void nautilus_window_update_view (NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_NavigationInfo *navi, Nautilus_SelectionInfo *seli, - NautilusView *requesting_view, - NautilusView *content_view) + NautilusViewFrame *requesting_view, + NautilusViewFrame *content_view) { CORBA_Environment environment; @@ -465,13 +465,13 @@ nautilus_window_update_view (NautilusWindow *window, navi->self_originated = (view == requesting_view); - nautilus_view_notify_location_change (view, navi); + nautilus_view_frame_notify_location_change (view, navi); if(seli) { CORBA_exception_init(&environment); CORBA_Object_release(seli->content_view, &environment); seli->content_view = CORBA_Object_duplicate - (nautilus_view_get_client_objref(content_view), + (nautilus_view_frame_get_client_objref(content_view), &environment); CORBA_exception_free(&environment); @@ -480,7 +480,7 @@ nautilus_window_update_view (NautilusWindow *window, } void -nautilus_window_view_destroyed (NautilusView *view, NautilusWindow *window) +nautilus_window_view_destroyed (NautilusViewFrame *view, NautilusWindow *window) { NautilusWindowStateItem item = VIEW_ERROR; nautilus_window_set_state_info (window, item, view, (NautilusWindowStateItem) 0); @@ -569,26 +569,26 @@ nautilus_window_free_load_info (NautilusWindow *window) } /* Meta view handling */ -static NautilusView * +static NautilusViewFrame * nautilus_window_load_meta_view(NautilusWindow *window, const char *iid, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { - NautilusView *meta_view; + NautilusViewFrame *meta_view; GList *p; meta_view = NULL; for (p = window->meta_views; p != NULL; p = p->next) { - meta_view = NAUTILUS_VIEW (p->data); - if (!strcmp (nautilus_view_get_iid (meta_view), iid)) + meta_view = NAUTILUS_VIEW_FRAME (p->data); + if (!strcmp (nautilus_view_frame_get_iid (meta_view), iid)) break; } if (p == NULL) { - meta_view = NAUTILUS_VIEW (gtk_widget_new (nautilus_meta_view_get_type(), + meta_view = NAUTILUS_VIEW_FRAME (gtk_widget_new (nautilus_meta_view_frame_get_type(), "main_window", window, NULL)); nautilus_window_connect_view (window, meta_view); - if (!nautilus_view_load_client (meta_view, iid)) { + if (!nautilus_view_frame_load_client (meta_view, iid)) { gtk_widget_unref (GTK_WIDGET (meta_view)); meta_view = NULL; } @@ -596,7 +596,7 @@ nautilus_window_load_meta_view(NautilusWindow *window, if (meta_view != NULL) { gtk_object_ref (GTK_OBJECT (meta_view)); - nautilus_view_set_active_errors (meta_view, TRUE); + nautilus_view_frame_set_active_errors (meta_view, TRUE); } return meta_view; @@ -636,7 +636,7 @@ handle_unreadable_location (NautilusWindow *window, const char *uri) { void nautilus_window_request_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { NautilusWindow *new_window; @@ -656,21 +656,21 @@ nautilus_window_request_location_change (NautilusWindow *window, } } -NautilusView * +NautilusViewFrame * nautilus_window_load_content_view(NautilusWindow *window, const char *iid, Nautilus_NavigationInfo *navinfo, - NautilusView **requesting_view) + NautilusViewFrame **requesting_view) { - NautilusView *content_view = window->content_view; - NautilusView *new_view; + NautilusViewFrame *content_view = window->content_view; + NautilusViewFrame *new_view; CORBA_Environment environment; g_return_val_if_fail(iid, NULL); g_return_val_if_fail(navinfo, NULL); - if (!NAUTILUS_IS_VIEW (content_view) - || strcmp (nautilus_view_get_iid (content_view), iid) != 0) { + if (!NAUTILUS_IS_VIEW_FRAME (content_view) + || strcmp (nautilus_view_frame_get_iid (content_view), iid) != 0) { if (requesting_view != NULL && *requesting_view == window->content_view) { /* If we are going to be zapping the old view, @@ -680,12 +680,12 @@ nautilus_window_load_content_view(NautilusWindow *window, *requesting_view = NULL; } - new_view = NAUTILUS_VIEW (gtk_widget_new (nautilus_content_view_get_type(), + new_view = NAUTILUS_VIEW_FRAME (gtk_widget_new (nautilus_content_view_frame_get_type(), "main_window", window, NULL)); - nautilus_window_connect_content_view (window, NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_window_connect_content_view (window, NAUTILUS_CONTENT_VIEW_FRAME (new_view)); - if (!nautilus_view_load_client (new_view, iid)) { + if (!nautilus_view_frame_load_client (new_view, iid)) { gtk_widget_unref(GTK_WIDGET(new_view)); new_view = NULL; } @@ -698,7 +698,7 @@ nautilus_window_load_content_view(NautilusWindow *window, new_view = window->content_view; } - if (!NAUTILUS_IS_VIEW (new_view)) { + if (!NAUTILUS_IS_VIEW_FRAME (new_view)) { new_view = NULL; } else { gtk_object_ref (GTK_OBJECT (new_view)); @@ -706,11 +706,11 @@ nautilus_window_load_content_view(NautilusWindow *window, CORBA_exception_init(&environment); CORBA_Object_release(navinfo->content_view, &environment); navinfo->content_view = CORBA_Object_duplicate - (nautilus_view_get_client_objref (new_view), + (nautilus_view_frame_get_client_objref (new_view), &environment); CORBA_exception_free(&environment); - nautilus_view_set_active_errors (new_view, TRUE); + nautilus_view_frame_set_active_errors (new_view, TRUE); } return new_view; @@ -748,9 +748,9 @@ nautilus_window_update_state (gpointer data) /* Now make any needed state changes based on available information */ if (window->view_bombed_out && window->error_views != NULL) { for (p = window->error_views; p != NULL; p = p->next) { - NautilusView *error_view = p->data; + NautilusViewFrame *error_view = p->data; - if (NAUTILUS_IS_CONTENT_VIEW(error_view)) { + if (NAUTILUS_IS_CONTENT_VIEW_FRAME(error_view)) { if (error_view == window->new_content_view) { window->made_changes++; window->reset_to_idle = TRUE; @@ -766,7 +766,7 @@ nautilus_window_update_state (gpointer data) } window->cv_progress_error = TRUE; } - else if (NAUTILUS_IS_META_VIEW(error_view)) + else if (NAUTILUS_IS_META_VIEW_FRAME(error_view)) { if (g_list_find (window->new_meta_views, error_view) != NULL) { window->new_meta_views = g_list_remove (window->new_meta_views, error_view); @@ -843,7 +843,7 @@ nautilus_window_update_state (gpointer data) &window->new_requesting_view); for (p = window->pending_ni->sidebar_panel_identifiers; p != NULL; p = p->next) { - NautilusView *meta_view; + NautilusViewFrame *meta_view; NautilusViewIdentifier *identifier; identifier = (NautilusViewIdentifier *) (p->data); @@ -852,7 +852,7 @@ nautilus_window_update_state (gpointer data) (window, identifier->iid, window->new_requesting_view); if (meta_view != NULL) { - nautilus_meta_view_set_label (NAUTILUS_META_VIEW (meta_view), + nautilus_meta_view_frame_set_label (NAUTILUS_META_VIEW_FRAME (meta_view), identifier->name); window->new_meta_views = g_list_prepend (window->new_meta_views, meta_view); } @@ -944,7 +944,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) { va_list args; NautilusWindowStateItem item_type; - NautilusView *new_view; + NautilusViewFrame *new_view; gboolean do_sync; /* Ensure that changes happen in-order */ @@ -971,7 +971,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) break; case VIEW_ERROR: - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); x_message (("VIEW_ERROR on %p", new_view)); window->view_bombed_out = TRUE; gtk_object_ref (GTK_OBJECT (new_view)); @@ -981,7 +981,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) case NEW_CONTENT_VIEW_ACTIVATED: x_message (("NEW_CONTENT_VIEW_ACTIVATED")); g_return_if_fail (window->new_content_view == NULL); - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); /* Don't ref here, reference is held by widget hierarchy. */ window->new_content_view = new_view; if (window->pending_ni == NULL) { @@ -993,7 +993,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) case NEW_META_VIEW_ACTIVATED: x_message (("NEW_META_VIEW_ACTIVATED")); - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); /* Don't ref here, reference is held by widget hierarchy. */ window->new_meta_views = g_list_prepend (window->new_meta_views, new_view); window->changes_pending = TRUE; @@ -1166,7 +1166,7 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co void nautilus_window_begin_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view, + NautilusViewFrame *requesting_view, NautilusLocationChangeType type, guint distance) { @@ -1197,7 +1197,7 @@ nautilus_window_begin_location_change (NautilusWindow *window, current_iid = NULL; if (window->content_view != NULL) { - current_iid = nautilus_view_get_iid (window->content_view); + current_iid = nautilus_view_frame_get_iid (window->content_view); } window->cancel_tag = nautilus_navigation_info_new diff --git a/src/nautilus-window-manage-views.h b/src/nautilus-window-manage-views.h index 276a88f47..99ffe5c5e 100644 --- a/src/nautilus-window-manage-views.h +++ b/src/nautilus-window-manage-views.h @@ -25,25 +25,25 @@ */ #ifndef NTL_WINDOW_MSGS_H -#define NTL_WINDOW_MSGS_H 1 +#define NTL_WINDOW_MSGS_H #include "ntl-window.h" #include "ntl-content-view.h" -void nautilus_window_request_location_change(NautilusWindow *window, - Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_selection_change(NautilusWindow *window, - Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_status_change(NautilusWindow *window, - Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_progress_change(NautilusWindow *window, - Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_title_change(NautilusWindow *window, - const char *new_title, - NautilusContentView *requesting_view); +void nautilus_window_request_location_change (NautilusWindow *window, + Nautilus_NavigationRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_selection_change (NautilusWindow *window, + Nautilus_SelectionRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_status_change (NautilusWindow *window, + Nautilus_StatusRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_progress_change (NautilusWindow *window, + Nautilus_ProgressRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_title_change (NautilusWindow *window, + const char *new_title, + NautilusContentViewFrame *requesting_view); -#endif +#endif /* NTL_WINDOW_MSGS_H */ diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h index 4882c5f00..48ae6f97a 100644 --- a/src/nautilus-window-private.h +++ b/src/nautilus-window-private.h @@ -1,5 +1,5 @@ #ifndef NTL_WINDOW_PRIVATE_H -#define NTL_WINDOW_PRIVATE_H 1 +#define NTL_WINDOW_PRIVATE_H #include "ntl-window.h" #include "ntl-content-view.h" @@ -23,37 +23,37 @@ void nautilus_window_set_state_info(NautilusWindow *window, ... /* things to set void nautilus_window_real_request_selection_change(NautilusWindow *window, Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_status_change(NautilusWindow *window, Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_progress_change (NautilusWindow *window, Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_set_status(NautilusWindow *window, const char *txt); void nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint distance); void nautilus_window_begin_location_change(NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view, + NautilusViewFrame *requesting_view, NautilusLocationChangeType type, guint distance); -void nautilus_window_remove_meta_view_real(NautilusWindow *window, NautilusView *meta_view); +void nautilus_window_remove_meta_view_real(NautilusWindow *window, NautilusViewFrame *meta_view); void nautilus_window_load_content_view_menu (NautilusWindow *window, NautilusNavigationInfo *ni); -NautilusView *nautilus_window_load_content_view(NautilusWindow *window, +NautilusViewFrame *nautilus_window_load_content_view(NautilusWindow *window, const char *iid, Nautilus_NavigationInfo *navinfo, - NautilusView **requesting_view); + NautilusViewFrame **requesting_view); void nautilus_window_connect_content_view (NautilusWindow *window, - NautilusContentView *view); + NautilusContentViewFrame *view); void nautilus_window_connect_view (NautilusWindow *window, - NautilusView *view); -void nautilus_window_view_destroyed(NautilusView *view, NautilusWindow *window); + NautilusViewFrame *view); +void nautilus_window_view_destroyed(NautilusViewFrame *view, NautilusWindow *window); void nautilus_send_history_list_changed (void); void nautilus_add_to_history_list (NautilusBookmark *bookmark); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 0e553e634..b23bcd149 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -59,7 +59,7 @@ enum }; static void nautilus_window_realize (GtkWidget *widget); -static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view); +static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view); /* Object framework static variables */ static GnomeAppClass *parent_class = NULL; @@ -343,7 +343,7 @@ zoom_in_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_in (window->content_view); + nautilus_view_frame_zoom_in (window->content_view); } } @@ -352,7 +352,7 @@ zoom_out_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_out (window->content_view); + nautilus_view_frame_zoom_out (window->content_view); } } @@ -491,7 +491,7 @@ nautilus_window_set_arg (GtkObject *object, window->app = BONOBO_OBJECT(GTK_VALUE_OBJECT(*arg)); break; case ARG_CONTENT_VIEW: - nautilus_window_real_set_content_view (window, (NautilusView *)GTK_VALUE_OBJECT(*arg)); + nautilus_window_real_set_content_view (window, (NautilusViewFrame *)GTK_VALUE_OBJECT(*arg)); break; } } @@ -654,7 +654,7 @@ nautilus_window_realize (GtkWidget *widget) #if 0 static gboolean -nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusView *meta_view) +nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusViewFrame *meta_view) { if(event->button != 3) return FALSE; @@ -671,7 +671,7 @@ static void view_menu_switch_views_callback (GtkWidget *widget, gpointer data) { NautilusWindow *window; - NautilusView *view; + NautilusViewFrame *view; NautilusDirectory *directory; char *iid; @@ -768,29 +768,29 @@ nautilus_window_load_content_view_menu (NautilusWindow *window, } void -nautilus_window_set_content_view (NautilusWindow *window, NautilusView *content_view) +nautilus_window_set_content_view (NautilusWindow *window, NautilusViewFrame *content_view) { nautilus_window_real_set_content_view (window, content_view); } void -nautilus_window_add_meta_view(NautilusWindow *window, NautilusView *meta_view) +nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); } void -nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusViewFrame *meta_view) { nautilus_index_panel_remove_meta_view(window->index_panel, meta_view); } void -nautilus_window_remove_meta_view (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view (NautilusWindow *window, NautilusViewFrame *meta_view) { if (!g_list_find(window->meta_views, meta_view)) return; @@ -953,7 +953,7 @@ nautilus_get_history_list () static void -nautilus_window_request_location_change_cb (NautilusView *view, +nautilus_window_request_location_change_cb (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *info, NautilusWindow *window) { @@ -962,7 +962,7 @@ nautilus_window_request_location_change_cb (NautilusView *view, static void -nautilus_window_request_selection_change_cb (NautilusView *view, +nautilus_window_request_selection_change_cb (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *info, NautilusWindow *window) { @@ -970,7 +970,7 @@ nautilus_window_request_selection_change_cb (NautilusView *view, } static void -nautilus_window_request_status_change_cb (NautilusView *view, +nautilus_window_request_status_change_cb (NautilusViewFrame *view, Nautilus_StatusRequestInfo *info, NautilusWindow *window) { @@ -978,7 +978,7 @@ nautilus_window_request_status_change_cb (NautilusView *view, } static void -nautilus_window_request_progress_change_cb (NautilusView *view, +nautilus_window_request_progress_change_cb (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *info, NautilusWindow *window) { @@ -986,7 +986,7 @@ nautilus_window_request_progress_change_cb (NautilusView *view, } static void -nautilus_window_request_title_change_callback (NautilusContentView *view, +nautilus_window_request_title_change_callback (NautilusContentViewFrame *view, const char *new_title, NautilusWindow *window) { @@ -994,7 +994,7 @@ nautilus_window_request_title_change_callback (NautilusContentView *view, } void -nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) +nautilus_window_connect_view(NautilusWindow *window, NautilusViewFrame *view) { GtkObject *view_object; @@ -1022,14 +1022,14 @@ nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) } void -nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentView *view) +nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentViewFrame *view) { GtkObject *view_object; - /* First connect with NautilusView signals. */ - nautilus_window_connect_view (window, NAUTILUS_VIEW (view)); + /* First connect with NautilusViewFrame signals. */ + nautilus_window_connect_view (window, NAUTILUS_VIEW_FRAME (view)); - /* Now connect with NautilusContentView signals. */ + /* Now connect with NautilusContentViewFrame signals. */ view_object = GTK_OBJECT(view); gtk_signal_connect(view_object, "request_title_change", @@ -1051,10 +1051,10 @@ nautilus_window_display_error(NautilusWindow *window, const char *error_msg) } static void -nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view) +nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view) { g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW (new_view)); + g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW_FRAME (new_view)); if (new_view == window->content_view) { @@ -1072,7 +1072,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_show (GTK_WIDGET (new_view)); - nautilus_content_view_set_active (NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_content_view_frame_set_active (NAUTILUS_CONTENT_VIEW_FRAME (new_view)); gtk_paned_pack2(GTK_PANED(window->content_hbox), GTK_WIDGET (new_view), TRUE, FALSE); } diff --git a/src/nautilus-window.h b/src/nautilus-window.h index c002e05ed..a79f408b1 100644 --- a/src/nautilus-window.h +++ b/src/nautilus-window.h @@ -89,7 +89,7 @@ struct _NautilusWindow { NautilusBookmark *last_location_bookmark; /* Current views stuff */ - NautilusView *content_view; + NautilusViewFrame *content_view; GList *meta_views; /* Widgets to keep track of (for state changes, etc) */ @@ -102,7 +102,7 @@ struct _NautilusWindow { /* Pending changes */ NautilusNavigationInfo *pending_ni; - NautilusView *new_content_view, *new_requesting_view; + NautilusViewFrame *new_content_view, *new_requesting_view; GList *new_meta_views; GList *error_views; @@ -126,30 +126,30 @@ struct _NautilusWindow { nautilus_boolean_bit reset_to_idle : 1; }; -GtkType nautilus_window_get_type (void); -void nautilus_window_close (NautilusWindow *window); -void nautilus_window_set_content_view (NautilusWindow *window, - NautilusView *content_view); -void nautilus_window_add_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_remove_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_goto_uri (NautilusWindow *window, - const char *uri); -void nautilus_window_display_error (NautilusWindow *window, - const char *error_msg); -const char * nautilus_window_get_requested_uri (NautilusWindow *window); -BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); -void nautilus_window_allow_back (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_forward (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_up (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_reload (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_stop (NautilusWindow *window, - gboolean allow); -void nautilus_bookmarks_exiting (void); +GtkType nautilus_window_get_type (void); +void nautilus_window_close (NautilusWindow *window); +void nautilus_window_set_content_view (NautilusWindow *window, + NautilusViewFrame *content_view); +void nautilus_window_add_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_remove_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_goto_uri (NautilusWindow *window, + const char *uri); +void nautilus_window_display_error (NautilusWindow *window, + const char *error_msg); +const char * nautilus_window_get_requested_uri (NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); +void nautilus_window_allow_back (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_forward (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_up (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_reload (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_stop (NautilusWindow *window, + gboolean allow); +void nautilus_bookmarks_exiting (void); #endif diff --git a/src/nautilus-zoomable-frame-corba.c b/src/nautilus-zoomable-frame-corba.c index 5ede0b97c..b89206447 100644 --- a/src/nautilus-zoomable-frame-corba.c +++ b/src/nautilus-zoomable-frame-corba.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Nautilus @@ -23,6 +23,7 @@ * Author: Elliot Lee <sopwith@redhat.com> * */ + /* ntl-zoomable-frame-svr.c: CORBA server implementation of Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */ @@ -31,10 +32,10 @@ #include "ntl-view-private.h" typedef struct { - POA_Nautilus_ZoomableFrame servant; - gpointer bonobo_object; - - NautilusView *view; + POA_Nautilus_ZoomableFrame servant; + gpointer bonobo_object; + + NautilusViewFrame *view; } impl_POA_Nautilus_ZoomableFrame; static void impl_Nautilus_ZoomableFrame_notify_zoom_level (impl_POA_Nautilus_ZoomableFrame *servant, @@ -63,10 +64,10 @@ impl_Nautilus_ZoomableFrame__destroy (BonoboObject *obj, { PortableServer_ObjectId *objid; CORBA_Environment ev; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_destroy_func) (PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (servant->view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (servant->view)->klass); CORBA_exception_init(&ev); @@ -82,15 +83,15 @@ impl_Nautilus_ZoomableFrame__destroy (BonoboObject *obj, } BonoboObject * -impl_Nautilus_ZoomableFrame__create (NautilusView *view, +impl_Nautilus_ZoomableFrame__create (NautilusViewFrame *view, CORBA_Environment * ev) { BonoboObject *retval; impl_POA_Nautilus_ZoomableFrame *newservant; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_init_func) (PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (view)->klass); newservant = g_new0 (impl_POA_Nautilus_ZoomableFrame, 1); newservant->servant.vepv = klass->vepv; @@ -115,5 +116,5 @@ impl_Nautilus_ZoomableFrame_notify_zoom_level (impl_POA_Nautilus_ZoomableFrame * CORBA_double level, CORBA_Environment *ev) { - nautilus_view_notify_zoom_level (servant->view, level); + nautilus_view_frame_notify_zoom_level (servant->view, level); } diff --git a/src/nautilus-zoomable-frame-svr.c b/src/nautilus-zoomable-frame-svr.c index 5ede0b97c..b89206447 100644 --- a/src/nautilus-zoomable-frame-svr.c +++ b/src/nautilus-zoomable-frame-svr.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Nautilus @@ -23,6 +23,7 @@ * Author: Elliot Lee <sopwith@redhat.com> * */ + /* ntl-zoomable-frame-svr.c: CORBA server implementation of Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */ @@ -31,10 +32,10 @@ #include "ntl-view-private.h" typedef struct { - POA_Nautilus_ZoomableFrame servant; - gpointer bonobo_object; - - NautilusView *view; + POA_Nautilus_ZoomableFrame servant; + gpointer bonobo_object; + + NautilusViewFrame *view; } impl_POA_Nautilus_ZoomableFrame; static void impl_Nautilus_ZoomableFrame_notify_zoom_level (impl_POA_Nautilus_ZoomableFrame *servant, @@ -63,10 +64,10 @@ impl_Nautilus_ZoomableFrame__destroy (BonoboObject *obj, { PortableServer_ObjectId *objid; CORBA_Environment ev; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_destroy_func) (PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (servant->view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (servant->view)->klass); CORBA_exception_init(&ev); @@ -82,15 +83,15 @@ impl_Nautilus_ZoomableFrame__destroy (BonoboObject *obj, } BonoboObject * -impl_Nautilus_ZoomableFrame__create (NautilusView *view, +impl_Nautilus_ZoomableFrame__create (NautilusViewFrame *view, CORBA_Environment * ev) { BonoboObject *retval; impl_POA_Nautilus_ZoomableFrame *newservant; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_init_func) (PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (view)->klass); newservant = g_new0 (impl_POA_Nautilus_ZoomableFrame, 1); newservant->servant.vepv = klass->vepv; @@ -115,5 +116,5 @@ impl_Nautilus_ZoomableFrame_notify_zoom_level (impl_POA_Nautilus_ZoomableFrame * CORBA_double level, CORBA_Environment *ev) { - nautilus_view_notify_zoom_level (servant->view, level); + nautilus_view_frame_notify_zoom_level (servant->view, level); } diff --git a/src/ntl-app.c b/src/ntl-app.c index 5f08ffb9b..c8d648ea7 100644 --- a/src/ntl-app.c +++ b/src/ntl-app.c @@ -131,7 +131,7 @@ impl_Nautilus_Application_create_object (impl_POA_Nautilus_Application *servant, CORBA_Environment * ev) { FMDirectoryView *dir_view; - NautilusContentViewFrame *view_frame; + NautilusContentView *view; if (!impl_Nautilus_Application_supports (servant, obj_iid, ev)) { return CORBA_OBJECT_NIL; @@ -147,8 +147,8 @@ impl_Nautilus_Application_create_object (impl_POA_Nautilus_Application *servant, return CORBA_OBJECT_NIL; } - view_frame = fm_directory_view_get_view_frame (dir_view); - return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (view_frame)), ev); + view = fm_directory_view_get_nautilus_view (dir_view); + return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (view)), ev); } @@ -269,14 +269,26 @@ display_prototype_caveat (void) /* Inform the user that Nautilus has a long way to go * before they should be expecting it to work well. */ - if (getenv ("NAUTILUS_NO_CAVEAT_DIALOG")==NULL) { - gnome_warning_dialog ( - _("Thank you for trying Nautilus!" - "\n\nIt is still under development, and many features are" - "\nnot yet implemented or have some degree of instability. " - "\nIf you use this pre-release version of Nautilus, please " - "\nexercise extreme caution." - "\n\nFor more information, visit http://nautilus.eazel.com.")); + if (getenv ("NAUTILUS_NO_CAVEAT_DIALOG") == NULL) { + /* Before you change this code back to use gnome_warning_dialog + * or nautilus_warning_dialog, you better test it. See bug 963. + */ + nautilus_simple_dialog + (NULL, + _("The Nautilus shell is under development; " + "it's not ready for daily use. " + "Many features, including some of the best ones, " + "are not yet done, partly done, or unstable. " + "The program doesn't look or act the way it " + "will in version 1.0." + "\n\n" + "If you do decide to test this version of Nautilus, beware. " + "The program could do something unpredictable and may even " + "delete or overwrite files on your computer." + "\n\n" + "For more information, visit http://nautilus.eazel.com."), + _("Nautilus: caveat"), + GNOME_STOCK_BUTTON_OK, NULL); } } diff --git a/src/ntl-content-view.c b/src/ntl-content-view.c index 4f866b9bd..d597bf848 100644 --- a/src/ntl-content-view.c +++ b/src/ntl-content-view.c @@ -23,6 +23,7 @@ * Author: Elliot Lee <sopwith@redhat.com> * */ + /* ntl-content-view.c: Implementation of the object representing a content view. */ #include <config.h> @@ -57,47 +58,47 @@ enum { LAST_SIGNAL }; -static void nautilus_content_view_class_init (NautilusContentViewClass *klass); -static void nautilus_content_view_init (NautilusContentView *view); -static void nautilus_content_view_request_title_change (NautilusContentView *view, +static void nautilus_content_view_frame_class_init (NautilusContentViewFrameClass *klass); +static void nautilus_content_view_frame_init (NautilusContentViewFrame *view); +static void nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view, const char *new_title); -static guint nautilus_content_view_signals[LAST_SIGNAL]; +static guint signals[LAST_SIGNAL]; static void impl_Nautilus_ContentViewFrame_request_title_change (impl_POA_Nautilus_ViewFrame * servant, const char * new_info, CORBA_Environment * ev) { - nautilus_content_view_request_title_change (NAUTILUS_CONTENT_VIEW (servant->view), new_info); + nautilus_content_view_frame_request_title_change (NAUTILUS_CONTENT_VIEW_FRAME (servant->view), new_info); } GtkType -nautilus_content_view_get_type(void) +nautilus_content_view_frame_get_type(void) { static guint view_type = 0; if (!view_type) { GtkTypeInfo view_info = { - "NautilusContentView", - sizeof(NautilusContentView), - sizeof(NautilusContentViewClass), - (GtkClassInitFunc) nautilus_content_view_class_init, - (GtkObjectInitFunc) nautilus_content_view_init, + "NautilusContentViewFrame", + sizeof(NautilusContentViewFrame), + sizeof(NautilusContentViewFrameClass), + (GtkClassInitFunc) nautilus_content_view_frame_class_init, + (GtkObjectInitFunc) nautilus_content_view_frame_init, NULL, NULL, NULL }; - view_type = gtk_type_unique (nautilus_view_get_type(), &view_info); + view_type = gtk_type_unique (nautilus_view_frame_get_type(), &view_info); } return view_type; } static void -nautilus_content_view_class_init (NautilusContentViewClass *klass) +nautilus_content_view_frame_class_init (NautilusContentViewFrameClass *klass) { GtkObjectClass *object_class; GtkWidgetClass *widget_class; @@ -106,33 +107,34 @@ nautilus_content_view_class_init (NautilusContentViewClass *klass) widget_class = (GtkWidgetClass*) klass; klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - NAUTILUS_VIEW_CLASS(klass)->servant_init_func = POA_Nautilus_ContentViewFrame__init; - NAUTILUS_VIEW_CLASS(klass)->servant_destroy_func = POA_Nautilus_ContentViewFrame__fini; - NAUTILUS_VIEW_CLASS(klass)->vepv = &impl_Nautilus_ContentViewFrame_vepv; + NAUTILUS_VIEW_FRAME_CLASS(klass)->servant_init_func = POA_Nautilus_ContentViewFrame__init; + NAUTILUS_VIEW_FRAME_CLASS(klass)->servant_destroy_func = POA_Nautilus_ContentViewFrame__fini; + NAUTILUS_VIEW_FRAME_CLASS(klass)->vepv = &impl_Nautilus_ContentViewFrame_vepv; - nautilus_content_view_signals[REQUEST_TITLE_CHANGE] = gtk_signal_new ("request_title_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusContentViewClass, - request_title_change), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + signals[REQUEST_TITLE_CHANGE] = + gtk_signal_new ("request_title_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusContentViewFrameClass, + request_title_change), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - gtk_object_class_add_signals (object_class, nautilus_content_view_signals, LAST_SIGNAL); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } static void -nautilus_content_view_init (NautilusContentView *view) +nautilus_content_view_frame_init (NautilusContentViewFrame *view) { } void -nautilus_content_view_set_active (NautilusContentView *view) +nautilus_content_view_frame_set_active (NautilusContentViewFrame *view) { BonoboControlFrame *control_frame; control_frame = BONOBO_CONTROL_FRAME (bonobo_object_query_local_interface - (NAUTILUS_VIEW (view)->view_frame, "IDL:Bonobo/ControlFrame:1.0")); + (NAUTILUS_VIEW_FRAME (view)->view_frame, "IDL:Bonobo/ControlFrame:1.0")); bonobo_control_frame_control_activate (control_frame); @@ -140,8 +142,8 @@ nautilus_content_view_set_active (NautilusContentView *view) } static void -nautilus_content_view_request_title_change (NautilusContentView *view, - const char *new_title) +nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view, + const char *new_title) { - gtk_signal_emit (GTK_OBJECT(view), nautilus_content_view_signals[REQUEST_TITLE_CHANGE], new_title); + gtk_signal_emit (GTK_OBJECT(view), signals[REQUEST_TITLE_CHANGE], new_title); } diff --git a/src/ntl-content-view.h b/src/ntl-content-view.h index f31360657..98dbc9b63 100644 --- a/src/ntl-content-view.h +++ b/src/ntl-content-view.h @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Nautilus @@ -24,41 +24,38 @@ */ /* ntl-content-view.h: Interface of the object representing a content view. */ -#ifndef NAUTILUS_CONTENT_VIEW_H -#define NAUTILUS_CONTENT_VIEW_H 1 +#ifndef NTL_CONTENT_VIEW_H +#define NTL_CONTENT_VIEW_H #include "ntl-view.h" -#define NAUTILUS_TYPE_CONTENT_VIEW (nautilus_content_view_get_type()) -#define NAUTILUS_CONTENT_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW, NautilusContentView)) -#define NAUTILUS_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW, NautilusContentViewClass)) -#define NAUTILUS_IS_CONTENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW)) -#define NAUTILUS_IS_CONTENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CONTENT_VIEW)) +#define NAUTILUS_TYPE_CONTENT_VIEW_FRAME (nautilus_content_view_frame_get_type()) +#define NAUTILUS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrame)) +#define NAUTILUS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrameClass)) +#define NAUTILUS_IS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME)) +#define NAUTILUS_IS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CONTENT_VIEW_FRAME)) -typedef struct _NautilusContentView NautilusContentView; -typedef struct _NautilusContentViewClass NautilusContentViewClass; +typedef struct NautilusContentViewFrame NautilusContentViewFrame; +typedef struct NautilusContentViewFrameClass NautilusContentViewFrameClass; -struct _NautilusContentViewClass +struct NautilusContentViewFrameClass { - NautilusViewClass parent_spot; - - /* - * These signals correspond to the Nautilus:ContentViewFrame CORBA interface. - * They are requests that the underlying view may make of the framework. - */ - - void (*request_title_change) (NautilusContentView *view, - const char *new_title); - - NautilusViewClass *parent_class; + NautilusViewFrameClass parent_spot; + + /* These signals correspond to the Nautilus:ContentViewFrame CORBA interface. + * They are requests that the underlying view may make of the framework. + */ + void (*request_title_change) (NautilusContentViewFrame *view, + const char *new_title); + + NautilusViewFrameClass *parent_class; }; -struct _NautilusContentView { - NautilusView parent_object; +struct NautilusContentViewFrame { + NautilusViewFrame parent_object; }; -GtkType nautilus_content_view_get_type (void); - -void nautilus_content_view_set_active (NautilusContentView *view); +GtkType nautilus_content_view_frame_get_type (void); +void nautilus_content_view_frame_set_active (NautilusContentViewFrame *view); -#endif +#endif /* NTL_CONTENT_VIEW_H */ diff --git a/src/ntl-index-panel.c b/src/ntl-index-panel.c index 5dd9014bc..557b3725a 100644 --- a/src/ntl-index-panel.c +++ b/src/ntl-index-panel.c @@ -462,7 +462,7 @@ nautilus_index_panel_drag_data_received (GtkWidget *widget, GdkDragContext *cont /* add a new meta-view to the index panel */ void -nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusView *meta_view) +nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusViewFrame *meta_view) { GtkWidget *label; char cbuf[32]; @@ -470,9 +470,9 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); - description = nautilus_meta_view_get_label (NAUTILUS_META_VIEW (meta_view)); + description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { /* FIXME bugzilla.eazel.com 599: * Why is a hex address better than an empty string? @@ -499,7 +499,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie /* remove the passed-in meta-view from the index panel */ void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *index_panel, - NautilusView *meta_view) + NautilusViewFrame *meta_view) { int page_num; diff --git a/src/ntl-index-panel.h b/src/ntl-index-panel.h index 0ac4e2fda..6a6dc2ef4 100644 --- a/src/ntl-index-panel.h +++ b/src/ntl-index-panel.h @@ -59,9 +59,9 @@ struct NautilusIndexPanelClass GtkType nautilus_index_panel_get_type (void); NautilusIndexPanel *nautilus_index_panel_new (void); void nautilus_index_panel_add_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *panel, - NautilusView *meta_view); + NautilusViewFrame *meta_view); void nautilus_index_panel_set_uri (NautilusIndexPanel *panel, const char *new_uri, const char *initial_title); diff --git a/src/ntl-meta-view.c b/src/ntl-meta-view.c index 87a1d6c15..78e76df4f 100644 --- a/src/ntl-meta-view.c +++ b/src/ntl-meta-view.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Nautilus @@ -22,6 +22,7 @@ * Author: Elliot Lee <sopwith@redhat.com> * */ + /* ntl-meta-view.c: Implementation of the object representing a meta/navigation view. */ #include <config.h> @@ -30,64 +31,55 @@ #include <gtk/gtksignal.h> #include <libnautilus-extensions/nautilus-gtk-macros.h> -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - -static POA_Nautilus_MetaViewFrame__epv impl_Nautilus_MetaViewFrame_epv = { - NULL -}; +static PortableServer_ServantBase__epv base_epv; +static POA_Nautilus_MetaViewFrame__epv impl_Nautilus_MetaViewFrame_epv; extern POA_Nautilus_ViewFrame__epv impl_Nautilus_ViewFrame_epv; - static POA_Nautilus_MetaViewFrame__vepv impl_Nautilus_MetaViewFrame_vepv = { - &base_epv, - NULL, - &impl_Nautilus_ViewFrame_epv, - &impl_Nautilus_MetaViewFrame_epv + &base_epv, + NULL, + &impl_Nautilus_ViewFrame_epv, + &impl_Nautilus_MetaViewFrame_epv }; -static void nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass); -static void nautilus_meta_view_initialize (NautilusMetaView *view); - -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMetaView, nautilus_meta_view, NAUTILUS_TYPE_VIEW) +static void nautilus_meta_view_frame_initialize_class (NautilusMetaViewFrameClass *klass); +static void nautilus_meta_view_frame_initialize (NautilusMetaViewFrame *view); +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMetaViewFrame, nautilus_meta_view_frame, NAUTILUS_TYPE_VIEW_FRAME) + static void -nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass) +nautilus_meta_view_frame_initialize_class (NautilusMetaViewFrameClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - NautilusViewClass *view_class; - - object_class = (GtkObjectClass*) klass; - widget_class = (GtkWidgetClass*) klass; - view_class = (NautilusViewClass*) klass; - klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - view_class->servant_init_func = POA_Nautilus_MetaViewFrame__init; - view_class->servant_destroy_func = POA_Nautilus_MetaViewFrame__fini; - view_class->vepv = &impl_Nautilus_MetaViewFrame_vepv; + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + NautilusViewFrameClass *view_class; + + object_class = (GtkObjectClass*) klass; + widget_class = (GtkWidgetClass*) klass; + view_class = (NautilusViewFrameClass*) klass; + klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); + view_class->servant_init_func = POA_Nautilus_MetaViewFrame__init; + view_class->servant_destroy_func = POA_Nautilus_MetaViewFrame__fini; + view_class->vepv = &impl_Nautilus_MetaViewFrame_vepv; } static void -nautilus_meta_view_initialize (NautilusMetaView *view) +nautilus_meta_view_frame_initialize (NautilusMetaViewFrame *view) { } void -nautilus_meta_view_set_label (NautilusMetaView *nview, - const char *label) +nautilus_meta_view_frame_set_label (NautilusMetaViewFrame *nview, + const char *label) { - nview->label = g_strdup (label); + nview->label = g_strdup (label); } const char * -nautilus_meta_view_get_label(NautilusMetaView *nview) +nautilus_meta_view_frame_get_label(NautilusMetaViewFrame *nview) { - return nview->label; + return nview->label; } - - - - - diff --git a/src/ntl-meta-view.h b/src/ntl-meta-view.h index cf499c197..6d6a041de 100644 --- a/src/ntl-meta-view.h +++ b/src/ntl-meta-view.h @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Nautilus @@ -22,36 +22,37 @@ * Author: Elliot Lee <sopwith@redhat.com> * */ + /* ntl-meta-view.h: Interface of the object representing a meta/navigation view. Derived from NautilusView. */ #ifndef NAUTILUS_META_VIEW_H -#define NAUTILUS_META_VIEW_H 1 +#define NAUTILUS_META_VIEW_H #include "ntl-view.h" -#define NAUTILUS_TYPE_META_VIEW (nautilus_meta_view_get_type()) -#define NAUTILUS_META_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW, NautilusMetaView)) -#define NAUTILUS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW, NautilusMetaViewClass)) -#define NAUTILUS_IS_META_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW)) -#define NAUTILUS_IS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_META_VIEW)) +#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type()) +#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame)) +#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass)) +#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME)) +#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_META_VIEW_FRAME)) -typedef struct _NautilusMetaView NautilusMetaView; +typedef struct NautilusMetaViewFrame NautilusMetaViewFrame; typedef struct { - NautilusViewClass parent_spot; - - NautilusViewClass *parent_class; -} NautilusMetaViewClass; - -struct _NautilusMetaView { - NautilusView parent_object; - char *label; + NautilusViewFrameClass parent_spot; + + NautilusViewFrameClass *parent_class; +} NautilusMetaViewFrameClass; + +struct NautilusMetaViewFrame { + NautilusViewFrame parent_object; + char *label; }; -GtkType nautilus_meta_view_get_type (void); -NautilusMetaView *nautilus_meta_view_new (void); -const char *nautilus_meta_view_get_label (NautilusMetaView *nview); -void nautilus_meta_view_set_label (NautilusMetaView *nview, - const char *label); +GtkType nautilus_meta_view_frame_get_type (void); +NautilusMetaViewFrame *nautilus_meta_view_frame_new (void); +const char * nautilus_meta_view_frame_get_label (NautilusMetaViewFrame *view); +void nautilus_meta_view_frame_set_label (NautilusMetaViewFrame *view, + const char *label); #endif diff --git a/src/ntl-view-bonobo-control.c b/src/ntl-view-bonobo-control.c index 6991ee4af..bc5cafb4a 100644 --- a/src/ntl-view-bonobo-control.c +++ b/src/ntl-view-bonobo-control.c @@ -34,25 +34,25 @@ typedef struct { } BonoboControlInfo; static void -destroy_bonobo_control_view(NautilusView *view, CORBA_Environment *ev) +destroy_bonobo_control_view(NautilusViewFrame *view, CORBA_Environment *ev) { BonoboControlInfo *bci = view->component_data; g_free(bci); } static void -nautilus_view_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) +nautilus_view_frame_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusViewFrame *view) { Nautilus_NavigationRequestInfo nri; g_assert(!relative); memset(&nri, 0, sizeof(nri)); nri.requested_uri = (char *)uri; - nautilus_view_request_location_change(view, &nri); + nautilus_view_frame_request_location_change(view, &nri); } static gboolean -bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +bonobo_control_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { BonoboControlInfo *bci; Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)))); @@ -67,20 +67,20 @@ bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Envir view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); gtk_signal_connect(GTK_OBJECT(bci->control_frame), - "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_activate_uri), view); + "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_frame_activate_uri), view); return TRUE; } static void -bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) +bonobo_control_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { Nautilus_ProgressRequestInfo pri; pri.amount = 0; pri.type = Nautilus_PROGRESS_UNDERWAY; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); pri.type = Nautilus_PROGRESS_DONE_OK; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); } NautilusViewComponentType bonobo_control_component_type = { diff --git a/src/ntl-view-bonobo-subdoc.c b/src/ntl-view-bonobo-subdoc.c index 97340e483..1288470ad 100644 --- a/src/ntl-view-bonobo-subdoc.c +++ b/src/ntl-view-bonobo-subdoc.c @@ -35,15 +35,14 @@ typedef struct { } BonoboSubdocInfo; static void -destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev) +destroy_bonobo_subdoc_view (NautilusViewFrame *view, CORBA_Environment *ev) { BonoboSubdocInfo *bsi = view->component_data; - g_free(bsi); } static void -bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) +bonobo_subdoc_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { Bonobo_PersistStream persist; @@ -60,7 +59,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo pri.type = Nautilus_PROGRESS_UNDERWAY; else pri.type = Nautilus_PROGRESS_DONE_ERROR; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); if(stream) { Bonobo_PersistStream_load (persist, @@ -69,13 +68,13 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); pri.type = Nautilus_PROGRESS_DONE_OK; - nautilus_view_request_progress_change(view, &pri); + nautilus_view_frame_request_progress_change(view, &pri); } } } static gboolean -bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +bonobo_subdoc_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { BonoboSubdocInfo *bsi; Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)))); diff --git a/src/ntl-view-frame-svr.c b/src/ntl-view-frame-svr.c index 3e1d22ce2..0c025c5a3 100644 --- a/src/ntl-view-frame-svr.c +++ b/src/ntl-view-frame-svr.c @@ -75,10 +75,10 @@ impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame { PortableServer_ObjectId *objid; CORBA_Environment ev; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_destroy_func)(PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(servant->view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass); CORBA_exception_init(&ev); @@ -94,14 +94,14 @@ impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame } BonoboObject * -impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) +impl_Nautilus_ViewFrame__create(NautilusViewFrame *view, CORBA_Environment * ev) { BonoboObject *retval; impl_POA_Nautilus_ViewFrame *newservant; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; void (*servant_init_func)(PortableServer_Servant, CORBA_Environment *); - klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); newservant = g_new0(impl_POA_Nautilus_ViewFrame, 1); newservant->servant.vepv = klass->vepv; if(!newservant->servant.vepv->Bonobo_Unknown_epv) @@ -129,7 +129,7 @@ impl_Nautilus_ViewFrame_request_location_change(impl_POA_Nautilus_ViewFrame * se Nautilus_NavigationRequestInfo * navinfo, CORBA_Environment * ev) { - nautilus_view_request_location_change(servant->view, navinfo); + nautilus_view_frame_request_location_change(servant->view, navinfo); } static void @@ -137,7 +137,7 @@ impl_Nautilus_ViewFrame_request_selection_change(impl_POA_Nautilus_ViewFrame * s Nautilus_SelectionRequestInfo * selinfo, CORBA_Environment * ev) { - nautilus_view_request_selection_change(servant->view, + nautilus_view_frame_request_selection_change(servant->view, selinfo); } @@ -146,7 +146,7 @@ impl_Nautilus_ViewFrame_request_status_change(impl_POA_Nautilus_ViewFrame * serv Nautilus_StatusRequestInfo * statinfo, CORBA_Environment * ev) { - nautilus_view_request_status_change(servant->view, statinfo); + nautilus_view_frame_request_status_change(servant->view, statinfo); } static void @@ -154,5 +154,5 @@ impl_Nautilus_ViewFrame_request_progress_change(impl_POA_Nautilus_ViewFrame * se Nautilus_ProgressRequestInfo * proginfo, CORBA_Environment * ev) { - nautilus_view_request_progress_change(servant->view, proginfo); + nautilus_view_frame_request_progress_change(servant->view, proginfo); } diff --git a/src/ntl-view-nautilus.c b/src/ntl-view-nautilus.c index 6205cf592..5e4ca2eed 100644 --- a/src/ntl-view-nautilus.c +++ b/src/ntl-view-nautilus.c @@ -35,7 +35,7 @@ typedef struct { } NautilusViewInfo; static gboolean -nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) +nautilus_view_try_load_client(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev) { Bonobo_Control control; NautilusViewInfo *nvi; @@ -69,7 +69,7 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro } static void -destroy_nautilus_view(NautilusView *view, CORBA_Environment *ev) +destroy_nautilus_view(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -79,7 +79,7 @@ destroy_nautilus_view(NautilusView *view, CORBA_Environment *ev) } static void -nv_show_properties(NautilusView *view, CORBA_Environment *ev) +nv_show_properties(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -89,7 +89,7 @@ nv_show_properties(NautilusView *view, CORBA_Environment *ev) } static void -nv_save_state(NautilusView *view, const char *config_path, CORBA_Environment *ev) +nv_save_state(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -99,7 +99,7 @@ nv_save_state(NautilusView *view, const char *config_path, CORBA_Environment *ev } static void -nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev) +nv_load_state(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -109,7 +109,7 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev } static void -nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev) +nv_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -119,7 +119,7 @@ nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, } static void -nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev) +nv_notify_selection_change(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; @@ -130,7 +130,7 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, } static void -nv_stop_location_change(NautilusView *view, CORBA_Environment *ev) +nv_stop_location_change(NautilusViewFrame *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; diff --git a/src/ntl-view-private.h b/src/ntl-view-private.h index 8cc345dfd..e1c5a276b 100644 --- a/src/ntl-view-private.h +++ b/src/ntl-view-private.h @@ -35,38 +35,38 @@ typedef struct { POA_Nautilus_ViewFrame servant; gpointer bonobo_object; - NautilusView *view; + NautilusViewFrame *view; } impl_POA_Nautilus_ViewFrame; extern POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv; extern POA_Nautilus_ZoomableFrame__vepv impl_Nautilus_ZoomableFrame_vepv; -BonoboObject *impl_Nautilus_ViewFrame__create (NautilusView *view, - CORBA_Environment *ev); -BonoboObject *impl_Nautilus_ZoomableFrame__create (NautilusView *view, - CORBA_Environment *ev); -void nautilus_view_request_location_change (NautilusView *view, - Nautilus_NavigationRequestInfo *loc); -void nautilus_view_request_selection_change (NautilusView *view, - Nautilus_SelectionRequestInfo *loc); -void nautilus_view_request_status_change (NautilusView *view, - Nautilus_StatusRequestInfo *loc); -void nautilus_view_request_progress_change (NautilusView *view, - Nautilus_ProgressRequestInfo *loc); -void nautilus_view_notify_zoom_level (NautilusView *view, - double level); +BonoboObject *impl_Nautilus_ViewFrame__create (NautilusViewFrame *view, + CORBA_Environment *ev); +BonoboObject *impl_Nautilus_ZoomableFrame__create (NautilusViewFrame *view, + CORBA_Environment *ev); +void nautilus_view_frame_request_location_change (NautilusViewFrame *view, + Nautilus_NavigationRequestInfo *loc); +void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, + Nautilus_SelectionRequestInfo *loc); +void nautilus_view_frame_request_status_change (NautilusViewFrame *view, + Nautilus_StatusRequestInfo *loc); +void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, + Nautilus_ProgressRequestInfo *loc); +void nautilus_view_frame_notify_zoom_level (NautilusViewFrame *view, + double level); struct NautilusViewComponentType { const char *primary_repoid; - gboolean (* try_load)(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev); - void (* destroy) (NautilusView *view, CORBA_Environment *ev); - void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev); - void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev); - void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev); - void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev); - void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev); - void (* show_properties)(NautilusView *view, CORBA_Environment *ev); + gboolean (* try_load)(NautilusViewFrame *view, CORBA_Object obj, CORBA_Environment *ev); + void (* destroy) (NautilusViewFrame *view, CORBA_Environment *ev); + void (* save_state)(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev); + void (* load_state)(NautilusViewFrame *view, const char *config_path, CORBA_Environment *ev); + void (* notify_location_change)(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev); + void (* stop_location_change)(NautilusViewFrame *view, CORBA_Environment *ev); + void (* notify_selection_change)(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev); + void (* show_properties)(NautilusViewFrame *view, CORBA_Environment *ev); }; #endif /* NTL_VIEW_PRIVATE_H */ diff --git a/src/ntl-view.c b/src/ntl-view.c index f090e2f5b..a56755ca0 100644 --- a/src/ntl-view.c +++ b/src/ntl-view.c @@ -50,40 +50,35 @@ enum { ARG_MAIN_WINDOW }; - - - -static void nautilus_view_init (NautilusView *view); -static void nautilus_view_destroy (GtkObject *view); -static void nautilus_view_constructed(NautilusView *view); -static void nautilus_view_class_init (NautilusViewClass *klass); -static void nautilus_view_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void nautilus_view_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -static guint nautilus_view_signals[LAST_SIGNAL]; - +static void nautilus_view_frame_init (NautilusViewFrame *view); +static void nautilus_view_frame_destroy (GtkObject *view); +static void nautilus_view_frame_constructed (NautilusViewFrame *view); +static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass); +static void nautilus_view_frame_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_frame_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_frame_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void nautilus_view_frame_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + +static guint signals[LAST_SIGNAL]; GtkType -nautilus_view_get_type (void) +nautilus_view_frame_get_type (void) { static GtkType view_type = 0; if (!view_type) { const GtkTypeInfo view_info = { - "NautilusView", - sizeof (NautilusView), - sizeof (NautilusViewClass), - (GtkClassInitFunc) nautilus_view_class_init, - (GtkObjectInitFunc) nautilus_view_init, + "NautilusViewFrame", + sizeof (NautilusViewFrame), + sizeof (NautilusViewFrameClass), + (GtkClassInitFunc) nautilus_view_frame_class_init, + (GtkObjectInitFunc) nautilus_view_frame_init, /* reserved_1 */ NULL, /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, @@ -118,19 +113,19 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object, #endif static void -nautilus_view_class_init (NautilusViewClass *klass) +nautilus_view_frame_class_init (NautilusViewFrameClass *klass) { GtkObjectClass *object_class; GtkWidgetClass *widget_class; object_class = (GtkObjectClass*) klass; - object_class->destroy = nautilus_view_destroy; - object_class->set_arg = nautilus_view_set_arg; - object_class->get_arg = nautilus_view_get_arg; + object_class->destroy = nautilus_view_frame_destroy; + object_class->set_arg = nautilus_view_frame_set_arg; + object_class->get_arg = nautilus_view_frame_get_arg; widget_class = (GtkWidgetClass*) klass; - widget_class->size_request = nautilus_view_size_request; - widget_class->size_allocate = nautilus_view_size_allocate; + widget_class->size_request = nautilus_view_frame_size_request; + widget_class->size_allocate = nautilus_view_frame_size_allocate; klass->servant_init_func = POA_Nautilus_ViewFrame__init; klass->servant_destroy_func = POA_Nautilus_ViewFrame__fini; @@ -145,49 +140,49 @@ nautilus_view_class_init (NautilusViewClass *klass) /* klass->request_selection_change = NULL; */ /* klass->request_status_change = NULL; */ /* klass->request_progress_change = NULL; */ - klass->view_constructed = nautilus_view_constructed; + klass->view_constructed = nautilus_view_frame_constructed; - nautilus_view_signals[REQUEST_LOCATION_CHANGE] = gtk_signal_new("request_location_change", + signals[REQUEST_LOCATION_CHANGE] = gtk_signal_new("request_location_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_location_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_SELECTION_CHANGE] = gtk_signal_new("request_selection_change", + signals[REQUEST_SELECTION_CHANGE] = gtk_signal_new("request_selection_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_selection_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_STATUS_CHANGE] = gtk_signal_new("request_status_change", + signals[REQUEST_STATUS_CHANGE] = gtk_signal_new("request_status_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_status_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[REQUEST_PROGRESS_CHANGE] = gtk_signal_new("request_progress_change", + signals[REQUEST_PROGRESS_CHANGE] = gtk_signal_new("request_progress_change", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, request_progress_change), gtk_marshal_NONE__BOXED, GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_signals[NOTIFY_ZOOM_LEVEL] = gtk_signal_new("notify_zoom_level", + signals[NOTIFY_ZOOM_LEVEL] = gtk_signal_new("notify_zoom_level", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewClass, + GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_zoom_level), nautilus_gtk_marshal_NONE__DOUBLE, GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE); - gtk_object_class_add_signals (object_class, nautilus_view_signals, LAST_SIGNAL); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); - gtk_object_add_arg_type ("NautilusView::main_window", + gtk_object_add_arg_type ("NautilusViewFrame::main_window", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MAIN_WINDOW); @@ -195,41 +190,41 @@ nautilus_view_class_init (NautilusViewClass *klass) } static void -nautilus_view_set_arg (GtkObject *object, +nautilus_view_frame_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - NautilusView *view; + NautilusViewFrame *view; - view = NAUTILUS_VIEW(object); + view = NAUTILUS_VIEW_FRAME(object); switch(arg_id) { case ARG_MAIN_WINDOW: view->main_window = GTK_WIDGET(GTK_VALUE_OBJECT(*arg)); - nautilus_view_construct_arg_set(view); + nautilus_view_frame_construct_arg_set(view); break; } } static void -nautilus_view_get_arg (GtkObject *object, +nautilus_view_frame_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) { switch(arg_id) { case ARG_MAIN_WINDOW: - GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(NAUTILUS_VIEW(object)->main_window); + GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(NAUTILUS_VIEW_FRAME(object)->main_window); break; } } static void -nautilus_view_init (NautilusView *view) +nautilus_view_frame_init (NautilusViewFrame *view) { GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW); } static void -nautilus_view_destroy_client(NautilusView *view) +nautilus_view_frame_destroy_client(NautilusViewFrame *view) { CORBA_Environment ev; CORBA_exception_init(&ev); @@ -265,10 +260,10 @@ nautilus_view_destroy_client(NautilusView *view) } static void -nautilus_view_destroy(GtkObject *view) +nautilus_view_frame_destroy(GtkObject *view) { - NautilusViewClass *klass = NAUTILUS_VIEW_CLASS(view->klass); - NautilusView *nview = NAUTILUS_VIEW(view); + NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(view->klass); + NautilusViewFrame *nview = NAUTILUS_VIEW_FRAME(view); if(nview->timer_id) { @@ -276,24 +271,24 @@ nautilus_view_destroy(GtkObject *view) nview->timer_id = 0; } - nautilus_view_destroy_client(nview); + nautilus_view_frame_destroy_client(nview); if(GTK_OBJECT_CLASS(klass->parent_class)->destroy) GTK_OBJECT_CLASS(klass->parent_class)->destroy(view); } static void -nautilus_view_constructed(NautilusView *view) +nautilus_view_frame_constructed(NautilusViewFrame *view) { } void -nautilus_view_construct_arg_set(NautilusView *view) +nautilus_view_frame_construct_arg_set(NautilusViewFrame *view) { guint nca; - NautilusViewClass *klass; + NautilusViewFrameClass *klass; - klass = NAUTILUS_VIEW_CLASS(((GtkObject *)view)->klass); + klass = NAUTILUS_VIEW_FRAME_CLASS(((GtkObject *)view)->klass); nca = klass->num_construct_args; if(view->construct_arg_count >= nca) return; @@ -305,7 +300,7 @@ nautilus_view_construct_arg_set(NautilusView *view) } static void -nautilus_view_size_request (GtkWidget *widget, +nautilus_view_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkBin *bin; @@ -327,7 +322,7 @@ nautilus_view_size_request (GtkWidget *widget, } static void -nautilus_view_size_allocate (GtkWidget *widget, +nautilus_view_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkBin *bin; @@ -345,24 +340,24 @@ extern NautilusViewComponentType bonobo_subdoc_component_type; /* ntl-view-bonob extern NautilusViewComponentType bonobo_control_component_type; /* ntl-view-bonobo-control.c */ static gboolean -nautilus_view_handle_client_destroy(GtkWidget *widget, NautilusView *view) +nautilus_view_frame_handle_client_destroy(GtkWidget *widget, NautilusViewFrame *view) { gtk_object_destroy(GTK_OBJECT(view)); return TRUE; } static void -nautilus_view_handle_client_destroy_2(GtkObject *object, CORBA_Object cobject, CORBA_Environment *ev, NautilusView *view) +nautilus_view_frame_handle_client_destroy_2(GtkObject *object, CORBA_Object cobject, CORBA_Environment *ev, NautilusViewFrame *view) { /* ICK! */ - if(NAUTILUS_IS_META_VIEW(view)) + if(NAUTILUS_IS_META_VIEW_FRAME(view)) nautilus_window_remove_meta_view(NAUTILUS_WINDOW(view->main_window), view); - else if(NAUTILUS_IS_CONTENT_VIEW(view)) + else if(NAUTILUS_IS_CONTENT_VIEW_FRAME(view)) nautilus_window_set_content_view(NAUTILUS_WINDOW(view->main_window), NULL); } gboolean /* returns TRUE if successful */ -nautilus_view_load_client(NautilusView *view, const char *iid) +nautilus_view_frame_load_client(NautilusViewFrame *view, const char *iid) { CORBA_Object obj; CORBA_Object zoomable; @@ -376,14 +371,14 @@ nautilus_view_load_client(NautilusView *view, const char *iid) NULL }; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); if (iid == NULL) return FALSE; CORBA_exception_init(&ev); - nautilus_view_destroy_client(view); + nautilus_view_frame_destroy_client(view); view->client_object = bonobo_object_activate(iid, 0); if(!view->client_object) @@ -422,7 +417,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) if (!view->component_class) { /* Nothing matched */ - nautilus_view_destroy_client(view); + nautilus_view_frame_destroy_client(view); return FALSE; } @@ -430,13 +425,13 @@ nautilus_view_load_client(NautilusView *view, const char *iid) view->iid = g_strdup(iid); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "destroy", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy), view, GTK_OBJECT(view)); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "object_gone", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy_2), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy_2), view, GTK_OBJECT(view)); gtk_signal_connect_while_alive(GTK_OBJECT(view->client_object), "system_exception", - GTK_SIGNAL_FUNC(nautilus_view_handle_client_destroy_2), view, + GTK_SIGNAL_FUNC(nautilus_view_frame_handle_client_destroy_2), view, GTK_OBJECT(view)); gtk_container_add(GTK_CONTAINER(view), view->client_widget); gtk_widget_show(view->client_widget); @@ -446,13 +441,13 @@ nautilus_view_load_client(NautilusView *view, const char *iid) } void -nautilus_view_notify_location_change(NautilusView *view, +nautilus_view_frame_notify_location_change(NautilusViewFrame *view, Nautilus_NavigationInfo *nav_context) { Nautilus_NavigationInfo real_nav_ctx; CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); real_nav_ctx = *nav_context; @@ -472,12 +467,12 @@ nautilus_view_notify_location_change(NautilusView *view, } void -nautilus_view_notify_selection_change(NautilusView *view, +nautilus_view_frame_notify_selection_change(NautilusViewFrame *view, Nautilus_SelectionInfo *nav_context) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -489,11 +484,11 @@ nautilus_view_notify_selection_change(NautilusView *view, } void -nautilus_view_load_state(NautilusView *view, const char *config_path) +nautilus_view_frame_load_state(NautilusViewFrame *view, const char *config_path) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -505,11 +500,11 @@ nautilus_view_load_state(NautilusView *view, const char *config_path) } void -nautilus_view_save_state(NautilusView *view, const char *config_path) +nautilus_view_frame_save_state(NautilusViewFrame *view, const char *config_path) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -521,11 +516,11 @@ nautilus_view_save_state(NautilusView *view, const char *config_path) } void -nautilus_view_show_properties(NautilusView *view) +nautilus_view_frame_show_properties(NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -537,11 +532,11 @@ nautilus_view_show_properties(NautilusView *view) } void -nautilus_view_stop_location_change(NautilusView *view) +nautilus_view_frame_stop_location_change(NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); g_return_if_fail(view->component_class); CORBA_exception_init(&ev); @@ -554,12 +549,12 @@ nautilus_view_stop_location_change(NautilusView *view) gboolean -nautilus_view_is_zoomable (NautilusView *view) +nautilus_view_frame_is_zoomable (NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); CORBA_exception_init (&ev); @@ -571,12 +566,12 @@ nautilus_view_is_zoomable (NautilusView *view) } gdouble -nautilus_view_get_zoom_level (NautilusView *view) +nautilus_view_frame_get_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -592,12 +587,12 @@ nautilus_view_get_zoom_level (NautilusView *view) } void -nautilus_view_set_zoom_level (NautilusView *view, +nautilus_view_frame_set_zoom_level (NautilusViewFrame *view, gdouble zoom_level) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -611,12 +606,12 @@ nautilus_view_set_zoom_level (NautilusView *view, } gdouble -nautilus_view_get_min_zoom_level (NautilusView *view) +nautilus_view_frame_get_min_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -632,12 +627,12 @@ nautilus_view_get_min_zoom_level (NautilusView *view) } gdouble -nautilus_view_get_max_zoom_level (NautilusView *view) +nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *view) { CORBA_Environment ev; gdouble retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), 0); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), 0); CORBA_exception_init (&ev); @@ -653,12 +648,12 @@ nautilus_view_get_max_zoom_level (NautilusView *view) } gboolean -nautilus_view_get_is_continuous (NautilusView *view) +nautilus_view_frame_get_is_continuous (NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval; - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), FALSE); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE); CORBA_exception_init (&ev); @@ -675,11 +670,11 @@ nautilus_view_get_is_continuous (NautilusView *view) void -nautilus_view_zoom_in (NautilusView *view) +nautilus_view_frame_zoom_in (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -694,11 +689,11 @@ nautilus_view_zoom_in (NautilusView *view) void -nautilus_view_zoom_out (NautilusView *view) +nautilus_view_frame_zoom_out (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -713,11 +708,11 @@ nautilus_view_zoom_out (NautilusView *view) void -nautilus_view_zoom_to_fit (NautilusView *view) +nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view) { CORBA_Environment ev; - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); CORBA_exception_init (&ev); @@ -732,70 +727,70 @@ nautilus_view_zoom_to_fit (NautilusView *view) const char * -nautilus_view_get_iid(NautilusView *view) +nautilus_view_frame_get_iid(NautilusViewFrame *view) { - g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), NULL); return view->iid; } CORBA_Object -nautilus_view_get_client_objref(NautilusView *view) +nautilus_view_frame_get_client_objref(NautilusViewFrame *view) { - g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW_FRAME (view), NULL); return view?bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)):NULL; } CORBA_Object -nautilus_view_get_objref(NautilusView *view) +nautilus_view_frame_get_objref(NautilusViewFrame *view) { - g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW (view), NULL); + g_return_val_if_fail (view == NULL || NAUTILUS_IS_VIEW_FRAME (view), NULL); return view?bonobo_object_corba_objref(view->view_frame):NULL; } void -nautilus_view_request_location_change(NautilusView *view, - Nautilus_NavigationRequestInfo *loc) +nautilus_view_frame_request_location_change(NautilusViewFrame *view, + Nautilus_NavigationRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_LOCATION_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_LOCATION_CHANGE], loc); } void -nautilus_view_request_selection_change (NautilusView *view, - Nautilus_SelectionRequestInfo *loc) +nautilus_view_frame_request_selection_change (NautilusViewFrame *view, + Nautilus_SelectionRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_SELECTION_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_SELECTION_CHANGE], loc); } void -nautilus_view_request_status_change (NautilusView *view, - Nautilus_StatusRequestInfo *loc) +nautilus_view_frame_request_status_change (NautilusViewFrame *view, + Nautilus_StatusRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_STATUS_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_STATUS_CHANGE], loc); } void -nautilus_view_request_progress_change(NautilusView *view, - Nautilus_ProgressRequestInfo *loc) +nautilus_view_frame_request_progress_change(NautilusViewFrame *view, + Nautilus_ProgressRequestInfo *loc) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit(GTK_OBJECT(view), nautilus_view_signals[REQUEST_PROGRESS_CHANGE], loc); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit(GTK_OBJECT(view), signals[REQUEST_PROGRESS_CHANGE], loc); } void -nautilus_view_notify_zoom_level (NautilusView *view, - gdouble level) +nautilus_view_frame_notify_zoom_level (NautilusViewFrame *view, + gdouble level) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); - gtk_signal_emit (GTK_OBJECT (view), nautilus_view_signals[NOTIFY_ZOOM_LEVEL], level); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); + gtk_signal_emit (GTK_OBJECT (view), signals[NOTIFY_ZOOM_LEVEL], level); } static gboolean -check_object(NautilusView *view) +check_object(NautilusViewFrame *view) { CORBA_Environment ev; gboolean retval = TRUE; @@ -819,9 +814,9 @@ check_object(NautilusView *view) } void -nautilus_view_set_active_errors(NautilusView *view, gboolean enabled) +nautilus_view_frame_set_active_errors(NautilusViewFrame *view, gboolean enabled) { - g_return_if_fail (NAUTILUS_IS_VIEW (view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); if(enabled) { if(!view->timer_id) diff --git a/src/ntl-view.h b/src/ntl-view.h index 9c6eef774..2be706f6a 100644 --- a/src/ntl-view.h +++ b/src/ntl-view.h @@ -25,11 +25,11 @@ */ /* ntl-view.h: Interface of the object representing a data - view. NautilusContentView and NautilusMetaView derive from this - class. */ + view. NautilusContentViewFrame and NautilusMetaViewFrame derive from + this class. */ -#ifndef NAUTILUS_VIEW_H -#define NAUTILUS_VIEW_H +#ifndef NTL_VIEW_H +#define NTL_VIEW_H #include <gtk/gtkwidget.h> #include <gtk/gtkbin.h> @@ -40,34 +40,36 @@ extern "C" { #endif /* __cplusplus */ -#define NAUTILUS_TYPE_VIEW (nautilus_view_get_type ()) -#define NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView)) -#define NAUTILUS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass)) -#define NAUTILUS_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW)) -#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW)) +#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ()) +#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame)) +#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass)) +#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) +#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME)) -typedef struct NautilusView NautilusView; -typedef struct NautilusViewClass NautilusViewClass; +typedef struct NautilusViewFrame NautilusViewFrame; +typedef struct NautilusViewFrameClass NautilusViewFrameClass; -struct NautilusViewClass { +struct NautilusViewFrameClass { GtkBinClass parent_spot; - /* These signals correspond to the Natuilus:ViewFrame CORBA interface. They - are requests that the underlying view may make of the framework. */ - - void (*request_location_change) (NautilusView *view, + /* These signals correspond to the Nautilus::ViewFrame CORBA interface. They + * are requests that the underlying view may make of the shell via the frame. + */ + void (*request_location_change) (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *navinfo); - void (*request_selection_change) (NautilusView *view, + void (*request_selection_change) (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *selinfo); - void (*request_status_change) (NautilusView *view, + void (*request_status_change) (NautilusViewFrame *view, Nautilus_StatusRequestInfo *loc); - void (*request_progress_change) (NautilusView *view, + void (*request_progress_change) (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *loc); - void (*notify_zoom_level) (NautilusView *view, + + /* Part of Nautilus::ZoomableFrame CORBA interface. */ + void (*notify_zoom_level) (NautilusViewFrame *view, gdouble zoom_level); /* Not a signal. Work-around for Gtk+'s lack of a 'constructed' operation */ - void (*view_constructed) (NautilusView *view); + void (*view_constructed) (NautilusViewFrame *view); GtkBinClass *parent_class; guint num_construct_args; @@ -78,7 +80,7 @@ struct NautilusViewClass { typedef struct NautilusViewComponentType NautilusViewComponentType; -struct NautilusView { +struct NautilusViewFrame { GtkBin parent; GtkWidget *main_window; @@ -101,43 +103,43 @@ struct NautilusView { guint checking; }; -GtkType nautilus_view_get_type (void); -gboolean nautilus_view_load_client (NautilusView *view, - const char *iid); -const char * nautilus_view_get_iid (NautilusView *view); -CORBA_Object nautilus_view_get_client_objref (NautilusView *view); -BonoboObject *nautilus_view_get_control_frame (NautilusView *view); -CORBA_Object nautilus_view_get_objref (NautilusView *view); +GtkType nautilus_view_frame_get_type (void); +gboolean nautilus_view_frame_load_client (NautilusViewFrame *view, + const char *iid); +const char * nautilus_view_frame_get_iid (NautilusViewFrame *view); +CORBA_Object nautilus_view_frame_get_client_objref (NautilusViewFrame *view); +BonoboObject *nautilus_view_frame_get_control_frame (NautilusViewFrame *view); +CORBA_Object nautilus_view_frame_get_objref (NautilusViewFrame *view); -/* These functions correspond to methods of the Nautilus:View CORBAinterface */ -void nautilus_view_notify_location_change (NautilusView *view, - Nautilus_NavigationInfo *nav_context); -void nautilus_view_notify_selection_change (NautilusView *view, - Nautilus_SelectionInfo *sel_context); -void nautilus_view_load_state (NautilusView *view, - const char *config_path); -void nautilus_view_save_state (NautilusView *view, - const char *config_path); -void nautilus_view_show_properties (NautilusView *view); -void nautilus_view_stop_location_change (NautilusView *view); -void nautilus_view_set_active_errors (NautilusView *view, - gboolean enabled); -gboolean nautilus_view_is_zoomable (NautilusView *view); -gdouble nautilus_view_get_zoom_level (NautilusView *view); -void nautilus_view_set_zoom_level (NautilusView *view, - gdouble zoom_level); -gdouble nautilus_view_get_min_zoom_level (NautilusView *view); -gdouble nautilus_view_get_max_zoom_level (NautilusView *view); -gboolean nautilus_view_get_is_continuous (NautilusView *view); -void nautilus_view_zoom_in (NautilusView *view); -void nautilus_view_zoom_out (NautilusView *view); -void nautilus_view_zoom_to_fit (NautilusView *view); +/* These functions correspond to methods of the Nautilus:View CORBAinterface. */ +void nautilus_view_frame_notify_location_change (NautilusViewFrame *view, + Nautilus_NavigationInfo *nav_context); +void nautilus_view_frame_notify_selection_change (NautilusViewFrame *view, + Nautilus_SelectionInfo *sel_context); +void nautilus_view_frame_load_state (NautilusViewFrame *view, + const char *config_path); +void nautilus_view_frame_save_state (NautilusViewFrame *view, + const char *config_path); +void nautilus_view_frame_show_properties (NautilusViewFrame *view); +void nautilus_view_frame_stop_location_change (NautilusViewFrame *view); +void nautilus_view_frame_set_active_errors (NautilusViewFrame *view, + gboolean enabled); +gboolean nautilus_view_frame_is_zoomable (NautilusViewFrame *view); +gdouble nautilus_view_frame_get_zoom_level (NautilusViewFrame *view); +void nautilus_view_frame_set_zoom_level (NautilusViewFrame *view, + gdouble zoom_level); +gdouble nautilus_view_frame_get_min_zoom_level (NautilusViewFrame *view); +gdouble nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *view); +gboolean nautilus_view_frame_get_is_continuous (NautilusViewFrame *view); +void nautilus_view_frame_zoom_in (NautilusViewFrame *view); +void nautilus_view_frame_zoom_out (NautilusViewFrame *view); +void nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view); /* This is a "protected" operation */ -void nautilus_view_construct_arg_set (NautilusView *view); +void nautilus_view_frame_construct_arg_set (NautilusViewFrame *view); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* NAUTILUS_VIEW_H */ +#endif /* NTL_VIEW_H */ diff --git a/src/ntl-window-msgs.c b/src/ntl-window-msgs.c index 0ac252cf1..294574c18 100644 --- a/src/ntl-window-msgs.c +++ b/src/ntl-window-msgs.c @@ -61,9 +61,9 @@ #endif static void nautilus_window_notify_selection_change (NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_SelectionInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); typedef enum { PROGRESS_INITIAL, PROGRESS_VIEWS, PROGRESS_DONE, PROGRESS_ERROR } ProgressType; @@ -105,18 +105,18 @@ Nautilus_SelectionInfo__copy(Nautilus_SelectionInfo *dest_si, Nautilus_Selection static void nautilus_window_notify_selection_change(NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_SelectionInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { loc->self_originated = (view == requesting_view); - nautilus_view_notify_selection_change(view, loc); + nautilus_view_frame_notify_selection_change(view, loc); } void nautilus_window_request_selection_change(NautilusWindow *window, Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { GList *p; Nautilus_SelectionInfo selinfo; @@ -125,7 +125,7 @@ nautilus_window_request_selection_change(NautilusWindow *window, CORBA_exception_init (&environment); selinfo.selected_uris = loc->selected_uris; selinfo.content_view = CORBA_Object_duplicate - (nautilus_view_get_objref (NAUTILUS_VIEW (window->content_view)), + (nautilus_view_frame_get_objref (NAUTILUS_VIEW_FRAME (window->content_view)), &environment); CORBA_exception_free (&environment); @@ -144,7 +144,7 @@ nautilus_window_request_selection_change(NautilusWindow *window, void nautilus_window_request_status_change(NautilusWindow *window, Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { nautilus_window_set_status(window, loc->status_string); } @@ -156,7 +156,7 @@ nautilus_window_request_status_change(NautilusWindow *window, void nautilus_window_request_progress_change(NautilusWindow *window, Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { NautilusWindowStateItem item; @@ -233,7 +233,7 @@ nautilus_window_get_current_location_title (NautilusWindow *window) /* * nautilus_window_update_title_internal: * - * Update the non-NautilusView objects that use the location's user-displayable + * Update the non-NautilusViewFrame objects that use the location's user-displayable * title in some way. Called when the location or title has changed. * @window: The NautilusWindow in question. * @title: The new user-displayable title. @@ -262,7 +262,7 @@ nautilus_window_update_title_internal (NautilusWindow *window, const char *title /* * nautilus_window_reset_title_internal: * - * Update the non-NautilusView objects that use the location's user-displayable + * Update the non-NautilusViewFrame objects that use the location's user-displayable * title in some way. Called when the location or title has changed. * @window: The NautilusWindow in question. * @title: The new user-displayable title. @@ -292,7 +292,7 @@ nautilus_window_reset_title_internal (NautilusWindow *window, const char *uri) void nautilus_window_request_title_change(NautilusWindow *window, const char *new_title, - NautilusContentView *requesting_view) + NautilusContentViewFrame *requesting_view) { g_return_if_fail (new_title != NULL); @@ -444,7 +444,7 @@ nautilus_window_update_internals (NautilusWindow *window, NautilusNavigationInfo /* Notify the index panel of the location change. */ /* FIXME bugzilla.eazel.com 211: * Eventually, this will not be necessary when we restructure the - * index panel to be a NautilusView. + * index panel to be a NautilusViewFrame. */ current_title = nautilus_window_get_current_location_title (window); nautilus_index_panel_set_uri (window->index_panel, window->ni->requested_uri, current_title); @@ -453,11 +453,11 @@ nautilus_window_update_internals (NautilusWindow *window, NautilusNavigationInfo static void nautilus_window_update_view (NautilusWindow *window, - NautilusView *view, + NautilusViewFrame *view, Nautilus_NavigationInfo *navi, Nautilus_SelectionInfo *seli, - NautilusView *requesting_view, - NautilusView *content_view) + NautilusViewFrame *requesting_view, + NautilusViewFrame *content_view) { CORBA_Environment environment; @@ -465,13 +465,13 @@ nautilus_window_update_view (NautilusWindow *window, navi->self_originated = (view == requesting_view); - nautilus_view_notify_location_change (view, navi); + nautilus_view_frame_notify_location_change (view, navi); if(seli) { CORBA_exception_init(&environment); CORBA_Object_release(seli->content_view, &environment); seli->content_view = CORBA_Object_duplicate - (nautilus_view_get_client_objref(content_view), + (nautilus_view_frame_get_client_objref(content_view), &environment); CORBA_exception_free(&environment); @@ -480,7 +480,7 @@ nautilus_window_update_view (NautilusWindow *window, } void -nautilus_window_view_destroyed (NautilusView *view, NautilusWindow *window) +nautilus_window_view_destroyed (NautilusViewFrame *view, NautilusWindow *window) { NautilusWindowStateItem item = VIEW_ERROR; nautilus_window_set_state_info (window, item, view, (NautilusWindowStateItem) 0); @@ -569,26 +569,26 @@ nautilus_window_free_load_info (NautilusWindow *window) } /* Meta view handling */ -static NautilusView * +static NautilusViewFrame * nautilus_window_load_meta_view(NautilusWindow *window, const char *iid, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { - NautilusView *meta_view; + NautilusViewFrame *meta_view; GList *p; meta_view = NULL; for (p = window->meta_views; p != NULL; p = p->next) { - meta_view = NAUTILUS_VIEW (p->data); - if (!strcmp (nautilus_view_get_iid (meta_view), iid)) + meta_view = NAUTILUS_VIEW_FRAME (p->data); + if (!strcmp (nautilus_view_frame_get_iid (meta_view), iid)) break; } if (p == NULL) { - meta_view = NAUTILUS_VIEW (gtk_widget_new (nautilus_meta_view_get_type(), + meta_view = NAUTILUS_VIEW_FRAME (gtk_widget_new (nautilus_meta_view_frame_get_type(), "main_window", window, NULL)); nautilus_window_connect_view (window, meta_view); - if (!nautilus_view_load_client (meta_view, iid)) { + if (!nautilus_view_frame_load_client (meta_view, iid)) { gtk_widget_unref (GTK_WIDGET (meta_view)); meta_view = NULL; } @@ -596,7 +596,7 @@ nautilus_window_load_meta_view(NautilusWindow *window, if (meta_view != NULL) { gtk_object_ref (GTK_OBJECT (meta_view)); - nautilus_view_set_active_errors (meta_view, TRUE); + nautilus_view_frame_set_active_errors (meta_view, TRUE); } return meta_view; @@ -636,7 +636,7 @@ handle_unreadable_location (NautilusWindow *window, const char *uri) { void nautilus_window_request_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view) + NautilusViewFrame *requesting_view) { NautilusWindow *new_window; @@ -656,21 +656,21 @@ nautilus_window_request_location_change (NautilusWindow *window, } } -NautilusView * +NautilusViewFrame * nautilus_window_load_content_view(NautilusWindow *window, const char *iid, Nautilus_NavigationInfo *navinfo, - NautilusView **requesting_view) + NautilusViewFrame **requesting_view) { - NautilusView *content_view = window->content_view; - NautilusView *new_view; + NautilusViewFrame *content_view = window->content_view; + NautilusViewFrame *new_view; CORBA_Environment environment; g_return_val_if_fail(iid, NULL); g_return_val_if_fail(navinfo, NULL); - if (!NAUTILUS_IS_VIEW (content_view) - || strcmp (nautilus_view_get_iid (content_view), iid) != 0) { + if (!NAUTILUS_IS_VIEW_FRAME (content_view) + || strcmp (nautilus_view_frame_get_iid (content_view), iid) != 0) { if (requesting_view != NULL && *requesting_view == window->content_view) { /* If we are going to be zapping the old view, @@ -680,12 +680,12 @@ nautilus_window_load_content_view(NautilusWindow *window, *requesting_view = NULL; } - new_view = NAUTILUS_VIEW (gtk_widget_new (nautilus_content_view_get_type(), + new_view = NAUTILUS_VIEW_FRAME (gtk_widget_new (nautilus_content_view_frame_get_type(), "main_window", window, NULL)); - nautilus_window_connect_content_view (window, NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_window_connect_content_view (window, NAUTILUS_CONTENT_VIEW_FRAME (new_view)); - if (!nautilus_view_load_client (new_view, iid)) { + if (!nautilus_view_frame_load_client (new_view, iid)) { gtk_widget_unref(GTK_WIDGET(new_view)); new_view = NULL; } @@ -698,7 +698,7 @@ nautilus_window_load_content_view(NautilusWindow *window, new_view = window->content_view; } - if (!NAUTILUS_IS_VIEW (new_view)) { + if (!NAUTILUS_IS_VIEW_FRAME (new_view)) { new_view = NULL; } else { gtk_object_ref (GTK_OBJECT (new_view)); @@ -706,11 +706,11 @@ nautilus_window_load_content_view(NautilusWindow *window, CORBA_exception_init(&environment); CORBA_Object_release(navinfo->content_view, &environment); navinfo->content_view = CORBA_Object_duplicate - (nautilus_view_get_client_objref (new_view), + (nautilus_view_frame_get_client_objref (new_view), &environment); CORBA_exception_free(&environment); - nautilus_view_set_active_errors (new_view, TRUE); + nautilus_view_frame_set_active_errors (new_view, TRUE); } return new_view; @@ -748,9 +748,9 @@ nautilus_window_update_state (gpointer data) /* Now make any needed state changes based on available information */ if (window->view_bombed_out && window->error_views != NULL) { for (p = window->error_views; p != NULL; p = p->next) { - NautilusView *error_view = p->data; + NautilusViewFrame *error_view = p->data; - if (NAUTILUS_IS_CONTENT_VIEW(error_view)) { + if (NAUTILUS_IS_CONTENT_VIEW_FRAME(error_view)) { if (error_view == window->new_content_view) { window->made_changes++; window->reset_to_idle = TRUE; @@ -766,7 +766,7 @@ nautilus_window_update_state (gpointer data) } window->cv_progress_error = TRUE; } - else if (NAUTILUS_IS_META_VIEW(error_view)) + else if (NAUTILUS_IS_META_VIEW_FRAME(error_view)) { if (g_list_find (window->new_meta_views, error_view) != NULL) { window->new_meta_views = g_list_remove (window->new_meta_views, error_view); @@ -843,7 +843,7 @@ nautilus_window_update_state (gpointer data) &window->new_requesting_view); for (p = window->pending_ni->sidebar_panel_identifiers; p != NULL; p = p->next) { - NautilusView *meta_view; + NautilusViewFrame *meta_view; NautilusViewIdentifier *identifier; identifier = (NautilusViewIdentifier *) (p->data); @@ -852,7 +852,7 @@ nautilus_window_update_state (gpointer data) (window, identifier->iid, window->new_requesting_view); if (meta_view != NULL) { - nautilus_meta_view_set_label (NAUTILUS_META_VIEW (meta_view), + nautilus_meta_view_frame_set_label (NAUTILUS_META_VIEW_FRAME (meta_view), identifier->name); window->new_meta_views = g_list_prepend (window->new_meta_views, meta_view); } @@ -944,7 +944,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) { va_list args; NautilusWindowStateItem item_type; - NautilusView *new_view; + NautilusViewFrame *new_view; gboolean do_sync; /* Ensure that changes happen in-order */ @@ -971,7 +971,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) break; case VIEW_ERROR: - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); x_message (("VIEW_ERROR on %p", new_view)); window->view_bombed_out = TRUE; gtk_object_ref (GTK_OBJECT (new_view)); @@ -981,7 +981,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) case NEW_CONTENT_VIEW_ACTIVATED: x_message (("NEW_CONTENT_VIEW_ACTIVATED")); g_return_if_fail (window->new_content_view == NULL); - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); /* Don't ref here, reference is held by widget hierarchy. */ window->new_content_view = new_view; if (window->pending_ni == NULL) { @@ -993,7 +993,7 @@ nautilus_window_set_state_info (NautilusWindow *window, ...) case NEW_META_VIEW_ACTIVATED: x_message (("NEW_META_VIEW_ACTIVATED")); - new_view = va_arg (args, NautilusView*); + new_view = va_arg (args, NautilusViewFrame*); /* Don't ref here, reference is held by widget hierarchy. */ window->new_meta_views = g_list_prepend (window->new_meta_views, new_view); window->changes_pending = TRUE; @@ -1166,7 +1166,7 @@ nautilus_window_end_location_change_callback (NautilusNavigationResult result_co void nautilus_window_begin_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view, + NautilusViewFrame *requesting_view, NautilusLocationChangeType type, guint distance) { @@ -1197,7 +1197,7 @@ nautilus_window_begin_location_change (NautilusWindow *window, current_iid = NULL; if (window->content_view != NULL) { - current_iid = nautilus_view_get_iid (window->content_view); + current_iid = nautilus_view_frame_get_iid (window->content_view); } window->cancel_tag = nautilus_navigation_info_new diff --git a/src/ntl-window-msgs.h b/src/ntl-window-msgs.h index 276a88f47..99ffe5c5e 100644 --- a/src/ntl-window-msgs.h +++ b/src/ntl-window-msgs.h @@ -25,25 +25,25 @@ */ #ifndef NTL_WINDOW_MSGS_H -#define NTL_WINDOW_MSGS_H 1 +#define NTL_WINDOW_MSGS_H #include "ntl-window.h" #include "ntl-content-view.h" -void nautilus_window_request_location_change(NautilusWindow *window, - Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_selection_change(NautilusWindow *window, - Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_status_change(NautilusWindow *window, - Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_progress_change(NautilusWindow *window, - Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view); -void nautilus_window_request_title_change(NautilusWindow *window, - const char *new_title, - NautilusContentView *requesting_view); +void nautilus_window_request_location_change (NautilusWindow *window, + Nautilus_NavigationRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_selection_change (NautilusWindow *window, + Nautilus_SelectionRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_status_change (NautilusWindow *window, + Nautilus_StatusRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_progress_change (NautilusWindow *window, + Nautilus_ProgressRequestInfo *loc, + NautilusViewFrame *requesting_view); +void nautilus_window_request_title_change (NautilusWindow *window, + const char *new_title, + NautilusContentViewFrame *requesting_view); -#endif +#endif /* NTL_WINDOW_MSGS_H */ diff --git a/src/ntl-window-private.h b/src/ntl-window-private.h index 4882c5f00..48ae6f97a 100644 --- a/src/ntl-window-private.h +++ b/src/ntl-window-private.h @@ -1,5 +1,5 @@ #ifndef NTL_WINDOW_PRIVATE_H -#define NTL_WINDOW_PRIVATE_H 1 +#define NTL_WINDOW_PRIVATE_H #include "ntl-window.h" #include "ntl-content-view.h" @@ -23,37 +23,37 @@ void nautilus_window_set_state_info(NautilusWindow *window, ... /* things to set void nautilus_window_real_request_selection_change(NautilusWindow *window, Nautilus_SelectionRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_status_change(NautilusWindow *window, Nautilus_StatusRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_location_change (NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_real_request_progress_change (NautilusWindow *window, Nautilus_ProgressRequestInfo *loc, - NautilusView *requesting_view); + NautilusViewFrame *requesting_view); void nautilus_window_set_status(NautilusWindow *window, const char *txt); void nautilus_window_back_or_forward (NautilusWindow *window, gboolean back, guint distance); void nautilus_window_begin_location_change(NautilusWindow *window, Nautilus_NavigationRequestInfo *loc, - NautilusView *requesting_view, + NautilusViewFrame *requesting_view, NautilusLocationChangeType type, guint distance); -void nautilus_window_remove_meta_view_real(NautilusWindow *window, NautilusView *meta_view); +void nautilus_window_remove_meta_view_real(NautilusWindow *window, NautilusViewFrame *meta_view); void nautilus_window_load_content_view_menu (NautilusWindow *window, NautilusNavigationInfo *ni); -NautilusView *nautilus_window_load_content_view(NautilusWindow *window, +NautilusViewFrame *nautilus_window_load_content_view(NautilusWindow *window, const char *iid, Nautilus_NavigationInfo *navinfo, - NautilusView **requesting_view); + NautilusViewFrame **requesting_view); void nautilus_window_connect_content_view (NautilusWindow *window, - NautilusContentView *view); + NautilusContentViewFrame *view); void nautilus_window_connect_view (NautilusWindow *window, - NautilusView *view); -void nautilus_window_view_destroyed(NautilusView *view, NautilusWindow *window); + NautilusViewFrame *view); +void nautilus_window_view_destroyed(NautilusViewFrame *view, NautilusWindow *window); void nautilus_send_history_list_changed (void); void nautilus_add_to_history_list (NautilusBookmark *bookmark); diff --git a/src/ntl-window.c b/src/ntl-window.c index 0e553e634..b23bcd149 100644 --- a/src/ntl-window.c +++ b/src/ntl-window.c @@ -59,7 +59,7 @@ enum }; static void nautilus_window_realize (GtkWidget *widget); -static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view); +static void nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view); /* Object framework static variables */ static GnomeAppClass *parent_class = NULL; @@ -343,7 +343,7 @@ zoom_in_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_in (window->content_view); + nautilus_view_frame_zoom_in (window->content_view); } } @@ -352,7 +352,7 @@ zoom_out_cb (NautilusZoomControl *zoom_control, NautilusWindow *window) { if (window->content_view != NULL) { - nautilus_view_zoom_out (window->content_view); + nautilus_view_frame_zoom_out (window->content_view); } } @@ -491,7 +491,7 @@ nautilus_window_set_arg (GtkObject *object, window->app = BONOBO_OBJECT(GTK_VALUE_OBJECT(*arg)); break; case ARG_CONTENT_VIEW: - nautilus_window_real_set_content_view (window, (NautilusView *)GTK_VALUE_OBJECT(*arg)); + nautilus_window_real_set_content_view (window, (NautilusViewFrame *)GTK_VALUE_OBJECT(*arg)); break; } } @@ -654,7 +654,7 @@ nautilus_window_realize (GtkWidget *widget) #if 0 static gboolean -nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusView *meta_view) +nautilus_window_send_show_properties(GtkWidget *dockitem, GdkEventButton *event, NautilusViewFrame *meta_view) { if(event->button != 3) return FALSE; @@ -671,7 +671,7 @@ static void view_menu_switch_views_callback (GtkWidget *widget, gpointer data) { NautilusWindow *window; - NautilusView *view; + NautilusViewFrame *view; NautilusDirectory *directory; char *iid; @@ -768,29 +768,29 @@ nautilus_window_load_content_view_menu (NautilusWindow *window, } void -nautilus_window_set_content_view (NautilusWindow *window, NautilusView *content_view) +nautilus_window_set_content_view (NautilusWindow *window, NautilusViewFrame *content_view) { nautilus_window_real_set_content_view (window, content_view); } void -nautilus_window_add_meta_view(NautilusWindow *window, NautilusView *meta_view) +nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW (meta_view)); + g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); } void -nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view_real (NautilusWindow *window, NautilusViewFrame *meta_view) { nautilus_index_panel_remove_meta_view(window->index_panel, meta_view); } void -nautilus_window_remove_meta_view (NautilusWindow *window, NautilusView *meta_view) +nautilus_window_remove_meta_view (NautilusWindow *window, NautilusViewFrame *meta_view) { if (!g_list_find(window->meta_views, meta_view)) return; @@ -953,7 +953,7 @@ nautilus_get_history_list () static void -nautilus_window_request_location_change_cb (NautilusView *view, +nautilus_window_request_location_change_cb (NautilusViewFrame *view, Nautilus_NavigationRequestInfo *info, NautilusWindow *window) { @@ -962,7 +962,7 @@ nautilus_window_request_location_change_cb (NautilusView *view, static void -nautilus_window_request_selection_change_cb (NautilusView *view, +nautilus_window_request_selection_change_cb (NautilusViewFrame *view, Nautilus_SelectionRequestInfo *info, NautilusWindow *window) { @@ -970,7 +970,7 @@ nautilus_window_request_selection_change_cb (NautilusView *view, } static void -nautilus_window_request_status_change_cb (NautilusView *view, +nautilus_window_request_status_change_cb (NautilusViewFrame *view, Nautilus_StatusRequestInfo *info, NautilusWindow *window) { @@ -978,7 +978,7 @@ nautilus_window_request_status_change_cb (NautilusView *view, } static void -nautilus_window_request_progress_change_cb (NautilusView *view, +nautilus_window_request_progress_change_cb (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *info, NautilusWindow *window) { @@ -986,7 +986,7 @@ nautilus_window_request_progress_change_cb (NautilusView *view, } static void -nautilus_window_request_title_change_callback (NautilusContentView *view, +nautilus_window_request_title_change_callback (NautilusContentViewFrame *view, const char *new_title, NautilusWindow *window) { @@ -994,7 +994,7 @@ nautilus_window_request_title_change_callback (NautilusContentView *view, } void -nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) +nautilus_window_connect_view(NautilusWindow *window, NautilusViewFrame *view) { GtkObject *view_object; @@ -1022,14 +1022,14 @@ nautilus_window_connect_view(NautilusWindow *window, NautilusView *view) } void -nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentView *view) +nautilus_window_connect_content_view(NautilusWindow *window, NautilusContentViewFrame *view) { GtkObject *view_object; - /* First connect with NautilusView signals. */ - nautilus_window_connect_view (window, NAUTILUS_VIEW (view)); + /* First connect with NautilusViewFrame signals. */ + nautilus_window_connect_view (window, NAUTILUS_VIEW_FRAME (view)); - /* Now connect with NautilusContentView signals. */ + /* Now connect with NautilusContentViewFrame signals. */ view_object = GTK_OBJECT(view); gtk_signal_connect(view_object, "request_title_change", @@ -1051,10 +1051,10 @@ nautilus_window_display_error(NautilusWindow *window, const char *error_msg) } static void -nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new_view) +nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame *new_view) { g_return_if_fail (NAUTILUS_IS_WINDOW (window)); - g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW (new_view)); + g_return_if_fail (new_view == NULL || NAUTILUS_IS_VIEW_FRAME (new_view)); if (new_view == window->content_view) { @@ -1072,7 +1072,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_show (GTK_WIDGET (new_view)); - nautilus_content_view_set_active (NAUTILUS_CONTENT_VIEW (new_view)); + nautilus_content_view_frame_set_active (NAUTILUS_CONTENT_VIEW_FRAME (new_view)); gtk_paned_pack2(GTK_PANED(window->content_hbox), GTK_WIDGET (new_view), TRUE, FALSE); } diff --git a/src/ntl-window.h b/src/ntl-window.h index c002e05ed..a79f408b1 100644 --- a/src/ntl-window.h +++ b/src/ntl-window.h @@ -89,7 +89,7 @@ struct _NautilusWindow { NautilusBookmark *last_location_bookmark; /* Current views stuff */ - NautilusView *content_view; + NautilusViewFrame *content_view; GList *meta_views; /* Widgets to keep track of (for state changes, etc) */ @@ -102,7 +102,7 @@ struct _NautilusWindow { /* Pending changes */ NautilusNavigationInfo *pending_ni; - NautilusView *new_content_view, *new_requesting_view; + NautilusViewFrame *new_content_view, *new_requesting_view; GList *new_meta_views; GList *error_views; @@ -126,30 +126,30 @@ struct _NautilusWindow { nautilus_boolean_bit reset_to_idle : 1; }; -GtkType nautilus_window_get_type (void); -void nautilus_window_close (NautilusWindow *window); -void nautilus_window_set_content_view (NautilusWindow *window, - NautilusView *content_view); -void nautilus_window_add_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_remove_meta_view (NautilusWindow *window, - NautilusView *meta_view); -void nautilus_window_goto_uri (NautilusWindow *window, - const char *uri); -void nautilus_window_display_error (NautilusWindow *window, - const char *error_msg); -const char * nautilus_window_get_requested_uri (NautilusWindow *window); -BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); -void nautilus_window_allow_back (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_forward (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_up (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_reload (NautilusWindow *window, - gboolean allow); -void nautilus_window_allow_stop (NautilusWindow *window, - gboolean allow); -void nautilus_bookmarks_exiting (void); +GtkType nautilus_window_get_type (void); +void nautilus_window_close (NautilusWindow *window); +void nautilus_window_set_content_view (NautilusWindow *window, + NautilusViewFrame *content_view); +void nautilus_window_add_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_remove_meta_view (NautilusWindow *window, + NautilusViewFrame *meta_view); +void nautilus_window_goto_uri (NautilusWindow *window, + const char *uri); +void nautilus_window_display_error (NautilusWindow *window, + const char *error_msg); +const char * nautilus_window_get_requested_uri (NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih (NautilusWindow *window); +void nautilus_window_allow_back (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_forward (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_up (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_reload (NautilusWindow *window, + gboolean allow); +void nautilus_window_allow_stop (NautilusWindow *window, + gboolean allow); +void nautilus_bookmarks_exiting (void); #endif |