diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-14 07:47:32 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-14 07:47:32 +0800 |
| commit | a94b49300fcf5b8dda47a794d2687467043d8c55 (patch) | |
| tree | c40bb5aede1f87e4a3d83d9f645fbd2ab6785cdb /src/ephy-toolbar.c | |
| parent | 2dbc06a5454482f62bc1d1b656431b798c548c7e (diff) | |
| download | gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar.gz gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar.bz2 gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar.lz gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar.xz gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.tar.zst gsoc2013-epiphany-a94b49300fcf5b8dda47a794d2687467043d8c55.zip | |
Add favicon and lock icon to the entry. Fixes bug #116482 and bug #149506.
2005-01-14 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_set_tooltip), (ephy_location_entry_finalize),
(ephy_location_entry_class_init), (modify_background),
(entry_style_set_cb), (entry_realize_cb),
(ephy_location_entry_construct_contents),
(ephy_location_entry_init), (ephy_location_entry_set_favicon),
(ephy_location_entry_set_show_lock),
(ephy_location_entry_set_lock_stock),
(ephy_location_entry_set_lock_tooltip):
* lib/widgets/ephy-location-entry.h:
* src/ephy-fullscreen-popup.c: (ephy_fullscreen_popup_constructor):
* src/ephy-location-action.c: (sync_icon), (sync_lock_stock_id),
(sync_lock_tooltip), (sync_show_lock), (connect_proxy),
(ephy_location_action_set_property),
(ephy_location_action_get_property),
(ephy_location_action_class_init), (ephy_location_action_finalize):
* src/ephy-toolbar.c: (ephy_toolbar_set_security_state),
(ephy_toolbar_set_lock_visibility), (ephy_toolbar_constructor):
* src/ephy-toolbar.h:
* src/ephy-window.c: (sync_chromes_visibility):
Add favicon and lock icon to the entry. Fixes bug #116482 and bug #149506.
Change "Exit Fullscreen" to "Leave Fullscreen" as per HIG, part of bug #153270.
Diffstat (limited to 'src/ephy-toolbar.c')
| -rwxr-xr-x | src/ephy-toolbar.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index e375a4edd..729322109 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -73,6 +73,8 @@ struct _EphyToolbarPrivate GtkToolItem *exit_button; guint disable_arbitrary_url_notifier_id; gulong set_focus_handler; + gboolean show_lock; + gboolean lock_visible; gboolean fullscreen; gboolean spinning; }; @@ -498,18 +500,31 @@ ephy_toolbar_set_security_state (EphyToolbar *toolbar, const char *stock_id, const char *tooltip) { -#if 0 EphyToolbarPrivate *priv = toolbar->priv; + priv->show_lock = show_lock; + g_object_set (priv->actions[LOCATION_ACTION], - "lock-show", show_lock, "lock-stock-id", stock_id, "lock-tooltip", tooltip, + "show-lock", priv->lock_visible && priv->show_lock, NULL); -#endif } void +ephy_toolbar_set_lock_visibility (EphyToolbar *toolbar, + gboolean visible) +{ + EphyToolbarPrivate *priv = toolbar->priv; + + priv->lock_visible = visible; + + g_object_set (priv->actions[LOCATION_ACTION], + "show-lock", priv->lock_visible && priv->show_lock, + NULL); +} + +void ephy_toolbar_set_spinning (EphyToolbar *toolbar, gboolean spinning) { @@ -637,7 +652,7 @@ ephy_toolbar_constructor (GType type, gtk_toolbar_insert (gtoolbar, priv->sep_item, -1); priv->exit_button = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->exit_button), _("Exit Fullscreen")); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (priv->exit_button), _("Leave Fullscreen")); gtk_tool_item_set_is_important (priv->exit_button, TRUE); g_signal_connect (priv->exit_button, "clicked", G_CALLBACK (exit_button_clicked_cb), toolbar); |