Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button.c ewl_icon.c ewl_image.c ewl_image.h
ewl_menu_item.c ewl_tree2.c
Log Message:
- API breakage ewl_image_file_get -> ewl_image_file_path_get
- add ewl_image_file_path_set and ewl_image_file_key_set/get
- bit of work on tree2
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_button.c 12 Jan 2006 18:21:18 -0000 1.24
+++ ewl_button.c 6 Feb 2006 16:32:10 -0000 1.25
@@ -248,7 +248,7 @@
if (!b->image_object)
file = NULL;
else
- file = ewl_image_file_get(EWL_IMAGE(b->image_object));
+ file = ewl_image_file_path_get(EWL_IMAGE(b->image_object));
DRETURN_PTR(file, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_icon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_icon.c 12 Jan 2006 18:21:18 -0000 1.4
+++ ewl_icon.c 6 Feb 2006 16:32:10 -0000 1.5
@@ -142,7 +142,7 @@
DCHECK_TYPE_RET("icon", icon, EWL_ICON_TYPE, NULL);
if (icon->preview)
- file = ewl_image_file_get(EWL_IMAGE(icon->preview));
+ file = ewl_image_file_path_get(EWL_IMAGE(icon->preview));
DRETURN_PTR(file, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_image.c 12 Jan 2006 18:21:18 -0000 1.23
+++ ewl_image.c 6 Feb 2006 16:32:10 -0000 1.24
@@ -88,12 +88,30 @@
}
/**
+ * @param i: The image to set the file into
+ * @param path: The path to set into the image
+ * @return Returns no value.
+ */
+void
+ewl_image_file_path_set(Ewl_Image *i, const char *path)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("i", i);
+ DCHECK_PARAM_PTR("path", path);
+ DCHECK_TYPE("i", i, EWL_IMAGE_TYPE);
+
+ ewl_image_file_set(i, path, i->key);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
* @param i: the image widget to get the file of
* @return Returns the currently set filename
* @brief get the filename this image uses
*/
const char *
-ewl_image_file_get(Ewl_Image *i)
+ewl_image_file_path_get(Ewl_Image *i)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("i", i, NULL);
@@ -103,6 +121,43 @@
}
/**
+ * @param i: The image to set the key into
+ * @param key: The key to set into the image
+ * @return Returns no value.
+ */
+void
+ewl_image_file_key_set(Ewl_Image *i, const char *key)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("i", i);
+ DCHECK_TYPE("i", i, EWL_IMAGE_TYPE);
+
+ if (i->path)
+ ewl_image_file_set(i, i->path, key);
+ else
+ {
+ IF_FREE(i->key);
+ if (key) i->key = strdup(key);
+ }
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param i: The image to get the key from
+ * @return Returns the key used for this image
+ */
+const char *
+ewl_image_file_key_get(Ewl_Image *i)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("i", i, NULL);
+ DCHECK_TYPE_RET("i", i, EWL_IMAGE_TYPE, NULL);
+
+ DRETURN_PTR(i->key, DLEVEL_STABLE);
+}
+
+/**
* @param i: the image widget to change the displayed image
* @param im: the path to the new image to be displayed by @a i
* @param key: the key in the file for the image
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_image.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl_image.h 12 Jan 2006 18:21:18 -0000 1.13
+++ ewl_image.h 6 Feb 2006 16:32:10 -0000 1.14
@@ -53,8 +53,15 @@
Ewl_Widget *ewl_image_new(void);
int ewl_image_init(Ewl_Image *i);
-void ewl_image_file_set(Ewl_Image *i, const char *im, const char
*key);
-const char *ewl_image_file_get(Ewl_Image *i);
+
+void ewl_image_file_set(Ewl_Image *i, const char *im,
+ const char *key);
+void ewl_image_file_path_set(Ewl_Image *i, const char *im);
+const char *ewl_image_file_path_get(Ewl_Image *i);
+
+void ewl_image_file_key_set(Ewl_Image *i, const char *key);
+const char *ewl_image_file_key_get(Ewl_Image *i);
+
void ewl_image_proportional_set(Ewl_Image *i, char p);
void ewl_image_scale(Ewl_Image *i, double wp, double hp);
void ewl_image_scale_to(Ewl_Image *i, int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_item.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_menu_item.c 12 Jan 2006 18:21:18 -0000 1.7
+++ ewl_menu_item.c 6 Feb 2006 16:32:10 -0000 1.8
@@ -149,7 +149,7 @@
DCHECK_TYPE_RET("item", item, EWL_MENU_ITEM_TYPE, NULL);
if (item->icon && ewl_widget_type_is(item->icon, "image"))
- DRETURN_PTR(ewl_image_file_get(EWL_IMAGE(item->icon)),
+ DRETURN_PTR(ewl_image_file_path_get(EWL_IMAGE(item->icon)),
DLEVEL_STABLE);
DRETURN_PTR(NULL, DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_tree2.c 6 Feb 2006 05:48:35 -0000 1.7
+++ ewl_tree2.c 6 Feb 2006 16:32:10 -0000 1.8
@@ -55,12 +55,11 @@
tree->mode = EWL_TREE_MODE_NONE;
- tree->header = ewl_hbox_new();
+ tree->header = ewl_hpaned_new();
ewl_container_child_append(EWL_CONTAINER(tree), tree->header);
ewl_widget_appearance_set(EWL_WIDGET(tree->header), "tree_header");
ewl_object_fill_policy_set(EWL_OBJECT(tree->header),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK);
- ewl_callback_append(tree->header, EWL_CALLBACK_CONFIGURE,
ewl_widget_print, NULL);
ewl_widget_show(tree->header);
tree->rows = ewl_vbox_new();
@@ -421,9 +420,10 @@
}
}
-ewl_widget_print(EWL_WIDGET(tree));
-
- ewl_object_place(EWL_OBJECT(tree->header), CURRENT_X(tree),
CURRENT_Y(tree), CURRENT_X(tree), CURRENT_H(tree));
+ /* place the header */
+ ewl_object_place(EWL_OBJECT(tree->header), CURRENT_X(tree),
+ CURRENT_Y(tree), CURRENT_W(tree),
+ CURRENT_H(tree));
ewl_widget_configure(tree->header);
/* if none of the models are dirty we are done */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
