summaryrefslogtreecommitdiff
path: root/src/nautilus-switchable-search-bar.h
Commit message (Collapse)AuthorAgeFilesLines
* Made copyright headers consistent in style; also made sure to refer toMaciej Stachowiak2000-08-111-19/+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".
* Completed bug 1433, the interface to search by file name and attribute.Rebecca Schulman2000-08-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-08-02 Rebecca Schulman <rebecka@eazel.com> Completed bug 1433, the interface to search by file name and attribute. * libnautilus-extensions/nautilus-search-uri.c: * libnautilus-extensions/nautilus-search-uri.h: * libnautilus-extensions/Makefile.am: removed the search uri files and placed their functionality in the appropriate search bar classes. * libnautilus-extensions/nautilus-search-bar-criterion-private.h: * libnautilus-extensions/nautilus-search-bar-criterion.h: * libnautilus-extensions/nautilus-search-bar-criterion.c: (nautilus_search_bar_criterion_new_from_values), (nautilus_search_bar_criterion_next_new), (nautilus_search_bar_criterion_get_location), (get_next_default_search_criterion_type), (nautilus_search_bar_criterion_show), (nautilus_search_bar_criterion_hide), (get_name_location_for), (get_content_location_for), (get_file_type_location_for), (get_size_location_for), (get_emblem_location_for), (get_date_modified_location_for), (get_owner_location_for): added ability to turn the criteria state into a text explanation for the search uri. It is slightly circuitous, because search uris are not internationalized. * libnautilus-extensions/nautilus-string.c: * libnautilus-extensions/nautilus-string.h: (nautilus_str_strip_trailing_str), (nautilus_self_check_string): added new string function used by the search bar criterion code, to strip a string off the end of an existing string. * src/nautilus-complex-search-bar.c: (nautilus_complex_search_bar_initialize), (nautilus_complex_search_bar_get_location), (attach_criterion_to_search_bar), (unattach_criterion_from_search_bar), (load_find_them_pixmap_widget), (fewer_options_callback): tweaks to make sizing an spacing on the bar better, and added search pixmap to the find button. Moved the find them button here from the switchable search bar class for appearance reasons. * src/nautilus-simple-search-bar.c: (nautilus_simple_search_bar_initialize), (nautilus_simple_search_bar_set_location), (nautilus_simple_search_bar_get_location), (nautilus_search_uri_to_simple_search_criteria), (nautilus_simple_search_criteria_to_search_uri): moved search uri functionality and find them button into the simple search bar class for apprearance reasons. * src/nautilus-switchable-search-bar.c: * src/nautilus-switchable-search-bar.h: (nautilus_switchable_search_bar_initialize_class), (nautilus_switchable_search_bar_initialize), (nautilus_switchable_search_bar_set_mode), (nautilus_search_uri_to_search_bar_mode), (nautilus_search_uri_is_displayable_by_mode), (other_search_mode): moved the find them button out of this class.
* After complaints from Rebecca, I tested my search changes andDarin Adler2000-07-281-15/+9
| | | | | | | | | | | | | | | | | | | | | | fixed 3 bugs. * libnautilus-extensions/nautilus-search-uri.c: (nautilus_search_uri_to_simple_search_criteria): Return g_strdup ("") instead of NULL. * src/nautilus-navigation-bar.c: (nautilus_navigation_bar_initialize_class): Fixed bad marshalling that was causing a crash. * src/nautilus-switchable-navigation-bar.c: (nautilus_switchable_navigation_bar_initialize_class), (nautilus_switchable_navigation_bar_get_location): Added a get_location here. I missed this subclass and that caused an assert every time you search! * src/nautilus-switchable-search-bar.c: (nautilus_switchable_search_bar_initialize): Remove an unneeded callback function here (somehow I missed this case last time). * src/nautilus-switchable-search-bar.h: Fixed a wrong type and cleaned up formatting a bit.
* This needs to return a g_free'able string, so I changed the placeholder toDarin Adler2000-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * libnautilus-extensions/nautilus-search-uri.c: (nautilus_search_uri_to_simple_search_criteria): This needs to return a g_free'able string, so I changed the placeholder to return NULL instead of "". (g_strdup ("") would also have been OK.) * src/nautilus-complex-search-bar.h: * src/nautilus-complex-search-bar.c: (nautilus_complex_search_bar_initialize_class), (nautilus_complex_search_bar_initialize), (nautilus_complex_search_bar_get_location), (nautilus_complex_search_bar_set_location): * src/nautilus-location-bar.c: (drag_data_received_callback), (drag_data_get_callback), (nautilus_location_bar_initialize_class), (nautilus_location_bar_initialize), (nautilus_location_bar_set_location), (nautilus_location_bar_get_location): * src/nautilus-navigation-bar.h: * src/nautilus-navigation-bar.c: (nautilus_navigation_bar_initialize_class), (nautilus_navigation_bar_get_location), (nautilus_navigation_bar_location_changed): * src/nautilus-search-bar.h: * src/nautilus-search-bar.c: (nautilus_search_bar_initialize_class), (nautilus_search_bar_initialize): * src/nautilus-simple-search-bar.h: * src/nautilus-simple-search-bar.c: (nautilus_simple_search_bar_initialize_class), (nautilus_simple_search_bar_initialize), (nautilus_simple_search_bar_set_location), (nautilus_simple_search_bar_get_location): * src/nautilus-switchable-navigation-bar.c: (nautilus_switchable_navigation_bar_initialize), (nautilus_switchable_navigation_bar_set_mode): * src/nautilus-switchable-search-bar.h: * src/nautilus-switchable-search-bar.c: (nautilus_switchable_search_bar_initialize_class), (nautilus_switchable_search_bar_set_mode), (search_activated_callback), (nautilus_switchable_search_bar_get_location), (nautilus_switchable_search_bar_set_location): Got rid of set_search_controls since set_location does exactly the same thing. Changed to use get_location in the NautilusNavigationBar base class instead of having lots of separate get_location. Fixed bug where get_location would return a non-g_strdup'd string, which callers would then g_free. Also changed to use simpler version of location_changed since the navigation bar can now get the location easily for itself so the subclasses need not do it. Callbacks now can call nautilus_navigation_bar_location_changed directly. Removed some empty destroy functions in classes where they are likely to be empty forever. * src/nautilus-window.c: (goto_uri_callback): Whitespace.
* (nautilus_simple_search_bar_set_search_controls): Extended search uri api;Rebecka Schulman2000-06-231-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2000-06-22 Rebecka Schulman <rebecka@eazel.com> * libnautilus-extensions/nautilus-search-uri.c: * libnautilus-extensions/nautilus-search-uri.h: (nautilus_search_uri_to_simple_search_criteria), (nautilus_search_uri_to_search_bar_mode), (nautilus_search_uri_is_displayable_by_mode), (other_search_mode): * src/nautilus-simple-search-bar.c: * src/nautilus-switchable-search-bar.c: (nautilus_switchable_search_bar_set_mode), (nautilus_switchable_search_bar_set_search_controls): * src/nautilus-switchable-search-bar.h: (nautilus_simple_search_bar_set_search_controls): Extended search uri api; Some functions came from nautilus-switchable-search-bar.c * src/nautilus-complex-search-bar.c: (nautilus_complex_search_bar_initialize): fixed it so the containers work right * src/nautilus-search-bar-criterion.c: * src/nautilus-search-bar-criterion.h: (nautilus_search_bar_criterion_initialize), (nautilus_search_bar_criterion_initialize_class), (destroy), (nautilus_search_bar_criterion_new), (nautilus_search_bar_criterion_file_type_new), (nautilus_search_bar_criterion_file_name_new), (nautilus_search_bar_criterion_add_to_search_bar): added file name and type, and new functions to aid in displaying * src/nautilus-search-bar.c: (nautilus_search_bar_new): * src/nautilus-search-bar.h: added nautilus_search_bar_new
* set up search-bar as a virtual class that switches between the availableRebecca Schulman2000-06-211-0/+73
2000-06-20 Rebecca Schulman <rebecka@eazel.com> * src/Makefile.am: * src/nautilus-search-bar.c: * src/nautilus-search-bar.h: (nautilus_search_bar_initialize_class), (nautilus_search_bar_initialize), (nautilus_search_bar_set_location), (nautilus_search_bar_set_search_controls): * src/nautilus-switchable-search-bar.c: * src/nautilus-switchable-search-bar.h: * src/nautilus-search-bar-criterion.c: * src/nautilus-search-bar-criterion.h: set up search-bar as a virtual class that switches between the available search bars, similar to nautilus-navigation-bar. * src/nautilus-complex-search-bar.c: * src/nautilus-complex-search-bar.h: * src/nautilus-simple-search-bar.c: * src/nautilus-simple-search-bar.h: Added simple and complex search bar skeletons. these need to get filled out a lot more * src/nautilus-switchable-navigation-bar.c: (nautilus_switchable_navigation_bar_initialize): switchable navigation bar uses a switchable search bar instead of a normal search bar, since that class is now virtual * src/nautilus-navigation-bar.c: fixed comment typos * libnautilus-extensions/nautilus-directory.h: Exported nautilus_uri_is_search_uri function * libnautilus-extensions/Makefile.am: Added nautilus-search-uri.c and .h files The functions aren't filled out yet, though * libnautilus-extensions/nautilus-search-uri.c: (nautilus_search_uri_to_simple_search_criteria): * libnautilus-extensions/nautilus-search-uri.h: * libnautilus-extensions/nautilus-global-preferences.c: (global_preferences_register_for_ui): * libnautilus-extensions/nautilus-global-preferences.h: Changed search bar preference names from NAUTILUS_SEARCH_BAR_ONE_BOX and NAUTILUS_SEARCH_BAR_MULTI_BOX to NAUTILUS_SIMPLE_SEARCH_BAR and NAUTILUS_COMPLEX_SEARCH_BAR to match respective object names