Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/epdf/src/bin
Modified Files:
Makefile.am epdf_etk_test.c epdf_ewl_test.c
Removed Files:
ewl_test_pdf.c
Log Message:
update to new etk and ewl api, use newest source of poppler, move ewl plugin to
its own dir, add epsilon plugin to remove circular dependancy between epdf,
epsilon and ewl, various fixes
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 10 Sep 2006 08:16:52 -0000 1.4
+++ Makefile.am 7 Jul 2007 16:12:08 -0000 1.5
@@ -9,9 +9,9 @@
EPDF_ETK_TEST = epdf_etk_test
endif
-INCLUDES = \
+INCLUDES = \
-I$(top_srcdir)/src/lib \
[EMAIL PROTECTED]@ @ECORE_CFLAGS@
[EMAIL PROTECTED]@
bin_PROGRAMS = epdf_evas_test epdf_esmart_test $(EPDF_EWL_TEST)
$(EPDF_ETK_TEST)
@@ -20,16 +20,14 @@
epdf_evas_test_LDADD = \
$(top_builddir)/src/lib/libepdf.la \
- $(EVAS_LIBS) \
- $(ECORE_LIBS)
+ $(EPDF_LIBS)
epdf_esmart_test_SOURCES = \
epdf_esmart_test.c
epdf_esmart_test_LDADD = \
$(top_builddir)/src/lib/libepdf.la \
- $(EVAS_LIBS) \
- $(ECORE_LIBS)
+ $(EPDF_LIBS)
epdf_ewl_test_SOURCES = \
epdf_ewl_test.c
@@ -38,8 +36,7 @@
epdf_ewl_test_LDADD = \
$(top_builddir)/src/lib/libepdf.la \
- $(EVAS_LIBS) \
- $(ECORE_LIBS) \
+ $(EPDF_LIBS) \
$(EWL_LIBS)
epdf_etk_test_SOURCES = \
@@ -49,23 +46,4 @@
epdf_etk_test_LDADD = \
$(top_builddir)/src/lib/libepdf.la \
- $(EVAS_LIBS) \
- $(ECORE_LIBS)
-
-if BUILD_EPDF_EWL
-pkgdir = @EWL_TEST_LIBS_DIR@
-pkg_LTLIBRARIES = libewl_test_pdf.la
-
-libewl_test_pdf_la_SOURCES = ewl_test_pdf.c
-libewl_test_pdf_la_CFLAGS = @EWL_CFLAGS@
-libewl_test_pdf_la_LIBADD = \
- $(top_builddir)/src/lib/libepdf.la \
- @EWL_LIBS@
-libewl_test_pdf_la_LDFLAGS = \
- -L$(top_builddir)/src/lib \
- -L$(top_builddir)/src/lib/.libs
-
-EXTRA_DIST = $(libewl_test_pdf_la_SOURCES)
-exampledir = @EWL_TEST_SOURCE_DIR@
-example_DATA = $(libewl_test_pdf_la_SOURCES)
-endif
+ $(EPDF_LIBS)
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_etk_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- epdf_etk_test.c 17 Jan 2007 01:49:04 -0000 1.8
+++ epdf_etk_test.c 7 Jul 2007 16:12:09 -0000 1.9
@@ -45,7 +45,7 @@
window = etk_window_new ();
etk_window_title_set (ETK_WINDOW (window), "Etk Pdf Test Application");
- etk_signal_connect ("delete_event", ETK_OBJECT (window),
+ etk_signal_connect ("delete-event", ETK_OBJECT (window),
ETK_CALLBACK(_quit_cb), NULL);
table = etk_table_new (2, 2, ETK_FALSE);
@@ -71,7 +71,7 @@
epdf_index_delete (index);
/* change page */
- etk_signal_connect ("row_clicked", ETK_OBJECT (tree),
+ etk_signal_connect ("row-clicked", ETK_OBJECT (tree),
ETK_CALLBACK(_change_page_cb), pdf);
/* we attach and show */
@@ -102,7 +102,7 @@
}
/* change page */
- etk_signal_connect ("row_clicked", ETK_OBJECT (list),
+ etk_signal_connect ("row-clicked", ETK_OBJECT (list),
ETK_CALLBACK(_change_page_cb), pdf);
/* we attach and show */
===================================================================
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_ewl_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- epdf_ewl_test.c 12 Feb 2007 14:31:47 -0000 1.7
+++ epdf_ewl_test.c 7 Jul 2007 16:12:09 -0000 1.8
@@ -167,17 +167,17 @@
hbox = ewl_hbox_new ();
ewl_box_homogeneous_set (EWL_BOX (hbox), FALSE);
ewl_container_child_append (EWL_CONTAINER (window), hbox);
+ ewl_object_fill_policy_set (EWL_OBJECT (hbox), EWL_FLAG_FILL_ALL);
ewl_widget_show (hbox);
vbox = ewl_vbox_new ();
ewl_box_homogeneous_set (EWL_BOX (vbox), TRUE);
ewl_container_child_append (EWL_CONTAINER (hbox), vbox);
+ ewl_object_fill_policy_set (EWL_OBJECT (vbox), EWL_FLAG_FILL_ALL);
ewl_widget_show (vbox);
/* view for both the list and the tree (if the index exists) */
- view = ewl_view_new();
- ewl_view_constructor_set (view, ewl_label_new);
- ewl_view_assign_set (view, EWL_VIEW_ASSIGN (_label_text_set));
+ view = ewl_label_view_get();
if (index) {
Ewl_Model *model;
@@ -197,17 +197,15 @@
/* model */
model = ewl_model_new ();
- ewl_model_fetch_set (model, tree2_data_fetch);
- ewl_model_count_set (model, tree2_data_count_get);
- ewl_model_expandable_set (model, tree2_data_expandable_get);
+ ewl_model_data_fetch_set (model, tree2_data_fetch);
+ ewl_model_data_count_set (model, tree2_data_count_get);
+ ewl_model_data_expandable_set (model, tree2_data_expandable_get);
ewl_model_expansion_data_fetch_set(model, tree2_data_expansion_fetch);
/* MVC */
ewl_mvc_data_set (EWL_MVC (tree), data);
ewl_mvc_model_set (EWL_MVC (tree), model);
-
- /* view */
- ewl_tree2_column_append (EWL_TREE2(tree), view, FALSE);
+ ewl_mvc_view_set(EWL_MVC(tree), view);
/* we attach and show */
ewl_container_child_append (EWL_CONTAINER (vbox), tree);
@@ -216,6 +214,7 @@
sp = ewl_scrollpane_new ();
ewl_container_child_append (EWL_CONTAINER (vbox), sp);
+ ewl_object_fill_policy_set (EWL_OBJECT (sp), EWL_FLAG_FILL_ALL);
ewl_widget_show (sp);
page_count = epdf_document_page_count_get (document);
@@ -231,9 +230,11 @@
model = ewl_model_ecore_list_get();
list = ewl_list_new ();
+ ewl_object_fill_policy_set (EWL_OBJECT (list), EWL_FLAG_FILL_ALL);
+
+ ewl_mvc_data_set(EWL_MVC(list), str_data);
ewl_mvc_model_set(EWL_MVC(list), model);
ewl_mvc_view_set(EWL_MVC(list), view);
- ewl_mvc_data_set(EWL_MVC(list), str_data);
ewl_callback_append (list,
EWL_CALLBACK_VALUE_CHANGED,
EWL_CALLBACK_FUNCTION (_change_page_cb),
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
