aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-05-26 05:42:47 +0800
committerChristian Persch <chpe@src.gnome.org>2005-05-26 05:42:47 +0800
commit3571a080a43a4c9e61791a78f7268ad06670d47c (patch)
tree1655e91ec83a0b177cf06380ddb7fcb6bdac7cfa /src
parent874ffe279950eaa51506884283452386a5de350b (diff)
downloadgsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar.gz
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar.bz2
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar.lz
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar.xz
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.tar.zst
gsoc2013-epiphany-3571a080a43a4c9e61791a78f7268ad06670d47c.zip
A src/ephy-find-toolbar.c: A src/ephy-find-toolbar.h:
2005-05-25 Christian Persch <chpe@cvs.gnome.org> * embed/Makefile.am: * embed/find-dialog.c: * embed/find-dialog.h: A src/ephy-find-toolbar.c: A src/ephy-find-toolbar.h: * src/ephy-window.c: (sync_tab_document_type), (tab_content_changed_cb), (ephy_window_set_active_tab), (ephy_window_dispose), (sync_find_toolbar_text_cb), (find_toolbar_find_next_cb), (find_toolbar_find_previous_cb), (find_toolbar_close_cb), (ephy_window_init), (ephy_window_notebook_switch_page_cb), (ephy_window_find): Replace the find dialogue with a find toolbar. Work in progress; no typeaheadfind yet.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ephy-find-toolbar.c386
-rw-r--r--src/ephy-find-toolbar.h72
-rw-r--r--src/ephy-window.c155
4 files changed, 567 insertions, 48 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 71f511843..ecad19dbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ NOINST_H_FILES = \
ephy-automation.h \
ephy-encoding-dialog.h \
ephy-encoding-menu.h \
+ ephy-find-toolbar.h \
ephy-fullscreen-popup.h \
ephy-go-action.h \
ephy-history-window.h \
@@ -75,6 +76,7 @@ libephymain_la_SOURCES = \
ephy-encoding-menu.c \
ephy-extension.c \
ephy-extensions-manager.c \
+ ephy-find-toolbar.c \
ephy-fullscreen-popup.c \
ephy-go-action.c \
ephy-home-action.c \
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
new file mode 100644
index 000000000..93ce237fe
--- /dev/null
+++ b/src/ephy-find-toolbar.c
@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2004 Tommi Komulainen
+ * Copyright (C) 2004, 2005 Christian Persch
+ *
+ * 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
+ */
+
+#include "config.h"
+
+#include "ephy-find-toolbar.h"
+#include "ephy-debug.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
+#include <gtk/gtkarrow.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkseparatortoolitem.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtktoolbutton.h>
+#include <gtk/gtkmain.h>
+#include <string.h>
+
+#define EPHY_FIND_TOOLBAR_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarPrivate))
+
+struct _EphyFindToolbarPrivate
+{
+ EphyWindow *window;
+ GtkWidget *entry;
+ GtkToolItem *next;
+ GtkToolItem *prev;
+ gulong set_focus_handler;
+};
+
+enum
+{
+ PROP_0,
+ PROP_TEXT
+};
+
+enum
+{
+ NEXT,
+ PREVIOUS,
+ CLOSE,
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+static GObjectClass *parent_class = NULL;
+
+/* public functions */
+
+const char *
+ephy_find_toolbar_get_text (EphyFindToolbar *toolbar)
+{
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+
+ return gtk_entry_get_text (GTK_ENTRY (priv->entry));
+}
+
+void
+ephy_find_toolbar_set_controls (EphyFindToolbar *toolbar,
+ gboolean can_find_next,
+ gboolean can_find_prev)
+{
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+
+ gtk_widget_set_sensitive (GTK_WIDGET (priv->next), can_find_next);
+ gtk_widget_set_sensitive (GTK_WIDGET (priv->prev), can_find_prev);
+}
+
+/* private functions */
+
+static void
+find_next_cb (EphyFindToolbar *toolbar)
+{
+ g_signal_emit (toolbar, signals[NEXT], 0);
+}
+
+static void
+find_prev_cb (EphyFindToolbar *toolbar)
+{
+ g_signal_emit (toolbar, signals[PREVIOUS], 0);
+}
+
+static void
+entry_changed_cb (GtkEntry *entry,
+ GObject *toolbar)
+{
+ g_object_notify (toolbar, "text");
+}
+
+static gboolean
+entry_key_press_event_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ EphyFindToolbar *toolbar)
+{
+ //EphyFindToolbarPrivate *priv = toolbar->priv;
+ guint mask = gtk_accelerator_get_default_mod_mask ();
+ gboolean handled = FALSE;
+
+ /* Hide the toolbar when ESC is pressed */
+ if ((event->state & mask) == 0)
+ {
+ if (event->keyval == GDK_Escape)
+ {
+ g_signal_emit (toolbar, signals[CLOSE], 0);
+
+ handled = TRUE;
+ }
+#if 0
+ else if (event->keyval == GDK_Page_Up)
+ {
+ ephy_command_manager_do_command
+ (EPHY_COMMAND_MANAGER (priv->embed),
+ "cmd_movePageUp");
+ handled = TRUE;
+ }
+ else if (event->keyval == GDK_Page_Down)
+ {
+ ephy_command_manager_do_command
+ (EPHY_COMMAND_MANAGER (priv->embed),
+ "cmd_movePageDown");
+ handled = TRUE;
+ }
+#endif
+ }
+
+ return handled;
+}
+
+static void
+set_focus_cb (EphyWindow *window,
+ GtkWidget *widget,
+ EphyFindToolbar *toolbar)
+{
+ GtkWidget *wtoolbar = GTK_WIDGET (toolbar);
+
+ while (widget != NULL && widget != wtoolbar)
+ {
+ widget = widget->parent;
+ }
+
+ /* if widget == toolbar, the new focus widget is in the toolbar, so we
+ * don't deactivate.
+ */
+ if (widget != wtoolbar)
+ {
+ gtk_widget_hide (wtoolbar);
+ }
+}
+
+static void
+ephy_find_toolbar_parent_set (GtkWidget *widget,
+ GtkWidget *previous_parent)
+{
+ EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (widget);
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+ GtkWidget *toplevel;
+
+ if (widget->parent != NULL && priv->set_focus_handler == 0)
+ {
+ toplevel = gtk_widget_get_toplevel (widget);
+ priv->set_focus_handler =
+ g_signal_connect (toplevel, "set-focus",
+ G_CALLBACK (set_focus_cb), toolbar);
+ }
+}
+
+static void
+ephy_find_toolbar_grab_focus (GtkWidget *widget)
+{
+ EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (widget);
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+
+ gtk_widget_grab_focus (priv->entry);
+}
+
+static void
+ephy_find_toolbar_init (EphyFindToolbar *toolbar)
+{
+ EphyFindToolbarPrivate *priv;
+ GtkToolbar *gtoolbar;
+ GtkToolItem *item;
+ GtkWidget *arrow, *box, *label;
+
+ priv = toolbar->priv = EPHY_FIND_TOOLBAR_GET_PRIVATE (toolbar);
+ gtoolbar = GTK_TOOLBAR (toolbar);
+
+ gtk_toolbar_set_style (gtoolbar, GTK_TOOLBAR_BOTH_HORIZ);
+
+ /* Find: |_____| */
+ box = gtk_hbox_new (FALSE, 12);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("Find:"));
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+
+ priv->entry = gtk_entry_new ();
+ gtk_entry_set_width_chars (GTK_ENTRY (priv->entry), 32);
+ gtk_entry_set_max_length (GTK_ENTRY (priv->entry), 512);
+ gtk_box_pack_start (GTK_BOX (box), priv->entry, TRUE, TRUE, 0);
+
+ item = gtk_tool_item_new ();
+ gtk_container_add (GTK_CONTAINER (item), box);
+ //gtk_tool_item_set_expand (item, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+ gtk_widget_show_all (GTK_WIDGET (item));
+
+ // FIXME padding
+
+ /* Next */
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ label = gtk_label_new (_("Find Next"));
+ priv->next = gtk_tool_button_new (arrow, _("Find Next"));
+ gtk_tool_item_set_is_important (priv->next, TRUE);
+ gtk_tool_item_set_tooltip (priv->next, gtoolbar->tooltips,
+ _("Find next occurrence of the search string"),
+ NULL);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->next, -1);
+ gtk_widget_show_all (GTK_WIDGET (priv->next));
+
+ /* Prev */
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ label = gtk_label_new (_("Find Previous"));
+ priv->prev = gtk_tool_button_new (arrow, _("Find Previous"));
+ gtk_tool_item_set_is_important (priv->prev, TRUE);
+ gtk_tool_item_set_tooltip (priv->prev, gtoolbar->tooltips,
+ _("Find previous occurrence of the search string"),
+ NULL);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->prev, -1);
+ gtk_widget_show_all (GTK_WIDGET (priv->prev));
+
+ /* connect signals */
+ g_signal_connect (priv->entry, "key-press-event",
+ G_CALLBACK (entry_key_press_event_cb), toolbar);
+ g_signal_connect_after (priv->entry, "changed",
+ G_CALLBACK (entry_changed_cb), toolbar);
+ //g_signal_connect (GTK_ENTRY (priv->entry)->im_context, "preedit-changed",
+ // G_CALLBACK (entry_preedit_changed_cb), toolbar);
+ g_signal_connect_swapped (priv->entry, "activate",
+ G_CALLBACK (find_next_cb), toolbar);
+ g_signal_connect_swapped (priv->next, "clicked",
+ G_CALLBACK (find_next_cb), toolbar);
+ g_signal_connect_swapped (priv->prev, "clicked",
+ G_CALLBACK (find_prev_cb), toolbar);
+}
+
+static void
+ephy_find_toolbar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (object);
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+
+ switch (prop_id)
+ {
+ case PROP_TEXT:
+ gtk_entry_set_text (GTK_ENTRY (priv->entry),
+ g_value_get_string (value));
+ break;
+ }
+}
+
+static void
+ephy_find_toolbar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (object);
+
+ switch (prop_id)
+ {
+ case PROP_TEXT:
+ g_value_set_string (value, ephy_find_toolbar_get_text (toolbar));
+ break;
+ }
+}
+
+static void
+ephy_find_toolbar_class_init (EphyFindToolbarClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->set_property = ephy_find_toolbar_set_property;
+ object_class->get_property = ephy_find_toolbar_get_property;
+
+ widget_class->parent_set = ephy_find_toolbar_parent_set;
+ widget_class->grab_focus = ephy_find_toolbar_grab_focus;
+
+ signals[NEXT] =
+ g_signal_new ("next",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EphyFindToolbarClass, next),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ signals[PREVIOUS] =
+ g_signal_new ("previous",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (EphyFindToolbarClass, previous),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ signals[CLOSE] =
+ g_signal_new ("close",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (EphyFindToolbarClass, close),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ g_object_class_install_property
+ (object_class,
+ PROP_TEXT,
+ g_param_spec_string ("text",
+ "Search string",
+ "Search string",
+ "",
+ G_PARAM_READWRITE));
+
+ g_type_class_add_private (klass, sizeof (EphyFindToolbarPrivate));
+}
+
+GType
+ephy_find_toolbar_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ {
+ static const GTypeInfo our_info =
+ {
+ sizeof (EphyFindToolbarClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) ephy_find_toolbar_class_init,
+ NULL,
+ NULL, /* class_data */
+ sizeof (EphyFindToolbar),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) ephy_find_toolbar_init
+ };
+
+ type = g_type_register_static (GTK_TYPE_TOOLBAR,
+ "EphyFindToolbar",
+ &our_info, 0);
+ }
+
+ return type;
+}
+
+EphyFindToolbar *
+ephy_find_toolbar_new (void)
+{
+ return EPHY_FIND_TOOLBAR (g_object_new (EPHY_TYPE_FIND_TOOLBAR, NULL));
+}
diff --git a/src/ephy-find-toolbar.h b/src/ephy-find-toolbar.h
new file mode 100644
index 000000000..8f3ef4567
--- /dev/null
+++ b/src/ephy-find-toolbar.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2004 Tommi Komulainen
+ * Copyright (C) 2004, 2005 Christian Persch
+ *
+ * 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; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
+ */
+
+#ifndef EPHY_FIND_TOOLBAR_H
+#define EPHY_FIND_TOOLBAR_H
+
+#include <gtk/gtktoolbar.h>
+
+#include "ephy-window.h"
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_FIND_TOOLBAR (ephy_find_toolbar_get_type ())
+#define EPHY_FIND_TOOLBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbar))
+#define EPHY_FIND_TOOLBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarClass))
+#define EPHY_IS_FIND_TOOLBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_FIND_TOOLBAR))
+#define EPHY_IS_FIND_TOOLBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FIND_TOOLBAR))
+#define EPHY_FIND_TOOLBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarClass))
+
+typedef struct _EphyFindToolbar EphyFindToolbar;
+typedef struct _EphyFindToolbarPrivate EphyFindToolbarPrivate;
+typedef struct _EphyFindToolbarClass EphyFindToolbarClass;
+
+struct _EphyFindToolbar
+{
+ GtkToolbar parent;
+
+ /*< private >*/
+ EphyFindToolbarPrivate *priv;
+};
+
+struct _EphyFindToolbarClass
+{
+ GtkToolbarClass parent_class;
+
+ /* Signals */
+ void (* next) (EphyFindToolbar *toolbar);
+ void (* previous) (EphyFindToolbar *toolbar);
+ void (* close) (EphyFindToolbar *toolbar);
+};
+
+GType ephy_find_toolbar_get_type (void) G_GNUC_CONST;
+
+EphyFindToolbar *ephy_find_toolbar_new (void);
+
+const char *ephy_find_toolbar_get_text (EphyFindToolbar *toolbar);
+
+void ephy_find_toolbar_set_controls (EphyFindToolbar *toolbar,
+ gboolean next,
+ gboolean previous);
+
+G_END_DECLS
+
+#endif /* EPHY_FIND_TOOLBAR_H */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 642e9a8eb..79c5efee4 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -31,8 +31,6 @@
#include "ephy-state.h"
#include "ppview-toolbar.h"
#include "window-commands.h"
-#include "find-dialog.h"
-#include "print-dialog.h"
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
#include "ephy-shell.h"
@@ -57,6 +55,7 @@
#include "ephy-notebook.h"
#include "ephy-fullscreen-popup.h"
#include "ephy-action-helper.h"
+#include "ephy-find-toolbar.h"
#include <string.h>
#include <glib/gi18n.h>
@@ -411,7 +410,7 @@ struct _EphyWindowPrivate
PPViewToolbar *ppview_toolbar;
GtkNotebook *notebook;
EphyTab *active_tab;
- EphyDialog *find_dialog;
+ EphyFindToolbar *find_toolbar;
guint num_tabs;
guint tab_message_cid;
guint help_message_cid;
@@ -1129,11 +1128,14 @@ sync_tab_document_type (EphyTab *tab,
GParamSpec *pspec,
EphyWindow *window)
{
- GtkActionGroup *action_group;
+ EphyWindowPrivate *priv = window->priv;
+ GtkActionGroup *action_group = priv->action_group;
GtkAction *action;
EphyEmbedDocumentType type;
gboolean can_find, disable;
+ if (priv->closing) return;
+
/* update zoom actions */
sync_tab_zoom (tab, NULL, window);
@@ -1141,7 +1143,6 @@ sync_tab_document_type (EphyTab *tab,
can_find = (type != EPHY_EMBED_DOCUMENT_IMAGE);
disable = (type != EPHY_EMBED_DOCUMENT_HTML);
- action_group = window->priv->action_group;
action = gtk_action_group_get_action (action_group, "ViewEncoding");
ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, disable);
action = gtk_action_group_get_action (action_group, "ViewPageSource");
@@ -1152,6 +1153,11 @@ sync_tab_document_type (EphyTab *tab,
ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, !can_find);
action = gtk_action_group_get_action (action_group, "EditFindPrev");
ephy_action_change_sensitivity_flags (action, SENS_FLAG_DOCUMENT, !can_find);
+
+ if (!can_find)
+ {
+ gtk_widget_hide (GTK_WIDGET (priv->find_toolbar));
+ }
}
static void
@@ -1784,6 +1790,18 @@ tab_context_menu_cb (EphyEmbed *embed,
return TRUE;
}
+static void
+tab_content_changed_cb (EphyEmbed *embed,
+ const char *uri,
+ EphyWindow *window)
+{
+ EphyWindowPrivate *priv = window->priv;
+
+ if (priv->closing) return;
+
+ ephy_find_toolbar_set_controls (priv->find_toolbar, TRUE, TRUE);
+}
+
static gboolean
let_me_resize_hack (EphyWindow *window)
{
@@ -1904,6 +1922,8 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab)
g_signal_handlers_disconnect_by_func
(embed, G_CALLBACK (tab_context_menu_cb), window);
g_signal_handlers_disconnect_by_func
+ (embed, G_CALLBACK (tab_content_changed_cb), window);
+ g_signal_handlers_disconnect_by_func
(embed, G_CALLBACK (tab_size_to_cb), window);
}
@@ -1965,6 +1985,9 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab)
g_signal_connect_object (embed, "ge-context-menu",
G_CALLBACK (tab_context_menu_cb),
window, G_CONNECT_AFTER);
+ g_signal_connect_object (embed, "ge-content-change",
+ G_CALLBACK (tab_content_changed_cb),
+ window, G_CONNECT_AFTER);
g_signal_connect_object (embed, "size-to",
G_CALLBACK (tab_size_to_cb),
window, 0);
@@ -2334,12 +2357,6 @@ ephy_window_dispose (GObject *object)
priv->idle_resize_handler = 0;
}
- if (priv->find_dialog)
- {
- g_object_unref (G_OBJECT (priv->find_dialog));
- priv->find_dialog = NULL;
- }
-
g_object_unref (priv->fav_menu);
priv->fav_menu = NULL;
@@ -2673,8 +2690,66 @@ ephy_window_open_link (EphyLink *link,
}
static void
+sync_find_toolbar_text_cb (EphyFindToolbar *toolbar,
+ GParamSpec *pspec,
+ EphyWindow *window)
+{
+ EphyEmbed *embed;
+ const char *text;
+
+ embed = ephy_window_get_active_embed (window);
+ g_return_if_fail (embed != NULL);
+
+ text = ephy_find_toolbar_get_text (toolbar);
+ ephy_embed_find_set_properties (embed, text, FALSE, TRUE);
+ ephy_find_toolbar_set_controls (toolbar, TRUE, TRUE);
+}
+
+static void
+find_toolbar_find_next_cb (EphyFindToolbar *toolbar,
+ EphyWindow *window)
+{
+ EphyEmbed *embed;
+ const char *text;
+ gboolean found;
+
+ embed = ephy_window_get_active_embed (window);
+ g_return_if_fail (embed != NULL);
+
+ text = ephy_find_toolbar_get_text (toolbar);
+ ephy_embed_find_set_properties (embed, text, FALSE, TRUE);
+ found = ephy_embed_find_next (embed, FALSE);
+ ephy_find_toolbar_set_controls (toolbar, found, found);
+}
+
+static void
+find_toolbar_find_previous_cb (EphyFindToolbar *toolbar,
+ EphyWindow *window)
+{
+ EphyEmbed *embed;
+ const char *text;
+ gboolean found;
+
+ embed = ephy_window_get_active_embed (window);
+ g_return_if_fail (embed != NULL);
+
+ text = ephy_find_toolbar_get_text (toolbar);
+ ephy_embed_find_set_properties (embed, text, FALSE, TRUE);
+ found = ephy_embed_find_next (embed, TRUE);
+ ephy_find_toolbar_set_controls (toolbar, found, found);
+}
+
+static void
+find_toolbar_close_cb (EphyFindToolbar *toolbar,
+ EphyWindow *window)
+{
+ gtk_widget_hide (GTK_WIDGET (toolbar));
+}
+
+static void
ephy_window_init (EphyWindow *window)
{
+ EphyWindowPrivate *priv;
EphyExtension *manager;
EphyEmbedSingle *single;
EggToolbarsModel *model;
@@ -2684,7 +2759,7 @@ ephy_window_init (EphyWindow *window)
g_object_ref (ephy_shell);
- window->priv = EPHY_WINDOW_GET_PRIVATE (window);
+ priv = window->priv = EPHY_WINDOW_GET_PRIVATE (window);
window->priv->chrome = EPHY_EMBED_CHROME_ALL;
@@ -2701,6 +2776,19 @@ ephy_window_init (EphyWindow *window)
TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (window->priv->notebook));
+ priv->find_toolbar = ephy_find_toolbar_new ();
+ g_signal_connect (priv->find_toolbar, "notify::text",
+ G_CALLBACK (sync_find_toolbar_text_cb), window);
+ g_signal_connect (priv->find_toolbar, "next",
+ G_CALLBACK (find_toolbar_find_next_cb), window);
+ g_signal_connect (priv->find_toolbar, "previous",
+ G_CALLBACK (find_toolbar_find_previous_cb), window);
+ g_signal_connect (priv->find_toolbar, "close",
+ G_CALLBACK (find_toolbar_close_cb), window);
+ gtk_box_pack_start (GTK_BOX (window->priv->main_vbox),
+ GTK_WIDGET (priv->find_toolbar), FALSE, FALSE, 0);
+ gtk_widget_show (GTK_WIDGET (priv->find_toolbar));
+
window->priv->statusbar = ephy_statusbar_new ();
gtk_box_pack_end (GTK_BOX (window->priv->main_vbox),
GTK_WIDGET (window->priv->statusbar),
@@ -3196,32 +3284,15 @@ ephy_window_get_tabs (EphyWindow *window)
}
static void
-update_embed_dialogs (EphyWindow *window,
- EphyTab *tab)
-{
- EphyEmbed *embed;
- EphyDialog *find_dialog = window->priv->find_dialog;
-
- embed = ephy_tab_get_embed (tab);
-
- if (find_dialog)
- {
- ephy_embed_dialog_set_embed
- (EPHY_EMBED_DIALOG(find_dialog),
- embed);
- }
-}
-
-static void
ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num,
EphyWindow *window)
{
+ EphyWindowPrivate *priv = window->priv;
EphyTab *tab;
- g_return_if_fail (EPHY_IS_WINDOW (window));
- if (window->priv->closing) return;
+ if (priv->closing) return;
/* get the new tab */
tab = real_get_active_tab (window, page_num);
@@ -3229,7 +3300,7 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
/* update new tab */
ephy_window_set_active_tab (window, tab);
- update_embed_dialogs (window, tab);
+ ephy_find_toolbar_set_controls (priv->find_toolbar, TRUE, TRUE);
/* update window controls */
update_tabs_menu_sensitivity (window);
@@ -3244,23 +3315,11 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
void
ephy_window_find (EphyWindow *window)
{
- EphyDialog *dialog;
- EphyEmbed *embed;
-
- if (window->priv->find_dialog == NULL)
- {
- embed = ephy_window_get_active_embed (window);
- g_return_if_fail (GTK_IS_WINDOW(window));
-
- dialog = find_dialog_new_with_parent (GTK_WIDGET(window),
- embed);
- window->priv->find_dialog = dialog;
-
- g_object_add_weak_pointer(G_OBJECT (dialog),
- (gpointer *) &window->priv->find_dialog);
- }
+ EphyWindowPrivate *priv = window->priv;
+ GtkWidget *toolbar = GTK_WIDGET (priv->find_toolbar);
- ephy_dialog_show (window->priv->find_dialog);
+ gtk_widget_show (toolbar);
+ gtk_widget_grab_focus (toolbar);
}
/**