]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-application.c
Do not hide sidebar in fullscreen mode. Fixes bug #396535.
[evince.git] / shell / ev-application.c
index 75c22470ce8cc486398ee110efa1f33f7940e66d..7633fb7a3cde6f203aed2fbe9b35a3123850f9d4 100644 (file)
@@ -45,6 +45,8 @@
 
 #include <string.h>
 
+static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
+
 struct _EvApplication {
        GObject base_instance;
 
@@ -59,6 +61,13 @@ struct _EvApplication {
        TotemScrsaver *scr_saver;
 
        gchar *last_chooser_uri;
+
+#ifdef WITH_GTK_PRINT
+       GtkPrintSettings *print_settings;
+#if GTK_CHECK_VERSION (2, 11, 0)
+       gchar            *print_settings_file;
+#endif
+#endif
 };
 
 struct _EvApplicationClass {
@@ -343,6 +352,22 @@ get_unlink_temp_file_from_args (GHashTable *args)
        return unlink_temp_file;
 }
 
+static const gchar *
+get_print_settings_from_args (GHashTable *args)
+{
+       const gchar *print_settings = NULL;
+       GValue      *value = NULL;
+
+       g_assert (args != NULL);
+
+       value = g_hash_table_lookup (args, "print-settings");
+       if (value) {
+               print_settings = g_value_get_string (value);
+       }
+
+       return print_settings;
+}
+
 /**
  * ev_application_open_window:
  * @application: The instance of the application.
@@ -372,6 +397,7 @@ ev_application_open_window (EvApplication  *application,
        if (screen) {
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
        }
+       ev_application_add_icon_path_for_screen (screen);
        
        gtk_widget_show (new_window);
        
@@ -451,30 +477,11 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
        return uri_window;
 }
 
-/**
- * ev_application_open_uri_at_dest:
- * @application: The instance of the application.
- * @uri: The uri to be opened.
- * @screen: Thee screen where the link will be shown.
- * @dest: The #EvLinkDest of the document.
- * @mode: The run mode of the window.
- * @unlink_temp_file: The unlink_temp_file option value.
- * @timestamp: Current time value.
- */
-void
-ev_application_open_uri_at_dest (EvApplication  *application,
-                                const char     *uri,
-                                GdkScreen      *screen,
-                                EvLinkDest     *dest,
-                                EvWindowRunMode mode,
-                                gboolean        unlink_temp_file,
-                                guint           timestamp)
+static void
+ev_application_add_icon_path_for_screen (GdkScreen *screen)
 {
-       EvWindow     *new_window;
        GtkIconTheme *icon_theme;
 
-       g_return_if_fail (uri != NULL);
-
        icon_theme = gtk_icon_theme_get_for_screen (screen);
        if (icon_theme) {
                gchar **path = NULL;
@@ -499,6 +506,33 @@ ev_application_open_uri_at_dest (EvApplication  *application,
                g_free (ev_icons_path);
                g_strfreev (path);
        }       
+}
+
+/**
+ * ev_application_open_uri_at_dest:
+ * @application: The instance of the application.
+ * @uri: The uri to be opened.
+ * @screen: Thee screen where the link will be shown.
+ * @dest: The #EvLinkDest of the document.
+ * @mode: The run mode of the window.
+ * @unlink_temp_file: The unlink_temp_file option value.
+ * @timestamp: Current time value.
+ */
+void
+ev_application_open_uri_at_dest (EvApplication  *application,
+                                const char     *uri,
+                                GdkScreen      *screen,
+                                EvLinkDest     *dest,
+                                EvWindowRunMode mode,
+                                gboolean        unlink_temp_file,
+                                const gchar    *print_settings, 
+                                guint           timestamp)
+{
+       EvWindow *new_window;
+
+       g_return_if_fail (uri != NULL);
+       
+       ev_application_add_icon_path_for_screen (screen);
 
        new_window = ev_application_get_uri_window (application, uri);
        
@@ -515,7 +549,8 @@ ev_application_open_uri_at_dest (EvApplication  *application,
 
        /* We need to load uri before showing the window, so
           we can restore window size without flickering */     
-       ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file);
+       ev_window_open_uri (new_window, uri, dest, mode,
+                           unlink_temp_file, print_settings);
 
        ev_document_fc_mutex_lock ();
        gtk_widget_show (GTK_WIDGET (new_window));
@@ -543,6 +578,7 @@ ev_application_open_uri (EvApplication  *application,
        EvLinkDest      *dest = NULL;
        EvWindowRunMode  mode = EV_WINDOW_MODE_NORMAL;
        gboolean         unlink_temp_file = FALSE;
+       const gchar     *print_settings = NULL;
        GdkScreen       *screen = NULL;
 
        if (args) {
@@ -551,11 +587,12 @@ ev_application_open_uri (EvApplication  *application,
                mode = get_window_run_mode_from_args (args);
                unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
                                    get_unlink_temp_file_from_args (args));
+               print_settings = get_print_settings_from_args (args);
        }
        
        ev_application_open_uri_at_dest (application, uri, screen,
-                                        dest, mode, unlink_temp_file, 
-                                        timestamp);
+                                        dest, mode, unlink_temp_file,
+                                        print_settings, timestamp);
 
        if (dest)
                g_object_unref (dest);
@@ -573,8 +610,8 @@ ev_application_open_uri_list (EvApplication *application,
 
        for (l = uri_list; l != NULL; l = l->next) {
                ev_application_open_uri_at_dest (application, (char *)l->data,
-                                                screen, NULL, 0, FALSE, 
-                                                timestamp);
+                                                screen, NULL, 0, FALSE,
+                                                NULL, timestamp);
        }
 }
 
@@ -594,6 +631,35 @@ ev_application_shutdown (EvApplication *application)
                application->recent_model = NULL;
        }
 #endif
+
+#ifdef WITH_GTK_PRINT
+#if GTK_CHECK_VERSION (2, 11, 0)
+       if (application->print_settings_file) {
+               if (application->print_settings) {
+                       GError *error = NULL;
+                       
+                       gtk_print_settings_to_file (application->print_settings,
+                                                   application->print_settings_file,
+                                                   &error);
+                       if (error) {
+                               g_warning (error->message);
+                               g_error_free (error);
+                       }
+
+                       g_object_unref (application->print_settings);
+                       application->print_settings = NULL;
+               }
+
+               g_free (application->print_settings_file);
+               application->print_settings_file = NULL;
+       }
+#else /* ! GTK 2.11.0 */
+       if (application->print_settings) {
+               g_object_unref (application->print_settings);
+               application->print_settings = NULL;
+       }
+#endif /* GTK 2.11.0 */
+#endif /* WITH_GTK_PRINT */
        
        g_free (application->last_chooser_uri);
        g_object_unref (application);
@@ -703,7 +769,7 @@ ev_application_get_chooser_uri (EvApplication *application)
 }
 
 void
-ev_application_screensaver_enable  (EvApplication *application)
+ev_application_screensaver_enable (EvApplication *application)
 {
        if (application->scr_saver)
                totem_scrsaver_enable (application->scr_saver); 
@@ -715,3 +781,52 @@ ev_application_screensaver_disable (EvApplication *application)
        if (application->scr_saver)
                totem_scrsaver_disable (application->scr_saver);        
 }
+
+#ifdef WITH_GTK_PRINT
+GtkPrintSettings *
+ev_application_get_print_settings (EvApplication *application)
+{
+       if (application->print_settings)
+               return application->print_settings;
+       
+#if GTK_CHECK_VERSION (2, 11, 0)
+       if (!application->print_settings_file) {
+               application->print_settings_file =
+                       g_build_filename (ev_dot_dir (), "print-settings", NULL);
+       }
+
+       if (g_file_test (application->print_settings_file, G_FILE_TEST_IS_REGULAR)) {
+               GError *error = NULL;
+               
+               application->print_settings =
+                       gtk_print_settings_new_from_file (application->print_settings_file, &error);
+               
+               if (error) {
+                       g_warning (error->message);
+                       g_error_free (error);
+               } else {
+                       return application->print_settings;
+               }
+       }
+#endif /* GTK 2.11.0 */
+       
+       application->print_settings = gtk_print_settings_new ();
+
+       return application->print_settings;
+}
+
+void
+ev_application_set_print_settings (EvApplication    *application,
+                                  GtkPrintSettings *settings)
+{
+       g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings));
+       
+       if (settings == application->print_settings)
+               return;
+
+       if (application->print_settings)
+               g_object_unref (application->print_settings);
+       
+       application->print_settings = g_object_ref (settings);
+}
+#endif /* WITH_GTK_PRINT */