X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-properties-dialog.c;h=f48b96778c79f52233df525c2ac522dde7f86a28;hb=03a4afa9aeab342a63530db46888e405ea1c8afc;hp=aa6142af73f951f58885252aefe6d055a1d23be8;hpb=2ad5c80aafe43d53698e1084db86e34bf15290a9;p=evince.git

diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index aa6142af..f48b9677 100644
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -22,18 +22,14 @@
 #include "config.h"
 #endif
 
-#include "ev-properties-view.h"
-#include "ev-properties-fonts.h"
-#include "ev-properties-dialog.h"
-#include "ev-page-cache.h"
-#include "ev-document-fonts.h"
-
 #include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
+
+#include "ev-document-fonts.h"
+#include "ev-page-cache.h"
+#include "ev-properties-dialog.h"
+#include "ev-properties-fonts.h"
+#include "ev-properties-view.h"
 
 struct _EvPropertiesDialog {
 	GtkDialog base_instance;
@@ -61,12 +57,16 @@ ev_properties_dialog_init (EvPropertiesDialog *properties)
 	gtk_window_set_title (GTK_WINDOW (properties), _("Properties"));
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (properties), TRUE);
 	gtk_dialog_set_has_separator (GTK_DIALOG (properties), FALSE);
-        gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
+	gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (properties)->vbox), 2);
 
 	gtk_dialog_add_button (GTK_DIALOG (properties), GTK_STOCK_CLOSE,
-			       GTK_RESPONSE_ACCEPT);
+			       GTK_RESPONSE_CANCEL);
+	gtk_dialog_set_default_response (GTK_DIALOG (properties), 
+			                 GTK_RESPONSE_CANCEL);
 
 	properties->notebook = gtk_notebook_new ();
+	gtk_container_set_border_width (GTK_CONTAINER (properties->notebook), 5);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (properties)->vbox),
 			    properties->notebook, TRUE, TRUE, 0);
 	gtk_widget_show (properties->notebook);
@@ -77,6 +77,7 @@ ev_properties_dialog_init (EvPropertiesDialog *properties)
 
 void
 ev_properties_dialog_set_document (EvPropertiesDialog *properties,
+				   const gchar        *uri,
 			           EvDocument         *document)
 {
 	GtkWidget *label;
@@ -88,21 +89,25 @@ ev_properties_dialog_set_document (EvPropertiesDialog *properties,
 
 	if (properties->general_page == NULL) {
 		label = gtk_label_new (_("General"));
-		properties->general_page = ev_properties_view_new ();
+		properties->general_page = ev_properties_view_new (uri);
 		gtk_notebook_append_page (GTK_NOTEBOOK (properties->notebook),
 					  properties->general_page, label);
 		gtk_widget_show (properties->general_page);
 	}
 	ev_properties_view_set_info (EV_PROPERTIES_VIEW (properties->general_page), info);
 
-	if (properties->fonts_page == NULL && EV_IS_DOCUMENT_FONTS (document)) {
-		label = gtk_label_new (_("Fonts"));
-		properties->fonts_page = ev_properties_fonts_new ();
-		gtk_notebook_append_page (GTK_NOTEBOOK (properties->notebook),
-					  properties->fonts_page, label);
-		gtk_widget_show (properties->fonts_page);
+	if (EV_IS_DOCUMENT_FONTS (document)) {
+		if (properties->fonts_page == NULL) {
+			label = gtk_label_new (_("Fonts"));
+			properties->fonts_page = ev_properties_fonts_new ();
+			gtk_notebook_append_page (GTK_NOTEBOOK (properties->notebook),
+						  properties->fonts_page, label);
+			gtk_widget_show (properties->fonts_page);
+		}
+
+		ev_properties_fonts_set_document
+			(EV_PROPERTIES_FONTS (properties->fonts_page), document);
 	}
-	ev_properties_fonts_set_document (EV_PROPERTIES_FONTS (properties->fonts_page), document);
 }
 
 GtkWidget *