parent
6b749086ef
commit
45c25644e5
|
@ -2536,6 +2536,7 @@ e_border_icon_add(E_Border *bd, Evas *evas)
|
||||||
e_util_edje_icon_set(o, "enlightenment/e");
|
e_util_edje_icon_set(o, "enlightenment/e");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
/* FIXME: .eaps are going away, raster says this is for module .eaps, so need to take care of all that at the same time. */
|
||||||
if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap"))
|
if (!strcmp(bd->internal_icon + strlen(bd->internal_icon) - 4, ".eap"))
|
||||||
{
|
{
|
||||||
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
|
if (!edje_object_file_set(o, bd->internal_icon, "icon"))
|
||||||
|
|
|
@ -32,6 +32,7 @@ struct _E_Config_Dialog_Data
|
||||||
char *wtitle;
|
char *wtitle;
|
||||||
char *wrole;
|
char *wrole;
|
||||||
char *iclass;
|
char *iclass;
|
||||||
|
char *ipath;
|
||||||
int icon_theme;
|
int icon_theme;
|
||||||
int startup_notify;
|
int startup_notify;
|
||||||
int wait_exit;
|
int wait_exit;
|
||||||
|
@ -113,6 +114,7 @@ _e_eap_edit_fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
IFDUP(cfdata->editor->eap->win_title, cfdata->wtitle);
|
IFDUP(cfdata->editor->eap->win_title, cfdata->wtitle);
|
||||||
IFDUP(cfdata->editor->eap->win_role, cfdata->wrole);
|
IFDUP(cfdata->editor->eap->win_role, cfdata->wrole);
|
||||||
IFDUP(cfdata->editor->eap->icon_class, cfdata->iclass);
|
IFDUP(cfdata->editor->eap->icon_class, cfdata->iclass);
|
||||||
|
IFDUP(cfdata->editor->eap->icon_path, cfdata->ipath);
|
||||||
cfdata->startup_notify = cfdata->editor->eap->startup_notify;
|
cfdata->startup_notify = cfdata->editor->eap->startup_notify;
|
||||||
cfdata->wait_exit = cfdata->editor->eap->wait_exit;
|
cfdata->wait_exit = cfdata->editor->eap->wait_exit;
|
||||||
/*- COMMON -*/
|
/*- COMMON -*/
|
||||||
|
@ -147,6 +149,7 @@ _e_eap_edit_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *data)
|
||||||
E_FREE(data->wtitle);
|
E_FREE(data->wtitle);
|
||||||
E_FREE(data->wrole);
|
E_FREE(data->wrole);
|
||||||
E_FREE(data->iclass);
|
E_FREE(data->iclass);
|
||||||
|
E_FREE(data->ipath);
|
||||||
E_FREE(data->image);
|
E_FREE(data->image);
|
||||||
if (data->editor->eap->tmpfile) ecore_file_unlink(data->editor->eap->image);
|
if (data->editor->eap->tmpfile) ecore_file_unlink(data->editor->eap->image);
|
||||||
data->editor->eap->tmpfile = 0;
|
data->editor->eap->tmpfile = 0;
|
||||||
|
|
|
@ -278,7 +278,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
|
||||||
mi = e_menu_item_new(m);
|
mi = e_menu_item_new(m);
|
||||||
e_menu_item_label_set(mi, _("Edit Icon"));
|
e_menu_item_label_set(mi, _("Edit Icon"));
|
||||||
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
|
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
|
||||||
e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
|
e_app_icon_add_to_menu_item(mi, bd->app);
|
||||||
}
|
}
|
||||||
else if (bd->client.icccm.class) /* icons with no class useless to borders */
|
else if (bd->client.icccm.class) /* icons with no class useless to borders */
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue