]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Replace GTK_WIDGET_IS_SENSITIVE() with gtk_widget_is_sensitive()
[evince.git] / shell / ev-window.c
index e9aee88912ca71f9aa47c7496f646089e6a05b26..3d1ffaf0b8885937d0a76681e9dda531576f42eb 100644 (file)
@@ -62,6 +62,7 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-annotations.h"
 #include "ev-document-type-builtins.h"
+#include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
@@ -321,6 +322,15 @@ static guint ev_window_n_copies = 0;
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+get_screen_dpi (EvWindow *window)
+{
+       GdkScreen *screen;
+
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       return ev_document_misc_get_screen_dpi (screen);
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
                                const char *name,
@@ -399,9 +409,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        /* File menu */
        ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document);
        ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
-#if !GTK_CHECK_VERSION (2, 17, 4)
-       ev_window_set_action_sensitive (ev_window, "FilePageSetup", has_pages && ok_to_print && ok_to_print_setup);
-#endif
        ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
        ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 
@@ -497,7 +504,7 @@ ev_window_update_actions (EvWindow *ev_window)
                                                      ZOOM_CONTROL_ACTION);
 
                real_zoom = ev_document_model_get_scale (ev_window->priv->model);
-               real_zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               real_zoom *= 72.0 / get_screen_dpi (ev_window);
                zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
                ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
@@ -982,7 +989,7 @@ setup_model_from_metadata (EvWindow *window)
        /* Zoom */
        if (ev_document_model_get_sizing_mode (window->priv->model) == EV_SIZING_FREE &&
            ev_metadata_get_double (window->priv->metadata, "zoom", &zoom)) {
-               zoom *= get_screen_dpi (GTK_WINDOW (window)) / 72.0;
+               zoom *= get_screen_dpi (window) / 72.0;
                ev_document_model_set_scale (window->priv->model, zoom);
        }
 
@@ -2870,43 +2877,6 @@ get_print_page_setup (GKeyFile *key_file)
        return page_setup ? page_setup : gtk_page_setup_new ();
 }
 
-static void
-ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup,
-                                   EvWindow     *window)
-{
-       /* Dialog was canceled */
-       if (!page_setup)
-               return;
-
-       ev_window_save_print_page_setup (window, page_setup);
-}
-
-static void
-ev_window_cmd_file_print_setup (GtkAction *action,
-                               EvWindow  *ev_window)
-{
-       GKeyFile         *print_settings_file;
-       GtkPrintSettings *print_settings;
-       GtkPageSetup     *print_page_setup;
-
-       print_settings_file = get_print_settings_file ();
-
-       print_settings = get_print_settings (print_settings_file);
-       ev_window_load_print_settings_from_metadata (ev_window, print_settings);
-
-       print_page_setup = get_print_page_setup (print_settings_file);
-       ev_window_load_print_page_setup_from_metadata (ev_window, print_page_setup);
-
-       gtk_print_run_page_setup_dialog_async (GTK_WINDOW (ev_window),
-                                              print_page_setup,
-                                              print_settings,
-                                              (GtkPageSetupDoneFunc)ev_window_print_page_setup_done_cb,
-                                              ev_window);
-       g_object_unref (print_settings);
-       g_object_unref (print_page_setup);
-       g_key_file_free (print_settings_file);
-}
-
 static void
 ev_window_print_cancel (EvWindow *ev_window)
 {
@@ -3232,6 +3202,15 @@ ev_window_cmd_file_close_window (GtkAction *action, EvWindow *ev_window)
        gchar     *text, *markup;
        gint       n_print_jobs;
 
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gint current_page;
+
+               /* Save current page */
+               current_page = ev_view_presentation_get_current_page (
+                       EV_VIEW_PRESENTATION (ev_window->priv->presentation_view));
+               ev_document_model_set_page (ev_window->priv->model, current_page);
+       }
+
        n_print_jobs = ev_window->priv->print_queue ?
                g_queue_get_length (ev_window->priv->print_queue) : 0;
        
@@ -3612,9 +3591,9 @@ ev_window_run_presentation (EvWindow *window)
 
        gtk_box_pack_start (GTK_BOX (window->priv->main_box),
                            window->priv->presentation_view,
-                           FALSE, FALSE, 0);
-       gtk_widget_show (window->priv->presentation_view);
+                           TRUE, TRUE, 0);
 
+       gtk_widget_hide (window->priv->hpaned);
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
 
@@ -3622,6 +3601,8 @@ ev_window_run_presentation (EvWindow *window)
        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 
+       gtk_widget_show (window->priv->presentation_view);
+
        ev_application_screensaver_disable (EV_APP);
 
        if (window->priv->metadata && !ev_window_is_empty (window))
@@ -3644,6 +3625,7 @@ ev_window_stop_presentation (EvWindow *window,
                              window->priv->presentation_view);
        window->priv->presentation_view = NULL;
 
+       gtk_widget_show (window->priv->hpaned);
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
@@ -3711,7 +3693,7 @@ ev_window_screen_changed (GtkWidget *widget,
                return;
 
        ev_window_setup_gtk_settings (window);
-       dpi = get_screen_dpi (GTK_WINDOW (window));
+       dpi = get_screen_dpi (window);
        ev_document_model_set_min_scale (priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (priv->model, MAX_SCALE * dpi / 72.0);
 
@@ -4067,7 +4049,7 @@ ev_window_zoom_changed_cb (EvDocumentModel *model, GParamSpec *pspec, EvWindow *
                gdouble zoom;
 
                zoom = ev_document_model_get_scale (model);
-               zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+               zoom *= 72.0 / get_screen_dpi (ev_window);
                ev_metadata_set_double (ev_window->priv->metadata, "zoom", zoom);
        }
 }
@@ -4442,16 +4424,34 @@ view_menu_annot_popup (EvWindow     *ev_window,
 
 static gboolean
 view_menu_popup_cb (EvView   *view,
-                   GObject  *object,
+                   GList    *items,
                    EvWindow *ev_window)
 {
-       view_menu_link_popup (ev_window,
-                             EV_IS_LINK (object) ? EV_LINK (object) : NULL);
-       view_menu_image_popup (ev_window,
-                              EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
-       view_menu_annot_popup (ev_window,
-                              EV_IS_ANNOTATION (object) ? EV_ANNOTATION (object) : NULL);
-       
+       GList   *l;
+       gboolean has_link = FALSE;
+       gboolean has_image = FALSE;
+       gboolean has_annot = FALSE;
+
+       for (l = items; l; l = g_list_next (l)) {
+               if (EV_IS_LINK (l->data)) {
+                       view_menu_link_popup (ev_window, EV_LINK (l->data));
+                       has_link = TRUE;
+               } else if (EV_IS_IMAGE (l->data)) {
+                       view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+                       has_image = TRUE;
+               } else if (EV_IS_ANNOTATION (l->data)) {
+                       view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+                       has_annot = TRUE;
+               }
+       }
+
+       if (!has_link)
+               view_menu_link_popup (ev_window, NULL);
+       if (!has_image)
+               view_menu_image_popup (ev_window, NULL);
+       if (!has_annot)
+               view_menu_annot_popup (ev_window, NULL);
+
        gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
                        NULL, NULL, NULL, NULL,
                        3, gtk_get_current_event_time ());
@@ -4667,7 +4667,7 @@ zoom_control_changed_cb (EphyZoomAction *action,
 
        if (mode == EV_SIZING_FREE) {
                ev_document_model_set_scale (ev_window->priv->model,
-                                            zoom * get_screen_dpi (GTK_WINDOW (ev_window)) / 72.0);
+                                            zoom * get_screen_dpi (ev_window) / 72.0);
        }
 }
 
@@ -4935,7 +4935,7 @@ ev_window_key_press_event (GtkWidget   *widget,
         */
        if (priv->view) {
                g_object_ref (priv->view);
-               if (GTK_WIDGET_IS_SENSITIVE (priv->view))
+               if (gtk_widget_is_sensitive (priv->view))
                        handled = gtk_widget_event (priv->view, (GdkEvent*) event);
                g_object_unref (priv->view);
        }
@@ -5001,9 +5001,6 @@ static const GtkActionEntry entries[] = {
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy…"), "<control>S",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
-       { "FilePageSetup", GTK_STOCK_PAGE_SETUP, N_("Page Set_up…"), NULL,
-         N_("Set up the page settings for printing"),
-         G_CALLBACK (ev_window_cmd_file_print_setup) },
        { "FilePrint", GTK_STOCK_PRINT, N_("_Print…"), "<control>P",
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
@@ -6124,16 +6121,6 @@ ev_window_init (EvWindow *ev_window)
        }
        g_free (ui_path);
 
-#if GTK_CHECK_VERSION (2, 17, 4)
-       {
-               GtkAction *action;
-
-               action = gtk_action_group_get_action (ev_window->priv->action_group,
-                                                     "FilePageSetup");
-               g_object_set (action, "visible", FALSE, "sensitive", FALSE, NULL);
-       }
-#endif
-
        ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
        ev_window->priv->recent_action_group = NULL;
        ev_window->priv->recent_ui_id = 0;
@@ -6254,7 +6241,7 @@ ev_window_init (EvWindow *ev_window)
 
        ev_window->priv->view = ev_view_new ();
        ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
-       dpi = get_screen_dpi (GTK_WINDOW (ev_window));
+       dpi = get_screen_dpi (ev_window);
        ev_document_model_set_min_scale (ev_window->priv->model, MIN_SCALE * dpi / 72.0);
        ev_document_model_set_max_scale (ev_window->priv->model, MAX_SCALE * dpi / 72.0);
        ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));