Most of the work on 2369, to add the emblems to the search criteria. This

2000-08-30  Rebecca Schulman  <rebecka@eazel.com>
	Most of the work on 2369, to add the emblems to the search
	criteria.  This work involved refactoring the code to generate
	property information for display.  This new code is used by the
	code to create the search criterion, and also by the emblem
	display code, which is in nautilus-property-browser.


	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-customization-data.c:
	* libnautilus-extensions/nautilus-customization-data.h:
	(nautilus_customization_data_new),
	(nautilus_customization_data_get_next_element_for_display),
	(nautilus_customization_data_private_data_was_displayed),
	(nautilus_customization_data_destroy),
	(get_global_customization_uri), (get_private_customization_uri),
	(get_file_path_for_mode),
	(nautilus_customization_make_background_chit),
	(format_name_for_display), (strip_extension):
	New file with extracted methods from nautilus-property browser.
	The new API initiates a new structure, and has an iterative call
	to "get the next element for display" which returns a correctly
	sized pixmap widget and a label widget containing the name appropriate
	for display.

	* libnautilus-extensions/nautilus-dateedit-extensions.c:
	(nautilus_gnome_date_edit_get_date_as_string):
	Removed extraneous debugging printf.

	* libnautilus-extensions/nautilus-search-bar-criterion.c:
	* libnautilus-extensions/nautilus-search-bar-criterion.h:
	(nautilus_search_bar_criterion_new_from_values),
	(nautilus_search_bar_criterion_next_new),
	(nautilus_search_bar_criterion_get_location),
	(get_emblem_location_for), (get_date_modified_location_for),
	(make_emblem_value_menu):
	Added code to generate the emblem menu, and to generate a
	search criterion for the search uri from the menu's settings.

	* libnautilus-extensions/nautilus-search-uri.c:
	More language updated, and added text for emblems

	* src/nautilus-property-browser.c: (make_drag_image),
	(make_properties_from_directories), (make_category):
	Updated this code to deal with new refactoring.

1 files changed, 25 insertions, 15 deletions

diff --git a/libnautilus-private/nautilus-search-uri.c b/libnautilus-private/nautilus-search-uri.c
index 1288e5477..ea4548024 100644
--- a/libnautilus-private/nautilus-search-uri.c
+++ b/libnautilus-private/nautilus-search-uri.c
@@ -200,7 +200,7 @@ struct _value_criterion_item {
 
 static operand_criterion_item file_name2_table [] = {
         {"contains", 
-         N_("that contain \"%s\""),
+         N_("that have \"%s\" in the name"),
          NULL},
         {"starts_with",
          N_("that start with \"%s\""),
@@ -278,13 +278,13 @@ static operand_criterion_item owner2_table [] = {
 */
 static operand_criterion_item size2_table [] = {
         {"larger_than",
-         N_("that are larger than %s kilobytes"),
+         N_("that are larger than %s bytes"),
          NULL},
         {"smaller_than",
-         N_("that are smaller than %s kilobytes"),
+         N_("that are smaller than %s bytes"),
          NULL},
         {"is",
-         N_("that are %s kilobytes"),
+         N_("that are %s bytes"),
          NULL},
         {NULL, NULL, NULL}
 };
@@ -295,10 +295,10 @@ static operand_criterion_item size2_table [] = {
 */
 static operand_criterion_item mod_time2_table [] = {
         {"updated", 
-         N_("modified after"), 
+         N_("modified after %s"), 
          NULL},
         {"not_updated", 
-         N_("modified before"), 
+         N_("modified before %s"), 
          NULL},
         {NULL, NULL, NULL}
 };
@@ -310,6 +310,12 @@ static operand_criterion_item mod_time2_table [] = {
 
 /* FIXME bugzilla.eazel.com 2369: not implemented in nautilus yet */
 static operand_criterion_item emblem2_table [] = {
+        { "is_marked_with",
+          N_("marked with \"%s\""),
+          NULL},
+        { "is_not_marked_with",
+          N_("not marked with \"%s\""),
+          NULL},
         {NULL, NULL, NULL}
 };
 
@@ -319,13 +325,19 @@ static operand_criterion_item emblem2_table [] = {
    -------------------------------------------------------
 */
 
-/* FIXME bugzilla.eazel.com 2439: I cannot find any doc on this one */
+
 static operand_criterion_item contains2_table [] = {
-        {"includes",
-         N_("with the word"),
+        {"includes_all_of",
+         N_("with all the words %s"),
+         NULL},
+        {"includes_any_of",
+         N_("containing one of the words %s"),
+         NULL},
+        {"does_not_include_all_of",
+         N_("without all the words %s"),
          NULL},
-        {"does_not_include",
-         N_("without the word"),
+        {"does_not_include_any_of",
+         N_("without any of the words %s"),
          NULL},
         {NULL, NULL, NULL},
 };
@@ -350,12 +362,10 @@ static field_criterion_item main_table[] = {
         {"size",
          N_(""),
          size2_table},
-        /* FIXME bugzilla.eazel.com 2439: waiting for doc */
-        {"contains",
+        {"content",
          N_(""),
          contains2_table},
-        /* FIXME bugzilla.eazel.com 2439: waiting for spec */
-        {"mod_time",
+        {"modified",
          N_(""),
          mod_time2_table},
         /* FIXME bugzilla.eazel.com 2369: waiting for implementation */