[epiphany] Show the location entry always except in application mode
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Show the location entry always except in application mode
- Date: Sun, 11 Sep 2016 04:26:03 +0000 (UTC)
commit ad0951f6f6f9e457d0f2beb4db772ec0e5b5b4e7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Sep 10 22:20:13 2016 -0500
Show the location entry always except in application mode
The location entry needs to be discoverable. Jim Hall discovered that
users couldn't figure out how to visit web sites, kinda a problem for a
web browser. Allan has requested that we show the title box only in app
mode. Make it happen.
Move EphyLocationEntry from EphyTitleBox to EphyHeaderBar (formerly
EphyToolbar). Make EphyTitleBox inherit from GtkBox instead of GtkStack.
Have a lot of fun....
Some more cleanup is certainly possible, e.g. to avoid creating both an
EphyTitleBox and an EphyLocationEntry as only one will ever be used now,
but this is a pretty good start.
src/ephy-header-bar.c | 16 +-
src/ephy-location-controller.c | 13 --
src/ephy-title-box.c | 466 ++--------------------------------------
src/ephy-title-box.h | 18 +--
src/ephy-window.c | 11 +-
5 files changed, 43 insertions(+), 481 deletions(-)
---
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index f7ea639..238d088 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -546,12 +546,13 @@ static void
ephy_header_bar_constructed (GObject *object)
{
EphyHeaderBar *header_bar = EPHY_HEADER_BAR (object);
- GtkWidget *box, *button;
+ GtkWidget *box, *button, *title_widget;
GtkMenu *menu;
GMenu *page_menu;
EphyDownloadsManager *downloads_manager;
GtkBuilder *builder;
EphyHistoryService *history_service;
+ EphyEmbedShell *embed_shell;
G_OBJECT_CLASS (ephy_header_bar_parent_class)->constructed (object);
@@ -626,10 +627,15 @@ ephy_header_bar_constructed (GObject *object)
gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar), button);
/* Location bar + Title */
- header_bar->title_box = ephy_title_box_new (header_bar->window);
- header_bar->entry = ephy_title_box_get_location_entry (header_bar->title_box);
- gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), GTK_WIDGET (header_bar->title_box));
- gtk_widget_show (GTK_WIDGET (header_bar->title_box));
+ header_bar->title_box = ephy_title_box_new ();
+ header_bar->entry = ephy_location_entry_new ();
+ embed_shell = ephy_embed_shell_get_default ();
+ title_widget = ephy_embed_shell_get_mode (embed_shell) == EPHY_EMBED_SHELL_MODE_APPLICATION ? GTK_WIDGET
(header_bar->title_box)
+ :
header_bar->entry;
+ gtk_widget_set_margin_start (title_widget, 54);
+ gtk_widget_set_margin_end (title_widget, 54);
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (header_bar), title_widget);
+ gtk_widget_show (title_widget);
/* Page Menu */
button = gtk_menu_button_new ();
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index cef9802..61cff0d 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -278,16 +278,6 @@ sync_address (EphyLocationController *controller,
g_signal_handlers_unblock_by_func (widget, G_CALLBACK (user_changed_cb), controller);
}
-static void
-title_box_mode_changed_cb (EphyTitleBox *title_box,
- GParamSpec *psec,
- gpointer user_data)
-{
- EphyLocationController *controller = EPHY_LOCATION_CONTROLLER (user_data);
-
- sync_address (controller, NULL, GTK_WIDGET (controller->location_entry));
-}
-
static char *
get_location_cb (EphyLocationEntry *entry,
EphyLocationController *controller)
@@ -429,9 +419,6 @@ ephy_location_controller_constructed (GObject *object)
add_completion_actions (controller, controller->location_entry);
- g_signal_connect_object (controller->title_box, "notify::mode",
- G_CALLBACK (title_box_mode_changed_cb), controller, 0);
-
sync_address (controller, NULL, widget);
g_signal_connect_object (controller, "notify::address",
G_CALLBACK (sync_address), widget, 0);
diff --git a/src/ephy-title-box.c b/src/ephy-title-box.c
index b38fdb6..6020e6d 100644
--- a/src/ephy-title-box.c
+++ b/src/ephy-title-box.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
/*
* Copyright © 2013, 2014 Yosef Or Boczko <yoseforb gnome org>
+ * Copyright © 2016 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
@@ -25,23 +25,6 @@
#include "ephy-private.h"
#include "ephy-type-builtins.h"
-/**
- * SECTION:ephy-title-box
- * @short_description: A #GtkStack shown the title or the address of the page
- * @see_also: #GtkStack
- *
- * #EphyTitleBox displaying or the title & uri of the page or the address bar.
- */
-
-enum {
- PROP_0,
- PROP_WINDOW,
- PROP_MODE,
- N_PROPERTIES
-};
-
-static GParamSpec *object_properties[N_PROPERTIES] = { NULL, };
-
enum {
LOCK_CLICKED,
LAST_SIGNAL
@@ -50,117 +33,29 @@ enum {
static guint signals[LAST_SIGNAL];
struct _EphyTitleBox {
- GtkStack parent_instance;
-
- EphyWindow *window;
- WebKitWebView *web_view;
+ GtkBox parent_instance;
- EphyTitleBoxMode mode;
-
- GtkWidget *entry;
GtkWidget *lock_image;
GtkWidget *title;
GtkWidget *subtitle;
GBinding *title_binding;
-
- guint location_disabled;
- guint button_down : 1;
- guint switch_to_entry_timeout_id;
-
- gulong title_sig_id;
};
-G_DEFINE_TYPE (EphyTitleBox, ephy_title_box, GTK_TYPE_STACK)
+G_DEFINE_TYPE (EphyTitleBox, ephy_title_box, GTK_TYPE_BOX)
static void
-ephy_title_box_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ephy_title_box_constructed (GObject *object)
{
EphyTitleBox *title_box = EPHY_TITLE_BOX (object);
+ GtkStyleContext *context;
+ GtkWidget *hbox;
- switch (prop_id) {
- case PROP_MODE:
- g_value_set_enum (value, ephy_title_box_get_mode (title_box));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- }
-}
-
-static void
-ephy_title_box_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (object);
-
- switch (prop_id) {
- case PROP_WINDOW:
- title_box->window = EPHY_WINDOW (g_value_get_object (value));
- break;
- case PROP_MODE:
- ephy_title_box_set_mode (title_box, g_value_get_enum (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- }
-}
-
-static gboolean
-ephy_title_box_entry_key_press_cb (GtkWidget *widget,
- GdkEventKey *event,
- gpointer user_data)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (user_data);
- guint state = event->state & gtk_accelerator_get_default_mod_mask ();
-
- LOG ("key-press-event entry %p event %p title-box %p", widget, event, title_box);
-
- if (event->keyval == GDK_KEY_Escape && state == 0) {
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE);
- /* don't return GDK_EVENT_STOP since we want to cancel the autocompletion popup too */
- }
-
- return GDK_EVENT_PROPAGATE;
-}
-
-static gboolean
-ephy_title_box_view_focus_in_cb (GtkWidget *widget,
- GdkEventFocus *event,
- gpointer user_data)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (user_data);
-
- LOG ("focus-in-event web_view %p event %p title-box %p", widget, event, title_box);
-
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE);
-
- return GDK_EVENT_PROPAGATE;
-}
-
-static void
-ephy_title_box_add_address_bar (EphyTitleBox *title_box)
-{
- title_box->entry = ephy_location_entry_new ();
- gtk_widget_show (title_box->entry);
- gtk_stack_add_named (GTK_STACK (title_box), title_box->entry, "address-bar");
-}
+ LOG ("EphyTitleBox constructed");
-static void
-ephy_title_box_add_title_bar (EphyTitleBox *title_box)
-{
- GtkStyleContext *context;
- GtkWidget *box;
- GtkWidget *hbox;
+ G_OBJECT_CLASS (ephy_title_box_parent_class)->constructed (object);
- box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_set_valign (box, GTK_ALIGN_CENTER);
- gtk_widget_show (box);
- gtk_stack_add_named (GTK_STACK (title_box), box, "title-bar");
+ gtk_widget_add_events (GTK_WIDGET (title_box), GDK_BUTTON_PRESS_MASK);
title_box->title = gtk_label_new (NULL);
gtk_widget_show (title_box->title);
@@ -169,7 +64,7 @@ ephy_title_box_add_title_bar (EphyTitleBox *title_box)
gtk_label_set_line_wrap (GTK_LABEL (title_box->title), FALSE);
gtk_label_set_single_line_mode (GTK_LABEL (title_box->title), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (title_box->title), PANGO_ELLIPSIZE_END);
- gtk_box_pack_start (GTK_BOX (box), title_box->title, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (title_box), title_box->title, FALSE, FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
context = gtk_widget_get_style_context (hbox);
@@ -177,7 +72,7 @@ ephy_title_box_add_title_bar (EphyTitleBox *title_box)
gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
gtk_widget_set_valign (hbox, GTK_ALIGN_BASELINE);
gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (title_box), hbox, FALSE, FALSE, 0);
title_box->lock_image = gtk_image_new_from_icon_name ("channel-secure-symbolic", GTK_ICON_SIZE_MENU);
gtk_widget_set_valign (title_box->lock_image, GTK_ALIGN_BASELINE);
@@ -191,132 +86,18 @@ ephy_title_box_add_title_bar (EphyTitleBox *title_box)
gtk_label_set_ellipsize (GTK_LABEL (title_box->subtitle), PANGO_ELLIPSIZE_END);
gtk_label_set_selectable (GTK_LABEL (title_box->subtitle), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), title_box->subtitle, FALSE, FALSE, 0);
-}
-
-static void
-sync_chromes_visibility (EphyTitleBox *title_box)
-{
- EphyWindowChrome chrome;
- chrome = ephy_window_get_chrome (title_box->window);
- title_box->location_disabled = !(chrome & EPHY_WINDOW_CHROME_LOCATION);
-
- if (title_box->location_disabled)
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE);
-}
-
-
-static void
-ephy_title_box_constructed (GObject *object)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (object);
- EphyWindowChrome chrome;
-
- LOG ("EphyTitleBox constructed");
-
- G_OBJECT_CLASS (ephy_title_box_parent_class)->constructed (object);
-
- gtk_widget_add_events (GTK_WIDGET (title_box),
- GDK_BUTTON_PRESS_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_RELEASE_MASK);
-
- ephy_title_box_add_address_bar (title_box);
- ephy_title_box_add_title_bar (title_box);
-
- chrome = ephy_window_get_chrome (title_box->window);
- title_box->location_disabled = !(chrome & EPHY_WINDOW_CHROME_LOCATION);
- if (title_box->location_disabled) {
- title_box->mode = EPHY_TITLE_BOX_MODE_TITLE;
- gtk_stack_set_visible_child_name (GTK_STACK (title_box), "title-bar");
- } else {
- title_box->mode = EPHY_TITLE_BOX_MODE_LOCATION_ENTRY;
- gtk_stack_set_visible_child_name (GTK_STACK (title_box), "address-bar");
- }
-
- g_signal_connect_swapped (title_box->window, "notify::chrome",
- G_CALLBACK (sync_chromes_visibility),
- title_box);
-}
-
-static gboolean
-ephy_title_box_switch_to_entry_timeout_cb (gpointer user_data)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (user_data);
-
- LOG ("switch_to_entry_timeout_cb title-box %p switch_to_entry_timeout_id %u",
- title_box, title_box->switch_to_entry_timeout_id);
-
- title_box->switch_to_entry_timeout_id = 0;
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
- gtk_widget_grab_focus (title_box->entry);
-
- return G_SOURCE_REMOVE;
-}
-
-static void
-ephy_title_box_switch_to_entry_after_double_click_time (EphyTitleBox *title_box)
-{
- gint double_click_time;
-
- if (title_box->switch_to_entry_timeout_id > 0)
- return;
-
- LOG ("switch_to_entry_after_double_click_time title-box %p switch_to_entry_timeout_id %u",
- title_box, title_box->switch_to_entry_timeout_id);
-
- g_object_get (gtk_widget_get_settings (GTK_WIDGET (title_box)),
- "gtk-double-click-time", &double_click_time,
- NULL);
-
- /* We don't want to wait the maximum time allowed between two
- * clicks before showing the entry. A quarter of this time is enough.
- */
- title_box->switch_to_entry_timeout_id = g_timeout_add (double_click_time / 4,
- ephy_title_box_switch_to_entry_timeout_cb,
- title_box);
-}
-
-static void
-ephy_title_box_cancel_switch_to_entry_after_double_click_time (EphyTitleBox *title_box)
-{
- if (title_box->switch_to_entry_timeout_id == 0)
- return;
-
- LOG ("cancel_switch_to_entry_after_double_click_time title-box %p switch_to_entry_timeout_id %u",
- title_box, title_box->switch_to_entry_timeout_id);
-
- g_source_remove (title_box->switch_to_entry_timeout_id);
- title_box->switch_to_entry_timeout_id = 0;
-}
-
-static gboolean
-ephy_title_box_button_release_event (GtkWidget *widget,
- GdkEventButton *event)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (widget);
-
- if (title_box->mode != EPHY_TITLE_BOX_MODE_TITLE
- || event->button != GDK_BUTTON_PRIMARY
- || !title_box->button_down)
- return GDK_EVENT_PROPAGATE;
-
- LOG ("button-release-event title-box %p event %p", title_box, event);
-
- ephy_title_box_switch_to_entry_after_double_click_time (title_box);
- title_box->button_down = FALSE;
-
- return GDK_EVENT_PROPAGATE;
+ gtk_widget_show (GTK_WIDGET (title_box));
}
static gboolean
ephy_title_box_button_press_event (GtkWidget *widget,
GdkEventButton *event)
{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (widget);
+ EphyTitleBox *title_box = EPHY_TITLE_BOX (widget);
GtkAllocation lock_allocation;
- if (title_box->mode != EPHY_TITLE_BOX_MODE_TITLE || event->button != GDK_BUTTON_PRIMARY)
+ if (event->button != GDK_BUTTON_PRIMARY)
return GDK_EVENT_PROPAGATE;
LOG ("button-press-event title-box %p event %p", title_box, event);
@@ -328,11 +109,6 @@ ephy_title_box_button_press_event (GtkWidget *widget,
event->y >= lock_allocation.y &&
event->y < lock_allocation.y + lock_allocation.height) {
g_signal_emit (title_box, signals[LOCK_CLICKED], 0, (GdkRectangle *)&lock_allocation);
- } else if (!title_box->location_disabled && event->type == GDK_BUTTON_PRESS) {
- title_box->button_down = TRUE;
- } else if (!title_box->location_disabled) {
- title_box->button_down = FALSE;
- ephy_title_box_cancel_switch_to_entry_after_double_click_time (title_box);
}
return GDK_EVENT_PROPAGATE;
@@ -345,8 +121,6 @@ ephy_title_box_dispose (GObject *object)
LOG ("EphyTitleBox dispose %p", title_box);
- ephy_title_box_cancel_switch_to_entry_after_double_click_time (title_box);
-
ephy_title_box_set_web_view (title_box, NULL);
G_OBJECT_CLASS (ephy_title_box_parent_class)->dispose (object);
@@ -371,45 +145,11 @@ ephy_title_box_class_init (EphyTitleBoxClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->dispose = ephy_title_box_dispose;
- object_class->get_property = ephy_title_box_get_property;
- object_class->set_property = ephy_title_box_set_property;
object_class->constructed = ephy_title_box_constructed;
widget_class->button_press_event = ephy_title_box_button_press_event;
- widget_class->button_release_event = ephy_title_box_button_release_event;
widget_class->get_preferred_width = ephy_title_box_get_preferred_width;
/**
- *
- * EphyTitleBox:window:
- *
- * The parent window.
- */
- object_properties[PROP_WINDOW] = g_param_spec_object ("window",
- "Window",
- "The parent window",
- EPHY_TYPE_WINDOW,
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS);
-
- /**
- * EphyTitleBox:mode:
- *
- * The mode of the title box.
- */
- object_properties[PROP_MODE] = g_param_spec_enum ("mode",
- "Mode",
- "The mode of the title box",
- EPHY_TYPE_TITLE_BOX_MODE,
- EPHY_TITLE_BOX_MODE_LOCATION_ENTRY,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS);
-
- g_object_class_install_properties (object_class,
- N_PROPERTIES,
- object_properties);
-
- /**
* EphyTitleBox::lock-clicked:
* @title_box: the object on which the signal is emitted
* @lock_position: the position of the lock icon
@@ -432,47 +172,19 @@ ephy_title_box_init (EphyTitleBox *title_box)
LOG ("EphyTitleBox initialising %p", title_box);
}
-static void
-ephy_title_box_title_changed_cb (GObject *gobject,
- GParamSpec *pspec,
- gpointer user_data)
-{
- EphyTitleBox *title_box = EPHY_TITLE_BOX (user_data);
- WebKitWebView *web_view = WEBKIT_WEB_VIEW (gobject);
- const gchar *title;
-
- LOG ("notify::title web_view %p title-box %p\n", web_view, title_box);
-
- title = webkit_web_view_get_title (web_view);
-
- if (gtk_widget_is_focus (title_box->entry) ||
- !title || *title == '\0') {
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
- return;
- }
-
- ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE);
-}
-
/**
* ephy_title_box_new:
- * @window: an #EphyWindow
*
* Creates a new #EphyTitleBox.
*
* Returns: a new #EphyTitleBox
**/
EphyTitleBox *
-ephy_title_box_new (EphyWindow *window)
+ephy_title_box_new (void)
{
- g_return_val_if_fail (EPHY_IS_WINDOW (window), NULL);
-
return g_object_new (EPHY_TYPE_TITLE_BOX,
- "window", window,
- "margin-start", 54,
- "margin-end", 54,
- "transition-duration", 150,
- "transition-type", GTK_STACK_TRANSITION_TYPE_CROSSFADE,
+ "orientation", GTK_ORIENTATION_VERTICAL,
+ "valign", GTK_ALIGN_CENTER,
NULL);
}
@@ -487,117 +199,17 @@ void
ephy_title_box_set_web_view (EphyTitleBox *title_box,
WebKitWebView *web_view)
{
- const gchar *title;
-
g_return_if_fail (EPHY_IS_TITLE_BOX (title_box));
- if (title_box->web_view == web_view)
- return;
-
LOG ("ephy_title_box_set_web_view title-box %p web_view %p", title_box, web_view);
- if (title_box->web_view != NULL) {
- g_signal_handlers_disconnect_by_func (title_box->entry,
- G_CALLBACK (ephy_title_box_entry_key_press_cb),
- title_box);
- g_signal_handlers_disconnect_by_func (title_box->web_view,
- G_CALLBACK (ephy_title_box_view_focus_in_cb),
- title_box);
- if (title_box->title_sig_id > 0)
- g_signal_handler_disconnect (title_box->web_view, title_box->title_sig_id);
-
- g_clear_object (&title_box->title_binding);
-
- g_object_remove_weak_pointer (G_OBJECT (title_box->web_view), (gpointer *)&title_box->web_view);
- }
-
- title_box->web_view = web_view;
-
- if (web_view == NULL)
- return;
-
- g_object_add_weak_pointer (G_OBJECT (web_view), (gpointer *)&title_box->web_view);
-
- title = webkit_web_view_get_title (web_view);
-
- ephy_title_box_set_mode (title_box, title && *title != '\0' ?
- EPHY_TITLE_BOX_MODE_TITLE : EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
-
- title_box->title_binding = g_object_bind_property (title_box->web_view, "title",
- title_box->title, "label",
- G_BINDING_SYNC_CREATE);
+ g_clear_object (&title_box->title_binding);
- title_box->title_sig_id = g_signal_connect (title_box->web_view, "notify::title",
- G_CALLBACK (ephy_title_box_title_changed_cb),
- title_box);
- g_signal_connect (title_box->entry, "key-press-event",
- G_CALLBACK (ephy_title_box_entry_key_press_cb), title_box);
- g_signal_connect (title_box->web_view, "focus-in-event",
- G_CALLBACK (ephy_title_box_view_focus_in_cb), title_box);
-}
-
-/**
- * ephy_title_box_get_mode:
- * @title_box: an #EphyTitleBox
- *
- * Gets the value of the #EphyTitleBox:mode property.
- *
- * Returns: The mode of the @title_box.
- **/
-EphyTitleBoxMode
-ephy_title_box_get_mode (EphyTitleBox *title_box)
-{
- g_return_val_if_fail (EPHY_IS_TITLE_BOX (title_box), EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
-
- return title_box->mode;
-}
-
-/**
- * ephy_title_box_set_mode:
- * @title_box: an #EphyTitleBox
- * @mode: an #EphyTitleBoxMode
- *
- * Sets the mode of the @title_box.
- **/
-void
-ephy_title_box_set_mode (EphyTitleBox *title_box,
- EphyTitleBoxMode mode)
-{
- const gchar *title;
-
- g_return_if_fail (EPHY_IS_TITLE_BOX (title_box));
-
- ephy_title_box_cancel_switch_to_entry_after_double_click_time (title_box);
-
- if (!title_box->location_disabled) {
- const gchar *uri;
-
- uri = title_box->web_view ? webkit_web_view_get_uri (title_box->web_view) : NULL;
- if (!uri || g_str_has_prefix (uri, "about:") ||
- g_str_has_prefix (uri, "ephy-about:")) {
- mode = EPHY_TITLE_BOX_MODE_LOCATION_ENTRY;
- }
- } else
- mode = EPHY_TITLE_BOX_MODE_TITLE;
-
- if (title_box->mode == mode)
- return;
-
- if (mode == EPHY_TITLE_BOX_MODE_TITLE) {
- /* Don't allow showing title mode if there is no title. */
- title = title_box->web_view ? webkit_web_view_get_title (title_box->web_view) : NULL;
- if (!title || !*title)
- return;
+ if (web_view) {
+ title_box->title_binding = g_object_bind_property (web_view, "title",
+ title_box->title, "label",
+ G_BINDING_SYNC_CREATE);
}
-
- LOG ("ephy_title_box_set_mode title-box %p mode %u", title_box, mode);
-
- title_box->mode = mode;
-
- gtk_stack_set_visible_child_name (GTK_STACK (title_box),
- mode == EPHY_TITLE_BOX_MODE_LOCATION_ENTRY ? "address-bar" :
"title-bar");
-
- g_object_notify_by_pspec (G_OBJECT (title_box), object_properties[PROP_MODE]);
}
/**
@@ -622,24 +234,6 @@ ephy_title_box_set_security_level (EphyTitleBox *title_box,
NULL);
gtk_widget_set_visible (title_box->lock_image, icon_name != NULL);
-
- ephy_location_entry_set_security_level (EPHY_LOCATION_ENTRY (title_box->entry), security_level);
-}
-
-/**
- * ephy_title_box_get_location_entry:
- * @title_box: an #EphyTitleBox
- *
- * Returns the location entry wrapped by @title_box.
- *
- * Returns: (transfer none): an #EphyLocationEntry
- **/
-GtkWidget *
-ephy_title_box_get_location_entry (EphyTitleBox *title_box)
-{
- g_return_val_if_fail (EPHY_IS_TITLE_BOX (title_box), NULL);
-
- return title_box->entry;
}
/**
@@ -653,21 +247,7 @@ void
ephy_title_box_set_address (EphyTitleBox *title_box,
const char *address)
{
- EphyEmbedShellMode mode;
-
g_return_if_fail (EPHY_IS_TITLE_BOX (title_box));
- mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ());
-
- if (address == NULL || mode == EPHY_EMBED_SHELL_MODE_APPLICATION) {
- gtk_label_set_text (GTK_LABEL (title_box->subtitle), address);
- } else {
- gboolean rtl;
- char *subtitle;
-
- rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
- subtitle = g_strconcat (rtl ? "▾ " : address, rtl ? address : " ▾", NULL);
- gtk_label_set_text (GTK_LABEL (title_box->subtitle), subtitle);
- g_free (subtitle);
- }
+ gtk_label_set_text (GTK_LABEL (title_box->subtitle), address);
}
diff --git a/src/ephy-title-box.h b/src/ephy-title-box.h
index 0b71bf5..63ada04 100644
--- a/src/ephy-title-box.h
+++ b/src/ephy-title-box.h
@@ -1,5 +1,4 @@
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=2 sts=2 et: */
/*
* Copyright © 2013, 2014 Yosef Or Boczko <yoseforb gnome org>
*
@@ -22,35 +21,22 @@
#include <gtk/gtk.h>
#include <webkit2/webkit2.h>
-#include "ephy-location-entry.h"
#include "ephy-window.h"
G_BEGIN_DECLS
#define EPHY_TYPE_TITLE_BOX (ephy_title_box_get_type ())
-G_DECLARE_FINAL_TYPE (EphyTitleBox, ephy_title_box, EPHY, TITLE_BOX, GtkStack)
+G_DECLARE_FINAL_TYPE (EphyTitleBox, ephy_title_box, EPHY, TITLE_BOX, GtkBox)
-typedef enum
-{
- EPHY_TITLE_BOX_MODE_LOCATION_ENTRY,
- EPHY_TITLE_BOX_MODE_TITLE
-} EphyTitleBoxMode;
-
-EphyTitleBox *ephy_title_box_new (EphyWindow *window);
+EphyTitleBox *ephy_title_box_new (void);
void ephy_title_box_set_web_view (EphyTitleBox *title_box,
WebKitWebView *web_view);
-EphyTitleBoxMode ephy_title_box_get_mode (EphyTitleBox *title_box);
-void ephy_title_box_set_mode (EphyTitleBox *title_box,
- EphyTitleBoxMode mode);
-
void ephy_title_box_set_security_level (EphyTitleBox *title_box,
EphySecurityLevel security_level);
-GtkWidget *ephy_title_box_get_location_entry (EphyTitleBox *title_box);
-
void ephy_title_box_set_address (EphyTitleBox *title_box,
const char *address);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 289c1be..be5f993 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -495,13 +495,19 @@ sync_tab_security (EphyWebView *view,
EphyWindow *window)
{
EphyTitleBox *title_box;
+ GtkWidget *location_entry;
EphySecurityLevel security_level;
- if (window->closing) return;
+ if (window->closing)
+ return;
ephy_web_view_get_security_level (view, &security_level, NULL, NULL);
+
title_box = ephy_header_bar_get_title_box (EPHY_HEADER_BAR (window->header_bar));
ephy_title_box_set_security_level (title_box, security_level);
+
+ location_entry = ephy_header_bar_get_location_entry (EPHY_HEADER_BAR (window->header_bar));
+ ephy_location_entry_set_security_level (EPHY_LOCATION_ENTRY (location_entry), security_level);
}
static void
@@ -3211,9 +3217,6 @@ ephy_window_activate_location (EphyWindow *window)
if (!(window->chrome & EPHY_WINDOW_CHROME_LOCATION))
return;
- ephy_title_box_set_mode (ephy_header_bar_get_title_box (EPHY_HEADER_BAR (window->header_bar)),
- EPHY_TITLE_BOX_MODE_LOCATION_ENTRY);
-
entry = ephy_header_bar_get_location_entry (EPHY_HEADER_BAR (window->header_bar));
ephy_location_entry_activate (EPHY_LOCATION_ENTRY (entry));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
