Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_image_test.c etk_progress_bar_test.c etk_test.c
etk_tree_test.c
Log Message:
** Breaks a lot of things, do not upgrade!! (even devs!)
* Big overhaul in the Etk_Widget and Etk_Container's internal code that
fix some bugs but create a lot of new ones :)
* Add a cache system that will improve (hopefully) the perfs of the tree
and of the future iconbox
* Cleans the code and the doc
* Breaks a lot of things!
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_image_test.c 15 Jan 2006 11:07:16 -0000 1.4
+++ etk_image_test.c 11 Feb 2006 00:28:31 -0000 1.5
@@ -17,7 +17,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Image Test"));
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
etk_image_keep_aspect_set(ETK_IMAGE(images[0]), ETK_TRUE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_progress_bar_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_progress_bar_test.c 21 Jan 2006 11:08:04 -0000 1.3
+++ etk_progress_bar_test.c 11 Feb 2006 00:28:31 -0000 1.4
@@ -1,6 +1,53 @@
#include "etk_test.h"
-#include "config.h"
+#include "Ecore.h"
+
+static Ecore_Timer *_etk_test_progress_bar_timer = NULL;
+static Ecore_Timer *_etk_test_progress_bar_timer2 = NULL;
+
+static int _etk_test_progress_bar_update(void *data);
+static int _etk_test_progress_bar_update2(void *data);
+
+/* Creates the window for the progress bar test */
+void etk_test_progress_bar_window_create(void *data)
+{
+ static Etk_Widget *win;
+ Etk_Widget *vbox;
+ Etk_Widget *pbar;
+ Etk_Widget *pbar2;
+
+ etk_init();
+
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
+
+ win = etk_window_new();
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Progress Bar Test"));
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+
+ vbox = etk_vbox_new(ETK_TRUE, 5);
+ etk_container_add(ETK_CONTAINER(win), vbox);
+
+ pbar = etk_progress_bar_new_with_text(_("0% done"));
+ etk_box_pack_start(ETK_BOX(vbox), pbar, ETK_TRUE, ETK_TRUE, 0);
+
+ pbar2 = etk_progress_bar_new_with_text(_("Loading..."));
+ etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(pbar2), 0.015);
+ etk_box_pack_start(ETK_BOX(vbox), pbar2, ETK_TRUE, ETK_TRUE, 0);
+
+ etk_widget_show_all(win);
+
+ _etk_test_progress_bar_timer = ecore_timer_add(0.05,
_etk_test_progress_bar_update, pbar);
+ _etk_test_progress_bar_timer2 = ecore_timer_add(0.025,
_etk_test_progress_bar_update2, pbar2);
+
+ etk_signal_connect_swapped("destroyed", ETK_OBJECT(pbar),
ETK_CALLBACK(ecore_timer_del), _etk_test_progress_bar_timer);
+ etk_signal_connect_swapped("destroyed", ETK_OBJECT(pbar2),
ETK_CALLBACK(ecore_timer_del), _etk_test_progress_bar_timer2);
+}
+
+/* Updates the first progress bar */
int _etk_test_progress_bar_update(void *data)
{
Etk_Widget *pbar;
@@ -12,16 +59,17 @@
fraction = etk_progress_bar_fraction_get(ETK_PROGRESS_BAR(pbar));
fraction += 0.01;
- if(fraction > 1.0)
- fraction = 0.0;
+ if (fraction > 1.0)
+ fraction = 0.0;
- snprintf(text, sizeof(text), "%.0f%% done", fraction * 100.0);
+ snprintf(text, sizeof(text), "%d%% done", (int)(fraction * 100.0));
etk_progress_bar_text_set(ETK_PROGRESS_BAR(pbar), text);
etk_progress_bar_fraction_set(ETK_PROGRESS_BAR(pbar), fraction);
return 1;
}
+/* Updates the second progress bar */
int _etk_test_progress_bar_update2(void *data)
{
Etk_Widget *pbar;
@@ -31,31 +79,3 @@
return 1;
}
-
-void etk_test_progress_bar_window_create(void *data)
-{
- Etk_Widget *win;
- Etk_Widget *vbox;
- Etk_Widget *pbar;
- Etk_Widget *pbar2;
-
- etk_init();
-
- win = etk_window_new();
-
- vbox = etk_vbox_new(ETK_TRUE, 5);
- etk_container_add(ETK_CONTAINER(win), vbox);
-
- pbar = etk_progress_bar_new_with_text(_("1% done"));
- etk_box_pack_start(ETK_BOX(vbox), pbar, ETK_TRUE, ETK_TRUE, 0);
-
- pbar2 = etk_progress_bar_new_with_text(_("Loading..."));
- etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(pbar2), 0.015);
- etk_box_pack_start(ETK_BOX(vbox), pbar2, ETK_TRUE, ETK_TRUE, 0);
-
- etk_window_title_set(ETK_WINDOW(win), _("Etk Progress Bar Test"));
- etk_widget_show_all(win);
-
- ecore_timer_add(0.05, _etk_test_progress_bar_update, pbar);
- ecore_timer_add(0.025, _etk_test_progress_bar_update2, pbar2);
-}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_test.c 8 Feb 2006 12:49:38 -0000 1.13
+++ etk_test.c 11 Feb 2006 00:28:31 -0000 1.14
@@ -68,7 +68,7 @@
{
"X Drag / Drop",
etk_test_xdnd_window_create
- }
+ }
};
static int num_tests = sizeof(tests) / sizeof (tests[0]);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_tree_test.c 22 Jan 2006 16:31:57 -0000 1.21
+++ etk_tree_test.c 11 Feb 2006 00:28:31 -0000 1.22
@@ -58,19 +58,19 @@
etk_tree_col_expand_set(col1, ETK_TRUE);
col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_double_new(ETK_TREE(tree)), 60);
col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60);
- col4 = etk_tree_col_new(ETK_TREE(tree), _("Column 4"),
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
+ //col4 = etk_tree_col_new(ETK_TREE(tree), _("Column 4"),
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
etk_tree_build(ETK_TREE(tree));
- etk_signal_connect("cell_value_changed", ETK_OBJECT(col4),
ETK_CALLBACK(_etk_test_tree_checkbox_toggled_cb), NULL);
+ //etk_signal_connect("cell_value_changed", ETK_OBJECT(col4),
ETK_CALLBACK(_etk_test_tree_checkbox_toggled_cb), NULL);
etk_tree_freeze(ETK_TREE(tree));
for (i = 0; i < 1000; i++)
{
row = etk_tree_append(ETK_TREE(tree), col1, etk_theme_icon_theme_get(),
"places/user-home_16", _("Row1"),
- col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", col4,
ETK_FALSE, NULL);
+ col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", /*col4,
ETK_FALSE,*/ NULL);
row = etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"places/folder_16", _("Row2"),
- col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", col4,
ETK_FALSE, NULL);
+ col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", /*col4,
ETK_FALSE,*/ NULL);
etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"mimetypes/text-x-generic_16", _("Row3"),
- col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", col4,
ETK_TRUE, NULL);
+ col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", /*col4,
ETK_TRUE,*/ NULL);
}
etk_tree_thaw(ETK_TREE(tree));
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
