[epiphany/wip/history-rewrite: 7/9] history-window: Add a view for the hosts
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/history-rewrite: 7/9] history-window: Add a view for the hosts
- Date: Tue, 6 Mar 2012 13:54:20 +0000 (UTC)
commit 5012d8a02e0ad74b0946941a916decbf5959af81
Author: Claudio Saavedra <csaavedra igalia com>
Date: Fri Mar 2 21:37:30 2012 +0200
history-window: Add a view for the hosts
embed/Makefile.am | 4 +
embed/ephy-hosts-store.c | 101 ++++++++++++++++++++++++++++
embed/ephy-hosts-store.h | 69 +++++++++++++++++++
embed/ephy-hosts-view.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++
embed/ephy-hosts-view.h | 57 ++++++++++++++++
5 files changed, 396 insertions(+), 0 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index dec4afb..30f44c3 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -29,6 +29,8 @@ INST_H_FILES = \
ephy-history-store.h \
ephy-history-view.h \
ephy-permission-manager.h \
+ ephy-hosts-store.h \
+ ephy-hosts-view.h \
ephy-web-view.h
@@ -55,6 +57,8 @@ libephyembed_la_SOURCES = \
ephy-permission-manager.c \
ephy-request-about.c \
ephy-embed-prefs.c \
+ ephy-hosts-store.c \
+ ephy-hosts-view.c \
ephy-web-app-utils.c \
ephy-web-view.c \
$(INST_H_FILES) \
diff --git a/embed/ephy-hosts-store.c b/embed/ephy-hosts-store.c
new file mode 100644
index 0000000..ca84f4b
--- /dev/null
+++ b/embed/ephy-hosts-store.c
@@ -0,0 +1,101 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* vim: set sw=2 ts=2 sts=2 et: */
+/*
+ * Copyright  2011, 2012 Igalia S.L.
+ *
+ * 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include "ephy-hosts-store.h"
+
+#include <gtk/gtk.h>
+
+G_DEFINE_TYPE (EphyHostsStore, ephy_hosts_store, GTK_TYPE_LIST_STORE)
+
+static void
+ephy_hosts_store_class_init (EphyHostsStoreClass *klass)
+{
+}
+
+static void
+ephy_hosts_store_init (EphyHostsStore *self)
+{
+ GType types[EPHY_HOSTS_STORE_N_COLUMNS];
+
+ types[EPHY_HOSTS_STORE_COLUMN_ID] = G_TYPE_INT;
+ types[EPHY_HOSTS_STORE_COLUMN_TITLE] = G_TYPE_STRING;
+ types[EPHY_HOSTS_STORE_COLUMN_ADDRESS] = G_TYPE_STRING;
+ types[EPHY_HOSTS_STORE_COLUMN_VISIT_COUNT] = G_TYPE_INT;
+
+ gtk_list_store_set_column_types (GTK_LIST_STORE (self),
+ EPHY_HOSTS_STORE_N_COLUMNS,
+ types);
+}
+
+EphyHostsStore *
+ephy_hosts_store_new (void)
+{
+ return g_object_new (EPHY_TYPE_HOSTS_STORE,
+ NULL);
+}
+
+void
+ephy_hosts_store_add_hosts (EphyHostsStore *store,
+ GList *hosts)
+{
+ EphyHistoryHost *host;
+ GList *iter;
+
+ for (iter = hosts; iter != NULL; iter = iter->next) {
+ host = (EphyHistoryHost *)iter->data;
+ gtk_list_store_insert_with_values (GTK_LIST_STORE (store),
+ NULL, -1,
+ EPHY_HOSTS_STORE_COLUMN_ID, host->id,
+ EPHY_HOSTS_STORE_COLUMN_TITLE, host->title,
+ EPHY_HOSTS_STORE_COLUMN_ADDRESS, host->url,
+ EPHY_HOSTS_STORE_COLUMN_VISIT_COUNT, host->visit_count,
+ -1);
+ }
+}
+
+void
+ephy_hosts_store_add_host (EphyHostsStore *store, EphyHistoryHost *host)
+{
+ GList *hosts = NULL;
+ hosts = g_list_append (hosts, host);
+ ephy_hosts_store_add_hosts (store, hosts);
+ g_list_free (hosts);
+}
+
+EphyHistoryHost *
+ephy_hosts_store_get_host_from_path (EphyHostsStore *store,
+ GtkTreePath *path)
+{
+ GtkTreeIter iter;
+
+ EphyHistoryHost *host = ephy_history_host_new ("", "", 0, 1.0);
+
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ EPHY_HOSTS_STORE_COLUMN_ID, &host->id,
+ EPHY_HOSTS_STORE_COLUMN_TITLE, &host->title,
+ EPHY_HOSTS_STORE_COLUMN_ADDRESS, &host->url,
+ EPHY_HOSTS_STORE_COLUMN_VISIT_COUNT, &host->visit_count,
+ -1);
+ return host;
+}
diff --git a/embed/ephy-hosts-store.h b/embed/ephy-hosts-store.h
new file mode 100644
index 0000000..5b61902
--- /dev/null
+++ b/embed/ephy-hosts-store.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* vim: set sw=2 ts=2 sts=2 et: */
+/*
+ * Copyright  2011-2012 Igalia S.L.
+ *
+ * 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _EPHY_HOSTS_STORE_H
+#define _EPHY_HOSTS_STORE_H
+
+#include "ephy-history-types.h"
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_HOSTS_STORE (ephy_hosts_store_get_type())
+#define EPHY_HOSTS_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_HOSTS_STORE, EphyHostsStore))
+#define EPHY_HOSTS_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_HOSTS_STORE, EphyHostsStoreClass))
+#define EPHY_IS_HOSTS_STORE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_HOSTS_STORE))
+#define EPHY_IS_HOSTS_STORE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_HOSTS_STORE))
+#define EPHY_HOSTS_STORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_HOSTS_STORE, EphyHostsStoreClass))
+
+typedef struct _EphyHostsStore EphyHostsStore;
+typedef struct _EphyHostsStoreClass EphyHostsStoreClass;
+typedef struct _EphyHostsStorePrivate EphyHostsStorePrivate;
+
+typedef enum {
+ EPHY_HOSTS_STORE_COLUMN_ID = 0,
+ EPHY_HOSTS_STORE_COLUMN_TITLE,
+ EPHY_HOSTS_STORE_COLUMN_ADDRESS,
+ EPHY_HOSTS_STORE_COLUMN_VISIT_COUNT,
+ EPHY_HOSTS_STORE_N_COLUMNS
+} EphyHostsStoreColumn;
+
+struct _EphyHostsStore
+{
+ GtkListStore parent;
+};
+
+struct _EphyHostsStoreClass
+{
+ GtkListStoreClass parent_class;
+};
+
+GType ephy_hosts_store_get_type (void) G_GNUC_CONST;
+EphyHostsStore* ephy_hosts_store_new (void);
+void ephy_hosts_store_add_hosts (EphyHostsStore *store, GList *hosts);
+void ephy_hosts_store_add_host (EphyHostsStore *store, EphyHistoryHost *host);
+void ephy_hosts_store_add_visits (EphyHostsStore *store, GList *visits);
+EphyHistoryHost* ephy_hosts_store_get_host_from_path (EphyHostsStore *store, GtkTreePath *path);
+
+G_END_DECLS
+
+#endif /* _EPHY_HOSTS_STORE_H */
diff --git a/embed/ephy-hosts-view.c b/embed/ephy-hosts-view.c
new file mode 100644
index 0000000..f508c83
--- /dev/null
+++ b/embed/ephy-hosts-view.c
@@ -0,0 +1,165 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* vim: set sw=2 ts=2 sts=2 et: */
+/*
+ * Copyright  2011, 2012 Igalia S.L.
+ *
+ * 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include "ephy-hosts-view.h"
+
+#include "ephy-gui.h"
+#include "ephy-hosts-store.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
+G_DEFINE_TYPE (EphyHostsView, ephy_hosts_view, GTK_TYPE_TREE_VIEW)
+static void
+ephy_hosts_view_class_init (EphyHostsViewClass *klass)
+{
+}
+
+static gboolean
+button_event_modifies_selection (GdkEventButton *event)
+{
+ return (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
+}
+
+static gboolean
+ephy_hosts_view_button_press_cb (GtkWidget *treeview,
+ GdkEventButton *event,
+ EphyHostsView *view)
+{
+ GtkTreeSelection *selection;
+ GtkTreePath *path = NULL;
+ gboolean path_is_selected, call_parent = TRUE;
+
+ if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (treeview)))
+ return GTK_WIDGET_CLASS (ephy_hosts_view_parent_class)->button_press_event (treeview, event);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+ if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview),
+ event->x,
+ event->y,
+ &path,
+ NULL, NULL, NULL)) {
+ path_is_selected = gtk_tree_selection_path_is_selected (selection, path);
+
+ if (!gtk_widget_is_focus (GTK_WIDGET (treeview)))
+ gtk_widget_grab_focus (GTK_WIDGET (treeview));
+
+ if (event->button == 3 && path_is_selected)
+ call_parent = FALSE;
+
+ if (!button_event_modifies_selection (event) &&
+ event->button == 1 && path_is_selected &&
+ gtk_tree_selection_count_selected_rows (selection) > 1)
+ call_parent = FALSE;
+
+ if (call_parent)
+ GTK_WIDGET_CLASS (ephy_hosts_view_parent_class)->button_press_event (treeview, event);
+
+ if (event->button == 3) {
+ gboolean retval;
+
+ g_signal_emit_by_name (view, "popup_menu", &retval);
+ }
+ gtk_tree_path_free (path);
+ } else
+ gtk_tree_selection_unselect_all (selection);
+
+ return TRUE;
+}
+
+static void
+ephy_hosts_view_init (EphyHostsView *self)
+{
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
+
+ column = gtk_tree_view_column_new_with_attributes (_("Sites"),
+ gtk_cell_renderer_text_new (),
+ "text", EPHY_HOSTS_STORE_COLUMN_TITLE,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (self), column);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+
+ g_signal_connect_object (self, "button_press_event",
+ G_CALLBACK (ephy_hosts_view_button_press_cb),
+ self, 0);
+}
+
+GtkWidget *
+ephy_hosts_view_new (void)
+{
+ return g_object_new (EPHY_TYPE_HOSTS_VIEW, NULL);
+}
+
+void
+ephy_hosts_view_popup (EphyHostsView *view, GtkWidget *menu)
+{
+ GdkEvent *event;
+
+ event = gtk_get_current_event ();
+ if (event)
+ {
+ if (event->type == GDK_KEY_PRESS) {
+ GdkEventKey *key = (GdkEventKey *) event;
+
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+ ephy_gui_menu_position_tree_selection,
+ view, 0, key->time);
+ gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+ } else if (event->type == GDK_BUTTON_PRESS) {
+ GdkEventButton *button = (GdkEventButton *) event;
+
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL,
+ NULL, button->button, button->time);
+ }
+ gdk_event_free (event);
+ }
+}
+
+static void
+get_selection (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer *data)
+{
+ EphyHistoryHost *host;
+
+ host = ephy_hosts_store_get_host_from_path (EPHY_HOSTS_STORE (model), path);
+ *data = g_list_prepend (*data, host);
+}
+
+GList *
+ephy_hosts_view_get_selection (EphyHostsView *view)
+{
+ GtkTreeSelection *selection;
+ GList *list = NULL;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+ gtk_tree_selection_selected_foreach (selection,
+ (GtkTreeSelectionForeachFunc) get_selection,
+ &list);
+
+ return g_list_reverse (list);
+}
diff --git a/embed/ephy-hosts-view.h b/embed/ephy-hosts-view.h
new file mode 100644
index 0000000..534903c
--- /dev/null
+++ b/embed/ephy-hosts-view.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* vim: set sw=2 ts=2 sts=2 et: */
+/*
+ * Copyright  2011, 2012 Igalia S.L.
+ *
+ * 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _EPHY_HOSTS_VIEW_H
+#define _EPHY_HOSTS_VIEW_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_HOSTS_VIEW (ephy_hosts_view_get_type())
+#define EPHY_HOSTS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_HOSTS_VIEW, EphyHostsView))
+#define EPHY_HOSTS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_HOSTS_VIEW, EphyHostsViewClass))
+#define EPHY_IS_HOSTS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_HOSTS_VIEW))
+#define EPHY_IS_HOSTS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_HOSTS_VIEW))
+#define EPHY_HOSTS_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_HOSTS_VIEW, EphyHostsViewClass))
+
+typedef struct _EphyHostsView EphyHostsView;
+typedef struct _EphyHostsViewClass EphyHostsViewClass;
+typedef struct _EphyHostsViewPrivate EphyHostsViewPrivate;
+
+struct _EphyHostsView
+{
+ GtkTreeView parent;
+};
+
+struct _EphyHostsViewClass
+{
+ GtkTreeViewClass parent_class;
+};
+
+GType ephy_hosts_view_get_type (void) G_GNUC_CONST;
+GtkWidget *ephy_hosts_view_new (void);
+void ephy_hosts_view_popup (EphyHostsView *view, GtkWidget *menu);
+GList * ephy_hosts_view_get_selection (EphyHostsView *view);
+
+G_END_DECLS
+
+#endif /* _EPHY_HOSTS_VIEW_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
