fix edje errors. printf--

SVN revision: 48793
This commit is contained in:
Hannes Janetzek 2010-05-12 23:27:05 +00:00
parent 441ffc2a40
commit 13d86d2ec5
2 changed files with 23 additions and 74 deletions

View File

@ -149,6 +149,7 @@ collections
{ {
state:"default" 0.00; state:"default" 0.00;
visible:1; visible:1;
align: 1.0 0.5;
rel1 rel1
{ {
relative:0.00 0.00; relative:0.00 0.00;
@ -157,8 +158,8 @@ collections
} }
rel2 rel2
{ {
relative:1.00 0.50; relative:1.0 0.50;
offset:-1 -3; offset:-12 -3;
to:"item_clip"; to:"item_clip";
} }
color2:0 0 0 96; color2:0 0 0 96;
@ -169,8 +170,8 @@ collections
text_class:"empris"; text_class:"empris";
font:"Sans:style=Mono"; font:"Sans:style=Mono";
size:10; size:10;
min:0 1; min:1 1;
align:0.50 0.50; align:1.00 0.50;
} }
} }
description description
@ -178,36 +179,12 @@ collections
state:"hidden" 0.00; state:"hidden" 0.00;
inherit: "default" 0.0; inherit: "default" 0.0;
visible:0; visible:0;
rel1
{
relative:0.00 0.00;
offset:0 4;
to:"item_clip";
}
rel2
{
relative:1.00 0.50;
offset:-1 -3;
to:"item_clip";
}
} }
description description
{ {
state:"visible" 0.00; state:"visible" 0.00;
inherit: "default" 0.0; inherit: "default" 0.0;
visible:1; visible:1;
rel1
{
relative:0.00 0.00;
offset:0 4;
to:"item_clip";
}
rel2
{
relative:1.00 0.50;
offset:-1 -3;
to:"item_clip";
}
} }
} }
part part
@ -224,13 +201,14 @@ collections
rel1 rel1
{ {
relative:0.00 0.50; relative:0.00 0.50;
offset:0 4;
offset:1 4;
to:"item_clip"; to:"item_clip";
} }
rel2 rel2
{ {
relative:1.00 1.00; relative:1.00 1.00;
offset:-1 -3; offset:-12 -3;
to:"item_clip"; to:"item_clip";
} }
color2:0 0 0 96; color2:0 0 0 96;
@ -241,8 +219,8 @@ collections
text_class:"empris"; text_class:"empris";
font:"Sans:style=Mono"; font:"Sans:style=Mono";
size:9; size:9;
min:0 1; min:0 0;
align:0.50 0.50; align:1.00 0.50;
} }
} }
description description
@ -250,36 +228,12 @@ collections
state:"hidden" 0.00; state:"hidden" 0.00;
inherit: "default" 0.0; inherit: "default" 0.0;
visible:0; visible:0;
rel1
{
relative:0.00 0.50;
offset:0 4;
to:"item_clip";
}
rel2
{
relative:1.00 1.00;
offset:-1 -3;
to:"item_clip";
}
} }
description description
{ {
state:"visible" 0.00; state:"visible" 1.00;
inherit: "default" 0.0; inherit: "default" 0.0;
visible:1; visible:1;
rel1
{
relative:0.00 0.50;
offset:0 4;
to:"item_clip";
}
rel2
{
relative:1.00 1.00;
offset:-1 -3;
to:"item_clip";
}
} }
} }
part part
@ -556,7 +510,7 @@ collections
{ {
state:"default" 0.00; state:"default" 0.00;
visible:1; visible:1;
min:200 45; min:250 45;
rel1 rel1
{ {
relative:0.00 0.00; relative:0.00 0.00;
@ -650,6 +604,7 @@ collections
state:"default" 0.00; state:"default" 0.00;
visible:1; visible:1;
align:0.00 0.50; align:0.00 0.50;
min: 10 10;
fixed : 1 1; fixed : 1 1;
rel1 rel1
{ {
@ -687,6 +642,8 @@ collections
state:"default" 0.00; state:"default" 0.00;
visible:1; visible:1;
align:0.00 0.50; align:0.00 0.50;
min: 10 10;
fixed : 1 1;
rel1 rel1
{ {
relative:0.00 1.00; relative:0.00 1.00;
@ -726,6 +683,8 @@ collections
state:"default" 0.00; state:"default" 0.00;
visible:1; visible:1;
align:0.00 0.50; align:0.00 0.50;
min: 10 10;
fixed : 1 1;
rel1 rel1
{ {
relative:0.00 1.00; relative:0.00 1.00;

View File

@ -347,36 +347,31 @@ _empris_config_updated (Config_Item * ci)
} }
static void static void
_empris_cb_play (void *data, Evas_Object * obj, const char *emission, _empris_cb_play (void *data, Evas_Object * obj, const char *emission, const char *source)
const char *source)
{ {
_dbus_send_msg("/Player", "Play", NULL, NULL); _dbus_send_msg("/Player", "Play", NULL, NULL);
} }
static void static void
_empris_cb_previous (void *data, Evas_Object * obj, const char *emission, _empris_cb_previous (void *data, Evas_Object * obj, const char *emission, const char *source)
const char *source)
{ {
_dbus_send_msg("/Player", "Prev", NULL, NULL); _dbus_send_msg("/Player", "Prev", NULL, NULL);
} }
static void static void
_empris_cb_next (void *data, Evas_Object * obj, const char *emission, _empris_cb_next (void *data, Evas_Object * obj, const char *emission, const char *source)
const char *source)
{ {
_dbus_send_msg("/Player", "Next", NULL, NULL); _dbus_send_msg("/Player", "Next", NULL, NULL);
} }
static void static void
_empris_cb_stop (void *data, Evas_Object * obj, const char *emission, _empris_cb_stop (void *data, Evas_Object * obj, const char *emission, const char *source)
const char *source)
{ {
_dbus_send_msg("/Player", "Stop", NULL, NULL); _dbus_send_msg("/Player", "Stop", NULL, NULL);
} }
static void static void
_empris_cb_pause (void *data, Evas_Object * obj, const char *emission, _empris_cb_pause (void *data, Evas_Object * obj, const char *emission, const char *source)
const char *source)
{ {
_dbus_send_msg("/Player", "Pause", NULL, NULL); _dbus_send_msg("/Player", "Pause", NULL, NULL);
} }
@ -662,8 +657,6 @@ _dbus_cb_current_track(void *data, DBusMessage *reply, DBusError *error)
DBusMessage *msg; DBusMessage *msg;
int num; int num;
printf("cb cur track\n");
if (!_dbus_check_msg(reply, error)) return; if (!_dbus_check_msg(reply, error)) return;
dbus_message_get_args(reply, error, dbus_message_get_args(reply, error,
@ -671,7 +664,6 @@ _dbus_cb_current_track(void *data, DBusMessage *reply, DBusError *error)
DBUS_TYPE_INVALID); DBUS_TYPE_INVALID);
/* XXX inst->pnd*/ /* XXX inst->pnd*/
printf("cb current track %d\n", num);
_dbus_send_msg_int("/TrackList", "GetMetadata", _dbus_send_msg_int("/TrackList", "GetMetadata",
_dbus_cb_tracklist_metadata, inst, num); _dbus_cb_tracklist_metadata, inst, num);
@ -715,8 +707,6 @@ _dbus_cb_tracklist_metadata(void *data, DBusMessage *reply, DBusError *error)
Evas_Object *empris = inst->empris; Evas_Object *empris = inst->empris;
Evas_Object *o_popup = inst->o_popup; Evas_Object *o_popup = inst->o_popup;
printf("cb metadata\n");
if (error) if (error)
{ {
if (!_dbus_check_msg(reply, error)) if (!_dbus_check_msg(reply, error))