Works with cleaner Bonobo toolbar API.

[evince.git] / pdf / xpdf / gpdf.cc

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 37112ae7d3bedb7250bf3deaa5b7116a45017e75..e61929442b9ec59b35c82276f145b8082308b945 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -50,25 +50,29 @@ const struct poptOption gpdf_popt_options [] = {
   { NULL, '\0', 0, NULL, 0 }
 };
 
+typedef struct _Component Component;
+typedef struct _Container Container;
 /* NB. there is a 1 to 1 Container -> Component mapping, this
    is due to how much MDI sucks; unutterably */
-typedef struct {
-       GnomeContainer  *container;
-       GnomeUIHandler  *uih;
-
-       GnomeViewFrame  *active_view_frame;
-
-       GtkWidget       *app;
-       GtkWidget       *view_widget;
-} Container;
+struct _Container {
+  GnomeContainer  *container;
+  GnomeUIHandler  *uih;
+  
+  GnomeViewFrame  *active_view_frame;
+  
+  GtkWidget    *app;
+  GtkWidget    *view_widget;
+  Component     *component;
+  gdouble zoom;
+};
 
-typedef struct {
+struct  _Component {
        Container         *container;
 
        GnomeClientSite   *client_site;
        GnomeViewFrame    *view_frame;
        GnomeObjectClient *server;
-} Component;
+};
 
 GList *containers = NULL;
 /*
@@ -81,6 +85,9 @@ extern "C" {
   static void       container_close_cmd (GtkWidget *widget, Container *container);
   static void       container_exit_cmd  (void);
   static Component *container_activate_component (Container *container, char *component_goad_id);
+  static void       zoom_in_cmd         (GtkWidget *widget, Container *container);
+  static void       zoom_out_cmd        (GtkWidget *widget, Container *container);
+  static void       zoom_set            (Container *container);
 }
 
 /*
@@ -95,8 +102,28 @@ static GnomeUIInfo container_file_menu [] = {
        GNOMEUIINFO_END
 };
 
+static GnomeUIInfo container_menu_zoom [] = {
+       { GNOME_APP_UI_ITEM, N_("_Zoom in"),
+         N_("Increase the size of objects in the PDF"),
+         zoom_in_cmd },
+       { GNOME_APP_UI_ITEM, N_("_Zoom out"),
+         N_("Decrease the size of objects in the PDF"),
+         zoom_out_cmd },
+       GNOMEUIINFO_END
+};
+
 static GnomeUIInfo container_main_menu [] = {
        GNOMEUIINFO_MENU_FILE_TREE (container_file_menu),
+       { GNOME_APP_UI_SUBTREE, N_("_Zoom"), NULL, container_menu_zoom },
+       GNOMEUIINFO_END
+};
+
+static GnomeUIInfo container_toolbar [] = {
+       GNOMEUIINFO_ITEM_STOCK (
+               N_("Open"), N_("Opens an existing workbook"),
+               container_open_cmd, GNOME_STOCK_PIXMAP_OPEN),
+
+       GNOMEUIINFO_SEPARATOR,
        GNOMEUIINFO_END
 };
 
@@ -141,6 +168,8 @@ extern "C" {
     
     GNOME_PersistStream_load (persist,
                              (GNOME_Stream) gnome_object_corba_objref (GNOME_OBJECT (stream)), &ev);
+
+    
     
     GNOME_Unknown_unref (persist, &ev);
     CORBA_Object_release (persist, &ev);
@@ -239,6 +268,35 @@ extern "C" {
       container_destroy ((Container *)containers->data);
   }
 
+  /*
+   * Enforces the containers zoom factor.
+   */
+  static void
+  zoom_set (Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    g_return_if_fail (container->component != NULL);
+
+    gnome_view_frame_set_zoom_factor (container->component->view_frame,
+                                     container->zoom);
+  }
+
+  static void
+  zoom_in_cmd (GtkWidget *widget, Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    container->zoom *= 1.4;
+    zoom_set (container);
+  }
+
+  static void
+  zoom_out_cmd (GtkWidget *widget, Container *container)
+  {
+    g_return_if_fail (container != NULL);
+    container->zoom /= 1.4;
+    zoom_set (container);
+  }
+
   static void
   component_user_activate_request_cb (GnomeViewFrame *view_frame, gpointer data)
   {
@@ -364,7 +422,7 @@ container_set_view (Container *container, Component *component)
        /*
         * Create the remote view and the local ViewFrame.
         */
-       view_frame = gnome_client_site_embeddable_new_view (component->client_site);
+       view_frame = gnome_client_site_new_view (component->client_site);
        component->view_frame = view_frame;
 
        /*
@@ -380,6 +438,7 @@ container_set_view (Container *container, Component *component)
         */
        view_widget = gnome_view_frame_get_wrapper (view_frame);
        container->view_widget = view_widget;
+       container->component   = component;
 /*     gtk_box_pack_start (GTK_BOX (container->app), view_widget,
        FALSE, FALSE, 5);*/
        gnome_app_set_contents (GNOME_APP (container->app), view_widget);
@@ -433,7 +492,7 @@ container_launch_component (GnomeClientSite *client_site,
         * Launch the component.
         */
        object_server = gnome_object_activate_with_goad_id (
-               NULL, component_goad_id, 0, NULL);
+               NULL, component_goad_id, GOAD_ACTIVATE_SHLIB, NULL);
 
        if (object_server == NULL)
                return NULL;
@@ -547,6 +606,17 @@ container_create_menus (Container *container)
        gnome_ui_handler_menu_free_list (menu_list);
 }
 
+static void
+container_create_toolbar (Container *container)
+{
+       GnomeUIHandlerToolbarItem *toolbar;
+
+       gnome_ui_handler_create_toolbar (container->uih, "pdf");
+       toolbar = gnome_ui_handler_toolbar_parse_uiinfo_list_with_data (container_toolbar, container);
+       gnome_ui_handler_toolbar_add_list (container->uih, "/", toolbar);
+       gnome_ui_handler_toolbar_free_list (toolbar);
+}
+
 static Container *
 container_new (const char *fname)
 {
@@ -554,8 +624,9 @@ container_new (const char *fname)
 
        container = g_new0 (Container, 1);
 
-       container->app = gnome_app_new ("pdf-viewer",
-                                       "GNOME PDF viewer");
+       container->app  = gnome_app_new ("pdf-viewer",
+                                        "GNOME PDF viewer");
+       container->zoom = 43.0;
 
        gtk_window_set_default_size (GTK_WINDOW (container->app), 400, 400);
        gtk_window_set_policy (GTK_WINDOW (container->app), TRUE, TRUE, FALSE);
@@ -572,10 +643,8 @@ container_new (const char *fname)
        container->uih = gnome_ui_handler_new ();
        gnome_ui_handler_set_app (container->uih, GNOME_APP (container->app));
 
-       /*
-        * Create the menus.
-        */
-       container_create_menus (container);
+       container_create_menus   (container);
+       container_create_toolbar (container);
 
        gtk_widget_show_all (container->app);
 
@@ -613,6 +682,7 @@ main (int argc, char **argv)
 
   if (bonobo_init (orb, NULL, NULL) == FALSE)
     g_error (_("Could not initialize Bonobo!\n"));
+  bonobo_activate ();
 
   view_files = poptGetArgs (ctx);
 
@@ -626,8 +696,9 @@ main (int argc, char **argv)
     container_new (NULL);
   
   poptFreeContext (ctx);
-  
+
   gtk_main ();
        
   return 0;
 }
+