X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-window.c;h=854079b573e0888cfbb9a4c2929daeafce1adf06;hb=bbc6a0f5736ed843754902eb9a829dd5e173e1ac;hp=29141d224a588b9b73dcc2d95400be296efefc43;hpb=d93ec57b2282ee22ade99eba434e1b13de80bcf3;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 29141d22..854079b5 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,12 +37,14 @@
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
-#include "ev-properties.h"
+#include "ev-properties-dialog.h"
+#include "ev-ps-exporter.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-fonts.h"
 #include "ev-document-find.h"
 #include "ev-document-security.h"
+#include "ev-document-types.h"
 #include "ev-job-queue.h"
 #include "ev-jobs.h"
 #include "ev-statusbar.h"
@@ -59,6 +61,8 @@
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 #include "ev-file-helpers.h"
+#include "ev-metadata-manager.h"
+
 #include <poppler.h>
 
 #include <glib/gi18n.h>
@@ -104,7 +108,7 @@ struct _EvWindowPrivate {
 	GtkWidget *sidebar_thumbs;
 
 	/* Dialogs */
-	EvProperties *properties;
+	GtkWidget *properties;
 
 	/* UI Builders */
 	GtkActionGroup *action_group;
@@ -177,8 +181,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);
@@ -211,13 +215,18 @@ update_action_sensitivity (EvWindow *ev_window)
 	int n_pages = 0, page = -1;
 	gboolean ok_to_print = TRUE;
 	gboolean ok_to_copy = TRUE;
+	gboolean has_properties = TRUE;
 
 	view = EV_VIEW (ev_window->priv->view);
+
 	document = ev_window->priv->document;
+
 	if (document)
 		info = ev_page_cache_get_info (ev_window->priv->page_cache);
+
 	page_mode = ev_window->priv->page_mode;
 	has_document = document != NULL;
+
 	if (has_document && ev_window->priv->page_cache) {
 		page = ev_page_cache_get_current_page (ev_window->priv->page_cache);
 		n_pages = ev_page_cache_get_n_pages (ev_window->priv->page_cache);
@@ -229,11 +238,18 @@ update_action_sensitivity (EvWindow *ev_window)
 		ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY);
 	}
 
+	if (has_document && !EV_IS_PS_EXPORTER(document))
+		ok_to_print = FALSE;
+
+	if (!info || info->fields_mask == 0) {
+		has_properties = FALSE;
+	}
+
 	/* File menu */
 	/* "FileOpen": always sensitive */
 	set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy);
 	set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print);
-	set_action_sensitive (ev_window, "FileProperties", has_document);
+	set_action_sensitive (ev_window, "FileProperties", has_document && has_properties);
 	/* "FileCloseWindow": always sensitive */
 
         /* Edit menu */
@@ -246,6 +262,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);
@@ -609,7 +627,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);
 	}
 }
 
@@ -654,8 +672,8 @@ ev_window_setup_document (EvWindow *ev_window)
 	update_document_mode (ev_window, info->mode);
 
 	if (ev_window->priv->properties) {
-		ev_properties_set_document (ev_window->priv->properties,
-					    ev_window->priv->document);
+		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+					           ev_window->priv->document);
 	}
 }
 
@@ -893,6 +911,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)
 {
@@ -901,6 +936,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);
@@ -919,42 +958,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));
 
-		list = g_slist_next (list);
+		if (folder != NULL)
+			g_free (folder);
+				
+		folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser));
+
+		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
@@ -963,16 +1009,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);
 }
@@ -1088,8 +1131,11 @@ static void
 ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 {
 	GtkWidget *fc;
-	GtkFileFilter *pdf_filter, *all_filter;
-	gchar *uri = NULL;
+
+	gchar *uri;
+	gchar *basename;
+	static char* folder = NULL;
+
 	gboolean success;
 
 	fc = gtk_file_chooser_dialog_new (
@@ -1100,18 +1146,17 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 		NULL);
 	gtk_window_set_modal (GTK_WINDOW (fc), TRUE);
 
-	pdf_filter = gtk_file_filter_new ();
-	gtk_file_filter_set_name (pdf_filter, _("PDF Documents"));
-	gtk_file_filter_add_mime_type (pdf_filter, "application/pdf");
-	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
-
-	all_filter = gtk_file_filter_new ();
-	gtk_file_filter_set_name (all_filter, _("All Files"));
-	gtk_file_filter_add_pattern (all_filter, "*");
-	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fc), all_filter);
-	gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (fc), pdf_filter);
-
+	ev_document_types_add_filters_for_type (fc, G_TYPE_FROM_INSTANCE (ev_window->priv->document));
 	gtk_dialog_set_default_response (GTK_DIALOG (fc), GTK_RESPONSE_OK);
+	
+	if (folder) {
+		gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER (fc), 
+							folder);
+    	}
+	
+	basename = g_path_get_basename (ev_window->priv->uri);
+	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename);
+	g_free (basename);
 
 	gtk_widget_show (fc);
 
@@ -1133,6 +1178,12 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 		else
 			save_error_dialog (GTK_WINDOW (fc), uri);
 	}
+
+	if (folder != NULL)
+		g_free (folder);
+				
+	folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fc));
+
 	gtk_widget_destroy (fc);
 }
 
@@ -1175,6 +1226,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)
 {
@@ -1266,14 +1323,16 @@ static void
 ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
 {
 	if (ev_window->priv->properties == NULL) {
-		ev_window->priv->properties = ev_properties_new ();
-		ev_properties_set_document (ev_window->priv->properties,
-					    ev_window->priv->document);
+		ev_window->priv->properties = ev_properties_dialog_new ();
+		ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties),
+					           ev_window->priv->document);
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->properties),
 					   (gpointer *) &(ev_window->priv->properties));
+		gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
+					      GTK_WINDOW (ev_window));
 	}
 
-	ev_properties_show (ev_window->priv->properties, GTK_WIDGET (ev_window));
+	gtk_widget_show (ev_window->priv->properties);
 }
 					
 static void
@@ -1581,7 +1640,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)
@@ -1610,10 +1669,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,
@@ -1642,9 +1704,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);
 	}
 }
 
@@ -1679,7 +1741,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),
@@ -1697,6 +1759,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) {
@@ -1989,7 +2052,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);
 
@@ -2164,7 +2227,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"name", _("Evince"),
 		"version", VERSION,
 		"copyright",
-		_("\xc2\xa9 1996-2004 The Evince authors"),
+		_("\xc2\xa9 1996-2005 The Evince authors"),
 		"license", license_trans,
 		"website", "http://www.gnome.org/projects/evince",
 		"comments", comments,
@@ -2206,17 +2269,18 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GParamSpec *pspe
 					 EvWindow   *ev_window)
 {
 	GtkAction *action;
-	gboolean visible, fullscreen;
+	gboolean visible, fullscreen_mode;
+
+
+	fullscreen_mode = ev_view_get_presentation (EV_VIEW (ev_window->priv->view)) ||
+			       ev_view_get_fullscreen (EV_VIEW (ev_window->priv->view));
 
-	g_object_get (ev_window->priv->view,
-		      "fullscreen", &fullscreen,
-		      NULL);
 	visible = GTK_WIDGET_VISIBLE (ev_sidebar);
 
 	/* In fullscreen mode the sidebar is not visible,
 	 * but we don't want to update the chrome
 	 */
-	if (fullscreen)
+	if (fullscreen_mode)
 		return;
 	
 	action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
@@ -2400,6 +2464,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)
 {
@@ -2500,6 +2578,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;
@@ -2692,7 +2771,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);
 
@@ -2928,6 +3007,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)
 {
@@ -2939,6 +3037,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;
@@ -3191,3 +3292,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;
+}
+
+