]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
[shell] Remove left over GtkPrinter
[evince.git] / shell / ev-window.c
index 5d99f667764ac7e5f277143a88ff0df8334a8c31..ded233d856375bc2e94316863e5088643f44bd68 100644 (file)
@@ -38,7 +38,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkunixprint.h>
 
 #ifdef WITH_GCONF
 #include <gconf/gconf-client.h>
@@ -199,7 +198,6 @@ struct _EvWindowPrivate {
 
        /* Printing */
        GQueue           *print_queue;
-       GtkPrinter       *printer;
        GtkPrintSettings *print_settings;
        GtkPageSetup     *print_page_setup;
        gboolean          close_after_print;
@@ -992,10 +990,12 @@ setup_document_from_metadata (EvWindow *window)
                        request_width = MIN (request_width, gdk_screen_get_width (screen));
                        request_height = MIN (request_width, gdk_screen_get_height (screen));
                }
-                               
-               gtk_window_resize (GTK_WINDOW (window),
-                                  request_width,
-                                  request_height);
+               
+               if (request_width > 0 && request_height > 0) {
+                       gtk_window_resize (GTK_WINDOW (window),
+                                          request_width,
+                                          request_height);
+               }
                g_value_unset (&width_ratio);
                g_value_unset (&height_ratio);
        }
@@ -1157,7 +1157,8 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
        EvDocument *document = ev_window->priv->document;
        
        if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
-           ev_page_cache_get_n_pages (ev_window->priv->page_cache) <= 0) {
+           ev_page_cache_get_n_pages (ev_window->priv->page_cache) <= 0 ||
+           ev_page_cache_check_dimensions (ev_window->priv->page_cache)) {
                return;
        }
        
@@ -1244,15 +1245,19 @@ ev_window_set_document (EvWindow *ev_window, EvDocument *document)
                ev_window->priv->dest = NULL;
        }
 
-       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
-               ev_view_set_document (view, document);
-       } else {
+       if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) <= 0) {
                ev_window_warning_message (ev_window, "%s",
                                           _("The document contains no pages"));
+       } else if (ev_page_cache_check_dimensions (ev_window->priv->page_cache)) {
+               ev_window_warning_message (ev_window, "%s",
+                                          _("The document contains only empty pages"));
+       } else {
+               ev_view_set_document (view, document);
        }
 
        if (ev_window->priv->setup_document_idle > 0)
                g_source_remove (ev_window->priv->setup_document_idle);
+
        ev_window->priv->setup_document_idle = g_idle_add ((GSourceFunc)ev_window_setup_document, ev_window);
 }
 
@@ -2014,24 +2019,25 @@ file_open_dialog_response_cb (GtkWidget *chooser,
                              gint       response_id,
                              EvWindow  *ev_window)
 {
-       gchar *uri;
-
        if (response_id == GTK_RESPONSE_OK) {
                GSList *uris;
+               gchar  *uri;
 
                uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
 
                ev_application_open_uri_list (EV_APP, uris,
                                              gtk_window_get_screen (GTK_WINDOW (ev_window)),
                                              GDK_CURRENT_TIME);
-       
-               g_slist_foreach (uris, (GFunc)g_free, NULL);    
+
+               g_slist_foreach (uris, (GFunc)g_free, NULL);
                g_slist_free (uris);
-       }
 
-       uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser));
-       ev_application_set_chooser_uri (EV_APP, uri);
-       g_free (uri);
+               uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
+               ev_application_set_filechooser_uri (EV_APP,
+                                                   GTK_FILE_CHOOSER_ACTION_OPEN,
+                                                   uri);
+               g_free (uri);
+       }
 
        gtk_widget_destroy (chooser);
 }
@@ -2039,7 +2045,9 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 static void
 ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
-       GtkWidget *chooser;
+       GtkWidget   *chooser;
+       const gchar *default_uri;
+       gchar       *parent_uri = NULL;
 
        chooser = gtk_file_chooser_dialog_new (_("Open Document"),
                                               GTK_WINDOW (window),
@@ -2052,12 +2060,23 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        ev_document_factory_add_filters (chooser, NULL);
        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
-       if (ev_application_get_chooser_uri (EV_APP) != NULL) {
-               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
-                                         ev_application_get_chooser_uri (EV_APP));
-       } else if (window->priv->uri != NULL) {
-               gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
-                                         window->priv->uri);
+
+       default_uri = ev_application_get_filechooser_uri (EV_APP, GTK_FILE_CHOOSER_ACTION_OPEN);
+       if (!default_uri && window->priv->uri) {
+               GFile *file, *parent;
+
+               file = g_file_new_for_uri (window->priv->uri);
+               parent = g_file_get_parent (file);
+               if (parent) {
+                       parent_uri = g_file_get_uri (parent);
+                       default_uri = parent_uri;
+                       g_object_unref (parent);
+               }
+               g_object_unref (file);
+       }
+
+       if (default_uri) {
+               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser), default_uri);
        } else {
                const gchar *folder;
 
@@ -2065,7 +2084,8 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
                gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
                                                     folder ? folder : g_get_home_dir ());
        }
-       
+       g_free (parent_uri);
+
        g_signal_connect (chooser, "response",
                          G_CALLBACK (file_open_dialog_response_cb),
                          window);
@@ -2531,17 +2551,32 @@ file_save_dialog_response_cb (GtkWidget *fc,
                              EvWindow  *ev_window)
 {
        gchar *uri;
-       
+       GFile *file, *parent;
+
        if (response_id != GTK_RESPONSE_OK) {
                gtk_widget_destroy (fc);
                return;
        }
-       
+
        uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fc));
+       file = g_file_new_for_uri (uri);
+       parent = g_file_get_parent (file);
+       g_object_unref (file);
+       if (parent) {
+               gchar *folder_uri;
+
+               folder_uri = g_file_get_uri (parent);
+               ev_application_set_filechooser_uri (EV_APP,
+                                                   GTK_FILE_CHOOSER_ACTION_SAVE,
+                                                   folder_uri);
+               g_free (folder_uri);
+               g_object_unref (parent);
+       }
+
        /* FIXME: remote copy should be done here rather than in the save job, 
         * so that we can track progress and cancel the operation
         */
-       
+
        ev_window_clear_save_job (ev_window);
        ev_window->priv->save_job = ev_job_save_new (ev_window->priv->document,
                                                     uri, ev_window->priv->uri);
@@ -2561,7 +2596,7 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
        gchar *base_name;
        GFile *file;
-       const gchar *folder;
+       const gchar *default_uri;
 
        fc = gtk_file_chooser_dialog_new (
                _("Save a Copy"),
@@ -2582,14 +2617,21 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        file = g_file_new_for_uri (ev_window->priv->uri);
        base_name = g_file_get_basename (file);
        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
-       
-       folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-       gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
-                                            folder ? folder : g_get_home_dir ());
-       
+
+       default_uri = ev_application_get_filechooser_uri (EV_APP, GTK_FILE_CHOOSER_ACTION_SAVE);
+       if (default_uri) {
+               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (fc), default_uri);
+       } else {
+               const gchar *folder;
+
+               folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+               gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
+                                                    folder ? folder : g_get_home_dir ());
+       }
+
        g_object_unref (file);
        g_free (base_name);
-        
+
        g_signal_connect (fc, "response",
                          G_CALLBACK (file_save_dialog_response_cb),
                          ev_window);
@@ -4512,10 +4554,17 @@ ev_window_drag_data_received (GtkWidget        *widget,
                              guint             time)
 
 {
-       EvWindow *window = EV_WINDOW (widget);
-       gchar   **uris;
-       gint      i = 0;
-       GSList   *uri_list = NULL;
+       EvWindow  *window = EV_WINDOW (widget);
+       gchar    **uris;
+       gint       i = 0;
+       GSList    *uri_list = NULL;
+       GtkWidget *source;
+
+       source = gtk_drag_get_source_widget (context);
+       if (source && widget == gtk_widget_get_toplevel (source)) {
+               gtk_drag_finish (context, FALSE, FALSE, time);
+               return;
+       }
 
        uris = gtk_selection_data_get_uris (selection_data);
        if (!uris) {
@@ -4665,11 +4714,6 @@ ev_window_dispose (GObject *object)
        
        ev_window_close_dialogs (window);
 
-       if (window->priv->printer) {
-               g_object_unref (window->priv->printer);
-               window->priv->printer = NULL;
-       }
-
        if (window->priv->print_settings) {
                g_object_unref (window->priv->print_settings);
                window->priv->print_settings = NULL;
@@ -4741,6 +4785,30 @@ ev_window_dispose (GObject *object)
        G_OBJECT_CLASS (ev_window_parent_class)->dispose (object);
 }
 
+static gboolean
+ev_window_key_press_event (GtkWidget   *widget,
+                          GdkEventKey *event)
+{
+       EvWindow *ev_window = EV_WINDOW (widget);
+       gboolean  handled = FALSE;
+
+       /* Propagate the event to the view first
+        * It's needed to be able to type in
+        * annot popups windows
+        */
+       if (ev_window->priv->view) {
+               g_object_ref (ev_window->priv->view);
+               if (GTK_WIDGET_IS_SENSITIVE (ev_window->priv->view))
+                       handled = gtk_widget_event (ev_window->priv->view, (GdkEvent*) event);
+               g_object_unref (ev_window->priv->view);
+       }
+
+       if (!handled)
+               handled = GTK_WIDGET_CLASS (ev_window_parent_class)->key_press_event (widget, event);
+
+       return handled;
+}
+
 static void
 ev_window_class_init (EvWindowClass *ev_window_class)
 {
@@ -4750,6 +4818,7 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        g_object_class->dispose = ev_window_dispose;
        g_object_class->finalize = ev_window_finalize;
 
+       widget_class->key_press_event = ev_window_key_press_event;
        widget_class->screen_changed = ev_window_screen_changed;
        widget_class->window_state_event = ev_window_state_event;
        widget_class->drag_data_received = ev_window_drag_data_received;
@@ -5333,6 +5402,8 @@ do_action_named (EvWindow *window, EvLinkAction *action)
                ev_window_cmd_edit_find (NULL, window);
        } else if (g_ascii_strcasecmp (name, "Close") == 0) {
                ev_window_cmd_file_close_window (NULL, window);
+       } else if (g_ascii_strcasecmp (name, "Print") == 0) {
+               ev_window_cmd_file_print (NULL, window);
        } else {
                g_warning ("Unimplemented named action: %s, please post a "
                           "bug report in Evince bugzilla "