X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=c973f42810d1a61ce0f4eb46758f9e0f3c7036eb;hb=34dc864999174a8416c4f2b772de897c581705e4;hp=6a03b75d1fe37608bcd9feb941bc65dbd35bd41c;hpb=d111d5e282a9f34f3897f80e490cbdeeb6b8d4ac;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 6a03b75d..c973f428 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -97,7 +97,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#if !GLIB_CHECK_VERSION (2, 13, 3)
 char *xdg_user_dir_lookup (char *type);
+#endif
 
 typedef enum {
 	PAGE_MODE_DOCUMENT,
@@ -211,7 +213,7 @@ struct _EvWindowPrivate {
 #define GCONF_LOCKDOWN_SAVE         "/desktop/gnome/lockdown/disable_save_to_disk"
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 
-#define PRESENTATION_TIMEOUT 5 * 1000
+#define PRESENTATION_TIMEOUT 5
 
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
@@ -314,7 +316,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 		has_properties = FALSE;
 	}
 
-	if (has_document && ev_document_can_get_text (document)) {
+	if (has_document && EV_IS_SELECTION (document)) {
 		can_get_text = TRUE;
 	}
 	
@@ -506,7 +508,7 @@ update_chrome_visibility (EvWindow *window)
 	fullscreen_toolbar = ((priv->chrome & EV_CHROME_FULLSCREEN_TOOLBAR) != 0 || 
 			      (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen;
 	findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0;
-	sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode;
+	sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !presentation;
 	preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR);
 
 	set_widget_visibility (priv->menubar, menubar);	
@@ -535,8 +537,6 @@ update_chrome_flag (EvWindow *window, EvChrome flag, gboolean active)
 	} else {
 		priv->chrome &= ~flag;
 	}
-
-	update_chrome_visibility (window);
 }
 
 static void
@@ -854,6 +854,7 @@ setup_sidebar_from_metadata (EvWindow *window, EvDocument *document)
 	if (ev_metadata_manager_get (uri, "sidebar_visibility", &sidebar_visibility, FALSE)) {
 		update_chrome_flag (window, EV_CHROME_SIDEBAR, g_value_get_boolean (&sidebar_visibility));
 		g_value_unset (&sidebar_visibility);
+		update_chrome_visibility (window);
 	}
 }
 
@@ -1506,6 +1507,8 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 			      gint       response_id,
 			      EvWindow  *ev_window)
 {
+	gchar *uri;
+
 	if (response_id == GTK_RESPONSE_OK) {
 		GSList *uris;
 
@@ -1518,8 +1521,10 @@ file_open_dialog_response_cb (GtkWidget *chooser,
 		g_slist_foreach (uris, (GFunc)g_free, NULL);	
 		g_slist_free (uris);
 	}
-	ev_application_set_chooser_uri (EV_APP, 
-			  	        gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser)));
+
+	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser));
+	ev_application_set_chooser_uri (EV_APP, uri);
+	g_free (uri);
 
 	gtk_widget_destroy (chooser);
 }
@@ -1547,12 +1552,20 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
 		gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (chooser),
 					  window->priv->uri);
 	} else {
+#if GLIB_CHECK_VERSION (2, 13, 3)
+		const gchar *folder;
+
+		folder = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
+						     folder ? folder : g_get_home_dir ());
+#else
 		char *folder;
 		
 		folder = xdg_user_dir_lookup ("DOCUMENTS");
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser),
 						     folder);
 		free (folder);
+#endif
 	}
 	
 	g_signal_connect (chooser, "response",
@@ -2086,7 +2099,11 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	GtkWidget *fc;
 	gchar *base_name;
 	gchar *file_name;
+#if GLIB_CHECK_VERSION (2, 13, 3)
+	const gchar *folder;
+#else
 	gchar *folder;
+#endif
 
 	fc = gtk_file_chooser_dialog_new (
 		_("Save a Copy"),
@@ -2102,12 +2119,20 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
 	gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (fc), TRUE);	
 	file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
 	base_name = g_path_get_basename (file_name);
-        folder = xdg_user_dir_lookup ("DOCUMENTS");
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+	
+#if GLIB_CHECK_VERSION (2, 13, 3)
+	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 ());
+#else
+	folder = xdg_user_dir_lookup ("DOCUMENTS");
         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc), folder);
+	free (folder);
+#endif
+	
 	g_free (file_name);
 	g_free (base_name);
-        free (folder);
         
 	g_signal_connect (fc, "response",
 			  G_CALLBACK (file_save_dialog_response_cb),
@@ -2220,6 +2245,10 @@ ev_window_print_send (EvWindow    *window,
 		gtk_print_settings_set_collate (settings, FALSE);
 	if (capabilities & EV_FILE_EXPORTER_CAN_REVERSE)
 		gtk_print_settings_set_reverse (settings, FALSE);
+	if (capabilities & EV_FILE_EXPORTER_CAN_NUMBER_UP) {
+		gtk_print_settings_set_number_up (settings, 1);
+		gtk_print_settings_set_int (settings, "cups-"GTK_PRINT_SETTINGS_NUMBER_UP, 1);
+	}
 	
 	if (window->priv->print_preview) {
 		gchar *uri;
@@ -2294,6 +2323,7 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
 	EvPrintPageSet page_set;
 	gint           n_ranges = 0;
 	gint           copies;
+	gint           pages_per_sheet;
 	gboolean       collate;
 	gboolean       reverse;
 	gdouble        scale;
@@ -2376,15 +2406,17 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
 	scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01;
 	
 	width = gtk_page_setup_get_paper_width (window->priv->print_page_setup,
-						GTK_UNIT_PIXEL);
+						GTK_UNIT_POINTS);
 	height = gtk_page_setup_get_paper_height (window->priv->print_page_setup,
-						  GTK_UNIT_PIXEL);
-
+						  GTK_UNIT_POINTS);
+	
 	if (scale != 1.0) {
 		width *= scale;
 		height *= scale;
 	}
 
+	pages_per_sheet = gtk_print_settings_get_number_up (window->priv->print_settings);
+	
 	copies = gtk_print_settings_get_n_copies (window->priv->print_settings);
 	collate = gtk_print_settings_get_collate (window->priv->print_settings);
 	reverse = gtk_print_settings_get_reverse (window->priv->print_settings);
@@ -2394,6 +2426,7 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog,
 						    width, height,
 						    ranges, n_ranges,
 						    page_set,
+						    pages_per_sheet,
 						    copies, collate,
 						    reverse);
 	
@@ -2644,6 +2677,7 @@ ev_window_cmd_focus_page_selector (GtkAction *act, EvWindow *window)
 	
 	update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, TRUE);
 	ev_window_set_action_sensitive (window, "ViewToolbar", FALSE);
+	update_chrome_visibility (window);
 	
 	action = gtk_action_group_get_action (window->priv->action_group,
 				     	      PAGE_SELECTOR_ACTION);
@@ -2734,6 +2768,7 @@ ev_window_cmd_edit_find (GtkAction *action, EvWindow *ev_window)
 	} 
 
 	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+	update_chrome_visibility (ev_window);
 	gtk_widget_grab_focus (ev_window->priv->find_bar);
 }
 
@@ -2742,6 +2777,9 @@ ev_window_cmd_edit_find_next (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
+	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+	update_chrome_visibility (ev_window);
+	gtk_widget_grab_focus (ev_window->priv->find_bar);
 	ev_view_find_next (EV_VIEW (ev_window->priv->view));
 }
 
@@ -2750,6 +2788,9 @@ ev_window_cmd_edit_find_previous (GtkAction *action, EvWindow *ev_window)
 {
         g_return_if_fail (EV_IS_WINDOW (ev_window));
 
+	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, TRUE);
+	update_chrome_visibility (ev_window);
+	gtk_widget_grab_focus (ev_window->priv->find_bar);
 	ev_view_find_previous (EV_VIEW (ev_window->priv->view));
 }
 
@@ -2896,9 +2937,16 @@ presentation_set_timeout (EvWindow *window)
 	if (window->priv->presentation_timeout_id > 0) {
 		g_source_remove (window->priv->presentation_timeout_id);
 	}
-	
+
+#if GLIB_CHECK_VERSION (2, 13, 0)
+	window->priv->presentation_timeout_id =
+		g_timeout_add_seconds (PRESENTATION_TIMEOUT,
+				       (GSourceFunc)presentation_timeout_cb, window);
+#else
 	window->priv->presentation_timeout_id = 
-	    g_timeout_add (PRESENTATION_TIMEOUT, (GSourceFunc)presentation_timeout_cb, window);
+	    g_timeout_add (PRESENTATION_TIMEOUT * 1000,
+			   (GSourceFunc)presentation_timeout_cb, window);
+#endif	
 
 	ev_view_show_cursor (EV_VIEW (window->priv->view));
 }
@@ -3326,25 +3374,30 @@ ev_window_cmd_start_presentation (GtkAction *action, EvWindow *window)
 }
 
 #ifdef WITH_GTK_PRINT
+static void ev_window_do_preview_print (EvWindow *window);
+
 static gboolean
-lookup_printer_from_name (GtkPrinter *printer,
-			  EvWindow   *window)
+ev_window_enumerate_printer_cb (GtkPrinter *printer,
+				EvWindow   *window)
 {
+	EvWindowPrivate *priv = window->priv;
 	const gchar *printer_name;
 
-	printer_name = gtk_print_settings_get_printer (window->priv->print_settings);
-	
+	printer_name = gtk_print_settings_get_printer (priv->print_settings);
 	if ((printer_name
-	     && g_ascii_strcasecmp (printer_name, gtk_printer_get_name (printer)) == 0) ||
+	     && strcmp (printer_name, gtk_printer_get_name (printer)) == 0) ||
 	    (!printer_name && gtk_printer_is_default (printer))) {
-		if (window->priv->printer)
-			g_object_unref (window->priv->printer);
-		window->priv->printer = g_object_ref (printer);
+		if (priv->printer)
+			g_object_unref (priv->printer);
+		priv->printer = g_object_ref (printer);
 
-		return TRUE;
+		/* Now that we have the printer, we'll start the print */
+		ev_window_do_preview_print (window);
+
+		return TRUE; /* we're done */
 	}
 
-	return FALSE;
+	return FALSE; /* continue the enumeration */
 }
 
 static void
@@ -3370,62 +3423,34 @@ ev_window_preview_print_finished (GtkPrintJob *print_job,
 	g_object_unref (print_job);
 	gtk_widget_destroy (GTK_WIDGET (window));
 }
-#endif /* WITH_GTK_PRINT */
 
 static void
-ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
+ev_window_do_preview_print (EvWindow *window)
 {
-#ifdef WITH_GTK_PRINT
-	GtkPrintSettings *print_settings = NULL;
+	EvWindowPrivate  *priv = window->priv;
 	GtkPageSetup     *page_setup;
 	GtkPrintJob      *job;
 	gchar            *filename;
 	GError           *error = NULL;
-#if GTK_CHECK_VERSION (2, 11, 0)
-	const gchar      *print_settings_file = window->priv->print_settings_file;
-
-	if (print_settings_file) {
-		if (g_file_test (print_settings_file, G_FILE_TEST_IS_REGULAR)) {
-			GError *error = NULL;
 
-			print_settings = gtk_print_settings_new_from_file (print_settings_file,
-									   &error);
-			
-			if (error) {
-				g_warning (error->message);
-				g_error_free (error);
-				print_settings = NULL;
-			}
-		}
-	}
-#endif /* GTK 2.11.0 */
-	
-	if (!print_settings)
-		print_settings = gtk_print_settings_new ();
+	g_assert (priv->print_settings != NULL);
+	g_assert (priv->printer != NULL);
 
-	if (window->priv->print_settings)
-		g_object_unref (window->priv->print_settings);
-	window->priv->print_settings = print_settings;
-
-	gtk_enumerate_printers ((GtkPrinterFunc) lookup_printer_from_name,
-				window, NULL, TRUE);
-	g_assert (GTK_IS_PRINTER (window->priv->printer));	
-	
 	page_setup = gtk_page_setup_new ();
 
 	job = gtk_print_job_new ("evince-print",
-				 window->priv->printer,
-				 window->priv->print_settings,
+				 priv->printer,
+				 priv->print_settings,
 				 page_setup);
 
-	g_object_unref (window->priv->print_settings);
-	window->priv->print_settings = NULL;
-	g_object_unref (window->priv->printer);
-	window->priv->printer = NULL;
+	g_object_unref (priv->print_settings);
+	priv->print_settings = NULL;
+	g_object_unref (priv->printer);
+	priv->printer = NULL;
 	g_object_unref (page_setup);
 
-	filename = g_filename_from_uri (window->priv->local_uri ?
-					window->priv->local_uri : window->priv->uri,
+	filename = g_filename_from_uri (priv->local_uri ?
+					priv->local_uri : priv->uri,
 					NULL, NULL);
 
 	if (gtk_print_job_set_source_file (job, filename, &error)) {
@@ -3440,6 +3465,44 @@ ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
 	g_free (filename);
 
 	gtk_widget_hide (GTK_WIDGET (window));
+}
+
+#endif /* WITH_GTK_PRINT */
+
+static void
+ev_window_cmd_preview_print (GtkAction *action, EvWindow *window)
+{
+#ifdef WITH_GTK_PRINT
+	EvWindowPrivate *priv = window->priv;
+	GtkPrintSettings *print_settings = NULL;
+#if GTK_CHECK_VERSION (2, 11, 0)
+	const gchar      *print_settings_file = priv->print_settings_file;
+
+	if (print_settings_file) {
+		if (g_file_test (print_settings_file, G_FILE_TEST_IS_REGULAR)) {
+			GError *error = NULL;
+
+			print_settings = gtk_print_settings_new_from_file (print_settings_file,
+									   &error);
+			
+			if (error) {
+				g_warning (error->message);
+				g_error_free (error);
+				print_settings = NULL;
+			}
+		}
+	}
+#endif /* GTK 2.11.0 */
+	
+	if (!print_settings)
+		print_settings = gtk_print_settings_new ();
+
+	if (priv->print_settings)
+		g_object_unref (priv->print_settings);
+	priv->print_settings = print_settings;
+
+	gtk_enumerate_printers ((GtkPrinterFunc) ev_window_enumerate_printer_cb,
+				window, NULL, FALSE);
 #endif /* WITH_GTK_PRINT */
 }
 
@@ -3451,6 +3514,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
 	widget = gtk_window_get_focus (GTK_WINDOW (window));
 	if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
 		update_chrome_flag (window, EV_CHROME_FINDBAR, FALSE);
+		update_chrome_visibility (window);
 		gtk_widget_grab_focus (window->priv->view);
 	} else {
 		gboolean fullscreen;
@@ -3729,6 +3793,7 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 	
 	active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	update_chrome_flag (ev_window, EV_CHROME_TOOLBAR, active);
+	update_chrome_visibility (ev_window);
 	ev_metadata_manager_set_boolean (NULL, "show_toolbar", active);
 }
 
@@ -3740,6 +3805,7 @@ ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 	    
 	update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
 			    gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+	update_chrome_visibility (ev_window);
 }
 
 static void
@@ -3778,9 +3844,7 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
 
 	action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 
-	if (!ev_view_get_presentation (view) && 
-	    !ev_view_get_fullscreen (view)) {
-
+	if (!ev_view_get_presentation (view)) {
 		gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 					      GTK_WIDGET_VISIBLE (ev_sidebar));
 
@@ -3944,6 +4008,7 @@ find_bar_close_cb (EggFindBar *find_bar,
 		   EvWindow   *ev_window)
 {
 	update_chrome_flag (ev_window, EV_CHROME_FINDBAR, FALSE);
+	update_chrome_visibility (ev_window);
 }
 
 static void
@@ -3952,24 +4017,18 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 			    EvWindow   *ev_window)
 {
 	gboolean case_sensitive;
-	gboolean visible;
 	const char *search_string;
 
-	/* 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
-	 * pretend the search string is NULL/""
-	 */
+	/* Either the string or case sensitivity could have changed. */
 
 	case_sensitive = egg_find_bar_get_case_sensitive (find_bar);
-	visible = GTK_WIDGET_VISIBLE (find_bar);
 	search_string = egg_find_bar_get_search_string (find_bar);
 
 	ev_view_search_changed (EV_VIEW(ev_window->priv->view));
 
 	if (ev_window->priv->document &&
 	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
-		if (visible && search_string && search_string[0]) {
+		if (search_string && search_string[0]) {
 			ev_document_doc_mutex_lock ();
 			ev_document_find_begin (EV_DOCUMENT_FIND (ev_window->priv->document), 
 						ev_page_cache_get_current_page (ev_window->priv->page_cache),
@@ -3989,6 +4048,26 @@ find_bar_search_changed_cb (EggFindBar *find_bar,
 	}
 }
 
+static void
+find_bar_visibility_changed_cb (EggFindBar *find_bar,
+			    GParamSpec *param,
+			    EvWindow   *ev_window)
+{
+	gboolean visible;
+
+	visible = GTK_WIDGET_VISIBLE (find_bar);
+
+	if (ev_window->priv->document &&
+	    EV_IS_DOCUMENT_FIND (ev_window->priv->document)) {
+		ev_view_set_highlight_search (EV_VIEW(ev_window->priv->view), visible);
+		ev_view_search_changed (EV_VIEW(ev_window->priv->view));
+		ev_window_update_actions (ev_window);
+
+		if (!visible)
+			egg_find_bar_set_status_text (EGG_FIND_BAR (ev_window->priv->find_bar), NULL);
+	}
+}
+
 static void
 find_bar_scroll(EggFindBar *find_bar, GtkScrollType scroll, EvWindow* ev_window)
 {
@@ -4549,6 +4628,8 @@ view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *win
 
 	ev_window_set_view_accels_sensitivity (window, TRUE);
 
+	update_chrome_visibility (window);
+
 	return FALSE;
 }
 
@@ -5148,12 +5229,12 @@ ev_window_init (EvWindow *ev_window)
 	}
 	
 #ifdef HAVE_GTK_RECENT
-#if GTK_CHECK_VERSION (2, 11, 4)
+#if GTK_CHECK_VERSION(2,11,4)
 	ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
 #else
 	/* It's fine to just use the one of the default screen here */
 	ev_window->priv->recent_manager = gtk_recent_manager_get_for_screen (
-		gtk_screen_get_default ());
+		gdk_screen_get_default ());
 #endif
 	ev_window->priv->recent_action_group = NULL;
 	ev_window->priv->recent_ui_id = 0;
@@ -5352,7 +5433,7 @@ ev_window_init (EvWindow *ev_window)
 			  ev_window);
 	g_signal_connect (ev_window->priv->find_bar,
 			  "notify::visible",
-			  G_CALLBACK (find_bar_search_changed_cb),
+			  G_CALLBACK (find_bar_visibility_changed_cb),
 			  ev_window);
 	g_signal_connect (ev_window->priv->find_bar,
 			  "scroll",