Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_dialogs.c edje_editor_images.c
edje_editor_images.h edje_editor_tree.c edje_editor_window.c
Log Message:
cleans & renames of edje_editor_images.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_dialogs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_dialogs.c 2 Jul 2008 13:50:00 -0000 1.3
+++ edje_editor_dialogs.c 2 Jul 2008 14:29:34 -0000 1.4
@@ -117,7 +117,7 @@
dialog_alert_show("ERROR: Can't import image file.");
break;
}
- PopulateImageBrowser();
+ image_browser_populate();
Etk_Range *range;
double upper;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_images.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_images.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_images.c 2 Jul 2008 14:29:34 -0000 1.3
@@ -4,8 +4,9 @@
#include "main.h"
+/*** Implementation ***/
Etk_Widget*
-create_image_frame(void)
+image_frame_create(void)
{
Etk_Widget *label;
Etk_Widget *table;
@@ -119,80 +120,61 @@
etk_table_attach_default(ETK_TABLE(table),UI_BorderBottomSpinner, 4, 4, 4,
4);
etk_signal_connect("row-selected", ETK_OBJECT(UI_ImageTweenList),
- ETK_CALLBACK(on_ImageTweenList_row_selected), NULL);
+ ETK_CALLBACK(_image_TweenList_row_selected_cb), NULL);
etk_signal_connect("clicked", ETK_OBJECT(UI_ImageAddButton),
ETK_CALLBACK(on_AllButton_click), (void*)IMAGE_BROWSER_SHOW);
etk_signal_connect("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
- ETK_CALLBACK(on_ImageAlphaSlider_value_changed), NULL);
+ ETK_CALLBACK(_image_AlphaSlider_value_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed), (void *)BORDER_LEFT);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void *)BORDER_LEFT);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderRightSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed), (void
*)BORDER_RIGHT);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void *)BORDER_RIGHT);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderTopSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed), (void *)BORDER_TOP);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void *)BORDER_TOP);
etk_signal_connect("value-changed", ETK_OBJECT(UI_BorderBottomSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed), (void
*)BORDER_BOTTOM);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void *)BORDER_BOTTOM);
return table;
}
-
void
-PopulateTweenList(void)
-{
- Evas_List *tweens, *l;
- Etk_Tree_Col *col;
-
- if (!etk_string_length_get(Cur.state)) return;
- if (!etk_string_length_get(Cur.part)) return;
-
- col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
-
- etk_tree_clear(ETK_TREE(UI_ImageTweenList));
-
- tweens = l = edje_edit_state_tweens_list_get(edje_o, Cur.part->string,
Cur.state->string);
- while (l)
- {
- //printf("RET: %s (id: %d)\n", l->data, edje_edit_image_id_get(edje_o,
l->data));
- //snprintf(buf, sizeof(buf), "images/%d", edje_edit_image_id_get(edje_o,
l->data)); TODO: find a way to append image directly from the edje file.
- etk_tree_row_append(ETK_TREE(UI_ImageTweenList), NULL,
- col, NULL, NULL, l->data,
- NULL);
- l = l->next;
- }
- edje_edit_string_list_free(tweens);
-}
-
-void
-UpdateImageFrame(void)
+image_frame_update(void)
{
//Etk_Combobox_Item *item = NULL;
const char *im;
//Stop signal propagation
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderLeftSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_LEFT);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void*)BORDER_LEFT);
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderRightSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_RIGHT);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void*)BORDER_RIGHT);
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderTopSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_TOP);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void*)BORDER_TOP);
etk_signal_block("value-changed",ETK_OBJECT(UI_BorderBottomSpinner),
- ETK_CALLBACK(on_BorderSpinner_value_changed),
(void*)BORDER_BOTTOM);
+ ETK_CALLBACK(_image_border_spinners_value_changed_cb),
+ (void*)BORDER_BOTTOM);
etk_signal_block("value-changed",ETK_OBJECT(UI_ImageAlphaSlider),
- ETK_CALLBACK(on_ImageAlphaSlider_value_changed), NULL);
+ ETK_CALLBACK(_image_AlphaSlider_value_changed_cb), NULL);
etk_signal_block("icon-selected", ETK_OBJECT(UI_ImageBrowserIconbox),
- ETK_CALLBACK(on_ImageBrowserIconbox_selected), NULL);
+ ETK_CALLBACK(_image_browser_iconbox_selected_cb), NULL);
if (!etk_string_length_get(Cur.state)) return;
if (!etk_string_length_get(Cur.part)) return;
- PopulateTweenList();
+ image_tweenlist_populate();
etk_widget_disabled_set(UI_DeleteTweenButton, TRUE);
etk_widget_disabled_set(UI_MoveDownTweenButton, TRUE);
etk_widget_disabled_set(UI_MoveUpTweenButton, TRUE);
/* Update Image Browser */
- UpdateImageBrowser();
+ image_browser_update();
//Set the images label for normal image
im = edje_edit_state_image_get(edje_o, Cur.part->string, Cur.state->string);
@@ -220,22 +202,52 @@
//ReEnable Signal Propagation
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderLeftSpinner),
- on_BorderSpinner_value_changed, (void*)BORDER_LEFT);
+ _image_border_spinners_value_changed_cb,
+ (void*)BORDER_LEFT);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderRightSpinner),
- on_BorderSpinner_value_changed, (void*)BORDER_RIGHT);
+ _image_border_spinners_value_changed_cb,
+ (void*)BORDER_RIGHT);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderTopSpinner),
- on_BorderSpinner_value_changed, (void*)BORDER_TOP);
+ _image_border_spinners_value_changed_cb,
+ (void*)BORDER_TOP);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_BorderBottomSpinner),
- on_BorderSpinner_value_changed, (void*)BORDER_BOTTOM);
+ _image_border_spinners_value_changed_cb,
+ (void*)BORDER_BOTTOM);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_ImageAlphaSlider),
- on_ImageAlphaSlider_value_changed, NULL);
+ _image_AlphaSlider_value_changed_cb, NULL);
etk_signal_unblock("icon-selected", ETK_OBJECT(UI_ImageBrowserIconbox),
- ETK_CALLBACK(on_ImageBrowserIconbox_selected), NULL);
+ ETK_CALLBACK(_image_browser_iconbox_selected_cb), NULL);
+
+}
+void
+image_tweenlist_populate(void)
+{
+ Evas_List *tweens, *l;
+ Etk_Tree_Col *col;
+
+ if (!etk_string_length_get(Cur.state)) return;
+ if (!etk_string_length_get(Cur.part)) return;
+
+ col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
+
+ etk_tree_clear(ETK_TREE(UI_ImageTweenList));
+
+ tweens = l = edje_edit_state_tweens_list_get(edje_o, Cur.part->string,
Cur.state->string);
+ while (l)
+ {
+ //printf("RET: %s (id: %d)\n", l->data, edje_edit_image_id_get(edje_o,
l->data));
+ //snprintf(buf, sizeof(buf), "images/%d", edje_edit_image_id_get(edje_o,
l->data)); TODO: find a way to append image directly from the edje file.
+ etk_tree_row_append(ETK_TREE(UI_ImageTweenList), NULL,
+ col, NULL, NULL, l->data,
+ NULL);
+ l = l->next;
+ }
+ edje_edit_string_list_free(tweens);
}
Etk_Widget*
-create_image_browser(void)
+image_browser_create(void)
{
Etk_Widget *hbox, *vbox, *vbox2;
Etk_Widget *button;
@@ -257,7 +269,7 @@
//ImageBrowserIconbox
UI_ImageBrowserIconbox = etk_iconbox_new();
etk_signal_connect("icon-selected", ETK_OBJECT(UI_ImageBrowserIconbox),
- ETK_CALLBACK(on_ImageBrowserIconbox_selected), NULL);
+ ETK_CALLBACK(_image_browser_iconbox_selected_cb), NULL);
etk_box_append(ETK_BOX(hbox), UI_ImageBrowserIconbox, 0,
ETK_BOX_EXPAND_FILL, 0);
vbox = etk_vbox_new(ETK_FALSE, 0);
@@ -324,84 +336,7 @@
}
void
-ShowImageBrowser(int UpdateCurrent)
-{
- ImageBroserUpdate = UpdateCurrent;
- PopulateImageBrowser();
- UpdateImageBrowser();
- etk_widget_show_all(UI_ImageBrowserWin);
-}
-
-/* Image Frame Callbacks */
-Etk_Bool
-on_ImageComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
-{
- printf("Changed signal on Image Combo EMITTED\n");
-
- char *im;
- if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
-
- im = etk_combobox_item_field_get(item, 1);
- edje_edit_state_image_set(edje_o, Cur.part->string, Cur.state->string, im);
-
- return ETK_TRUE;
-}
-
-Etk_Bool
-on_ImageTweenList_row_selected(Etk_Object *object, Etk_Tree_Row *row, void
*data)
-{
- Etk_Tree_Col *col;
- char *selected = NULL;
- printf("Row selected signal on ImageTweenList EMITTED\n");
-
- col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
- etk_tree_row_fields_get(row, col, NULL, NULL, &selected, NULL);
- if (!selected) return ETK_TRUE;
-
- Cur.tween = etk_string_set(Cur.tween, selected);
- etk_widget_disabled_set(UI_DeleteTweenButton, FALSE);
- // etk_widget_disabled_set(UI_MoveDownTweenButton, FALSE);
- // etk_widget_disabled_set(UI_MoveUpTweenButton, FALSE);
-
- return ETK_TRUE;
-}
-
-Etk_Bool
-on_ImageAlphaSlider_value_changed(Etk_Object *object, double va, void *data)
-{
- printf("ImageSlieder value_changed signale EMIT: %.2f\n",va);
-
- if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
- edje_edit_state_color_set(edje_o, Cur.part->string, Cur.state->string,
- -1, -1, -1, (int)va);
- canvas_redraw();
-
- return ETK_TRUE;
-}
-
-Etk_Bool
-on_BorderSpinner_value_changed(Etk_Range *range, double value, void *data)
-{
- printf("Value Changed signal on BorderSpinner EMITTED (value:
%f)\n",etk_range_value_get(range));
-
- if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
- if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
- edje_edit_state_image_border_set(edje_o, Cur.part->string,
Cur.state->string,
- (int)etk_range_value_get(ETK_RANGE(UI_BorderLeftSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderRightSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderTopSpinner)),
- (int)etk_range_value_get(ETK_RANGE(UI_BorderBottomSpinner)));
-
- canvas_redraw();
-
- return ETK_TRUE;
-}
-/*******************/
-
-void
-PopulateImageBrowser(void)
+image_browser_populate(void)
{
Evas_List *l, *images;
char buf[4096];
@@ -422,7 +357,16 @@
}
void
-UpdateImageBrowser(void)
+image_browser_show(int UpdateCurrent)
+{
+ ImageBroserUpdate = UpdateCurrent;
+ image_browser_populate();
+ image_browser_update();
+ etk_widget_show_all(UI_ImageBrowserWin);
+}
+
+void
+image_browser_update(void)
{
const char *pi;
char buf[4096];
@@ -461,9 +405,62 @@
}
}
-/* Image Browser callbacks */
+
+
+/* Image Frame Callbacks */
+Etk_Bool
+_image_TweenList_row_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void
*data)
+{
+ Etk_Tree_Col *col;
+ char *selected = NULL;
+ printf("Row selected signal on ImageTweenList EMITTED\n");
+
+ col = etk_tree_nth_col_get(ETK_TREE(UI_ImageTweenList), 0);
+ etk_tree_row_fields_get(row, col, NULL, NULL, &selected, NULL);
+ if (!selected) return ETK_TRUE;
+
+ Cur.tween = etk_string_set(Cur.tween, selected);
+ etk_widget_disabled_set(UI_DeleteTweenButton, FALSE);
+ // etk_widget_disabled_set(UI_MoveDownTweenButton, FALSE);
+ // etk_widget_disabled_set(UI_MoveUpTweenButton, FALSE);
+
+ return ETK_TRUE;
+}
+
+Etk_Bool
+_image_AlphaSlider_value_changed_cb(Etk_Object *object, double va, void *data)
+{
+ printf("ImageSlieder value_changed signale EMIT: %.2f\n",va);
+
+ if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
+ if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
+ edje_edit_state_color_set(edje_o, Cur.part->string, Cur.state->string,
+ -1, -1, -1, (int)va);
+ canvas_redraw();
+
+ return ETK_TRUE;
+}
+
+Etk_Bool
+_image_border_spinners_value_changed_cb(Etk_Range *range, double value, void
*data)
+{
+ printf("Value Changed signal on BorderSpinner EMITTED (value:
%f)\n",etk_range_value_get(range));
+
+ if (!etk_string_length_get(Cur.state)) return ETK_TRUE;
+ if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
+ edje_edit_state_image_border_set(edje_o, Cur.part->string,
Cur.state->string,
+ (int)etk_range_value_get(ETK_RANGE(UI_BorderLeftSpinner)),
+ (int)etk_range_value_get(ETK_RANGE(UI_BorderRightSpinner)),
+ (int)etk_range_value_get(ETK_RANGE(UI_BorderTopSpinner)),
+ (int)etk_range_value_get(ETK_RANGE(UI_BorderBottomSpinner)));
+
+ canvas_redraw();
+
+ return ETK_TRUE;
+}
+/* Image Browser Callbacks */
Etk_Bool
-on_ImageBrowserIconbox_selected(Etk_Iconbox *iconbox, Etk_Iconbox_Icon *icon,
void *data)
+_image_browser_iconbox_selected_cb(Etk_Iconbox *iconbox, Etk_Iconbox_Icon
*icon, void *data)
{
const char *image;
image = etk_iconbox_icon_label_get(icon);
@@ -473,7 +470,7 @@
{
edje_edit_state_image_set(edje_o, Cur.part->string, Cur.state->string,
image);
}
- UpdateImageFrame();
+ image_frame_update();
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_images.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_images.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_images.h 2 Jul 2008 14:29:34 -0000 1.2
@@ -1,6 +1,7 @@
#ifndef _EDJE_EDITOR_IMAGES_H_
#define _EDJE_EDITOR_IMAGES_H_
+
/* image frame objects */
Etk_Widget *UI_ImageTweenList;
Etk_Widget *UI_ImageNameLabel;
@@ -22,21 +23,20 @@
Etk_Widget *UI_ImageBrowserSizeLabel;
-Etk_Widget* create_image_frame(void);
-void PopulateTweenList(void);
-void UpdateImageFrame(void);
-void ShowImageBrowser(int UpdateCurrent);
-
-Etk_Bool on_ImageAlphaSlider_value_changed (Etk_Object *object, double value,
void *data);
-Etk_Bool on_ImageComboBox_item_activated (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
-Etk_Bool on_ImageTweenList_row_selected (Etk_Object *object, Etk_Tree_Row
*row, void *data);
-Etk_Bool on_BorderSpinner_value_changed (Etk_Range *range, double value,
void *data);
-
-Etk_Widget* create_image_browser(void);
-void PopulateImageBrowser(void);
-void UpdateImageBrowser(void);
-Etk_Bool on_ImageBrowserIconbox_selected(Etk_Iconbox *iconbox,
Etk_Iconbox_Icon *icon, void *data);
+Etk_Widget* image_frame_create (void);
+void image_frame_update (void);
+void image_tweenlist_populate (void);
+
+Etk_Widget* image_browser_create (void);
+void image_browser_populate (void);
+void image_browser_show (int UpdateCurrent);
+void image_browser_update (void);
+
+Etk_Bool _image_AlphaSlider_value_changed_cb (Etk_Object *object, double
value, void *data);
+Etk_Bool _image_TweenList_row_selected_cb (Etk_Object *object,
Etk_Tree_Row *row, void *data);
+Etk_Bool _image_border_spinners_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _image_browser_iconbox_selected_cb (Etk_Iconbox *iconbox,
Etk_Iconbox_Icon *icon, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_tree.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_tree.c 2 Jul 2008 14:29:34 -0000 1.3
@@ -294,7 +294,7 @@
edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
break;
case EDJE_PART_TYPE_IMAGE:
- UpdateImageFrame();
+ image_frame_update();
edje_object_signal_emit(edje_ui,"image_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_window.c 2 Jul 2008 14:08:41 -0000 1.5
+++ edje_editor_window.c 2 Jul 2008 14:29:34 -0000 1.6
@@ -210,7 +210,7 @@
//ImageEmbed
UI_ImageEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_ImageEmbed), create_image_frame());
+ etk_container_add(ETK_CONTAINER(UI_ImageEmbed), image_frame_create());
etk_embed_position_method_set(ETK_EMBED(UI_ImageEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_ImageEmbed);
@@ -258,7 +258,7 @@
UI_ColorWin = dialog_colorpicker_create();
//Image Browser
- create_image_browser();
+ image_browser_create();
//Create the main edje object to edit
edje_o = edje_object_add(UI_evas);
@@ -420,13 +420,13 @@
ReloadEdje();
break;
case IMAGE_BROWSER_SHOW:
- ShowImageBrowser(1);
+ image_browser_show(1);
break;
case IMAGE_BROWSER_CLOSE:
etk_widget_hide(ETK_WIDGET(UI_ImageBrowserWin));
break;
case TOOLBAR_IMAGE_BROWSER:
- ShowImageBrowser(0);
+ image_browser_show(0);
break;
case TOOLBAR_FONT_BROWSER:
dialog_alert_show("Font Browser");
@@ -446,7 +446,7 @@
if (icons)
{
evas_list_free(icons);
- PopulateTweenList();
+ image_tweenlist_populate();
row = etk_tree_last_row_get(ETK_TREE(UI_ImageTweenList));
etk_tree_row_select(row);
etk_tree_row_scroll_to(row, ETK_FALSE);
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
