diff options
Diffstat (limited to 'src')
49 files changed, 1214 insertions, 1154 deletions
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 |