styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- add callbacks for file fetching

Browse Source 
- integrate new e_file_dialog


SVN revision: 18072
devs/princeamd/enlightenment-0.17-elive
codewarrior 18 years ago committed by codewarrior
parent d16712064d
commit 1ebd9678cd
10 changed files with 192 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/bin/e_eap_editor.c
  2. 50
      src/bin/e_file_dialog.c
  3. 6
      src/bin/e_file_dialog.h
  4. 33
      src/bin/e_fileman_smart.c
  5. 28
      src/bin/e_icon_layout.c
  6. 1
      src/bin/e_includes.h
  7. 30
      src/bin/e_widget_fileman.c
  8. 1
      src/bin/e_widget_fileman.h
  9. 47
      src/bin/e_widget_iconsel.c
  10. 1
      src/bin/e_widget_iconsel.h

14
src/bin/e_eap_editor.c
Unescape View File

@ -48,7 +48,7 @@ static int _e_eap_edit_basic_apply_data(E_Config_Dialog *cfd, void *d
static int _e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd, void *data);
static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data);
static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data);
static void _e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data);
#define IFDUP(src, dst) if(src) dst = strdup(src); else dst = NULL
@ -217,7 +217,7 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
&cfdata->image);
e_widget_iconsel_select_callback_add(editor->img_widget, _e_eap_edit_select_cb, editor);
e_widget_frametable_object_append(o, editor->img_widget,
0, 0, 1, 1,
1, 1, 1, 1);
@ -368,3 +368,13 @@ _e_eap_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data
return ol;
}
void
_e_eap_edit_select_cb(Evas_Object *obj, char *file, void *data)
{
E_App_Edit *editor;
editor = data;
printf("selected: %s\n", file);
}

50
src/bin/e_file_dialog.c
Unescape View File

@ -9,6 +9,7 @@
static void _e_file_dialog_button1_click(void *data, E_Dialog *dia);
static void _e_file_dialog_button2_click(void *data, E_Dialog *dia);
static void _e_file_dialog_free(E_File_Dialog *dia);
static void _e_file_dialog_file_select_cb(Evas_Object *obj, char *file, void *data);
E_File_Dialog *
e_file_dialog_new(E_Container *con)
@ -17,7 +18,7 @@ e_file_dialog_new(E_Container *con)
Evas_Coord w, h, ew, eh;
E_Manager *man;
Evas *evas;
Evas_Object *table, *ol;
Evas_Object *table, *ol, *fm;
if (!con)
{
@ -39,30 +40,35 @@ e_file_dialog_new(E_Container *con)
dia->con = con;
dia->file = NULL;
dia->select_func = NULL;
dia->select_data = NULL;
evas = dia->dia->win->evas;
ol = e_widget_list_add(evas, 0, 1);
table = e_widget_frametable_add(evas, "Places", 0);
e_widget_frametable_object_append(table, e_widget_button_add(evas, "Home", "fileman/home", NULL,
e_widget_frametable_object_append(table, e_widget_button_add(evas, strdup("Home"), "fileman/home", NULL,
NULL, NULL),
0, 0, 1, 1, 1, 0, 1, 0);
e_widget_frametable_object_append(table, e_widget_button_add(evas, " Desktop", "fileman/desktop", NULL,
e_widget_frametable_object_append(table, e_widget_button_add(evas, strdup("Desktop"), "fileman/desktop", NULL,
NULL, NULL),
0, 1, 1, 1, 1, 0, 1, 0);
e_widget_frametable_object_append(table, e_widget_button_add(evas, " Icons", "fileman/folder", NULL,
e_widget_frametable_object_append(table, e_widget_button_add(evas, strdup("Icons"), "fileman/folder", NULL,
NULL, NULL),
0, 2, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(ol, table, 1, 1, 0.0);
table = e_widget_frametable_add(evas, "Select File", 0);
table = e_widget_table_add(evas, "Select File", 0);
fm = e_widget_fileman_add(evas, dia->file);
e_widget_table_object_append(table, fm, 0, 0, 4, 4, 1, 1, 1, 1);
e_widget_frametable_object_append(table, e_widget_fileman_add(evas, dia->file),
0, 0, 4, 4, 1, 1, 1, 1);
e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb, dia);
e_widget_list_object_append(ol, table, 1, 1, 0.0);
@ -87,13 +93,24 @@ e_file_dialog_title_set(E_File_Dialog *dia, const char *title)
e_dialog_title_set(dia->dia, title);
}
void
e_file_dialog_select_callback_add(E_File_Dialog *dia, void (*func)(E_File_Dialog *dia, char *file, void *data), void *data)
{
dia->select_func = func;
dia->select_data = data;
}
/* local subsystem functions */
static void
_e_file_dialog_button1_click(void *data, E_Dialog *dia)
_e_file_dialog_button1_click(void *data, E_Dialog *edia)
{
// TODO: Save or Ok ... clicked. Call user cb.
E_File_Dialog *dia;
dia = data;
if(dia->select_func && dia->file)
dia->select_func(dia, dia->file, dia->select_data);
_e_file_dialog_free(dia);
}
static void
@ -102,9 +119,24 @@ _e_file_dialog_button2_click(void *data, E_Dialog *dia)
_e_file_dialog_free(data);
}
static void
_e_file_dialog_file_select_cb(Evas_Object *obj, char *file, void *data)
{
E_File_Dialog *dia;
dia = data;
if(dia->select_func)
dia->select_func(dia, file, dia->select_data);
printf("e_file_dialog: %s\n", file);
_e_file_dialog_free(dia);
}
static void
_e_file_dialog_free(E_File_Dialog *dia)
{
e_object_del(E_OBJECT(dia->dia));
E_FREE(dia->file);
free(dia);
}

6
src/bin/e_file_dialog.h
Unescape View File

@ -19,11 +19,15 @@ struct _E_File_Dialog
E_Dialog *dia;
char *file;
void (*select_func)(E_File_Dialog *dia, char *file, void *data);
void *select_data;
};
EAPI E_File_Dialog *e_file_dialog_new (E_Container *con);
EAPI void e_file_dialog_show (E_File_Dialog *dia);
EAPI void e_file_dialog_title_set (E_File_Dialog *dia, const char *title);
EAPI void e_file_dialog_select_callback_add(E_File_Dialog *dia, void (*func)(E_File_Dialog *dia, char *file, void *data), void *data);
#endif
#endif

33
src/bin/e_fileman_smart.c
Unescape View File

@ -181,6 +181,8 @@ struct _E_Fm_Smart_Data
static void _e_fm_smart_add(Evas_Object *object);
static void _e_fm_smart_del(Evas_Object *object);
static void _e_fm_smart_show(Evas_Object *object);
static void _e_fm_smart_hide(Evas_Object *object);
static void _e_fm_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord y);
static void _e_fm_smart_resize(Evas_Object *object, Evas_Coord w, Evas_Coord h);
@ -252,8 +254,8 @@ e_fm_init(void)
NULL, NULL, NULL, NULL, NULL,
_e_fm_smart_move, /* move */
_e_fm_smart_resize, /* resize */
NULL,/* show */
NULL,/* hide */
_e_fm_smart_show,/* show */
_e_fm_smart_hide,/* hide */
NULL, /* color_set */
NULL, /* clip_set */
NULL, /* clip_unset */
@ -443,6 +445,30 @@ e_fm_background_set(Evas_Object *object, Evas_Object *bg)
/* local subsystem functions */
static void
_e_fm_smart_show(Evas_Object *object)
{
E_Fm_Smart_Data *sd;
if ((!object) || !(sd = evas_object_smart_data_get(object)))
return;
evas_object_show(sd->bg);
evas_object_show(sd->layout);
evas_object_show(sd->clip);
}
static void
_e_fm_smart_hide(Evas_Object *object)
{
E_Fm_Smart_Data *sd;
if ((!object) || !(sd = evas_object_smart_data_get(object)))
return;
evas_object_hide(sd->clip);
}
static void
_e_fm_smart_add(Evas_Object *object)
{
@ -476,6 +502,7 @@ _e_fm_smart_add(Evas_Object *object)
sd->layout = e_icon_layout_add(sd->evas);
evas_object_repeat_events_set(sd->layout, 1);
evas_object_smart_member_add(sd->layout, object);
e_icon_layout_spacing_set(sd->layout, sd->icon_info.x_space, sd->icon_info.y_space);
evas_object_stack_above(sd->layout, sd->bg);
@ -1611,7 +1638,7 @@ _e_fm_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
ev = event_info;
sd = data;

28
src/bin/e_icon_layout.c
Unescape View File

@ -39,6 +39,8 @@ static void _e_icon_layout_smart_move_resize_item(E_Icon_Layout_I
static void _e_icon_layout_smart_init(void);
static void _e_icon_layout_smart_add(Evas_Object *obj);
static void _e_icon_layout_smart_show(Evas_Object *obj);
static void _e_icon_layout_smart_hide(Evas_Object *obj);
static void _e_icon_layout_smart_del(Evas_Object *obj);
static void _e_icon_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
static void _e_icon_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
@ -396,14 +398,36 @@ _e_icon_layout_smart_init(void)
NULL, NULL, NULL, NULL, NULL,
_e_icon_layout_smart_move,
_e_icon_layout_smart_resize,
NULL,
NULL,
_e_icon_layout_smart_show,
_e_icon_layout_smart_hide,
_e_icon_layout_smart_color_set,
_e_icon_layout_smart_clip_set,
_e_icon_layout_smart_clip_unset,
NULL);
}
static void
_e_icon_layout_smart_show(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
evas_object_show(sd->clip);
}
static void
_e_icon_layout_smart_hide(Evas_Object *obj)
{
E_Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
evas_object_hide(sd->clip);
}
static void
_e_icon_layout_smart_add(Evas_Object *obj)
{

1
src/bin/e_includes.h
Unescape View File

@ -86,3 +86,4 @@
#include "e_eap_editor.h"
#include "e_file_selector.h"
#include "e_file_dialog.h"
#include "e_widget_fileman.h"

30
src/bin/e_widget_fileman.c
Unescape View File

@ -11,8 +11,11 @@
typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
Evas_Object *wid;
Evas_Object *o_fm;
char **valptr;
void (*select_func) (Evas_Object *obj, char *file, void *data);
void *select_data;
};
static void _e_wid_del_hook(Evas_Object *obj);
@ -43,11 +46,21 @@ _e_wid_fileman_selected_cb(Evas_Object *obj, char *file, void *data)
int size;
wd = data;
/* this is crashing, see why */
#if 0
if(*(wd->valptr) != NULL)
E_FREE(*(wd->valptr));
E_FREE(*(wd->valptr));
size = (strlen(file) + 1) * sizeof(char);
*(wd->valptr) = E_NEW(char *, size);
snprintf(*(wd->valptr), size, "%s", file);
snprintf(*(wd->valptr), size, "%s", file);
#endif
if(wd->select_func)
wd->select_func(wd->wid, file, wd->select_data);
printf("e_widget_fileman: %s\n", file);
}
/* externally accessible functions */
@ -64,6 +77,8 @@ e_widget_fileman_add(Evas *evas, char **val)
wd = calloc(1, sizeof(E_Widget_Data));
wd->valptr = val;
wd->select_func = NULL;
wd->select_data = NULL;
e_widget_data_set(obj, wd);
wd->o_fm = e_file_selector_add(evas);
@ -76,5 +91,16 @@ e_widget_fileman_add(Evas *evas, char **val)
evas_object_event_callback_add(wd->o_fm, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
e_widget_resize_object_set(obj, wd->o_fm);
wd->wid = obj;
return obj;
}
void
e_widget_fileman_select_callback_add(Evas_Object *obj, void (*func) (Evas_Object *obj, char *file, void *data), void *data)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
wd->select_func = func;
wd->select_data = data;
}

1
src/bin/e_widget_fileman.h
Unescape View File

@ -7,6 +7,7 @@
#define E_WIDGET_FM_H
EAPI Evas_Object *e_widget_fileman_add(Evas *evas, char **val);
EAPI void e_widget_fileman_select_callback_add(Evas_Object *obj, void (*func) (Evas_Object *obj, char *file, void *data), void *data);
#endif
#endif

47
src/bin/e_widget_iconsel.c
Unescape View File

@ -7,9 +7,13 @@ typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
E_Container *con;
Evas_Object *obj;
Evas_Object *o_button;
Evas_Object *o_icon;
char **valptr;
void (*select_func) (Evas_Object *obj, char *file, void *data);
void *select_data;
};
static void _e_wid_del_hook(Evas_Object *obj);
@ -19,6 +23,8 @@ static void _e_wid_active_hook_cb(E_Fileman *fileman, char *file, void *data);
static void _e_wid_disable_hook(Evas_Object *obj);
static void _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_wid_select_cb(E_File_Dialog *dia, char *file, void *data);
/* local subsystem functions */
/* externally accessible functions */
@ -38,6 +44,9 @@ e_widget_iconsel_add(Evas *evas, Evas_Object *icon, Evas_Coord minw, Evas_Coord
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
wd = calloc(1, sizeof(E_Widget_Data));
wd->valptr = file;
wd->select_func = NULL;
wd->select_data = NULL;
wd->obj = obj;
e_widget_data_set(obj, wd);
man = e_manager_current_get();
@ -91,6 +100,9 @@ e_widget_iconsel_add_from_file(Evas *evas, char *icon, Evas_Coord minw, Evas_Coo
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
wd = calloc(1, sizeof(E_Widget_Data));
wd->valptr = file;
wd->select_func = NULL;
wd->select_data = NULL;
wd->obj = obj;
e_widget_data_set(obj, wd);
o = edje_object_add(evas);
@ -124,6 +136,16 @@ e_widget_iconsel_add_from_file(Evas *evas, char *icon, Evas_Coord minw, Evas_Coo
return obj;
}
void
e_widget_iconsel_select_callback_add(Evas_Object *obj, void (*func)(Evas_Object *obj, char *file, void *data), void *data)
{
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
wd->select_func = func;
wd->select_data = data;
}
static void
_e_wid_del_hook(Evas_Object *obj)
{
@ -162,6 +184,7 @@ _e_wid_activate_hook(Evas_Object *obj)
dia = e_file_dialog_new(wd->con);
if(!dia) return;
e_file_dialog_title_set(dia, "Select File");
e_file_dialog_select_callback_add(dia, _e_wid_select_cb, wd);
e_file_dialog_show(dia);
}
@ -214,3 +237,27 @@ _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
e_widget_focus_steal(data);
}
static void
_e_wid_select_cb(E_File_Dialog *dia, char *file, void *data)
{
E_Widget_Data *wd;
char *ext;
wd = data;
ext = strrchr(file, '.');
if(!ext)
return;
if(strcasecmp(ext, ".png") && strcasecmp(ext, ".jpg") &&
strcasecmp(ext, ".jpeg"))
return;
if(wd->select_func)
wd->select_func(wd->obj, file, wd->select_data);
e_icon_file_set(wd->o_icon, file);
E_FREE(*(wd->valptr));
*(wd->valptr) = strdup(file);
e_object_del(dia);
}

1
src/bin/e_widget_iconsel.h
Unescape View File

@ -8,6 +8,7 @@
EAPI Evas_Object *e_widget_iconsel_add(Evas *evas, Evas_Object *icon, Evas_Coord minw, Evas_Coord minh, void (*func) (void *data, void *data2), void *data, void *data2);
EAPI Evas_Object *e_widget_iconsel_add_from_file(Evas *evas, char *icon, Evas_Coord minw, Evas_Coord minh, void (*func) (void *data, void *data2), void *data, void *data2);
EAPI void e_widget_iconsel_select_callback_add(Evas_Object *obj, void (*func)(Evas_Object *obj, char *file, void *data), void *data);
#endif
#endif

Write Preview
Loading…
Cancel
Save