aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-06 01:53:51 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-06 01:53:51 +0800
commit686b095ac4f6590ae599b2c7d7d087683d09881f (patch)
treeab24678400af3d1cac56898410b27228879954a5 /lib
parent4ccc0bb51ea56894f5c8bea291eb16ab1f019acf (diff)
downloadgsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar.gz
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar.bz2
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar.lz
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar.xz
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.tar.zst
gsoc2013-epiphany-686b095ac4f6590ae599b2c7d7d087683d09881f.zip
s/ask download/ask for download
2003-06-05 Marco Pesenti Gritti <marco@it.gnome.org> * data/epiphany.schemas.in: s/ask download/ask for download * lib/egg/egg-editable-toolbar.c: (toolbar_changed_cb), (egg_editable_toolbar_set_model): * lib/egg/egg-toolbars-model.c: (egg_toolbars_model_set_flags), (egg_toolbars_model_class_init): * lib/egg/egg-toolbars-model.h: * lib/egg/eggtoolbar.c: (egg_toolbar_internal_insert_element): Update. * src/ephy-toolbars-model.c: (ephy_toolbars_model_set_flag), (ephy_toolbars_model_unset_flag): * src/ephy-toolbars-model.h: Add a way to set/unset a flag on all toolbars. * src/ephy-window.c: (ephy_window_init), (translate_default_chrome), (update_exit_fullscreen_popup_position), (size_changed_cb), (exit_fullscreen_button_clicked_cb), (ephy_window_fullscreen), (ephy_window_unfullscreen), (ephy_window_set_chrome): Implement an exit fullscreen button. Force toolbars style to be icon only.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/egg/egg-editable-toolbar.c23
-rwxr-xr-xlib/egg/egg-toolbars-model.c11
-rwxr-xr-xlib/egg/egg-toolbars-model.h5
-rw-r--r--lib/egg/eggtoolbar.c2
4 files changed, 40 insertions, 1 deletions
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index bf32c54ff..99726faf5 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -366,6 +366,27 @@ create_item (EggEditableToolbar *t,
}
static void
+toolbar_changed_cb (EggToolbarsModel *model,
+ int position,
+ EggEditableToolbar *t)
+{
+ GtkWidget *toolbar;
+ EggTbModelFlags flags;
+
+ flags = egg_toolbars_model_get_flags (model, position);
+ toolbar = get_toolbar_nth (t, position);
+
+ if (flags & EGG_TB_MODEL_ICONS_ONLY)
+ {
+ egg_toolbar_set_style (EGG_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
+ }
+ else
+ {
+ egg_toolbar_unset_style (EGG_TOOLBAR (toolbar));
+ }
+}
+
+static void
toolbar_added_cb (EggToolbarsModel *model,
int position,
EggEditableToolbar *t)
@@ -444,6 +465,8 @@ egg_editable_toolbar_set_model (EggEditableToolbar *t,
G_CALLBACK (toolbar_added_cb), t, 0);
g_signal_connect_object (model, "toolbar_removed",
G_CALLBACK (toolbar_removed_cb), t, 0);
+ g_signal_connect_object (model, "toolbar_changed",
+ G_CALLBACK (toolbar_changed_cb), t, 0);
}
static void
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index 94a89ba27..8d8829dcf 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -31,6 +31,7 @@ enum
ITEM_ADDED,
ITEM_REMOVED,
TOOLBAR_ADDED,
+ TOOLBAR_CHANGED,
TOOLBAR_REMOVED,
LAST_SIGNAL
};
@@ -213,6 +214,9 @@ egg_toolbars_model_set_flags (EggToolbarsModel *t,
toolbar = toolbar_node->data;
toolbar->flags = flags;
+
+ g_signal_emit (G_OBJECT (t), egg_toolbars_model_signals[TOOLBAR_CHANGED],
+ 0, toolbar_position);
}
void
@@ -398,6 +402,13 @@ egg_toolbars_model_class_init (EggToolbarsModelClass *klass)
G_STRUCT_OFFSET (EggToolbarsModelClass, toolbar_removed),
NULL, NULL, g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
+ egg_toolbars_model_signals[TOOLBAR_CHANGED] =
+ g_signal_new ("toolbar_changed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EggToolbarsModelClass, toolbar_changed),
+ NULL, NULL, g_cclosure_marshal_VOID__INT,
+ G_TYPE_NONE, 1, G_TYPE_INT);
}
static void
diff --git a/lib/egg/egg-toolbars-model.h b/lib/egg/egg-toolbars-model.h
index 1440468fc..5d79787b9 100755
--- a/lib/egg/egg-toolbars-model.h
+++ b/lib/egg/egg-toolbars-model.h
@@ -39,7 +39,8 @@ typedef struct EggToolbarsModelPrivate EggToolbarsModelPrivate;
typedef enum
{
- EGG_TB_MODEL_NOT_REMOVABLE = 1
+ EGG_TB_MODEL_NOT_REMOVABLE = 1,
+ EGG_TB_MODEL_ICONS_ONLY = 2
} EggTbModelFlags;
struct EggToolbarsModel
@@ -61,6 +62,8 @@ struct EggToolbarsModelClass
int position);
void (* toolbar_added) (EggToolbarsModel *group,
int position);
+ void (* toolbar_changed) (EggToolbarsModel *group,
+ int position);
void (* toolbar_removed) (EggToolbarsModel *group,
int position);
diff --git a/lib/egg/eggtoolbar.c b/lib/egg/eggtoolbar.c
index 79344f7d9..6ae9ff4b6 100644
--- a/lib/egg/eggtoolbar.c
+++ b/lib/egg/eggtoolbar.c
@@ -2594,6 +2594,8 @@ egg_toolbar_internal_insert_element (EggToolbar *toolbar,
break;
}
+ gtk_widget_show (GTK_WIDGET (item));
+
if (type == EGG_TOOLBAR_CHILD_BUTTON ||
type == EGG_TOOLBAR_CHILD_RADIOBUTTON ||
type == EGG_TOOLBAR_CHILD_TOGGLEBUTTON)