E CVS: libs/ewl titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
scroll.edc
Log Message:
Fix the inset of the scrollpane.
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/scroll.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- scroll.edc 2 Jan 2007 05:23:40 - 1.1
+++ scroll.edc 2 Jan 2007 08:10:31 - 1.2
@@ -26,7 +26,10 @@
data
{
- item: inset 8;
+ item: inset/left 12;
+item: inset/top 12;
+item: inset/right 8;
+item: inset/bottom 8;
}
parts
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src/bin Modified Files: ephoto_gui.c Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ephoto_gui.c29 Dec 2006 12:17:46 - 1.14 +++ ephoto_gui.c2 Jan 2007 09:32:48 - 1.15 @@ -88,7 +88,7 @@ ewl_object_maximum_size_set(EWL_OBJECT(progress), 200, 20); ewl_widget_show(progress); - timer = ecore_timer_add(.3, destroy_boot, win); + timer = ecore_timer_add(.2, destroy_boot, win); ewl_main(); } - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl titan
Enlightenment CVS committal Author : titan Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/libs/ewl/AUTHORS,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- AUTHORS 23 Jun 2006 20:23:03 - 1.14 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.15 @@ -5,7 +5,7 @@ Significant Contributors: Alexander 'chaos' Taylor [EMAIL PROTECTED] Vincent 'caro' Torri [EMAIL PROTECTED] - Stephen 'LinuxTitan/titansoccer15' Houston [EMAIL PROTECTED] + Stephen 'UnixTitan' Houston [EMAIL PROTECTED] Peter 'pfritz' Wehrfritz [EMAIL PROTECTED] Testers and Debuggers: - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- AUTHORS 11 Nov 2006 21:21:26 - 1.31 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.32 @@ -13,5 +13,5 @@ Stafford Horne [EMAIL PROTECTED] Cedric Bail [EMAIL PROTECTED] onefang (David Seikel) [EMAIL PROTECTED] -LinuxTitan (Stephen Houston) [EMAIL PROTECTED] +UnixTitan (Stephen Houston) [EMAIL PROTECTED] Byron Hillis [EMAIL PROTECTED] - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/empower Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/empower/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 18 Dec 2006 04:43:10 - 1.4 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.5 @@ -1,3 +1,3 @@ Mekius_ (Nick Hughart) [EMAIL PROTECTED] CodeWarrior (Hisham Mardam Bey) [EMAIL PROTECTED] -LinuxTitan (Stephen Houston) [EMAIL PROTECTED] +UnixTitan (Stephen Houston) [EMAIL PROTECTED] - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/proto/ephoto/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- AUTHORS 6 Oct 2006 21:45:16 - 1.6 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.7 @@ -6,4 +6,4 @@ / /__/ /__/ /__/ /___//_//___/ ===Project Manager/Lead Developer=== -Stephen LinuxTitan Houston [EMAIL PROTECTED] +Stephen UnixTitan Houston [EMAIL PROTECTED] - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_tree2_test.c
Log Message:
* [Tree2] Emit the row_clicked signal when a row is clicked
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree2_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_tree2_test.c10 Dec 2006 12:53:53 - 1.3
+++ etk_tree2_test.c2 Jan 2007 11:24:03 - 1.4
@@ -4,14 +4,19 @@
#include config.h
static void _etk_test_tree2_key_down_cb(Etk_Object *object, Etk_Event_Key_Down
*event, void *data);
+static void _etk_test_tree2_row_clicked_cb(Etk_Object *object, Etk_Tree2_Row
*row, Etk_Event_Mouse_Up *event, void *data);
/* Creates the window for the tree test */
void etk_test_tree2_window_create(void *data)
{
static Etk_Widget *win = NULL;
+ Etk_Widget *vbox;
Etk_Widget *tree;
Etk_Tree2_Col *col1, *col2, *col3, *col4;
Etk_Tree2_Row *row;
+ Etk_Widget *statusbar;
+ Etk_Widget *alignment;
+ char row_name[128];
int i;
if (win)
@@ -20,36 +25,60 @@
return;
}
+ /* Create the window and the vbox where the widgets will be packed into */
win = etk_window_new();
- etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_window_title_set(ETK_WINDOW(win), Etk Tree Test);
etk_window_resize(ETK_WINDOW(win), 440, 500);
etk_signal_connect(delete_event, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(win), vbox);
+
+ /* TODO: we shouldn't be obliged to create an alignement to do that... */
+ alignment = etk_alignment_new(0.5, 0.5, 1.0, 1.0);
+ etk_container_border_width_set(ETK_CONTAINER(alignment), 5);
+ etk_box_append(ETK_BOX(vbox), alignment, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+
+ /* Create the tree widget */
tree = etk_tree2_new();
- etk_container_add(ETK_CONTAINER(win), tree);
- etk_signal_connect(key_down, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree2_key_down_cb), NULL);
-
etk_tree2_mode_set(ETK_TREE2(tree), ETK_TREE2_MODE_TREE);
etk_tree2_multiple_select_set(ETK_TREE2(tree), ETK_TRUE);
+ etk_container_add(ETK_CONTAINER(alignment), tree);
+
+ /* We first create the columns of the tree, and then we build the tree
with etk_tree2_build() */
col1 = etk_tree2_col_new(ETK_TREE2(tree), Column 1,
etk_tree2_model_icon_text_new(ETK_TREE2(tree), ETK_TREE_FROM_EDJE), 90);
col2 = etk_tree2_col_new(ETK_TREE2(tree), Column 2,
etk_tree2_model_double_new(ETK_TREE2(tree)), 60);
col3 = etk_tree2_col_new(ETK_TREE2(tree), Column 3,
etk_tree2_model_image_new(ETK_TREE2(tree), ETK_TREE_FROM_FILE), 60);
col4 = etk_tree2_col_new(ETK_TREE2(tree), Column 4,
etk_tree2_model_checkbox_new(ETK_TREE2(tree)), 90);
etk_tree2_build(ETK_TREE2(tree));
+ /* Then we add the rows to the tree. etk_tree2_freeze/thaw() is used to
improve the speed when you insert a lot
+* of rows. It's not really useful here since we insert only 150 rows */
etk_tree2_freeze(ETK_TREE2(tree));
for (i = 0; i 50; i++)
{
- row = etk_tree2_row_append(ETK_TREE2(tree), NULL, col1,
etk_theme_icon_get(), places/user-home_16, Row1,
+ sprintf(row_name, Row %d, (i * 3) + 1);
+ row = etk_tree2_row_append(ETK_TREE2(tree), NULL, col1,
etk_theme_icon_get(), places/user-home_16, row_name,
col2, 10.0, col3, PACKAGE_DATA_DIR /images/1star.png, col4,
ETK_FALSE, NULL);
- row = etk_tree2_row_append(ETK_TREE2(tree), row, col1,
etk_theme_icon_get(), places/folder_16, Row2,
+
+ sprintf(row_name, Row %d, (i * 3) + 2);
+ row = etk_tree2_row_append(ETK_TREE2(tree), row, col1,
etk_theme_icon_get(), places/folder_16, row_name,
col2, 20.0, col3, PACKAGE_DATA_DIR /images/2stars.png, col4,
ETK_TRUE, NULL);
- etk_tree2_row_append(ETK_TREE2(tree), row, col1, etk_theme_icon_get(),
mimetypes/text-x-generic_16, Row3,
+
+ sprintf(row_name, Row %d, (i * 3) + 3);
+ etk_tree2_row_append(ETK_TREE2(tree), row, col1, etk_theme_icon_get(),
mimetypes/text-x-generic_16, row_name,
col2, 30.0, col3, PACKAGE_DATA_DIR /images/3stars.png, col4,
ETK_TRUE, NULL);
}
etk_tree2_thaw(ETK_TREE2(tree));
+ /* Finally we create the statusbar used to display the events on the tree */
+ statusbar = etk_statusbar_new();
+ etk_box_append(ETK_BOX(vbox), statusbar, ETK_BOX_START, ETK_BOX_FILL, 0);
+
+
+ etk_signal_connect(key_down, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree2_key_down_cb), NULL);
+ etk_signal_connect(row_clicked, ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree2_row_clicked_cb), statusbar);
+
etk_widget_show_all(win);
}
@@ -77,4 +106,28 @@
etk_signal_stop();
}
+}
+
+/* Called when a row of the tree is clicked: we display the clicked
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_tree2.c
Log Message:
* [Tree2] Emit the row_clicked signal when a row is clicked
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_tree2.c 26 Dec 2006 14:51:23 - 1.4
+++ etk_tree2.c 2 Jan 2007 11:24:03 - 1.5
@@ -2430,6 +2430,12 @@
* to allow the user to drag and drop several rows. The selection will be
done on key-up */
if (!row_object-row-selected || event.modifiers != ETK_MODIFIER_NONE)
_etk_tree2_row_select(row_object-row-tree, row_object-row,
event.modifiers);
+
+ if (event.flags != ETK_MOUSE_NONE)
+ {
+ etk_signal_emit(_etk_tree2_signals[ETK_TREE2_ROW_CLICKED_SIGNAL],
ETK_OBJECT(row_object-row-tree),
+ NULL, row_object-row, event);
+ }
}
/* Called when the background of a row is released by the mouse */
@@ -2437,13 +2443,26 @@
{
Etk_Tree2_Row_Object *row_object;
Etk_Event_Mouse_Up event;
+ int x, y, w, h;
if (!(row_object = data) || !row_object-row)
return;
+ evas_object_geometry_get(obj, x, y, w, h);
etk_event_mouse_up_wrap(ETK_WIDGET(row_object-row-tree), event_info,
event);
- if (row_object-row-selected event.modifiers == ETK_MODIFIER_NONE)
- _etk_tree2_row_select(row_object-row-tree, row_object-row,
ETK_MODIFIER_NONE);
+
+ /* We make sure the mouse button has been released over the row */
+ if (ETK_INSIDE(event.canvas.x, event.canvas.y, x, y, w, h))
+ {
+ if (row_object-row-selected event.modifiers == ETK_MODIFIER_NONE)
+ _etk_tree2_row_select(row_object-row-tree, row_object-row,
ETK_MODIFIER_NONE);
+
+ if (event.flags == ETK_MOUSE_NONE)
+ {
+ etk_signal_emit(_etk_tree2_signals[ETK_TREE2_ROW_CLICKED_SIGNAL],
ETK_OBJECT(row_object-row-tree),
+NULL, row_object-row, event);
+ }
+ }
}
/* Called when the expander of a row is released by the mouse */
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
scroll.edc text.edc
Log Message:
- remove unneeded quotes
- make the inset on the scrollpane 10 for left/top
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/scroll.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- scroll.edc 2 Jan 2007 08:10:31 - 1.2
+++ scroll.edc 2 Jan 2007 15:03:43 - 1.3
@@ -26,10 +26,9 @@
data
{
- item: inset/left 12;
-item: inset/top 12;
-item: inset/right 8;
-item: inset/bottom 8;
+item: inset 10;
+ item: inset/bottom 8;
+ item: inset/right 8;
}
parts
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/text.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- text.edc2 Jan 2007 05:23:40 - 1.1
+++ text.edc2 Jan 2007 15:03:43 - 1.2
@@ -12,8 +12,8 @@
data
{
- item: inset 2;
- item: inset/left 6;
+ item: inset 2;
+ item: inset/left 6;
}
parts
@@ -134,8 +134,8 @@
data
{
- item: pad 0;
- item: pad/top 4;
+ item: pad 0;
+ item: pad/top 4;
}
parts
@@ -206,8 +206,8 @@
name: ewl/entry/selection;
data
{
- item: pad/top 4;
- item: pad/bottom 4;
+ item: pad/top 4;
+ item: pad/bottom 4;
}
parts
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
combo.edc
Log Message:
- set a minimum size on the combo
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/combo.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- combo.edc 2 Jan 2007 05:23:40 - 1.1
+++ combo.edc 2 Jan 2007 15:07:35 - 1.2
@@ -10,6 +10,7 @@
group
{
name: ewl/combo;
+ min: 1 28;
data
{
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
combo.edc
Log Message:
- add some slight insets to the combo
- set min size on the combo button
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/combo.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- combo.edc 2 Jan 2007 15:07:35 - 1.2
+++ combo.edc 2 Jan 2007 15:19:15 - 1.3
@@ -57,12 +57,15 @@
item: pad 0;
item: pad/left 4;
item: inset 0;
+ item: inset/top 4;
+ item: inset/bottom 2;
}
}
group
{
name: ewl/combo/increment;
+ min: 24 24;
max: 24 24;
data
@@ -224,6 +227,7 @@
group
{
name: ewl/combo/decrement;
+ min: 24 24;
max: 24 24;
data
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c ewl_widget.h
Log Message:
- update some const settings
- rename widget-bit_* to widget-theme_*
- add some comments
- remove duplicate evas calls. the same calls are done in the caching code
as well.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- ewl_widget.c29 Dec 2006 19:16:38 - 1.111
+++ ewl_widget.c2 Jan 2007 16:16:31 - 1.112
@@ -13,7 +13,7 @@
static void ewl_widget_theme_insets_get(Ewl_Widget *w, int *l, int *r,
int *t, int *b);
static void ewl_widget_appearance_part_text_apply(Ewl_Widget *w,
- const char *part, char *text);
+ const char *part, const char
*text);
static void ewl_widget_layer_stack_add(Ewl_Widget *w);
static void ewl_widget_layer_update(Ewl_Widget *w);
static Evas_Object *ewl_widget_layer_neighbor_find_above(Ewl_Widget *w);
@@ -219,11 +219,13 @@
*/
if (w-parent !REALIZED(w-parent))
ewl_widget_realize(w-parent);
+
else if (w-parent || ewl_object_toplevel_get(EWL_OBJECT(w))) {
ewl_object_queued_add(EWL_OBJECT(w), EWL_FLAG_QUEUED_RPROCESS);
ewl_callback_call(w, EWL_CALLBACK_REALIZE);
ewl_object_queued_remove(EWL_OBJECT(w),
EWL_FLAG_QUEUED_RPROCESS);
+
ewl_object_visible_add(EWL_OBJECT(w),
EWL_FLAG_VISIBLE_REALIZED);
ewl_widget_obscure(w);
@@ -289,9 +291,8 @@
ewl_object_visible_remove(EWL_OBJECT(w), EWL_FLAG_VISIBLE_OBSCURED);
emb = ewl_embed_widget_find(w);
- if (emb emb-evas) {
+ if (emb emb-evas)
ewl_callback_call(w, EWL_CALLBACK_REVEAL);
- }
ewl_widget_configure(w);
@@ -603,7 +604,7 @@
* update callback to initiate the change.
*/
void
-ewl_widget_appearance_set(Ewl_Widget *w, char *appearance)
+ewl_widget_appearance_set(Ewl_Widget *w, const char *appearance)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w, w);
@@ -728,7 +729,7 @@
* reference cached for later re-use.
*/
if (flag == EWL_STATE_PERSISTENT)
- w-bit_state = ecore_string_instance((char *)state);
+ w-theme_state = ecore_string_instance((char *)state);
if (w-theme_object) {
if (ewl_config_cache.print_signals)
@@ -831,7 +832,7 @@
* Changes the text of a given Edje-define TEXT part.
*/
static void
-ewl_widget_appearance_part_text_apply(Ewl_Widget *w, const char *part, char
*text)
+ewl_widget_appearance_part_text_apply(Ewl_Widget *w, const char *part, const
char *text)
{
Evas_Coord nw, nh;
@@ -866,7 +867,7 @@
* is reloaded for this widget.
*/
void
-ewl_widget_appearance_part_text_set(Ewl_Widget *w, char *part, char *text)
+ewl_widget_appearance_part_text_set(Ewl_Widget *w, const char *part, const
char *text)
{
int i;
Ewl_Pair *match = NULL;
@@ -952,7 +953,7 @@
* each of those text parts to be retrieved independently.
*/
char *
-ewl_widget_appearance_part_text_get(Ewl_Widget *w, char *part)
+ewl_widget_appearance_part_text_get(Ewl_Widget *w, const char *part)
{
int i;
Ewl_Pair *match = NULL;
@@ -998,7 +999,7 @@
* is reloaded for this widget.
*/
void
-ewl_widget_appearance_text_set(Ewl_Widget *w, char *text)
+ewl_widget_appearance_text_set(Ewl_Widget *w, const char *text)
{
char *part;
@@ -1564,7 +1565,7 @@
* @brief Appends the given inheritance to this widgets inheritance string.
*/
void
-ewl_widget_inherit(Ewl_Widget *widget, char *inherit)
+ewl_widget_inherit(Ewl_Widget *widget, const char *inherit)
{
int len;
char *tmp = NULL;
@@ -2113,9 +2114,9 @@
w-inheritance = NULL;
}
- if (w-bit_state) {
- ecore_string_release(w-bit_state);
- w-bit_state = NULL;
+ if (w-theme_state) {
+ ecore_string_release(w-theme_state);
+ w-theme_state = NULL;
}
if (w-theme_text.list) {
@@ -2271,25 +2272,23 @@
/*
* No object allocated yet for this widget
*/
- if (!w-theme_object w-bit_path w-bit_group) {
+ if (!w-theme_object w-theme_path w-theme_group) {
/*
* Attempt to load a cached object first, fallback to adding a
* new one.
*/
w-theme_object = ewl_embed_object_request(emb, edje);
- if (!w-theme_object) {
+ if (!w-theme_object)
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_embed.h Log Message: - formatting === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ewl_embed.h 7 Dec 2006 19:13:14 - 1.37 +++ ewl_embed.h 2 Jan 2007 17:01:44 - 1.38 @@ -111,10 +111,16 @@ voidewl_embed_mouse_move_feed(Ewl_Embed *embed, int x, int y, unsigned int modifiers); -const char *ewl_embed_dnd_position_feed(Ewl_Embed *embed, int x, int y,int*,int*,int*,int*); -const char *ewl_embed_dnd_drop_feed(Ewl_Embed* embed, int x, int y, int internal); -voidewl_embed_dnd_data_received_feed(Ewl_Embed* embed, char *type, void *data, unsigned int len, unsigned int format); -voidewl_embed_dnd_data_request_feed(Ewl_Embed* embed, void *handle, char *type); +const char *ewl_embed_dnd_position_feed(Ewl_Embed *embed, int x, int y, + int *, int *, int *, int *); +const char *ewl_embed_dnd_drop_feed(Ewl_Embed* embed, int x, int y, + int internal); +voidewl_embed_dnd_data_received_feed(Ewl_Embed* embed, char *type, + void *data, + unsigned int len, + unsigned int format); +voidewl_embed_dnd_data_request_feed(Ewl_Embed* embed, void *handle, + char *type); voidewl_embed_mouse_out_feed(Ewl_Embed *embed, int x, int y, unsigned int modifiers); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_combo.c Log Message: - use signals instead of separate groups to change the button appearance on the combo widget === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- ewl_combo.c 7 Dec 2006 20:04:32 - 1.41 +++ ewl_combo.c 2 Jan 2007 17:02:17 - 1.42 @@ -53,7 +53,6 @@ combo-button = ewl_button_new(); ewl_container_child_append(EWL_CONTAINER(combo), combo-button); - ewl_widget_appearance_set(combo-button, decrement); ewl_widget_internal_set(combo-button, TRUE); ewl_object_alignment_set(EWL_OBJECT(combo-button), EWL_FLAG_ALIGN_RIGHT); @@ -171,13 +170,13 @@ /* XXX put checks to make sure all the needed module and view * function callbacks are setup */ - /* change the button appearance and expand the menu */ - ewl_widget_appearance_set(combo-button, increment); - ewl_widget_show(combo-popup); ewl_window_raise(EWL_WINDOW(combo-popup)); ewl_widget_focus_send(EWL_WIDGET(combo-popup)); + ewl_widget_state_set(combo-button, expanded, + EWL_STATE_PERSISTENT); + if (!ewl_mvc_dirty_get(EWL_MVC(combo))) DRETURN(DLEVEL_STABLE); @@ -226,7 +225,8 @@ combo = EWL_COMBO(data); ewl_widget_hide(combo-popup); - ewl_widget_appearance_set(combo-button, decrement); + ewl_widget_state_set(combo-button, collapsed, + EWL_STATE_PERSISTENT); } DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -256,7 +256,8 @@ ewl_mvc_selected_set(EWL_MVC(combo), i, -1); ewl_widget_hide(combo-popup); - ewl_widget_appearance_set(combo-button, decrement); + ewl_widget_state_set(combo-button, collapsed, + EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - use signals instead of separate groups to change the button appearance on the combo widget === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e17.edc 2 Jan 2007 05:23:40 - 1.9 +++ e17.edc 2 Jan 2007 17:02:17 - 1.10 @@ -46,8 +46,7 @@ item: /combo/cell/group ewl/combo/contents; item: /combo/popup/group ewl/menu; item: /combo/popup/vbox/cell/group ewl/combo/popup/contents; - item: /combo/decrement/group ewl/combo/decrement; - item: /combo/increment/group ewl/combo/increment; + item: /combo/button/group ewl/combo/button; /* entry/text related groups */ item: /entry/group ewl/entry; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
combo.edc
Log Message:
- use signals instead of separate groups to change the button appearance on
the combo widget
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/combo.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- combo.edc 2 Jan 2007 15:19:15 - 1.3
+++ combo.edc 2 Jan 2007 17:02:17 - 1.4
@@ -64,13 +64,14 @@
group
{
- name: ewl/combo/increment;
+ name: ewl/combo/button;
min: 24 24;
max: 24 24;
data
{
item: pad 0;
+ item: pad/right 4;
item: inset 0;
item: inset/top 3;
item: inset/bottom 3;
@@ -172,13 +173,22 @@
}
image
{
- normal: e17_button_detail_up.png;
+ normal: e17_button_detail_down.png;
}
fill
{
smooth: 0;
}
}
+ description
+ {
+ state: expanded 0.0;
+ inherit: default 0.0;
+ image
+ {
+ normal: e17_button_detail_up.png;
+ }
+ }
}
}
@@ -221,166 +231,23 @@
target: button_image;
target: button_image;
}
- }
-}
-
-group
-{
- name: ewl/combo/decrement;
- min: 24 24;
- max: 24 24;
-
- data
- {
- item: pad 0;
- item: pad/right 4;
- item: inset/top 3;
- item: inset/bottom 3;
- }
-
- parts
- {
- part
- {
- name: button_image;
- type: IMAGE;
- mouse_events: 1;
-
- description
- {
- state: default 0.0;
- min: 56 16;
-
- rel1
- {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2
- { relative: 1.0 1.0;
- offset: -1 -2;
- }
- image
- {
- normal: ewl_combo_button_sm.png;
- border: 8 8 8 8;
- }
- }
- description
- {
- state: clicked 0.0;
- inherit: default 0.0;
- image
- {
- normal: e17_button_sm2.png;
- }
- }
- description
- {
- state: disabled 0.0;
- inherit: default 0.0;
- visible: 0;
- }
- }
- part
- {
- name: button_image2;
- type: IMAGE;
- mouse_events: 1;
- description
- {
- state: default 0.0;
- visible: 0;
- rel1
- {
- to: button_image;
- }
- rel2
- {
- to: button_image;
- }
- image
- {
- normal: e17_button_sm_disabled.png;
- border: 8 8 8 8;
- }
- }
- description
- {
- state: disabled 0.0;
- inherit: default 0.0;
- visible: 1;
-
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
- use states instead of groups to change the arrow on the tree headers
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_tree2.c 17 Dec 2006 08:57:29 - 1.40
+++ ewl_tree2.c 2 Jan 2007 17:31:44 - 1.41
@@ -493,7 +493,6 @@
static void
ewl_tree2_header_build(Ewl_Tree2 *tree, Ewl_Tree2_Column *col, void *mvc_data,
int column)
{
- char *theme_str;
Ewl_Widget *h, *c;
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -518,17 +517,19 @@
/* display the sort arrow if needed */
if (col-model-sort)
{
+ char *state_str;
+
c = ewl_button_new();
ewl_container_child_append(EWL_CONTAINER(h), c);
if (col-sort == EWL_SORT_DIRECTION_ASCENDING)
- theme_str = ascending;
+ state_str = ascending;
else if (col-sort == EWL_SORT_DIRECTION_DESCENDING)
- theme_str = descending;
+ state_str = descending;
else
- theme_str = blank;
+ state_str = default;
- ewl_widget_appearance_set(c, theme_str);
+ ewl_widget_state_set(c, state_str, EWL_STATE_PERSISTENT);
ewl_widget_internal_set(c, TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(c), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(c), EWL_FLAG_ALIGN_RIGHT);
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - use states instead of groups to change the arrow on the tree headers === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e17.edc 2 Jan 2007 17:02:17 - 1.10 +++ e17.edc 2 Jan 2007 17:31:44 - 1.11 @@ -127,10 +127,7 @@ item: /tree_header/group ewl/tree/header; item: /tree_header/button/group ewl/tree/header/button; item: /tree_header/grabber/vertical/group ewl/separator/vertical; - - item: /tree_header/header/ascending/body/group ewl/tree/header/ascending; - item: /tree_header/header/descending/body/group ewl/tree/header/descending; - item: /tree_header/header/blank/body/group ewl/tree/header/normal; + item: /tree_header/header/button/group ewl/tree/header/button; item: /row/group ewl/row; item: /node/check/group ewl/tree/expansion; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
tree.edc
Log Message:
- use states instead of groups to change the arrow on the tree headers
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- tree.edc2 Jan 2007 05:23:40 - 1.1
+++ tree.edc2 Jan 2007 17:31:44 - 1.2
@@ -162,11 +162,6 @@
group
{
name: ewl/tree/header/button;
-}
-
-group
-{
- name: ewl/tree/header/ascending;
min: 16 16;
parts
@@ -179,7 +174,7 @@
{
state: default 0.0;
min: 16 16;
-
+ visible: 0;
image
{
normal: e17_button_detail_down.png;
@@ -189,38 +184,57 @@
smooth: 0;
}
}
- }
- }
-}
-
-group
-{
- name: ewl/tree/header/descending;
- min: 16 16;
-
- parts
- {
- part
- {
- name: arrow;
- mouse_events: 0;
description
{
- state: default 0.0;
- min: 16 16;
-
+ state: ascending 0.0;
+ inherit: default 0.0;
+ visible: 1;
+ }
+ description
+ {
+ state: descending 0.0;
+ inherit: default 0.0;
+ visible: 1;
image
{
normal: e17_button_detail_up.png;
}
- fill
- {
- smooth: 0;
- }
}
}
}
+ programs
+ {
+ program
+ {
+ name: ascending;
+ signal: ascending;
+ source: EWL;
+ action: STATE_SET ascending 0.0;
+ target: arrow;
+ transition: LINEAR 0.0;
+ }
+ program
+ {
+ name: descending;
+ signal: descending;
+ source: EWL;
+ action: STATE_SET descending 0.0;
+ target: arrow;
+ transition: LINEAR 0.0;
+ }
+ program
+ {
+ name: default;
+ signal: default;
+ source: EWL;
+ action: STATE_SET default 0.0;
+ target: arrow;
+ transition: LINEAR 0.0;
+ }
+
+ }
}
+
group
{
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl titan
Enlightenment CVS committal Author : titan Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/images Modified Files: Makefile.am Added Files: e17_icon_down_arrow.png e17_icon_right_arrow.png Log Message: Add a different image for tree nodes. === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/images/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 2 Jan 2007 05:23:40 - 1.3 +++ Makefile.am 2 Jan 2007 18:00:25 - 1.4 @@ -13,6 +13,8 @@ e17_frame_outline.png \ e17_ibar_bg_v.png \ e17_ibar_over_v.png \ +e17_icon_down_arrow.png \ +e17_icon_right_arrow.png \ e17_ilist_bg0.png \ e17_ilist_bg1.png \ e17_menu_arrow.png \ - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
tree.edc
Log Message:
Add a different image for tree nodes.
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- tree.edc2 Jan 2007 17:31:44 - 1.2
+++ tree.edc2 Jan 2007 18:00:25 - 1.3
@@ -1,9 +1,10 @@
images
{
- image: e17_button_detail_right.png COMP;
image: e17_button_detail_up.png COMP;
image: e17_button_detail_down.png COMP;
image: e17_button_sm_disabled.png COMP;
+ image: e17_icon_right_arrow.png COMP;
+ image: e17_icon_down_arrow.png COMP;
}
group
@@ -13,27 +14,53 @@
{
part
{
+ name: base;
+ type: RECT;
+ mouse_events: 1;
+
+ description
+ {
+ state: default 0.0;
+ min: 12 12;
+
+ rel1
+ {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2
+ {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ color: 255 255 255 255;
+ }
+ }
+ part
+ {
name: expansion;
mouse_events: 1;
description
{
state: default 0.0;
- min: 12 12;
+ min: 5 5;
rel1
{
+ to: base;
relative: 0.5 0.5;
offset: 0 0;
}
rel2
{
+ to: base;
relative: 0.5 0.5;
offset: -1 -1;
}
image
{
- normal: e17_button_detail_right.png;
+ normal: e17_icon_right_arrow.png;
}
}
description
@@ -42,7 +69,7 @@
inherit: default 0.0;
image
{
- normal: e17_button_detail_down.png;
+ normal: e17_icon_down_arrow.png;
}
}
}
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
border.edc
Log Message:
Add an inset for the bottom of a border.
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/border.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- border.edc 2 Jan 2007 05:23:40 - 1.1
+++ border.edc 2 Jan 2007 18:32:34 - 1.2
@@ -12,7 +12,7 @@
data
{
item: inset 8;
- item: inset/bottom 0;
+ item: inset/bottom 5;
item: inset/top 0;
}
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
No need to track the drag, as it is assured to be deleted by the dnd code
after e_drag_start has been called.
===
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- e_mod_main.c30 Dec 2006 23:32:25 - 1.199
+++ e_mod_main.c2 Jan 2007 19:14:45 - 1.200
@@ -52,7 +52,6 @@
int xnum, ynum;
Evas_List *desks;
Pager_Popup *popup;
- E_Drag *drag;
unsigned chardragging : 1;
unsigned charjust_dragged : 1;
Evas_Coord dnd_x, dnd_y;
@@ -256,7 +255,6 @@
static void
_pager_free(Pager *p)
{
- if (p-drag) e_object_del(E_OBJECT(p-drag));
_pager_empty(p);
evas_object_del(p-o_table);
free(p);
@@ -476,9 +474,6 @@
{
if ((pw-drag.from_pager) (pw-desk-pager-dragging))
{
- if (pw-desk-pager-drag)
- e_object_del(E_OBJECT(pw-desk-pager-drag));
- pw-desk-pager-drag = NULL;
pw-desk-pager-dragging = 0;
}
if (pw-o_window) evas_object_del(pw-o_window);
@@ -824,9 +819,6 @@
{
if ((pw-drag.from_pager) (pw-desk-pager-dragging))
{
- if (pw-desk-pager-drag)
-e_object_del(E_OBJECT(pw-desk-pager-drag));
- pw-desk-pager-drag = NULL;
pw-desk-pager-dragging = 0;
}
evas_object_hide(pw-o_window);
@@ -1438,8 +1430,7 @@
drag =
e_drag_new(pw-desk-pager-inst-gcc-gadcon-zone-container,
x, y, drag_types, 1, pw, -1,
_pager_window_cb_drag_finished);
-pw-desk-pager-drag = drag;
-
+
o = edje_object_add(drag-evas);
edje_object_file_get(pw-o_window, file, part);
edje_object_file_set(o, file, part);
@@ -1474,7 +1465,6 @@
pw = drag-data;
if (!pw) return;
evas_object_show(pw-o_window);
- pw-desk-pager-drag = NULL;
if (!dropped)
{
/* wasn't dropped (on pager). move it to position of mouse on screen */
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: This is already 0 when dragging begins. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.200 retrieving revision 1.201 diff -u -3 -r1.200 -r1.201 --- e_mod_main.c2 Jan 2007 19:14:45 - 1.200 +++ e_mod_main.c2 Jan 2007 19:28:37 - 1.201 @@ -1508,7 +1508,6 @@ if (pw pw-drag.from_pager) pw-drag.from_pager-dragging = 0; pw-drag.from_pager = NULL; pw-drag.in_pager = 0; - pw-drag.start = 0; } static void - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: This is reset when dragging starts. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.201 retrieving revision 1.202 diff -u -3 -r1.201 -r1.202 --- e_mod_main.c2 Jan 2007 19:28:37 - 1.201 +++ e_mod_main.c2 Jan 2007 19:32:06 - 1.202 @@ -1507,7 +1507,6 @@ } if (pw pw-drag.from_pager) pw-drag.from_pager-dragging = 0; pw-drag.from_pager = NULL; - pw-drag.in_pager = 0; } static void - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Use config button value to test against.
===
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- e_mod_main.c2 Jan 2007 19:32:06 - 1.202
+++ e_mod_main.c2 Jan 2007 19:35:15 - 1.203
@@ -1688,7 +1688,7 @@
ev = event_info;
pd = data;
/* FIXME: pd-pager-dragging is 0 when finishing a drag from desk to desk
*/
- if ((ev-button == 1) (!pd-pager-dragging)
+ if ((ev-button == pager_config-btn_drag) (!pd-pager-dragging)
(!pd-pager-just_dragged))
{
e_desk_show(pd-desk);
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Formatting.
===
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- e_mod_main.c2 Jan 2007 19:35:15 - 1.203
+++ e_mod_main.c2 Jan 2007 19:37:11 - 1.204
@@ -1354,7 +1354,7 @@
pw = data;
if (!pw) return;
if ((ev-button == pager_config-btn_drag) ||
- (ev-button ==pager_config-btn_noplace))
+ (ev-button == pager_config-btn_noplace))
{
if (!pw-drag.from_pager)
{
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e manowarrior
Enlightenment CVS committal Author : manowarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: e17_icon_mouse.png e17_icon_transitions.png Log Message: a better Transitions icon === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_mouse.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsmsJmoQ and /tmp/cvsbBEBXr differ === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_transitions.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsAiiqbS and /tmp/cvsLhg9Mt differ - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e manowarrior
Enlightenment CVS committal Author : manowarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: e17_icon_mouse.png Log Message: oops.. sorry. === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_mouse.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsgx3bYV and /tmp/cvsc5yp9o differ - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
fill the icon name on mouse-in, to catch changed icons
===
RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_mod_main.c30 Dec 2006 23:32:25 - 1.78
+++ e_mod_main.c2 Jan 2007 20:55:12 - 1.79
@@ -90,6 +90,7 @@
static IBox_Icon *_ibox_icon_new(IBox *b, E_Border *bd);
static void _ibox_icon_free(IBox_Icon *ic);
static void _ibox_icon_fill(IBox_Icon *ic);
+static void _ibox_icon_fill_label(IBox_Icon *ic);
static void _ibox_icon_empty(IBox_Icon *ic);
static void _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src);
//static IBox *_ibox_zone_find(E_Zone *zone);
@@ -136,11 +137,11 @@
Evas_Coord x, y, w, h;
const char *drop[] = { enlightenment/border };
Config_Item *ci;
-
+
inst = E_NEW(Instance, 1);
ci = _ibox_config_item_get(id);
-
+
b = _ibox_new(gc-evas, gc-zone);
b-show_label = ci-show_label;
b-show_zone = ci-show_zone;
@@ -153,10 +154,10 @@
o = b-o_box;
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc-data = inst;
-
+
inst-gcc = gcc;
inst-o_ibox = o;
-
+
evas_object_geometry_get(o, x, y, w, h);
inst-drop_handler =
e_drop_handler_add(E_OBJECT(inst-gcc), inst,
@@ -175,7 +176,7 @@
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc-data;
ibox_config-instances = evas_list_remove(ibox_config-instances, inst);
e_drop_handler_del(inst-drop_handler);
@@ -187,7 +188,7 @@
_gc_orient(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc-data;
switch (gcc-gadcon-orient)
{
@@ -229,7 +230,7 @@
{
Evas_Object *o;
char buf[4096];
-
+
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), %s/module.edj,
e_module_dir_get(ibox_config-module));
@@ -246,7 +247,7 @@
_ibox_new(Evas *evas, E_Zone *zone)
{
IBox *b;
-
+
b = E_NEW(IBox, 1);
b-o_box = e_box_add(evas);
e_box_homogenous_set(b-o_box, 1);
@@ -272,7 +273,7 @@
{
Evas_Event_Mouse_Down *ev;
IBox *b;
-
+
ev = event_info;
b = data;
if (!ibox_config-menu)
@@ -315,7 +316,7 @@
if (!b-o_empty)
{
Evas_Coord w, h;
-
+
b-o_empty =
evas_object_rectangle_add(evas_object_evas_get(b-o_box));
evas_object_event_callback_add(b-o_empty,
EVAS_CALLBACK_MOUSE_DOWN, _ibox_cb_empty_mouse_down, b);
evas_object_color_set(b-o_empty, 0, 0, 0, 0);
@@ -349,7 +350,7 @@
E_Border_List *bl;
E_Border *bd;
int ok;
-
+
bl = e_container_border_list_first(b-zone-container);
while ((bd = e_container_border_list_next(bl)))
{
@@ -359,7 +360,7 @@
ok = 1;
}
else if((b-show_zone == 1) (bd-iconic))
- {
+ {
if ((b-show_desk == 0) (bd-zone == b-zone))
{
ok = 1;
@@ -372,14 +373,14 @@
}
if (ok)
- {
+ {
ic = _ibox_icon_new(b, bd);
-b-icons = evas_list_append(b-icons, ic);
-e_box_pack_end(b-o_box, ic-o_holder);
+b-icons = evas_list_append(b-icons, ic);
+e_box_pack_end(b-o_box, ic-o_holder);
}
}
e_container_border_list_free(bl);
-
+
_ibox_empty_handle(b);
_ibox_resize_handle(b);
}
@@ -408,7 +409,7 @@
Evas_List *l;
IBox_Icon *ic;
Evas_Coord w, h;
-
+
evas_object_geometry_get(b-o_box, NULL, NULL, w, h);
if (e_box_orientation_get(b-o_box))
w = h;
@@ -433,17 +434,17 @@
_ibox_instance_drop_zone_recalc(Instance *inst)
{
Evas_Coord x, y, w, h;
-
+
evas_object_geometry_get(inst-o_ibox, x, y, w, h);
e_drop_handler_geometry_set(inst-drop_handler, x, y, w, h);
-}
+}
static IBox_Icon *
_ibox_icon_find(IBox *b, E_Border *bd)
{
Evas_List *l;
IBox_Icon *ic;
-
+
for (l = b-icons; l; l = l-next)
{
ic = l-data;
@@ -458,7 +459,7 @@
{
Evas_List *l;
IBox_Icon *ic;
-
+
for (l = b-icons; l; l = l-next)
{
Evas_Coord dx, dy, dw, dh;
@@ -474,7 +475,7 @@
_ibox_icon_new(IBox *b, E_Border *bd)
{
IBox_Icon *ic;
-
+
ic = E_NEW(IBox_Icon, 1);
e_object_ref(E_OBJECT(bd));
ic-ibox = b;
@@ -490,14 +491,14 @@
evas_object_event_callback_add(ic-o_holder, EVAS_CALLBACK_MOVE,
_ibox_cb_icon_move, ic);
evas_object_event_callback_add(ic-o_holder, EVAS_CALLBACK_RESIZE,
_ibox_cb_icon_resize, ic);
evas_object_show(ic-o_holder);
-
+
ic-o_holder2 = edje_object_add(evas_object_evas_get(b-o_box));
e_theme_edje_object_set(ic-o_holder2, base/theme/modules/ibox,
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
scroll.edc tree.edc
Log Message:
- theme the bg of tree2 and remove the theme from the scrollpane in
tree2 makes the header look a lot better
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/scroll.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- scroll.edc 2 Jan 2007 15:03:43 - 1.3
+++ scroll.edc 2 Jan 2007 21:08:22 - 1.4
@@ -26,7 +26,7 @@
data
{
-item: inset 10;
+ item: inset 10;
item: inset/bottom 8;
item: inset/right 8;
}
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- tree.edc2 Jan 2007 18:00:25 - 1.3
+++ tree.edc2 Jan 2007 21:08:22 - 1.4
@@ -9,6 +9,79 @@
group
{
+ name: ewl/tree;
+
+ data
+ {
+ item: inset 2;
+ item: inset/bottom 0;
+ }
+
+ parts
+ {
+ part
+ {
+ name: bg;
+ mouse_events: 0;
+ description
+ {
+ state: default 0.0;
+ image
+ {
+ normal: e17_ibar_bg_v.png;
+ border: 7 7 7 7;
+ }
+ fill
+ {
+ smooth: 0;
+ }
+ }
+ }
+ part
+ {
+ name: overlay;
+ mouse_events: 0;
+ description
+ {
+ state: default 0.0;
+ rel1
+ {
+ to: bg;
+ }
+ rel2
+ {
+ to: bg;
+ }
+ image
+ {
+ normal: e17_ibar_over_v.png;
+ border: 13 13 13 13;
+ middle: 0;
+ }
+ fill
+ {
+ smooth: 0;
+ }
+ }
+ }
+ }
+}
+
+group
+{
+name: ewl/tree/scrollpane/background;
+
+data
+{
+ item: inset/top 0;
+ item: inset/bottom 8;
+ item: inset/right 8;
+ item: inset/left 10;
+}
+}
+
+group
+{
name: ewl/tree/expansion;
parts
{
@@ -153,7 +226,7 @@
data
{
item: pad 0;
- item: inset 0;
+ item: inset 4;
}
parts
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - theme the bg of tree2 and remove the theme from the scrollpane in tree2 makes the header look a lot better === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e17.edc 2 Jan 2007 17:31:44 - 1.11 +++ e17.edc 2 Jan 2007 21:08:21 - 1.12 @@ -124,6 +124,9 @@ item: /vtoolbar/vbox/icon/group ewl/toolbar/icon; /* tree groups */ + item: /tree2/group ewl/tree; + item: /tree2/vbox/scrollpane/group ewl/tree/scrollpane/background; + item: /tree_header/group ewl/tree/header; item: /tree_header/button/group ewl/tree/header/button; item: /tree_header/grabber/vertical/group ewl/separator/vertical; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
tree.edc
Log Message:
- set the insets on the vbox so that their picked up by both the scrolled
and plain view
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/tree.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- tree.edc2 Jan 2007 21:08:22 - 1.4
+++ tree.edc2 Jan 2007 21:15:22 - 1.5
@@ -70,14 +70,17 @@
group
{
name: ewl/tree/scrollpane/background;
+}
-data
-{
+group
+{
+ name: ewl/tree/vbox;
+ data
+ {
+ item: inset 10;
item: inset/top 0;
item: inset/bottom 8;
- item: inset/right 8;
- item: inset/left 10;
-}
+ }
}
group
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - set the insets on the vbox so that their picked up by both the scrolled and plain view === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e17.edc 2 Jan 2007 21:08:21 - 1.12 +++ e17.edc 2 Jan 2007 21:15:22 - 1.13 @@ -125,6 +125,7 @@ /* tree groups */ item: /tree2/group ewl/tree; + item: /tree2/vbox/group ewl/tree/vbox; item: /tree2/vbox/scrollpane/group ewl/tree/scrollpane/background; item: /tree_header/group ewl/tree/header; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - put the headers inside the white area on tree1 as well === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e17.edc 2 Jan 2007 21:15:22 - 1.13 +++ e17.edc 2 Jan 2007 21:23:54 - 1.14 @@ -124,6 +124,9 @@ item: /vtoolbar/vbox/icon/group ewl/toolbar/icon; /* tree groups */ + item: /tree/group ewl/tree; + item: /tree/scrollpane/group ewl/tree/vbox; + item: /tree2/group ewl/tree; item: /tree2/vbox/group ewl/tree/vbox; item: /tree2/vbox/scrollpane/group ewl/tree/scrollpane/background; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
button.edc
Log Message:
don't clip the button
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/button.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- button.edc 2 Jan 2007 05:23:40 - 1.1
+++ button.edc 2 Jan 2007 23:04:01 - 1.2
@@ -39,7 +39,7 @@
description
{
state: default 0.0;
- min: 56 16;
+ min: 16 16;
image
{
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_tree2.c etk_tree2.h Log Message: * [Tree2] More work on column resizing === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree2.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_tree2.c 2 Jan 2007 11:24:03 - 1.5 +++ etk_tree2.c 3 Jan 2007 00:09:31 - 1.6 @@ -107,14 +107,15 @@ static void _etk_tree2_focus_cb(Etk_Object *object, void *event, void *data); static void _etk_tree2_unfocus_cb(Etk_Object *object, void *event, void *data); static void _etk_tree2_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void *data); +static void _etk_tree2_scroll_content_realize_cb(Etk_Object *object, void *data); static void _etk_tree2_grid_realize_cb(Etk_Object *object, void *data); static void _etk_tree2_grid_unrealize_cb(Etk_Object *object, void *data); -static void _etk_tree2_header_mouse_down_cb(Etk_Object *object, void *event_info, void *data); -static void _etk_tree2_header_mouse_up_cb(Etk_Object *object, void *event_info, void *data); -static void _etk_tree2_header_mouse_move_cb(Etk_Object *object, void *event_info, void *data); -static void _etk_tree2_header_mouse_in_cb(Etk_Object *object, void *event_info, void *data); -static void _etk_tree2_header_mouse_out_cb(Etk_Object *object, void *event_info, void *data); +static void _etk_tree2_headers_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _etk_tree2_headers_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _etk_tree2_headers_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _etk_tree2_headers_mouse_in_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _etk_tree2_headers_mouse_out_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _etk_tree2_row_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _etk_tree2_row_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); @@ -127,7 +128,8 @@ /* TODO: static void _etk_tree2_sort(Etk_Tree2 *tree); */ static void _etk_tree2_col_realize(Etk_Tree2 *tree, int col_nth); -static Etk_Tree2_Col *etk_tree2_col_to_resize_get(Etk_Tree2_Col *col, int x); +static Etk_Tree2_Col *etk_tree2_col_to_resize_get(Etk_Tree2 *tree, int x); +static void _etk_tree2_headers_rect_create(Etk_Tree2 *tree, Etk_Widget *parent); static Etk_Tree2_Row *_etk_tree2_row_next_to_render_get(Etk_Tree2_Row *row, int *depth); static void _etk_tree2_row_fields_set_valist_full(Etk_Tree2_Row *row, va_list args, Etk_Bool emit_signal); @@ -141,6 +143,7 @@ static Etk_Signal *_etk_tree2_col_signals[ETK_TREE2_COL_NUM_SIGNALS]; /* TODO: better doc of row_next_get()... (with a note about deleted rows...) */ +/* TODO: a fucntion to get the first/last visible rows.. we do it all the time.. */ /** @@ -468,11 +471,8 @@ etk_widget_parent_set(new_header, tree-scroll_content); new_col-header = new_header; - etk_signal_connect(mouse_down, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_down_cb), new_col); - etk_signal_connect(mouse_up, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_up_cb), new_col); - etk_signal_connect(mouse_move, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_move_cb), new_col); - etk_signal_connect(mouse_in, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_in_cb), new_col); - etk_signal_connect(mouse_out, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_out_cb), new_col); + /*etk_signal_connect(mouse_down, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_down_cb), new_col); + etk_signal_connect(mouse_up, ETK_OBJECT(new_header), ETK_CALLBACK(_etk_tree2_header_mouse_up_cb), new_col);*/ tree-num_cols++; _etk_tree2_col_realize(tree, tree-num_cols - 1); @@ -1395,6 +1395,8 @@ tree-scroll_content-size_allocate = _etk_tree2_scroll_content_size_allocate; tree-scroll_content-scroll = _etk_tree2_scroll_content_scroll; tree-scroll_content-scroll_size_get = _etk_tree2_scroll_content_scroll_size_get; + etk_signal_connect(realize, ETK_OBJECT(tree-scroll_content), + ETK_CALLBACK(_etk_tree2_scroll_content_realize_cb), NULL); tree-grid = etk_widget_new(ETK_WIDGET_TYPE, theme_group, grid, theme_parent, tree, repeat_mouse_events, ETK_TRUE, internal, ETK_TRUE, visible, ETK_TRUE, NULL); @@ -1408,6 +1410,8 @@ tree-num_cols = 0; tree-columns = NULL; + tree-headers_rect = NULL; + tree-over_col = NULL; tree-col_to_resize = NULL; tree-headers_visible = ETK_TRUE; tree-grid_clip = NULL; @@ -1768,11 +1772,21 @@ else etk_widget_hide(tree-columns[i]-header);
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_tree2_test.c
Log Message:
* [Tree2] More work on column resizing
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree2_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_tree2_test.c2 Jan 2007 11:24:03 - 1.4
+++ etk_tree2_test.c3 Jan 2007 00:09:31 - 1.5
@@ -46,7 +46,7 @@
etk_container_add(ETK_CONTAINER(alignment), tree);
/* We first create the columns of the tree, and then we build the tree
with etk_tree2_build() */
- col1 = etk_tree2_col_new(ETK_TREE2(tree), Column 1,
etk_tree2_model_icon_text_new(ETK_TREE2(tree), ETK_TREE_FROM_EDJE), 90);
+ col1 = etk_tree2_col_new(ETK_TREE2(tree), Column 1,
etk_tree2_model_icon_text_new(ETK_TREE2(tree), ETK_TREE_FROM_EDJE), 130);
col2 = etk_tree2_col_new(ETK_TREE2(tree), Column 2,
etk_tree2_model_double_new(ETK_TREE2(tree)), 60);
col3 = etk_tree2_col_new(ETK_TREE2(tree), Column 3,
etk_tree2_model_image_new(ETK_TREE2(tree), ETK_TREE_FROM_FILE), 60);
col4 = etk_tree2_col_new(ETK_TREE2(tree), Column 4,
etk_tree2_model_checkbox_new(ETK_TREE2(tree)), 90);
@@ -109,6 +109,7 @@
}
/* Called when a row of the tree is clicked: we display the clicked row in the
statusbar */
+/* TODO: sometimes it's a Etk_Event_Mouse_Up, sometimes a
Etk_Event_Mouse_Down... */
static void _etk_test_tree2_row_clicked_cb(Etk_Object *object, Etk_Tree2_Row
*row, Etk_Event_Mouse_Up *event, void *data)
{
Etk_Tree2 *tree;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_structure_viewer.c layout_etk_simple.c
Log Message:
* etk_tree-etk_tree2 . DND temporarily disabled
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_structure_viewer.c 30 Dec 2006 13:43:34 - 1.31
+++ etk_structure_viewer.c 3 Jan 2007 01:47:39 - 1.32
@@ -16,7 +16,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree_Col* tree_col1;
+ Etk_Tree2_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* row_hash;
@@ -67,17 +67,20 @@
{
Etk_Event_Selection_Request *ev;
Etk_Selection_Data_Files *files;
- Etk_Tree* tree;
- Etk_Tree_Row* row;
+ Etk_Tree2* tree;
+ Etk_Tree2_Row* row;
int i;
entropy_etk_file_structure_viewer* viewer;
entropy_gui_component_instance* instance;
event_file_core* e_event;
+
+ /*FIXME - DND is disabled during the transition to tree2*/
+ return;
ev = event;
files = ev-data;
- tree = ETK_TREE(object);
- row = etk_tree_selected_row_get(tree);
+ tree = ETK_TREE2(object);
+ //row = etk_tree2_selected_row_get(tree);
instance = ecore_hash_get(instance_map_hash, row);
if (instance) {
@@ -120,7 +123,7 @@
}
}
-static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object,
Etk_Tree2_Row *row, Etk_Event_Mouse_Down *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_structure_viewer* viewer;
@@ -136,7 +139,7 @@
printf(Post\n);
instance = ecore_hash_get(instance_map_hash, row);
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (instance) {
viewer = instance-data;
e_event = ecore_hash_get(viewer-row_hash, row);
@@ -159,28 +162,28 @@
-Etk_Tree_Row*
+Etk_Tree2_Row*
structure_viewer_add_row (entropy_gui_component_instance * instance,
- entropy_generic_file * file, Etk_Tree_Row * prow)
+ entropy_generic_file * file, Etk_Tree2_Row * prow)
{
- Etk_Tree_Row* new_row;
+ Etk_Tree2_Row* new_row;
entropy_etk_file_structure_viewer* viewer;
event_file_core *event;
- Etk_Tree_Col* col;
- Etk_Tree_Row* parent;
+ Etk_Tree2_Col* col;
+ Etk_Tree2_Row* parent;
viewer = instance-data;
- parent = (Etk_Tree_Row*)viewer-parent_visual;
+ parent = (Etk_Tree2_Row*)viewer-parent_visual;
- col = etk_tree_nth_col_get(ETK_TREE(parent-tree), 0);
- etk_tree_freeze(ETK_TREE(viewer-tree));
+ col = etk_tree2_nth_col_get(ETK_TREE2(parent-tree), 0);
+ etk_tree2_freeze(ETK_TREE2(viewer-tree));
if (!prow) {
- new_row =
etk_tree_append_to_row((Etk_Tree_Row*)viewer-parent_visual, col,
+ new_row = etk_tree2_row_append(
((Etk_Tree2_Row*)viewer-parent_visual)-tree,
(Etk_Tree2_Row*)viewer-parent_visual, col,
PACKAGE_DATA_DIR /icons/folder.png,
_(file-filename), NULL);
} else {
- new_row = etk_tree_append_to_row(prow, col,
+ new_row = etk_tree2_row_append( ((Etk_Tree2_Row*)prow)-tree,
(Etk_Tree2_Row*)prow, col,
PACKAGE_DATA_DIR /icons/folder.png,
_(file-filename), NULL);
}
@@ -196,7 +199,7 @@
/*Save this file in this list of files we're responsible for */
ecore_list_append (viewer-files, event-file);
- etk_tree_thaw(ETK_TREE(viewer-tree));
+ etk_tree2_thaw(ETK_TREE2(viewer-tree));
return new_row;
}
@@ -212,7 +215,7 @@
switch (eevent-event_type) {
case ENTROPY_NOTIFY_FILELIST_REQUEST_EXTERNAL:
case ENTROPY_NOTIFY_FILELIST_REQUEST:{
- Etk_Tree_Row* row = NULL;
+ Etk_Tree2_Row* row = NULL;
entropy_generic_file *file;
entropy_generic_file *event_file =
((entropy_file_request *) eevent-data)-file;
@@ -253,7 +256,7 @@
}
if (row)
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
if (row) {
ecore_list_goto_first (el);
@@ -276,7 +279,7 @@
structure_viewer_add_row (comp, file,
row);
ecore_hash_set (viewer-loaded_dirs, row,
(int*)1);
}
- etk_tree_row_expand(row);
+ etk_tree2_row_unfold(row);
}
}
@@ -289,7 +292,7 @@
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c
Log Message:
* Port list viewer to tree2
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- etk_list_viewer.c 30 Dec 2006 13:43:34 - 1.76
+++ etk_list_viewer.c 3 Jan 2007 02:04:28 - 1.77
@@ -19,7 +19,7 @@
entropy_core *ecore; /*A reference to the core object passed from
init */
//Etk_Row *current_row;
Etk_Widget *tree;
- Etk_Tree_Col* tree_col1;
+ Etk_Tree2_Col* tree_col1;
Etk_Widget* parent_visual;
Ecore_Hash* gui_hash;
@@ -46,7 +46,7 @@
entropy_generic_file *file;
entropy_thumbnail *thumbnail;
entropy_gui_component_instance *instance;
- Etk_Tree_Row *icon;
+ Etk_Tree2_Row *icon;
};
@@ -96,7 +96,7 @@
/* Compares two rows of the tree */
-static int _entropy_etk_list_type_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_type_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -116,7 +116,7 @@
}
}
-static int _entropy_etk_list_filename_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_filename_compare_cb(Etk_Tree2 *tree,
Etk_Tree2_Row *row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
int val;
@@ -149,7 +149,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_size_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -172,7 +172,7 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_date_compare_cb(Etk_Tree2 *tree, Etk_Tree2_Row
*row1, Etk_Tree2_Row *row2, Etk_Tree2_Col *col, void *data)
{
gui_file *file1, *file2;
@@ -198,16 +198,15 @@
static void _etk_entropy_list_viewer_key_down_cb(Etk_Object *object, void
*event, void *data)
{
Etk_Event_Key_Down *key_event = event;
+ Etk_Tree2_Row* iter;
- Etk_Tree* tree;
- Evas_List* row_list;
+ Etk_Tree2* tree;
+ Evas_List* row_list = NULL;
gui_file* file;
-
- /*entropy_gui_component_instance* instance;
- entropy_etk_file_list_viewer* viewer;*/
- tree = ETK_TREE(object);
- row_list = etk_tree_selected_rows_get(tree);
+ tree = ETK_TREE2(object);
+ for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_row_walk_next(iter, ETK_TRUE))
+ if (iter-selected == ETK_TRUE) row_list =
evas_list_append(row_list, iter);
if (!strcmp(key_event-key, Delete)) {
@@ -232,7 +231,7 @@
static void _entropy_etk_list_viewer_drag_begin_cb(Etk_Object *object, void
*data)
{
- Etk_Tree *tree;
+ Etk_Tree2 *tree;
const char **types;
unsigned int num_types;
Etk_Widget *drag;
@@ -241,7 +240,7 @@
entropy_etk_file_list_viewer* viewer;
char buffer[8192]; /* Um - help - what do we size this to? */
int count = 0;
- Evas_List* rows;
+ Evas_List* rows = NULL;
Etk_Widget* table;
int l=0,r=0,t=0,b=0;
int added_object = 0;
@@ -249,12 +248,14 @@
Etk_Widget* vbox;
Etk_Widget* label;
char label_buffer[50];
+ Etk_Tree2_Row* iter;
instance = data;
viewer = instance-data;
- tree = ETK_TREE(object);
- rows = etk_tree_selected_rows_get(tree);
+ tree = ETK_TREE2(object);
+ for (iter = etk_tree2_first_row_get(tree); iter; iter =
etk_tree2_row_walk_next(iter, ETK_TRUE))
+if (iter-selected == ETK_TRUE) rows = evas_list_append(rows, iter);
drag = (ETK_WIDGET(tree))-drag;
@@ -356,7 +357,7 @@
Ecore_List *file_remove_ref_list;
entropy_generic_file *obj;
gui_file *freeobj;
- Etk_Tree_Row* row;
+ Etk_Tree2_Row* row;
entropy_etk_file_list_viewer *view = comp-data;
@@ -400,7 +401,7 @@
}
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row
*row, Etk_Event_Mouse_Up *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree2_Row
*row, Etk_Event_Mouse_Up *event, void *data)
{
entropy_gui_component_instance* instance;
entropy_etk_file_list_viewer* viewer;
@@ -428,7 +429,7 @@
gui_event-data = file-file;
entropy_core_layout_notify_event (file-instance, gui_event,
ENTROPY_EVENT_GLOBAL);
} else if (event-button == 2) {
-
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Add a convert callback so that a drag can have several types.
Make it possible to drag pager windows to the ibar.
===
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- e_mod_main.c2 Jan 2007 19:37:11 - 1.204
+++ e_mod_main.c3 Jan 2007 06:14:04 - 1.205
@@ -121,6 +121,7 @@
static void _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _pager_window_cb_mouse_up(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _pager_window_cb_mouse_move(void *data, Evas *e, Evas_Object *obj,
void *event_info);
+static void *_pager_window_cb_drag_convert(E_Drag *drag, const char *type);
static void _pager_window_cb_drag_finished(E_Drag *drag, int dropped);
static void _pager_inst_cb_enter(void *data, const char *type, void
*event_info);
static void _pager_inst_cb_move(void *data, const char *type, void
*event_info);
@@ -162,7 +163,7 @@
E_Gadcon_Client *gcc;
Instance *inst;
Evas_Coord x, y, w, h;
- const char *drop[] = { enlightenment/border, enlightenment/pager_win };
+ const char *drop[] = { enlightenment/pager_win, enlightenment/border };
inst = E_NEW(Instance, 1);
@@ -1422,13 +1423,14 @@
Evas_Object *o, *oo;
Evas_Coord x, y, w, h;
const char *file = NULL, *part = NULL;
-const char *drag_types[] = { enlightenment/pager_win };
+const char *drag_types[] = { enlightenment/pager_win,
enlightenment/border };
evas_object_geometry_get(pw-o_window, x, y, w, h);
evas_object_hide(pw-o_window);
drag =
e_drag_new(pw-desk-pager-inst-gcc-gadcon-zone-container,
- x, y, drag_types, 1, pw, -1,
+ x, y, drag_types, 2, pw, -1,
+ _pager_window_cb_drag_convert,
_pager_window_cb_drag_finished);
o = edje_object_add(drag-evas);
@@ -1455,6 +1457,17 @@
// ecore_x_current_time_get(), NULL);
}
}
+}
+
+static void *
+_pager_window_cb_drag_convert(E_Drag *drag, const char *type)
+{
+ Pager_Win *pw;
+
+ pw = drag-data;
+ if (!strcmp(type, enlightenment/pager_win)) return pw;
+ if (!strcmp(type, enlightenment/border)) return pw-border;
+ return NULL;
}
static void
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_dnd.c e_dnd.h e_fm.c e_gadcon.c e_int_menus.c
Log Message:
Add a convert callback so that a drag can have several types.
Make it possible to drag pager windows to the ibar.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -3 -r1.564 -r1.565
--- e_border.c 29 Dec 2006 15:53:49 - 1.564
+++ e_border.c 3 Jan 2007 06:14:02 - 1.565
@@ -4705,7 +4705,7 @@
drag = e_drag_new(bd-zone-container,
bd-x + bd-fx.x + x,
bd-y + bd-fx.y + y,
- drag_types, 1, bd, -1, NULL);
+ drag_types, 1, bd, -1, NULL,
NULL);
o = e_border_icon_add(bd, drag-evas);
if (!o)
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_dnd.c 29 Dec 2006 16:53:36 - 1.54
+++ e_dnd.c 3 Jan 2007 06:14:02 - 1.55
@@ -19,7 +19,7 @@
static void _e_drag_hide(E_Drag *drag);
static void _e_drag_move(E_Drag *drag, int x, int y);
static void _e_drag_coords_update(E_Drop_Handler *h, int *dx, int *dy, int
*dw, int *dh);
-static int _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win);
+static int _e_drag_win_matches(E_Drop_Handler *h, Ecore_X_Window win);
static void _e_drag_update(int x, int y);
static void _e_drag_end(int x, int y);
static void _e_drag_xdnd_end(int x, int y);
@@ -141,6 +141,7 @@
e_drag_new(E_Container *container, int x, int y,
const char **types, unsigned int num_types,
void *data, int size,
+ void *(*convert_cb)(E_Drag *drag, const char *type),
void (*finished_cb)(E_Drag *drag, int dropped))
{
E_Drag *drag;
@@ -194,6 +195,7 @@
drag-num_types = num_types;
drag-data = data;
drag-data_size = size;
+ drag-cb.convert = convert_cb;
drag-cb.finished = finished_cb;
_drag_list = evas_list_append(_drag_list, drag);
@@ -246,7 +248,6 @@
e_drag_start(E_Drag *drag, int x, int y)
{
Evas_List *l;
- int i;
if (_drag_win) return 0;
_drag_win = ecore_x_window_input_new(drag-container-win,
@@ -267,14 +268,24 @@
for (l = _drop_handlers; l; l = l-next)
{
E_Drop_Handler *h;
+ int i, j;
h = l-data;
h-active = 0;
+ h-type = NULL;
for (i = 0; i h-num_types; i++)
{
-if (!strcmp(h-types[i], drag-types[0]))
- h-active = 1;
+for (j = 0; j drag-num_types; j++)
+ {
+ if (!strcmp(h-types[i], drag-types[j]))
+ {
+ h-active = 1;
+ h-type = h-types[i];
+ break;
+ }
+ }
+if (h-active) break;
}
h-entered = 0;
}
@@ -621,18 +632,18 @@
if (!h-entered)
{
if (h-cb.enter)
-h-cb.enter(h-cb.data, _drag_current-types[0],
enter_ev);
+h-cb.enter(h-cb.data, h-type, enter_ev);
h-entered = 1;
}
if (h-cb.move)
- h-cb.move(h-cb.data, _drag_current-types[0], move_ev);
+ h-cb.move(h-cb.data, h-type, move_ev);
}
else
{
if (h-entered)
{
if (h-cb.leave)
-h-cb.leave(h-cb.data, _drag_current-types[0],
leave_ev);
+h-cb.leave(h-cb.data, h-type, leave_ev);
h-entered = 0;
}
}
@@ -659,18 +670,18 @@
if (!h-entered)
{
if (h-cb.enter)
-h-cb.enter(h-cb.data, _xdnd-type, enter_ev);
+h-cb.enter(h-cb.data, h-type, enter_ev);
h-entered = 1;
}
if (h-cb.move)
- h-cb.move(h-cb.data, _xdnd-type, move_ev);
+ h-cb.move(h-cb.data, h-type, move_ev);
}
else
{
if (h-entered)
{
if (h-cb.leave)
-h-cb.leave(h-cb.data, _xdnd-type, leave_ev);
+h-cb.leave(h-cb.data, h-type, leave_ev);
h-entered =
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_main.c Log Message: Add a convert callback so that a drag can have several types. Make it possible to drag pager windows to the ibar. === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- e_mod_main.c2 Jan 2007 20:55:12 - 1.79 +++ e_mod_main.c3 Jan 2007 06:14:03 - 1.80 @@ -752,7 +752,7 @@ evas_object_geometry_get(ic-o_icon, x, y, w, h); d = e_drag_new(ic-ibox-inst-gcc-gadcon-zone-container, x, y, drag_types, 1, - ic-border, -1, _ibox_cb_drag_finished); + ic-border, -1, NULL, _ibox_cb_drag_finished); o = e_border_icon_add(ic-border, e_drag_evas_get(d)); e_drag_object_set(d, o); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: Add a convert callback so that a drag can have several types. Make it possible to drag pager windows to the ibar. === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.164 retrieving revision 1.165 diff -u -3 -r1.164 -r1.165 --- e_mod_main.c30 Dec 2006 23:32:25 - 1.164 +++ e_mod_main.c3 Jan 2007 06:14:03 - 1.165 @@ -989,7 +989,7 @@ evas_object_geometry_get(ic-o_icon, x, y, w, h); d = e_drag_new(ic-ibar-inst-gcc-gadcon-zone-container, x, y, drag_types, 1, - ic-app, -1, _ibar_cb_drag_finished); + ic-app, -1, NULL, _ibar_cb_drag_finished); o = e_app_icon_add(ic-app, e_drag_evas_get(d)); e_drag_object_set(d, o); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c emotion_xine.h emotion_xine_vo_out.c
Log Message:
there is a deadlock between the video out deocder thread and the main process
(emotion) thread as it continues while the main thread is stopped tyring to
stop the video playback - this ends up in a deadlock. this tries to eliminate
that by havng a much more limited framequeue.
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- emotion_xine.c 19 Dec 2006 14:15:17 - 1.30
+++ emotion_xine.c 3 Jan 2007 06:24:25 - 1.31
@@ -276,7 +276,7 @@
// pthread_mutex_lock((ev-seek_mutex));
if (!ev-seek_thread_deleted)
{
- printf(closing seek thread\n);
+ printf(closing seek thread %p\n, ev);
pthread_cond_broadcast((ev-seek_cond));
while (ev-seek_to);
}
@@ -284,20 +284,20 @@
// pthread_mutex_lock((ev-get_pos_len_mutex));
if (!ev-get_pos_thread_deleted)
{
- printf(closing get_pos thread\n);
+ printf(closing get_pos thread, %p\n, ev);
pthread_cond_broadcast((ev-get_pos_len_cond));
while (ev-get_poslen);
}
- printf(EX dispose\n);
+ printf(EX dispose %p\n, ev);
xine_dispose(ev-stream);
- printf(EX dispose evq\n);
+ printf(EX dispose evq %p\n, ev);
xine_event_dispose_queue(ev-queue);
- printf(EX close video drv\n);
+ printf(EX close video drv %p\n, ev);
if (ev-video) xine_close_video_driver(ev-decoder, ev-video);
- printf(EX close audio drv\n);
+ printf(EX close audio drv %p\n, ev);
if (ev-audio) xine_close_audio_driver(ev-decoder, ev-audio);
- printf(EX del fds\n);
+ printf(EX del fds %p\n, ev);
ecore_main_fd_handler_del(ev-fd_handler);
close(ev-fd_write);
close(ev-fd_read);
@@ -365,18 +365,24 @@
ev = (Emotion_Xine_Video *)ef;
if (!ev) return;
- printf(EX pause end...\n);
+ printf(EX pause end... %p\n, ev);
if (!emotion_object_play_get(ev-obj))
// if (xine_get_param(ev-stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
{
- printf( ... unpause\n);
+ printf( ... unpause %p\n, ev);
xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
}
- printf(EX stop\n);
+// xine_set_param(ev-stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ printf(EX done %p\n, ev);
+ em_frame_done(ev);
+// printf(EX seek 0 %p\n, ev);
+// xine_play(ev-stream, 0, 0);
+ printf(EX: fq %i %p\n, ev-fq, ev);
+ printf(EX stop %p\n, ev);
xine_stop(ev-stream);
- printf(EX close\n);
+ printf(EX close %p\n, ev);
xine_close(ev-stream);
- printf(EX del timer\n);
+ printf(EX del timer %p\n, ev);
if (ev-timer)
{
ecore_timer_del(ev-timer);
@@ -591,13 +597,15 @@
ev = (Emotion_Xine_Video *)ef;
if (ev-cur_frame)
{
+ ev-fq--;
if (ev-cur_frame-done_func)
ev-cur_frame-done_func(ev-cur_frame-done_data);
ev-cur_frame = NULL;
}
}
-static Emotion_Format em_format_get(void *ef)
+static Emotion_Format
+em_format_get(void *ef)
{
Emotion_Xine_Video *ev;
Emotion_Xine_Video_Frame *fr;
@@ -605,8 +613,7 @@
ev = (Emotion_Xine_Video *)ef;
fr = ev-cur_frame;
- if (fr)
- return fr-format;
+ if (fr) return fr-format;
return EMOTION_FORMAT_YV12;
}
@@ -660,7 +667,7 @@
if (!fr) return 0;
if (fr-bgra_data)
{
- *bgra_data = fr-bgra_data;
+ *bgra_data = fr-bgra_data;
return 1;
}
return 0;
@@ -1154,25 +1161,14 @@
ev = _emotion_video_get(fr-obj);
if (ev)
{
- if (ev-cur_frame)
- {
- if (ev-cur_frame-done_func)
-ev-cur_frame-done_func(ev-cur_frame-done_data);
- }
+ em_frame_done(ev);
ev-cur_frame = fr;
_em_get_pos_len(ev);
if ((xine_get_stream_info(ev-stream,
XINE_STREAM_INFO_HAS_VIDEO))
(xine_get_stream_info(ev-stream,
XINE_STREAM_INFO_VIDEO_HANDLED)))
{
-
- if (ev-video_mute)
-{
- if (ev-cur_frame-done_func)
-
ev-cur_frame-done_func(ev-cur_frame-done_data);
- ev-cur_frame = NULL;
-}
- else
-_emotion_frame_new(fr-obj);
+ if (ev-video_mute) em_frame_done(ev);
+ else _emotion_frame_new(fr-obj);
}
_emotion_frame_resize(fr-obj, fr-w, fr-h, fr-ratio);
_emotion_video_pos_update(fr-obj, ev-pos,
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: there is a deadlock between the video out deocder thread and the main process (emotion) thread as it continues while the main thread is stopped tyring to stop the video playback - this ends up in a deadlock. this tries to eliminate that by havng a much more limited framequeue. === RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- emotion_smart.c 19 Dec 2006 14:15:17 - 1.23 +++ emotion_smart.c 3 Jan 2007 06:24:25 - 1.24 @@ -1038,7 +1038,10 @@ } } } +// no need for this because on any new frame decode info from the decoder +// module, the previous current frame is released (done) for us anyway // sd-module-frame_done(sd-video); + /* evas_object_image_size_get(obj, iw, ih); sd-module-video_data_size_get(sd-video, w, h); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
Rename callbacks for gadcon client.
Add callback for move/resize of the gadcon.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_gadcon.c 3 Jan 2007 06:14:02 - 1.69
+++ e_gadcon.c 3 Jan 2007 06:30:43 - 1.70
@@ -15,12 +15,13 @@
static void _e_gadcon_cb_min_size_request(void *data, Evas_Object *obj, void
*event_info);
static void _e_gadcon_cb_size_request(void *data, Evas_Object *obj, void
*event_info);
-static void _e_gadcon_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
-static void _e_gadcon_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
-static void _e_gadcon_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
-static void _e_gadcon_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
-static void _e_gadcon_cb_move(void *data, Evas *evas, Evas_Object *obj, void
*event_info);
-static void _e_gadcon_cb_resize(void *data, Evas *evas, Evas_Object *obj, void
*event_info);
+static void _e_gadcon_cb_moveresize(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_cb_client_mouse_up(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_cb_client_mouse_in(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_cb_client_mouse_out(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_cb_client_move(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _e_gadcon_cb_client_resize(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
static void _e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const
char *emission, const char *source);
@@ -277,6 +278,10 @@
drop_types, 1,
x, y, w, h);
#endif
+ evas_object_event_callback_add(gc-o_container, EVAS_CALLBACK_MOVE,
+ _e_gadcon_cb_moveresize, gc);
+ evas_object_event_callback_add(gc-o_container, EVAS_CALLBACK_RESIZE,
+ _e_gadcon_cb_moveresize, gc);
evas_object_smart_callback_add(gc-o_container, size_request,
_e_gadcon_cb_size_request, gc);
evas_object_smart_callback_add(gc-o_container, min_size_request,
@@ -901,20 +906,20 @@
edje_object_signal_callback_add(gcc-o_control, e,action,resize,down,go,
,
_e_gadcon_cb_signal_resize_right_go, gcc);
- evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_cb_mouse_down, gcc);
- evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_UP,
_e_gadcon_cb_mouse_up, gcc);
- evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_IN,
_e_gadcon_cb_mouse_in, gcc);
- evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_OUT,
_e_gadcon_cb_mouse_out, gcc);
+ evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_cb_client_mouse_down, gcc);
+ evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_UP,
_e_gadcon_cb_client_mouse_up, gcc);
+ evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_IN,
_e_gadcon_cb_client_mouse_in, gcc);
+ evas_object_event_callback_add(gcc-o_event, EVAS_CALLBACK_MOUSE_OUT,
_e_gadcon_cb_client_mouse_out, gcc);
if (gcc-o_frame)
{
- evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOVE,
_e_gadcon_cb_move, gcc);
- evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_RESIZE,
_e_gadcon_cb_resize, gcc);
+ evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOVE,
_e_gadcon_cb_client_move, gcc);
+ evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_RESIZE,
_e_gadcon_cb_client_resize, gcc);
}
else
{
- evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOVE,
_e_gadcon_cb_move, gcc);
- evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_RESIZE,
_e_gadcon_cb_resize, gcc);
+ evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOVE,
_e_gadcon_cb_client_move, gcc);
+ evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_RESIZE,
_e_gadcon_cb_client_resize, gcc);
}
evas_object_show(gcc-o_event);
@@ -931,13 +936,13 @@
if (gcc-o_frame)
{
- evas_object_event_callback_del(gcc-o_frame, EVAS_CALLBACK_MOVE,
