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=81e7354dc101d5bb9005380178dbe4d7c9560824;hb=0818fd8b1ce7e011d5abe487b2a3cbca774861e8;hp=2556b62fcb2efd92564e0c792aabc3a5ab0c6a8b;hpb=82f0c287b85ccb54a8761718c1ba95f32168d89f;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 2556b62f..81e7354d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -177,6 +177,7 @@ struct _EvWindowPrivate {
 #endif
 
 	EvJob *load_job;
+	EvJob *thumbnail_job;
 #ifdef WITH_GNOME_PRINT
 	GnomePrintJob *print_job;
 #endif
@@ -217,6 +218,8 @@ static void     ev_window_set_page_mode                 (EvWindow         *windo
 							 EvWindowPageMode  page_mode);
 static void	ev_window_load_job_cb  			(EvJobLoad        *job,
 							 gpointer          data);
+static void     ev_window_set_icon_from_thumbnail       (EvJobThumbnail   *job,
+							 EvWindow         *ev_window);
 #ifdef WITH_GTK_PRINT
 static void     ev_window_print_job_cb                  (EvJobPrint       *job,
 							 EvWindow         *window);
@@ -428,13 +431,6 @@ ev_window_update_actions (EvWindow *ev_window)
 					ev_view_can_zoom_out (view) &&
 					!presentation_mode);
 	
-	ev_window_set_action_sensitive (ev_window, "Plus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "Minus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "KpPlus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "KpMinus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "CtrlKpPlus", !presentation_mode);
-	ev_window_set_action_sensitive (ev_window, "CtrlKpMinus", !presentation_mode);
-
         /* Go menu */
 	if (has_pages) {
 		ev_window_set_action_sensitive (ev_window, "GoPreviousPage", page > 0);
@@ -661,8 +657,8 @@ page_changed_cb (EvPageCache *page_cache,
 }
 
 typedef struct _FindTask {
-    const gchar *page_label;
-    gchar *chapter;
+	const gchar *page_label;
+	gchar *chapter;
 } FindTask;
 
 static gboolean
@@ -671,26 +667,26 @@ ev_window_find_chapter (GtkTreeModel *tree_model,
 		        GtkTreeIter  *iter,
 		        gpointer      data)
 {
-    FindTask *task = (FindTask *)data;
-    gchar *page_string;
-    
-    gtk_tree_model_get (tree_model, iter,
-			EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, 
-			-1);
-			
-    if (!page_string)
-	    return FALSE;
-	    
-    if (!strcmp (page_string, task->page_label)) {
-	    gtk_tree_model_get (tree_model, iter,
-		    		EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, 
-				-1);
-	    g_free (page_string);
-	    return TRUE;
-    }
-    
-    g_free (page_string);
-    return FALSE;
+	FindTask *task = (FindTask *)data;
+	gchar *page_string;
+	
+	gtk_tree_model_get (tree_model, iter,
+			    EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, &page_string, 
+			    -1);
+	
+	if (!page_string)
+		return FALSE;
+	
+	if (!strcmp (page_string, task->page_label)) {
+		gtk_tree_model_get (tree_model, iter,
+				    EV_DOCUMENT_LINKS_COLUMN_MARKUP, &task->chapter, 
+				    -1);
+		g_free (page_string);
+		return TRUE;
+	}
+	
+	g_free (page_string);
+	return FALSE;
 }
 
 static void
@@ -918,7 +914,6 @@ setup_size_from_metadata (EvWindow *window)
 	    	g_value_unset (&width_ratio);
 		g_value_unset (&height_ratio);
 	}
-
 }
 
 static void
@@ -1014,6 +1009,32 @@ setup_view_from_metadata (EvWindow *window)
 	}
 }
 
+static void
+ev_window_clear_thumbnail_job (EvWindow *ev_window)
+{
+	if (ev_window->priv->thumbnail_job != NULL) {
+		ev_job_queue_remove_job (ev_window->priv->thumbnail_job);
+
+		g_signal_handlers_disconnect_by_func (ev_window->priv->thumbnail_job,
+						      ev_window_set_icon_from_thumbnail,
+						      ev_window);
+		g_object_unref (ev_window->priv->thumbnail_job);
+		ev_window->priv->thumbnail_job = NULL;
+	}
+}
+
+static void
+ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
+				   EvWindow       *ev_window)
+{
+	if (job->thumbnail) {
+		gtk_window_set_icon (GTK_WINDOW (ev_window),
+				     job->thumbnail);
+	}
+
+	ev_window_clear_thumbnail_job (ev_window);
+}
+
 static void
 ev_window_setup_document (EvWindow *ev_window)
 {
@@ -1025,8 +1046,10 @@ ev_window_setup_document (EvWindow *ev_window)
 
 	document = ev_window->priv->document;
 	ev_window->priv->page_cache = ev_page_cache_get (ev_window->priv->document);
-	g_signal_connect (ev_window->priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), ev_window);
-	g_signal_connect (ev_window->priv->page_cache, "history-changed", G_CALLBACK (history_changed_cb), ev_window);
+	g_signal_connect (ev_window->priv->page_cache, "page-changed",
+			  G_CALLBACK (page_changed_cb), ev_window);
+	g_signal_connect (ev_window->priv->page_cache, "history-changed",
+			  G_CALLBACK (history_changed_cb), ev_window);
 
 	if (EV_IS_DOCUMENT_FIND (document)) {
 		g_signal_connect_object (G_OBJECT (document),
@@ -1035,6 +1058,27 @@ ev_window_setup_document (EvWindow *ev_window)
 				         ev_window, 0);
 	}
 
+	if (EV_IS_DOCUMENT_THUMBNAILS (document)) {
+		EvRenderContext *rc;
+		gint page_width, page_height;
+		gdouble scale;
+
+		ev_window_clear_thumbnail_job (ev_window);
+		
+		ev_page_cache_get_size (ev_window->priv->page_cache,
+					0, 0, 1.0,
+					&page_width, &page_height);
+		scale = (gdouble)128 / (gdouble)page_width;
+		
+		rc = ev_render_context_new (0, 0, scale);
+		ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, rc);
+		g_signal_connect (ev_window->priv->thumbnail_job, "finished",
+				  G_CALLBACK (ev_window_set_icon_from_thumbnail),
+				  ev_window);
+		ev_job_queue_add_job (EV_JOB (ev_window->priv->thumbnail_job), EV_JOB_PRIORITY_LOW);
+		g_object_unref (rc);
+	}
+
 	ev_sidebar_set_document (sidebar, document);
 
 	if (ev_page_cache_get_n_pages (ev_window->priv->page_cache) > 0) {
@@ -1120,7 +1164,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 		gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->password_dialog), GTK_WINDOW (ev_window));
 
 		g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
-					   (gpointer *) &(ev_window->priv->password_dialog));
+					   (gpointer) &(ev_window->priv->password_dialog));
 		g_signal_connect (ev_window->priv->password_dialog,
 				  "response",
 				  G_CALLBACK (password_dialog_response),
@@ -1348,6 +1392,8 @@ ev_window_open_uri (EvWindow       *ev_window,
 	if (ev_window->priv->uri)
 		g_free (ev_window->priv->uri);
 	ev_window->priv->uri = g_strdup (uri);
+
+	setup_size_from_metadata (ev_window);
 	
 	ev_window->priv->load_job = ev_job_load_new (uri, dest, mode);
 	g_signal_connect (ev_window->priv->load_job,
@@ -1501,8 +1547,12 @@ ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
 	gchar *symlink_uri;
 	gchar *old_filename;
 	gchar *new_filename;
+	gchar *uri_unc;
 
-	old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+	uri_unc = g_object_get_data (G_OBJECT (window->priv->document),
+				     "uri-uncompressed");
+	old_filename = g_filename_from_uri (uri_unc ? uri_unc : window->priv->uri,
+					    NULL, NULL);
 	new_filename = ev_window_create_tmp_symlink (old_filename, &error);
 
 	if (error) {
@@ -2329,7 +2379,7 @@ ev_window_cmd_file_properties (GtkAction *action, EvWindow *ev_window)
 		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));
+					   (gpointer) &(ev_window->priv->properties));
 		gtk_window_set_transient_for (GTK_WINDOW (ev_window->priv->properties),
 					      GTK_WINDOW (ev_window));
 	}
@@ -3132,14 +3182,10 @@ ev_window_cmd_go_backward (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window)
 {
-	char *uri;
-
-	g_return_if_fail (EV_IS_WINDOW (ev_window));
+	gchar *uri;
 
 	uri = g_strdup (ev_window->priv->uri);
-
 	ev_window_open_uri (ev_window, uri, NULL, 0, FALSE);
-
 	g_free (uri);
 }
 
@@ -3704,8 +3750,6 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 	gboolean visible;
 	const char *search_string;
 
-	g_return_if_fail (EV_IS_WINDOW (ev_window));
-
 	/* Either the string or case sensitivity could have changed,
 	 * we connect this callback to both. We also connect it
 	 * to ::visible so when the find bar is hidden, we should
@@ -3861,9 +3905,14 @@ ev_window_dispose (GObject *object)
 	if (priv->load_job) {
 		ev_window_clear_load_job (window);
 	}
+
+	if (priv->thumbnail_job) {
+		ev_window_clear_thumbnail_job (window);
+	}
 	
 	if (priv->local_uri) {
 		ev_window_clear_local_uri (window);
+		priv->local_uri = NULL;
 	}
 	
 	ev_window_close_dialogs (window);
@@ -4351,12 +4400,15 @@ window_configure_event_cb (EvWindow *window, GdkEventConfigure *event, gpointer
 			ev_page_cache_get_max_height (window->priv->page_cache, 
 						      0, 1.0,
 						      &document_height);			
-			ev_metadata_manager_set_int (uri, "window_x", x);
-			ev_metadata_manager_set_int (uri, "window_y", y);
 			ev_metadata_manager_set_double (uri, "window_width_ratio", 
-							(double)width/document_width);
+							(double)width / document_width);
 			ev_metadata_manager_set_double (uri, "window_height_ratio", 
-							(double)height/document_height);
+							(double)height / document_height);
+			
+			ev_metadata_manager_set_int (uri, "window_x", x);
+			ev_metadata_manager_set_int (uri, "window_y", y);
+			ev_metadata_manager_set_int (uri, "window_width", width);
+			ev_metadata_manager_set_int (uri, "window_height", height);
 		}
 	}