Reorder menu items and build menu with fixed length

[evince.git] / shell / ev-properties-dialog.c

diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index aa6142af73f951f58885252aefe6d055a1d23be8..16494e167ea20e19f32739c0d803e2d3e6cd67e5 100644 (file)
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -61,12 +61,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);
@@ -95,14 +99,18 @@ ev_properties_dialog_set_document (EvPropertiesDialog *properties,
        }
        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 *