X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=ps%2Fgsdefaults.c;h=d20a6c2c25fdefb6d916696bbbb000c82e35c6e1;hb=dd1c805ae5ff6e6379c67e1dca48affd1306b6e9;hp=d5d2fbb2f17a091507609809ec2cb5a944ad7981;hpb=fb1055dd92e9aa1173de92add6f4a6f5e4a62d2d;p=evince.git

diff --git a/ps/gsdefaults.c b/ps/gsdefaults.c
index d5d2fbb2..d20a6c2c 100644
--- a/ps/gsdefaults.c
+++ b/ps/gsdefaults.c
@@ -25,12 +25,13 @@
 #include <gnome.h>
 #include <math.h>
 
-#include "gtkgs.h"
 #include "gsdefaults.h"
-#include "ggvutils.h"
 
 #include <gconf/gconf-client.h>
 
+static void gtk_gs_defaults_changed (GConfClient * client, guint cnxn_id,
+                        	     GConfEntry * entry, gpointer user_data);
+
 /**
  * defaults for GtkGS widgets
  **/
@@ -63,6 +64,28 @@ static GtkGSDefaults gtk_gs_defaults = {
   GTK_GS_ZOOM_ABSOLUTE
 };
 
+GtkGSPaperSize gtk_gs_paper_sizes[] = {
+  {N_("BBox"), 0, 0},
+  {N_("Letter"), 612, 792,},
+  {N_("Tabloid"), 792, 1224,},
+  {N_("Ledger"), 1224, 792,},
+  {N_("Legal"), 612, 1008,},
+  {N_("Statement"), 396, 612,},
+  {N_("Executive"), 540, 720,},
+  {N_("A0"), 2380, 3368,},
+  {N_("A1"), 1684, 2380,},
+  {N_("A2"), 1190, 1684,},
+  {N_("A3"), 842, 1190,},
+  {N_("A4"), 595, 842,},
+  {N_("A5"), 420, 595,},
+  {N_("B4"), 729, 1032,},
+  {N_("B5"), 516, 729,},
+  {N_("Folio"), 612, 936,},
+  {N_("Quarto"), 610, 780,},
+  {N_("10x14"), 720, 1008,},
+  {NULL, 0, 0}
+};
+
 void
 gtk_gs_defaults_set_scroll_step(gfloat step)
 {
@@ -206,18 +229,7 @@ gtk_gs_defaults_get_respect_eof()
 GtkGSPaperSize *
 gtk_gs_defaults_get_paper_sizes()
 {
-  return ggv_paper_sizes;
-}
-
-gint
-gtk_gs_defaults_get_paper_count()
-{
-  gint n = 0;
-
-  while(ggv_paper_sizes[n].name != NULL)
-    n++;
-
-  return n;
+  return gtk_gs_paper_sizes;
 }
 
 gboolean
@@ -388,6 +400,23 @@ gtk_gs_defaults_set_zoom_mode(GtkGSZoomMode zoom_mode)
   }
 }
 
+static GConfClient *
+gtk_gs_defaults_gconf_client()
+{
+  if(!gconf_client) {
+    g_assert(gconf_is_initialized());
+    gconf_client = gconf_client_get_default();
+    g_assert(gconf_client != NULL);
+    gconf_client_add_dir(gconf_client, "/apps/ggv/gtkgs",
+                         GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+    gconf_client_notify_add(gconf_client,
+                            "/apps/ggv/gtkgs", (GConfClientNotifyFunc)
+                            gtk_gs_defaults_changed, NULL, NULL, NULL);
+  }
+
+  return gconf_client;
+}
+
 void
 gtk_gs_defaults_load()
 {
@@ -486,20 +515,3 @@ gtk_gs_defaults_changed(GConfClient * client, guint cnxn_id,
     gtk_gs_defaults_set_scroll_step
       (gconf_client_get_float(client, "/apps/ggv/gtkgs/scrollstep", NULL));
 }
-
-GConfClient *
-gtk_gs_defaults_gconf_client()
-{
-  if(!gconf_client) {
-    g_assert(gconf_is_initialized());
-    gconf_client = gconf_client_get_default();
-    g_assert(gconf_client != NULL);
-    gconf_client_add_dir(gconf_client, "/apps/ggv/gtkgs",
-                         GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-    gconf_client_notify_add(gconf_client,
-                            "/apps/ggv/gtkgs", (GConfClientNotifyFunc)
-                            gtk_gs_defaults_changed, NULL, NULL, NULL);
-  }
-
-  return gconf_client;
-}