forked from enlightenment/enlightenment
parent
8933744cbd
commit
24d2cfc8fd
|
@ -56,9 +56,11 @@ static void _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata);
|
||||||
static void _e_desktop_edit_select_cb(void *data, Evas_Object *obj);
|
static void _e_desktop_edit_select_cb(void *data, Evas_Object *obj);
|
||||||
static void _e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj);
|
static void _e_desktop_editor_icon_entry_changed(void *data, Evas_Object *obj);
|
||||||
|
|
||||||
#define IFADD(src, dst) if (src) dst = eina_stringshare_add(src); else dst = NULL
|
#define IFADD(src, dst) if (src) dst = eina_stringshare_add(src); else \
|
||||||
|
dst = NULL
|
||||||
#define IFDEL(src) if (src) eina_stringshare_del(src); src = NULL;
|
#define IFDEL(src) if (src) eina_stringshare_del(src); src = NULL;
|
||||||
#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;
|
||||||
|
|
||||||
/* externally accessible functions */
|
/* externally accessible functions */
|
||||||
|
@ -117,8 +119,10 @@ e_desktop_border_create(E_Border *bd)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (bclass) desktop->name = strdup(bclass);
|
if (bclass) desktop->name = strdup(bclass);
|
||||||
else if (bname) desktop->name = strdup(bname);
|
else if (bname)
|
||||||
else if (btitle) desktop->name = strdup(btitle);
|
desktop->name = strdup(bname);
|
||||||
|
else if (btitle)
|
||||||
|
desktop->name = strdup(btitle);
|
||||||
|
|
||||||
if (btitle) desktop->comment = strdup(btitle);
|
if (btitle) desktop->comment = strdup(btitle);
|
||||||
|
|
||||||
|
@ -282,7 +286,7 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd)
|
||||||
char dir[PATH_MAX];
|
char dir[PATH_MAX];
|
||||||
const char *file;
|
const char *file;
|
||||||
|
|
||||||
if (ecore_file_can_write (cfdata->editor->desktop->orig_path))
|
if (ecore_file_can_write(cfdata->editor->desktop->orig_path))
|
||||||
cfdata->desktop = efreet_desktop_uncached_new(cfdata->editor->desktop->orig_path);
|
cfdata->desktop = efreet_desktop_uncached_new(cfdata->editor->desktop->orig_path);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -458,6 +462,7 @@ _e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialo
|
||||||
IFFREE(cfdata->desktop->url);
|
IFFREE(cfdata->desktop->url);
|
||||||
IFDUP(cfdata->url, cfdata->desktop->url);
|
IFDUP(cfdata->url, cfdata->desktop->url);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
IFFREE(cfdata->desktop->exec);
|
IFFREE(cfdata->desktop->exec);
|
||||||
IFDUP(cfdata->exec, cfdata->desktop->exec);
|
IFDUP(cfdata->exec, cfdata->desktop->exec);
|
||||||
|
@ -618,7 +623,6 @@ _e_desktop_edit_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Di
|
||||||
}
|
}
|
||||||
eina_stringshare_del(str);
|
eina_stringshare_del(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
ret |= cfdata->changed_mimes;
|
ret |= cfdata->changed_mimes;
|
||||||
}
|
}
|
||||||
|
@ -774,7 +778,6 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
|
||||||
e_widget_toolbook_page_append
|
e_widget_toolbook_page_append
|
||||||
(otb, NULL, _("General"), ot, 1, 0, 1, 0, 0.5, 0.0);
|
(otb, NULL, _("General"), ot, 1, 0, 1, 0, 0.5, 0.0);
|
||||||
|
|
||||||
|
|
||||||
ol = e_widget_list_add(evas, 0, 0);
|
ol = e_widget_list_add(evas, 0, 0);
|
||||||
o = e_widget_check_add(evas, _("Startup Notify"), &(cfdata->startup_notify));
|
o = e_widget_check_add(evas, _("Startup Notify"), &(cfdata->startup_notify));
|
||||||
e_widget_list_object_append(ol, o, 1, 0, 0.0);
|
e_widget_list_object_append(ol, o, 1, 0, 0.0);
|
||||||
|
@ -1024,3 +1027,4 @@ _e_desktop_editor_exec_update(E_Config_Dialog_Data *cfdata)
|
||||||
if (!cfdata->editor->entry_widget_exec) return;
|
if (!cfdata->editor->entry_widget_exec) return;
|
||||||
e_widget_entry_text_set(cfdata->editor->entry_widget_exec, cfdata->exec);
|
e_widget_entry_text_set(cfdata->editor->entry_widget_exec, cfdata->exec);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,8 @@ struct _E_Config_Dialog_Data
|
||||||
{
|
{
|
||||||
E_Fm2_Icon *ic;
|
E_Fm2_Icon *ic;
|
||||||
E_Fm2_Icon_Info *fi;
|
E_Fm2_Icon_Info *fi;
|
||||||
struct {
|
struct
|
||||||
|
{
|
||||||
Evas_Object *icon_wid;
|
Evas_Object *icon_wid;
|
||||||
Evas_Object *preview;
|
Evas_Object *preview;
|
||||||
Evas_Object *preview_table;
|
Evas_Object *preview_table;
|
||||||
|
@ -311,6 +312,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
return 1; /* Apply was OK */
|
return 1; /* Apply was OK */
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**--GUI--**/
|
/**--GUI--**/
|
||||||
|
@ -467,11 +469,9 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
||||||
o = e_widget_table_add(evas, 0);
|
o = e_widget_table_add(evas, 0);
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_cb_icon_sel(void *data, void *data2)
|
_cb_icon_sel(void *data, void *data2)
|
||||||
{
|
{
|
||||||
|
@ -565,7 +565,7 @@ _cb_fsel_ok(void *data, E_Dialog *dia)
|
||||||
{
|
{
|
||||||
if (!strcasecmp(ext, ".edj"))
|
if (!strcasecmp(ext, ".edj"))
|
||||||
{
|
{
|
||||||
icon = edje_object_add( evas_object_evas_get(cfdata->gui.icon_wid));
|
icon = edje_object_add(evas_object_evas_get(cfdata->gui.icon_wid));
|
||||||
edje_object_file_set(icon, cfdata->file, "icon");
|
edje_object_file_set(icon, cfdata->file, "icon");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -589,3 +589,4 @@ _cb_fsel_cancel(void *data, E_Dialog *dia)
|
||||||
e_object_del(E_OBJECT(dia));
|
e_object_del(E_OBJECT(dia));
|
||||||
cfdata->gui.fsel = NULL;
|
cfdata->gui.fsel = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue