Redid the complex search bar to look the way we actually wanted it. There

2000-07-26  Rebecca Schulman  <rebecka@eazel.com>
	Redid the complex search bar to look the way we actually
	wanted it.  There are still some bugs, but as far as i
	can tell, it hasn't introduced horrid instability, and
	this way, mathieu, among other can work on the
	partial amount of stuff i have done.

	* libnautilus-extensions/Makefile.am:

	* src/Makefile.am:
	* src/nautilus-search-bar-criterion.c:
	* src/nautilus-search-bar-criterion.h:
	* libnautilus-extensions/nautilus-search-uri.h:
	* src/nautilus-search-bar.c:
	* src/nautilus-simple-search-bar.c:
	(nautilus_simple_search_bar_initialize_class),
	(nautilus_simple_search_bar_set_search_controls):
	* src/nautilus-switchable-search-bar.c:
	Moved nautilus-search-bar-criterion.c from src/ to
	libnautilus-extensions.

	* libnautilus-extensions/nautilus-search-bar-criterion.c:
	* libnautilus-extensions/nautilus-search-bar-criterion.h:
	(nautilus_search_bar_criterion_destroy),
	(nautilus_search_bar_criterion_new),
	(nautilus_search_bar_criterion_new_from_values),
	(nautilus_search_bar_criterion_next_new),
	(nautilus_search_bar_criterion_first_new),
	(nautilus_search_bar_criterion_list_get_last),
	(get_next_default_search_criterion_type),
	(nautilus_search_bar_criterion_show),
	(nautilus_search_bar_criterion_hide):
	redid this api, and made it saner.  Doesn't seem
	like a gtk class is even necessary, or even useful here.
	We just want to keep track of the widgets.

	* 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_search_controls),
	(attach_criterion_to_search_bar),
	(unattach_criterion_from_search_bar), (more_options_callback),
	(fewer_options_callback):
	redid this to use tables, instead of all the boxes, as per
	Gene's suggestion.  There are still a few bugs here
	with criterion removal that need to be worked out,
	and there also needs to be some level of translation to
	uri, and re-setting up the search criteria to correspond to
	a uri.

	* libnautilus-extensions/nautilus-search-bar-criterion-private.h:
	added to keep some sense of data privacy.

1 files changed, 0 insertions, 373 deletions

diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c
deleted file mode 100644
index 5ca052b90..000000000
--- a/src/nautilus-search-bar-criterion.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* nautilus-search-bar-criterion.c - Code to bring up
-   the various kinds of criterion supported in the nautilus search
-   bar 
-
-   Copyright (C) 2000 Eazel, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program 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
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; see the file COPYING.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: Rebecca Schulman <rebecka@eazel.com>
-*/
-
-#include "nautilus-search-bar-criterion.h"
-#include "nautilus-search-bar.h"
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-
-
-
-struct NautilusSearchBarCriterionDetails {
-	gboolean use_intro_label;
-	GtkLabel *intro_label;
-
-	gboolean use_operator_menu;
-	GtkOptionMenu *operator_menu;
-
-	gboolean use_value_entry;
-	GtkEntry *value_entry;
-	gboolean use_value_menu;
-	GtkOptionMenu *value_menu;
-};
-
-static void      destroy                                        (GtkObject *object);
-static void      nautilus_search_bar_criterion_initialize       (NautilusSearchBarCriterion *criterion);
-static void      nautilus_search_bar_criterion_initialize_class (NautilusSearchBarCriterionClass *klass);
-
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSearchBarCriterion, nautilus_search_bar_criterion, GTK_TYPE_CONTAINER)
-
-
-
-
-
-
-static void
-nautilus_search_bar_criterion_initialize (NautilusSearchBarCriterion *criterion)
-{
-	/* Nothing to do until a type of bar is declared */
-}
-
-static void
-nautilus_search_bar_criterion_initialize_class (NautilusSearchBarCriterionClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = destroy;
-}
-
-
-
-static void
-destroy (GtkObject *object)
-{
-	NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-GtkWidget *
-nautilus_search_bar_criterion_new (void)
-{
-	return gtk_widget_new (NAUTILUS_TYPE_SEARCH_BAR_CRITERION, NULL);
-}
-
-
-
-NautilusSearchBarCriterion *
-nautilus_search_bar_criterion_file_type_new (NautilusComplexSearchBar *bar)
-{
-     GtkWidget *new_criterion;
-     NautilusSearchBarCriterion *file_type;
-     GtkWidget *file_type_menu, *file_type_options;
-     
-     new_criterion = nautilus_search_bar_criterion_new ();
-     
-     file_type = NAUTILUS_SEARCH_BAR_CRITERION (new_criterion);
-     
-     file_type->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
-
-     file_type->type = NAUTILUS_FILE_TYPE_SEARCH_CRITERION;
-     
-     file_type_options = gtk_option_menu_new ();
-	
-     file_type_menu = gtk_menu_new ();
-     /* FIXME:  These need to be configurable in some way */
-     gtk_menu_append (GTK_MENU (file_type_menu),
-		      gtk_menu_item_new_with_label ("Files"));
-     gtk_menu_append (GTK_MENU (file_type_menu),
-			 gtk_menu_item_new_with_label ("Text Files"));
-     gtk_menu_append (GTK_MENU (file_type_menu),
-		      gtk_menu_item_new_with_label ("Applications"));
-     gtk_menu_append (GTK_MENU (file_type_menu),
-		      gtk_menu_item_new_with_label ("Music"));
-     gtk_menu_append (GTK_MENU (file_type_menu),
-		      gtk_menu_item_new_with_label ("Directories"));
-     gtk_option_menu_set_menu (GTK_OPTION_MENU (file_type_options),
-			       file_type_menu);
-
-     file_type->details->operator_menu = GTK_OPTION_MENU (file_type_options);
-     file_type->details->use_operator_menu = TRUE;
-
-     file_type->details->use_intro_label = FALSE;
-     file_type->details->use_value_entry = FALSE;
-     file_type->details->use_value_menu = FALSE;
-     return file_type;
-}
-
-NautilusSearchBarCriterion *
-nautilus_search_bar_criterion_file_name_new (NautilusComplexSearchBar *bar)
-{
-	GtkWidget *new_criterion;
-	NautilusSearchBarCriterion *file_name;
-	GtkWidget *intro_label;
-	GtkWidget *file_name_menu, *file_name_options, *file_name_entry;
-
-	new_criterion = nautilus_search_bar_criterion_new ();
-	
-	file_name = NAUTILUS_SEARCH_BAR_CRITERION (new_criterion);
-
-	file_name->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
-
-	file_name->type = NAUTILUS_FILE_NAME_SEARCH_CRITERION;
-
-	intro_label = gtk_label_new ("where name");
-	file_name->details->intro_label = GTK_LABEL (intro_label);
-	file_name->details->use_intro_label = TRUE;
-
-	file_name_options = gtk_option_menu_new ();
-
-	file_name_menu = gtk_menu_new ();
-	gtk_menu_append (GTK_MENU (file_name_menu),
-			 gtk_menu_item_new_with_label ("contains"));
-	gtk_menu_append (GTK_MENU (file_name_menu),
-			 gtk_menu_item_new_with_label ("does not contain"));
-	gtk_menu_append (GTK_MENU (file_name_menu),
-			 gtk_menu_item_new_with_label ("is"));
-	gtk_menu_append (GTK_MENU (file_name_menu),
-			 gtk_menu_item_new_with_label ("is not"));
-	gtk_menu_append (GTK_MENU (file_name_menu),
-			 gtk_menu_item_new_with_label ("matches pattern"));
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (file_name_options),
-				  file_name_menu);
-	file_name->details->operator_menu = GTK_OPTION_MENU (file_name_options);
-	file_name->details->use_operator_menu = TRUE;
-
-	file_name_entry = gtk_entry_new ();
-	file_name->details->value_entry = GTK_ENTRY (file_name_entry);
-	file_name->details->use_value_entry = TRUE;
-
-	file_name->details->use_value_menu = FALSE;
-
-	return file_name;
-}
-
-NautilusSearchBarCriterion *
-nautilus_search_bar_criterion_location_new (NautilusComplexSearchBar *bar)
-{
-	GtkWidget *new_criterion;
-	NautilusSearchBarCriterion *location;
-	GtkWidget *intro_label;
-	GtkWidget *location_options, *location_menu;
-
-	new_criterion = nautilus_search_bar_criterion_new ();
-	
-	location = NAUTILUS_SEARCH_BAR_CRITERION (new_criterion);
-
-	location->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
-	location->type = NAUTILUS_LOCATION_SEARCH_CRITERION;
-	
-	intro_label = gtk_label_new ("in");
-	location->details->intro_label = GTK_LABEL (intro_label);
-	location->details->use_intro_label = TRUE;
-
-	location_options = gtk_option_menu_new ();
-
-	location_menu = gtk_menu_new ();
-	/* FIXME:  This is incomplete, and should be configurable  */
-	gtk_menu_append (GTK_MENU (location_menu),
-			 gtk_menu_item_new_with_label ("My Local Files"));
-	gtk_menu_append (GTK_MENU (location_menu),
-			 gtk_menu_item_new_with_label ("This Directory"));
-	gtk_menu_append (GTK_MENU (location_menu),
-			 gtk_menu_item_new_with_label ("My Home Directory"));
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (location_options),
-				  location_menu);
-	
-	location->details->operator_menu = GTK_OPTION_MENU (location_options);
-	location->details->use_operator_menu = TRUE;
-
-	location->details->use_value_entry = FALSE;
-	location->details->use_value_menu = FALSE;
-	
-	return location;
-}
-
-NautilusSearchBarCriterion *
-nautilus_search_bar_criterion_content_new (NautilusComplexSearchBar *bar)
-{
-	GtkWidget *new_criterion;
-	NautilusSearchBarCriterion *content;
-	GtkWidget *content_options, *content_menu, *content_entry;
-
-	new_criterion = nautilus_search_bar_criterion_new ();
-
-	content = NAUTILUS_SEARCH_BAR_CRITERION (new_criterion);
-
-	content->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
-	content->type = NAUTILUS_CONTENT_SEARCH_CRITERION;
-
-	content_options = gtk_option_menu_new ();
-
-	content_menu = gtk_menu_new ();
-	gtk_menu_append (GTK_MENU (content_menu),
-			 gtk_menu_item_new_with_label ("contains"));
-	gtk_menu_append (GTK_MENU (content_menu),
-			 gtk_menu_item_new_with_label ("contains all of"));
-	gtk_menu_append (GTK_MENU (content_menu),
-			 gtk_menu_item_new_with_label ("contains any of"));
-	gtk_menu_append (GTK_MENU (content_menu),
-			 gtk_menu_item_new_with_label ("does not contain"));
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (content_options),
-				  content_menu);
-
-	content->details->operator_menu = GTK_OPTION_MENU (content_options);
-	content->details->use_operator_menu = TRUE;
-
-	content_entry = gtk_entry_new ();
-	content->details->value_entry = GTK_ENTRY (content_entry);
-	content->details->use_value_entry = TRUE;
-
-	content->details->use_value_menu = FALSE;
-	
-	return content;
-	       
-
-}
-
-NautilusSearchBarCriterion *
-nautilus_search_bar_criterion_size_new (NautilusComplexSearchBar *bar)
-{
-	GtkWidget *new_criterion;
-	NautilusSearchBarCriterion *size;
-	GtkWidget *size_options, *size_menu;
-	GtkWidget *size_value_options, *size_value_menu;
-
-	new_criterion = nautilus_search_bar_criterion_new ();
-
-	size = NAUTILUS_SEARCH_BAR_CRITERION (new_criterion);
-
-	size->details = g_new0 (NautilusSearchBarCriterionDetails, 1);
-	size->type = NAUTILUS_SIZE_SEARCH_CRITERION;
-
-	size_options = gtk_option_menu_new ();
-
-	size_menu = gtk_menu_new ();
-	gtk_menu_append (GTK_MENU (size_menu),
-			 gtk_menu_item_new_with_label ("larger than"));
-	gtk_menu_append (GTK_MENU (size_menu),
-			 gtk_menu_item_new_with_label ("smaller than"));
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (size_options),
-				  size_menu);
-
-	size->details->operator_menu = GTK_OPTION_MENU (size_options);
-	size->details->use_operator_menu = TRUE;
-
-	size_value_options = gtk_option_menu_new ();
-
-	size_value_menu = gtk_menu_new ();
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("1K"));
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("10K"));
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("100K"));
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("1 Meg"));
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("10 Megs"));
-	gtk_menu_append (GTK_MENU (size_value_menu),
-			 gtk_menu_item_new_with_label ("100 Megs"));
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (size_value_options),
-				  size_value_menu);
-
-	size->details->value_menu = GTK_OPTION_MENU (size_value_options);
-	size->details->use_value_menu = TRUE;
-
-	size->details->use_value_entry = FALSE;
-
-	return size;
-}
-
-void
-nautilus_search_bar_criterion_add_to_search_bar (NautilusSearchBarCriterion *criterion,
-						 GtkWidget *hbox)
-{
-	g_return_if_fail (NAUTILUS_IS_SEARCH_BAR_CRITERION (criterion));
-	g_return_if_fail (GTK_IS_BOX (hbox));
-	if (criterion->details->use_intro_label) {
-		gtk_box_pack_start (GTK_BOX (hbox),
-				    GTK_WIDGET (criterion->details->intro_label),
-				    FALSE,
-				    TRUE,
-				    GNOME_PAD_SMALL);
-	}
-	if (criterion->details->use_operator_menu) {
-		gtk_box_pack_start (GTK_BOX (hbox),
-				    GTK_WIDGET (criterion->details->operator_menu),
-				    TRUE,
-				    TRUE,
-				    GNOME_PAD_SMALL);
-	}
-	if (criterion->details->use_value_entry) {
-		gtk_box_pack_start (GTK_BOX (hbox),
-				     GTK_WIDGET (criterion->details->value_entry),
-				     FALSE,
-				     TRUE,
-				     GNOME_PAD_SMALL);
-	}
-	if (criterion->details->use_value_menu) {
-		gtk_box_pack_start (GTK_BOX (hbox),
-				     GTK_WIDGET (criterion->details->value_menu),
-				     TRUE,
-				     TRUE,
-				     0);
-	}
-	
-}
-
-void
-nautilus_search_bar_criterion_show (NautilusSearchBarCriterion *criterion)
-{
-	g_return_if_fail (NAUTILUS_IS_SEARCH_BAR_CRITERION (criterion));
-	if (criterion->details->use_intro_label) {
-		gtk_widget_show (GTK_WIDGET (criterion->details->intro_label));
-	}
-	if (criterion->details->use_operator_menu) {
-		gtk_widget_show (GTK_WIDGET (criterion->details->operator_menu));
-	}
-	if (criterion->details->use_value_entry) {
-		gtk_widget_show (GTK_WIDGET (criterion->details->value_entry));
-	}
-	if (criterion->details->use_value_menu) {
-		gtk_widget_show (GTK_WIDGET (criterion->details->value_menu));
-	}
-}
-