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=e5acd4089c2dbd64f5850e6746220383bc3fed80;hb=2ae6aa02f5d43dbaaa25e28d48fe997165afb5c2;hp=ce43ab072b16a512735556248af9b89f3da9cefb;hpb=1034436d36e173bbfa374c64f94371f0579d6ff6;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index ce43ab07..e5acd408 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -895,6 +895,13 @@ view_selection_changed_cb (EvView   *view,
 					ev_view_get_has_selection (view));
 }
 
+static void
+view_layers_changed_cb (EvView   *view,
+			EvWindow *window)
+{
+	ev_sidebar_layers_update_layers_state (EV_SIDEBAR_LAYERS (window->priv->sidebar_layers));
+}
+
 static void
 ev_window_page_changed_cb (EvWindow        *ev_window,
 			   gint             old_page,
@@ -4204,7 +4211,6 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
 	gtk_box_set_spacing (GTK_BOX (content_area), 2);
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
 
 	toolbar = EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar);
@@ -4640,7 +4646,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"name", _("Evince"),
 		"version", VERSION,
 		"copyright",
-		_("© 1996–2009 The Evince authors"),
+		_("© 1996–2010 The Evince authors"),
 		"license", license_trans,
 		"website", "http://www.gnome.org/projects/evince",
 		"comments", comments,
@@ -6589,6 +6595,9 @@ ev_window_sync_source (EvWindow     *window,
 {
 	GDBusConnection *connection;
 	GError          *error = NULL;
+	guint32		 timestamp;
+	gchar		*uri_input;
+	GFile		*input_gfile;
 
 	if (window->priv->dbus_object_id <= 0)
 		return;
@@ -6597,16 +6606,41 @@ ev_window_sync_source (EvWindow     *window,
 	if (!connection)
 		return;
 
+	timestamp = gtk_get_current_event_time ();
+	if (g_path_is_absolute (link->filename)) {
+		input_gfile = g_file_new_for_path (link->filename);
+	} else {
+		GFile *gfile, *parent_gfile;
+
+		gfile = g_file_new_for_uri (window->priv->uri);
+		parent_gfile = g_file_get_parent (gfile);
+
+		/* parent_gfile should never be NULL */
+		if (parent_gfile == NULL) {
+			g_printerr ("Document URI is '/'\n");
+			return;
+		}
+
+		input_gfile = g_file_get_child (parent_gfile, link->filename);
+		g_object_unref (parent_gfile);
+		g_object_unref (gfile);
+	}
+
+	uri_input = g_file_get_uri (input_gfile);
+	g_object_unref (input_gfile);
+
 	g_dbus_connection_emit_signal (connection,
 				       NULL,
 				       window->priv->dbus_object_path,
 				       EV_WINDOW_DBUS_INTERFACE,
 				       "SyncSource",
-				       g_variant_new ("(s(ii))",
-						      link->filename,
+				       g_variant_new ("(s(ii)u)",
+						      uri_input,
 						      link->line,
-						      link->col),
+						      link->col,
+						      timestamp),
 				       &error);
+	g_free (uri_input);
 	if (error) {
 		g_printerr ("Failed to emit DBus signal SyncSource: %s\n",
 			    error->message);
@@ -6695,10 +6729,11 @@ method_call_cb (GDBusConnection       *connection,
 
 	if (window->priv->document && ev_document_has_synctex (window->priv->document)) {
 		EvSourceLink link;
+		guint32	     timestamp;
 
-		g_variant_get (parameters, "(&s(ii))", &link.filename, &link.line, &link.col);
+		g_variant_get (parameters, "(&s(ii)u)", &link.filename, &link.line, &link.col, &timestamp);
 		ev_view_highlight_forward_search (EV_VIEW (window->priv->view), &link);
-		gtk_window_present (GTK_WINDOW (window));
+		gtk_window_present_with_time (GTK_WINDOW (window), timestamp);
 	}
 
 	g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
@@ -6710,10 +6745,12 @@ static const char introspection_xml[] =
             "<method name='SyncView'>"
               "<arg type='s' name='source_file' direction='in'/>"
               "<arg type='(ii)' name='source_point' direction='in'/>"
+              "<arg type='u' name='timestamp' direction='in'/>"
             "</method>"
 	    "<signal name='SyncSource'>"
 	      "<arg type='s' name='source_file' direction='out'/>"
 	      "<arg type='(ii)' name='source_point' direction='out'/>"
+	      "<arg type='u' name='timestamp' direction='out'/>"
 	    "</signal>"
             "<signal name='Closed'/>"
 	    "<signal name='DocumentLoaded'>"
@@ -6879,7 +6916,7 @@ ev_window_init (EvWindow *ev_window)
 	gtk_widget_show (ev_window->priv->toolbar);
 
 	/* Add the main area */
-	ev_window->priv->hpaned = gtk_hpaned_new ();
+	ev_window->priv->hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
 	g_signal_connect (ev_window->priv->hpaned,
 			  "notify::position",
 			  G_CALLBACK (ev_window_sidebar_position_change_cb),
@@ -7007,6 +7044,9 @@ ev_window_init (EvWindow *ev_window)
 	g_signal_connect_object (ev_window->priv->view, "annot-added",
 				 G_CALLBACK (view_annot_added),
 				 ev_window, 0);
+	g_signal_connect_object (ev_window->priv->view, "layers-changed",
+				 G_CALLBACK (view_layers_changed_cb),
+				 ev_window, 0);
 #ifdef ENABLE_DBUS
 	g_signal_connect_swapped (ev_window->priv->view, "sync-source",
 				  G_CALLBACK (ev_window_sync_source),