? .cdtproject ? .project ? INSTALL_DIR ? PREFIX ? bubble.patch ? gedit/Unsaved Document 1 ? gedit/eggnotificationbubble.c ? gedit/eggnotificationbubble.h ? gedit/gedit-document.old.c ? gedit/gedit-global-message-area.c ? gedit/gedit-global-message-area.h ? gedit/gedit-panel.c.diff ? gedit/gedit-print-job-preview.c.paolo ? gedit/gedit-vfs-utils.c ? gedit/gedit-vfs-utils.h ? gedit/gedit.diff ? gedit/output.pdf ? gedit/pippo.txt ? gedit/prova2.txt ? gedit/search-panel.gladep ? gedit/sexy-icon-entry.c ? gedit/sexy-icon-entry.h ? gedit/dialogs/gedit-dialog-goto-line.loT ? gedit/dialogs/search-panel.gladep ? plugins/sample_test ? plugins/savecopy/savecopy.c.paolo ? tools/plugin_template/Makefile.in Index: gedit/Makefile.am =================================================================== RCS file: /cvs/gnome/gedit/gedit/Makefile.am,v retrieving revision 1.111.2.34 diff -u -p -r1.111.2.34 Makefile.am --- gedit/Makefile.am 11 Oct 2005 17:19:08 -0000 1.111.2.34 +++ gedit/Makefile.am 18 Oct 2005 14:34:48 -0000 @@ -60,6 +60,7 @@ NOINST_H_FILES = \ gedit-io-error-message-area.h \ gedit-search-panel.h \ gedit-spinner.h \ + sexy-icon-entry.h \ gedit-session.h if ENABLE_PYTHON @@ -153,6 +154,7 @@ gedit_SOURCES = \ gedit-plugin-manager.c \ gedit-spinner.c \ gedit-session.c \ + sexy-icon-entry.c \ $(NOINST_H_FILES) \ $(INST_H_FILES) Index: gedit/gedit-search-panel.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/Attic/gedit-search-panel.c,v retrieving revision 1.1.2.19 diff -u -p -r1.1.2.19 gedit-search-panel.c --- gedit/gedit-search-panel.c 18 Oct 2005 12:19:07 -0000 1.1.2.19 +++ gedit/gedit-search-panel.c 18 Oct 2005 14:34:49 -0000 @@ -41,6 +41,8 @@ #include "gedit-debug.h" #include "gedit-statusbar.h" +#include "sexy-icon-entry.h" + #include #define GEDIT_SEARCH_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GEDIT_TYPE_SEARCH_PANEL, GeditSearchPanelPrivate)) @@ -948,10 +950,59 @@ static void option_button_toggled (GtkToggleButton *togglebutton, GeditSearchPanel *panel) { + /* FIXME: set_sensitive should be set to true only if there is + some text to search for */ gtk_widget_set_sensitive (panel->priv->find_button, TRUE); } static void +search_backwards_button_toggled (GtkToggleButton *togglebutton, + GeditSearchPanel *panel) +{ + GtkImage *icon; + + /* FIXME: set_sensitive should be set to true only if there is + some text to search for */ + gtk_widget_set_sensitive (panel->priv->find_button, TRUE); + + icon = sexy_icon_entry_get_icon (SEXY_ICON_ENTRY (panel->priv->search_entry), + SEXY_ICON_ENTRY_SECONDARY); + + if (gtk_toggle_button_get_active (togglebutton)) + { + gtk_image_set_from_stock (icon, + GTK_STOCK_GO_UP, + GTK_ICON_SIZE_MENU); + } + else + { + gtk_image_set_from_stock (icon, + GTK_STOCK_GO_DOWN, + GTK_ICON_SIZE_MENU); + } +} + +static void +icon_released (SexyIconEntry *entry, + SexyIconEntryPosition icon_pos, + gint button, + GeditSearchPanel *panel) +{ + g_return_if_fail (icon_pos == SEXY_ICON_ENTRY_SECONDARY); + + if (button == 1) + { + gboolean state; + + state = gtk_toggle_button_get_active ( + GTK_TOGGLE_BUTTON (panel->priv->search_backwards_checkbutton)); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->search_backwards_checkbutton), + !state); + } +} + +static void search_entry_insert_text (GtkEditable *editable, const gchar *text, gint length, @@ -996,6 +1047,7 @@ gedit_search_panel_init (GeditSearchPane GtkWidget *find_vbox; GtkWidget *search_panel_vbox; GtkWidget *error_widget; + GtkWidget *icon; gboolean ret; GtkListStore *store; GtkEntryCompletion *completion; @@ -1035,6 +1087,19 @@ gedit_search_panel_init (GeditSearchPane return; } + icon = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, + GTK_ICON_SIZE_MENU); + + gtk_widget_show(icon); + sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (panel->priv->search_entry), + SEXY_ICON_ENTRY_SECONDARY, + GTK_IMAGE (icon)); + sexy_icon_entry_set_icon_highlight (SEXY_ICON_ENTRY (panel->priv->search_entry), + SEXY_ICON_ENTRY_SECONDARY, + TRUE); + + gtk_widget_show (panel->priv->search_entry); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->wrap_around_checkbutton), TRUE); @@ -1136,12 +1201,16 @@ gedit_search_panel_init (GeditSearchPane panel); g_signal_connect (panel->priv->search_backwards_checkbutton, "toggled", - G_CALLBACK (option_button_toggled), + G_CALLBACK (search_backwards_button_toggled), panel); g_signal_connect (panel->priv->wrap_around_checkbutton, "toggled", G_CALLBACK (option_button_toggled), panel); + g_signal_connect (panel->priv->search_entry, + "icon-released", + G_CALLBACK (icon_released), + panel); } GtkWidget * Index: gedit/search-panel.glade =================================================================== RCS file: /cvs/gnome/gedit/gedit/Attic/search-panel.glade,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 search-panel.glade --- gedit/search-panel.glade 14 Jun 2005 11:55:56 -0000 1.1.2.1 +++ gedit/search-panel.glade 18 Oct 2005 14:34:49 -0000 @@ -100,8 +100,12 @@ 6 - + True + sexy_icon_entry_new + 0 + 0 + Search for (Ctrl+F) True True @@ -111,6 +115,9 @@ True * True + 0