X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-page-action.c;h=deb9b773895708913c94c0c3b16ac143a60156e6;hb=8bc2adc14fed2e5be9c52b052cff441b7a136b9a;hp=4b559c5d4bba96fa327437b6ce7bdbe8b629cd9f;hpb=324e007ce9e3dfd5e1c28fdc90483ca81236b180;p=evince.git

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 4b559c5d..deb9b773 100644
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -39,6 +39,7 @@ struct _EvPageActionWidget
 	GtkToolItem parent;
 
 	GtkWidget *entry;
+	GtkWidget *label;
 	EvPageCache *page_cache;
 	guint signal_id;
 	GtkTreeModel *filter_model;
@@ -93,6 +94,24 @@ enum {
 /* user data to set on the widget. */
 #define EPA_FILTER_MODEL_DATA "epa-filter-model"
 
+static void
+update_pages_label (EvPageActionWidget *proxy,
+		    gint                page,
+		    EvPageCache        *page_cache)
+{
+	char *label_text;
+	gint n_pages;
+
+	n_pages = page_cache ? ev_page_cache_get_n_pages (page_cache) : 0;
+	if (ev_page_cache_has_nonnumeric_page_labels (page_cache)) {
+    	        label_text = g_strdup_printf (_("(%d of %d)"), page + 1, n_pages);
+	} else {
+    	        label_text = g_strdup_printf (_("of %d"), n_pages);
+	}
+	gtk_label_set_text (GTK_LABEL (proxy->label), label_text);
+	g_free (label_text);
+}
+
 static void
 page_changed_cb (EvPageCache        *page_cache,
 		 gint                page,
@@ -100,7 +119,7 @@ page_changed_cb (EvPageCache        *page_cache,
 {
 	g_assert (proxy);
 	
-	if (page_cache != NULL) {
+	if (page_cache != NULL && page >= 0) {
 		gchar *page_label = ev_page_cache_get_page_label (page_cache, page);
 		gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label);
 		gtk_editable_set_position (GTK_EDITABLE (proxy->entry), -1);
@@ -108,6 +127,8 @@ page_changed_cb (EvPageCache        *page_cache,
 	} else {
 		gtk_entry_set_text (GTK_ENTRY (proxy->entry), "");
 	}
+
+	update_pages_label (proxy, page, page_cache);
 }
 
 static void
@@ -136,20 +157,29 @@ static GtkWidget *
 create_tool_item (GtkAction *action)
 {
 	EvPageActionWidget *proxy;
+	GtkWidget *hbox;
 
 	proxy = g_object_new (ev_page_action_widget_get_type (), NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (proxy), 6); 
 	gtk_widget_show (GTK_WIDGET (proxy));
 
+	hbox = gtk_hbox_new (FALSE, 0);
+	gtk_box_set_spacing (GTK_BOX (hbox), 6);
+
 	proxy->entry = gtk_entry_new ();
 	gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 5);
+	gtk_box_pack_start (GTK_BOX (hbox), proxy->entry, FALSE, FALSE, 0);
 	gtk_widget_show (proxy->entry);
-
 	g_signal_connect (proxy->entry, "activate",
 			  G_CALLBACK (activate_cb),
 			  action);
 
-	gtk_container_add (GTK_CONTAINER (proxy), proxy->entry);
+	proxy->label = gtk_label_new (NULL);
+	gtk_box_pack_start (GTK_BOX (hbox), proxy->label, FALSE, FALSE, 0);
+	gtk_widget_show (proxy->label);
+
+	gtk_container_add (GTK_CONTAINER (proxy), hbox);
+	gtk_widget_show (hbox);
 
 	return GTK_WIDGET (proxy);
 }
@@ -167,10 +197,10 @@ update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *pr
 		g_signal_handler_disconnect (proxy->page_cache, proxy->signal_id);
 	
 	if (page_cache != NULL) {
-		signal_id = g_signal_connect (page_cache,
-					      "page-changed",
-					      G_CALLBACK (page_changed_cb),
-					      proxy);
+		signal_id = g_signal_connect_object (page_cache,
+					             "page-changed",
+					             G_CALLBACK (page_changed_cb),
+					             proxy, 0);
 		/* Set the initial value */
 		page_changed_cb (page_cache,
 				 ev_page_cache_get_current_page (page_cache),