enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

*Make the apps config dialog even more generic. 

*Use it from the startup config dialog.

I'm too tired for aesthetics, someone please make the startup config dialog
look pretty again.


SVN revision: 27130
This commit is contained in:
David Walter Seikel 2006-11-16 00:08:29 +00:00
parent 48b19f84c6
commit 50cf1ae98c
4 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bin/e_int_config_apps.c
View File

@ -46,14 +46,16 @@ struct _E_Config_Dialog_Data
struct _E_Config_Once
{
const char *title;
const char *label;
const char *path;
int (*func) (void *data, const char *path);
void *data;
};
EAPI E_Config_Dialog *
e_int_config_apps_once(E_Container *con, const char *label, int (*func) (void *data, const char *path), void *data)
e_int_config_apps_once(E_Container *con, const char *title, const char *label, const char *path, int (*func) (void *data, const char *path), void *data)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@ -65,12 +67,14 @@ e_int_config_apps_once(E_Container *con, const char *label, int (*func) (void *d
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create_widgets;
if (func)
if ((path) || (func))
{
once = E_NEW(struct _E_Config_Once, 1);
if (once)
{
once->title = title;
once->label = label;
once->path = path;
once->func = func;
once->data = data;
}
@ -87,7 +91,7 @@ EAPI E_Config_Dialog *
e_int_config_apps(E_Container *con)
{
if (e_config_dialog_find("E", "_config_applications_dialog")) return NULL;
return e_int_config_apps_once(con, NULL, NULL, NULL);
return e_int_config_apps_once(con, NULL, NULL, NULL, NULL, NULL);
}
static void
@ -429,6 +433,7 @@ _cb_button_add(void *data1, void *data2)
E_Fm2_Icon_Info *ici;
const char *realpath;
char buf[4096];
int do_it = 1;
cfdata = data1;
if (!cfdata->gui.o_fm_all) return;
@ -454,9 +459,13 @@ _cb_button_add(void *data1, void *data2)
struct _E_Config_Once *once = NULL;
once = cfdata->cfd->data;
once->func(once->data, buf);
if (once->func)
{
once->func(once->data, buf);
do_it = 0;
}
}
else
if (do_it)
{
if (!cfdata->gui.o_fm) return;
@ -648,7 +657,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, mt);
mt = NULL;
if (once)
if ((once) && (once->label))
mt = e_widget_button_add(evas, _(once->label), "enlightenment/e",
_cb_button_add, cfdata, NULL);
/*
@ -671,9 +680,12 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_table_object_append(ot, of, 0, 0, 2, 4, 1, 1, 1, 1);
if (!once)
if ((!once) || (once->path))
{
of = e_widget_framelist_add(evas, _("Bars, Menus, etc."), 0);
if ((once) && (once->title))
of = e_widget_framelist_add(evas, once->title, 0);
else
of = e_widget_framelist_add(evas, _("Bars, Menus, etc."), 0);
mt = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir",
_cb_button_up, cfdata, NULL);
@ -712,7 +724,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
evas_object_smart_callback_add(mt, "changed",
_cb_files_changed, cfdata);
e_fm2_icon_menu_start_extend_callback_set(mt, _cb_files_add_edited, cfdata);
e_fm2_path_set(cfdata->gui.o_fm, cfdata->path, "/");
if ((once) && (once->path))
e_fm2_path_set(cfdata->gui.o_fm, once->path, "/");
else
e_fm2_path_set(cfdata->gui.o_fm, cfdata->path, "/");
e_fm2_window_object_set(cfdata->gui.o_fm, E_OBJECT(cfd->dia->win));
ob = e_widget_scrollframe_pan_add(evas, mt,
@ -743,13 +758,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, mt);
e_widget_disabled_set(cfdata->gui.o_move_down_button, 1);
*/
if (!once)
{
mt = e_widget_button_add(evas, _("Regenerate/update \"Applications\" Menu"), "enlightenment/regenerate_menus",
_cb_button_regen, cfdata, NULL);
cfdata->gui.o_regen_button = mt;
e_widget_framelist_object_append(of, mt);
}
e_widget_table_object_append(ot, of, 2, 0, 2, 4, 1, 1, 1, 1);
}

2
src/bin/e_int_config_apps.h
View File

@ -7,7 +7,7 @@
#define E_INT_CONFIG_APPS_H
EAPI E_Config_Dialog *e_int_config_apps(E_Container *con);
EAPI E_Config_Dialog *e_int_config_apps_once(E_Container *con, const char *label, int (*func) (void *data, const char *path), void *data);
EAPI E_Config_Dialog *e_int_config_apps_once(E_Container *con, const char *title, const char *label, const char *path, int (*func) (void *data, const char *path), void *data);
#endif
#endif

34
src/bin/e_int_config_startup.c
View File

@ -165,6 +165,30 @@ _cb_dir(void *data, Evas_Object *obj, void *event_info)
e_fm2_path_set(cfdata->o_fm, path, "/");
}
static void
_cb_button_add_startup(void *data1, void *data2)
{
const char *homedir;
char path[PATH_MAX];
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/applications/startup", homedir);
e_int_config_apps_once(e_container_current_get(e_manager_current_get()),
"Startup", NULL, path, NULL, NULL);
}
static void
_cb_button_add_restart(void *data1, void *data2)
{
const char *homedir;
char path[PATH_MAX];
homedir = e_user_homedir_get();
snprintf(path, sizeof(path), "%s/.e/e/applications/restart", homedir);
e_int_config_apps_once(e_container_current_get(e_manager_current_get()),
"Restart", NULL, path, NULL, NULL);
}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
@ -345,6 +369,14 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
o = e_widget_check_add(evas, _("Show Splash Screen on Login"),
&(cfdata->show_splash));
e_widget_table_object_append(ot, o, 1, 3, 1, 1, 1, 0, 0, 0);
o = e_widget_button_add(evas, _("Add startup Application"), "enlightenment/e",
_cb_button_add_startup, cfdata, NULL);
e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 0, 0, 0);
o = e_widget_button_add(evas, _("Add restart Application"), "enlightenment/e",
_cb_button_add_restart, cfdata, NULL);
e_widget_table_object_append(ot, o, 0, 4, 1, 1, 1, 0, 0, 0);
return ot;
}

2
src/modules/ibar/e_mod_main.c
View File

@ -841,7 +841,7 @@ _ibar_cb_menu_add(void *data, E_Menu *m, E_Menu_Item *mi)
IBar *b;
b = data;
e_int_config_apps_once(b->inst->gcc->gadcon->zone->container, _("Add to IBar"), _ibar_cb_menu_add_application_cb, b);
e_int_config_apps_once(b->inst->gcc->gadcon->zone->container, "IBar", _("Add to IBar"), NULL, _ibar_cb_menu_add_application_cb, b);
}
static void