Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests/mvc
Modified Files:
ewl_mvc.c
Log Message:
Add model data to selections to make selections easier to work with.
Initial framework for tree based filelist, non-functional so far.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/mvc/ewl_mvc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_mvc.c 4 Jan 2007 05:09:43 -0000 1.5
+++ ewl_mvc.c 18 Jan 2007 10:24:58 -0000 1.6
@@ -90,7 +90,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -119,10 +119,10 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, 6, 8);
- ewl_mvc_selected_add(m, 3, 0);
- ewl_mvc_selected_add(m, 9, 1);
- ewl_mvc_selected_add(m, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
idx = ewl_mvc_selected_get(m);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -150,7 +150,7 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_INDEX)
@@ -179,7 +179,7 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
idx = ecore_list_goto_first(m->selected);
if (idx->sel.type != EWL_SELECTION_TYPE_RANGE)
@@ -214,11 +214,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, 6, 8);
- ewl_mvc_selected_add(m, 3, 0);
- ewl_mvc_selected_add(m, 9, 1);
- ewl_mvc_selected_add(m, 1, 2);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
count = ewl_mvc_selected_count_get(m);
if (count != expected)
@@ -240,9 +240,9 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, 6, 8);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- if (!ewl_mvc_selected_is(m, 6, 8))
+ if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
{
snprintf(buf, len, "Not selected");
return FALSE;
@@ -260,9 +260,9 @@
t = ewl_tree2_new();
m = EWL_MVC(t);
- ewl_mvc_selected_set(m, 6, 8);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
- if (ewl_mvc_selected_is(m, 7, 7))
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 7, 7))
{
snprintf(buf, len, "Item selected");
return FALSE;
@@ -281,9 +281,9 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- if (!ewl_mvc_selected_is(m, 4, 5))
+ if (!ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
{
snprintf(buf, len, "Not selected");
return FALSE;
@@ -302,9 +302,9 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- if (ewl_mvc_selected_is(m, 1, 1))
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
snprintf(buf, len, "Item selected selected");
return FALSE;
@@ -323,11 +323,11 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, 6, 8);
- ewl_mvc_selected_add(m, 3, 0);
- ewl_mvc_selected_add(m, 9, 1);
- ewl_mvc_selected_add(m, 1, 2);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
ewl_mvc_selected_clear(m);
if (ewl_mvc_selected_count_get(m) != 0)
@@ -349,14 +349,14 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, 6, 8);
- ewl_mvc_selected_add(m, 3, 0);
- ewl_mvc_selected_add(m, 9, 1);
- ewl_mvc_selected_add(m, 1, 2);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 9, 1);
- if (ewl_mvc_selected_is(m, 9, 1))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 9, 1);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 9, 1))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -375,14 +375,14 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_set(m, 6, 8);
- ewl_mvc_selected_add(m, 3, 0);
- ewl_mvc_selected_add(m, 9, 1);
- ewl_mvc_selected_add(m, 1, 2);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_set(m, ewl_mvc_data_get(m), 6, 8);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 3, 0);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 9, 1);
+ ewl_mvc_selected_add(m, ewl_mvc_data_get(m), 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 10, 2);
- if (ewl_mvc_selected_is(m, 10, 2))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 10, 2);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 10, 2))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -402,10 +402,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 1, 1, 2, 1);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 2, 1);
- ewl_mvc_selected_rm(m, 2, 1);
- if (ewl_mvc_selected_is(m, 2, 1))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 2, 1);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 2, 1))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -437,10 +437,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 1, 1, 2, 1);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 2, 1);
- ewl_mvc_selected_rm(m, 1, 1);
- if (ewl_mvc_selected_is(m, 1, 1))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -472,10 +472,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 1, 1, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 1, 2);
- ewl_mvc_selected_rm(m, 1, 1);
- if (ewl_mvc_selected_is(m, 1, 1))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 1);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 1))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -507,10 +507,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 1, 1, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 1, 1, 1, 2);
- ewl_mvc_selected_rm(m, 1, 2);
- if (ewl_mvc_selected_is(m, 1, 2))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -542,10 +542,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 1, 2);
- if (ewl_mvc_selected_is(m, 1, 2))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 2);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 2))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -581,10 +581,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 6, 8);
- if (ewl_mvc_selected_is(m, 6, 8))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 8);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 8))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -620,10 +620,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 4, 5);
- if (ewl_mvc_selected_is(m, 4, 5))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 5);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 5))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -670,10 +670,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 4, 2);
- if (ewl_mvc_selected_is(m, 4, 2))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 4, 2);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 4, 2))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -715,10 +715,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 3, 8);
- if (ewl_mvc_selected_is(m, 3, 8))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 3, 8);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 3, 8))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -760,10 +760,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 1, 5);
- if (ewl_mvc_selected_is(m, 1, 5))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 1, 5);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 1, 5))
{
snprintf(buf, len, "Index still selected");
return FALSE;
@@ -805,10 +805,10 @@
m = EWL_MVC(t);
ewl_mvc_selection_mode_set(m, EWL_SELECTION_MODE_MULTI);
- ewl_mvc_selected_range_add(m, 6, 8, 1, 2);
+ ewl_mvc_selected_range_add(m, ewl_mvc_data_get(m), 6, 8, 1, 2);
- ewl_mvc_selected_rm(m, 6, 3);
- if (ewl_mvc_selected_is(m, 6, 3))
+ ewl_mvc_selected_rm(m, ewl_mvc_data_get(m), 6, 3);
+ if (ewl_mvc_selected_is(m, ewl_mvc_data_get(m), 6, 3))
{
snprintf(buf, len, "Index still selected");
return FALSE;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
