gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed search preferences, and fixed search icon

Browse source 
2000-06-16  Rebecka Schulman  <rebecka@eazel.com>

	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_create_dialog),
	(global_preferences_register_for_ui):
	* libnautilus-extensions/nautilus-global-preferences.h:
	* src/nautilus-search-bar.c: (nautilus_search_bar_initialize):
	* src/nautilus-search-bar.h:
	Changed search preferences, and fixed search icon
This commit is contained in:
Rebecka Schulman 2000-06-16 20:34:21 +00:00 committed by Rebecca Schulman
parent 070e7a17cc
commit f971d7c56d
8 changed files with 117 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,14 @@
2000-06-16 Rebecka Schulman <rebecka@eazel.com>
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_create_dialog),
(global_preferences_register_for_ui):
* libnautilus-extensions/nautilus-global-preferences.h:
* src/nautilus-search-bar.c: (nautilus_search_bar_initialize):
* src/nautilus-search-bar.h:
Changed search preferences, and fixed search icon
2000-06-16 Darin Adler <darin@eazel.com>
* src/nautilus-location-bar.c: (try_to_expand_path):
@ -7,7 +18,7 @@
Put in a new fix that uses a marshal function to avoid clobbering
the return value of key_press_event.
2000-06-16 Rebecka Schulman <set EMAIL_ADDRESS environment variable>
2000-06-16 Rebecka Schulman <rebecka@eazel.com>
* icons/eazel/Search.png:
Added search icon to toolbar, courtesy of Arlo.

BIN
icons/eazel/Search.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 553 B

38
libnautilus-extensions/nautilus-global-preferences.c
View file

@ -219,18 +219,26 @@ global_preferences_create_dialog (void)
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
/*
* File Indexing
* Search Settings
*/
file_indexing_pane = nautilus_preferences_box_add_pane (preference_box,
"Search",
"Search Settings");
nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
"Search Complexity Options");
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
0,
NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
NAUTILUS_PREFERENCE_ITEM_ENUM);
nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
"Search Tradeoffs");
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
0,
NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS,
1,
NAUTILUS_PREFERENCES_SEARCH_METHOD,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
/*
* Navigation
@ -549,12 +557,30 @@ global_preferences_register_for_ui (void)
"standard",
"standard");
global_preferences_register_boolean_with_defaults (NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS,
"find very new files by doing a slow search on disk after a fast search",
/* search tradeoffs */
global_preferences_register_boolean_with_defaults (NAUTILUS_PREFERENCES_SEARCH_METHOD,
"Always do slow, complete search",
FALSE,
FALSE,
FALSE);
/* search bar type */
global_preferences_register_enum_with_defaults (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search type to do by default",
NAUTILUS_SEARCH_BAR_ONE_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX);
nautilus_preference_enum_add_entry_by_name (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search by text",
"Search for files by text only",
NAUTILUS_SEARCH_BAR_ONE_BOX);
nautilus_preference_enum_add_entry_by_name (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search by text and properties",
"Search for files by text and by their properties",
NAUTILUS_SEARCH_BAR_MULTI_BOX);
/*
* These dont have a UI (yet ? maybe in the advanced settings ?).
* They do need to have appropiate defaults nontheless.

9
libnautilus-extensions/nautilus-global-preferences.h
View file

@ -66,7 +66,8 @@ BEGIN_GNOME_DECLS
#define NAUTILUS_PREFERENCES_ICON_THEME "preferences/icon_theme"
/* File Indexing */
#define NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS "preferences/do_slow_search"
#define NAUTILUS_PREFERENCES_SEARCH_METHOD "preferences/also_do_slow_search"
#define NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE "preferences/search_bar_type"
enum
{
@ -74,6 +75,12 @@ enum
NAUTILUS_CLICK_POLICY_DOUBLE
};
enum
{
NAUTILUS_SEARCH_BAR_ONE_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX
};
#define NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS "preferences/remote_icon_text"
void nautilus_global_preferences_shutdown (void);

38
libnautilus-private/nautilus-global-preferences.c
View file

@ -219,18 +219,26 @@ global_preferences_create_dialog (void)
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
/*
* File Indexing
* Search Settings
*/
file_indexing_pane = nautilus_preferences_box_add_pane (preference_box,
"Search",
"Search Settings");
nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
"Search Complexity Options");
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
0,
NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
NAUTILUS_PREFERENCE_ITEM_ENUM);
nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
"Search Tradeoffs");
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (file_indexing_pane),
0,
NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS,
1,
NAUTILUS_PREFERENCES_SEARCH_METHOD,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
/*
* Navigation
@ -549,12 +557,30 @@ global_preferences_register_for_ui (void)
"standard",
"standard");
global_preferences_register_boolean_with_defaults (NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS,
"find very new files by doing a slow search on disk after a fast search",
/* search tradeoffs */
global_preferences_register_boolean_with_defaults (NAUTILUS_PREFERENCES_SEARCH_METHOD,
"Always do slow, complete search",
FALSE,
FALSE,
FALSE);
/* search bar type */
global_preferences_register_enum_with_defaults (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search type to do by default",
NAUTILUS_SEARCH_BAR_ONE_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX);
nautilus_preference_enum_add_entry_by_name (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search by text",
"Search for files by text only",
NAUTILUS_SEARCH_BAR_ONE_BOX);
nautilus_preference_enum_add_entry_by_name (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE,
"search by text and properties",
"Search for files by text and by their properties",
NAUTILUS_SEARCH_BAR_MULTI_BOX);
/*
* These dont have a UI (yet ? maybe in the advanced settings ?).
* They do need to have appropiate defaults nontheless.

9
libnautilus-private/nautilus-global-preferences.h
View file

@ -66,7 +66,8 @@ BEGIN_GNOME_DECLS
#define NAUTILUS_PREFERENCES_ICON_THEME "preferences/icon_theme"
/* File Indexing */
#define NAUTILUS_PREFERENCES_SEARCH_SPEED_SETTINGS "preferences/do_slow_search"
#define NAUTILUS_PREFERENCES_SEARCH_METHOD "preferences/also_do_slow_search"
#define NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE "preferences/search_bar_type"
enum
{
@ -74,6 +75,12 @@ enum
NAUTILUS_CLICK_POLICY_DOUBLE
};
enum
{
NAUTILUS_SEARCH_BAR_ONE_BOX,
NAUTILUS_SEARCH_BAR_MULTI_BOX
};
#define NAUTILUS_PREFERENCES_SHOW_TEXT_IN_REMOTE_ICONS "preferences/remote_icon_text"
void nautilus_global_preferences_shutdown (void);

22
src/nautilus-search-bar.c
View file

@ -29,9 +29,27 @@
#include <libgnome/gnome-i18n.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
typedef enum {
NAUTILUS_SEARCH_ONE_BOX,
NAUTILUS_SEARCH_MULTI_BOX
} NautilusSearchBarType;
struct NautilusSearchBarDetails {
NautilusSearchBarType search_bar_type;
GtkLabel *search_label;
/* This one is used for the simple search */
GtkEntry *entry;
/* These are used for the more complicated
search */
/* Under construction */
GList *search_bar_pairs;
};
static void nautilus_search_bar_set_location (NautilusNavigationBar *bar,
const char *location);
@ -66,13 +84,13 @@ nautilus_search_bar_initialize_class (NautilusSearchBarClass *klass)
static void
nautilus_search_bar_initialize (NautilusSearchBar *bar)
{
GtkWidget *label;
GtkWidget *label;
/* FIXME: set up the widgetry here. */
label = gtk_label_new (_("The search bar goes here"));
gtk_widget_show (label);
gtk_widget_show (label);
gtk_container_add (GTK_CONTAINER (bar), label);
}

5
src/nautilus-search-bar.h
View file

@ -36,8 +36,12 @@
#define NAUTILUS_IS_SEARCH_BAR(obj) \
GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_SEARCH_BAR)
typedef struct NautilusSearchBarDetails NautilusSearchBarDetails;
typedef struct NautilusSearchBar {
NautilusNavigationBar parent;
NautilusSearchBarDetails *details;
} NautilusSearchBar;
typedef struct {
@ -49,3 +53,4 @@ GtkWidget* nautilus_search_bar_new (void);
#endif /* NAUTILUS_SEARCH_BAR_H */