aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-embed.h
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-03-19 04:22:25 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-03-19 04:22:25 +0800
commit40f9870ee0b060e7fdbfff104343d4c2f0eb4ac2 (patch)
tree17b9b8fd132e01e1ff62590bdefa4d057ab92b69 /embed/ephy-embed.h
parentfb9bc516d855e7422d6e6e3b5b93baf5238a0b38 (diff)
downloadgsoc2013-epiphany-40f9870ee0b060e7fdbfff104343d4c2f0eb4ac2.tar.gz
gsoc2013-epiphany-40f9870ee0b060e7fdbfff104343d4c2f0eb4ac2.tar.zst
gsoc2013-epiphany-40f9870ee0b060e7fdbfff104343d4c2f0eb4ac2.zip
Cleanups chromes code and register a type for the enum.
2004-03-16 Marco Pesenti Gritti <marco@gnome.org> * embed/ephy-embed.c: (ephy_embed_chrome_get_type): * embed/ephy-embed.h: * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed.cpp: Cleanups chromes code and register a type for the enum. * src/ephy-nautilus-view.c: (gnv_embed_new_window_cb): Adapt to the api changes * src/ephy-tab.c: (ephy_tab_new_window_cb): Move js chrome lockdown pref check here. * src/ephy-window.c: (get_chromes_visibility), (sync_chromes_visibility), (ephy_window_fullscreen), (ephy_window_unfullscreen), (update_chromes_actions), (update_actions_sensitivity), (show_embed_popup), (get_default_chrome), (ephy_window_set_property), (ephy_window_class_init), (actions_notifier), (navigation_notifier), (ephy_window_init), (ephy_window_finalize), (ephy_window_new_with_chrome), (ephy_window_set_print_preview), (ephy_window_show), (sync_prefs_with_chrome), (sync_chrome_with_view_toggle), (ephy_window_view_statusbar_cb), (ephy_window_view_toolbar_cb), (ephy_window_view_bookmarksbar_cb): Rework chrome handling so that it's not applied to all windows. Changes are now saved on the fly like for window size. * src/ephy-window.h: Use a construct property instead of a _set for chrome. * src/window-commands.c: * src/window-commands.h: Move chromes actions to EphyWindow so we dont need to expose chrome handling.
Diffstat (limited to 'embed/ephy-embed.h')
-rw-r--r--embed/ephy-embed.h28
1 files changed, 11 insertions, 17 deletions
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index f7e3bcfd4..afeee8d9f 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -37,6 +37,8 @@ G_BEGIN_DECLS
#define EPHY_IS_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED))
#define EPHY_EMBED_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIface))
+#define EPHY_TYPE_EMBED_CHROME_MASK (ephy_embed_chrome_get_type ())
+
typedef struct EphyEmbed EphyEmbed;
typedef struct EphyEmbedIface EphyEmbedIface;
@@ -57,21 +59,11 @@ typedef enum
typedef enum
{
- EMBED_CHROME_NONE = 0,
- EMBED_CHROME_DEFAULT = 1 << 0,
- EMBED_CHROME_MENUBARON = 1 << 1,
- EMBED_CHROME_TOOLBARON = 1 << 2,
- EMBED_CHROME_BOOKMARKSBARON = 1 << 3,
- EMBED_CHROME_BOOKMARKSBAR_DEFAULT = 1 << 4,
- EMBED_CHROME_STATUSBARON = 1 << 5,
- EMBED_CHROME_WINDOWRAISED = 1 << 6,
- EMBED_CHROME_WINDOWLOWERED = 1 << 7,
- EMBED_CHROME_CENTERSCREEN = 1 << 8,
- EMBED_CHROME_OPENASDIALOG = 1 << 9,
- EMBED_CHROME_OPENASCHROME = 1 << 10,
- EMBED_CHROME_OPENASPOPUP = 1 << 11,
- EMBED_CHROME_PPVIEWTOOLBARON = 1 << 12
-} EmbedChromeMask;
+ EPHY_EMBED_CHROME_DEFAULT = 1 << 0,
+ EPHY_EMBED_CHROME_MENUBAR = 1 << 1,
+ EPHY_EMBED_CHROME_TOOLBAR = 1 << 2,
+ EPHY_EMBED_CHROME_STATUSBAR = 1 << 3
+} EphyEmbedChrome;
typedef enum
{
@@ -164,7 +156,7 @@ struct EphyEmbedIface
EmbedState state);
void (* new_window) (EphyEmbed *embed,
EphyEmbed **new_embed,
- EmbedChromeMask chromemask);
+ EphyEmbedChrome chromemask);
gboolean (* dom_mouse_click) (EphyEmbed *embed,
EphyEmbedEvent *event);
gboolean (* dom_mouse_down) (EphyEmbed *embed,
@@ -230,6 +222,8 @@ struct EphyEmbedIface
gboolean (* has_modified_forms) (EphyEmbed *embed);
};
+GType ephy_embed_chrome_get_type (void);
+
GType ephy_embed_get_type (void);
/* Base */
@@ -280,7 +274,7 @@ void ephy_embed_shistory_go_nth (EphyEmbed *embed,
void ephy_embed_get_security_level (EphyEmbed *embed,
EmbedSecurityLevel *level,
- char **description);
+ char **description);
/* Zoom */
void ephy_embed_zoom_set (EphyEmbed *embed,