forked from enlightenment/enlightenment
Be sure to close the mime_edit dialog if the main mime_list dialog closes.
SVN revision: 27092
This commit is contained in:
parent
3da0131bcc
commit
70769c03ef
|
@ -25,6 +25,7 @@ struct _E_Config_Dialog_Data
|
||||||
{
|
{
|
||||||
Evas_Object *tlist, *list;
|
Evas_Object *tlist, *list;
|
||||||
} gui;
|
} gui;
|
||||||
|
E_Config_Dialog *cfd, *edit_dlg;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void *_create_data (E_Config_Dialog *cfd);
|
static void *_create_data (E_Config_Dialog *cfd);
|
||||||
|
@ -60,6 +61,17 @@ e_int_config_mime(E_Container *con)
|
||||||
return cfd;
|
return cfd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void
|
||||||
|
e_int_config_mime_edit_done(void *data)
|
||||||
|
{
|
||||||
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
|
cfdata = data;
|
||||||
|
if (!cfdata) return;
|
||||||
|
if (cfdata->edit_dlg)
|
||||||
|
cfdata->edit_dlg = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
|
@ -94,6 +106,7 @@ _create_data(E_Config_Dialog *cfd)
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||||
|
cfdata->cfd = cfd;
|
||||||
_fill_data(cfdata);
|
_fill_data(cfdata);
|
||||||
return cfdata;
|
return cfdata;
|
||||||
}
|
}
|
||||||
|
@ -101,6 +114,12 @@ _create_data(E_Config_Dialog *cfd)
|
||||||
static void
|
static void
|
||||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
|
if (cfdata->edit_dlg)
|
||||||
|
{
|
||||||
|
e_object_del(E_OBJECT(cfdata->edit_dlg));
|
||||||
|
cfdata->edit_dlg = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
while (types)
|
while (types)
|
||||||
{
|
{
|
||||||
Config_Type *t;
|
Config_Type *t;
|
||||||
|
@ -432,6 +451,7 @@ _cb_config(void *data, void *data2)
|
||||||
Evas_List *l;
|
Evas_List *l;
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
E_Config_Mime_Icon *mi = NULL;
|
E_Config_Mime_Icon *mi = NULL;
|
||||||
|
E_Config_Dialog *edit_dlg;
|
||||||
char *m;
|
char *m;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
|
|
||||||
|
@ -455,5 +475,5 @@ _cb_config(void *data, void *data2)
|
||||||
mi->mime = evas_stringshare_add(m);
|
mi->mime = evas_stringshare_add(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
e_int_config_mime_edit(mi);
|
cfdata->edit_dlg = e_int_config_mime_edit(mi, cfdata);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
#ifndef E_INT_CONFIG_MIME_H
|
#ifndef E_INT_CONFIG_MIME_H
|
||||||
#define E_INT_CONFIG_MIME_H
|
#define E_INT_CONFIG_MIME_H
|
||||||
|
|
||||||
|
|
||||||
EAPI E_Config_Dialog *e_int_config_mime(E_Container *con);
|
EAPI E_Config_Dialog *e_int_config_mime(E_Container *con);
|
||||||
|
EAPI void e_int_config_mime_edit_done(void *data);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -36,17 +36,24 @@ struct _E_Config_Dialog_Data
|
||||||
Evas_Object *icon_wid, *fsel_wid;
|
Evas_Object *icon_wid, *fsel_wid;
|
||||||
E_Dialog *fsel;
|
E_Dialog *fsel;
|
||||||
} gui;
|
} gui;
|
||||||
|
E_Config_Mime_Icon *data;
|
||||||
|
void *data2;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL;
|
#define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL;
|
||||||
#define IFFREE(src) if (src) free(src); src = NULL;
|
#define IFFREE(src) if (src) free(src); src = NULL;
|
||||||
|
|
||||||
EAPI E_Config_Dialog *
|
EAPI E_Config_Dialog *
|
||||||
e_int_config_mime_edit(E_Config_Mime_Icon *data)
|
e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
|
||||||
{
|
{
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
E_Config_Dialog_View *v;
|
E_Config_Dialog_View *v;
|
||||||
E_Container *con;
|
E_Container *con;
|
||||||
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
|
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||||
|
cfdata->data = data;
|
||||||
|
cfdata->data2 = data2;
|
||||||
|
|
||||||
if (e_config_dialog_find("E", "_config_mime_edit_dialog")) return NULL;
|
if (e_config_dialog_find("E", "_config_mime_edit_dialog")) return NULL;
|
||||||
|
|
||||||
|
@ -60,18 +67,15 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data)
|
||||||
|
|
||||||
cfd = e_config_dialog_new(con, _("Mime Settings"), "E",
|
cfd = e_config_dialog_new(con, _("Mime Settings"), "E",
|
||||||
"_config_mime_edit_dialog", "enlightenment/e",
|
"_config_mime_edit_dialog", "enlightenment/e",
|
||||||
0, v, data);
|
0, v, cfdata);
|
||||||
return cfd;
|
return cfd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
_create_data(E_Config_Dialog *cfd)
|
_create_data(E_Config_Dialog *cfd)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_Data *cfdata;
|
_fill_data(cfd, cfd->data);
|
||||||
|
return cfd->data;
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
|
||||||
_fill_data(cfd, cfdata);
|
|
||||||
return cfdata;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -79,7 +83,7 @@ _fill_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
E_Config_Mime_Icon *mi;
|
E_Config_Mime_Icon *mi;
|
||||||
|
|
||||||
mi = (E_Config_Mime_Icon *)cfd->data;
|
mi = (E_Config_Mime_Icon *)cfdata->data;
|
||||||
|
|
||||||
IFDUP(mi->mime, cfdata->mime);
|
IFDUP(mi->mime, cfdata->mime);
|
||||||
IFDUP(mi->icon, cfdata->icon);
|
IFDUP(mi->icon, cfdata->icon);
|
||||||
|
@ -115,6 +119,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
IFFREE(cfdata->file);
|
IFFREE(cfdata->file);
|
||||||
IFFREE(cfdata->mime);
|
IFFREE(cfdata->mime);
|
||||||
IFFREE(cfdata->icon);
|
IFFREE(cfdata->icon);
|
||||||
|
e_int_config_mime_edit_done(cfdata->data2);
|
||||||
E_FREE(cfdata);
|
E_FREE(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#ifndef E_INT_CONFIG_MIME_EDIT_H
|
#ifndef E_INT_CONFIG_MIME_EDIT_H
|
||||||
#define E_INT_CONFIG_MIME_EDIT_H
|
#define E_INT_CONFIG_MIME_EDIT_H
|
||||||
|
|
||||||
EAPI E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data);
|
EAPI E_Config_Dialog *e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue