diff options
Diffstat (limited to 'shell/ev-window.c')
| -rw-r--r-- | shell/ev-window.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/shell/ev-window.c b/shell/ev-window.c index 7705a9ec..1f989f85 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -4157,7 +4157,9 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400); toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar); @@ -4167,7 +4169,11 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window) gtk_container_set_border_width (GTK_CONTAINER (editor), 5); gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0); +#else gtk_container_add (GTK_CONTAINER (content_area), editor); +#endif egg_editable_toolbar_set_edit_mode (toolbar, TRUE); @@ -4592,7 +4598,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "name", _("Atril"), "version", VERSION, "copyright", - _("© 1996–2009 The Atril authors"), + _("© 1996–2009 The Evince authors\n© 2012–2014 The MATE developers"), "license", license_trans, "website", "http://www.mate-desktop.org/", "comments", comments, @@ -6816,6 +6822,11 @@ ev_window_init (EvWindow *ev_window) NULL)); g_object_unref (toolbars_model); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (ev_window->priv->toolbar)), + GTK_STYLE_CLASS_PRIMARY_TOOLBAR); +#endif + egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), "DefaultToolBar"); gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), |