Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : proto

Dir     : e17/proto/exorcist/src/bin


Modified Files:
        etk_main_window.c ewl_main_window.c 


Log Message:
use the new api

===================================================================
RCS file: /cvs/e/e17/proto/exorcist/src/bin/etk_main_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_main_window.c   17 Apr 2006 08:50:48 -0000      1.2
+++ etk_main_window.c   17 Apr 2006 18:09:09 -0000      1.3
@@ -14,7 +14,7 @@
 typedef struct Exo_Etk_ Exo_Etk;
 struct Exo_Etk_
 {
-  char *path;
+  char       *path;
   char       *filename;
   Etk_Widget *pdf;
   Etk_Widget *list_pages;
@@ -52,37 +52,35 @@
 static void
 _exo_etk_tree_fill (Etk_Pdf *pdf, Etk_Tree *tree, Etk_Tree_Col *col, 
Etk_Tree_Row *row, Ecore_List *items)
 {
-  Etk_Tree_Row            *prow;
-  Evas_Poppler_Index_Item *item;
+  Etk_Tree_Row    *prow;
+  Epdf_Index_Item *item;
 
   if (!items)
     return;
 
   ecore_list_goto_first (items);
-  while ((item = ecore_list_next (items)))
-    {
-      char       *buf;
-      Ecore_List *c;
-      int         *num;
-
-      buf = strdup (evas_poppler_index_item_title_get (item));
-      if (!row)
-        prow = etk_tree_append (tree, col, buf, NULL);
-      else
-        prow = etk_tree_append_to_row (row, col, buf, NULL);
-
-      num = (int *)malloc (sizeof (int));
-      *num = evas_poppler_index_item_page_get (etk_pdf_pdf_document_get (pdf), 
item);
-      etk_tree_row_data_set (prow, num);
-      free (buf);
-/*       etk_signal_connect ("destroyed", ETK_OBJECT (row), */
-/*                           ETK_CALLBACK(_exo_etk_row_data_free_cb), NULL); */
-      c = evas_poppler_index_item_children_get (item);
-      if (c)
-        {
-          _exo_etk_tree_fill (pdf, tree, col, prow, c);
-        }
+  while ((item = ecore_list_next (items))) {
+    char       *buf;
+    Ecore_List *c;
+    int         *num;
+
+    buf = strdup (epdf_index_item_title_get (item));
+    if (!row)
+      prow = etk_tree_append (tree, col, buf, NULL);
+    else
+      prow = etk_tree_append_to_row (row, col, buf, NULL);
+
+    num = (int *)malloc (sizeof (int));
+    *num = epdf_index_item_page_get (etk_pdf_pdf_document_get (pdf), item);
+    etk_tree_row_data_set (prow, num);
+    free (buf);
+    /*       etk_signal_connect ("destroyed", ETK_OBJECT (row), */
+    /*                           ETK_CALLBACK(_exo_etk_row_data_free_cb), 
NULL); */
+    c = epdf_index_item_children_get (item);
+    if (c) {
+      _exo_etk_tree_fill (pdf, tree, col, prow, c);
     }
+  }
 }
 
 static void
@@ -90,10 +88,10 @@
                           Etk_Tree_Col *col_pages,
                           Etk_Tree_Col *col_index)
 {
-  Evas_Poppler_Document   *document;
-  Ecore_List              *index;
-  int                      page_count;
-  int                      i;
+  Epdf_Document   *document;
+  Ecore_List      *index;
+  int              page_count;
+  int              i;
 
   if (!data || !data->filename) return;
 
@@ -105,20 +103,19 @@
   document = etk_pdf_pdf_document_get (ETK_PDF (data->pdf));
   if (!document) return;
 
-  page_count = evas_poppler_document_page_count_get (document);
+  page_count = epdf_document_page_count_get (document);
   etk_tree_freeze (ETK_TREE (data->list_pages));
-  for (i = 0; i < page_count; i++)
-    {
-      Etk_Tree_Row *row;
-      int          *num;
-
-      row = etk_tree_append (ETK_TREE (data->list_pages), col_pages, i + 1, 
NULL);
-      num = (int *)malloc (sizeof (int));
-      *num = i;
-      etk_tree_row_data_set (row, num);
-/*       etk_signal_connect ("destroyed", ETK_OBJECT (row), */
-/*                           ETK_CALLBACK(_exo_etk_row_data_free_cb), NULL); */
-    }
+  for (i = 0; i < page_count; i++) {
+    Etk_Tree_Row *row;
+    int          *num;
+
+    row = etk_tree_append (ETK_TREE (data->list_pages), col_pages, i + 1, 
NULL);
+    num = (int *)malloc (sizeof (int));
+    *num = i;
+    etk_tree_row_data_set (row, num);
+    /*       etk_signal_connect ("destroyed", ETK_OBJECT (row), */
+    /*                           ETK_CALLBACK(_exo_etk_row_data_free_cb), 
NULL); */
+  }
   etk_tree_thaw (ETK_TREE (data->list_pages));
 
   index = etk_pdf_pdf_index_get (ETK_PDF (data->pdf));
@@ -431,16 +428,16 @@
 static void
 _exo_etk_info_cb (Etk_Object *object __UNUSED__, void *user_data)
 {
-  Exo_Etk               *data;
-  Etk_Widget            *dialog_info;
-  Etk_Widget            *table;
-  Etk_Widget            *notebook;
-  Etk_Widget            *label;
-  Etk_Widget            *entry;
-  Etk_Widget            *list;
-  Ecore_List            *fonts;
-  Evas_Poppler_Document *doc;
-  Evas_Poppler_Font_Info *font;
+  Exo_Etk        *data;
+  Etk_Widget     *dialog_info;
+  Etk_Widget     *table;
+  Etk_Widget     *notebook;
+  Etk_Widget     *label;
+  Etk_Widget     *entry;
+  Etk_Widget     *list;
+  Ecore_List     *fonts;
+  Epdf_Document  *doc;
+  Epdf_Font_Info *font;
 
   data = (Exo_Etk *)user_data;
   doc = etk_pdf_pdf_document_get (ETK_PDF (data->pdf));
@@ -469,7 +466,7 @@
   etk_widget_show (label);
 
   entry = etk_entry_new ();
-  etk_entry_text_set (ETK_ENTRY (entry), evas_poppler_version_get ());
+  etk_entry_text_set (ETK_ENTRY (entry), epdf_poppler_version_get ());
   etk_table_attach_defaults (ETK_TABLE (table), entry, 1, 1, 0, 0);
   etk_widget_show (entry);
 
@@ -500,10 +497,10 @@
 
     etk_tree_append (ETK_TREE (list),
                      col_title, "File name",
-                     col_prop, evas_poppler_document_filename_get (doc),
+                     col_prop, epdf_document_filename_get (doc),
                      NULL);
 
-    text = evas_poppler_document_title_get (doc);
+    text = epdf_document_title_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Title",
@@ -511,13 +508,13 @@
                      NULL);
     free (text);
 
-    snprintf (buf, 16, "PDF-%.1f", evas_poppler_document_pdf_version_get 
(doc));
+    snprintf (buf, 16, "PDF-%.1f", epdf_document_pdf_version_get (doc));
     etk_tree_append (ETK_TREE (list),
                      col_title, "Format",
                      col_prop, buf,
                      NULL);
 
-    text = evas_poppler_document_author_get (doc);
+    text = epdf_document_author_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Author",
@@ -525,7 +522,7 @@
                      NULL);
     free (text);
 
-    text = evas_poppler_document_subject_get (doc);
+    text = epdf_document_subject_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Subject",
@@ -533,7 +530,7 @@
                      NULL);
     free (text);
 
-    text = evas_poppler_document_keywords_get (doc);
+    text = epdf_document_keywords_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Keywords",
@@ -541,7 +538,7 @@
                      NULL);
     free (text);
 
-    text = evas_poppler_document_creator_get (doc);
+    text = epdf_document_creator_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Creator",
@@ -549,7 +546,7 @@
                      NULL);
     free (text);
 
-    text = evas_poppler_document_producer_get (doc);
+    text = epdf_document_producer_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Producer",
@@ -557,7 +554,7 @@
                      NULL);
     free (text);
 
-    if (evas_poppler_document_is_linearized (doc))
+    if (epdf_document_is_linearized (doc))
       text = "yes";
     else
       text = "no";
@@ -568,15 +565,15 @@
 
     etk_tree_append (ETK_TREE (list),
                      col_title, "Page mode",
-                     col_prop, evas_poppler_document_page_mode_string_get 
(doc),
+                     col_prop, epdf_document_page_mode_string_get (doc),
                      NULL);
 
     etk_tree_append (ETK_TREE (list),
                      col_title, "Page layout",
-                     col_prop, evas_poppler_document_page_layout_string_get 
(doc),
+                     col_prop, epdf_document_page_layout_string_get (doc),
                      NULL);
 
-    text = evas_poppler_document_creation_date_get (doc);
+    text = epdf_document_creation_date_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Creation date",
@@ -584,7 +581,7 @@
                      NULL);
     free (text);
 
-    text = evas_poppler_document_mod_date_get (doc);
+    text = epdf_document_mod_date_get (doc);
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Modification date",
@@ -592,7 +589,7 @@
                      NULL);
     free (text);
 
-    snprintf (buf, 16, "%d", evas_poppler_document_page_count_get (doc));
+    snprintf (buf, 16, "%d", epdf_document_page_count_get (doc));
     if (!text) text = strdup ("unknown");
     etk_tree_append (ETK_TREE (list),
                      col_title, "Page count",
@@ -630,14 +627,14 @@
 
     etk_tree_freeze (ETK_TREE (list));
 
-    fonts = evas_poppler_document_fonts_get (doc);
+    fonts = epdf_document_fonts_get (doc);
     ecore_list_goto_first (fonts);
     while ((font = ecore_list_next (fonts))) {
       etk_tree_append (ETK_TREE (list),
-                       col_name, evas_poppler_font_info_font_name_get (font),
-                       col_type, evas_poppler_font_info_type_name_get (font),
-                       col_embedded, evas_poppler_font_info_is_embedded_get 
(font) ? "yes" : "no",
-                       col_subset, evas_poppler_font_info_is_subset_get (font) 
? "yes" : "no",
+                       col_name, epdf_font_info_font_name_get (font),
+                       col_type, epdf_font_info_type_name_get (font),
+                       col_embedded, epdf_font_info_is_embedded_get (font) ? 
"yes" : "no",
+                       col_subset, epdf_font_info_is_subset_get (font) ? "yes" 
: "no",
                        NULL);
     }
     ecore_list_destroy (fonts);
@@ -652,8 +649,8 @@
     Etk_Tree_Col *col_prop;
     char  buf[16];
     char *text;
-    Evas_Poppler_Page *page;
-    Evas_Poppler_Page_Orientation o;
+    Epdf_Page *page;
+    Epdf_Page_Orientation o;
 
     page = etk_pdf_pdf_page_get (ETK_PDF (data->pdf));
 
@@ -678,24 +675,24 @@
                      col_prop, buf,
                      NULL);
 
-    snprintf (buf, 16, "%d x %d", evas_poppler_page_width_get (page), 
evas_poppler_page_height_get (page));
+    snprintf (buf, 16, "%d x %d", epdf_page_width_get (page), 
epdf_page_height_get (page));
     etk_tree_append (ETK_TREE (list),
                      col_title, "Size (pixels)",
                      col_prop, buf,
                      NULL);
 
-    o = evas_poppler_page_orientation_get (page);
+    o = epdf_page_orientation_get (page);
     switch (o) {
-    case EVAS_POPPLER_PAGE_ORIENTATION_LANDSCAPE:
+    case EPDF_PAGE_ORIENTATION_LANDSCAPE:
       text = "landscape";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_UPSIDEDOWN:
+    case EPDF_PAGE_ORIENTATION_UPSIDEDOWN:
       text = "upside down";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_SEASCAPE:
+    case EPDF_PAGE_ORIENTATION_SEASCAPE:
       text = "seascape";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_PORTRAIT:
+    case EPDF_PAGE_ORIENTATION_PORTRAIT:
       text = "portrait";
       break;
     default:
@@ -844,7 +841,7 @@
   pdf =  ETK_PDF (((Exo_Etk *)user_data)->pdf);
 
   if (etk_menu_item_check_active_get (ETK_MENU_ITEM_CHECK (object))) {
-    etk_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_LANDSCAPE);
+    etk_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_LANDSCAPE);
   }
 }
 
@@ -856,7 +853,7 @@
   pdf =  ETK_PDF (((Exo_Etk *)user_data)->pdf);
 
   if (etk_menu_item_check_active_get (ETK_MENU_ITEM_CHECK (object))) {
-    etk_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_UPSIDEDOWN);
+    etk_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_UPSIDEDOWN);
   }
 }
 
@@ -868,7 +865,7 @@
   pdf =  ETK_PDF (((Exo_Etk *)user_data)->pdf);
 
   if (etk_menu_item_check_active_get (ETK_MENU_ITEM_CHECK (object))) {
-    etk_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_SEASCAPE);
+    etk_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_SEASCAPE);
   }
 }
 
@@ -880,7 +877,7 @@
   pdf =  ETK_PDF (((Exo_Etk *)user_data)->pdf);
 
   if (etk_menu_item_check_active_get (ETK_MENU_ITEM_CHECK (object))) {
-    etk_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_PORTRAIT);
+    etk_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_PORTRAIT);
   }
 }
 
===================================================================
RCS file: /cvs/e/e17/proto/exorcist/src/bin/ewl_main_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_main_window.c   17 Apr 2006 08:50:48 -0000      1.2
+++ ewl_main_window.c   17 Apr 2006 18:09:09 -0000      1.3
@@ -92,8 +92,8 @@
 void
 _exo_ewl_tree_fill (Exo_Ewl *data, Ewl_Row *row, Ecore_List *items)
 {
-  Ewl_Widget              *prow;
-  Evas_Poppler_Index_Item *item;
+  Ewl_Widget      *prow;
+  Epdf_Index_Item *item;
 
   if (!items)
     return;
@@ -106,40 +106,38 @@
       char       *buf;
       Ecore_List *c;
 
-      buf = strdup (evas_poppler_index_item_title_get (item));
+      buf = strdup (epdf_index_item_title_get (item));
       prow = ewl_tree_text_row_add (EWL_TREE (data->list_index), row,
                                     &buf);
-      page = evas_poppler_index_item_page_get (ewl_pdf_pdf_document_get 
(EWL_PDF (data->pdf)), item);
-      if (page >= 0)
-        {
-          num = (int *)malloc (sizeof (int));
-          *num = page;
-          ewl_widget_data_set (prow, "row-number", num);
-          ewl_callback_append (EWL_WIDGET (prow),
-                               EWL_CALLBACK_CLICKED,
-                               EWL_CALLBACK_FUNCTION (_exo_ewl_change_page_cb),
-                               data);
-          ewl_callback_prepend (EWL_WIDGET (prow),
-                                EWL_CALLBACK_DESTROY,
-                                EWL_CALLBACK_FUNCTION 
(_exo_ewl_row_data_free_cb),
-                                NULL);
-        }
+      page = epdf_index_item_page_get (ewl_pdf_pdf_document_get (EWL_PDF 
(data->pdf)), item);
+      if (page >= 0) {
+        num = (int *)malloc (sizeof (int));
+        *num = page;
+        ewl_widget_data_set (prow, "row-number", num);
+        ewl_callback_append (EWL_WIDGET (prow),
+                             EWL_CALLBACK_CLICKED,
+                             EWL_CALLBACK_FUNCTION (_exo_ewl_change_page_cb),
+                             data);
+        ewl_callback_prepend (EWL_WIDGET (prow),
+                              EWL_CALLBACK_DESTROY,
+                              EWL_CALLBACK_FUNCTION 
(_exo_ewl_row_data_free_cb),
+                              NULL);
+      }
       free (buf);
-      c = evas_poppler_index_item_children_get (item);
-      if (c)
-        {
-          _exo_ewl_tree_fill (data, EWL_ROW (prow), c);
-        }
+      c = epdf_index_item_children_get (item);
+      if (c) {
+        _exo_ewl_tree_fill (data, EWL_ROW (prow), c);
+      }
     }
 }
 
 static void
 _exo_ewl_update_document (Exo_Ewl *data)
 {
-  Evas_Poppler_Document   *document;
-  Ecore_List              *index;
-  int                      page_count;
-  int                      i;
+  Epdf_Document   *document;
+  Ecore_List      *index;
+  int              page_count;
+  int              i;
 
   if (!data || !data->filename) return;
 
@@ -151,7 +149,7 @@
   document = ewl_pdf_pdf_document_get (EWL_PDF (data->pdf));
   if (!document) return;
 
-  page_count = evas_poppler_document_page_count_get (document);
+  page_count = epdf_document_page_count_get (document);
   for (i = 0; i < page_count; i++) {
     char        row_text[64];
     char       *txt;
@@ -561,11 +559,10 @@
   pdf =  EWL_PDF (((Exo_Ewl *)user_data)->pdf);
 
   row_number = *(int *)ewl_widget_data_get (widget, "row-number");
-  if (row_number != ewl_pdf_page_get (pdf))
-    {
-      ewl_pdf_page_set (pdf, row_number);
-      ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
-    }
+  if (row_number != ewl_pdf_page_get (pdf)) {
+    ewl_pdf_page_set (pdf, row_number);
+    ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
+  }
 }
 
 static void
@@ -710,17 +707,17 @@
                   void       *ev_data __UNUSED__,
                   void       *user_data)
 {
-  Exo_Ewl                *data;
-  Ewl_Widget             *dialog_info;
-  Ewl_Widget             *button;
-  Ewl_Widget             *table;
-  Ewl_Widget             *notebook;
-  Ewl_Widget             *label;
-  Ewl_Widget             *entry;
-  Ewl_Widget             *list;
-  Ecore_List             *fonts;
-  Evas_Poppler_Document  *doc;
-  Evas_Poppler_Font_Info *font;
+  Exo_Ewl        *data;
+  Ewl_Widget     *dialog_info;
+  Ewl_Widget     *button;
+  Ewl_Widget     *table;
+  Ewl_Widget     *notebook;
+  Ewl_Widget     *label;
+  Ewl_Widget     *entry;
+  Ewl_Widget     *list;
+  Ecore_List     *fonts;
+  Epdf_Document  *doc;
+  Epdf_Font_Info *font;
 
   data = (Exo_Ewl *)user_data;
   doc = ewl_pdf_pdf_document_get (EWL_PDF (data->pdf));
@@ -756,7 +753,7 @@
   ewl_widget_show (label);
 
   entry = ewl_entry_new ();
-  ewl_text_text_set (EWL_TEXT (entry), evas_poppler_version_get ());
+  ewl_text_text_set (EWL_TEXT (entry), epdf_poppler_version_get ());
   ewl_table_add (EWL_TABLE (table), entry, 2, 2, 1, 1);
   ewl_widget_show (entry);
 
@@ -774,11 +771,11 @@
     ewl_widget_show (list);
 
     row_text[0] = "File name";
-    row_text[1] = evas_poppler_document_filename_get (doc);
+    row_text[1] = epdf_document_filename_get (doc);
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Title";
-    text = evas_poppler_document_title_get (doc);
+    text = epdf_document_title_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -788,12 +785,12 @@
       free (text);
 
     row_text[0] = "Format";
-    snprintf (buf, 16, "PDF-%.1f", evas_poppler_document_pdf_version_get 
(doc));
+    snprintf (buf, 16, "PDF-%.1f", epdf_document_pdf_version_get (doc));
     row_text[1] = buf;
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Author";
-    text = evas_poppler_document_author_get (doc);
+    text = epdf_document_author_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -803,7 +800,7 @@
       free (text);
 
     row_text[0] = "Subject";
-    text = evas_poppler_document_subject_get (doc);
+    text = epdf_document_subject_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -813,7 +810,7 @@
       free (text);
 
     row_text[0] = "Keywords";
-    text = evas_poppler_document_keywords_get (doc);
+    text = epdf_document_keywords_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -823,7 +820,7 @@
       free (text);
 
     row_text[0] = "Creator";
-    text = evas_poppler_document_creator_get (doc);
+    text = epdf_document_creator_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -833,7 +830,7 @@
       free (text);
 
     row_text[0] = "Producer";
-    text = evas_poppler_document_producer_get (doc);
+    text = epdf_document_producer_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -843,22 +840,22 @@
       free (text);
 
     row_text[0] = "Linearized";
-    if (evas_poppler_document_is_linearized (doc))
+    if (epdf_document_is_linearized (doc))
       row_text[1] = "yes";
     else
       row_text[1] = "no";
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Page mode";
-    row_text[1] = (char *)evas_poppler_document_page_mode_string_get (doc);
+    row_text[1] = (char *)epdf_document_page_mode_string_get (doc);
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Page layout";
-    row_text[1] = (char *)evas_poppler_document_page_layout_string_get (doc);
+    row_text[1] = (char *)epdf_document_page_layout_string_get (doc);
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Creation date";
-    text = evas_poppler_document_creation_date_get (doc);
+    text = epdf_document_creation_date_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -868,7 +865,7 @@
       free (text);
 
     row_text[0] = "Modification date";
-    text = evas_poppler_document_mod_date_get (doc);
+    text = epdf_document_mod_date_get (doc);
     if (text)
       row_text[1] = text;
     else
@@ -878,7 +875,7 @@
       free (text);
 
     row_text[0] = "Page count";
-    snprintf (buf, 16, "%d", evas_poppler_document_page_count_get (doc));
+    snprintf (buf, 16, "%d", epdf_document_page_count_get (doc));
     row_text[1] = buf;
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
@@ -897,15 +894,15 @@
     ewl_tree_headers_set (EWL_TREE (list), header);
     ewl_widget_show (list);
 
-    fonts = evas_poppler_document_fonts_get (doc);
+    fonts = epdf_document_fonts_get (doc);
     ecore_list_goto_first (fonts);
     while ((font = ecore_list_next (fonts))) {
       char *row_text[4];
 
-      row_text[0] = (char *)evas_poppler_font_info_font_name_get (font);
-      row_text[1] = (char *)evas_poppler_font_info_type_name_get (font);
-      row_text[2] = evas_poppler_font_info_is_embedded_get (font) ? "yes" : 
"no";
-      row_text[3] = evas_poppler_font_info_is_subset_get (font) ? "yes" : "no";
+      row_text[0] = (char *)epdf_font_info_font_name_get (font);
+      row_text[1] = (char *)epdf_font_info_type_name_get (font);
+      row_text[2] = epdf_font_info_is_embedded_get (font) ? "yes" : "no";
+      row_text[3] = epdf_font_info_is_subset_get (font) ? "yes" : "no";
       ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
     }
     ecore_list_destroy (fonts);
@@ -917,8 +914,8 @@
   {
     char  buf[16];
     char *row_text[2];
-    Evas_Poppler_Page *page;
-    Evas_Poppler_Page_Orientation o;
+    Epdf_Page *page;
+    Epdf_Page_Orientation o;
 
     page = ewl_pdf_pdf_page_get (EWL_PDF (data->pdf));
 
@@ -931,23 +928,23 @@
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Size (pixels)";
-    snprintf (buf, 16, "%d x %d", evas_poppler_page_width_get (page), 
evas_poppler_page_height_get (page));
+    snprintf (buf, 16, "%d x %d", epdf_page_width_get (page), 
epdf_page_height_get (page));
     row_text[1] = buf;
     ewl_tree_text_row_add (EWL_TREE (list), NULL, row_text);
 
     row_text[0] = "Orientation";
-    o = evas_poppler_page_orientation_get (page);
+    o = epdf_page_orientation_get (page);
     switch (o) {
-    case EVAS_POPPLER_PAGE_ORIENTATION_LANDSCAPE:
+    case EPDF_PAGE_ORIENTATION_LANDSCAPE:
       row_text[1] = "landscape";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_UPSIDEDOWN:
+    case EPDF_PAGE_ORIENTATION_UPSIDEDOWN:
       row_text[1] = "upside down";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_SEASCAPE:
+    case EPDF_PAGE_ORIENTATION_SEASCAPE:
       row_text[1] = "seascape";
       break;
-    case EVAS_POPPLER_PAGE_ORIENTATION_PORTRAIT:
+    case EPDF_PAGE_ORIENTATION_PORTRAIT:
       row_text[1] = "portrait";
       break;
     }
@@ -981,7 +978,7 @@
   pdf =  EWL_PDF (((Exo_Ewl *)user_data)->pdf);
 
   if (ewl_radiobutton_is_checked (r)) {
-    ewl_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_LANDSCAPE);
+    ewl_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_LANDSCAPE);
     ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
   }
 }
@@ -998,7 +995,7 @@
   pdf =  EWL_PDF (((Exo_Ewl *)user_data)->pdf);
 
   if (ewl_radiobutton_is_checked (r)) {
-    ewl_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_UPSIDEDOWN);
+    ewl_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_UPSIDEDOWN);
     ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
   }
 }
@@ -1015,7 +1012,7 @@
   pdf =  EWL_PDF (((Exo_Ewl *)user_data)->pdf);
 
   if (ewl_radiobutton_is_checked (r)) {
-    ewl_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_SEASCAPE);
+    ewl_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_SEASCAPE);
     ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
   }
 }
@@ -1032,7 +1029,7 @@
   pdf =  EWL_PDF (((Exo_Ewl *)user_data)->pdf);
 
   if (ewl_radiobutton_is_checked (r)) {
-    ewl_pdf_orientation_set (pdf, EVAS_POPPLER_PAGE_ORIENTATION_PORTRAIT);
+    ewl_pdf_orientation_set (pdf, EPDF_PAGE_ORIENTATION_PORTRAIT);
     ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
   }
 }




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to