Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/epdf
Dir : e17/proto/epdf/src/bin
Modified Files:
Makefile.am epdf_esmart_test.c epdf_evas_test.c
epdf_ewl_test.c
Log Message:
* configure.in:
* src/bin/Makefile.am:
* src/lib/Makefile.am:
* src/plugins/epsilon/Makefile.am:
* src/plugins/ewl/Makefile.am:
fix autotools
* Doxyfile:
* src/lib/Epdf.h:
* src/lib/epdf_document.cpp:
* src/lib/epdf_document.h:
* src/lib/epdf_fontinfo.cpp:
* src/lib/epdf_fontinfo.h:
* src/lib/epdf_index.cpp:
* src/lib/epdf_index.h:
* src/lib/epdf_main.h:
* src/lib/epdf_page.cpp:
* src/lib/epdf_page.h:
* src/lib/epdf_page_transition.h:
* src/lib/epdf_postscript.cpp:
* src/lib/epdf_postscript.h:
* src/lib/esmart_pdf.c: (esmart_pdf_size_get), (esmart_pdf_render),
(esmart_pdf_pdf_index_get):
* src/lib/esmart_pdf.h:
* src/lib/etk_pdf.c: (etk_pdf_file_set), (etk_pdf_page_get),
(etk_pdf_size_get), (etk_pdf_page_previous), (etk_pdf_search_next),
(_etk_pdf_load):
* src/lib/etk_pdf.h:
* src/lib/ewl_pdf.c: (ewl_pdf_new), (ewl_pdf_init),
(ewl_pdf_file_set), (ewl_pdf_file_get), (ewl_pdf_page_set),
(ewl_pdf_page_get), (ewl_pdf_pdf_size_get),
(ewl_pdf_orientation_set), (ewl_pdf_orientation_get),
(ewl_pdf_scale_set), (ewl_pdf_scale_get), (ewl_pdf_page_next),
(ewl_pdf_page_previous), (ewl_pdf_search_text_set),
(ewl_pdf_search_first_page_set),
(ewl_pdf_search_is_case_sensitive), (ewl_pdf_search_next),
(ewl_pdf_pdf_document_get), (ewl_pdf_pdf_page_get),
(ewl_pdf_pdf_index_get), (ewl_pdf_configure_cb),
(ewl_pdf_reveal_cb), (ewl_pdf_obscure_cb), (ewl_pdf_destroy_cb):
* src/lib/ewl_pdf.h:
api break : epdf_page_size_get instead of
epdf_page_width_get and epdf_page_height_get
add const when needed
fix documentation
change 1 tabulation to 8 spaces in ewl widget
* src/bin/epdf_esmart_test.c: (main):
* src/bin/epdf_evas_test.c: (main), (document_info_print):
* src/bin/epdf_ewl_test.c: (_change_page_cb):
* src/plugins/epsilon/epsilon_thumbnailer.c:
(epsilon_generate_thumb):
update to new api
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 27 Jan 2008 05:47:55 -0000 1.7
+++ Makefile.am 21 May 2008 13:07:08 -0000 1.8
@@ -11,6 +11,8 @@
bin_PROGRAMS = epdf_evas_test epdf_esmart_test $(EPDF_EWL_TEST)
$(EPDF_ETK_TEST)
+## evas test
+
epdf_evas_test_SOURCES = \
epdf_evas_test.c
@@ -23,6 +25,10 @@
$(top_builddir)/src/lib/libepdf.la \
$(EPDF_LIBS) $(ECORE_EVAS_LIBS)
+epdf_evas_test_DEPENDENCIES = $(top_builddir)/src/lib/libepdf.la
+
+## esmart test
+
epdf_esmart_test_SOURCES = \
epdf_esmart_test.c
@@ -35,6 +41,10 @@
$(top_builddir)/src/lib/libepdf.la \
$(EPDF_LIBS) $(ECORE_EVAS_LIBS)
+epdf_esmart_test_DEPENDENCIES = $(top_builddir)/src/lib/libepdf.la
+
+## ewl test
+
epdf_ewl_test_SOURCES = \
epdf_ewl_test.c
@@ -49,6 +59,10 @@
$(EPDF_LIBS) \
$(EWL_LIBS)
+epdf_ewl_test_DEPENDENCIES = $(top_builddir)/src/lib/libepdf.la
+
+## etk test
+
epdf_etk_test_SOURCES = \
epdf_etk_test.c
@@ -61,3 +75,5 @@
epdf_etk_test_LDADD = \
$(top_builddir)/src/lib/libepdf.la \
$(EPDF_LIBS)
+
+epdf_etk_test_DEPENDENCIES = $(top_builddir)/src/lib/libepdf.la
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_esmart_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- epdf_esmart_test.c 20 Apr 2008 21:58:17 -0000 1.4
+++ epdf_esmart_test.c 21 May 2008 13:07:08 -0000 1.5
@@ -15,11 +15,14 @@
int
main (int argc, char *argv[])
{
- Ecore_Evas *ee;
- Evas *evas;
- Evas_Object *o, *bg;
- char *filename;
- int page_number;
+ Ecore_Evas *ee;
+ Evas *evas;
+ Evas_Object *o;
+ Evas_Object *bg;
+ char *filename;
+ int page_number;
+ int width;
+ int height;
if (argc < 3)
{
@@ -42,7 +45,7 @@
return -1;
}
- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 600, 850);
+ ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, app_signal_exit, NULL);
ecore_evas_callback_delete_request_set(ee, app_delete_request);
ecore_evas_title_set(ee, "Esmart Pdf Test");
@@ -54,7 +57,6 @@
bg = evas_object_rectangle_add(evas);
evas_object_color_set(bg, 0, 0, 0, 255);
- evas_object_resize(bg, 600, 850);
evas_object_show(bg);
ecore_evas_data_set(ee, "bg", bg);
@@ -70,6 +72,10 @@
esmart_pdf_render (o);
evas_object_move (o, 0, 0);
evas_object_show (o);
+
+ esmart_pdf_size_get (o, &width, &height);
+ ecore_evas_resize(ee, width, height);
+ evas_object_resize(bg, width, height);
ecore_main_loop_begin ();
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_evas_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- epdf_evas_test.c 20 Apr 2008 21:58:17 -0000 1.9
+++ epdf_evas_test.c 21 May 2008 13:07:08 -0000 1.10
@@ -24,6 +24,8 @@
Epdf_Document *document;
Epdf_Page *page;
int page_number;
+ int width;
+ int height;
if (argc < 3) {
printf ("\nUsage: %s filename page_number\n\n", argv[0]);
@@ -50,6 +52,7 @@
return EXIT_FAILURE;
}
epdf_page_page_set (page, page_number);
+ epdf_page_size_get (page, &width, &height);
document_info_print (document, page);
@@ -65,11 +68,11 @@
return EXIT_FAILURE;
}
- ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, 600, 850);
+ ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, width, height);
/* these tests can be improved... */
if (!ee) {
printf ("Can not find Software X11 engine. Trying DirectDraw engine...\n");
- ee = ecore_evas_software_ddraw_new (NULL, 0, 0, 600, 850);
+ ee = ecore_evas_software_ddraw_new (NULL, 0, 0, width, height);
if (!ee) {
printf ("Can not find Software X11 engine. Trying DirectDraw
engine...\n");
printf ("Exiting...\n");
@@ -91,7 +94,6 @@
evas_object_move (o, 0, 0);
epdf_page_render (page, o);
evas_object_show (o);
- ecore_evas_resize (ee, epdf_page_width_get (page), epdf_page_height_get
(page));
ecore_main_loop_begin ();
@@ -153,6 +155,8 @@
const char *page_mode;
const char *page_layout;
const char *orientation;
+ int width;
+ int height;
printf ("\n");
printf (" Poppler version....: %s\n", epdf_poppler_version_get ());
@@ -234,8 +238,10 @@
printf (" Page Properties:\n");
printf ("\n");
+ epdf_page_size_get (page, &width, &height);
+
printf (" Number.............: %d\n", epdf_page_page_get (page));
- printf (" Size (pixels)......: %d x %d\n", epdf_page_width_get (page),
epdf_page_height_get (page));
+ printf (" Size (pixels)......: %d x %d\n", width, height);
switch (epdf_page_orientation_get (page))
{
case EPDF_PAGE_ORIENTATION_PORTRAIT:
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_ewl_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- epdf_ewl_test.c 20 Apr 2008 21:58:17 -0000 1.11
+++ epdf_ewl_test.c 21 May 2008 13:07:08 -0000 1.12
@@ -269,6 +269,8 @@
Ewl_Pdf *pdf;
Ewl_Selection_Idx *sel;
+ pdf = EWL_PDF (user_data);
+
if (ewl_widget_type_is (widget, "list")) {
/* sel = ewl_mvc_selected_get (EWL_MVC (widget)); */
@@ -282,14 +284,11 @@
Tree_Data *data;
Tree_Row_Data *row_data;
- printf ("1\n");
sel = ewl_mvc_selected_get (EWL_MVC (widget));
if (!sel) return;
- printf ("2 %d\n\n", sel->row);
data = (Tree_Data *)EWL_SELECTION(sel)->data;
row_data = data->rows[sel->row];
if (row_data) {
- printf ("3 %d\n\n", row_data->page);
ewl_pdf_page_set (pdf, row_data->page);
ewl_callback_call (EWL_WIDGET (pdf), EWL_CALLBACK_REVEAL);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
