summaryrefslogtreecommitdiff
path: root/src/nautilus-switchable-navigation-bar.h
Commit message (Collapse)AuthorAgeFilesLines
* Fixed the names of these files to match the menu items in shell-uiRebecca Schulman2000-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-10-13 Rebecca Schulman <rebecka@eazel.com> * libnautilus/nautilus-clipboard-ui.xml: Fixed the names of these files to match the menu items in shell-ui * libnautilus/nautilus-clipboard.h: * libnautilus/nautilus-clipboard.c: (add_menu_items_callback), (container_copy_free), (ui_component_remove_container_and_unref), (finish_setting_up_editable), (finish_setting_up_editable_from_bonobo_control_callback), (nautilus_clipboard_set_up_editable_from_bonobo_control), (nautilus_clipboard_set_up_editable_from_bonobo_ui_container): Added the from_ui_container function for local editable widgets to use, and changed the function sequence around so that the two clipboard set up functions share an api except for the initial calling functions * src/nautilus-window-private.h: * src/nautilus-window.c: (nautilus_window_constructed), (nautilus_window_show), (nautilus_window_get_bonobo_ui_container), (nautilus_window_get_bonobo_ui_component): added the new nautilus-window_get_bonobo_ui_component function for local editables to use, and changed the construction order so that menu items would get merged correctly (set up the main window menus before setting up the location bar) * src/nautilus-complex-search-bar.c: (nautilus_complex_search_bar_new): * src/nautilus-complex-search-bar.h: * src/nautilus-location-bar.c: (nautilus_location_bar_get_window), (nautilus_location_bar_initialize), (nautilus_location_bar_new), (nautilus_location_bar_set_location): * src/nautilus-location-bar.h: * src/nautilus-simple-search-bar.c: (nautilus_simple_search_bar_initialize), (nautilus_simple_search_bar_destroy), (nautilus_simple_search_bar_new): * src/nautilus-simple-search-bar.h: * src/nautilus-switchable-navigation-bar.c: (nautilus_switchable_navigation_bar_initialize), (nautilus_switchable_navigation_bar_destroy), (nautilus_switchable_navigation_bar_new): * src/nautilus-switchable-navigation-bar.h: * src/nautilus-switchable-search-bar.c: (nautilus_switchable_search_bar_initialize), (nautilus_switchable_search_bar_destroy), (nautilus_switchable_search_bar_new): * src/nautilus-switchable-search-bar.h: Changed the location bar and switchable search bar to take windows in the constructor funciton. These are used to get the local ui component when setting up the clipboard
* Fixed bug 2668 (Switching to Search mode should move theJohn Sullivan2000-09-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | focus to the search text field). * src/nautilus-navigation-bar.h: Added signal and public function for nautilus_navigation_bar_activate. * src/nautilus-navigation-bar.c: (nautilus_navigation_bar_initialize_class): Wire up activate signal; default function is NULL. (nautilus_navigation_bar_activate): New function, emits signal. * src/nautilus-switchable-navigation-bar.h: * src/nautilus-switchable-navigation-bar.c: Defined a NautilusSwitchableNavigationBarDetails struct, and moved implementation details into it. Set the types of the fields in this struct to reflect actual needs, instead of using GtkWidget and casting up to other classes. (nautilus_switchable_navigation_bar_initialize): Create details struct. (nautilus_switchable_navigation_bar_destroy): New function, free details struct. (nautilus_switchable_navigation_bar_initialize_class): Wire up destroy handler. (nautilus_switchable_navigation_bar_set_mode): Call nautilus_navigation_bar_activate on switched-to bar. (nautilus_switchable_navigation_bar_get_mode), (nautilus_switchable_navigation_bar_get_location), (nautilus_switchable_navigation_bar_set_location): Updated to use bar->details. * src/nautilus-switchable-search-bar.c: (nautilus_switchable_search_bar_initialize_class): Wire up activate signal to real_activate. (real_activate): Call nautilus_navigation_bar_activate on the current search bar. * src/nautilus-simple-search-bar.c: (nautilus_simple_search_bar_initialize_class): Wire up activate signal to real_activate. (real_activate): Set focus to text field. * src/nautilus-complex-search-bar.c: (nautilus_complex_search_bar_initialize_class): Wire up activate signal to real_activate. (get_first_text_field): New helper function to find the first text field in a search criterion (or NULL). (real_activate): Set focus to first text field.
* More work on bug 1653 (new menu layout)John Sullivan2000-08-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug 1995 (No way to enter/leave search mode from keyboard) Fixed bug 1999 (No way to reload from keyboard) * libnautilus/nautilus-bonobo-ui.h: Added more placeholders. * src/file-manager/fm-directory-view.c: (fm_directory_view_real_merge_menus): Position "Empty Trash" menu item and separator using placeholder. * src/file-manager/fm-icon-view.c: (compute_menu_item_info): Fixed bug where "Restore Icon's Original Size" was using the wrong plurality. (insert_bonobo_menu_item): Renamed this from append_ and gave it a position parameter. (fm_icon_view_merge_menus): Used placeholders to put the menu items in the order specified by bug 1653. * src/nautilus-switchable-navigation-bar.h: * src/nautilus-switchable-navigation-bar.c: (nautilus_switchable_navigation_bar_get_mode): New function; formerly there was a public setter but no public getter. * src/nautilus-window-menus.c: (file_menu_close_window_callback): Removed redundant assert. (file_menu_toggle_find_mode_callback): New function, toggles whether we're in search mode. (go_menu_reload_callback): New function, reloads. (nautilus_window_initialize_menus): Tweaked hint for "Close All Windows", added Find/Browse menu item; Changed "Up" to "Up a Level" to match bug 1653; added "Reload" to Go menu. (nautilus_window_update_find_menu_item): New function, sets the label of the Find/Browse menu item based on search mode's state. * src/nautilus-window-private.h: added #define for NAUTILUS_MENU_PATH_RELOAD_ITEM; added prototype for nautilus_window_update_find_menu_item. * src/nautilus-window-toolbars.c: Changed "Search" to "Find" to match menu item (and Arlo's design). * src/nautilus-window.h, * src/nautilus-window.c: (navigation_bar_mode_changed_callback): Update Find menu item. (nautilus_window_get_search_mode): New function; formerly there was a public setter but no public getter. (nautilus_window_allow_reload): Update menu item sensitivity.
* Made copyright headers consistent in style; also made sure to refer toMaciej Stachowiak2000-08-111-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/nautilus-applicable-views.c, src/nautilus-applicable-views.h, src/nautilus-application.c, src/nautilus-application.h, src/nautilus-bookmark-list.c, src/nautilus-bookmark-list.h, src/nautilus-bookmark-parsing.c, src/nautilus-bookmark-parsing.h, src/nautilus-bookmarks-window.c, src/nautilus-bookmarks-window.h, src/nautilus-complex-search-bar.c, src/nautilus-complex-search-bar.h, src/nautilus-desktop-window.c, src/nautilus-desktop-window.h, src/nautilus-first-time-druid.c, src/nautilus-first-time-druid.h, src/nautilus-history-frame.c, src/nautilus-history-frame.h, src/nautilus-link-set-window.c, src/nautilus-link-set-window.h, src/nautilus-location-bar.c, src/nautilus-location-bar.h, src/nautilus-main.c, src/nautilus-navigation-bar.c, src/nautilus-navigation-bar.h, src/nautilus-property-browser.c, src/nautilus-property-browser.h, src/nautilus-search-bar-private.h, src/nautilus-search-bar.c, src/nautilus-search-bar.h, src/nautilus-self-check-functions.c, src/nautilus-self-check-functions.h, src/nautilus-shell.c, src/nautilus-shell.h, src/nautilus-sidebar-tabs.c, src/nautilus-sidebar-tabs.h, src/nautilus-sidebar-title.c, src/nautilus-sidebar-title.h, src/nautilus-sidebar.c, src/nautilus-sidebar.h, src/nautilus-signaller.c, src/nautilus-signaller.h, src/nautilus-simple-search-bar.c, src/nautilus-simple-search-bar.h, src/nautilus-switchable-navigation-bar.c, src/nautilus-switchable-navigation-bar.h, src/nautilus-switchable-search-bar.c, src/nautilus-switchable-search-bar.h, src/nautilus-toolbar.c, src/nautilus-toolbar.h, src/nautilus-view-frame-bonobo-control.c, src/nautilus-view-frame-bonobo-embeddable.c, src/nautilus-view-frame-corba.c, src/nautilus-view-frame-nautilus-view.c, src/nautilus-view-frame-private.h, src/nautilus-view-frame.c,src/nautilus-view-frame.h, src/nautilus-window-manage-views.c, src/nautilus-window-manage-views.h, src/nautilus-window-menus.c, src/nautilus-window-private.h, src/nautilus-window-toolbars.c, src/nautilus-window.c, src/nautilus-window.h, src/nautilus-zoom-control.c, src/nautilus-zoom-control.h, src/nautilus-zoomable-frame-corba.c: Made copyright headers consistent in style; also made sure to refer to Nautilus as Nautilus, not "this library" or "The GNOME Library".
* Task 1351: implement controllers to allow location bar and theMaciej Stachowiak2000-06-161-0/+69
search/browse button * src/nautilus-location-bar.h, src/nautilus-location-bar.c: Factored this into two classes, NautilusNavigationBar, a class that defines the abstract interface (the set_location function and the location_changed signal), and NautilusLocationBar, a concrete implementation that works like the previous location bar. (nautilus_location_bar_set_location, nautilus_location_bar_get_location): Made static. Made `nautilus_location_bar_set_location' the handler for the set_location virtual method. * src/nautilus-navigation-bar.h, src/nautilus-navigation-bar.c: Abstract superclass for navigation bars. * src/nautilus-search-bar.h, src/nautilus-search-bar.c: New subclass of NautilusNavigationBar. Contains placeholder widgets for now, will eventually be the search bar. * src/nautilus-switchable-navigation-bar.h, src/nautilus-switchable-navigation-bar.c: New subclass of NautilusNavigationBar that allows switching between the location bar and the search bar. * src/nautilus-window.h: Rename `ent_uri' member of the window struct to `navigation_bar'. * src/nautilus-window.c (nautilus_window_navigation_bar_mode_changed_callback): Callback to sync the "search" toggle button to the mode of the switchable navigation bar. (nautilus_window_constructed): Create a NautilusSwitchableNavigationBar instead of a NautilusLocationBar. (nautilus_window_set_search_mode): New function to be used by the search toggle button callback; simply sets the mode of the switchable navigation bar appropriately. * src/nautilus-window-toolbars.c: Made Search button a toggle button. (toolbar_search_callback): Call `nautilus_window_set_search_mode'. * src/nautilus-window-manage-views.c (nautilus_window_update_internals, nautilus_window_end_location_change_callback): Use NautlusNavigationBar calls instead of NautilusLocationBar ones. * src/Makefile.am: Add new files to the build, and split all headers into noinst_HEADERS out from the nautilus_SOURCES variable.
View Lorry Controller Status