Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_startup.c e_int_config_apps.h e_int_config_apps.c
e_configure.c
Log Message:
Moved 'Startup' and 'Restart' app calls from the Appearance->Startup screen
to their own 'Applications' section in config panel as they were difficult
for users to find.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_startup.c 16 Nov 2006 00:08:29 -0000 1.23
+++ e_int_config_startup.c 1 Dec 2006 23:49:13 -0000 1.24
@@ -110,7 +110,6 @@
E_Config_Dialog_Data *cfdata;
cfdata = data;
- printf("SEL\n");
}
static void
@@ -166,30 +165,6 @@
}
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)
{
char path[4096];
@@ -369,14 +344,6 @@
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_apps.h 16 Nov 2006 00:08:29 -0000 1.3
+++ e_int_config_apps.h 1 Dec 2006 23:49:13 -0000 1.4
@@ -8,6 +8,8 @@
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
*title, const char *label, const char *path, int (*func) (void *data, const
char *path), void *data);
+EAPI E_Config_Dialog *e_int_config_apps_restart(E_Container *con);
+EAPI E_Config_Dialog *e_int_config_apps_startup(E_Container *con);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_int_config_apps.c 27 Nov 2006 04:32:13 -0000 1.49
+++ e_int_config_apps.c 1 Dec 2006 23:49:13 -0000 1.50
@@ -53,7 +53,6 @@
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)
{
@@ -92,6 +91,24 @@
{
if (e_config_dialog_find("E", "_config_applications_dialog")) return NULL;
return e_int_config_apps_once(con, NULL, NULL, NULL, NULL, NULL);
+}
+
+EAPI E_Config_Dialog *
+e_int_config_apps_restart(E_Container *con)
+{
+ char path[4096];
+
+ snprintf(path, sizeof(path), "%s/.e/e/applications/restart",
e_user_homedir_get());
+ return e_int_config_apps_once(con, _("Restart"), NULL, path, NULL, NULL);
+}
+
+EAPI E_Config_Dialog *
+e_int_config_apps_startup(E_Container *con)
+{
+ char path[4096];
+
+ snprintf(path, sizeof(path), "%s/.e/e/applications/startup",
e_user_homedir_get());
+ return e_int_config_apps_once(con, _("Startup"), NULL, path, NULL, NULL);
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_configure.c 30 Nov 2006 19:30:34 -0000 1.82
+++ e_configure.c 1 Dec 2006 23:49:13 -0000 1.83
@@ -401,6 +401,10 @@
_e_configure_item_add(cat, _("Transitions"), "enlightenment/transitions",
e_int_config_transitions);
_e_configure_item_add(cat, _("Startup"), "enlightenment/startup",
e_int_config_startup);
+ cat = _e_configure_category_add(eco, _("Applications"),
"enlightenment/applications");
+ _e_configure_item_add(cat, _("Restart Applications"),
"enlightenment/applications", e_int_config_apps_restart);
+ _e_configure_item_add(cat, _("Startup Applications"),
"enlightenment/applications", e_int_config_apps_startup);
+
cat = _e_configure_category_add(eco, _("Screen"),
"enlightenment/screen_setup");
_e_configure_item_add(cat, _("Virtual Desktops"), "enlightenment/desktops",
e_int_config_desks);
_e_configure_item_add(cat, _("Screen Resolution"),
"enlightenment/screen_resolution", e_int_config_display);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
