forked from enlightenment/enlightenment
efm now allows renaming by clicking an icon's label
SVN revision: 74963
This commit is contained in:
parent
6790e78bb7
commit
ce76c249b8
|
@ -20359,6 +20359,19 @@ collections {
|
||||||
rel2.offset: -9 -9;
|
rel2.offset: -9 -9;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "vol_state";
|
name: "vol_state";
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
|
@ -20439,6 +20452,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
@ -21394,6 +21413,19 @@ collections {
|
||||||
rel2.offset: -9 -9;
|
rel2.offset: -9 -9;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "vol_state";
|
name: "vol_state";
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
|
@ -21474,6 +21506,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
@ -22023,6 +22061,19 @@ collections {
|
||||||
color: 0 0 0 0;
|
color: 0 0 0 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.entry";
|
name: "e.swallow.entry";
|
||||||
type: SWALLOW;
|
type: SWALLOW;
|
||||||
|
@ -22034,6 +22085,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
@ -22579,6 +22636,19 @@ collections {
|
||||||
color: 0 0 0 0;
|
color: 0 0 0 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.entry";
|
name: "e.swallow.entry";
|
||||||
type: SWALLOW;
|
type: SWALLOW;
|
||||||
|
@ -22590,6 +22660,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
@ -23137,6 +23213,19 @@ collections {
|
||||||
color: 0 0 0 0;
|
color: 0 0 0 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.entry";
|
name: "e.swallow.entry";
|
||||||
type: SWALLOW;
|
type: SWALLOW;
|
||||||
|
@ -23148,6 +23237,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
@ -23694,6 +23789,19 @@ collections {
|
||||||
color: 0 0 0 0;
|
color: 0 0 0 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
part {
|
||||||
|
name: "label_event";
|
||||||
|
type: RECT;
|
||||||
|
mouse_events: 1;
|
||||||
|
repeat_events: 1;
|
||||||
|
ignore_flags: ON_HOLD;
|
||||||
|
description {
|
||||||
|
state: "default" 0.0;
|
||||||
|
color: 0 0 0 0;
|
||||||
|
rel1.to: "e.text.label";
|
||||||
|
rel2.to: "e.text.label";
|
||||||
|
}
|
||||||
|
}
|
||||||
part {
|
part {
|
||||||
name: "e.swallow.entry";
|
name: "e.swallow.entry";
|
||||||
type: SWALLOW;
|
type: SWALLOW;
|
||||||
|
@ -23705,6 +23813,12 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
programs {
|
programs {
|
||||||
|
program {
|
||||||
|
name: "label_click";
|
||||||
|
signal: "mouse,clicked,1";
|
||||||
|
source: "label_event";
|
||||||
|
action: SIGNAL_EMIT "e,action,label,click" "e";
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "go_active";
|
name: "go_active";
|
||||||
signal: "e,state,selected";
|
signal: "e,state,selected";
|
||||||
|
|
|
@ -178,6 +178,7 @@ struct _E_Fm2_Icon
|
||||||
Ecore_X_Window keygrab;
|
Ecore_X_Window keygrab;
|
||||||
E_Config_Dialog *prop_dialog;
|
E_Config_Dialog *prop_dialog;
|
||||||
E_Dialog *dialog;
|
E_Dialog *dialog;
|
||||||
|
Ecore_Timer *rename_click;
|
||||||
|
|
||||||
E_Fm2_Icon_Info info;
|
E_Fm2_Icon_Info info;
|
||||||
|
|
||||||
|
@ -4559,6 +4560,11 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
|
||||||
e_object_del(E_OBJECT(ic->dialog));
|
e_object_del(E_OBJECT(ic->dialog));
|
||||||
ic->dialog = NULL;
|
ic->dialog = NULL;
|
||||||
}
|
}
|
||||||
|
if (ic->rename_click)
|
||||||
|
{
|
||||||
|
ecore_timer_del(ic->rename_click);
|
||||||
|
ic->rename_click = NULL;
|
||||||
|
}
|
||||||
if (ic->entry_dialog)
|
if (ic->entry_dialog)
|
||||||
{
|
{
|
||||||
e_object_del(E_OBJECT(ic->entry_dialog));
|
e_object_del(E_OBJECT(ic->entry_dialog));
|
||||||
|
@ -4585,6 +4591,21 @@ _e_fm2_icon_free(E_Fm2_Icon *ic)
|
||||||
free(ic);
|
free(ic);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Eina_Bool
|
||||||
|
_e_fm2_icon_label_click_cb(void *data)
|
||||||
|
{
|
||||||
|
_e_fm2_file_rename(data, NULL, NULL);
|
||||||
|
return EINA_FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_e_fm2_icon_label_click(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||||
|
{
|
||||||
|
E_Fm2_Icon *ic = data;
|
||||||
|
if (ic->rename_click || ic->entry_widget || ic->entry_dialog) return;
|
||||||
|
ic->rename_click = ecore_timer_add(0.75, _e_fm2_icon_label_click_cb, ic);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_fm2_icon_realize(E_Fm2_Icon *ic)
|
_e_fm2_icon_realize(E_Fm2_Icon *ic)
|
||||||
{
|
{
|
||||||
|
@ -4653,6 +4674,7 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
|
||||||
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_MOVE, _e_fm2_cb_icon_mouse_move, ic);
|
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_MOVE, _e_fm2_cb_icon_mouse_move, ic);
|
||||||
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_IN, _e_fm2_cb_icon_mouse_in, ic);
|
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_IN, _e_fm2_cb_icon_mouse_in, ic);
|
||||||
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_OUT, _e_fm2_cb_icon_mouse_out, ic);
|
evas_object_event_callback_add(ic->obj, EVAS_CALLBACK_MOUSE_OUT, _e_fm2_cb_icon_mouse_out, ic);
|
||||||
|
edje_object_signal_callback_add(ic->obj, "e,action,label,click", "e", _e_fm2_icon_label_click, ic);
|
||||||
|
|
||||||
_e_fm2_icon_icon_set(ic);
|
_e_fm2_icon_icon_set(ic);
|
||||||
|
|
||||||
|
@ -6877,8 +6899,6 @@ _e_fm2_cb_icon_mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
|
||||||
ic = data;
|
ic = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
|
|
||||||
if (ic->entry_widget) return;
|
|
||||||
|
|
||||||
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
evas_object_smart_callback_call(ic->sd->obj, "icon,mouse,in", &ic->info);
|
evas_object_smart_callback_call(ic->sd->obj, "icon,mouse,in", &ic->info);
|
||||||
}
|
}
|
||||||
|
@ -6892,8 +6912,6 @@ _e_fm2_cb_icon_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
|
||||||
ic = data;
|
ic = data;
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
|
|
||||||
if (ic->entry_widget) return;
|
|
||||||
|
|
||||||
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
evas_object_smart_callback_call(ic->sd->obj, "icon,mouse,out", &ic->info);
|
evas_object_smart_callback_call(ic->sd->obj, "icon,mouse,out", &ic->info);
|
||||||
}
|
}
|
||||||
|
@ -9236,6 +9254,11 @@ _e_fm2_file_rename(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||||
char text[PATH_MAX + 256];
|
char text[PATH_MAX + 256];
|
||||||
|
|
||||||
ic = data;
|
ic = data;
|
||||||
|
if (ic->rename_click)
|
||||||
|
{
|
||||||
|
ecore_timer_del(ic->rename_click);
|
||||||
|
ic->rename_click = NULL;
|
||||||
|
}
|
||||||
if ((ic->entry_dialog) || (ic->entry_widget)) return;
|
if ((ic->entry_dialog) || (ic->entry_widget)) return;
|
||||||
|
|
||||||
if (!_e_fm2_icon_entry_widget_add(ic))
|
if (!_e_fm2_icon_entry_widget_add(ic))
|
||||||
|
|
Loading…
Reference in New Issue