forked from enlightenment/enlightenment
Initial check-in of upcoming toolbar. Ignore this code for now as it's still
a work in progress (ie: do not use right now). SVN revision: 32229
This commit is contained in:
parent
b28acd50ac
commit
9a4d68f63a
|
@ -156,7 +156,9 @@ e_widget_font_preview.h \
|
|||
e_fm_custom.h \
|
||||
e_fm_shared.h \
|
||||
e_config_data.h \
|
||||
e_intl_data.h
|
||||
e_intl_data.h \
|
||||
e_toolbar.h \
|
||||
e_int_toolbar_config.h
|
||||
|
||||
enlightenment_src = \
|
||||
e_user.c \
|
||||
|
@ -286,6 +288,8 @@ e_order.c \
|
|||
e_exec.c \
|
||||
e_widget_font_preview.c \
|
||||
e_fm_custom.c \
|
||||
e_toolbar.c \
|
||||
e_int_toolbar_config.c \
|
||||
$(ENLIGHTENMENTHEADERS)
|
||||
|
||||
enlightenment_SOURCES = \
|
||||
|
|
|
@ -672,6 +672,22 @@ e_gadcon_shelf_get(E_Gadcon *gc)
|
|||
return gc->shelf;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar)
|
||||
{
|
||||
E_OBJECT_CHECK(gc);
|
||||
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
|
||||
gc->toolbar = toolbar;
|
||||
}
|
||||
|
||||
EAPI E_Toolbar *
|
||||
e_gadcon_toolbar_get(E_Gadcon *gc)
|
||||
{
|
||||
E_OBJECT_CHECK_RETURN(gc, NULL);
|
||||
E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL);
|
||||
return gc->toolbar;
|
||||
}
|
||||
|
||||
EAPI E_Config_Gadcon_Client *
|
||||
e_gadcon_client_config_new(E_Gadcon *gc, const char *name)
|
||||
{
|
||||
|
|
|
@ -84,6 +84,7 @@ struct _E_Gadcon
|
|||
unsigned char editing : 1;
|
||||
Ecore_X_Window dnd_win;
|
||||
E_Shelf *shelf;
|
||||
E_Toolbar *toolbar;
|
||||
|
||||
E_Drop_Handler *drop_handler;
|
||||
|
||||
|
@ -194,7 +195,8 @@ EAPI void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win);
|
|||
EAPI Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc);
|
||||
EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf);
|
||||
EAPI E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc);
|
||||
|
||||
EAPI void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar);
|
||||
EAPI E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc);
|
||||
EAPI E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name);
|
||||
EAPI void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc);
|
||||
EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj);
|
||||
|
|
|
@ -119,7 +119,6 @@
|
|||
#include "e_color_dialog.h"
|
||||
#include "e_sys.h"
|
||||
#include "e_obj_dialog.h"
|
||||
//#include "e_fwin.h"
|
||||
#include "e_filereg.h"
|
||||
#include "e_widget_aspect.h"
|
||||
#include "e_widget_desk_preview.h"
|
||||
|
@ -130,3 +129,5 @@
|
|||
#include "e_widget_font_preview.h"
|
||||
#include "e_fm_custom.h"
|
||||
#include "e_msgbus.h"
|
||||
#include "e_toolbar.h"
|
||||
#include "e_int_toolbar_config.h"
|
||||
|
|
|
@ -0,0 +1,91 @@
|
|||
#include "e.h"
|
||||
|
||||
/* local function protos */
|
||||
static void *_create_data (E_Config_Dialog *cfd);
|
||||
static void _fill_data (E_Config_Dialog_Data *cfdata);
|
||||
static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
int orient;
|
||||
};
|
||||
|
||||
EAPI void
|
||||
e_int_toolbar_config(E_Toolbar *tbar)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
E_Container *con;
|
||||
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
if (!v) return;
|
||||
con = e_container_current_get(e_manager_current_get());
|
||||
v->create_cfdata = _create_data;
|
||||
v->free_cfdata = _free_data;
|
||||
v->basic.apply_cfdata = _basic_apply;
|
||||
v->basic.create_widgets = _basic_create;
|
||||
cfd = e_config_dialog_new(con, _("Toolbar Configuration"), "E",
|
||||
"_toolbar_config_dialog", "enlightenment/shelf",
|
||||
0, v, tbar);
|
||||
tbar->cfg_dlg = cfd;
|
||||
}
|
||||
|
||||
/* local functions */
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->tbar = cfd->data;
|
||||
_fill_data(cfdata);
|
||||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->orient = cfdata->tbar->gadcon->orient;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->tbar->cfg_dlg = NULL;
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *ot, *ow;
|
||||
E_Radio_Group *rg;
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
ot = e_widget_frametable_add(evas, _("Layout"), 1);
|
||||
rg = e_widget_radio_group_new(&(cfdata->orient));
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_left",
|
||||
24, 24, E_GADCON_ORIENT_LEFT, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_top",
|
||||
24, 24, E_GADCON_ORIENT_TOP, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_right",
|
||||
24, 24, E_GADCON_ORIENT_RIGHT, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 2, 1, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_position_bottom",
|
||||
24, 24, E_GADCON_ORIENT_BOTTOM, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 1, 2, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o, ot, 1, 1, 0.5);
|
||||
return o;
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#ifdef E_TYPEDEFS
|
||||
#else
|
||||
#ifndef E_INT_TOOLBAR_CONFIG_H
|
||||
#define E_INT_TOOLBAR_CONFIG_H
|
||||
|
||||
EAPI void e_int_toolbar_config(E_Toolbar *tbar);
|
||||
|
||||
#endif
|
||||
#endif
|
|
@ -0,0 +1,303 @@
|
|||
#include "e.h"
|
||||
|
||||
/* local function protos */
|
||||
static void _e_toolbar_free(E_Toolbar *tbar);
|
||||
static void _e_toolbar_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
|
||||
static void _e_toolbar_menu_cb_post(void *data, E_Menu *mn);
|
||||
static void _e_toolbar_menu_cb_pre(void *data, E_Menu *mn);
|
||||
static void _e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn);
|
||||
static void _e_toolbar_menu_del_hook(void *data);
|
||||
static void _e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
static void _e_toolbar_menu_cb_config(void *data, E_Menu *mn, E_Menu_Item *mi);
|
||||
static void _e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
|
||||
|
||||
/* local vars */
|
||||
static Evas_List *toolbars = NULL;
|
||||
|
||||
EAPI int
|
||||
e_toolbar_init(void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
EAPI int
|
||||
e_toolbar_shutdown(void)
|
||||
{
|
||||
while (toolbars)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
|
||||
tbar = toolbars->data;
|
||||
e_object_del(E_OBJECT(tbar));
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
EAPI E_Toolbar *
|
||||
e_toolbar_new(Evas *evas, const char *name)
|
||||
{
|
||||
E_Toolbar *tbar = NULL;
|
||||
|
||||
if (!name) return NULL;
|
||||
|
||||
tbar = E_OBJECT_ALLOC(E_Toolbar, E_TOOLBAR_TYPE, _e_toolbar_free);
|
||||
if (!tbar) return NULL;
|
||||
tbar->id = evas_list_count(toolbars) + 1;
|
||||
tbar->x = tbar->y = 0;
|
||||
tbar->h = tbar->w = 32;
|
||||
tbar->evas = evas;
|
||||
tbar->name = evas_stringshare_add(name);
|
||||
|
||||
tbar->o_event = evas_object_rectangle_add(evas);
|
||||
evas_object_color_set(tbar->o_event, 0, 0, 0, 0);
|
||||
evas_object_resize(tbar->o_event, tbar->w, tbar->h);
|
||||
evas_object_event_callback_add(tbar->o_event, EVAS_CALLBACK_MOUSE_DOWN,
|
||||
_e_toolbar_cb_mouse_down, tbar);
|
||||
|
||||
tbar->o_base = edje_object_add(evas);
|
||||
evas_object_resize(tbar->o_base, tbar->w, tbar->h);
|
||||
e_theme_edje_object_set(tbar->o_base, "base/theme/toolbar",
|
||||
"e/toolbar/default/base");
|
||||
evas_object_move(tbar->o_event, 0, 0);
|
||||
evas_object_move(tbar->o_base, 0, 0);
|
||||
|
||||
tbar->gadcon = e_gadcon_swallowed_new(tbar->name, tbar->id, tbar->o_base, "e.swallow.content");
|
||||
e_gadcon_size_request_callback_set(tbar->gadcon, _e_toolbar_gadcon_size_request, tbar);
|
||||
/* FIXME: We want to implement "styles" here ? */
|
||||
|
||||
e_gadcon_orient(tbar->gadcon, E_GADCON_ORIENT_TOP);
|
||||
/* TODO: Send signals to theme obj */
|
||||
|
||||
e_gadcon_toolbar_set(tbar->gadcon, tbar);
|
||||
|
||||
toolbars = evas_list_append(toolbars, tbar);
|
||||
return tbar;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_toolbar_show(E_Toolbar *tbar)
|
||||
{
|
||||
E_OBJECT_CHECK(tbar);
|
||||
E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
|
||||
evas_object_show(tbar->o_event);
|
||||
evas_object_show(tbar->o_base);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_toolbar_move(E_Toolbar *tbar, int x, int y)
|
||||
{
|
||||
E_OBJECT_CHECK(tbar);
|
||||
E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
|
||||
tbar->x = x;
|
||||
tbar->y = y;
|
||||
evas_object_move(tbar->o_event, tbar->x, tbar->y);
|
||||
evas_object_move(tbar->o_base, tbar->x, tbar->y);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_toolbar_resize(E_Toolbar *tbar, int w, int h)
|
||||
{
|
||||
E_OBJECT_CHECK(tbar);
|
||||
E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
|
||||
tbar->w = w;
|
||||
tbar->h = h;
|
||||
evas_object_resize(tbar->o_event, tbar->w, tbar->h);
|
||||
evas_object_resize(tbar->o_base, tbar->w, tbar->h);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_toolbar_move_resize(E_Toolbar *tbar, int x, int y, int w, int h)
|
||||
{
|
||||
E_OBJECT_CHECK(tbar);
|
||||
E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
|
||||
tbar->x = x;
|
||||
tbar->y = y;
|
||||
tbar->w = w;
|
||||
tbar->h = h;
|
||||
evas_object_move(tbar->o_event, x, y);
|
||||
evas_object_move(tbar->o_base, x, y);
|
||||
evas_object_resize(tbar->o_event, w, h);
|
||||
evas_object_resize(tbar->o_base, w, h);
|
||||
}
|
||||
|
||||
/* local functions */
|
||||
static void
|
||||
_e_toolbar_free(E_Toolbar *tbar)
|
||||
{
|
||||
toolbars = evas_list_remove(toolbars, tbar);
|
||||
|
||||
if (tbar->menu)
|
||||
{
|
||||
e_menu_post_deactivate_callback_set(tbar->menu, NULL, NULL);
|
||||
e_object_del(E_OBJECT(tbar->menu));
|
||||
tbar->menu = NULL;
|
||||
}
|
||||
if (tbar->cfg_dlg) e_object_del(E_OBJECT(tbar->cfg_dlg));
|
||||
e_object_del(E_OBJECT(tbar->gadcon));
|
||||
if (tbar->name) evas_stringshare_del(tbar->name);
|
||||
evas_object_del(tbar->o_event);
|
||||
evas_object_del(tbar->o_base);
|
||||
E_FREE(tbar);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Event_Mouse_Down *ev;
|
||||
E_Toolbar *tbar;
|
||||
E_Menu *mn;
|
||||
E_Zone *zone;
|
||||
int x, y;
|
||||
|
||||
ev = event_info;
|
||||
tbar = data;
|
||||
switch (ev->button)
|
||||
{
|
||||
case 3:
|
||||
mn = e_menu_new();
|
||||
e_menu_post_deactivate_callback_set(mn, _e_toolbar_menu_cb_post, tbar);
|
||||
tbar->menu = mn;
|
||||
_e_toolbar_menu_append(tbar, mn);
|
||||
zone = e_util_zone_current_get(e_manager_current_get());
|
||||
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
|
||||
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
|
||||
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
|
||||
e_util_evas_fake_mouse_up_later(tbar->gadcon->evas, ev->button);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_cb_post(void *data, E_Menu *mn)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
|
||||
tbar = data;
|
||||
if (!tbar->menu) return;
|
||||
e_object_del(E_OBJECT(tbar->menu));
|
||||
tbar->menu = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_cb_pre(void *data, E_Menu *mn)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
E_Menu_Item *mi;
|
||||
|
||||
tbar = data;
|
||||
e_menu_pre_activate_callback_set(mn, NULL, NULL);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
if (tbar->gadcon->editing)
|
||||
e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
|
||||
else
|
||||
e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
|
||||
e_util_menu_item_edje_icon_set(mi, "enlightenment/edit");
|
||||
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_edit, tbar);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_label_set(mi, _("Toolbar Configuration"));
|
||||
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
|
||||
e_menu_item_callback_set(mi, _e_toolbar_menu_cb_config, tbar);
|
||||
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_label_set(mi, _("Configure Toolbar Contents"));
|
||||
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_append(E_Toolbar *tbar, E_Menu *mn)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
E_Menu *subm;
|
||||
|
||||
subm = e_menu_new();
|
||||
mi = e_menu_item_new(mn);
|
||||
e_menu_item_label_set(mi, tbar->name);
|
||||
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
|
||||
e_menu_pre_activate_callback_set(subm, _e_toolbar_menu_cb_pre, tbar);
|
||||
e_object_free_attach_func_set(E_OBJECT(subm), _e_toolbar_menu_del_hook);
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_del_hook(void *data)
|
||||
{
|
||||
E_Menu *mn;
|
||||
Evas_List *l = NULL;
|
||||
|
||||
mn = data;
|
||||
for (l = mn->items; l; l = l->next)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
|
||||
mi = l->data;
|
||||
if (mi->submenu) e_object_del(E_OBJECT(mi->submenu));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_cb_edit(void *data, E_Menu *mn, E_Menu_Item *mi)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
|
||||
tbar = data;
|
||||
if (tbar->gadcon->editing)
|
||||
{
|
||||
e_gadcon_edit_end(tbar->gadcon);
|
||||
}
|
||||
else
|
||||
{
|
||||
e_gadcon_edit_begin(tbar->gadcon);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_menu_cb_config(void *data, E_Menu *mn, E_Menu_Item *mi)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
|
||||
tbar = data;
|
||||
if (!tbar->cfg_dlg) e_int_toolbar_config(tbar);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
Evas_Coord nx, ny, nw, nh, ww, hh;
|
||||
|
||||
tbar = data;
|
||||
nx = tbar->x;
|
||||
ny = tbar->y;
|
||||
nw = tbar->w;
|
||||
nh = tbar->h;
|
||||
ww = hh = 0;
|
||||
evas_object_geometry_get(gc->o_container, NULL, NULL, &ww, &hh);
|
||||
switch (gc->orient)
|
||||
{
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
w = ww;
|
||||
h = hh;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
e_gadcon_swallowed_min_size_set(gc, w, h);
|
||||
edje_object_size_min_calc(tbar->o_base, &nw, &nh);
|
||||
switch (gc->orient)
|
||||
{
|
||||
case E_GADCON_ORIENT_TOP:
|
||||
nw = tbar->w;
|
||||
nh = tbar->h;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
e_toolbar_move_resize(tbar, nx, ny, nw, nh);
|
||||
}
|
|
@ -0,0 +1,35 @@
|
|||
#ifdef E_TYPEDEFS
|
||||
|
||||
typedef struct _E_Toolbar E_Toolbar;
|
||||
|
||||
#else
|
||||
#ifndef E_TOOLBAR_H
|
||||
#define E_TOOLBAR_H
|
||||
|
||||
#define E_TOOLBAR_TYPE 0xE0b0101f
|
||||
|
||||
struct _E_Toolbar
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
int x, y, w, h, id;
|
||||
const char *name;
|
||||
|
||||
Evas *evas;
|
||||
E_Gadcon *gadcon;
|
||||
E_Menu *menu;
|
||||
|
||||
E_Config_Dialog *cfg_dlg;
|
||||
Evas_Object *o_base, *o_event;
|
||||
};
|
||||
|
||||
EAPI int e_toolbar_init (void);
|
||||
EAPI int e_toolbar_shutdown (void);
|
||||
EAPI E_Toolbar *e_toolbar_new (Evas *evas, const char *name);
|
||||
EAPI void e_toolbar_show (E_Toolbar *tbar);
|
||||
EAPI void e_toolbar_move (E_Toolbar *tbar, int x, int y);
|
||||
EAPI void e_toolbar_resize (E_Toolbar *tbar, int w, int h);
|
||||
EAPI void e_toolbar_move_resize (E_Toolbar *tbar, int x, int y, int w, int h);
|
||||
|
||||
#endif
|
||||
#endif
|
Loading…
Reference in New Issue