]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-window.c
Exit from fullscreen mode when switch to presentation. Fix for bug 309365
[evince.git] / shell / ev-window.c
index 37531df608cbdcaa42cfd153b1875c8ede6abb1b..72b7a38ce536fb5d76eb1fe546b1c088366c1203 100644 (file)
@@ -60,6 +60,7 @@
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 #include "ev-file-helpers.h"
+#include "ev-metadata-manager.h"
 
 #include <poppler.h>
 
@@ -179,8 +180,8 @@ static void     ev_window_zoom_changed_cb           (EvView           *view,
                                                         EvWindow         *ev_window);
 static void     ev_window_add_recent                    (EvWindow         *window,
                                                         const char       *filename);
-static void     ev_window_fullscreen                    (EvWindow         *window);
-static void     ev_window_unfullscreen                  (EvWindow         *window);
+static void     ev_window_run_fullscreen                (EvWindow         *window);
+static void     ev_window_stop_fullscreen               (EvWindow         *window);
 static void     ev_window_cmd_view_fullscreen           (GtkAction        *action,
                                                         EvWindow         *window);
 static void     ev_window_run_presentation              (EvWindow         *window);
@@ -257,6 +258,8 @@ update_action_sensitivity (EvWindow *ev_window)
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "EditFindNext",
                              ev_view_can_find_next (view));
+       set_action_sensitive (ev_window, "EditRotateLeft", has_document);
+       set_action_sensitive (ev_window, "EditRotateRight", has_document);
 
         /* View menu */
        set_action_sensitive (ev_window, "ViewContinuous", has_pages);
@@ -620,7 +623,7 @@ update_document_mode (EvWindow *window, EvDocumentMode mode)
                ev_window_run_presentation (window);
        }
        else if (mode == EV_DOCUMENT_MODE_FULL_SCREEN) {
-               ev_window_fullscreen (window);
+               ev_window_run_fullscreen (window);
        }
 }
 
@@ -904,6 +907,23 @@ ev_window_xfer_job_cb  (EvJobXfer *job,
        }               
 }
 
+#ifdef ENABLE_METADATA
+static void
+ev_window_setup_from_metadata (EvWindow *window)
+{
+       char *uri = window->priv->uri;
+       GValue width = { 0, };
+       GValue height = { 0, };
+
+       ev_metadata_manager_get (uri, "window_width", &width);
+       ev_metadata_manager_get (uri, "window_height", &height);
+
+       gtk_window_set_default_size (GTK_WINDOW (window),
+                                    g_value_get_int (&width),
+                                    g_value_get_int (&height));
+}
+#endif
+
 void
 ev_window_open_uri (EvWindow *ev_window, const char *uri)
 {
@@ -912,6 +932,10 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
 
        g_free (ev_window->priv->uri);
        ev_window->priv->uri = g_strdup (uri);
+
+#ifdef ENABLE_METADATA
+       ev_window_setup_from_metadata (ev_window);
+#endif
        
        ev_window_clear_jobs (ev_window);
        ev_window_clear_local_uri (ev_window);
@@ -930,42 +954,49 @@ ev_window_open_uri (EvWindow *ev_window, const char *uri)
                                    TRUE);
 }
 
-void
-ev_window_open_uri_list (EvWindow *ev_window, GSList *uri_list)
+static void
+ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 {
-       GSList *list;
-       gchar  *uri;
-       
-       g_return_if_fail (uri_list != NULL);
-       
-       list = uri_list;
-       while (list) {
+       GtkWidget *chooser;
+       static char *folder = NULL;
 
-               uri = (gchar *)list->data;
-               
-                       if (ev_window_is_empty (EV_WINDOW (ev_window))) {
-                               ev_window_open_uri (ev_window, uri);
+       chooser = gtk_file_chooser_dialog_new (_("Open document"),
+                                              GTK_WINDOW (window),
+                                              GTK_FILE_CHOOSER_ACTION_OPEN,
+                                              GTK_STOCK_CANCEL,
+                                              GTK_RESPONSE_CANCEL,
+                                              GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                              NULL);
 
-                               gtk_widget_show (GTK_WIDGET (ev_window));
-                       } else {
-                               EvWindow *new_window;
+       if (folder) {
+               gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (chooser),
+                                                        folder);
+       }
 
-                               new_window = ev_application_new_window (EV_APP);
-                               ev_window_open_uri (new_window, uri);
+       ev_document_types_add_filters (chooser);
+       gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), TRUE);
+       gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
 
-                               gtk_widget_show (GTK_WIDGET (new_window));
-                       }
+       if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
+               GSList *uris;
 
-               g_free (uri);
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (chooser));
+
+               if (folder != NULL)
+                       g_free (folder);
+                               
+               folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
 
-               list = g_slist_next (list);
+               ev_application_open_uri_list (EV_APP, uris);
+       
+               g_slist_foreach (uris, (GFunc)g_free, NULL);    
+               g_slist_free (uris);
+       } else {
+               if (!GTK_WIDGET_VISIBLE (window))
+                       gtk_widget_destroy (GTK_WIDGET (window));
        }
-}
 
-static void
-ev_window_cmd_file_open (GtkAction *action, EvWindow *ev_window)
-{
-       ev_application_open (EV_APP, NULL);
+       gtk_widget_destroy (GTK_WIDGET (chooser));
 }
 
 static void
@@ -974,16 +1005,13 @@ ev_window_cmd_recent_file_activate (GtkAction *action,
 {
        char *uri;
        EggRecentItem *item;
-       GtkWidget *window;
 
        item = egg_recent_view_uimanager_get_item (ev_window->priv->recent_view,
                                                   action);
 
        uri = egg_recent_item_get_uri (item);
-       
-       window = GTK_WIDGET (ev_application_get_empty_window (EV_APP));
-       gtk_widget_show (window);
-       ev_window_open_uri (EV_WINDOW (window), uri);
+
+       ev_application_open_uri (EV_APP, uri, NULL);    
        
        g_free (uri);
 }
@@ -1194,6 +1222,12 @@ ev_window_print (EvWindow *window)
        ev_window_print_range (window, 1, -1);
 }
 
+const char *
+ev_window_get_uri (EvWindow *ev_window)
+{
+       return ev_window->priv->uri;
+}
+
 void
 ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
 {
@@ -1600,7 +1634,7 @@ ev_window_update_fullscreen_action (EvWindow *window)
 }
 
 static void
-ev_window_fullscreen (EvWindow *window)
+ev_window_run_fullscreen (EvWindow *window)
 {
        ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        if (window->priv->fullscreen_popup == NULL)
@@ -1629,10 +1663,13 @@ ev_window_fullscreen (EvWindow *window)
 }
 
 static void
-ev_window_unfullscreen (EvWindow *window)
+ev_window_stop_fullscreen (EvWindow *window)
 {
        EvView *view = EV_VIEW (window->priv->view);
 
+       if (!ev_view_get_fullscreen (EV_VIEW (view)))
+               return;
+
        ev_view_set_fullscreen (view, FALSE);
        g_object_set (G_OBJECT (window->priv->scrolled_window),
                      "shadow-type", GTK_SHADOW_IN,
@@ -1661,9 +1698,9 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
 
        fullscreen = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (fullscreen) {
-               ev_window_fullscreen (window);
+               ev_window_run_fullscreen (window);
        } else {
-               ev_window_unfullscreen (window);
+               ev_window_stop_fullscreen (window);
        }
 }
 
@@ -1698,7 +1735,7 @@ ev_window_run_presentation (EvWindow *window)
 static void
 ev_window_stop_presentation (EvWindow *window)
 {
-       if (! ev_view_get_presentation (EV_VIEW (window->priv->view)))
+       if (!ev_view_get_presentation (EV_VIEW (window->priv->view)))
                return;
 
        g_object_set (G_OBJECT (window->priv->scrolled_window),
@@ -1716,6 +1753,7 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window)
        gboolean presentation;
 
         g_return_if_fail (EV_IS_WINDOW (window));
+       ev_window_stop_fullscreen (window);
 
        presentation = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
        if (presentation) {
@@ -2008,7 +2046,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
                              NULL);
 
                if (fullscreen)
-                       ev_window_unfullscreen (window);
+                       ev_window_stop_fullscreen (window);
                if (presentation)
                        ev_window_stop_presentation (window);
 
@@ -2420,6 +2458,20 @@ zoom_control_changed_cb (EphyZoomAction *action,
        }
 }
 
+static void
+ev_window_finalize (GObject *object)
+{
+       GList *windows = gtk_window_list_toplevels ();
+
+       if (windows == NULL) {
+               ev_application_shutdown (EV_APP);
+       } else {
+               g_list_free (windows);
+       }
+
+       G_OBJECT_CLASS (ev_window_parent_class)->finalize (object);
+}
+
 static void
 ev_window_dispose (GObject *object)
 {
@@ -2520,6 +2572,7 @@ ev_window_class_init (EvWindowClass *ev_window_class)
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (ev_window_class);
 
        g_object_class->dispose = ev_window_dispose;
+       g_object_class->finalize = ev_window_finalize;
 
        widget_class->window_state_event = ev_window_state_event;
        widget_class->focus_in_event = ev_window_focus_in_event;
@@ -2712,7 +2765,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context,
 
                gnome_vfs_uri_list_free (uri_list);
                
-               ev_window_open_uri_list (EV_WINDOW (widget), uris);
+               ev_application_open_uri_list (EV_APP, uris);
                
                g_slist_free (uris);
 
@@ -2948,6 +3001,25 @@ sidebar_page_main_widget_update_cb (GObject *ev_sidebar_page,
        }
 }
 
+static gboolean
+window_configure_event_cb (EvWindow *window, gpointer dummy)
+{
+#ifdef ENABLE_METADATA
+       int width, height;
+
+       if (window->priv->uri == NULL) {
+               return FALSE;
+       }
+
+       gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+
+       ev_metadata_manager_set_int (window->priv->uri, "window_width", width);
+       ev_metadata_manager_set_int (window->priv->uri, "window_height", height);
+#endif
+
+       return FALSE;
+}
+
 static void
 ev_window_init (EvWindow *ev_window)
 {
@@ -2959,6 +3031,9 @@ ev_window_init (EvWindow *ev_window)
        GConfClient *client;
        int sidebar_size;
 
+       g_signal_connect (ev_window, "configure_event",
+                         G_CALLBACK (window_configure_event_cb), NULL);
+
        ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
        ev_window->priv->page_mode = PAGE_MODE_DOCUMENT;
@@ -3211,3 +3286,18 @@ ev_window_init (EvWindow *ev_window)
        update_action_sensitivity (ev_window);
 }
 
+GtkWidget *
+ev_window_new (void)
+{
+       GtkWidget *ev_window;
+
+       ev_window = GTK_WIDGET (g_object_new (EV_TYPE_WINDOW,
+                                             "type", GTK_WINDOW_TOPLEVEL,
+                                             "default-width", 600,
+                                             "default-height", 600,
+                                             NULL));
+
+       return ev_window;
+}
+
+