]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update Simplified Chinese translation.
[evince.git] / shell / ev-window.c
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 29ee12a17495382e86c43461dbcd3b42b3c7a777..4b23975a58d727ef6f4f99cfe438721170701af7 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <math.h>
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
@@ -223,13 +224,12 @@ struct _EvWindowPrivate {
 #define NAVIGATION_ACTION      "Navigation"
 
 #define GCONF_LOCKDOWN_DIR          "/desktop/gnome/lockdown"
 #define NAVIGATION_ACTION      "Navigation"
 
 #define GCONF_LOCKDOWN_DIR          "/desktop/gnome/lockdown"
-#define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
 #define GS_SCHEMA_NAME           "org.gnome.Evince"
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
 #define GS_SCHEMA_NAME           "org.gnome.Evince"
-#define GS_OVERRIDE_RESTRICTIONS "override_restrictions"
+#define GS_OVERRIDE_RESTRICTIONS "override-restrictions"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
@@ -244,7 +244,7 @@ struct _EvWindowPrivate {
 #define EV_TOOLBARS_FILENAME "evince-toolbar.xml"
 
 #define MIN_SCALE 0.05409
 #define EV_TOOLBARS_FILENAME "evince-toolbar.xml"
 
 #define MIN_SCALE 0.05409
-#define MAX_SCALE 4.0
+#define PAGE_CACHE_SIZE 52428800 /* 50MB */
 
 #define MAX_RECENT_ITEM_LEN (40)
 
 
 #define MAX_RECENT_ITEM_LEN (40)
 
@@ -326,6 +326,7 @@ static void     ev_window_load_file_remote              (EvWindow         *ev_wi
 static void     ev_window_media_player_key_pressed      (EvWindow         *window,
                                                         const gchar      *key,
                                                         gpointer          user_data);
 static void     ev_window_media_player_key_pressed      (EvWindow         *window,
                                                         const gchar      *key,
                                                         gpointer          user_data);
+static void     ev_window_update_max_min_scale          (EvWindow         *window);
 
 static guint ev_window_n_copies = 0;
 
 
 static guint ev_window_n_copies = 0;
 
@@ -358,7 +359,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        const EvDocumentInfo *info = NULL;
        gboolean has_document = FALSE;
        gboolean ok_to_print = TRUE;
        const EvDocumentInfo *info = NULL;
        gboolean has_document = FALSE;
        gboolean ok_to_print = TRUE;
-       gboolean ok_to_print_setup = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
        gboolean override_restrictions = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
        gboolean override_restrictions = TRUE;
@@ -408,11 +408,6 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
            gconf_client_get_bool (ev_window->priv->gconf_client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
            gconf_client_get_bool (ev_window->priv->gconf_client, GCONF_LOCKDOWN_PRINT, NULL)) {
                ok_to_print = FALSE;
        }
-
-       if (has_document &&
-           gconf_client_get_bool (ev_window->priv->gconf_client, GCONF_LOCKDOWN_PRINT_SETUP, NULL)) {
-               ok_to_print_setup = FALSE;
-       }
 #endif
 
        /* File menu */
 #endif
 
        /* File menu */
@@ -1232,7 +1227,7 @@ ev_window_setup_document (EvWindow *ev_window)
        GtkAction *action;
 
        ev_window->priv->setup_document_idle = 0;
        GtkAction *action;
 
        ev_window->priv->setup_document_idle = 0;
-       
+
        ev_window_refresh_window_thumbnail (ev_window);
 
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
        ev_window_refresh_window_thumbnail (ev_window);
 
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
@@ -1293,6 +1288,8 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
                g_object_unref (ev_window->priv->document);
        ev_window->priv->document = g_object_ref (document);
 
                g_object_unref (ev_window->priv->document);
        ev_window->priv->document = g_object_ref (document);
 
+       ev_window_update_max_min_scale (ev_window);
+
        ev_window_set_message_area (ev_window, NULL);
 
        if (ev_document_get_n_pages (document) <= 0) {
        ev_window_set_message_area (ev_window, NULL);
 
        if (ev_document_get_n_pages (document) <= 0) {
@@ -1303,6 +1300,12 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
                                           _("The document contains only empty pages"));
        }
 
                                           _("The document contains only empty pages"));
        }
 
+       if (EV_WINDOW_IS_PRESENTATION (ev_window)) {
+               gtk_widget_destroy (ev_window->priv->presentation_view);
+               ev_window->priv->presentation_view = NULL;
+               ev_window_run_presentation (ev_window);
+       }
+
        if (ev_window->priv->setup_document_idle > 0)
                g_source_remove (ev_window->priv->setup_document_idle);
 
        if (ev_window->priv->setup_document_idle > 0)
                g_source_remove (ev_window->priv->setup_document_idle);
 
@@ -1860,7 +1863,6 @@ ev_window_open_uri (EvWindow       *ev_window,
        ev_window_close_dialogs (ev_window);
        ev_window_clear_load_job (ev_window);
        ev_window_clear_local_uri (ev_window);
        ev_window_close_dialogs (ev_window);
        ev_window_clear_load_job (ev_window);
        ev_window_clear_local_uri (ev_window);
-       ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
 
        ev_window->priv->window_mode = mode;
 
 
        ev_window->priv->window_mode = mode;
 
@@ -1899,6 +1901,7 @@ ev_window_open_uri (EvWindow       *ev_window,
        if (!g_file_is_native (source_file) && !ev_window->priv->local_uri) {
                ev_window_load_file_remote (ev_window, source_file);
        } else {
        if (!g_file_is_native (source_file) && !ev_window->priv->local_uri) {
                ev_window_load_file_remote (ev_window, source_file);
        } else {
+               ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE);
                g_object_unref (source_file);
                ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
        }
                g_object_unref (source_file);
                ev_job_scheduler_push_job (ev_window->priv->load_job, EV_JOB_PRIORITY_NONE);
        }
@@ -2791,21 +2794,25 @@ ev_window_save_print_settings (EvWindow         *window,
 
        key_file = get_print_settings_file ();
        gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP);
 
        key_file = get_print_settings_file ();
        gtk_print_settings_to_key_file (print_settings, key_file, EV_PRINT_SETTINGS_GROUP);
-       save_print_setting_file (key_file);
-       g_key_file_free (key_file);
-
-       if (!window->priv->metadata)
-               return;
 
        /* Save print settings that are specific to the document */
        for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
 
        /* Save print settings that are specific to the document */
        for (i = 0; i < G_N_ELEMENTS (document_print_settings); i++) {
-               const gchar *value;
+               /* Remove it from global settings */
+               g_key_file_remove_key (key_file, EV_PRINT_SETTINGS_GROUP,
+                                      document_print_settings[i], NULL);
 
 
-               value = gtk_print_settings_get (print_settings,
-                                               document_print_settings[i]);
-               ev_metadata_set_string (window->priv->metadata,
-                                       document_print_settings[i], value);
+               if (window->priv->metadata) {
+                       const gchar *value;
+
+                       value = gtk_print_settings_get (print_settings,
+                                                       document_print_settings[i]);
+                       ev_metadata_set_string (window->priv->metadata,
+                                               document_print_settings[i], value);
+               }
        }
        }
+
+       save_print_setting_file (key_file);
+       g_key_file_free (key_file);
 }
 
 static void
 }
 
 static void
@@ -2816,6 +2823,19 @@ ev_window_save_print_page_setup (EvWindow     *window,
 
        key_file = get_print_settings_file ();
        gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP);
 
        key_file = get_print_settings_file ();
        gtk_page_setup_to_key_file (page_setup, key_file, EV_PAGE_SETUP_GROUP);
+
+       /* Do not save document settings in global file */
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-orientation", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-top", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-bottom", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-left", NULL);
+       g_key_file_remove_key (key_file, EV_PAGE_SETUP_GROUP,
+                              "page-setup-margin-right", NULL);
+
        save_print_setting_file (key_file);
        g_key_file_free (key_file);
 
        save_print_setting_file (key_file);
        g_key_file_free (key_file);
 
@@ -3738,23 +3758,47 @@ ev_window_setup_gtk_settings (EvWindow *window)
        g_free (menubar_accel_accel);
 }
 
        g_free (menubar_accel_accel);
 }
 
+static void
+ev_window_update_max_min_scale (EvWindow *window)
+{
+       gdouble    dpi;
+       GtkAction *action;
+       gdouble    min_width, min_height;
+       gdouble    width, height;
+       gdouble    max_scale;
+       gint       rotation = ev_document_model_get_rotation (window->priv->model);
+
+       if (!window->priv->document)
+               return;
+
+       dpi = get_screen_dpi (window) / 72.0;
+
+       ev_document_get_min_page_size (window->priv->document, &min_width, &min_height);
+       width = (rotation == 0 || rotation == 180) ? min_width : min_height;
+       height = (rotation == 0 || rotation == 180) ? min_height : min_width;
+       max_scale = sqrt (PAGE_CACHE_SIZE / (width * dpi * 4 * height * dpi));
+
+       action = gtk_action_group_get_action (window->priv->action_group,
+                                             ZOOM_CONTROL_ACTION);
+       ephy_zoom_action_set_max_zoom_level (EPHY_ZOOM_ACTION (action), max_scale * dpi);
+
+       ev_document_model_set_min_scale (window->priv->model, MIN_SCALE * dpi);
+       ev_document_model_set_max_scale (window->priv->model, max_scale * dpi);
+}
+
 static void
 ev_window_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen)
 {
        EvWindow *window = EV_WINDOW (widget);
 static void
 ev_window_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen)
 {
        EvWindow *window = EV_WINDOW (widget);
-       EvWindowPrivate *priv = window->priv;
        GdkScreen *screen;
        GdkScreen *screen;
-       gdouble dpi;
 
        screen = gtk_widget_get_screen (widget);
        if (screen == old_screen)
                return;
 
        ev_window_setup_gtk_settings (window);
 
        screen = gtk_widget_get_screen (widget);
        if (screen == old_screen)
                return;
 
        ev_window_setup_gtk_settings (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);
+       ev_window_update_max_min_scale (window);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->screen_changed (widget, old_screen);
@@ -4172,6 +4216,7 @@ ev_window_rotation_changed_cb (EvDocumentModel *model,
                ev_metadata_set_int (window->priv->metadata, "rotation",
                                     rotation);
 
                ev_metadata_set_int (window->priv->metadata, "rotation",
                                     rotation);
 
+       ev_window_update_max_min_scale (window);
        ev_window_refresh_window_thumbnail (window);
 }
 
        ev_window_refresh_window_thumbnail (window);
 }
 
@@ -4874,6 +4919,7 @@ ev_window_dispose (GObject *object)
        }
 
        if (priv->last_settings) {
        }
 
        if (priv->last_settings) {
+               g_settings_apply (priv->last_settings);
                g_object_unref (priv->last_settings);
                priv->last_settings = NULL;
        }
                g_object_unref (priv->last_settings);
                priv->last_settings = NULL;
        }
@@ -6136,7 +6182,6 @@ ev_window_init (EvWindow *ev_window)
        EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
        gchar *ui_path;
        EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
        gchar *ui_path;
-       gdouble dpi;
 
        g_signal_connect (ev_window, "configure_event",
                          G_CALLBACK (window_configure_event_cb), NULL);
 
        g_signal_connect (ev_window, "configure_event",
                          G_CALLBACK (window_configure_event_cb), NULL);
@@ -6322,10 +6367,9 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (ev_window->priv->view_box);
 
        ev_window->priv->view = ev_view_new ();
        gtk_widget_show (ev_window->priv->view_box);
 
        ev_window->priv->view = ev_view_new ();
+       ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view), PAGE_CACHE_SIZE);
        ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
        ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
-       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));
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
        ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));
        g_signal_connect_swapped (ev_window->priv->password_view,
                                  "unlock",
@@ -6460,6 +6504,7 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_grab_focus (ev_window->priv->view);
 
        ev_window->priv->last_settings = g_settings_new (GS_SCHEMA_NAME".Default");
        gtk_widget_grab_focus (ev_window->priv->view);
 
        ev_window->priv->last_settings = g_settings_new (GS_SCHEMA_NAME".Default");
+       g_settings_delay (ev_window->priv->last_settings);
 
        /* Set it user interface params */
        ev_window_setup_recent (ev_window);
 
        /* Set it user interface params */
        ev_window_setup_recent (ev_window);
Dual-screen mode for evince