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] The models can now be combined: for example, if you want a column containing an icon followed by a text, just add the image model and the text model to the column. It allows a lot more flexibility with the models, it makes model creation easier, and there is no more need for the "icon_text" model. It needs more work though before being usable === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree2_test.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_tree2_test.c3 Jan 2007 00:09:31 - 1.5 +++ etk_tree2_test.c3 Jan 2007 18:10:11 - 1.6 @@ -46,10 +46,16 @@ 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), 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); + col1 = etk_tree2_col_new(ETK_TREE2(tree), "Column 1", 130); + etk_tree2_col_model_add(col1, etk_tree2_model_image_new(ETK_TREE2(tree), ETK_TREE_FROM_EDJE)); + etk_tree2_col_model_add(col1, etk_tree2_model_text_new(ETK_TREE2(tree))); + col2 = etk_tree2_col_new(ETK_TREE2(tree), "Column 2", 60); + etk_tree2_col_model_add(col2, etk_tree2_model_double_new(ETK_TREE2(tree))); + col3 = etk_tree2_col_new(ETK_TREE2(tree), "Column 3", 60); + etk_tree2_col_model_add(col3, etk_tree2_model_image_new(ETK_TREE2(tree), ETK_TREE_FROM_FILE)); + col4 = etk_tree2_col_new(ETK_TREE2(tree), "Column 4", 90); + etk_tree2_col_model_add(col4, etk_tree2_model_checkbox_new(ETK_TREE2(tree))); + 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 - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.h etk_tree2.c etk_tree2.h etk_tree2_model.c
etk_tree2_model.h
Log Message:
* [Tree2] The models can now be combined: for example, if you want a
column containing an icon followed by a text, just add the image model
and the text model to the column. It allows a lot more
flexibility with the models, it makes model creation easier, and there
is no more need for the "icon_text" model. It needs more work though
before being usable
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_button.h6 Oct 2006 17:04:14 - 1.11
+++ etk_button.h3 Jan 2007 18:10:11 - 1.12
@@ -6,11 +6,6 @@
#include "etk_types.h"
#include "etk_stock.h"
-/* TODO/FIXME list:
- * - More properties (stock, ...)?
- * - Should the button repeat the "clicked" signal when space is kept pressed
(see canvas' test app)
- */
-
/**
* @defgroup Etk_Button Etk_Button
* @brief The Etk_Button widget is a widget that emits a signal when it is
pressed, released or clicked
@@ -63,7 +58,7 @@
Etk_Stock_Size stock_size;
};
-Etk_Type *etk_button_type_get();
+Etk_Type *etk_button_type_get();
Etk_Widget *etk_button_new();
Etk_Widget *etk_button_new_with_label(const char *label);
Etk_Widget *etk_button_new_from_stock(Etk_Stock_Id stock_id);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_tree2.c 3 Jan 2007 00:09:31 - 1.6
+++ etk_tree2.c 3 Jan 2007 18:10:11 - 1.7
@@ -25,14 +25,14 @@
#define COL_RESIZE_THRESHOLD 3
#define MIN_ROW_HEIGHT 12
#define DEFAULT_ROW_HEIGHT 24
-#define MAX_OBJECTS_PER_CELL 5
+#define MAX_OBJECTS_PER_MODEL 5
#define CELL_HMARGINS 4
#define CELL_VMARGINS 2
typedef struct Etk_Tree2_Cell_Objects
{
- Evas_Object *objects[MAX_OBJECTS_PER_CELL];
+ Evas_Object *objects[MAX_MODELS_PER_COL][MAX_OBJECTS_PER_MODEL];
} Etk_Tree2_Cell_Objects;
typedef struct Etk_Tree2_Row_Object
@@ -428,28 +428,22 @@
* @brief Inserts a new column into a tree
* @param tree a tree
* @param title the tile of the column
- * @param model the model to use for the column
* @param width the requested width of the column. It won't be necessary the
visible width
* of the column since it can be expanded to fit the available space
* @return Returns the new column
*/
-Etk_Tree2_Col *etk_tree2_col_new(Etk_Tree2 *tree, const char *title,
Etk_Tree2_Model *model, int width)
+Etk_Tree2_Col *etk_tree2_col_new(Etk_Tree2 *tree, const char *title, int width)
{
Etk_Tree2_Col *new_col;
Etk_Widget *new_header;
- if (!tree || !model)
+ if (!tree)
return NULL;
if (tree->built)
{
ETK_WARNING("The tree is built, you can not add a new column");
return NULL;
}
- if (model->col)
- {
- ETK_WARNING("The tree-model to use for that column is already used by
another column");
- return NULL;
- }
tree->columns = realloc(tree->columns, sizeof(Etk_Tree2_Col *) *
(tree->num_cols + 1));
new_col = ETK_TREE2_COL(etk_object_new(ETK_TREE2_COL_TYPE, "title", title,
@@ -458,8 +452,6 @@
new_col->id = tree->num_cols;
new_col->tree = tree;
- new_col->model = model;
- new_col->model->col = new_col;
new_col->position = tree->num_cols;
/* Creates the header widget */
@@ -470,9 +462,6 @@
else
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);*/
tree->num_cols++;
_etk_tree2_col_realize(tree, tree->num_cols - 1);
@@ -507,6 +496,39 @@
}
/**
+ * @brief Adds a model to a column of the tree. You can add several models to
the same column in order to combine them.
+ * For example, if you want the column's content to be an icon followed by a
text, add the "image" model and then the
+ * "text" model
+ * @param col a column
+ * @param model the model to add to the column @a col
+ * @warning the number of models per column is limited to 5
+ */
+void etk_tree2_col_model_add(Etk_Tree2_Col *col, Etk_Tree2_Model *model)
+{
+ if (!col || !model || !col->tree)
+ return;
+ if (col->tree->built)
+ {
+ ETK_WARNING("You cannot add a model to a column once the tree is built");
+ return;
+ }
+ if (col->num_models >= MAX_MODELS_PER_COL)
+ {
+ ETK_WARNING("The number of models per column is limited to %d. Unable to
add the model", MAX_MODELS_PER_COL);
+
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default
Modified Files:
default.edc
Log Message:
* Show the separator in dialogs again
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- default.edc 26 Dec 2006 14:51:23 - 1.27
+++ default.edc 3 Jan 2007 13:21:31 - 1.28
@@ -21,6 +21,7 @@
item: "alias: etk/menu_bar/menu_item/radiobox"
"etk/menu/menu_item/radiobox";
item: "alias: etk/tool_button"
"etk/htoolbar/tool_button";
item: "alias: etk/tool_toggle_button"
"etk/htoolbar/tool_toggle_button";
+ item: "alias: etk/dialog/hseparator" "etk/hseparator";
}
collections {
-
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
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.php&p=sourceforge&CID=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
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.php&p=sourceforge&CID=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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* Actually revert them...
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ecore_evas_x11.c31 Dec 2006 14:44:21 - 1.23
+++ ecore_evas_x11.c31 Dec 2006 14:50:31 - 1.24
@@ -495,7 +495,7 @@
/* Release all the buttons of the mouse */
/* TODO: There should be a better way to do that... */
- /*ecore_x_pointer_last_xy_get(&mx, &my);
+ ecore_x_pointer_last_xy_get(&mx, &my);
if ((win = ecore_x_window_at_xy_get(mx, my)) != 0)
{
int i;
@@ -503,7 +503,7 @@
ecore_x_pointer_xy_get(win, &mx, &my);
for (i = 1; i <= 32; i++)
ecore_x_mouse_up_send(win, mx, my, i);
- }*/
+ }
/* Create the input window */
root = engine_data->x_window;
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* Revert yesterday's changes: we feed the "mouse-up" events again when a
popup window is popped up
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_evas_x11.c30 Dec 2006 22:11:49 - 1.22
+++ ecore_evas_x11.c31 Dec 2006 14:44:21 - 1.23
@@ -494,7 +494,7 @@
int mx, my;
/* Release all the buttons of the mouse */
- /* TODO: I commented this out because it causes some problems... */
+ /* TODO: There should be a better way to do that... */
/*ecore_x_pointer_last_xy_get(&mx, &my);
if ((win = ecore_x_window_at_xy_get(mx, my)) != 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.php&p=sourceforge&CID=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_widget.c
Log Message:
* Fix a redraw problem (the toolbar in emphasis didn't get properly
redrawn when you switch from mini mode to full mode)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- etk_widget.c31 Dec 2006 00:19:21 - 1.91
+++ etk_widget.c31 Dec 2006 13:04:44 - 1.92
@@ -2465,8 +2465,8 @@
/* We create the content-object if the part ETK_WIDGET_CONTENT_PART
exists:
* the content-object is a smart object that will be swallowed in this
part, and
- * whose member-objects are the member-objects and the children's
smart-objects of the widget.
- * This way, we have a powerful and generic way to swallow children in
any types of widgets */
+ * whose member-objects are the member-objects and children's
smart-objects of the widget.
+ * This way, we have a powerful and generic way to swallow children in
any type of widgets */
if (edje_object_part_exists(widget->theme_object,
ETK_WIDGET_CONTENT_PART))
{
widget->content_object = _etk_widget_content_object_add(evas, widget);
@@ -3497,10 +3497,7 @@
evas_object_geometry_get(obj, &prev_w, &prev_h, NULL, NULL);
if ((prev_w != w || prev_h != h || widget->need_redraw) &&
widget->size_allocate)
- {
widget->size_allocate(widget, widget->inner_geometry);
- widget->need_redraw = ETK_FALSE;
- }
}
/* Called when the content-object of the widget is clipped */
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_widget.c
Log Message:
* We don't need this...
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- etk_widget.c31 Dec 2006 00:16:32 - 1.90
+++ etk_widget.c31 Dec 2006 00:19:21 - 1.91
@@ -3232,7 +3232,7 @@
if (!obj || !(widget = ETK_WIDGET(evas_object_smart_data_get(obj
return;
- if (1 || w != widget->geometry.w || h != widget->geometry.h ||
widget->need_redraw)
+ if (w != widget->geometry.w || h != widget->geometry.h ||
widget->need_redraw)
{
widget->geometry.w = w;
widget->geometry.h = 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.php&p=sourceforge&CID=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_widget.c
Log Message:
* [Etk_Widget] Recalculate the inner geometry each time the widget's
smart-object is resized. It fixes a placement problem of the label of
a tree's header in emphasis.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- etk_widget.c29 Dec 2006 13:42:09 - 1.89
+++ etk_widget.c31 Dec 2006 00:16:32 - 1.90
@@ -1759,7 +1759,8 @@
return;
/* free old data */
- if(widget->dnd_types_num > 0 && widget->dnd_types != NULL)
+ if(num <= 0 || types == NULL ||
+ (widget->dnd_types_num > 0 && widget->dnd_types != NULL))
{
for(i = 0; i < widget->dnd_types_num; i++)
@@ -3231,16 +3232,18 @@
if (!obj || !(widget = ETK_WIDGET(evas_object_smart_data_get(obj
return;
- if (w != widget->geometry.w || h != widget->geometry.h ||
widget->need_redraw)
+ if (1 || w != widget->geometry.w || h != widget->geometry.h ||
widget->need_redraw)
{
widget->geometry.w = w;
widget->geometry.h = h;
if (!widget->content_object)
{
+ widget->inner_geometry.x = widget->geometry.x + widget->inset.left;
+ widget->inner_geometry.y = widget->geometry.y + widget->inset.top;
widget->inner_geometry.w = widget->geometry.w - widget->inset.left -
widget->inset.right;
widget->inner_geometry.h = widget->geometry.h - widget->inset.top -
widget->inset.bottom;
}
-
+
if (widget->theme_object)
{
evas_object_move(widget->theme_object, widget->geometry.x,
widget->geometry.y);
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk Modified Files: configure.in Log Message: * Comment out a line. Thanks `vko for having caught this :) === RCS file: /cvs/e/e17/proto/etk/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- configure.in14 Nov 2006 22:33:10 - 1.20 +++ configure.in30 Dec 2006 23:24:27 - 1.21 @@ -198,7 +198,7 @@ fi # -Ecore_FB +## Ecore_FB have_ecore_fb="no" save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ECORE_CFLAGS" - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_tab.c
Log Message:
* It looks better if the vscrollbars are not always visible imho
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- exhibit_tab.c 30 Dec 2006 12:28:03 - 1.32
+++ exhibit_tab.c 30 Dec 2006 22:58:20 - 1.33
@@ -47,7 +47,6 @@
etk_signal_connect("row_clicked", ETK_OBJECT(tab->dtree),
ETK_CALLBACK(_ex_tab_dtree_item_clicked_cb), e);
tab->dcol = etk_tree_col_new(ETK_TREE(tab->dtree), "Directories",
etk_tree_model_icon_text_new(ETK_TREE(tab->dtree), ETK_TREE_FROM_EDJE), 10);
etk_tree_headers_visible_set(ETK_TREE(tab->dtree), 0);
-
etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->dtree)),
ETK_POLICY_AUTO, ETK_POLICY_SHOW);
etk_tree_build(ETK_TREE(tab->dtree));
tab->itree = etk_tree_new();
@@ -62,7 +61,6 @@
tab->icol = etk_tree_col_new(ETK_TREE(tab->itree), "Files", imodel, 10);
etk_tree_headers_visible_set(ETK_TREE(tab->itree), 0);
etk_tree_row_height_set(ETK_TREE(tab->itree), 60);
-
etk_scrolled_view_policy_set(etk_tree_scrolled_view_get(ETK_TREE(tab->itree)),
ETK_POLICY_AUTO, ETK_POLICY_SHOW);
etk_tree_build(ETK_TREE(tab->itree));
if (dir)
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/macros
Modified Files:
toolbar.edc
Log Message:
* Toolbar theme: "remove the god damn yellow thing"
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/toolbar.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- toolbar.edc 30 Dec 2006 21:22:44 - 1.3
+++ toolbar.edc 30 Dec 2006 22:49:59 - 1.4
@@ -5,7 +5,7 @@
type: RECT; \
description { \
state: "default" 0.0; \
-color: 255 255 0 120; \
+color: 255 255 255 0; \
rel1 { \
relative: 0.0 0.0; \
offset: ox1 oy1; \
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
tree.edc
Log Message:
* The focus glow does not look good with the tree... it's disabled.
Ideas are welcomed :)
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- tree.edc26 Dec 2006 14:51:23 - 1.24
+++ tree.edc30 Dec 2006 22:46:32 - 1.25
@@ -137,9 +137,10 @@
}
}
}
- FOCUS_GLOW(0.0, 0.0, -1, 0, "background", 1.0, 1.0, 0, -1, "background")
+ /* TODO: it doesn't look good... */
+ //FOCUS_GLOW(0.0, 0.0, -1, 0, "background", 1.0, 1.0, 0, -1,
"background")
}
- programs {
+ /*programs {
program {
name: "tree_focus";
signal: "etk,state,focused";
@@ -152,7 +153,7 @@
source: "etk";
UNFOCUS_GLOW_ACTION
}
- }
+ }*/
}
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* Do not feed "mouse up" events when a popup window is popped-up. If
fixes problems when a popup window appears if the mouse pointer is above
a button
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ecore_evas_x11.c9 Dec 2006 09:56:32 - 1.21
+++ ecore_evas_x11.c30 Dec 2006 22:11:49 - 1.22
@@ -494,7 +494,8 @@
int mx, my;
/* Release all the buttons of the mouse */
- ecore_x_pointer_last_xy_get(&mx, &my);
+ /* TODO: I commented this out because it causes some problems... */
+ /*ecore_x_pointer_last_xy_get(&mx, &my);
if ((win = ecore_x_window_at_xy_get(mx, my)) != 0)
{
int i;
@@ -502,7 +503,7 @@
ecore_x_pointer_xy_get(win, &mx, &my);
for (i = 1; i <= 32; i++)
ecore_x_mouse_up_send(win, mx, my, i);
- }
+ }*/
/* Create the input window */
root = engine_data->x_window;
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_combobox.c etk_toggle_button.c
Log Message:
* Do not feed "mouse up" events when a popup window is popped-up. If
fixes problems when a popup window appears if the mouse pointer is above
a button
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etk_button.c6 Oct 2006 17:04:14 - 1.30
+++ etk_button.c30 Dec 2006 22:11:49 - 1.31
@@ -190,8 +190,9 @@
else
etk_widget_show(button->label);
+ /* Rebuild the button only if necessary (i.e. if the label is currently not
packed into the button) */
rebuild = ETK_TRUE;
- for (parent = etk_widget_parent_get(ETK_WIDGET(button)); parent; parent =
etk_widget_parent_get(parent))
+ for (parent = etk_widget_parent_get(button->label); parent; parent =
etk_widget_parent_get(parent))
{
if (parent == widget)
{
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- etk_combobox.c 29 Dec 2006 22:10:13 - 1.34
+++ etk_combobox.c 30 Dec 2006 22:11:49 - 1.35
@@ -678,7 +678,7 @@
return;
combobox->button = etk_widget_new(ETK_TOGGLE_BUTTON_TYPE, "theme_group",
"button", "theme_parent", combobox,
- "visible", ETK_TRUE, "repeat_mouse_events", ETK_TRUE, "internal",
ETK_TRUE, NULL);
+ "visible", ETK_TRUE, "repeat_mouse_events", ETK_TRUE, "focusable",
ETK_FALSE, "internal", ETK_TRUE, NULL);
etk_widget_parent_set(combobox->button, ETK_WIDGET(combobox));
etk_signal_connect("toggled", ETK_OBJECT(combobox->button),
ETK_CALLBACK(_etk_combobox_button_toggled_cb), combobox);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toggle_button.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_toggle_button.c 30 Dec 2006 21:22:45 - 1.15
+++ etk_toggle_button.c 30 Dec 2006 22:11:49 - 1.16
@@ -9,13 +9,13 @@
* @{
*/
-enum _Etk_Toggle_Button_Signal_Id
+enum Etk_Toggle_Button_Signal_Id
{
ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL,
ETK_TOGGLE_BUTTON_NUM_SIGNALS
};
-enum _Etk_Toggle_Button_Property_Id
+enum Etk_Toggle_Button_Property_Id
{
ETK_TOGGLE_BUTTON_ACTIVE_PROPERTY
};
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk Modified Files: ABOUT-NLS Log Message: * [Toggle_Button] Documentation === RCS file: /cvs/e/e17/proto/etk/ABOUT-NLS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ABOUT-NLS 16 Oct 2005 00:05:57 - 1.1 +++ ABOUT-NLS 30 Dec 2006 21:22:44 - 1.2 @@ -185,28 +185,548 @@ Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es ++ - etk|| + a2ps | [] [] [] []| + aegis | () | + ant-phone | () | + anubis || + ap-utils || + aspell | [] | + bash | [] [] [] [] | + batchelor || + bfd|[] [] | + binutils |[] [] | + bison |[] [][] | + bluez-pin | [] [] []| + clisp || + clisp | [][] [] | + console-tools | [][] | + coreutils | [][] [][] | + cpio |[] [][] | + darkstat |[] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [][][] | + enscript | [][] [][] | + error | [][] [][] [] | + fetchmail | [] () [] [] [] [] | + fileutils |[] [][] | + findutils | [] [][] [] [] [] [] | + flex | [][] [][] | + fslint || + gas| [] | + gawk | [][] [][] | + gbiff | [] | + gcal | []| + gcc|[] [] | + gettext| [] [][] [][] | + gettext-examples | [] [] [][] | + gettext-runtime| [] [][] [][] | + gettext-tools | [] [][] | + gimp-print | [] [] [][] [] | + gliv || + glunarclock|[] [] | + gnubiff| [] | + gnucash| []()[] [] | + gnucash-glossary |[] ()[] | + gnupg | [] ()[] [] [] [] | + gpe-aerial | [] | + gpe-beam | [][] | + gpe-calendar | [][] | + gpe-clock | [][] | + gpe-conf | [][] | + gpe-contacts | [][] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [][] | + gpe-ownerinfo | [][] | + gpe-sketchbook
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
slider.edc
Log Message:
* [Toggle_Button] Documentation
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/slider.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- slider.edc 9 Dec 2006 09:56:32 - 1.5
+++ slider.edc 30 Dec 2006 21:22:45 - 1.6
@@ -64,6 +64,7 @@
state: "default" 0.0;
min: 32 32;
max: 32 32;
+fixed: 1 1;
rel1 {
to: "etk.dragable.slider";
}
@@ -228,6 +229,7 @@
state: "default" 0.0;
min: 32 32;
max: 32 32;
+fixed: 1 1;
rel1 {
to: "etk.dragable.slider";
}
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am Log Message: * [Toggle_Button] Documentation === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Makefile.am 26 Dec 2006 14:51:23 - 1.15 +++ Makefile.am 30 Dec 2006 21:22:44 - 1.16 @@ -83,6 +83,12 @@ tree_expander_fold.png \ tree_expander_unfold.png \ tree_header_over.png \ +tree_header_first.png \ +tree_header_first2.png \ +tree_header_last.png \ +tree_header_last2.png \ +tree_header_middle.png \ +tree_header_middle2.png \ tree_header_unique.png \ tree_header_unique2.png \ tree.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.php&p=sourceforge&CID=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/data/themes/default/macros
Modified Files:
toolbar.edc
Log Message:
* [Toggle_Button] Documentation
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/toolbar.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- toolbar.edc 20 Oct 2006 17:51:43 - 1.2
+++ toolbar.edc 30 Dec 2006 21:22:44 - 1.3
@@ -5,7 +5,7 @@
type: RECT; \
description { \
state: "default" 0.0; \
-color: 255 255 255 0; \
+color: 255 255 0 120; \
rel1 { \
relative: 0.0 0.0; \
offset: ox1 oy1; \
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_toggle_button.c etk_toggle_button.h etk_types.h
Log Message:
* [Toggle_Button] Documentation
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toggle_button.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_toggle_button.c 6 Oct 2006 17:04:15 - 1.14
+++ etk_toggle_button.c 30 Dec 2006 21:22:45 - 1.15
@@ -38,7 +38,7 @@
/**
* @internal
* @brief Gets the type of an Etk_Toggle_Button
- * @return Returns the type on an Etk_Toggle_Button
+ * @return Returns the type of an Etk_Toggle_Button
*/
Etk_Type *etk_toggle_button_type_get()
{
@@ -46,11 +46,14 @@
if (!toggle_button_type)
{
- toggle_button_type = etk_type_new("Etk_Toggle_Button", ETK_BUTTON_TYPE,
sizeof(Etk_Toggle_Button), ETK_CONSTRUCTOR(_etk_toggle_button_constructor),
NULL);
+ toggle_button_type = etk_type_new("Etk_Toggle_Button", ETK_BUTTON_TYPE,
sizeof(Etk_Toggle_Button),
+ ETK_CONSTRUCTOR(_etk_toggle_button_constructor), NULL);
- _etk_toggle_button_signals[ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL] =
etk_signal_new("toggled", toggle_button_type,
ETK_MEMBER_OFFSET(Etk_Toggle_Button, toggled), etk_marshaller_VOID__VOID, NULL,
NULL);
+ _etk_toggle_button_signals[ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL] =
etk_signal_new("toggled",
+ toggle_button_type, ETK_MEMBER_OFFSET(Etk_Toggle_Button, toggled),
etk_marshaller_VOID__VOID, NULL, NULL);
- etk_type_property_add(toggle_button_type, "active",
ETK_TOGGLE_BUTTON_ACTIVE_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(0));
+ etk_type_property_add(toggle_button_type, "active",
ETK_TOGGLE_BUTTON_ACTIVE_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
toggle_button_type->property_set = _etk_toggle_button_property_set;
toggle_button_type->property_get = _etk_toggle_button_property_get;
@@ -61,7 +64,7 @@
/**
* @brief Creates a new toggle button
- * @return Returns the new toggle button widget
+ * @return Returns the new toggle-button widget
*/
Etk_Widget *etk_toggle_button_new()
{
@@ -71,11 +74,12 @@
/**
* @brief Creates a new toggle button with a label
* @param label the label
- * @return Returns the new toggle button widget
+ * @return Returns the new toggle-button widget
*/
Etk_Widget *etk_toggle_button_new_with_label(const char *label)
{
- return etk_widget_new(ETK_TOGGLE_BUTTON_TYPE, "theme_group",
"toggle_button", "label", label, "focusable", ETK_TRUE, NULL);
+ return etk_widget_new(ETK_TOGGLE_BUTTON_TYPE, "theme_group",
"toggle_button",
+ "label", label, "focusable", ETK_TRUE, NULL);
}
/**
@@ -90,9 +94,9 @@
}
/**
- * @brief Sets the state of the toggle button
+ * @brief Sets whether the toggle button is active or not
* @param toggle_button a toggle button
- * @param active if @a active == ETK_TRUE, the toggle button will be active
+ * @param active if @a active is ETK_TRUE, the toggle button will be
activated. Otherwise, it will be deactivated
*/
void etk_toggle_button_active_set(Etk_Toggle_Button *toggle_button, Etk_Bool
active)
{
@@ -103,7 +107,7 @@
/**
* @brief Gets the state of the toggle button
* @param toggle_button a toggle button
- * @return Returns ETK_TRUE if the button is activated, ETK_FALSE otherwise
+ * @return Returns ETK_TRUE if the button is active, ETK_FALSE otherwise
*/
Etk_Bool etk_toggle_button_active_get(Etk_Toggle_Button *toggle_button)
{
@@ -128,8 +132,11 @@
toggle_button->toggled = _etk_toggle_button_toggled_handler;
toggle_button->active_set = _etk_toggle_button_active_set_default;
- etk_signal_connect("realize", ETK_OBJECT(toggle_button),
ETK_CALLBACK(_etk_toggle_button_realize_cb), NULL);
- etk_signal_connect_swapped("clicked", ETK_OBJECT(toggle_button),
ETK_CALLBACK(etk_toggle_button_toggle), toggle_button);
+ etk_signal_connect("realize", ETK_OBJECT(toggle_button),
+ ETK_CALLBACK(_etk_toggle_button_realize_cb), NULL);
+ /* If the button is clicked, we toggle it */
+ etk_signal_connect_swapped("clicked", ETK_OBJECT(toggle_button),
+ ETK_CALLBACK(etk_toggle_button_toggle), toggle_button);
}
/* Sets the property whose id is "property_id" to the value "value" */
@@ -212,3 +219,35 @@
}
/** @} */
+
+/**
+ *
+ * Documentation
+ *
+ **/
+
+/**
+ * @addtogroup Etk_Toggle_Button
+ *
+ * @image html widgets/toggle_button.png
+ *
+ * \par Object Hierarchy:
+ * - Etk_Object
+ * - Etk_Widget
+ * - Etk_Container
+ * - Etk_Bin
+ * - Etk_Button
+ * - Etk_Toggle_Button
+ *
+ * \par Signals:
+ * @signal_name "toggled": Emitted when the state of the toggle button is
changed
+ * @signal_
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/doc/img/widgets Modified Files: toggle_button.png Log Message: * [Toggle_Button] Documentation === RCS file: /cvs/e/e17/proto/etk/doc/img/widgets/toggle_button.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYXzRWc and /tmp/cvsPXeIIR 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.php&p=sourceforge&CID=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_image.c Log Message: * [Etk_Image] Update the docs of the properties === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- etk_image.c 30 Dec 2006 14:27:13 - 1.29 +++ etk_image.c 30 Dec 2006 14:42:00 - 1.30 @@ -985,43 +985,48 @@ * - Etk_Image * * \par Properties: - * @prop_name "image_file": The image file (.png, .jpg, ...) which the image is loaded from. - * Set to NULL if the image is loaded from an edje file (.edj) - * @prop_type String (char *) - * @prop_rw - * @prop_val NULL + * @prop_name "source": The source of the image (file, edje, stock, Evas object or pixel data) + * @prop_type Integer (Etk_Image_Source) + * @prop_ro + * @prop_val ETK_IMAGE_FILE * \par - * @prop_name "edje_file": The edje file (.edj) which the image is loaded from. - * Set to NULL if the image is loaded from an image file (.png, .jpg, ...) + * @prop_name "file": The path of the loaded file (path to the image-file or to the edje-file, or NULL if the image is + * not loaded from a file) * @prop_type String (char *) * @prop_rw * @prop_val NULL * \par - * @prop_name "edje_group": The edje group of the image. - * Set to NULL if the image is loaded from an image file (.png, .jpg, ...) + * @prop_name "key": The name of the loaded key: it corresponds to the loaded edje-group if the image is loaded from an + * Edje-file, or to the key corresponding to the image if it is loaded from an Eet-file. Otherwise it is set to NULL * @prop_type String (char *) * @prop_rw * @prop_val NULL * \par - * @prop_name "keep_aspect": Whether of not the image keeps its aspect ratio when it is resized - * @prop_type Boolean - * @prop_rw - * @prop_val ETK_TRUE - * \par - * @prop_name "use_edje": Whether of not the image is loaded from an edje file (.edj) - * @prop_type Boolean - * @prop_ro - * @prop_val ETK_FALSE - * \par * @prop_name "stock_id": The stock ID used by the image. - * Set to ETK_STOCK_NO_STOCK if the image is not loaded from a stock icon + * It is set to ETK_STOCK_NO_STOCK if the image is not a stock-icon * @prop_type Integer * @prop_rw * @prop_val ETK_STOCK_NO_STOCK * \par - * @prop_name "stock_size": The size of the stock icon used by the image. - * Set to a random value if the image is not loaded from a stock icon + * @prop_name "stock_size": The size of the stock-icon used by the image. + * It is set to ETK_STOCK_MEDIUM if the image is not a stock-icon * @prop_type Integer * @prop_rw * @prop_val ETK_STOCK_MEDIUM + * \par + * @prop_name "evas_object": A pointer to the Evas object corresponding to the image. You must be careful if you + * manipulate it directly (do not call an Edje function on an Evas image object) + * @prop_type Pointer (Evas_Object *) + * @prop_rw + * @prop_val NULL + * \par + * @prop_name "keep_aspect": Whether of not the image keeps its aspect ratio when it is resized + * @prop_type Boolean + * @prop_rw + * @prop_val ETK_TRUE + * \par + * @prop_name "aspect_ratio": The aspect-ratio of the image. If it is set to 0.0, Etk calculates it automatically + * @prop_type Double + * @prop_rw + * @prop_val 0.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.php&p=sourceforge&CID=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_image.c
Log Message:
* [Etk_Image] Allow chaning the "stock-id" and the "stock-id" property,
even if the image is not in "STOCK" mode
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- etk_image.c 29 Dec 2006 22:10:13 - 1.28
+++ etk_image.c 30 Dec 2006 14:27:13 - 1.29
@@ -65,7 +65,7 @@
etk_type_property_add(image_type, "stock_id",
ETK_IMAGE_STOCK_ID_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_NO_STOCK));
etk_type_property_add(image_type, "stock_size",
ETK_IMAGE_STOCK_SIZE_PROPERTY,
- ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_SMALL));
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_MEDIUM));
etk_type_property_add(image_type, "evas_object",
ETK_IMAGE_EVAS_OBJECT_PROPERTY,
ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
@@ -310,7 +310,7 @@
if (stock_id)
*stock_id = ETK_STOCK_NO_STOCK;
if (stock_size)
- *stock_size = ETK_STOCK_SMALL;
+ *stock_size = ETK_STOCK_MEDIUM;
}
else
{
@@ -545,7 +545,7 @@
return;
image->keep_aspect = keep_aspect;
- etk_widget_size_recalc_queue(ETK_WIDGET(image));
+ etk_widget_redraw_queue(ETK_WIDGET(image));
etk_object_notify(ETK_OBJECT(image), "keep_aspect");
}
@@ -573,7 +573,7 @@
return;
image->aspect_ratio = aspect_ratio;
- etk_widget_size_recalc_queue(ETK_WIDGET(image));
+ etk_widget_redraw_queue(ETK_WIDGET(image));
etk_object_notify(ETK_OBJECT(image), "aspect_ratio");
}
@@ -667,10 +667,14 @@
case ETK_IMAGE_STOCK_ID_PROPERTY:
if (image->source == ETK_IMAGE_STOCK)
etk_image_set_from_stock(image, etk_property_value_int_get(value),
image->info.stock.size);
+ else
+etk_image_set_from_stock(image, etk_property_value_int_get(value),
ETK_STOCK_MEDIUM);
break;
case ETK_IMAGE_STOCK_SIZE_PROPERTY:
if (image->source == ETK_IMAGE_STOCK)
etk_image_set_from_stock(image, image->info.stock.id,
etk_property_value_int_get(value));
+ else
+etk_image_set_from_stock(image, ETK_STOCK_NO_STOCK,
etk_property_value_int_get(value));
break;
case ETK_IMAGE_EVAS_OBJECT_PROPERTY:
etk_image_set_from_evas_object(image,
etk_property_value_pointer_get(value));
@@ -716,10 +720,16 @@
etk_property_value_string_set(value, NULL);
break;
case ETK_IMAGE_STOCK_ID_PROPERTY:
- etk_property_value_int_set(value, image->info.stock.id);
+ if (image->source == ETK_IMAGE_STOCK)
+etk_property_value_int_set(value, image->info.stock.id);
+ else
+etk_property_value_int_set(value, ETK_STOCK_NO_STOCK);
break;
case ETK_IMAGE_STOCK_SIZE_PROPERTY:
- etk_property_value_int_set(value, image->info.stock.size);
+ if (image->source == ETK_IMAGE_STOCK)
+etk_property_value_int_set(value, image->info.stock.size);
+ else
+etk_property_value_int_set(value, ETK_STOCK_MEDIUM);
break;
case ETK_IMAGE_EVAS_OBJECT_PROPERTY:
etk_property_value_pointer_set(value, image->object);
@@ -853,7 +863,7 @@
break;
case ETK_IMAGE_STOCK:
image->info.stock.id = ETK_STOCK_NO_STOCK;
- image->info.stock.size = ETK_STOCK_SMALL;
+ image->info.stock.size = ETK_STOCK_MEDIUM;
break;
case ETK_IMAGE_DATA:
image->info.data.size.w = 0;
@@ -1013,5 +1023,5 @@
* Set to a random value if the image is not loaded from a stock icon
* @prop_type Integer
* @prop_rw
- * @prop_val ETK_STOCK_SMALL
+ * @prop_val ETK_STOCK_MEDIUM
*/
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_player.c
Log Message:
Move to the new Etk_Image API
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_player.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- emphasis_player.c 21 Aug 2006 14:58:50 - 1.3
+++ emphasis_player.c 29 Dec 2006 22:25:07 - 1.4
@@ -265,8 +265,8 @@
void
emphasis_player_cover_set(Emphasis_Player_Gui *player, const char *path)
{
- etk_image_set_from_file(ETK_IMAGE(player->full.cover) , path);
- etk_image_set_from_file(ETK_IMAGE(player->small.cover), path);
+ etk_image_set_from_file(ETK_IMAGE(player->full.cover) , path, NULL);
+ etk_image_set_from_file(ETK_IMAGE(player->small.cover), path, NULL);
}
/* TODO : documentation */
@@ -503,12 +503,12 @@
switch(right)
{
case 0:
- etk_image_set_from_file(ETK_IMAGE(player->small.sound_low), path);
- etk_image_set_from_file(ETK_IMAGE(player->full.sound_low) , path);
+ etk_image_set_from_file(ETK_IMAGE(player->small.sound_low), path, NULL);
+ etk_image_set_from_file(ETK_IMAGE(player->full.sound_low) , path, NULL);
break;
default:
- etk_image_set_from_file(ETK_IMAGE(player->small.sound_high), path);
- etk_image_set_from_file(ETK_IMAGE(player->full.sound_high) , path);
+ etk_image_set_from_file(ETK_IMAGE(player->small.sound_high), path,
NULL);
+ etk_image_set_from_file(ETK_IMAGE(player->full.sound_high) , path,
NULL);
break;
}
}
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/emphasis_cover_editor
Modified Files:
emphasis_cover_editor.c
Log Message:
Move to the new Etk_Image API
===
RCS file:
/cvs/e/e17/proto/emphasis/src/emphasis_cover_editor/emphasis_cover_editor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emphasis_cover_editor.c 20 Aug 2006 22:48:50 - 1.1
+++ emphasis_cover_editor.c 29 Dec 2006 22:25:07 - 1.2
@@ -134,7 +134,7 @@
if(path)
{
- etk_image_set_from_file(ETK_IMAGE(cover), path);
+ etk_image_set_from_file(ETK_IMAGE(cover), path, NULL);
}
else
{
@@ -200,7 +200,7 @@
row = etk_tree_selected_row_get(ETK_TREE(tree));
free(etk_tree_row_data_get(row));
etk_tree_row_data_set(row, cover_path);
- etk_image_set_from_file(ETK_IMAGE(cover), cover_path);
+ etk_image_set_from_file(ETK_IMAGE(cover), cover_path, NULL);
}
etk_widget_hide_all(ETK_WIDGET(filechooser_dialog));
}
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/estickies/src/bin Modified Files: about.c Log Message: Move to the new Etk_Image API === RCS file: /cvs/e/e17/proto/estickies/src/bin/about.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- about.c 15 Aug 2006 18:10:38 - 1.4 +++ about.c 29 Dec 2006 22:20:25 - 1.5 @@ -29,7 +29,7 @@ vbox = etk_vbox_new(ETK_FALSE, 0); /* Logo */ - logo = etk_image_new_from_file(PACKAGE_DATA_DIR"/images/estickies.png"); + logo = etk_image_new_from_file(PACKAGE_DATA_DIR"/images/estickies.png", NULL); etk_box_append(ETK_BOX(vbox), logo, ETK_BOX_START, ETK_BOX_EXPAND, 0); /* Description */ - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/enhance/src/lib Modified Files: enhance.c Log Message: Move to the new Etk_Image API === RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- enhance.c 8 Dec 2006 13:25:27 - 1.33 +++ enhance.c 29 Dec 2006 22:15:41 - 1.34 @@ -719,7 +719,7 @@ PROPERTY_STR; /* TODO : edj? */ -etk_image_set_from_file(ETK_IMAGE(wid->wid), value); +etk_image_set_from_file(ETK_IMAGE(wid->wid), value, NULL); } else if(!strcmp(name, "active")) - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_dnd_test.c etk_embed_test.c
etk_image_test.c etk_notebook_test.c etk_shadow_test.c
etk_table_test.c etk_tree_test.c
Log Message:
* [Etk_Image] *API BREAK* etk_image_new_from_file() and
etk_image_set_from_file() now takes a "key" parameter that allows you to
load images from Eet files. You can just set it to NULL if you don't
need it.
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_button_test.c 15 Aug 2006 15:59:01 - 1.12
+++ etk_button_test.c 29 Dec 2006 22:10:12 - 1.13
@@ -30,7 +30,7 @@
etk_tooltips_tip_set(button_normal, "This is a normal button");
etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE,
0);
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png",
NULL);
button_normal = etk_button_new_with_label("Button with an image");
etk_tooltips_tip_set(button_normal, "This is a normal button with an
image");
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_dnd_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_dnd_test.c 6 Oct 2006 18:15:25 - 1.1
+++ etk_dnd_test.c 29 Dec 2006 22:10:12 - 1.2
@@ -63,7 +63,7 @@
sep = etk_hseparator_new();
etk_box_append(ETK_BOX(vbox2), sep, ETK_BOX_START, ETK_BOX_NONE, 0);
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png",
NULL);
button = etk_button_new_with_label("Drop an image here");
etk_widget_dnd_dest_set(button, ETK_TRUE);
dnd_types_num = 1;
@@ -158,7 +158,7 @@
printf("Widget got the file: %s\n", files->files[i]);
if ((image = strstr(files->files[i], "file://")) != NULL)
- etk_image_set_from_file(ETK_IMAGE(data), image + strlen("file://"));
+ etk_image_set_from_file(ETK_IMAGE(data), image + strlen("file://"),
NULL);
}
}
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_embed_test.c6 Oct 2006 17:04:13 - 1.8
+++ etk_embed_test.c29 Dec 2006 22:10:12 - 1.9
@@ -99,7 +99,7 @@
int i;
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_image_test.c15 Aug 2006 16:33:26 - 1.7
+++ etk_image_test.c29 Dec 2006 22:10:12 - 1.8
@@ -19,9 +19,9 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
etk_image_keep_aspect_set(ETK_IMAGE(images[0]), ETK_TRUE);
- images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png",
NULL);
etk_image_keep_aspect_set(ETK_IMAGE(images[1]), ETK_FALSE);
labels[0] = etk_label_new("Keep aspect");
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_notebook_test.c 15 Aug 2006 16:33:26 - 1.11
+++ etk_notebook_test.c 29 Dec 2006 22:10:12 - 1.12
@@ -75,7 +75,7 @@
Etk_Widget *entries[6];
int i;
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png", NULL);
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_shadow_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_shadow_test.c 29 Oct 2006 11:39:54 -00
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_combobox.c etk_image.c etk_image.h
Log Message:
* [Etk_Image] *API BREAK* etk_image_new_from_file() and
etk_image_set_from_file() now takes a "key" parameter that allows you to
load images from Eet files. You can just set it to NULL if you don't
need it.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_combobox.c 10 Dec 2006 13:12:23 - 1.33
+++ etk_combobox.c 29 Dec 2006 22:10:13 - 1.34
@@ -294,7 +294,7 @@
if (item)
etk_image_copy(ETK_IMAGE(combobox->active_item_children[j]),
ETK_IMAGE(item->widgets[i]));
else
-
etk_image_set_from_file(ETK_IMAGE(combobox->active_item_children[j]), NULL);
+
etk_image_set_from_file(ETK_IMAGE(combobox->active_item_children[j]), NULL,
NULL);
break;
default:
break;
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_image.c 29 Dec 2006 21:50:46 - 1.27
+++ etk_image.c 29 Dec 2006 22:10:13 - 1.28
@@ -92,14 +92,15 @@
/**
* @brief Creates a new image and loads the image from an image file
* @param filename the path of the file to load
+ * @param key the key to load (only used if the file is an Eet file, otherwise
you can set it to NULL)
* @return Returns the new image widget
*/
-Etk_Widget *etk_image_new_from_file(const char *filename)
+Etk_Widget *etk_image_new_from_file(const char *filename, const char *key)
{
Etk_Widget *image;
image = etk_image_new();
- etk_image_set_from_file(ETK_IMAGE(image), filename);
+ etk_image_set_from_file(ETK_IMAGE(image), filename, key);
return image;
}
@@ -169,8 +170,9 @@
* @brief Loads the image from a file
* @param image an image
* @param filename the path to the file to load
+ * @param key the key to load (only used if the file is an Eet file, otherwise
you can set it to NULL)
*/
-void etk_image_set_from_file(Etk_Image *image, const char *filename)
+void etk_image_set_from_file(Etk_Image *image, const char *filename, const
char *key)
{
if (!image)
return;
@@ -182,6 +184,12 @@
image->info.file.filename = filename ? strdup(filename) : NULL;
etk_object_notify(ETK_OBJECT(image), "file");
}
+ if (image->info.file.key != key)
+ {
+ free(image->info.file.key);
+ image->info.file.key = key ? strdup(key) : NULL;
+ etk_object_notify(ETK_OBJECT(image), "key");
+ }
_etk_image_load(image);
}
@@ -189,13 +197,25 @@
/**
* @brief Gets the path to the file used by the image
* @param image an image
- * @return Returns the path to the file used by the image (NULL on failure)
+ * @param filename the location where to store the path to the loaded file
+ * @param key the location where to store the key of the loaded image (NULL if
the file is not loaded from an Eet file)
*/
-const char *etk_image_file_get(Etk_Image *image)
+void etk_image_file_get(Etk_Image *image, char **filename, char **key)
{
if (!image || image->source != ETK_IMAGE_FILE)
- return NULL;
- return image->info.file.filename;
+ {
+ if (filename)
+ *filename = NULL;
+ if (key)
+ *key = NULL;
+ }
+ else
+ {
+ if (filename)
+ *filename = image->info.file.filename;
+ if (key)
+ *key = image->info.file.key;
+ }
}
/**
@@ -458,8 +478,7 @@
switch (src_image->source)
{
case ETK_IMAGE_FILE:
- /* TODO: copy the key too.. */
- etk_image_set_from_file(dest_image, src_image->info.file.filename);
+ etk_image_set_from_file(dest_image, src_image->info.file.filename,
src_image->info.file.key);
break;
case ETK_IMAGE_EDJE:
etk_image_set_from_edje(dest_image, src_image->info.edje.filename,
src_image->info.edje.group);
@@ -637,17 +656,11 @@
if (image->source == ETK_IMAGE_EDJE)
etk_image_set_from_edje(image,
etk_property_value_string_get(value), image->info.edje.group);
else
- {
-/* TODO: set the key! */
-etk_image_set_from_file(image,
etk_property_value_string_get(value));
- }
+etk_image_set_from_file(image,
etk_property_value_string_get(value), image->info.file.key);
break;
case ETK_IMAGE_KEY_PROPERTY:
if (image->source == ETK_IMAGE_FILE)
- {
-/* TODO: set the key! */
-//etk_image_set_from_file(image, image->info.file.filename,
etk_property_value_string_get(value));
- }
+etk_image_set_
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_image.c etk_image.h
Log Message:
* [Etk_Image] Rewrite Etk_Image and add etk_image_set_from_data()
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_image.c 25 Dec 2006 14:04:53 - 1.26
+++ etk_image.c 29 Dec 2006 21:50:46 - 1.27
@@ -16,14 +16,14 @@
enum Etk_Image_Property_Id
{
+ ETK_IMAGE_SOURCE_PROPERTY,
ETK_IMAGE_FILE_PROPERTY,
- ETK_IMAGE_EDJE_FILE_PROPERTY,
- ETK_IMAGE_EDJE_GROUP_PROPERTY,
- ETK_IMAGE_EVAS_OBJECT_PROPERTY,
- ETK_IMAGE_KEEP_ASPECT_PROPERTY,
- ETK_IMAGE_USE_EDJE_PROPERTY,
+ ETK_IMAGE_KEY_PROPERTY,
ETK_IMAGE_STOCK_ID_PROPERTY,
- ETK_IMAGE_STOCK_SIZE_PROPERTY
+ ETK_IMAGE_STOCK_SIZE_PROPERTY,
+ ETK_IMAGE_EVAS_OBJECT_PROPERTY,
+ ETK_IMAGE_KEEP_ASPECT_PROPERTY,
+ ETK_IMAGE_ASPECT_RATIO_PROPERTY
};
static void _etk_image_constructor(Etk_Image *image);
@@ -31,9 +31,9 @@
static void _etk_image_property_set(Etk_Object *object, int property_id,
Etk_Property_Value *value);
static void _etk_image_property_get(Etk_Object *object, int property_id,
Etk_Property_Value *value);
static void _etk_image_realize_cb(Etk_Object *object, void *data);
-static void _etk_image_unrealize_cb(Etk_Object *object, void *data);
static void _etk_image_size_request(Etk_Widget *widget, Etk_Size *size);
static void _etk_image_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry);
+static void _etk_image_source_set(Etk_Image *image, Etk_Image_Source source);
static void _etk_image_load(Etk_Image *image);
/**
@@ -47,7 +47,7 @@
* @brief Gets the type of an Etk_Image
* @return Returns the type of an Etk_Image
*/
-Etk_Type *etk_image_type_get()
+Etk_Type *etk_image_type_get(void)
{
static Etk_Type *image_type = NULL;
@@ -56,22 +56,22 @@
image_type = etk_type_new("Etk_Image", ETK_WIDGET_TYPE,
sizeof(Etk_Image),
ETK_CONSTRUCTOR(_etk_image_constructor),
ETK_DESTRUCTOR(_etk_image_destructor));
- etk_type_property_add(image_type, "image_file", ETK_IMAGE_FILE_PROPERTY,
- ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
- etk_type_property_add(image_type, "edje_file",
ETK_IMAGE_EDJE_FILE_PROPERTY,
+ etk_type_property_add(image_type, "source", ETK_IMAGE_SOURCE_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE,
etk_property_value_int(ETK_IMAGE_FILE));
+ etk_type_property_add(image_type, "file", ETK_IMAGE_FILE_PROPERTY,
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
- etk_type_property_add(image_type, "edje_group",
ETK_IMAGE_EDJE_GROUP_PROPERTY,
+ etk_type_property_add(image_type, "key", ETK_IMAGE_KEY_PROPERTY,
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
- etk_type_property_add(image_type, "evas_object",
ETK_IMAGE_EVAS_OBJECT_PROPERTY,
- ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
- etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
- ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_TRUE));
- etk_type_property_add(image_type, "use_edje",
ETK_IMAGE_USE_EDJE_PROPERTY,
- ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE, NULL);
etk_type_property_add(image_type, "stock_id",
ETK_IMAGE_STOCK_ID_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_NO_STOCK));
etk_type_property_add(image_type, "stock_size",
ETK_IMAGE_STOCK_SIZE_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_SMALL));
+ etk_type_property_add(image_type, "evas_object",
ETK_IMAGE_EVAS_OBJECT_PROPERTY,
+ ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
+ etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_TRUE));
+ etk_type_property_add(image_type, "aspect_ratio",
ETK_IMAGE_ASPECT_RATIO_PROPERTY,
+ ETK_PROPERTY_DOUBLE, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_double(0.0));
image_type->property_set = _etk_image_property_set;
image_type->property_get = _etk_image_property_get;
@@ -81,33 +81,56 @@
}
/**
- * @brief Creates a new image
+ * @brief Creates a new empty image
* @return Returns the new image widget
*/
-Etk_Widget *etk_image_new()
+Etk_Widget *etk_image_new(void)
{
return etk_widget_new(ETK_IMAGE_TYPE, NULL);
}
/**
* @brief Creates a new image and loads the image
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_label.c Log Message: * [Label] Sometimes the label's width has to be a bit bigger to prevent the text from being wrapped. So 1px is added to the native width returrned by Evas. It should fix some problems with multiline labels. === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_label.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- etk_label.c 20 Oct 2006 17:51:44 - 1.23 +++ etk_label.c 27 Dec 2006 17:35:12 - 1.24 @@ -262,7 +262,7 @@ etk_widget_size_request(widget, &requested_size); evas_object_move(label->text_object, geometry.x + (geometry.w - requested_size.w) * label->xalign, geometry.y + (geometry.h - requested_size.h) * label->yalign); - evas_object_resize(label->text_object, requested_size.w, requested_size.h); + evas_object_resize(label->text_object, requested_size.w + 1, requested_size.h); evas_object_move(label->clip, geometry.x, geometry.y); evas_object_resize(label->clip, geometry.w, geometry.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.php&p=sourceforge&CID=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_editable.c Log Message: * [Editable] Fix deletion of multi-bytes chars in the entry. Thanks to olofsj for spotting this :) === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_editable.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- etk_editable.c 28 Nov 2006 21:40:07 - 1.3 +++ etk_editable.c 27 Dec 2006 12:03:41 - 1.4 @@ -808,7 +808,7 @@ if (end_id <= start_id) return 0; - etk_string_delete(sd->text, start, end - start); + etk_string_delete(sd->text, start_id, end_id - start_id); sd->unicode_length -= (end - start); _etk_editable_text_update(editable); - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default
Modified Files:
default.edc
Log Message:
Lib:
* [Spinner] The spinner is now completely done. It may need some theming
though...
* [Tree2] More work!
Theme:
--
* [Tree2] Improve the theme of the tree2's headers
Misc:
-
* [Documentation] More doc
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- default.edc 28 Nov 2006 21:40:06 - 1.26
+++ default.edc 26 Dec 2006 14:51:23 - 1.27
@@ -4,6 +4,7 @@
#include "macros/paned.edc"
#include "macros/scrollbar.edc"
#include "macros/toolbar.edc"
+#include "macros/tree_header.edc"
fonts {
font: "Vera.ttf" "Vera";
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
combobox.edc tree.edc
Log Message:
Lib:
* [Spinner] The spinner is now completely done. It may need some theming
though...
* [Tree2] More work!
Theme:
--
* [Tree2] Improve the theme of the tree2's headers
Misc:
-
* [Documentation] More doc
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/combobox.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- combobox.edc10 Dec 2006 13:12:23 - 1.10
+++ combobox.edc26 Dec 2006 14:51:23 - 1.11
@@ -86,6 +86,28 @@
}
}
}
+ /*part {
+ name: "entry";
+ description {
+state: "default" 0.0;
+color: 255 248 235 255;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 5 6;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -24 -7;
+}
+image {
+ normal: "entry.png";
+ border: 8 8 8 8;
+}
+fill {
+ smooth: 0;
+}
+ }
+ }*/
part {
name: "etk.swallow.content";
type: SWALLOW;
@@ -94,11 +116,11 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
- offset: 8 8;
+ offset: 11 9;
}
rel2 {
relative: 1.0 1.0;
- offset: -25 -9;
+ offset: -28 -10;
}
}
}
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- tree.edc9 Dec 2006 09:56:32 - 1.23
+++ tree.edc26 Dec 2006 14:51:23 - 1.24
@@ -1,3 +1,25 @@
+/**
+ * group "etk/tree"
+ *
+ * This group corresponds to the background object of the tree, which is below
+ * the headers-bar and the scrolled-view. Most of the time, it is only used to
+ * defined the values of the different settings
+ *
+ * Different settings:
+ * ---
+ * - "tree_contains_headers": a boolean setting whether the headers-bar should
+ *be contained by the tree itself (the headers-bar is then above the
+ *scrolled-view) or contained by the scrolled-view (the headers-bar is then
+ *inside the scrolled-view). The default value is "1": the headers-bar is
+ *contained directly by the tree. Set it to "0" otherwise
+ * - "separator_color": the rgba color of the vertical lines separating the
+ *columns of the tree. Default value is "255 255 255 0"
+ *
+ * Signals:
+ *
+ * - common widget's signals: "etk,state,enter", "etk,state,leave",
+ *"etk,state,focused", "etk,state,unfocused", "etk,state,shown"
+ */
group {
name: "etk/tree";
data {
@@ -5,15 +27,53 @@
item: "separator_color" "204 204 204 140";
}
}
-group {
- name: "etk/tree/grid";
- data {
- item: "separator_color" "204 204 204 140";
- item: "row_height" "24";
- item: "cell_margins" "4 4 2 2";
- item: "expander_size" "18";
- }
-}
+
+
+/**
+ * group "etk/tree/header"
+ * "etk/tree/header_unique"
+ * "etk/tree/header_first"
+ * "etk/tree/header_last"
+ * ---
+ * These groups correspond to the header-objects of the tree's columns.
+ * - Only "etk/tree/header" has to be necessarily implemented. It is the
generic
+ *group for the column headers.
+ * - "etk/tree/header_first" is used for the header of the first visible
column,
+ *when several columns can be seen. If this group doesn't exist,
+ *"etk/tree/header" is used
+ * - "etk/tree/header_last" is used for the header of the last visible column,
+ *when several columns can be seen. If this group doesn't exist,
+ *"etk/tree/header" is used
+ * - "etk/tree/header_last" is used for the header of the column when only one
+ *column is visible seen. If this group doesn't exist, "etk/tree/header"
+ *is used
+ *
+ * Signals:
+ *
+ * - "etk,state,pressed": emitted when the header is pressed
+ * - "etk,state,released": emitted when the header is released
+ * - "etk,state,clicked": emitted when the header is clicked
+ * - common widget's signals: "etk,state,enter", "etk,state,leave",
"etk,state,shown"
+ */
+TREE_HEADER("etk/tree/header", "tree_header_middle.png",
"tree_header_middle2.png");
+TREE_HEADER("etk/tree/header_unique", "tree_header_unique.png",
"tree_header_unique2.png");
+TREE_HEADER("etk/tree/header_first", "tree_header_first.png",
"tree_header_first2.png");
+TREE_HEADER("etk/tree/header_last", "tree_header_last.png",
"tree_header_last2.png");
+
+
+/
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am images.edc Added Files: tree_header_first.png tree_header_first2.png tree_header_last.png tree_header_last2.png tree_header_middle.png tree_header_middle2.png tree_header_over.png tree_header_unique.png tree_header_unique2.png Removed Files: tree_header_active.png tree_header_inactive.png Log Message: Lib: * [Spinner] The spinner is now completely done. It may need some theming though... * [Tree2] More work! Theme: -- * [Tree2] Improve the theme of the tree2's headers Misc: - * [Documentation] More doc === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 17 Dec 2006 15:10:21 - 1.14 +++ Makefile.am 26 Dec 2006 14:51:23 - 1.15 @@ -82,8 +82,9 @@ tree_desc_arrow.png \ tree_expander_fold.png \ tree_expander_unfold.png \ -tree_header_active.png \ -tree_header_inactive.png \ +tree_header_over.png \ +tree_header_unique.png \ +tree_header_unique2.png \ tree.png \ tree_shadow.png \ vpaned_handle.png \ === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- images.edc 9 Dec 2006 09:56:32 - 1.34 +++ images.edc 26 Dec 2006 14:51:23 - 1.35 @@ -48,8 +48,15 @@ image: "spinner_button_down2.png" COMP; image: "tree.png" COMP; image: "tree_shadow.png" COMP; - image: "tree_header_inactive.png" COMP; - image: "tree_header_active.png" COMP; + image: "tree_header_over.png" COMP; + image: "tree_header_first.png" COMP; + image: "tree_header_first2.png" COMP; + image: "tree_header_last.png" COMP; + image: "tree_header_last2.png" COMP; + image: "tree_header_middle.png" COMP; + image: "tree_header_middle2.png" COMP; + image: "tree_header_unique.png" COMP; + image: "tree_header_unique2.png" COMP; image: "tree_expander_fold.png" COMP; image: "tree_expander_unfold.png" COMP; image: "hseparator.png" COMP; - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/macros Modified Files: Makefile.am Added Files: tree_header.edc Log Message: Lib: * [Spinner] The spinner is now completely done. It may need some theming though... * [Tree2] More work! Theme: -- * [Tree2] Improve the theme of the tree2's headers Misc: - * [Documentation] More doc === RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 6 Oct 2006 17:04:12 - 1.3 +++ Makefile.am 26 Dec 2006 14:51:23 - 1.4 @@ -4,4 +4,5 @@ glint.edc \ paned.edc \ scrollbar.edc \ - toolbar.edc + toolbar.edc \ + tree_header.edc - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/doc/img/widgets Added Files: spinner.png Log Message: Lib: * [Spinner] The spinner is now completely done. It may need some theming though... * [Tree2] More work! Theme: -- * [Tree2] Improve the theme of the tree2's headers Misc: - * [Documentation] More doc - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_spinner.c etk_spinner.h etk_tree2.c etk_tree2.h
etk_utils.h etk_widget.c
Log Message:
Lib:
* [Spinner] The spinner is now completely done. It may need some theming
though...
* [Tree2] More work!
Theme:
--
* [Tree2] Improve the theme of the tree2's headers
Misc:
-
* [Documentation] More doc
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_spinner.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_spinner.c 19 Dec 2006 21:43:50 - 1.3
+++ etk_spinner.c 26 Dec 2006 14:51:23 - 1.4
@@ -22,7 +22,9 @@
enum Etk_Spinner_Propery_Id
{
- ETK_SPINNER_DIGITS_PROPERTY
+ ETK_SPINNER_DIGITS_PROPERTY,
+ ETK_SPINNER_SNAP_TO_TICKS_PROPERTY,
+ ETK_SPINNER_WRAP_PROPERTY
};
static void _etk_spinner_constructor(Etk_Spinner *spinner);
@@ -35,6 +37,7 @@
static void _etk_spinner_unfocus_cb(Etk_Object *object, void *data);
static void _etk_spinner_key_down_cb(Etk_Object *object, Etk_Event_Key_Down
*event, void *data);
+static void _etk_spinner_key_up_cb(Etk_Object *object, Etk_Event_Key_Up
*event, void *data);
static void _etk_spinner_editable_mouse_in_cb(void *data, Evas *evas,
Evas_Object *object, void *event_info);
static void _etk_spinner_editable_mouse_out_cb(void *data, Evas *evas,
Evas_Object *object, void *event_info);
static void _etk_spinner_editable_mouse_down_cb(void *data, Evas *evas,
Evas_Object *object, void *event_info);
@@ -43,6 +46,7 @@
static void _etk_spinner_selection_received_cb(Etk_Object *object, void
*event, void *data);
static void _etk_spinner_value_changed_handler(Etk_Range *range, double value);
+static void _etk_spinner_step_increment_changed_cb(Etk_Object *object, const
char *property_name, void *data);
static void _etk_spinner_step_start_cb(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _etk_spinner_step_stop_cb(void *data, Evas_Object *obj, const char
*emission, const char *source);
@@ -51,8 +55,11 @@
static void _etk_spinner_update_text_from_value(Etk_Spinner *spinner);
static void _etk_spinner_update_value_from_text(Etk_Spinner *spinner);
+static void _etk_spinner_spin(Etk_Spinner *spinner, double increment);
+static double _etk_spinner_value_snap(Etk_Spinner *spinner, double value);
static void _etk_spinner_selection_copy(Etk_Spinner *spinner,
Etk_Selection_Type selection, Etk_Bool cut);
+
/**
*
* Implementation
@@ -75,6 +82,10 @@
etk_type_property_add(spinner_type, "digits",
ETK_SPINNER_DIGITS_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(0));
+ etk_type_property_add(spinner_type, "snap_to_ticks",
ETK_SPINNER_SNAP_TO_TICKS_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
+ etk_type_property_add(spinner_type, "wrap", ETK_SPINNER_WRAP_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
spinner_type->property_set = _etk_spinner_property_set;
spinner_type->property_get = _etk_spinner_property_get;
@@ -85,6 +96,11 @@
/**
* @brief Creates a new spinner
+ * @param lower the minimal value of the spinner
+ * @param upper the maximal value of the spinner
+ * @param value the value to set to the spinner
+ * @param step_increment specifies by how much the value should be changed
when an arrow is clicked
+ * @param page_increment specifies by how much the value should be changed
when the "page down/up" keys are pressed
* @return Returns the new spinner widget
*/
Etk_Widget *etk_spinner_new(double lower, double upper, double value, double
step_increment, double page_increment)
@@ -124,6 +140,70 @@
return spinner->digits;
}
+/**
+ * @brief Sets whether or not the value of the spinner should be automatically
+ * corrected to the nearest step-increment
+ * @param spinner a spinner
+ * @param snap_to_ticks ETK_TRUE if you want the value to be corrected,
ETK_FALSE otherwise
+ */
+void etk_spinner_snap_to_ticks_set(Etk_Spinner *spinner, Etk_Bool
snap_to_ticks)
+{
+ if (!spinner || spinner->snap_to_ticks == snap_to_ticks)
+ return;
+
+ spinner->snap_to_ticks = snap_to_ticks;
+
+ if (snap_to_ticks)
+ {
+ double new_value;
+
+ new_value = _etk_spinner_value_snap(spinner,
etk_range_value_get(ETK_RANGE(spinner)));
+ etk_range_value_set(ETK_RANGE(spinner), new_value);
+ }
+ etk_object_notify(ETK_OBJECT(spinner), "snap_to_ticks");
+}
+
+/**
+ * @brief Gets whether or not the value of the spinner are automatically
+ * corrected to the nearest step-increment
+ * @param spinner a spinner
+ * @return Returns ETK_TRUE if the value is automatically corre
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
slider.edc tree.edc
Log Message:
Lib:
* [Etk_Fixed] A new container that allows you to position widgets at fixed
coords (see the test app of the scrolled view in etk_test for an example)
* [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been
implemented
Misc:
-
* [Theme] The sliders now look like those of e17
* [Theme] The theme of the rows have been improved (better colors imho)
* [Autofoo] make dist is fixed
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/slider.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- slider.edc 6 Oct 2006 17:04:13 - 1.4
+++ slider.edc 9 Dec 2006 09:56:32 - 1.5
@@ -1,6 +1,6 @@
group {
name: "etk/hslider";
- min: 30 18;
+ min: 32 32;
parts {
part {
name: "slider_bar";
@@ -26,23 +26,25 @@
part {
name: "slider_bar_confine";
type: RECT;
+ mouse_events: 0;
description {
state: "default" 0.0;
visible: 0;
rel1 {
relative: 0.0 0.0;
- offset: -2 8;
+ offset: 3 6;
to: "slider_bar";
}
rel2 {
relative: 1.0 0.0;
- offset: 2 9;
+ offset: -5 7;
to: "slider_bar";
}
}
}
part {
name: "etk.dragable.slider";
+ type: RECT;
dragable {
confine: "slider_bar_confine";
x: 1 1 1;
@@ -50,58 +52,61 @@
}
description {
state: "default" 0.0;
-min: 34 18;
-max: 34 18;
-image {
- normal: "hhandle.png";
- border: 10 10 0 0;
+color: 255 255 255 0;
+min: 16 16;
+max: 16 16;
+ }
+ }
+ part {
+ name: "slider_button";
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+min: 32 32;
+max: 32 32;
+rel1 {
+ to: "etk.dragable.slider";
}
-fill {
- smooth: 0;
+rel2 {
+ to: "etk.dragable.slider";
+}
+image {
+ normal: "slider_button1.png";
}
}
description {
state: "down" 0.0;
inherit: "default" 0.0;
image {
- normal: "hhandle_down.png";
+ normal: "slider_button2.png";
}
}
}
+ FOCUS_GLOW(0.0, 0.0, 0, -13, "slider_bar", 1.0, 1.0, -1, 10,
"slider_bar")
part {
- name: "dragable_thumb";
+ name: "slider_glow";
mouse_events: 0;
description {
state: "default" 0.0;
+color: 255 255 255 0;
+min: 32 32;
+max: 32 32;
rel1 {
- relative: 0.5 0.5;
- offset: -9 -4;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
rel2 {
- relative: 0.5 0.5;
- offset: 6 1;
- to: "etk.dragable.slider";
+ to: "slider_button";
}
image {
- normal: "hhandle_thumb.png";
-}
-fill {
- smooth: 0;
+ normal: "slider_button_glow.png";
}
}
description {
-state: "down" 0.0;
+state: "visible" 0.0;
inherit: "default" 0.0;
-rel1 {
- offset: -8 -3;
-}
-rel2 {
- offset: 7 2;
-}
+color: 255 255 255 255;
}
}
- FOCUS_GLOW(0.0, 0.0, 0, -9, "slider_bar", 1.0, 1.0, -1, 8, "slider_bar")
}
programs {
program {
@@ -109,16 +114,38 @@
signal: "mouse,down,1*";
source: "etk.dragable.slider";
action: STATE_SET "down" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
}
program {
name: "hslider_drag_up";
signal: "mouse,up,1";
source: "etk.dragable.slider";
action: STATE_SET "default" 0.0;
- target: "etk.dragable.slider";
- target: "dragable_thumb";
+ target: "slider_button";
+ }
+ program {
+name: "hslider_in";
+signal: "mouse,in";
+source: "etk.dragable.slider";
+ action: STATE_SET "visible" 0.0;
+transition: SINUSOIDAL 1.0;
+target: "slider_glow";
+after: "hslider_in2";
+ }
+ program {
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_scrolled_view_test.c etk_tree2_test.c
Log Message:
Lib:
* [Etk_Fixed] A new container that allows you to position widgets at fixed
coords (see the test app of the scrolled view in etk_test for an example)
* [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been
implemented
Misc:
-
* [Theme] The sliders now look like those of e17
* [Theme] The theme of the rows have been improved (better colors imho)
* [Autofoo] make dist is fixed
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_scrolled_view_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_scrolled_view_test.c15 Aug 2006 15:59:01 - 1.4
+++ etk_scrolled_view_test.c9 Dec 2006 09:56:32 - 1.5
@@ -1,11 +1,19 @@
#include "etk_test.h"
+#define BUTTON_WIDTH 150
+#define BUTTON_HEIGHT 40
+#define SPACING 5
+#define NUM_COLS 5
+#define NUM_ROWS 15
+
/* Creates the window for the scrolled view test */
void etk_test_scrolled_view_window_create(void *data)
{
static Etk_Widget *win = NULL;
Etk_Widget *scrolled_view;
+ Etk_Widget *fixed;
Etk_Widget *button;
+ int i, j;
if (win)
{
@@ -20,10 +28,19 @@
scrolled_view = etk_scrolled_view_new();
etk_container_add(ETK_CONTAINER(win), scrolled_view);
+
+ fixed = etk_fixed_new();
+ etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(scrolled_view),
fixed);
- button = etk_button_new_with_label("Scrolled View Test");
- etk_widget_size_request_set(button, 300, 300);
- etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(scrolled_view),
button);
+ for (i = 0; i < NUM_COLS; i++)
+ {
+ for (j = 0; j < NUM_ROWS; j++)
+ {
+ button = etk_button_new_with_label("Scrolled View Test");
+ etk_widget_size_request_set(button, BUTTON_WIDTH, BUTTON_HEIGHT);
+ etk_fixed_put(ETK_FIXED(fixed), button, (BUTTON_WIDTH + SPACING) * i,
(BUTTON_HEIGHT + SPACING) * j);
+ }
+ }
etk_widget_show_all(win);
}
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree2_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_tree2_test.c28 Nov 2006 21:40:07 - 1.1
+++ etk_tree2_test.c9 Dec 2006 09:56:32 - 1.2
@@ -1,13 +1,14 @@
#include "etk_test.h"
-#include
#include
+#include
#include "config.h"
+static void _etk_test_tree2_key_down_cb(Etk_Object *object, Etk_Event_Key_Down
*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 *hpaned;
Etk_Widget *tree;
Etk_Tree2_Col *col1, *col2, *col3, *col4;
Etk_Tree2_Row *row;
@@ -22,13 +23,12 @@
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);
-
- hpaned = etk_hpaned_new();
- etk_container_add(ETK_CONTAINER(win), hpaned);
tree = etk_tree2_new();
- etk_paned_child1_set(ETK_PANED(hpaned), tree, ETK_TRUE);
+ 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);
@@ -50,16 +50,47 @@
}
etk_tree2_thaw(ETK_TREE2(tree));
- /*tree = etk_tree2_new();
- etk_paned_child2_set(ETK_PANED(hpaned), tree, ETK_TRUE);
+ etk_widget_show_all(win);
+}
- etk_tree2_mode_set(ETK_TREE2(tree), ETK_TREE2_MODE_TREE);
- etk_tree2_multiple_select_set(ETK_TREE2(tree), ETK_TRUE);
- 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));*/
+/* Called when a key is pressed while the tree is focused:
+ * we use this to delete the selected rows if "DEL" is pressed */
+static void _etk_test_tree2_key_down_cb(Etk_Object *object, Etk_Event_Key_Down
*event, void *data)
+{
+ Etk_Tree2 *tree;
+ Etk_Tree2_Row *r;
- etk_widget_show_all(win);
+ if (!(tree = ETK_TREE2(object)))
+ return;
+
+ if (strcmp(event->keyname, "Delete") ==
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am images.edc Added Files: slider_button1.png slider_button2.png slider_button_glow.png Removed Files: dialog_logo.png hhandle.png hhandle_down.png hhandle_thumb.png tree_bg.png vhandle.png vhandle_down.png vhandle_thumb.png Log Message: Lib: * [Etk_Fixed] A new container that allows you to position widgets at fixed coords (see the test app of the scrolled view in etk_test for an example) * [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been implemented Misc: - * [Theme] The sliders now look like those of e17 * [Theme] The theme of the rows have been improved (better colors imho) * [Autofoo] make dist is fixed === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- Makefile.am 28 Nov 2006 21:57:50 - 1.12 +++ Makefile.am 9 Dec 2006 09:56:32 - 1.13 @@ -67,6 +67,9 @@ scrollbar_vdrag1.png \ scrollbar_vdrag2.png \ scrollbar_vdrag_thumb.png \ +slidet_button1.png \ +slidet_button2.png \ +slidet_button_glow.png \ spinner_bg.png \ spinner_button_down1.png \ spinner_button_down2.png \ === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- images.edc 28 Nov 2006 21:40:06 - 1.33 +++ images.edc 9 Dec 2006 09:56:32 - 1.34 @@ -18,13 +18,6 @@ image: "entry.png" COMP; image: "text_view_bg.png" COMP; image: "text_view_over.png" COMP; - image: "dialog_logo.png" COMP; - image: "hhandle.png" COMP; - image: "hhandle_down.png" COMP; - image: "hhandle_thumb.png" COMP; - image: "vhandle.png" COMP; - image: "vhandle_down.png" COMP; - image: "vhandle_thumb.png" COMP; image: "hslider_bar.png" COMP; image: "vslider_bar.png" COMP; image: "hscrollbar_trough.png" COMP; @@ -45,6 +38,9 @@ image: "scrollbar_vdrag2.png" COMP; image: "scrollbar_hdrag_thumb.png" COMP; image: "scrollbar_vdrag_thumb.png" COMP; + image: "slider_button1.png" COMP; + image: "slider_button2.png" COMP; + image: "slider_button_glow.png" COMP; image: "spinner_bg.png" COMP; image: "spinner_button_up1.png" COMP; image: "spinner_button_up2.png" COMP; - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
Lib:
* [Etk_Fixed] A new container that allows you to position widgets at fixed
coords (see the test app of the scrolled view in etk_test for an example)
* [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been
implemented
Misc:
-
* [Theme] The sliders now look like those of e17
* [Theme] The theme of the rows have been improved (better colors imho)
* [Autofoo] make dist is fixed
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ecore_evas_x11.c8 Oct 2006 10:04:53 - 1.20
+++ ecore_evas_x11.c9 Dec 2006 09:56:32 - 1.21
@@ -398,10 +398,12 @@
static void _window_pointer_set(Etk_Window *window, Etk_Pointer_Type
pointer_type)
{
int x_pointer_type = ECORE_X_CURSOR_LEFT_PTR;
+ Ecore_Evas *ecore_evas;
Ecore_X_Cursor cursor;
Etk_Engine_Window_Data *engine_data;
engine_data = window->engine_data;
+ ecore_evas = ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)->ecore_evas;
switch (pointer_type)
{
@@ -453,8 +455,10 @@
break;
}
- if ((cursor = ecore_x_cursor_shape_get(x_pointer_type)))
-
ecore_x_window_cursor_set(ecore_evas_software_x11_window_get(ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)->ecore_evas),
cursor);
+ if (pointer_type == ETK_POINTER_NONE)
+
ecore_x_window_cursor_set(ecore_evas_software_x11_window_get(ecore_evas), 0);
+ else if ((cursor = ecore_x_cursor_shape_get(x_pointer_type)))
+
ecore_x_window_cursor_set(ecore_evas_software_x11_window_get(ecore_evas),
cursor);
else
ETK_WARNING("Unable to find the X cursor \"%d\"", pointer_type);
}
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_combobox.c etk_scrolled_view.c
etk_table.c etk_toplevel.c etk_toplevel.h etk_tree.c
etk_tree2.c etk_tree2.h etk_types.h
Added Files:
etk_fixed.c etk_fixed.h
Log Message:
Lib:
* [Etk_Fixed] A new container that allows you to position widgets at fixed
coords (see the test app of the scrolled view in etk_test for an example)
* [Etk_Tree2] More work on Etk_Tree2: deletion and selection has been
implemented
Misc:
-
* [Theme] The sliders now look like those of e17
* [Theme] The theme of the rows have been improved (better colors imho)
* [Autofoo] make dist is fixed
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Etk.h 28 Nov 2006 21:40:07 - 1.45
+++ Etk.h 9 Dec 2006 09:56:32 - 1.46
@@ -40,6 +40,7 @@
#include "etk_entry.h"
#include "etk_event.h"
#include "etk_filechooser_widget.h"
+#include "etk_fixed.h"
#include "etk_frame.h"
#include "etk_iconbox.h"
#include "etk_image.h"
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- Makefile.am 28 Nov 2006 21:40:07 - 1.49
+++ Makefile.am 9 Dec 2006 09:56:32 - 1.50
@@ -38,6 +38,7 @@
etk_entry.h \
etk_event.h \
etk_filechooser_widget.h \
+etk_fixed.h \
etk_frame.h \
etk_iconbox.h \
etk_image.h \
@@ -111,6 +112,7 @@
etk_entry.c \
etk_event.c \
etk_filechooser_widget.c \
+etk_fixed.c \
etk_frame.c \
etk_iconbox.c \
etk_image.c \
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_combobox.c 6 Oct 2006 17:04:14 - 1.31
+++ etk_combobox.c 9 Dec 2006 09:56:32 - 1.32
@@ -1301,7 +1301,7 @@
* @code
* Etk_Combobox *combobox;
*
- * combobox = etk_combobox_new();
+ * combobox = ETK_COMBOBOX(etk_combobox_new());
* etk_combobox_column_add(combobox, ETK_COMBOBOX_IMAGE, 24, ETK_FALSE,
ETK_FALSE, ETK_FALSE, 0.0, 0.5);
* etk_combobox_column_add(combobox, ETK_COMBOBOX_LABEL, 75, ETK_TRUE,
ETK_FALSE, ETK_FALSE, 0.0, 0.5);
* etk_combobox_build(combobox);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_scrolled_view.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_scrolled_view.c 20 Oct 2006 17:51:44 - 1.24
+++ etk_scrolled_view.c 9 Dec 2006 09:56:33 - 1.25
@@ -182,13 +182,13 @@
scrolled_view->hpolicy = ETK_POLICY_AUTO;
scrolled_view->vpolicy = ETK_POLICY_AUTO;
- scrolled_view->hscrollbar = etk_hscrollbar_new(0.0, 0.0, 0.0, 6.0, 40.0,
0.0);
+ scrolled_view->hscrollbar = etk_hscrollbar_new(0.0, 0.0, 0.0, 12.0, 50.0,
0.0);
etk_widget_theme_parent_set(scrolled_view->hscrollbar,
ETK_WIDGET(scrolled_view));
etk_widget_parent_set(scrolled_view->hscrollbar, ETK_WIDGET(scrolled_view));
etk_widget_internal_set(scrolled_view->hscrollbar, ETK_TRUE);
etk_widget_show(scrolled_view->hscrollbar);
- scrolled_view->vscrollbar = etk_vscrollbar_new(0.0, 0.0, 0.0, 6.0, 40.0,
0.0);
+ scrolled_view->vscrollbar = etk_vscrollbar_new(0.0, 0.0, 0.0, 12.0, 50.0,
0.0);
etk_widget_theme_parent_set(scrolled_view->vscrollbar,
ETK_WIDGET(scrolled_view));
etk_widget_parent_set(scrolled_view->vscrollbar, ETK_WIDGET(scrolled_view));
etk_widget_internal_set(scrolled_view->vscrollbar, ETK_TRUE);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_table.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_table.c 6 Oct 2006 17:04:15 - 1.19
+++ etk_table.c 9 Dec 2006 09:56:33 - 1.20
@@ -39,7 +39,7 @@
/**
* @internal
* @brief Gets the type of an Etk_Table
- * @return Returns the type on an Etk_Table
+ * @return Returns the type of an Etk_Table
*/
Etk_Type *etk_table_type_get()
{
@@ -47,11 +47,15 @@
if (!table_type)
{
- table_type = etk_type_new("Etk_Table", ETK_CONTAINER_TYPE,
sizeof(Etk_Table), ETK_CONSTRUCTOR(_etk_table_constructor),
ETK_DESTRUCTOR(_etk_table_destructor));
+ table_type = etk_type_new("Etk_Table", ETK_CONTAINER_TYPE,
sizeof(Etk_Table),
+ ETK_CONSTRUCTOR(_etk_table_constructor),
ETK_DESTRUCTOR(_etk_table_destructor));
- etk_type_property_add(table_type, "num_cols",
ETK_TABLE_NUM_COLS_PROPERTY, ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(0));
- etk_type_property_add(table_type, "num_rows",
ETK_T
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am Log Message: Fix make dist === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Makefile.am 20 Oct 2006 17:51:43 - 1.11 +++ Makefile.am 28 Nov 2006 21:57:50 - 1.12 @@ -67,6 +67,7 @@ scrollbar_vdrag1.png \ scrollbar_vdrag2.png \ scrollbar_vdrag_thumb.png \ +spinner_bg.png \ spinner_button_down1.png \ spinner_button_down2.png \ spinner_button_up1.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.php&p=sourceforge&CID=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/data/themes/default Modified Files: default.edc Log Message: * [Etk_Tree2] A future replacement of Etk_Tree. Still not usable * [Etk_Spinner] A basic spinner widget that needs more work but it is already usable === RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- default.edc 20 Oct 2006 17:51:43 - 1.25 +++ default.edc 28 Nov 2006 21:40:06 - 1.26 @@ -31,6 +31,7 @@ #include "widgets/entry.edc" #include "widgets/text_view.edc" #include "widgets/slider.edc" + #include "widgets/spinner.edc" #include "widgets/scrollbar.edc" #include "widgets/tree.edc" #include "widgets/separator.edc" - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_slider_test.c etk_test.c etk_test.h
Added Files:
etk_tree2_test.c
Log Message:
* [Etk_Tree2] A future replacement of Etk_Tree. Still not usable
* [Etk_Spinner] A basic spinner widget that needs more work but it is
already usable
===
RCS file: /cvs/e/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 29 Oct 2006 11:39:54 - 1.18
+++ Makefile.am 28 Nov 2006 21:40:06 - 1.19
@@ -28,6 +28,7 @@
etk_canvas_test.c \
etk_colorpicker_test.c \
etk_tree_test.c \
+etk_tree2_test.c \
etk_paned_test.c \
etk_scrolled_view_test.c \
etk_menu_test.c \
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_slider_test.c 20 Oct 2006 17:51:44 - 1.7
+++ etk_slider_test.c 28 Nov 2006 21:40:06 - 1.8
@@ -9,6 +9,7 @@
Etk_Widget *table;
Etk_Widget *slider;
Etk_Widget *label;
+ Etk_Widget *spinner;
if (win)
{
@@ -21,7 +22,7 @@
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- table = etk_table_new(2, 2, ETK_FALSE);
+ table = etk_table_new(2, 3, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
slider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
@@ -32,6 +33,10 @@
etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0, ETK_TABLE_NONE);
etk_signal_connect("value_changed", ETK_OBJECT(slider),
ETK_CALLBACK(_etk_test_slider_value_changed), label);
+ spinner = etk_spinner_new(0.0, 255.0, 128.00, 1.0, 10.0);
+ etk_table_attach(ETK_TABLE(table), spinner, 0, 0, 2, 2, 0, 0,
ETK_TABLE_NONE);
+ //etk_signal_connect("value_changed", ETK_OBJECT(spinner),
ETK_CALLBACK(_etk_test_spinner_value_changed), label);
+
slider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
etk_widget_size_request_set(slider, 130, 130);
etk_table_attach_default(ETK_TABLE(table), slider, 1, 1, 0, 0);
@@ -39,6 +44,10 @@
label = etk_label_new("128.00");
etk_table_attach(ETK_TABLE(table), label, 1, 1, 1, 1, 0, 0, ETK_TABLE_NONE);
etk_signal_connect("value_changed", ETK_OBJECT(slider),
ETK_CALLBACK(_etk_test_slider_value_changed), label);
+
+ spinner = etk_spinner_new(0.0, 255.0, 128.00, 1.0, 10.0);
+ etk_table_attach(ETK_TABLE(table), spinner, 1, 1, 2, 2, 0, 0,
ETK_TABLE_NONE);
+ //etk_signal_connect("value_changed", ETK_OBJECT(spinner),
ETK_CALLBACK(_etk_test_spinner_value_changed), label);
etk_widget_show_all(win);
}
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_test.c 29 Oct 2006 11:39:54 - 1.31
+++ etk_test.c 28 Nov 2006 21:40:06 - 1.32
@@ -68,6 +68,11 @@
ETK_TEST_ADVANCED_WIDGET
},
{
+ "Tree2",
+ etk_test_tree2_window_create,
+ ETK_TEST_ADVANCED_WIDGET
+ },
+ {
"Paned",
etk_test_paned_window_create,
ETK_TEST_CONTAINER
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_test.h 29 Oct 2006 11:39:54 - 1.18
+++ etk_test.h 28 Nov 2006 21:40:07 - 1.19
@@ -11,6 +11,7 @@
void etk_test_colorpicker_window_create(void *data);
void etk_test_canvas_window_create(void *data);
void etk_test_tree_window_create(void *data);
+void etk_test_tree2_window_create(void *data);
void etk_test_paned_window_create(void *data);
void etk_test_scrolled_view_window_create(void *data);
void etk_test_menu_window_create(void *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.php&p=sourceforge&CID=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/data/themes/default/images Modified Files: images.edc Added Files: spinner_bg.png Log Message: * [Etk_Tree2] A future replacement of Etk_Tree. Still not usable * [Etk_Spinner] A basic spinner widget that needs more work but it is already usable === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- images.edc 20 Oct 2006 17:51:43 - 1.32 +++ images.edc 28 Nov 2006 21:40:06 - 1.33 @@ -45,6 +45,7 @@ image: "scrollbar_vdrag2.png" COMP; image: "scrollbar_hdrag_thumb.png" COMP; image: "scrollbar_vdrag_thumb.png" COMP; + image: "spinner_bg.png" COMP; image: "spinner_button_up1.png" COMP; image: "spinner_button_up2.png" COMP; image: "spinner_button_down1.png" COMP; - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
spinner.edc tree.edc
Log Message:
* [Etk_Tree2] A future replacement of Etk_Tree. Still not usable
* [Etk_Spinner] A basic spinner widget that needs more work but it is
already usable
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/spinner.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- spinner.edc 10 Jul 2006 03:26:53 - 1.2
+++ spinner.edc 28 Nov 2006 21:40:06 - 1.3
@@ -1,6 +1,6 @@
group {
- name: "spin_button";
- min: 120 18;
+ name: "etk/spinner";
+ min: 60 18;
parts {
part {
name: "spinner";
@@ -15,7 +15,7 @@
offset: -1 8;
}
image {
- normal: "entry.png";
+ normal: "spinner_bg.png";
border: 8 8 8 8;
}
fill {
@@ -39,6 +39,24 @@
}
}
part {
+ name: "etk.swallow.text";
+ type: SWALLOW;
+ description {
+state: "default" 0.0;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 4 3;
+ to: "spinner";
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -17 -1;
+ to: "spinner";
+}
+ }
+ }
+ FOCUS_GLOW(0.0, 0.0, 0, 0, "spinner", 1.0, 1.0, -1, -1, "spinner")
+ part {
name: "up_arrow";
clip_to: "clip";
description {
@@ -91,37 +109,19 @@
normal: "spinner_button_down2.png";
}
}
- }
- part {
- name: "text_area";
- type: SWALLOW;
- description {
-state: "default" 0.0;
-rel1 {
- relative: 0.0 0.0;
- offset: 4 3;
- to: "spinner";
-}
-rel2 {
- relative: 1.0 1.0;
- offset: -15 -3;
- to: "spinner";
-}
- }
}
- FOCUS_GLOW(0.0, 0.0, -1, -1, "spinner", 1.0, 1.0, 0, 0, "spinner")
}
programs {
program {
name: "spinner_focus";
- signal: "focus";
- source: "";
+ signal: "etk,state,focused";
+ source: "etk";
FOCUS_GLOW_ACTION
}
program {
name: "button_unfocus";
- signal: "unfocus";
- source: "";
+ signal: "etk,state,unfocused";
+ source: "etk";
UNFOCUS_GLOW_ACTION
}
program {
@@ -156,25 +156,121 @@
name: "up_arrow_pressed";
source: "up_arrow";
signal: "mouse,down,1*";
-action: SIGNAL_EMIT "scroll_up_start" "";
+action: SIGNAL_EMIT "etk,action,increment,start" "";
}
program {
name: "up_arrow_released";
source: "up_arrow";
signal: "mouse,up,1";
-action: SIGNAL_EMIT "scroll_stop" "";
+action: SIGNAL_EMIT "etk,action,increment,stop" "";
}
program {
name: "down_arrow_pressed";
source: "down_arrow";
signal: "mouse,down,1*";
-action: SIGNAL_EMIT "scroll_down_start" "";
+action: SIGNAL_EMIT "etk,action,decrement,start" "";
}
program {
name: "down_arrow_released";
source: "down_arrow";
signal: "mouse,up,1";
-action: SIGNAL_EMIT "scroll_stop" "";
+action: SIGNAL_EMIT "etk,action,decrement,stop" "";
}
+ }
+}
+
+group {
+ name: "etk/spinner/text";
+ parts {
+ part {
+ name: "etk.text.text";
+type: TEXT;
+mouse_events: 0;
+description {
+ state: "default" 0.0;
+ color: 0 0 0 255;
+ text {
+ text: "Entry";
+ font: "Vera";
+ size: 10;
+ min: 1 1;
+ align: 0.0 0.5;
+ text_class: "spinner";
+ }
+}
+ }
+ }
+}
+
+group {
+ name: "etk/spinner/cursor";
+ min: 1 0;
+ parts {
+ part {
+ name: "cursor";
+ type: RECT;
+ description {
+state: "default" 0.0;
+color: 0 0 0 255;
+visible: 0;
+ }
+ description {
+state: "visible" 0.0;
+inherit: "default" 0.0;
+visible: 1;
+ }
+ }
+ }
+ programs {
+ program {
+ name: "on_cursor_show";
+signal: "etk,action,show,cursor";
+source: "etk";
+ action: ACTION_STOP;
+ target: "cursor_show";
+ target: "cursor_hide";
+ target: "cursor_show_timer";
+ target: "cursor_hide_timer";
+ after: "cursor_show";
+ }
+ program {
+ name: "curs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_editable.c etk_editable.h etk_entry.c
etk_scrollbar.c etk_scrolled_view.h etk_types.h etk_widget.c
Added Files:
etk_spinner.c etk_spinner.h etk_tree2.c etk_tree2.h
etk_tree2_model.c etk_tree2_model.h
Log Message:
* [Etk_Tree2] A future replacement of Etk_Tree. Still not usable
* [Etk_Spinner] A basic spinner widget that needs more work but it is
already usable
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- Etk.h 20 Oct 2006 17:51:44 - 1.44
+++ Etk.h 28 Nov 2006 21:40:07 - 1.45
@@ -61,6 +61,7 @@
#include "etk_separator.h"
#include "etk_shadow.h"
#include "etk_slider.h"
+#include "etk_spinner.h"
#include "etk_statusbar.h"
#include "etk_stock.h"
#include "etk_table.h"
@@ -74,6 +75,8 @@
#include "etk_toplevel.h"
#include "etk_tree.h"
#include "etk_tree_model.h"
+#include "etk_tree2.h"
+#include "etk_tree2_model.h"
#include "etk_viewport.h"
#include "etk_widget.h"
#include "etk_window.h"
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- Makefile.am 20 Oct 2006 17:51:44 - 1.48
+++ Makefile.am 28 Nov 2006 21:40:07 - 1.49
@@ -65,6 +65,7 @@
etk_signal.h \
etk_signal_callback.h \
etk_slider.h \
+etk_spinner.h \
etk_statusbar.h \
etk_stock.h \
etk_string.h \
@@ -79,6 +80,8 @@
etk_toplevel.h \
etk_tree.h \
etk_tree_model.h \
+etk_tree2.h \
+etk_tree2_model.h \
etk_type.h \
etk_types.h \
etk_utils.h \
@@ -135,6 +138,7 @@
etk_signal.c \
etk_signal_callback.c \
etk_slider.c \
+etk_spinner.c \
etk_statusbar.c \
etk_stock.c \
etk_string.c \
@@ -149,6 +153,8 @@
etk_toplevel.c \
etk_tree.c \
etk_tree_model.c \
+etk_tree2.c \
+etk_tree2_model.c \
etk_type.c \
etk_utils.c \
etk_viewport.c \
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_editable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_editable.c 6 Oct 2006 17:04:14 - 1.2
+++ etk_editable.c 28 Nov 2006 21:40:07 - 1.3
@@ -32,6 +32,7 @@
Etk_String *text;
int unicode_length;
+ float align;
int cursor_width;
Etk_Bool selection_on_fg;
int average_char_w;
@@ -130,6 +131,36 @@
}
/**
+ * @brief Sets the alignment of the text inside the editable object
+ * @param editable an editable object
+ * @param align the alignment of the text, from 0.0 (left alignment) to 1.0
(right alignment)
+ */
+void etk_editable_align_set(Evas_Object *editable, float align)
+{
+ Etk_Editable_Smart_Data *sd;
+
+ if (!editable || !(sd = evas_object_smart_data_get(editable)))
+ return;
+
+ sd->align = ETK_CLAMP(align, 0.0, 1.0);
+ _etk_editable_text_position_update(editable, -1);
+}
+
+/**
+ * @brief Gets the alignment of the text inside the editable object
+ * @param editable an editable object
+ * @return Returns the alignment of the text, from 0.0 (left alignment) to 1.0
(right alignment)
+ */
+float etk_editable_align_get(Evas_Object *editable)
+{
+ Etk_Editable_Smart_Data *sd;
+
+ if (!editable || !(sd = evas_object_smart_data_get(editable)))
+ return 0.0;
+ return sd->align;
+}
+
+/**
* @brief Sets whether or not the editable object is in password mode. In
password mode, the
* editable object displays '*' instead of the characters
* @param editable an editable object
@@ -914,6 +945,8 @@
else if ((tx + tw + offset_x) < (ox + ow))
offset_x = (ox + ow) - (tx + tw);
}
+ else
+ offset_x += (ow - tw) * sd->align;
new_ty = oy + ((oh - th) / 2);
evas_object_move(sd->text_object, tx + offset_x, new_ty);
@@ -1004,6 +1037,7 @@
sd->average_char_w = -1;
sd->average_char_h = -1;
+ sd->align = 0.0;
sd->cursor_pos = 0;
sd->cursor_visible = ETK_TRUE;
sd->selection_pos = 0;
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_editable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_editable.h 6 Oct 2006 17:04:14 - 1.2
+++ etk_editable.h 28 Nov 2006 21:40:07 - 1.3
@@ -14,9 +14,10 @@
Evas_Object *etk_editable_add(Evas *evas);
void etk_editable_theme_set(Evas_Object *editable, const char *file,
const char *group);
-
-void etk_editable_password_mode_set(Evas_Object *editable, Etk_Bool
password_mode);
-Etk_Bool etk_editable_password_mode_get(Evas_Object *editable);
+void etk_editable_align_set(Evas_Object *editable, float align);
+floatetk_edita
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines Modified Files: Makefile.am Log Message: * Add a simple GL-X11 engine inheriting from the Ecore_Evas_X11 engine === RCS file: /cvs/e/e17/proto/etk/src/engines/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 5 Sep 2006 00:14:56 - 1.4 +++ Makefile.am 14 Nov 2006 22:32:28 - 1.5 @@ -3,4 +3,5 @@ SUBDIRS = ecore_evas \ ecore_evas_x11 \ ecore_evas_software_x11 \ + ecore_evas_gl_x11 \ ecore_fb - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk Modified Files: configure.in Log Message: * X11-GL engine === RCS file: /cvs/e/e17/proto/etk/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- configure.in31 Aug 2006 17:32:05 - 1.19 +++ configure.in14 Nov 2006 22:33:10 - 1.20 @@ -258,6 +258,7 @@ src/engines/ecore_evas/Makefile src/engines/ecore_evas_x11/Makefile src/engines/ecore_evas_software_x11/Makefile +src/engines/ecore_evas_gl_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile src/tools/Makefile - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_gl_x11 Added Files: Makefile.am ecore_evas_gl_x11.c Log Message: * Add a simple GL-X11 engine inheriting from the Ecore_Evas_X11 engine - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_gl_x11 Log Message: Directory /cvs/e/e17/proto/etk/src/engines/ecore_evas_gl_x11 added to the repository - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
progress_bar.edc tree.edc
Log Message:
* [Etk_Widget] Force Edje to process the signals of the theme object before
calculating its min size. It should fix problems of incorrect size
calculation
(It fixes the width of the popup menu in exhibit and in estickies)
* [Etk_Tree] Emit the theme-signal "etk,state,focused" on the scrolled-view when
the tree is focused.
* [Etk_Shadow] More work, some bugs fixed and add the ability to add a colored
border
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/progress_bar.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- progress_bar.edc6 Oct 2006 17:04:13 - 1.4
+++ progress_bar.edc29 Oct 2006 11:39:54 - 1.5
@@ -41,17 +41,35 @@
}
}
}
+ part {
+ name: "confine";
+ type: RECT;
+ description {
+state: "default" 0.0;
+visible: 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 2 0;
+ to: "progress_bar";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -3 0;
+ to: "progress_bar";
+ }
+ }
+ }
part {
name: "etk.dragable.filler";
mouse_events: 0;
dragable {
- confine: "progress_bar";
+ confine: "confine";
x: 1 1 1;
y: 0 0 0;
}
description {
state: "default" 0.0;
- min: 1 18;
+ min: 0 14;
fixed: 1 1;
rel1 {
relative: 0.5 0.5;
@@ -62,10 +80,10 @@
relative: 0.5 0.5;
offset: 0 0;
to: "progress_bar";
- }
+ }
image {
- normal: "button_up.png";
- border: 8 8 8 8;
+ normal: "scrollbar_hdrag1.png";
+ border: 5 5 5 5;
}
fill {
smooth: 0;
@@ -98,5 +116,22 @@
}
}
}
+ GLINT_PART("etk.dragable.filler")
+ }
+ programs {
+ program {
+ name: "progress_bar_init";
+ signal: "load";
+ after: "progress_bar_glint";
+ }
+ program {
+ name: "progress_bar_glint";
+ signal: "mouse,in";
+ source: "etk.dragable.filler";
+ in: 4.0 2.0;
+ GLINT_ACTION
+ after: "progress_bar_glint";
+ }
+ GLINT_PROGRAM
}
}
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- tree.edc20 Oct 2006 17:51:44 - 1.20
+++ tree.edc29 Oct 2006 11:39:54 - 1.21
@@ -34,22 +34,6 @@
}
}
}
- /*part {
- name: "middle";
- type: RECT;
- description {
-state: "default" 0.0;
-color: 255 255 255 255;
-rel1 {
- relative: 0.0 0.0;
- offset: 8 8;
-}
-rel2 {
- relative: 1.0 1.0;
- offset: -9 -9;
-}
- }
- }*/
part {
name: "etk.swallow.content";
type: SWALLOW;
@@ -89,8 +73,7 @@
}
}
}
- FOCUS_GLOW(0.0, 0.0, -1, -1, "border", 1.0, 1.0, 0, 0, "border")
- DRAG_GLOW(0.0, 0.0, -1, -1, "border", 1.0, 1.0, 0, 0, "border");
+ FOCUS_GLOW(0.0, 0.0, -1, 0, "border", 1.0, 1.0, 0, -1, "border")
}
programs {
program {
@@ -105,24 +88,6 @@
source: "etk";
UNFOCUS_GLOW_ACTION
}
- program {
- name: "drag_enter";
- signal: "drag_enter";
- source: "etk";
- DRAG_ENTER_ACTION
- }
- program {
- name: "drag_leave";
- signal: "drag_leave";
- source: "etk";
- DRAG_LEAVE_ACTION
- }
- program {
- name: "drag_drop";
- signal: "drag_drop";
- source: "etk";
- DRAG_LEAVE_ACTION
- }
}
}
@@ -332,8 +297,9 @@
state: "default" 0.0;
visible: 0;
//color: 239 191 114 80;
-color: 245 205 109 102;
+//color: 245 205 109 102;
//color: 245 205 109 127;
+color: 254 235 199 170;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/images Modified Files: Makefile.am Added Files: picture1.png picture2.png picture3.png picture4.png picture5.png picture6.png Log Message: * [Etk_Widget] Force Edje to process the signals of the theme object before calculating its min size. It should fix problems of incorrect size calculation (It fixes the width of the popup menu in exhibit and in estickies) * [Etk_Tree] Emit the theme-signal "etk,state,focused" on the scrolled-view when the tree is focused. * [Etk_Shadow] More work, some bugs fixed and add the ability to add a colored border === RCS file: /cvs/e/e17/proto/etk/data/images/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 24 Jun 2006 15:59:11 - 1.4 +++ Makefile.am 29 Oct 2006 11:39:53 - 1.5 @@ -2,7 +2,9 @@ FILES = test.png e_icon.png e_logo.png \ 1star.png 2stars.png 3stars.png \ -backdrop.png panel.png panel_shadow.png panel_top.png +backdrop.png panel.png panel_shadow.png panel_top.png \ +picture1.png picture2.png picture3.png \ +picture4.png picture5.png picture6.png filesdir = $(pkgdatadir)/images files_DATA = $(FILES) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ 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:
Makefile.am etk_test.c etk_test.h
Added Files:
etk_shadow_test.c
Log Message:
* [Etk_Widget] Force Edje to process the signals of the theme object before
calculating its min size. It should fix problems of incorrect size
calculation
(It fixes the width of the popup menu in exhibit and in estickies)
* [Etk_Tree] Emit the theme-signal "etk,state,focused" on the scrolled-view when
the tree is focused.
* [Etk_Shadow] More work, some bugs fixed and add the ability to add a colored
border
===
RCS file: /cvs/e/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 6 Oct 2006 17:04:13 - 1.17
+++ Makefile.am 29 Oct 2006 11:39:54 - 1.18
@@ -38,7 +38,8 @@
etk_combobox_test.c \
etk_iconbox_test.c \
etk_text_view_test.c \
-etk_embed_test.c
+etk_embed_test.c \
+etk_shadow_test.c
etk_test_LDADD = $(top_builddir)/src/lib/libetk.la \
@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etk_test.c 20 Oct 2006 17:51:44 - 1.30
+++ etk_test.c 29 Oct 2006 11:39:54 - 1.31
@@ -121,6 +121,11 @@
"Embed Widget",
etk_test_embed_window_create,
ETK_TEST_CONTAINER
+ },
+ {
+ "Shadow",
+ etk_test_shadow_window_create,
+ ETK_TEST_MISC
}
};
static int _etk_test_num_examples = sizeof(_etk_test_examples) / sizeof
(_etk_test_examples[0]);
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_test.h 6 Oct 2006 17:04:13 - 1.17
+++ etk_test.h 29 Oct 2006 11:39:54 - 1.18
@@ -22,5 +22,6 @@
void etk_test_iconbox_window_create(void *data);
void etk_test_text_view_window_create(void *data);
void etk_test_embed_window_create(void *data);
+void etk_test_shadow_window_create(void *data);
#endif
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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/data/themes/default/macros
Modified Files:
glint.edc
Log Message:
* [Etk_Widget] Force Edje to process the signals of the theme object before
calculating its min size. It should fix problems of incorrect size
calculation
(It fixes the width of the popup menu in exhibit and in estickies)
* [Etk_Tree] Emit the theme-signal "etk,state,focused" on the scrolled-view when
the tree is focused.
* [Etk_Shadow] More work, some bugs fixed and add the ability to add a colored
border
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/glint.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- glint.edc 6 Oct 2006 17:04:12 - 1.3
+++ glint.edc 29 Oct 2006 11:39:53 - 1.4
@@ -6,6 +6,7 @@
description { \
state: "default" 0.0; \
color: 255 255 255 255; \
+ fixed: 1 1; \
rel1 { \
offset: 3 3; \
to: rect_part; \
@@ -25,6 +26,7 @@
color: 255 255 255 0; \
align: 0.0 0.0; \
max: 34 13; \
+ fixed: 1 1; \
rel1 { \
relative: 0.0 0.0; \
offset: 2 2; \
@@ -137,6 +139,7 @@
color: 255 255 255 0; \
align: 1.0 1.0; \
max: 34 13; \
+ fixed: 1 1; \
rel1 { \
relative: 0.0 0.0; \
offset: 2 2; \
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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_shadow.c etk_shadow.h etk_tree.c etk_widget.c
Log Message:
* [Etk_Widget] Force Edje to process the signals of the theme object before
calculating its min size. It should fix problems of incorrect size
calculation
(It fixes the width of the popup menu in exhibit and in estickies)
* [Etk_Tree] Emit the theme-signal "etk,state,focused" on the scrolled-view when
the tree is focused.
* [Etk_Shadow] More work, some bugs fixed and add the ability to add a colored
border
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_shadow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_shadow.c22 Oct 2006 14:55:54 - 1.2
+++ etk_shadow.c29 Oct 2006 11:39:54 - 1.3
@@ -35,7 +35,14 @@
enum Etk_Shadow_Property_Id
{
ETK_SHADOW_SHADOW_TYPE_PROPERTY,
- ETK_SHADOW_HAS_BORDER_PROPERTY,
+ ETK_SHADOW_SHADOW_EDGES_PROPERTY,
+ ETK_SHADOW_SHADOW_COLOR_PROPERTY,
+ ETK_SHADOW_SHADOW_OFFSET_X_PROPERTY,
+ ETK_SHADOW_SHADOW_OFFSET_Y_PROPERTY,
+ ETK_SHADOW_SHADOW_RADIUS_PROPERTY,
+ ETK_SHADOW_SHADOW_OPACITY_PROPERTY,
+ ETK_SHADOW_BORDER_PROPERTY,
+ ETK_SHADOW_BORDER_COLOR_PROPERTY
};
static void _etk_shadow_constructor(Etk_Shadow *shadow);
@@ -46,6 +53,7 @@
static void _etk_shadow_realized_cb(Etk_Object *object, void *data);
static void _etk_shadow_unrealized_cb(Etk_Object *object, void *data);
static void _etk_shadow_shadow_recalc(Etk_Shadow *shadow);
+static void _etk_shadow_border_recalc(Etk_Shadow *shadow);
static Etk_Bool _etk_shadow_edge_visible(Etk_Shadow *shadow,
Etk_Shadow_Object_Id object_id);
static int _etk_shadow_gaussian_values[] = {
@@ -109,11 +117,25 @@
{
shadow_type = etk_type_new("Etk_Shadow", ETK_BIN_TYPE,
sizeof(Etk_Shadow),
ETK_CONSTRUCTOR(_etk_shadow_constructor), NULL);
-
+
etk_type_property_add(shadow_type, "shadow_type",
ETK_SHADOW_SHADOW_TYPE_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_SHADOW_NONE));
- etk_type_property_add(shadow_type, "has_border",
ETK_SHADOW_HAS_BORDER_PROPERTY,
- ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
+ etk_type_property_add(shadow_type, "shadow_edges",
ETK_SHADOW_SHADOW_EDGES_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_SHADOW_ALL));
+ etk_type_property_add(shadow_type, "shadow_color",
ETK_SHADOW_SHADOW_COLOR_PROPERTY,
+ ETK_PROPERTY_OTHER, ETK_PROPERTY_NO_ACCESS, NULL);
+ etk_type_property_add(shadow_type, "shadow_offset_x",
ETK_SHADOW_SHADOW_OFFSET_X_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(0));
+ etk_type_property_add(shadow_type, "shadow_offset_y",
ETK_SHADOW_SHADOW_OFFSET_Y_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(0));
+ etk_type_property_add(shadow_type, "shadow_radius",
ETK_SHADOW_SHADOW_RADIUS_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(20));
+ etk_type_property_add(shadow_type, "shadow_opacity",
ETK_SHADOW_SHADOW_OPACITY_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(155));
+ etk_type_property_add(shadow_type, "border", ETK_SHADOW_BORDER_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(0));
+ etk_type_property_add(shadow_type, "border_color",
ETK_SHADOW_BORDER_COLOR_PROPERTY,
+ ETK_PROPERTY_OTHER, ETK_PROPERTY_NO_ACCESS, NULL);
shadow_type->property_set = _etk_shadow_property_set;
shadow_type->property_get = _etk_shadow_property_get;
@@ -131,26 +153,67 @@
return etk_widget_new(ETK_SHADOW_TYPE, NULL);
}
-/* TODOC */
+/**
+ * @brief Sets the different settings of the shadow cast by the shadow
container
+ * @param shadow a shadow container
+ * @param type the type of shadow to cast: ETK_SHADOW_NONE to cast no shadow,
ETK_SHADOW_OUTSIDE to cast the shadow
+ * outside of the container, ETK_SHADOW_INSIDE to cast the shadow inside the
container on the child.
+ * @param edges the edges of the container where the shadow should be cast
(ETK_SHADOW_ALL most of the time)
+ * @param radius the blur radius of the shadow to cast, from 0 to 255
+ * @param offset_x the horizontal offset of the shadow
+ * @param offset_y the vertical offset of the shadow
+ * @param opacity the opacity of the shadow to cast, from 0 (totally
transparent) to 255 (totally opaque)
+ */
void etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity)
{
if (!shadow)
return;
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c
Log Message:
* The HPaned now casts a *small* shadow on the image. It makes the
interface clearer imho (better separation between the image and the left
pane)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- exhibit.h 15 Sep 2006 11:30:10 - 1.36
+++ exhibit.h 22 Oct 2006 15:00:30 - 1.37
@@ -193,6 +193,7 @@
Etk_Widget*table;
Etk_Widget*hpaned;
Etk_Widget*vpaned;
+ Etk_Widget*hpaned_shadow;
Etk_Widget*entry[2];
Etk_Widget*zoom_in[2];
Etk_Widget*zoom_out[2];
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- exhibit_main.c 21 Oct 2006 09:32:31 - 1.86
+++ exhibit_main.c 22 Oct 2006 15:00:30 - 1.87
@@ -905,10 +905,15 @@
}
else
tab = _ex_tab_new(e, ".");
-
+
+ e->hpaned_shadow = etk_shadow_new();
+ etk_shadow_shadow_set(ETK_SHADOW(e->hpaned_shadow), ETK_SHADOW_INSIDE,
+ ETK_SHADOW_LEFT, 5, 2, 0, 115);
+ etk_paned_child2_set(ETK_PANED(e->hpaned), e->hpaned_shadow, ETK_TRUE);
+
e->notebook = etk_notebook_new();
etk_notebook_tabs_visible_set(ETK_NOTEBOOK(e->notebook), ETK_FALSE);
- etk_paned_child2_set(ETK_PANED(e->hpaned), e->notebook, ETK_TRUE);
+ etk_container_add(ETK_CONTAINER(e->hpaned_shadow), e->notebook);
etk_signal_connect("current_page_changed", ETK_OBJECT(e->notebook),
ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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_shadow.c etk_shadow.h
Log Message:
* [Etk_Shadow] Add API funcs to control the shadow
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_shadow.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_shadow.c20 Oct 2006 17:51:44 - 1.1
+++ etk_shadow.c22 Oct 2006 14:55:54 - 1.2
@@ -131,6 +131,82 @@
return etk_widget_new(ETK_SHADOW_TYPE, NULL);
}
+/* TODOC */
+void etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity)
+{
+ if (!shadow)
+ return;
+
+ shadow->type = type;
+ shadow->edges = edges;
+ shadow->radius = ETK_CLAMP(radius, 0, 255);
+ shadow->offset_x = offset_x;
+ shadow->offset_y = offset_y;
+ shadow->color.a = ETK_CLAMP(opacity, 0, 255);
+
+ /* TODO: notify */
+
+ shadow->shadow_need_recalc = ETK_TRUE;
+ etk_widget_size_recalc_queue(ETK_WIDGET(shadow));
+}
+
+/* TODOC */
+void etk_shadow_shadow_get(Etk_Shadow *shadow, Etk_Shadow_Type *type,
Etk_Shadow_Edges *edges, int *radius, int *offset_x, int *offset_y, int
*opacity)
+{
+ if (!shadow)
+ return;
+
+ if (type) *type = shadow->type;
+ if (edges) *edges = shadow->edges;
+ if (radius) *radius = shadow->radius;
+ if (offset_x) *offset_x = shadow->offset_x;
+ if (offset_y) *offset_y = shadow->offset_y;
+ if (opacity)*opacity = shadow->color.a;
+}
+
+/**
+ * @brief Sets the color of the shadow
+ * @param shadow a shadow container
+ * @param r the red component of the color to set (from 0 to 255)
+ * @param g the green component of the color to set (from 0 to 255)
+ * @param b the blue component of the color to set (from 0 to 255)
+ */
+void etk_shadow_shadow_color_set(Etk_Shadow *shadow, int r, int g, int b)
+{
+ int i;
+
+ if (!shadow)
+ return;
+
+ shadow->color.r = r;
+ shadow->color.g = g;
+ shadow->color.b = b;
+
+ evas_color_argb_premul(shadow->color.a, &r, &g, &b);
+ for (i = 0; i < 4; i++)
+ {
+ if (shadow->shadow_objs[i])
+ evas_object_color_set(shadow->shadow_objs[i], r, g, b,
shadow->color.a);
+ }
+}
+
+/**
+ * @brief Gets the color of the shadow
+ * @param shadow a shadow container
+ * @param r the location where to store the red component of the color
+ * @param g the location where to store the green component of the color
+ * @param b the location where to store the blue component of the color
+ */
+void etk_shadow_shadow_color_get(Etk_Shadow *shadow, int *r, int *g, int *b)
+{
+ if (!shadow)
+ return;
+
+ if (r) *r = shadow->color.r;
+ if (g) *g = shadow->color.g;
+ if (b) *b = shadow->color.b;
+}
+
/**
*
* Etk specific functions
@@ -150,6 +226,10 @@
shadow->offset_x = 0;
shadow->offset_y = 0;
shadow->radius = 30;
+ shadow->color.r = 0;
+ shadow->color.g = 0;
+ shadow->color.b = 0;
+ shadow->color.a = 180;
shadow->shadow_need_recalc = ETK_FALSE;
shadow->border_need_recalc = ETK_FALSE;
@@ -419,6 +499,7 @@
int prev_id, next_id;
int size, prev_size, next_size;
Etk_Size shadow_size;
+ Etk_Color color;
if (!shadow || !(evas = etk_widget_toplevel_evas_get(ETK_WIDGET(shadow
return;
@@ -458,6 +539,9 @@
offsets[i] = -offsets[i];
}
+ color = shadow->color;
+ evas_color_argb_premul(color.a, &color.r, &color.g, &color.b);
+
for (i = 0; i < 4; i++)
{
prev_id = (i == 0) ? 3 : (i - 1);
@@ -491,7 +575,7 @@
shadow->shadow_objs[i] = obj;
etk_widget_member_object_add(ETK_WIDGET(shadow), obj);
evas_object_pass_events_set(obj, 1);
- evas_object_color_set(obj, 0, 0, 0, 255 * 0.60);
+ evas_object_color_set(obj, color.r, color.g, color.b, color.a);
evas_object_clip_set(obj, shadow->clip);
evas_object_show(obj);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_shadow.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_shadow.h20 Oct 2006 17:51:44 - 1.1
+++ etk_shadow.h22 Oct 2006 14:55:54 - 1.2
@@ -52,6 +52,7 @@
Etk_Shadow_Type type;
Etk_Shadow_Edges edges;
+ Etk_Color color;
int offset_x;
int offset_y;
int radius;
@@ -66,6 +67,11 @@
Etk_Type *etk_shadow_type_get();
Etk_Widget *etk_shadow_new(void);
+
+void etk_shadow_shadow_set(Etk_Shadow *shadow, Etk_Shadow_Type type,
Etk_Shadow_Edges edges, int radius, int offset_x, int offset_y, int opacity);
+void etk_shadow_shadow_get(Etk_Shadow *shadow, Etk_Shadow_Type *type,
Etk_Shadow_Edges *edges, int *radius, int *offset_x, int *offset_y, int
*opacity);
+void etk_shadow_sha
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
Use a toolbar for the zoom buttons, and use a stock icon for the "go" button
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- exhibit_main.c 7 Oct 2006 11:39:20 - 1.84
+++ exhibit_main.c 21 Oct 2006 09:03:40 - 1.85
@@ -636,6 +636,7 @@
_ex_main_window_show(char *dir)
{
Ex_Tab *tab;
+ Etk_Widget *entry_hbox, *toolbar;
char file[PATH_MAX];
char *homedir;
const char **dnd_types;
@@ -805,46 +806,45 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _("About"),
ETK_STOCK_HELP_BROWSER, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_about_cb),
e);
}
- e->zoom_in[0] = etk_button_new();
+ toolbar = etk_toolbar_new();
+ etk_table_attach(ETK_TABLE(e->table), toolbar,
+ 0, 3, 1, 1,
+ 0, 0, ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+
+ e->zoom_in[0] = etk_tool_button_new();
e->zoom_in[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"zoom_in");
etk_button_image_set(ETK_BUTTON(e->zoom_in[0]), ETK_IMAGE(e->zoom_in[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_in[0]),
ETK_CALLBACK(_ex_tab_current_zoom_in), e);
- etk_table_attach(ETK_TABLE(e->table), e->zoom_in[0],
- 0, 0, 1, 1,
- 0, 0, ETK_TABLE_NONE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), e->zoom_in[0]);
- e->zoom_out[0] = etk_button_new();
+ e->zoom_out[0] = etk_tool_button_new();
e->zoom_out[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"zoom_out");
etk_button_image_set(ETK_BUTTON(e->zoom_out[0]), ETK_IMAGE(e->zoom_out[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->zoom_out[0]),
ETK_CALLBACK(_ex_tab_current_zoom_out), e);
- etk_table_attach(ETK_TABLE(e->table), e->zoom_out[0],
- 1, 1, 1, 1,
- 0, 0, ETK_TABLE_NONE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), e->zoom_out[0]);
- e->fit[0] = etk_button_new();
+ e->fit[0] = etk_tool_button_new();
e->fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"fit_to_window");
etk_button_image_set(ETK_BUTTON(e->fit[0]), ETK_IMAGE(e->fit[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->fit[0]),
ETK_CALLBACK(_ex_tab_current_fit_to_window), e);
- etk_table_attach(ETK_TABLE(e->table), e->fit[0],
- 2, 2, 1, 1,
- 0, 0, ETK_TABLE_NONE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), e->fit[0]);
- e->original[0] = etk_button_new();
+ e->original[0] = etk_tool_button_new();
e->original[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR"/gui.edj",
"one_to_one");
etk_button_image_set(ETK_BUTTON(e->original[0]), ETK_IMAGE(e->original[1]));
etk_signal_connect_swapped("clicked", ETK_OBJECT(e->original[0]),
ETK_CALLBACK(_ex_tab_current_zoom_one_to_one), e);
- etk_table_attach(ETK_TABLE(e->table), e->original[0],
- 3, 3, 1, 1,
- 0, 0, ETK_TABLE_NONE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), e->original[0]);
+
+ entry_hbox = etk_hbox_new(ETK_FALSE, 0);
+ etk_table_attach(ETK_TABLE(e->table), entry_hbox, 0, 3, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
e->entry[0] = etk_entry_new();
- etk_table_attach(ETK_TABLE(e->table), e->entry[0], 0, 2, 2, 2, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ etk_box_append(ETK_BOX(entry_hbox), e->entry[0], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_signal_connect("key_down", ETK_OBJECT(e->entry[0]),
ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e);
- e->entry[1] = etk_button_new_with_label("Go");
- etk_table_attach(ETK_TABLE(e->table), e->entry[1],
- 3, 3, 2, 2,
- 0, 0, ETK_TABLE_NONE);
+ e->entry[1] = etk_button_new_from_stock(ETK_STOCK_GO_NEXT);
+ etk_button_label_set(ETK_BUTTON(e->entry[1]), NULL);
+ etk_box_append(ETK_BOX(entry_hbox), e->entry[1], ETK_BOX_START,
ETK_BOX_FILL, 0);
etk_signal_connect("clicked", ETK_OBJECT(e->entry[1]),
ETK_CALLBACK(_ex_main_goto_dir_clicked_cb), e);
/* create first tab but dont place it in notebook */
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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/emphasis/data Modified Files: emphasis.glade Log Message: * Add some spacing between the 3 trees === RCS file: /cvs/e/e17/proto/emphasis/data/emphasis.glade,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- emphasis.glade 24 Aug 2006 23:25:27 - 1.4 +++ emphasis.glade 20 Oct 2006 19:09:54 - 1.5 @@ -358,6 +358,7 @@ True True +6 True - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ 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/data/themes/default
Modified Files:
default.edc
Log Message:
Lib:
* [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its
theme-object. If a widget's theme-object has a part called
"etk.swallow.content",
the children of the widget will be automatically swallowed in this part. This
increases a lot the theming possibilities for certain widgets.
* [Etk_Shadow] A new simple container that can cast a shadow or have a border.
* [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused().
* [Etk_Widget] Add etk_widget_focusable_set/get().
* [Etk_Widget] Clipping code has been rewritten and simplified.
* [Etk_Toplevel] Tab focusing is now "circular".
* [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and
there is now etk_object_name_find() to get an object from its name.
* [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes
extrackt)
* [Etk_Box] Fix the focus order of the box.
Misc:
-
* [Theme] "etk.swallow.child" --> "etk.swallow.content".
* [Theme] Improve the theme of the paned and the tree, and make the entry a bit
larger.
* [Test_Paned] Make the checkboxes effective.
* [Test_Entry] Improve the test.
* [Documentation] Documentation++
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default.edc 6 Oct 2006 17:04:12 - 1.24
+++ default.edc 20 Oct 2006 17:51:43 - 1.25
@@ -16,8 +16,6 @@
data {
item: "alias: etk/scrolled_view/hscrollbar" "etk/hscrollbar";
item: "alias: etk/scrolled_view/vscrollbar" "etk/vscrollbar";
- item: "alias: etk/tree/scrolled_view/hscrollbar" "etk/hscrollbar";
- item: "alias: etk/tree/scrolled_view/vscrollbar" "etk/vscrollbar";
item: "alias: etk/menu_bar/menu_item/checkbox"
"etk/menu/menu_item/checkbox";
item: "alias: etk/menu_bar/menu_item/radiobox"
"etk/menu/menu_item/radiobox";
item: "alias: etk/tool_button"
"etk/htoolbar/tool_button";
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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/data/themes/default/widgets
Modified Files:
button.edc colorpicker.edc combobox.edc entry.edc notebook.edc
paned.edc toggle_button.edc tree.edc
Log Message:
Lib:
* [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its
theme-object. If a widget's theme-object has a part called
"etk.swallow.content",
the children of the widget will be automatically swallowed in this part. This
increases a lot the theming possibilities for certain widgets.
* [Etk_Shadow] A new simple container that can cast a shadow or have a border.
* [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused().
* [Etk_Widget] Add etk_widget_focusable_set/get().
* [Etk_Widget] Clipping code has been rewritten and simplified.
* [Etk_Toplevel] Tab focusing is now "circular".
* [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and
there is now etk_object_name_find() to get an object from its name.
* [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes
extrackt)
* [Etk_Box] Fix the focus order of the box.
Misc:
-
* [Theme] "etk.swallow.child" --> "etk.swallow.content".
* [Theme] Improve the theme of the paned and the tree, and make the entry a bit
larger.
* [Test_Paned] Make the checkboxes effective.
* [Test_Entry] Improve the test.
* [Documentation] Documentation++
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/button.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- button.edc 6 Oct 2006 17:04:12 - 1.10
+++ button.edc 20 Oct 2006 17:51:43 - 1.11
@@ -31,7 +31,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/colorpicker.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- colorpicker.edc 6 Oct 2006 17:04:12 - 1.6
+++ colorpicker.edc 20 Oct 2006 17:51:44 - 1.7
@@ -204,7 +204,7 @@
}
rel2 {
relative: 1.0 1.0;
- offset: -1 1;
+ offset: -1 -1;
}
image {
normal: "colorpicker_slider_trough.png";
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/combobox.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- combobox.edc6 Oct 2006 17:04:13 - 1.8
+++ combobox.edc20 Oct 2006 17:51:44 - 1.9
@@ -83,7 +83,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/entry.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- entry.edc 6 Oct 2006 17:04:13 - 1.6
+++ entry.edc 20 Oct 2006 17:51:44 - 1.7
@@ -1,6 +1,6 @@
group {
name: "etk/entry";
- min: 120 18;
+ min: 120 20;
parts {
part {
name: "entry";
@@ -8,11 +8,11 @@
state: "default" 0.0;
rel1 {
relative: 0.0 0.5;
- offset: 0 -9;
+ offset: 0 -10;
}
rel2 {
relative: 1.0 0.5;
- offset: -1 8;
+ offset: -1 9;
}
image {
normal: "entry.png";
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/notebook.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- notebook.edc6 Oct 2006 17:04:13 - 1.9
+++ notebook.edc20 Oct 2006 17:51:44 - 1.10
@@ -15,7 +15,7 @@
offset: -1 -1;
}
image {
- normal: "tab.png";
+ normal: "notebook_tab.png";
border: 8 12 8 0;
}
fill {
@@ -79,7 +79,7 @@
}
}
part {
- name: "etk.swallow.child";
+ name: "etk.swallow.content";
type: SWALLOW;
mouse_events: 0;
description {
@@ -138,7 +138,7 @@
to: "tab";
}
image {
- normal: "tab_shadow.png";
+ normal: "notebook_tab_shadow.png";
}
fill {
smooth: 0;
===
RCS f
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am images.edc tree.png Added Files: notebook_tab.png notebook_tab_shadow.png tree_shadow.png Removed Files: hpaned_separator.png tab.png tab_shadow.png tree_row_even.png tree_row_odd.png vpaned_separator.png Log Message: Lib: * [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its theme-object. If a widget's theme-object has a part called "etk.swallow.content", the children of the widget will be automatically swallowed in this part. This increases a lot the theming possibilities for certain widgets. * [Etk_Shadow] A new simple container that can cast a shadow or have a border. * [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused(). * [Etk_Widget] Add etk_widget_focusable_set/get(). * [Etk_Widget] Clipping code has been rewritten and simplified. * [Etk_Toplevel] Tab focusing is now "circular". * [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and there is now etk_object_name_find() to get an object from its name. * [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes extrackt) * [Etk_Box] Fix the focus order of the box. Misc: - * [Theme] "etk.swallow.child" --> "etk.swallow.content". * [Theme] Improve the theme of the paned and the tree, and make the entry a bit larger. * [Test_Paned] Make the checkboxes effective. * [Test_Entry] Improve the test. * [Documentation] Documentation++ === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 6 Oct 2006 17:04:12 - 1.10 +++ Makefile.am 20 Oct 2006 17:51:43 - 1.11 @@ -1,102 +1,100 @@ MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = background.png \ -hscrollbar_trough.png \ -spinner_button_up1.png \ -border.png \ -hseparator.png \ -spinner_button_up2.png \ -button_down.png \ -hslider_bar.png \ -status_bar.png \ -button_toggled.png \ -images.edc \ -status_resize.png \ -button_up.png \ -tab.png \ -checkbox_down.png \ -menu_arrow.png \ -tab_shadow.png \ -checkbox_off.png \ -menu_bar.png \ -text_view_bg.png \ -checkbox_on.png \ -menu_item_highlight.png \ -text_view_over.png \ -combo_arrow.png \ -menu_item_outline.png \ -tooltip_border.png \ -menu_item_shadow1.png \ -tooltip.png \ -dialog_logo.png \ -menu_item_shadow2.png \ -tree_asc_arrow.png \ -drag_glow.png \ -menu_separator.png \ -tree_bg.png \ -notebook_frame.png \ -tree_desc_arrow.png \ -entry.png \ -radio_off.png \ -tree_expander_fold.png \ -focus_glow.png \ -focus_rect.png \ -radio_on.png \ -tree_expander_unfold.png \ -scrollbar_button_down1.png \ -tree_header_active.png \ -frame_label_over.png \ -scrollbar_button_down2.png \ -tree_header_inactive.png \ -frame_label_under.png \ -scrollbar_button_left1.png \ -frame_outline.png \ -scrollbar_button_left2.png \ -tree.png \ -glint1.png \ -scrollbar_button_right1.png \ -tree_row_even.png \ -glint2.png \ -scrollbar_button_right2.png \ -tree_row_odd.png \ -glint3.png \ -scrollbar_button_up1.png \ -vhandle_down.png \ -glow_arrow_down.png \ -scrollbar_button_up2.png \ -vhandle.png \ -glow_arrow_left.png \ -scrollbar_hdrag1.png \ -vhandle_thumb.png \ -glow_arrow_right.png \ -scrollbar_hdrag2.png \ -vpaned_handle.png \ -glow_arrow_up.png \ -scrollbar_hdrag_thumb.png \ -vpaned_separator.png \ -hhandle_down.png \ -scrollbar_vdrag1.png \ -vscrollbar_trough.png \ -hhandle.png \ -scrollbar_vdrag2.png \ -vseparator.png \ -hhandle_thumb.png \ -scrollbar_vdrag_thumb.png \ -vslider_bar.png \ -hpaned_handle.png \ -spinner_button_down1.png \ -hpaned_separator.png \ -spinner_button_down2.png \ - hscrollbar_trough2.png \ - vscrollbar_trough2.png \ -
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_entry_test.c etk_paned_test.c etk_slider_test.c etk_test.c
Removed Files:
etk_xdnd_test.c
Log Message:
Lib:
* [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its
theme-object. If a widget's theme-object has a part called
"etk.swallow.content",
the children of the widget will be automatically swallowed in this part. This
increases a lot the theming possibilities for certain widgets.
* [Etk_Shadow] A new simple container that can cast a shadow or have a border.
* [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused().
* [Etk_Widget] Add etk_widget_focusable_set/get().
* [Etk_Widget] Clipping code has been rewritten and simplified.
* [Etk_Toplevel] Tab focusing is now "circular".
* [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and
there is now etk_object_name_find() to get an object from its name.
* [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes
extrackt)
* [Etk_Box] Fix the focus order of the box.
Misc:
-
* [Theme] "etk.swallow.child" --> "etk.swallow.content".
* [Theme] Improve the theme of the paned and the tree, and make the entry a bit
larger.
* [Test_Paned] Make the checkboxes effective.
* [Test_Entry] Improve the test.
* [Documentation] Documentation++
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_entry_test.c17 Aug 2006 23:17:58 - 1.10
+++ etk_entry_test.c20 Oct 2006 17:51:44 - 1.11
@@ -1,17 +1,21 @@
#include "etk_test.h"
-static void _etk_test_entry_print_clicked(Etk_Object *object, void *data);
-static void _etk_test_entry_password_toggled(Etk_Object *object, void *data);
+static void _etk_test_entry_normal_print_cb(Etk_Object *object, void *data);
+static void _etk_test_entry_password_show_cb(Etk_Object *object, void *data);
-static Etk_Widget *label = NULL;
-static Etk_Widget *entry = NULL;
+static Etk_Widget *_label_normal = NULL;
+static Etk_Widget *_entry_normal = NULL;
/* Creates the window for the entry test */
void etk_test_entry_window_create(void *data)
{
static Etk_Widget *win = NULL;
+ Etk_Widget *vbox;
+ Etk_Widget *frame;
+ Etk_Widget *separator;
Etk_Widget *table;
Etk_Widget *button;
+ Etk_Widget *password_entry;
if (win)
{
@@ -21,37 +25,58 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Entry Test");
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- table = etk_table_new(3, 2, ETK_FALSE);
- etk_container_add(ETK_CONTAINER(win), table);
-
- entry = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(win), vbox);
+
+ /* Normal entry */
+ frame = etk_frame_new("Normal Entry");
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ table = etk_table_new(2, 2, ETK_FALSE);
+ etk_container_add(ETK_CONTAINER(frame), table);
+
+ _entry_normal = etk_entry_new();
+ etk_entry_text_set(ETK_ENTRY(_entry_normal), "Here is some text");
+ etk_table_attach(ETK_TABLE(table), _entry_normal, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
- button = etk_button_new_with_label("Print text");
+ button = etk_button_new_with_label("Print Text");
etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_TABLE_NONE);
- etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_print_clicked), NULL);
-
- button = etk_toggle_button_new_with_label("Toggle password");
- etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_TABLE_NONE);
- etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_password_toggled), NULL);
+ etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_normal_print_cb), NULL);
+
+ _label_normal = etk_label_new(NULL);
+ etk_table_attach(ETK_TABLE(table), _label_normal, 0, 1, 1, 1, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
- label = etk_label_new(" ");
- etk_table_attach(ETK_TABLE(table), label, 0, 1, 1, 1, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
+ separator = etk_hseparator_new();
+ etk_box_append(ETK_BOX(vbox), separator, ETK_BOX_START, ETK_BOX_NONE, 6);
+
+
+ /* Password entry */
+ frame = etk_frame_new("Password Entry");
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ vbox = etk_vbox_new(ETK_FALSE, 0);
+ etk_container_add(ETK_CONTAINER(fr
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/macros
Modified Files:
toolbar.edc
Log Message:
Lib:
* [Etk_Widget] Etk_Widget has now a generic way to swallow its children in its
theme-object. If a widget's theme-object has a part called
"etk.swallow.content",
the children of the widget will be automatically swallowed in this part. This
increases a lot the theming possibilities for certain widgets.
* [Etk_Shadow] A new simple container that can cast a shadow or have a border.
* [Etk_Widget] etk_widget_focused_get() --> etk_widget_is_focused().
* [Etk_Widget] Add etk_widget_focusable_set/get().
* [Etk_Widget] Clipping code has been rewritten and simplified.
* [Etk_Toplevel] Tab focusing is now "circular".
* [Etk_Object] etk_widget_name_set/get() --> etk_object_name_set/get() and
there is now etk_object_name_find() to get an object from its name.
* [Etk_Object] Fix a segv with etk_object_properties_set_valist() (it fixes
extrackt)
* [Etk_Box] Fix the focus order of the box.
Misc:
-
* [Theme] "etk.swallow.child" --> "etk.swallow.content".
* [Theme] Improve the theme of the paned and the tree, and make the entry a bit
larger.
* [Test_Paned] Make the checkboxes effective.
* [Test_Entry] Improve the test.
* [Documentation] Documentation++
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/toolbar.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toolbar.edc 6 Oct 2006 18:15:24 - 1.1
+++ toolbar.edc 20 Oct 2006 17:51:43 - 1.2
@@ -98,7 +98,7 @@
} \
} \
part { \
- name: "etk.swallow.child"; \
+ name: "etk.swallow.content"; \
type: SWALLOW; \
description { \
state: "active" 0.0; \
@@ -136,7 +136,7 @@
source: "etk"; \
action: STATE_SET "down" 0.0; \
target: "button_shadow2"; \
- target: "etk.swallow.child"; \
+ target: "etk.swallow.content"; \
} \
program { \
name: "button_released"; \
@@ -144,7 +144,7 @@
source: "etk"; \
action: STATE_SET "active" 0.0; \
target: "button_shadow2"; \
- target: "etk.swallow.child"; \
+ target: "etk.swallow.content"; \
} \
program { \
name: "button_enter"; \
@@ -222,4 +222,4 @@
} \
\
GLINT_PROGRAM \
- } \
+ }
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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_iconbox.c etk_popup_window.c
Log Message:
* [Etk_Iconbox] The steps of the scrolled-view is now adapted to the size of
the model's cell.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_iconbox.c 6 Oct 2006 17:04:14 - 1.17
+++ etk_iconbox.c 8 Oct 2006 10:30:05 - 1.18
@@ -212,6 +212,11 @@
return;
iconbox->current_model = model;
+
etk_range_increments_set(etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)),
+ model->width * 0.75, model->width * 3.0);
+
etk_range_increments_set(etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)),
+ model->height * 0.75, model->height * 3.0);
+
etk_signal_emit_by_name("scroll_size_changed", ETK_OBJECT(iconbox->grid),
NULL);
etk_widget_redraw_queue(iconbox->grid);
}
@@ -824,7 +829,8 @@
etk_widget_show(iconbox->grid);
iconbox->models = NULL;
- iconbox->current_model = etk_iconbox_model_new(iconbox);
+ iconbox->current_model = NULL;
+ etk_iconbox_current_model_set(iconbox, etk_iconbox_model_new(iconbox));
iconbox->num_icons = 0;
iconbox->first_icon = NULL;
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_popup_window.c 8 Oct 2006 10:04:54 - 1.16
+++ etk_popup_window.c 8 Oct 2006 10:30:05 - 1.17
@@ -373,8 +373,6 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_down.timestamp < _etk_popup_window_popup_timestamp)
- return;
evas_event_feed_key_down(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_down.keyname,
event_info.key_down.key, event_info.key_down.string, NULL,
event_info.key_down.timestamp, NULL);
@@ -386,8 +384,6 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_up.timestamp < _etk_popup_window_popup_timestamp)
- return;
evas_event_feed_key_up(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_up.keyname,
event_info.key_up.key, event_info.key_up.string, NULL,
event_info.key_up.timestamp, NULL);
@@ -400,9 +396,6 @@
Etk_Popup_Window *pop;
int px, py;
- /*if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp)
- return;*/
-
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
{
@@ -422,12 +415,6 @@
Etk_Popup_Window *pop;
Etk_Bool pointer_over_window = ETK_FALSE;
- if (event_info.mouse_up.timestamp < _etk_popup_window_popup_timestamp)
- {
- printf("Up Timestamps: %d %d\n", event_info.mouse_up.timestamp,
_etk_popup_window_popup_timestamp);
- return;
- }
-
/* If the user clicks on a popped window, we feed the event */
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
@@ -445,7 +432,7 @@
}
/* Otherwise, we pop down the popup windows */
- if (!pointer_over_window
+ if (!pointer_over_window && event_info.mouse_up.timestamp >=
_etk_popup_window_popup_timestamp
&& (event_info.mouse_up.timestamp - _etk_popup_window_popup_timestamp)
>= ETK_POPUP_WINDOW_MIN_POP_TIME)
{
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_iconbox_test.c
Log Message:
Patch from drexil:
- Fix a mem leak in Etk_Config
- Fix some warnings
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_iconbox_test.c 6 Oct 2006 17:04:13 - 1.9
+++ etk_iconbox_test.c 8 Oct 2006 10:11:59 - 1.10
@@ -42,8 +42,6 @@
{
static Etk_Widget *win = NULL;
Etk_Widget *iconbox;
- Etk_Iconbox_Model *mini_model;
- int i;
if (win)
{
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_config.c
Log Message:
Patch from drexil:
- Fix a mem leak in Etk_Config
- Fix some warnings
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_config.c31 Aug 2006 17:33:58 - 1.1
+++ etk_config.c8 Oct 2006 10:11:59 - 1.2
@@ -139,6 +139,18 @@
{
FREED(_etk_config_gen_edd);
FREED(_etk_config_ver_edd);
+ if (_etk_config)
+ {
+ free(_etk_config->version);
+ if (_etk_config->general);
+ {
+ free(_etk_config->general->widget_theme);
+ free(_etk_config->general->font);
+ free(_etk_config->general->engine);
+ free(_etk_config->general);
+ }
+ free(_etk_config);
+ }
}
/**
@@ -206,9 +218,11 @@
{
ETK_WARNING("Your version / configuration of Etk is not valid!");
eet_close(ef);
+free(v);
_etk_config_defaults_apply();
return ETK_FALSE;
}
+ free(v);
}
_etk_config->general = eet_data_read(ef, _etk_config_gen_edd,
"config/general");
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: ecore_evas.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ecore_evas.c6 Oct 2006 17:04:13 - 1.13 +++ ecore_evas.c8 Oct 2006 10:04:53 - 1.14 @@ -108,6 +108,8 @@ NULL, /* popup_window_popdown */ NULL, /* event_callback_set */ + NULL, /* event_timestamp_get */ + NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_fb Modified Files: ecore_fb.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_fb/ecore_fb.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ecore_fb.c 6 Oct 2006 17:04:14 - 1.9 +++ ecore_fb.c 8 Oct 2006 10:04:53 - 1.10 @@ -113,6 +113,8 @@ NULL, /* popup_window_popdown */ _event_callback_set, + NULL, /* event_timestamp_get */ + _mouse_position_get, _mouse_screen_geometry_get, - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Modified Files: ecore_evas_software_x11.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ecore_evas_software_x11.c 6 Oct 2006 17:04:13 - 1.12 +++ ecore_evas_software_x11.c 8 Oct 2006 10:04:53 - 1.13 @@ -69,6 +69,8 @@ NULL, /* popup_window_popdown */ NULL, /* event_callback_set */ + NULL, /* event_timestamp_get */ + NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* [Etk_Engine] Add etk_engine_event_timestamp_get()
* [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug
with Bulgarian X :)
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ecore_evas_x11.c7 Oct 2006 18:45:16 - 1.19
+++ ecore_evas_x11.c8 Oct 2006 10:04:53 - 1.20
@@ -41,9 +41,12 @@
static void _popup_window_popup(Etk_Popup_Window *popup_window);
static void _popup_window_popdown(Etk_Popup_Window *popup_window);
-/* Event and mouse functions */
+/* Event functions */
static void _event_callback_set(void (*callback)(Etk_Event_Type event,
Etk_Event_Global event_info));
+static unsigned int _event_timestamp_get(void);
static int _event_input_handler_cb(void *data, int type, void *event);
+
+/* Mouse functions */
static void _mouse_position_get(int *x, int *y);
static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h);
@@ -153,6 +156,8 @@
_popup_window_popdown,
_event_callback_set,
+ _event_timestamp_get,
+
_mouse_position_get,
_mouse_screen_geometry_get,
@@ -535,6 +540,18 @@
_event_callback = callback;
}
+/* Gets the current event timestamp */
+static unsigned int _event_timestamp_get(void)
+{
+ return ecore_x_current_time_get();
+}
+
+/**
+ *
+ * Mouse's functions
+ *
+ **/
+
/* Gets the position of the mouse pointer */
static void _mouse_position_get(int *x, int *y)
{
@@ -1176,7 +1193,7 @@
}
else
{
- int cur_num, new_num;
+ unsigned int cur_num, new_num;
int i, j;
Ecore_X_Window_State *cur_state, *new_state;
Etk_Bool is_set = ETK_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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_engine.h etk_popup_window.c
Log Message:
* [Etk_Engine] Add etk_engine_event_timestamp_get()
* [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug
with Bulgarian X :)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_engine.c6 Oct 2006 17:04:14 - 1.13
+++ etk_engine.c8 Oct 2006 10:04:54 - 1.14
@@ -745,7 +745,7 @@
/**
* @internal
- * @brief Sets the callback to call when an input event is emitted
+ * @brief Calls the engine's method to set the callback to call when an input
event is emitted
* @param callback the function to call
* @param data the data to pass to the callback
* @note This function is already used by Etk_Event, you must not use it. Use
etk_event_global_callback_add() instead
@@ -758,6 +758,17 @@
}
/**
+ * @brief Calls the engine's method to get the current timestamp used by the
events
+ * @return Returns the current event timestamp
+ */
+unsigned int etk_engine_event_timestamp_get(void)
+{
+ if (!_engine || !_engine->event_timestamp_get)
+ return 0;
+ return _engine->event_timestamp_get();
+}
+
+/**
* @brief Calls the engine's method to get the position of the mouse pointer,
relative to the screen
* @param x the location where to store the x position of the mouse pointer
* @param y the location where to store the y position of the mouse pointer
@@ -901,6 +912,8 @@
INHERIT(popup_window_popdown);
INHERIT(event_callback_set);
+ INHERIT(event_timestamp_get);
+
INHERIT(mouse_position_get);
INHERIT(mouse_screen_geometry_get);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_engine.h6 Oct 2006 17:04:14 - 1.12
+++ etk_engine.h8 Oct 2006 10:04:54 - 1.13
@@ -74,6 +74,8 @@
void (*popup_window_popdown)(Etk_Popup_Window *popup_window);
void (*event_callback_set)(void (*callback)(Etk_Event_Type event,
Etk_Event_Global event_info));
+ unsigned int (*event_timestamp_get)(void);
+
void (*mouse_position_get)(int *x, int *y);
void (*mouse_screen_geometry_get)(int *x, int *y, int *w, int *h);
@@ -82,6 +84,7 @@
void (*selection_clear)(Etk_Selection_Type selection);
+
void (*drag_constructor)(Etk_Drag *drag);
void (*drag_begin)(Etk_Drag *drag);
};
@@ -141,7 +144,9 @@
void etk_engine_popup_window_popup(Etk_Popup_Window *popup_window);
void etk_engine_popup_window_popdown(Etk_Popup_Window *popup_window);
-void etk_engine_event_callback_set(void (*callback)(Etk_Event_Type event,
Etk_Event_Global event_info));
+void etk_engine_event_callback_set(void (*callback)(Etk_Event_Type
event, Etk_Event_Global event_info));
+unsigned int etk_engine_event_timestamp_get(void);
+
void etk_engine_mouse_position_get(int *x, int *y);
void etk_engine_mouse_screen_geometry_get(int *x, int *y, int *w, int *h);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_popup_window.c 7 Oct 2006 18:45:16 - 1.15
+++ etk_popup_window.c 8 Oct 2006 10:04:54 - 1.16
@@ -230,7 +230,7 @@
if (!popup_window->parent || !popup_window->parent->popped_up)
{
_etk_popup_window_popped_parents =
evas_list_append(_etk_popup_window_popped_parents, popup_window);
- _etk_popup_window_popup_timestamp = etk_current_time_get();
+ _etk_popup_window_popup_timestamp = etk_engine_event_timestamp_get();
}
if (popup_window->parent)
{
@@ -400,8 +400,8 @@
Etk_Popup_Window *pop;
int px, py;
- if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp)
- return;
+ /*if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp)
+ return;*/
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
@@ -529,7 +529,7 @@
/* We feed a mouse-move event since the relative position between the
mouse pointer
* and the popup window has changed */
etk_engine_mouse_position_get(&mx, &my);
- evas_event_feed_mouse_move(ETK_TOPLEVEL(pwin)->evas, mx - x, my - y,
etk_current_time_get(), NULL);
+ evas_event_feed_mouse_move(ETK_TOPLEVEL(pwin)->evas, mx - x, my - y,
etk_engine_event_timestamp_get(), NULL);
}
return 1;
-
Take S
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_popup_window.c
Log Message:
* [Etk_Popup_Window] It should fix potential problems with the popup
window. Manowarrior, does it fix your problem?
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_popup_window.c 7 Oct 2006 14:23:40 - 1.14
+++ etk_popup_window.c 7 Oct 2006 18:45:16 - 1.15
@@ -43,7 +43,7 @@
static Etk_Popup_Window_Screen_Edge
_etk_popup_window_edge_get(Etk_Popup_Window *popup_window);
static Etk_Popup_Window_Screen_Edge _etk_popup_window_mouse_edge_get();
-static int _etk_popup_window_popup_timestamp = 0;
+static unsigned int _etk_popup_window_popup_timestamp = 0;
static Ecore_Timer *_etk_popup_window_slide_timer = NULL;
static Evas_List *_etk_popup_window_popped_parents = NULL;
static Etk_Popup_Window *_etk_popup_window_focused_window = NULL;
@@ -373,7 +373,7 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_down.timestamp < (int)_etk_popup_window_popup_timestamp)
+ if (event_info.key_down.timestamp < _etk_popup_window_popup_timestamp)
return;
evas_event_feed_key_down(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_down.keyname,
@@ -386,7 +386,7 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_up.timestamp < (int)_etk_popup_window_popup_timestamp)
+ if (event_info.key_up.timestamp < _etk_popup_window_popup_timestamp)
return;
evas_event_feed_key_up(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_up.keyname,
@@ -400,7 +400,7 @@
Etk_Popup_Window *pop;
int px, py;
- if (event_info.mouse_move.timestamp <
(int)_etk_popup_window_popup_timestamp)
+ if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp)
return;
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
@@ -422,10 +422,12 @@
Etk_Popup_Window *pop;
Etk_Bool pointer_over_window = ETK_FALSE;
- if (event_info.mouse_up.timestamp < (int)_etk_popup_window_popup_timestamp)
+ if (event_info.mouse_up.timestamp < _etk_popup_window_popup_timestamp)
+ {
+ printf("Up Timestamps: %d %d\n", event_info.mouse_up.timestamp,
_etk_popup_window_popup_timestamp);
return;
+ }
- printf("PopWin: Mouse Up: %d %d\n", event_info.mouse_up.pos.x,
event_info.mouse_up.pos.y);
/* If the user clicks on a popped window, we feed the event */
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
@@ -433,7 +435,6 @@
int px, py, pw, ph;
etk_window_geometry_get(ETK_WINDOW(pop), &px, &py, &pw, &ph);
- printf("PopWin: Mouse Up2: %d %d %d %d\n", px, py, pw, ph);
if (ETK_INSIDE(event_info.mouse_up.pos.x, event_info.mouse_up.pos.y, px,
py, pw, ph))
{
pointer_over_window = ETK_TRUE;
@@ -445,7 +446,7 @@
/* Otherwise, we pop down the popup windows */
if (!pointer_over_window
- && ((int)event_info.mouse_up.timestamp -
_etk_popup_window_popup_timestamp) >= ETK_POPUP_WINDOW_MIN_POP_TIME)
+ && (event_info.mouse_up.timestamp - _etk_popup_window_popup_timestamp)
>= ETK_POPUP_WINDOW_MIN_POP_TIME)
{
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
etk_popup_window_popdown(pop);
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* [Etk_Popup_Window] It should fix potential problems with the popup
window. Manowarrior, does it fix your problem?
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_evas_x11.c7 Oct 2006 14:23:40 - 1.18
+++ ecore_evas_x11.c7 Oct 2006 18:45:16 - 1.19
@@ -501,7 +501,6 @@
root = win;
ecore_x_window_geometry_get(root, &root_x, &root_y, &root_w, &root_h);
- printf("Engine: Popup: %d %d %d %d\n", root_x, root_y, root_w, root_h);
_popup_window_input_window = ecore_x_window_input_new(root, root_x,
root_y, root_w, root_h);
ecore_x_window_show(_popup_window_input_window);
ecore_x_pointer_confine_grab(_popup_window_input_window);
@@ -517,7 +516,6 @@
if (!_popup_window_popped_windows)
{
- printf("Engine: Popdown\n");
ecore_x_pointer_ungrab();
ecore_x_keyboard_ungrab();
ecore_x_window_del(_popup_window_input_window);
@@ -723,7 +721,6 @@
ev.mouse_up.pos.x = xev->x + x;
ev.mouse_up.pos.y = xev->y + y;
ev.mouse_up.timestamp = xev->time;
- printf("Engine: Mouse Up: %d %d (%d %d)\n", ev.mouse_up.pos.x,
ev.mouse_up.pos.y, x, y);
_event_callback(ETK_EVENT_MOUSE_UP, ev);
}
else if (type == ECORE_X_EVENT_MOUSE_WHEEL)
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* Debug printfs for Manowarrior
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ecore_evas_x11.c6 Oct 2006 17:04:14 - 1.17
+++ ecore_evas_x11.c7 Oct 2006 14:23:40 - 1.18
@@ -501,6 +501,7 @@
root = win;
ecore_x_window_geometry_get(root, &root_x, &root_y, &root_w, &root_h);
+ printf("Engine: Popup: %d %d %d %d\n", root_x, root_y, root_w, root_h);
_popup_window_input_window = ecore_x_window_input_new(root, root_x,
root_y, root_w, root_h);
ecore_x_window_show(_popup_window_input_window);
ecore_x_pointer_confine_grab(_popup_window_input_window);
@@ -516,6 +517,7 @@
if (!_popup_window_popped_windows)
{
+ printf("Engine: Popdown\n");
ecore_x_pointer_ungrab();
ecore_x_keyboard_ungrab();
ecore_x_window_del(_popup_window_input_window);
@@ -721,6 +723,7 @@
ev.mouse_up.pos.x = xev->x + x;
ev.mouse_up.pos.y = xev->y + y;
ev.mouse_up.timestamp = xev->time;
+ printf("Engine: Mouse Up: %d %d (%d %d)\n", ev.mouse_up.pos.x,
ev.mouse_up.pos.y, x, y);
_event_callback(ETK_EVENT_MOUSE_UP, ev);
}
else if (type == ECORE_X_EVENT_MOUSE_WHEEL)
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_popup_window.c
Log Message:
* Debug printfs for Manowarrior
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_popup_window.c 6 Oct 2006 17:04:14 - 1.13
+++ etk_popup_window.c 7 Oct 2006 14:23:40 - 1.14
@@ -425,6 +425,7 @@
if (event_info.mouse_up.timestamp < (int)_etk_popup_window_popup_timestamp)
return;
+ printf("PopWin: Mouse Up: %d %d\n", event_info.mouse_up.pos.x,
event_info.mouse_up.pos.y);
/* If the user clicks on a popped window, we feed the event */
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
@@ -432,6 +433,7 @@
int px, py, pw, ph;
etk_window_geometry_get(ETK_WINDOW(pop), &px, &py, &pw, &ph);
+ printf("PopWin: Mouse Up2: %d %d %d %d\n", px, py, pw, ph);
if (ETK_INSIDE(event_info.mouse_up.pos.x, event_info.mouse_up.pos.y, px,
py, pw, ph))
{
pointer_over_window = ETK_TRUE;
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_paned.c
Log Message:
* [Etk_Paned] Should fix some redraw bugs
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_paned.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_paned.c 6 Oct 2006 17:04:14 - 1.13
+++ etk_paned.c 7 Oct 2006 13:44:17 - 1.14
@@ -355,11 +355,7 @@
return;
if (paned->child1)
- {
etk_widget_size_request(paned->child1, &child1_size);
- if (paned->child1->geometry.w < child1_size.w)
- etk_widget_redraw_queue(widget);
- }
else
{
child1_size.w = 0;
@@ -367,11 +363,7 @@
}
if (paned->child2)
- {
etk_widget_size_request(paned->child2, &child2_size);
- if (paned->child2->geometry.w < child2_size.w)
- etk_widget_redraw_queue(widget);
- }
else
{
child2_size.w = 0;
@@ -381,6 +373,10 @@
etk_widget_size_request(paned->separator, &separator_size);
size->w = child1_size.w + child2_size.w + separator_size.w;
size->h = ETK_MAX(child1_size.h, ETK_MAX(child2_size.h, separator_size.h));
+
+ /* We force the paned to redraw */
+ /* TODO: maybe a smarter way to fix the redraw bug */
+ etk_widget_redraw_queue(widget);
}
/* Calculates the ideal size of the vpaned */
@@ -393,11 +389,7 @@
return;
if (paned->child1)
- {
etk_widget_size_request(paned->child1, &child1_size);
- if (paned->child1->geometry.h < child1_size.h)
- etk_widget_redraw_queue(widget);
- }
else
{
child1_size.w = 0;
@@ -405,11 +397,7 @@
}
if (paned->child2)
- {
etk_widget_size_request(paned->child2, &child2_size);
- if (paned->child2->geometry.h < child2_size.h)
- etk_widget_redraw_queue(widget);
- }
else
{
child2_size.w = 0;
@@ -419,6 +407,10 @@
etk_widget_size_request(paned->separator, &separator_size);
size->w = ETK_MAX(child1_size.w, ETK_MAX(child2_size.w, separator_size.w));
size->h = child1_size.h + child2_size.h + separator_size.h;
+
+ /* We force the paned to redraw */
+ /* TODO: maybe a smarter way to fix the redraw bug */
+ etk_widget_redraw_queue(widget);
}
/* Resizes the hpaned to the allocated size */
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/estickies/data/themes/default
Modified Files:
default.edc
Log Message:
* Fix the default theme
===
RCS file: /cvs/e/e17/proto/estickies/data/themes/default/default.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- default.edc 7 Oct 2006 12:34:54 - 1.3
+++ default.edc 7 Oct 2006 12:37:33 - 1.4
@@ -290,7 +290,7 @@
}
group {
- name: "etk/preview";
+ name: "preview";
parts {
part {
name: "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.php&p=sourceforge&CID=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/estickies/data/themes/default
Modified Files:
default.edc
Log Message:
* Fix estickies
===
RCS file: /cvs/e/e17/proto/estickies/data/themes/default/default.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default.edc 31 Jul 2006 00:31:45 - 1.2
+++ default.edc 7 Oct 2006 12:34:54 - 1.3
@@ -45,7 +45,7 @@
IMAGE("button_lock");
IMAGE("button_stick");
group {
- name: "window";
+ name: "etk/window";
data {
item: "inset" "11 11 11 11";
}
@@ -73,7 +73,7 @@
}
group {
- name: "button";
+ name: "etk/button";
min: 0 16;
data {
item: "inset" "1 1 1 1";
@@ -118,29 +118,29 @@
programs {
program {
name: "button_pressed";
- signal: "pressed";
- source: "";
+ signal: "etk,state,pressed";
+ source: "etk";
action: STATE_SET "down" 0.0;
target: "button";
}
program {
name: "button_released";
- signal: "released";
- source: "";
+ signal: "etk,state,released";
+ source: "etk";
action: STATE_SET "default" 0.0;
target: "button";
}
program {
name: "button_enter";
- signal: "enter";
- source: "";
+ signal: "etk,state,enter";
+ source: "etk";
action: STATE_SET "over" 0.0;
target: "button";
}
program {
name: "button_leave";
- signal: "leave";
- source: "";
+ signal: "etk,state,leave";
+ source: "etk";
action: STATE_SET "default" 0.0;
target: "button";
}
@@ -148,7 +148,7 @@
}
group {
- name: "toggle_button";
+ name: "etk/toggle_button";
min: 0 16;
data {
item: "inset" "1 1 1 1";
@@ -200,47 +200,47 @@
programs {
program {
name: "toggle_button_activate";
- signal: "activate";
- source: "";
+ signal: "etk,state,on";
+ source: "etk";
script {
activate();
}
}
program {
name: "toggle_button_deactivate";
- signal: "deactivate";
- source: "";
+ signal: "etk,state,off";
+ source: "etk";
script {
deactivate();
}
}
program {
name: "toggle_button_pressed";
- signal: "pressed";
- source: "";
+ signal: "etk,state,pressed";
+ source: "etk";
action: STATE_SET "down" 0.0;
target: "toggle_button";
}
program {
name: "toggle_button_released";
- signal: "released";
- source: "";
+ signal: "etk,state,released";
+ source: "etk";
script {
up();
}
}
program {
name: "toggle_button_enter";
- signal: "enter";
- source: "";
+ signal: "etk,state,enter";
+ source: "etk";
script {
enter();
}
}
program {
name: "toggle_button_leave";
- signal: "leave";
- source: "";
+ signal: "etk,state,leave";
+ source: "etk";
script {
leave();
}
@@ -282,7 +282,7 @@
}
group {
- name: "text_view";
+ name: "etk/text_view";
min: 120 18;
data {
item: "inset" "2 2 2 2";
@@ -290,7 +290,7 @@
}
group {
- name: "preview";
+ name: "etk/preview";
parts {
part {
name: "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.php&p=sourceforge&CID=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/estickies/src/bin
Modified Files:
stickies.c
Log Message:
* Fix estickies
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- stickies.c 25 Aug 2006 11:54:47 - 1.13
+++ stickies.c 7 Oct 2006 12:34:54 - 1.14
@@ -16,7 +16,7 @@
static void _e_sticky_focus_out_cb(Etk_Object *object, void *data);
static void _e_sticky_sticky_cb(Etk_Object *object, const char *property_name,
void *data);
static void _e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void
*data);
-static void _e_sticky_clipboard_text_request_cb(Etk_Object *object, void
*event, void *data);
+static void _e_sticky_selection_text_request_cb(Etk_Object *object, void
*event, void *data);
static void
_e_sticky_key_down_cb(Etk_Object *object, void *event, void *data)
@@ -61,7 +61,7 @@
if(string && (text = etk_string_get(string)))
{
- etk_clipboard_text_set(s->textview, text, strlen(text) + 1);
+ etk_selection_text_set(ETK_SELECTION_CLIPBOARD, text);
etk_object_destroy(ETK_OBJECT(string));
}
@@ -71,7 +71,7 @@
}
else if(!strcmp(ev->key, "v"))
{
-etk_clipboard_text_request(ETK_WIDGET(s->win));
+etk_selection_text_request(ETK_SELECTION_CLIPBOARD,
ETK_WIDGET(s->win));
}
else if(!strcmp(ev->key, "a"))
{
@@ -358,7 +358,7 @@
etk_container_add(ETK_CONTAINER(s->win), vbox);
etk_widget_focus(s->textview);
- etk_signal_connect("clipboard_received", ETK_OBJECT(s->win),
ETK_CALLBACK(_e_sticky_clipboard_text_request_cb), s);
+ etk_signal_connect("selection_received", ETK_OBJECT(s->win),
ETK_CALLBACK(_e_sticky_selection_text_request_cb), s);
}
E_Sticky *
@@ -555,16 +555,14 @@
etk_object_destroy(obj);
}
-static void _e_sticky_clipboard_text_request_cb(Etk_Object *object, void
*event, void *data)
+static void _e_sticky_selection_text_request_cb(Etk_Object *object, void
*event, void *data)
{
- Etk_Event_Selection_Request *ev;
- Etk_Selection_Data_Text *ev_text;
+ Etk_Selection_Event *ev = event;
Etk_Textblock_Iter *cursor;
Etk_Textblock_Iter *selection;
E_Sticky *s;
- ev = event;
- if(!(s = data) || !(ev_text = ev->data) || !(ev_text->text))
+ if(!(ev = event) || (ev->type != ETK_SELECTION_TEXT))
return;
cursor =
etk_textblock_object_cursor_get(ETK_TEXT_VIEW(s->textview)->textblock_object);
@@ -573,7 +571,7 @@
etk_textblock_delete_range(etk_text_view_textblock_get(ETK_TEXT_VIEW(s->textview)),
cursor, selection);
etk_textblock_insert(etk_text_view_textblock_get(ETK_TEXT_VIEW(s->textview)),
cursor,
- ev_text->text, strlen(ev_text->text));
+ ev->data.text, -1);
}
int main(int argc, char **argv)
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c exhibit_menus.c
exhibit_slideshow.c
Log Message:
* Exhibit compiles again
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- exhibit_image.c 2 Sep 2006 01:43:23 - 1.38
+++ exhibit_image.c 7 Oct 2006 11:39:19 - 1.39
@@ -81,7 +81,7 @@
e->mouse.x = ev->canvas.x;
e->mouse.y = ev->canvas.y;
-etk_toplevel_widget_pointer_push(ETK_TOPLEVEL_WIDGET(e->win),
ETK_POINTER_MOVE);
+etk_toplevel_pointer_push(ETK_TOPLEVEL(e->win), ETK_POINTER_MOVE);
}
else if(ev->button == 2)
{
@@ -147,7 +147,7 @@
if(ev->button == 1)
{
e->mouse.down = 0;
-etk_toplevel_widget_pointer_pop(ETK_TOPLEVEL_WIDGET(e->win),
ETK_POINTER_MOVE);
+etk_toplevel_pointer_pop(ETK_TOPLEVEL(e->win), ETK_POINTER_MOVE);
}
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- exhibit_main.c 15 Sep 2006 11:30:10 - 1.83
+++ exhibit_main.c 7 Oct 2006 11:39:20 - 1.84
@@ -22,27 +22,27 @@
{
if (e->cur_tab->fit_window)
{
-etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
-etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), _("Fit to window"),
0);
+etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), _("Fit to
window"), 0);
}
else if(e->zoom > 0)
{
char zoom[6];
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
snprintf(zoom, sizeof(zoom), "%d:1", abs(e->zoom));
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);
}
else if(e->zoom < 0)
{
char zoom[6];
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
snprintf(zoom, sizeof(zoom), "1:%d", abs(e->zoom));
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);;
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), zoom, 0);;
}
else
{
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[2]), "1:1", 0);
}
}
@@ -58,10 +58,10 @@
E_FREE(tab->cur_file);
tab->image_loaded = ETK_FALSE;
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[0]), NULL, 0);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), NULL, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[0]), NULL, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), NULL, 0);
/* Just hide the image as if we deleted it */
etk_widget_hide(ETK_WIDGET(tab->image));
@@ -113,13 +113,13 @@
bytes = ecore_file_size(image);
snprintf(size, sizeof(size), "%d K", (int)(bytes/1024));
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[0]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[0]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[0]), size, 0);
etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
snprintf(size, sizeof(size), "( %d x %d )", w, h);
- etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
- etk_statusbar_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
+ etk_statusbar_message_pop(ETK_STATUSBAR(e->statusbar[1]), 0);
+ etk_statusbar_message_push(ETK_STATUSBAR(e->statusbar[1]), size, 0);
hs =
etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view));
vs =
etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view));
@@ -164,7 +164,7 @@
{
snprintf(back, PATH_MAX, "..");
etk_tree_append(ETK_TREE(e->cur_tab->dtree), e->cur_tab->dcol,
- etk_theme_icon_theme_get(), "actions/go-up_16", back, NULL);
+ etk_theme_icon_get(), "actions/go-up_16", back, NULL);
}
if (e->cur_tab->monitor)
@@ -207,7 +207,7 @@
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c
Log Message:
* ETK API change
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- enhance.c 11 Sep 2006 15:06:10 - 1.31
+++ enhance.c 7 Oct 2006 11:03:12 - 1.32
@@ -622,7 +622,7 @@
image = etk_image_new_from_stock(id, ETK_STOCK_SMALL);
etk_button_image_set(ETK_BUTTON(wid->wid), ETK_IMAGE(image));
etk_widget_show(image);
- etk_widget_visibility_locked_set(image, ETK_TRUE);
+ etk_widget_internal_set(image, ETK_TRUE);
}
else
{
@@ -676,7 +676,7 @@
image = etk_image_new_from_stock(id, ETK_STOCK_SMALL);
etk_button_image_set(ETK_BUTTON(wid->wid), ETK_IMAGE(image));
etk_widget_show(image);
- etk_widget_visibility_locked_set(image, ETK_TRUE);
+ etk_widget_internal_set(image, ETK_TRUE);
}
else
{
@@ -770,7 +770,7 @@
else if(!strcmp(name, "toolbar_style"))
{
PROPERTY_STR;
-Etk_Toolbar_Style style = ETK_TOOLBAR_ICONS;
+Etk_Toolbar_Style style = ETK_TOOLBAR_ICON;
if (value)
{
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/bin Added Files: etk_dnd_test.c Log Message: * Add missing files - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Added Files: htoolbar.png Log Message: * Add missing files - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/macros Added Files: toolbar.edc Log Message: * Add missing files - 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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: ecore_evas_x11.c Log Message: A lot of changes and API breaks. Most of the existing apps are probably broken... * [Etk_Theme] The whole theme system has been rewritten to make it simpler and more powerful * [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e. "etk/widget" for the groups, "etk.swallow.name" for the swallow parts, "etk.text.name" for the text parts, ...). It means that all the (few) existing themes are broken :( * [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling the iconbox or the tree is now ultra fast!!) * [Etk_Selection] Rewrite the selection/clipboard system * [Etk_Widgets] Fix problems caused by the premul-color change * [Etk_Entry] The entry has received more work: it is now entirely themable and it now supports copy/paste * [Etk_Box] Fix a bug/segv that happened when more than one child were packed in the end-group * [Etk_Toolbar] Some work on the toolbar * [Etk_Button] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Label] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a widget in the end-group now *appends* it into this group (it was prepended before) * [X11 engine] Fix a bug with the popup window creation (the mouse was not correctly grabbed) * [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() --> etk_statusbar_message_push/pop/remove() * [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy * [Etk_Widget] etk_widget_visibility_locked_set/get() --> etk_widget_internal_set/get() * [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel * [Etk_Container] Add etk_container_remove_all() * [Etk_Iconbox] Add etk_iconbox_scrolled_view_get() * [Etk_Main] Don't use the "-e" program arg to detect the engine to use * [Documentation] More documentation for a lot of widgets More API breaks to come... enjoy! :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ecore_evas_x11.c5 Sep 2006 00:14:57 - 1.16 +++ ecore_evas_x11.c6 Oct 2006 17:04:14 - 1.17 @@ -47,6 +47,13 @@ static void _mouse_position_get(int *x, int *y); static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h); +/* Etk_Selection functions */ +static void _selection_text_set(Etk_Selection_Type selection, const char *text); +static void _selection_text_request(Etk_Selection_Type selection, Etk_Widget *target); +static void _selection_clear(Etk_Selection_Type selection); +static int _selection_notify_handler_cb(void *data, int type, void *event); + + /* Etk_Drag functions */ static void _drag_constructor(Etk_Drag *drag); static void _drag_begin(Etk_Drag *drag); @@ -54,9 +61,7 @@ static int _drag_mouse_move_cb(void *data, int type, void *event); /* Etk_Dnd functions */ -static Etk_Bool _dnd_init(); -static void _dnd_shutdown(); -static void _dnd_container_get_widgets_at(Etk_Toplevel_Widget *top, int x, int y, int offx, int offy, Evas_List **list); +static void _dnd_container_get_widgets_at(Etk_Toplevel *top, int x, int y, int offx, int offy, Evas_List **list); static int _dnd_enter_handler(void *data, int type, void *event); static int _dnd_position_handler(void *data, int type, void *event); static int _dnd_drop_handler(void *data, int type, void *event); @@ -65,15 +70,6 @@ static int _dnd_status_handler(void *data, int type, void *event); static int _dnd_finished_handler(void *data, int type, void *event); -/* Etk_Clipboard functions */ -static void _clipboard_text_request(Etk_Widget *widget); -static void _clipboard_text_set(Etk_Widget *widget, const char *text, int length); - -/* Etk_Selection functions */ -static void _selection_text_request(Etk_Widget *widget); -static void _selection_text_set(Etk_Widget *widget, const char *text, int length); -static void _selection_clear(void); - /* Private functions */ static void _window_netwm_state_active_set(Etk_Window *window, Ecore_X_Window_State state, Etk_Bool active); static Etk_Bool _window_netwm_state_active_get(Etk_Window *window, Ecore_X_Window_State state); @@ -81,16 +77,19 @@ /* Private vars */ +static Evas_List *_popup_window_popped_windows = NULL; +static Ecore_X_Window _popup_window_input_window = 0; + static void (*_event_callback)(Etk_Event_Type event, Etk_Event_Global event_info) = NULL; static Ecore_Event_Handler *_event_input_handlers[NUM_INPUT_HANDLERS]; -static Evas_List *_popup_window_popped_windows = NULL; -static Ecore_X_Window _popup_window_input_win
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_fb
Modified Files:
ecore_fb.c
Log Message:
A lot of changes and API breaks. Most of the existing apps are probably
broken...
* [Etk_Theme] The whole theme system has been rewritten to make it simpler and
more powerful
* [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e.
"etk/widget" for the groups, "etk.swallow.name" for the swallow parts,
"etk.text.name" for the text parts, ...). It means that all the (few) existing
themes are broken :(
* [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the
perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling
the iconbox or the tree is now ultra fast!!)
* [Etk_Selection] Rewrite the selection/clipboard system
* [Etk_Widgets] Fix problems caused by the premul-color change
* [Etk_Entry] The entry has received more work: it is now entirely themable and
it now supports copy/paste
* [Etk_Box] Fix a bug/segv that happened when more than one child were packed
in the end-group
* [Etk_Toolbar] Some work on the toolbar
* [Etk_Button] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Label] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a
widget in the end-group now *appends* it into this group (it was prepended
before)
* [X11 engine] Fix a bug with the popup window creation (the mouse was not
correctly grabbed)
* [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() -->
etk_statusbar_message_push/pop/remove()
* [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy
* [Etk_Widget] etk_widget_visibility_locked_set/get() -->
etk_widget_internal_set/get()
* [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel
* [Etk_Container] Add etk_container_remove_all()
* [Etk_Iconbox] Add etk_iconbox_scrolled_view_get()
* [Etk_Main] Don't use the "-e" program arg to detect the engine to use
* [Documentation] More documentation for a lot of widgets
More API breaks to come... enjoy! :)
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_fb/ecore_fb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_fb.c 5 Sep 2006 00:17:01 - 1.8
+++ ecore_fb.c 6 Oct 2006 17:04:14 - 1.9
@@ -116,18 +116,12 @@
_mouse_position_get,
_mouse_screen_geometry_get,
+ NULL, /* selection_text_set */
+ NULL, /* selection_text_request */
+ NULL, /* selection_clear */
+
NULL, /* drag_constructor */
NULL, /* drag_begin */
-
- NULL, /* dnd_init */
- NULL, /* dnd_shutdown */
-
- NULL, /* clipboard_text_request */
- NULL, /* clipboard_text_set */
-
- NULL, /* selection_text_request */
- NULL, /* selection_text_set */
- NULL, /* _selection_clear */
};
/**
@@ -183,7 +177,8 @@
ecore_evas_show(_ecore_evas);
/* Create the background */
- _background_object = etk_theme_object_load(_evas,
etk_theme_widget_theme_get(), "wm_background");
+ _background_object = edje_object_add(_evas);
+ etk_theme_edje_object_set(_background_object, etk_theme_widget_get(),
"wm_background", NULL);
evas_object_resize(_background_object, _fb_width, _fb_height);
evas_object_show(_background_object);
@@ -226,7 +221,7 @@
engine_data->border = NULL;
window->engine_data = engine_data;
- ETK_TOPLEVEL_WIDGET(window)->evas = _evas;
+ ETK_TOPLEVEL(window)->evas = _evas;
etk_signal_connect("realize", ETK_OBJECT(window),
ETK_CALLBACK(_window_realized_cb), NULL);
}
@@ -409,7 +404,8 @@
return;
engine_data = window->engine_data;
- engine_data->border = etk_theme_object_load_from_parent(_evas,
ETK_WIDGET(window), NULL, "wm_border");
+ engine_data->border = edje_object_add(_evas);
+ etk_theme_edje_object_set(engine_data->border,
etk_widget_theme_file_get(ETK_WIDGET(window)), "wm_border", NULL);
edje_extern_object_min_size_set(ETK_WIDGET(window)->smart_object,
engine_data->size.w, engine_data->size.h);
edje_object_part_swallow(engine_data->border, "content",
ETK_WIDGET(window)->smart_object);
edje_object_size_min_calc(engine_data->border, &border_w, &border_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.php&p=sourceforge&CID=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/engines/ecore_evas_software_x11 Modified Files: ecore_evas_software_x11.c Log Message: A lot of changes and API breaks. Most of the existing apps are probably broken... * [Etk_Theme] The whole theme system has been rewritten to make it simpler and more powerful * [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e. "etk/widget" for the groups, "etk.swallow.name" for the swallow parts, "etk.text.name" for the text parts, ...). It means that all the (few) existing themes are broken :( * [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling the iconbox or the tree is now ultra fast!!) * [Etk_Selection] Rewrite the selection/clipboard system * [Etk_Widgets] Fix problems caused by the premul-color change * [Etk_Entry] The entry has received more work: it is now entirely themable and it now supports copy/paste * [Etk_Box] Fix a bug/segv that happened when more than one child were packed in the end-group * [Etk_Toolbar] Some work on the toolbar * [Etk_Button] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Label] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a widget in the end-group now *appends* it into this group (it was prepended before) * [X11 engine] Fix a bug with the popup window creation (the mouse was not correctly grabbed) * [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() --> etk_statusbar_message_push/pop/remove() * [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy * [Etk_Widget] etk_widget_visibility_locked_set/get() --> etk_widget_internal_set/get() * [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel * [Etk_Container] Add etk_container_remove_all() * [Etk_Iconbox] Add etk_iconbox_scrolled_view_get() * [Etk_Main] Don't use the "-e" program arg to detect the engine to use * [Documentation] More documentation for a lot of widgets More API breaks to come... enjoy! :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ecore_evas_software_x11.c 3 Sep 2006 21:15:31 - 1.11 +++ ecore_evas_software_x11.c 6 Oct 2006 17:04:13 - 1.12 @@ -72,18 +72,12 @@ NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ + NULL, /* selection_text_set */ + NULL, /* selection_text_request */ + NULL, /* selection_clear */ + NULL, /* drag_constructor */ NULL, /* drag_begin */ - - NULL, /* dnd_init */ - NULL, /* dnd_shutdown */ - - NULL, /* clipboard_text_request */ - NULL, /* clipboard_text_set */ - - NULL, /* selection_text_request */ - NULL, /* selection_text_set */ - NULL /* selection_clear */ }; /** - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_canvas_test.c etk_embed_test.c
etk_iconbox_test.c etk_menu_test.c etk_test.c etk_test.h
etk_text_view_test.c etk_tree_test.c
Log Message:
A lot of changes and API breaks. Most of the existing apps are probably
broken...
* [Etk_Theme] The whole theme system has been rewritten to make it simpler and
more powerful
* [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e.
"etk/widget" for the groups, "etk.swallow.name" for the swallow parts,
"etk.text.name" for the text parts, ...). It means that all the (few) existing
themes are broken :(
* [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the
perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling
the iconbox or the tree is now ultra fast!!)
* [Etk_Selection] Rewrite the selection/clipboard system
* [Etk_Widgets] Fix problems caused by the premul-color change
* [Etk_Entry] The entry has received more work: it is now entirely themable and
it now supports copy/paste
* [Etk_Box] Fix a bug/segv that happened when more than one child were packed
in the end-group
* [Etk_Toolbar] Some work on the toolbar
* [Etk_Button] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Label] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a
widget in the end-group now *appends* it into this group (it was prepended
before)
* [X11 engine] Fix a bug with the popup window creation (the mouse was not
correctly grabbed)
* [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() -->
etk_statusbar_message_push/pop/remove()
* [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy
* [Etk_Widget] etk_widget_visibility_locked_set/get() -->
etk_widget_internal_set/get()
* [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel
* [Etk_Container] Add etk_container_remove_all()
* [Etk_Iconbox] Add etk_iconbox_scrolled_view_get()
* [Etk_Main] Don't use the "-e" program arg to detect the engine to use
* [Documentation] More documentation for a lot of widgets
More API breaks to come... enjoy! :)
===
RCS file: /cvs/e/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 24 Jun 2006 15:59:12 - 1.16
+++ Makefile.am 6 Oct 2006 17:04:13 - 1.17
@@ -34,7 +34,7 @@
etk_filechooser_test.c \
etk_notebook_test.c \
etk_progress_bar_test.c \
-etk_xdnd_test.c \
+etk_dnd_test.c \
etk_combobox_test.c \
etk_iconbox_test.c \
etk_text_view_test.c \
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_canvas_test.c 16 Aug 2006 16:38:49 - 1.11
+++ etk_canvas_test.c 6 Oct 2006 17:04:13 - 1.12
@@ -31,7 +31,8 @@
etk_widget_size_request_set(canvas, 300, 200);
etk_box_append(ETK_BOX(vbox), canvas, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
- button = etk_button_new_with_label("Add object");
+ button = etk_button_new_from_stock(ETK_STOCK_LIST_ADD);
+ etk_button_label_set(ETK_BUTTON(button), "Add object");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -71,6 +72,8 @@
g = rand() % 255;
b = rand() % 255;
a = ETK_MAX(rand() % 255, 40);
+ evas_color_argb_premul(a, &r, &g, &b);
+
evas_object_color_set(object, r, g, b, a);
}
/* Or add an image */
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_embed_test.c3 Sep 2006 18:36:11 - 1.7
+++ etk_embed_test.c6 Oct 2006 17:04:13 - 1.8
@@ -178,7 +178,7 @@
evas_object_move(panel_clip, 0, y);
evas_object_resize(panel_clip, win_w, win_h - y);
- evas_object_color_set(panel_clip, 255, 255, 255, alpha);
+ evas_object_color_set(panel_clip, alpha, alpha, alpha, alpha);
etk_widget_size_request(embed, &embed_size);
evas_object_move(embed_object, (win_w - embed_size.w) / 2, y + 20);
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_iconbox_test.c 26 Aug 2006 09:38:06 - 1.8
+++ etk_iconbox_test.c 6 Oct 2006 17:04:13 - 1.9
@@ -42,6 +42,8 @@
{
static Etk_Widget *win =
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: ecore_evas.c Log Message: A lot of changes and API breaks. Most of the existing apps are probably broken... * [Etk_Theme] The whole theme system has been rewritten to make it simpler and more powerful * [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e. "etk/widget" for the groups, "etk.swallow.name" for the swallow parts, "etk.text.name" for the text parts, ...). It means that all the (few) existing themes are broken :( * [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling the iconbox or the tree is now ultra fast!!) * [Etk_Selection] Rewrite the selection/clipboard system * [Etk_Widgets] Fix problems caused by the premul-color change * [Etk_Entry] The entry has received more work: it is now entirely themable and it now supports copy/paste * [Etk_Box] Fix a bug/segv that happened when more than one child were packed in the end-group * [Etk_Toolbar] Some work on the toolbar * [Etk_Button] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Label] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a widget in the end-group now *appends* it into this group (it was prepended before) * [X11 engine] Fix a bug with the popup window creation (the mouse was not correctly grabbed) * [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() --> etk_statusbar_message_push/pop/remove() * [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy * [Etk_Widget] etk_widget_visibility_locked_set/get() --> etk_widget_internal_set/get() * [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel * [Etk_Container] Add etk_container_remove_all() * [Etk_Iconbox] Add etk_iconbox_scrolled_view_get() * [Etk_Main] Don't use the "-e" program arg to detect the engine to use * [Documentation] More documentation for a lot of widgets More API breaks to come... enjoy! :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ecore_evas.c3 Sep 2006 21:15:31 - 1.12 +++ ecore_evas.c6 Oct 2006 17:04:13 - 1.13 @@ -111,18 +111,12 @@ NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ + NULL, /* selection_text_set */ + NULL, /* selection_text_request */ + NULL, /* selection_clear */ + NULL, /* drag_constructor */ NULL, /* drag_begin */ - - NULL, /* dnd_init */ - NULL, /* dnd_shutdown */ - - NULL, /* clipboard_text_request */ - NULL, /* clipboard_text_set */ - - NULL, /* selection_text_request */ - NULL, /* selection_text_set */ - NULL /* selection_clear */ }; /** @@ -175,7 +169,7 @@ engine_data = window->engine_data; - ETK_TOPLEVEL_WIDGET(window)->evas = ecore_evas_get(engine_data->ecore_evas); + ETK_TOPLEVEL(window)->evas = ecore_evas_get(engine_data->ecore_evas); ecore_evas_data_set(engine_data->ecore_evas, "_Etk_Engine::Window", window); ecore_evas_callback_move_set(engine_data->ecore_evas, _window_move_cb); ecore_evas_callback_resize_set(engine_data->ecore_evas, _window_resize_cb); - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default
Modified Files:
default.edc
Log Message:
A lot of changes and API breaks. Most of the existing apps are probably
broken...
* [Etk_Theme] The whole theme system has been rewritten to make it simpler and
more powerful
* [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e.
"etk/widget" for the groups, "etk.swallow.name" for the swallow parts,
"etk.text.name" for the text parts, ...). It means that all the (few) existing
themes are broken :(
* [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the
perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling
the iconbox or the tree is now ultra fast!!)
* [Etk_Selection] Rewrite the selection/clipboard system
* [Etk_Widgets] Fix problems caused by the premul-color change
* [Etk_Entry] The entry has received more work: it is now entirely themable and
it now supports copy/paste
* [Etk_Box] Fix a bug/segv that happened when more than one child were packed
in the end-group
* [Etk_Toolbar] Some work on the toolbar
* [Etk_Button] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Label] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a
widget in the end-group now *appends* it into this group (it was prepended
before)
* [X11 engine] Fix a bug with the popup window creation (the mouse was not
correctly grabbed)
* [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() -->
etk_statusbar_message_push/pop/remove()
* [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy
* [Etk_Widget] etk_widget_visibility_locked_set/get() -->
etk_widget_internal_set/get()
* [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel
* [Etk_Container] Add etk_container_remove_all()
* [Etk_Iconbox] Add etk_iconbox_scrolled_view_get()
* [Etk_Main] Don't use the "-e" program arg to detect the engine to use
* [Documentation] More documentation for a lot of widgets
More API breaks to come... enjoy! :)
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- default.edc 29 Aug 2006 12:20:45 - 1.23
+++ default.edc 6 Oct 2006 17:04:12 - 1.24
@@ -3,6 +3,7 @@
#include "macros/glint.edc"
#include "macros/paned.edc"
#include "macros/scrollbar.edc"
+#include "macros/toolbar.edc"
fonts {
font: "Vera.ttf" "Vera";
@@ -12,6 +13,17 @@
#include "images/images.edc"
+data {
+ item: "alias: etk/scrolled_view/hscrollbar" "etk/hscrollbar";
+ item: "alias: etk/scrolled_view/vscrollbar" "etk/vscrollbar";
+ item: "alias: etk/tree/scrolled_view/hscrollbar" "etk/hscrollbar";
+ item: "alias: etk/tree/scrolled_view/vscrollbar" "etk/vscrollbar";
+ item: "alias: etk/menu_bar/menu_item/checkbox"
"etk/menu/menu_item/checkbox";
+ item: "alias: etk/menu_bar/menu_item/radiobox"
"etk/menu/menu_item/radiobox";
+ item: "alias: etk/tool_button"
"etk/htoolbar/tool_button";
+ item: "alias: etk/tool_toggle_button"
"etk/htoolbar/tool_toggle_button";
+}
+
collections {
#include "widgets/windows.edc"
#include "widgets/button.edc"
@@ -30,7 +42,6 @@
#include "widgets/statusbar.edc"
#include "widgets/notebook.edc"
#include "widgets/progress_bar.edc"
- #include "widgets/spinner.edc"
#include "widgets/combobox.edc"
#include "widgets/tooltips.edc"
#include "widgets/iconbox.edc"
-
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
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/doc/pages Modified Files: object_hierarchy.h Log Message: A lot of changes and API breaks. Most of the existing apps are probably broken... * [Etk_Theme] The whole theme system has been rewritten to make it simpler and more powerful * [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e. "etk/widget" for the groups, "etk.swallow.name" for the swallow parts, "etk.text.name" for the text parts, ...). It means that all the (few) existing themes are broken :( * [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling the iconbox or the tree is now ultra fast!!) * [Etk_Selection] Rewrite the selection/clipboard system * [Etk_Widgets] Fix problems caused by the premul-color change * [Etk_Entry] The entry has received more work: it is now entirely themable and it now supports copy/paste * [Etk_Box] Fix a bug/segv that happened when more than one child were packed in the end-group * [Etk_Toolbar] Some work on the toolbar * [Etk_Button] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Label] Bugs have been fixed, and the code has been fully documented/cleaned up * [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a widget in the end-group now *appends* it into this group (it was prepended before) * [X11 engine] Fix a bug with the popup window creation (the mouse was not correctly grabbed) * [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() --> etk_statusbar_message_push/pop/remove() * [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy * [Etk_Widget] etk_widget_visibility_locked_set/get() --> etk_widget_internal_set/get() * [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel * [Etk_Container] Add etk_container_remove_all() * [Etk_Iconbox] Add etk_iconbox_scrolled_view_get() * [Etk_Main] Don't use the "-e" program arg to detect the engine to use * [Documentation] More documentation for a lot of widgets More API breaks to come... enjoy! :) === RCS file: /cvs/e/e17/proto/etk/doc/pages/object_hierarchy.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- object_hierarchy.h 2 Jul 2006 04:01:19 - 1.5 +++ object_hierarchy.h 6 Oct 2006 17:04:13 - 1.6 @@ -18,7 +18,7 @@ * - Etk_Radio_Button * - Etk_Frame * - Etk_Scrolled_View - * - Etk_Toplevel_Widget + * - Etk_Toplevel * - Etk_Embed * - Etk_Window * - Etk_Dialog - 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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/wm
Modified Files:
background.edc borders.edc
Log Message:
A lot of changes and API breaks. Most of the existing apps are probably
broken...
* [Etk_Theme] The whole theme system has been rewritten to make it simpler and
more powerful
* [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e.
"etk/widget" for the groups, "etk.swallow.name" for the swallow parts,
"etk.text.name" for the text parts, ...). It means that all the (few) existing
themes are broken :(
* [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the
perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling
the iconbox or the tree is now ultra fast!!)
* [Etk_Selection] Rewrite the selection/clipboard system
* [Etk_Widgets] Fix problems caused by the premul-color change
* [Etk_Entry] The entry has received more work: it is now entirely themable and
it now supports copy/paste
* [Etk_Box] Fix a bug/segv that happened when more than one child were packed
in the end-group
* [Etk_Toolbar] Some work on the toolbar
* [Etk_Button] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Label] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a
widget in the end-group now *appends* it into this group (it was prepended
before)
* [X11 engine] Fix a bug with the popup window creation (the mouse was not
correctly grabbed)
* [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() -->
etk_statusbar_message_push/pop/remove()
* [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy
* [Etk_Widget] etk_widget_visibility_locked_set/get() -->
etk_widget_internal_set/get()
* [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel
* [Etk_Container] Add etk_container_remove_all()
* [Etk_Iconbox] Add etk_iconbox_scrolled_view_get()
* [Etk_Main] Don't use the "-e" program arg to detect the engine to use
* [Documentation] More documentation for a lot of widgets
More API breaks to come... enjoy! :)
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/wm/background.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- background.edc 30 Jul 2006 21:09:32 - 1.1
+++ background.edc 6 Oct 2006 17:04:13 - 1.2
@@ -1,5 +1,5 @@
group {
- name: "wm_background";
+ name: "etk/wm_background";
parts {
part {
name: "background_image";
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/wm/borders.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- borders.edc 7 Aug 2006 20:01:21 - 1.2
+++ borders.edc 6 Oct 2006 17:04:13 - 1.3
@@ -1,5 +1,5 @@
group {
- name: "wm_border";
+ name: "etk/wm_border";
parts {
part {
name: "shadow";
-
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
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/macros
Modified Files:
Makefile.am glint.edc
Log Message:
A lot of changes and API breaks. Most of the existing apps are probably
broken...
* [Etk_Theme] The whole theme system has been rewritten to make it simpler and
more powerful
* [Etk_Theme] The widgets now use the same theme naming convention as e17 (i.e.
"etk/widget" for the groups, "etk.swallow.name" for the swallow parts,
"etk.text.name" for the text parts, ...). It means that all the (few) existing
themes are broken :(
* [Etk_Main] Replace the main Ecore_Job by an idle-enterer: it improves the
perfs A LOT when a large part of the screen has to be redrawn (e.g scrolling
the iconbox or the tree is now ultra fast!!)
* [Etk_Selection] Rewrite the selection/clipboard system
* [Etk_Widgets] Fix problems caused by the premul-color change
* [Etk_Entry] The entry has received more work: it is now entirely themable and
it now supports copy/paste
* [Etk_Box] Fix a bug/segv that happened when more than one child were packed
in the end-group
* [Etk_Toolbar] Some work on the toolbar
* [Etk_Button] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Label] Bugs have been fixed, and the code has been fully
documented/cleaned up
* [Etk_Dialog] The behaviour of etk_dialog_pack_*() has been changed: packing a
widget in the end-group now *appends* it into this group (it was prepended
before)
* [X11 engine] Fix a bug with the popup window creation (the mouse was not
correctly grabbed)
* [Etk_Statusbar] The API has been changed: etk_statusbar_push/pop/remove() -->
etk_statusbar_message_push/pop/remove()
* [Etk_Tooltip] The tooltips are disabled for now since they are a bit buggy
* [Etk_Widget] etk_widget_visibility_locked_set/get() -->
etk_widget_internal_set/get()
* [Etk_Toplevel] Etk_Toplevel_Widget --> Etk_Toplevel
* [Etk_Container] Add etk_container_remove_all()
* [Etk_Iconbox] Add etk_iconbox_scrolled_view_get()
* [Etk_Main] Don't use the "-e" program arg to detect the engine to use
* [Documentation] More documentation for a lot of widgets
More API breaks to come... enjoy! :)
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 29 Aug 2006 12:20:45 - 1.2
+++ Makefile.am 6 Oct 2006 17:04:12 - 1.3
@@ -3,4 +3,5 @@
focus.edc \
glint.edc \
paned.edc \
-scrollbar.edc
+scrollbar.edc \
+ toolbar.edc
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/macros/glint.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- glint.edc 30 Aug 2006 21:25:51 - 1.2
+++ glint.edc 6 Oct 2006 17:04:12 - 1.3
@@ -75,9 +75,6 @@
normal: "glint2.png"; \
border: 0 0 5 5; \
} \
- fill { \
-smooth: 0; \
- } \
} \
description { \
state: "active" 0.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.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
