Menu
▾
▴
enlightenment-cvs
|
From: <enl...@li...> - 2005-09-21 01:15:43
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_mod_main.c 8 Sep 2005 05:03:28 -0000 1.44
+++ e_mod_main.c 21 Sep 2005 01:15:35 -0000 1.45
@@ -73,13 +73,23 @@
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: Battery\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Battery<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Battery Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
/* actually init battery */
@@ -126,12 +136,21 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Battery Module"),
- _("A basic battery meter that uses either ACPI or APM\n"
- "on Linux to monitor your battery and AC power adaptor\n"
- "status. This will work under Linux and FreeBSD and is only\n"
- "as accurate as your BIOS or kernel drivers."));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Battery Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("A basic battery meter that uses either"
+ "<hilight>ACPI</hilight> or <hilight>APM</hilight><br>"
+ "on Linux to monitor your battery and AC power adaptor<br>"
+ "status. This will work under Linux and FreeBSD and is only<br>"
+ "as accurate as your BIOS or kernel drivers."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
@@ -756,9 +775,17 @@
{
if (!ef->alarm_triggered)
{
- e_error_dialog_show(_("Battery Running Low"),
- _("Your battery is running low.\n"
- "You may wish to switch to an AC source."));
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Battery Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("Battery Running Low<br>Your battery is running low.<br>"
+ "You may wish to switch to an AC source."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
}
edje_object_signal_emit(face->bat_object, "pulse", "");
}
|
|
From: <enl...@li...> - 2005-09-21 01:16:02
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_mod_main.c 25 Jul 2005 09:55:45 -0000 1.33
+++ e_mod_main.c 21 Sep 2005 01:15:56 -0000 1.34
@@ -46,13 +46,23 @@
/* check module api version */
if (module->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: Clock\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- module->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Clock<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, module->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Clock Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
@@ -101,9 +111,17 @@
int
e_modapi_about(E_Module *module)
{
- e_error_dialog_show(_("Enlightenment Clock Module"),
- _("A simple module to give E17 a clock."));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Clock Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("A simple module to give E17 a clock."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:16:22
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/cpufreq
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/cpufreq/e_mod_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.c 14 Sep 2005 20:19:44 -0000 1.19
+++ e_mod_main.c 21 Sep 2005 01:16:16 -0000 1.20
@@ -64,13 +64,23 @@
if (module->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: cpufreq\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- module->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Cpufreq<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, module->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
@@ -118,10 +128,18 @@
int
e_modapi_about(E_Module *module)
{
- e_error_dialog_show(_("CPU Frequency Controller Module"),
- _("A simple module to control the frequency of the system CPU. "
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "CPU Frequency Controller Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("A simple module to control the frequency of the system CPU.<br>"
"This is especially useful to save power on laptops."));
- return 1;
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
static Cpufreq *
@@ -301,9 +319,17 @@
ret = system(buf);
if (ret != 0)
{
- e_error_dialog_show(_("CPU Frequency ERROR"),
- _("There was an error trying to set the cpu frequency\n"
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return;
+ e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
"governor via the module's setfreq utility."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
}
}
@@ -321,9 +347,17 @@
ret = system(buf);
if (ret != 0)
{
- e_error_dialog_show(_("CPU Frequency ERROR"),
- _("There was an error trying to set the cpu frequency\n"
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return;
+ e_dialog_title_set(dia, "Enlightenment Cpufreq Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
"setting via the module's setfreq utility."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
}
}
|
|
From: <enl...@li...> - 2005-09-21 01:16:42
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/dropshadow
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_mod_main.c 14 Aug 2005 16:57:55 -0000 1.26
+++ e_mod_main.c 21 Sep 2005 01:16:35 -0000 1.27
@@ -97,13 +97,23 @@
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: Dropshadow\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Dropshadow<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Dropshadow Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
ds = _ds_init(m);
@@ -190,11 +200,19 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Dropshadow Module"),
- _("This is the dropshadow module that allows dropshadows to be cast\n"
- "on the desktop background - without special X-Server extensions\n"
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Dropshadow Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("This is the dropshadow module that allows dropshadows to be cast<br>"
+ "on the desktop background - without special X-Server extensions<br>"
"or hardware acceleration."));
- return 1;
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:17:17
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.c 14 Aug 2005 16:57:56 -0000 1.14
+++ e_mod_main.c 21 Sep 2005 01:17:11 -0000 1.15
@@ -100,13 +100,23 @@
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: IBox\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: IBox<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment IBox Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
/* actually init ibox */
@@ -153,13 +163,18 @@
int
e_modapi_about(E_Module *m)
{
- /* FIXME: Wrong text */
- e_error_dialog_show(_("Enlightenment IBox Module"),
- _("This is the IBox Application Launcher box module for Enlightenment.\n"
- "It is a first example module and is being used to flesh out several\n"
- "Interfaces in Enlightenment 0.17.0. It is under heavy development,\n"
- "so expect it to break often and change as it improves."));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment IBox Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("This is the IBox Iconified Application module for Enlightenment.<br>"
+ "It will hold minimized applications"));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:17:02
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_mod_main.c 14 Sep 2005 06:43:54 -0000 1.69
+++ e_mod_main.c 21 Sep 2005 01:16:56 -0000 1.70
@@ -118,13 +118,23 @@
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: IBar\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: IBar<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment IBar Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
/* actually init ibar */
@@ -171,12 +181,20 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment IBar Module"),
- _("This is the IBar Application Launcher bar module for Enlightenment.\n"
- "It is a first example module and is being used to flesh out several\n"
- "interfaces in Enlightenment 0.17.0. It is under heavy development,\n"
- "so expect it to break often and change as it improves."));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment IBar Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("This is the IBar Application Launcher bar module for Enlightenment.<br>"
+ "It is a first example module and is being used to flesh out several<br>"
+ "interfaces in Enlightenment 0.17.0. It is under heavy development,<br>"
+ "so expect it to <hilight>break often</hilight> and change as it improves."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:17:36
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- e_mod_main.c 20 Sep 2005 17:55:45 -0000 1.125
+++ e_mod_main.c 21 Sep 2005 01:17:30 -0000 1.126
@@ -112,13 +112,23 @@
/* check module api version */
if (module->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: Pager\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- module->api->version);
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Pager<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, module->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Pager Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
return NULL;
}
/* actually init pager */
@@ -168,9 +178,17 @@
int
e_modapi_about(E_Module *module)
{
- e_error_dialog_show(_("Enlightenment Pager Module"),
- _("A pager module to navigate virtual desktops."));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Pager Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("A pager module to navigate virtual desktops."));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:17:50
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/randr
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/randr/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 30 Aug 2005 01:17:22 -0000 1.10
+++ e_mod_main.c 21 Sep 2005 01:17:45 -0000 1.11
@@ -33,14 +33,24 @@
Randr *e;
if (m->api->version < E_MODULE_API_VERSION) {
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: randr\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
- return NULL;
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Randr<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Randr Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return NULL;
}
/* Create the button */
@@ -90,9 +100,17 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Randr Module"),
- _("Module to change screen resolution for E17"));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Randr Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("Module to change screen resolution for E17"));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
static Randr *
|
|
From: <enl...@li...> - 2005-09-21 01:18:08
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/start
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 28 Jul 2005 04:35:45 -0000 1.5
+++ e_mod_main.c 21 Sep 2005 01:17:59 -0000 1.6
@@ -25,14 +25,24 @@
Start *e;
if (m->api->version < E_MODULE_API_VERSION) {
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: start\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
- return NULL;
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Start<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Start Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return NULL;
}
/* Create the button */
@@ -78,9 +88,17 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Start Module"),
- _("Experimental Button module for E17"));
- return 1;
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Start Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("Experimental Button module for E17"));
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
static Start *
|
|
From: <enl...@li...> - 2005-09-21 01:18:22
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/temperature
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_mod_main.c 20 Sep 2005 19:14:29 -0000 1.35
+++ e_mod_main.c 21 Sep 2005 01:18:17 -0000 1.36
@@ -46,14 +46,24 @@
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: Temperature\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
- return NULL;
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Temperature<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Temperature Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return NULL;
}
/* actually init temperature */
e = _temperature_new(m);
@@ -99,11 +109,19 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Temperature Module"),
- _("A module to measure the ACPI Thermal sensor on Linux.\n"
- "It is especially useful for modern Laptops with high speed\n"
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Temperature Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux.<br>"
+ "It is especially useful for modern Laptops with high speed<br>"
"CPUs that generate a lot of heat."));
- return 1;
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
/* module private routines */
|
|
From: <enl...@li...> - 2005-09-21 01:18:37
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/test
Modified Files:
e_mod_main.c
Log Message:
Changed module to use e_dialog instead of e_error
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/test/e_mod_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.c 12 Jul 2005 03:53:56 -0000 1.4
+++ e_mod_main.c 21 Sep 2005 01:18:30 -0000 1.5
@@ -6,14 +6,24 @@
{
if (m->api->version < E_MODULE_API_VERSION)
{
- e_error_dialog_show(_("Module API Error"),
- _("Error initializing Module: test\n"
- "It requires a minimum module API version of: %i.\n"
- "The module API advertized by Enlightenment is: %i.\n"
- "Aborting module."),
- E_MODULE_API_VERSION,
- m->api->version);
- return NULL;
+ E_Dialog *dia;
+ char buf[4096];
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return NULL;
+
+ snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Test<br>"
+ "It requires a minimum module API version of: %i.<br>"
+ "The module API advertized by Enlightenment is: %i.<br>"),
+ E_MODULE_API_VERSION, m->api->version);
+
+ e_dialog_title_set(dia, "Enlightenment Test Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, buf);
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return NULL;
}
{
E_Menu *mn;
@@ -63,9 +73,17 @@
int
e_modapi_about(E_Module *m)
{
- e_error_dialog_show(_("Enlightenment Test Module"),
- _("This module is VERY simple and is only used to test the basic\n"
- "interface of the Enlightenment 0.17.0 module system. Please\n"
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!dia) return 0;
+ e_dialog_title_set(dia, "Enlightenment Test Module");
+ e_dialog_icon_set(dia, "enlightenment/e", 64);
+ e_dialog_text_set(dia, _("This module is VERY simple and is only used to test the basic<br>"
+ "interface of the Enlightenment 0.17.0 module system. Please<br>"
"ignore this module unless you are working on the module system."));
- return 1;
+ e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+ return 1;
}
|
|
From: <enl...@li...> - 2005-10-08 01:30:46
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.h
Log Message:
Add an option to enable/disable the follower.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h 24 Sep 2005 13:42:05 -0000 1.6
+++ e_mod_main.h 8 Oct 2005 01:30:39 -0000 1.7
@@ -16,6 +16,7 @@
struct _Config
{
double follow_speed;
+ int follower;
double autoscroll_speed;
int iconsize;
int width;
|
|
From: <enl...@li...> - 2005-10-08 01:31:03
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
Add an option to enable/disable the follower.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c 27 Sep 2005 18:46:48 -0000 1.20
+++ e_mod_main.c 8 Oct 2005 01:30:57 -0000 1.21
@@ -91,6 +91,8 @@
static void _ibox_box_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibox_box_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _ibox_box_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi);
+
/* public module routines. all modules must have these */
E_Module_Api e_modapi =
{
@@ -175,6 +177,7 @@
#undef D
#define T Config
#define D conf_edd
+ E_CONFIG_VAL(D, T, follower, INT);
E_CONFIG_VAL(D, T, follow_speed, DOUBLE);
E_CONFIG_VAL(D, T, autoscroll_speed, DOUBLE);
E_CONFIG_VAL(D, T, iconsize, INT);
@@ -185,6 +188,7 @@
if (!ib->conf)
{
ib->conf = E_NEW(Config, 1);
+ ib->conf->follower = 1;
ib->conf->follow_speed = 0.9;
ib->conf->autoscroll_speed = 0.95;
ib->conf->iconsize = 24;
@@ -297,12 +301,15 @@
"modules/ibox/main");
evas_object_show(o);
- o = edje_object_add(ibb->evas);
- ibb->overlay_object = o;
- evas_object_layer_set(o, 1);
- e_theme_edje_object_set(o, "base/theme/modules/ibox",
- "modules/ibox/follower");
- evas_object_show(o);
+ if (ibb->ibox->conf->follower)
+ {
+ o = edje_object_add(ibb->evas);
+ ibb->overlay_object = o;
+ evas_object_layer_set(o, 1);
+ e_theme_edje_object_set(o, "base/theme/modules/ibox",
+ "modules/ibox/follower");
+ evas_object_show(o);
+ }
o = evas_object_rectangle_add(ibb->evas);
ibb->event_object = o;
@@ -594,6 +601,12 @@
if (ib->conf->width == IBOX_WIDTH_AUTO) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _ibox_box_cb_width_auto, ib);
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Follower"));
+ e_menu_item_check_set(mi, 1);
+ if (ib->conf->follower) e_menu_item_toggle_set(mi, 1);
+ e_menu_item_callback_set(mi, _ibox_box_cb_follower, ib);
+
mn = e_menu_new();
ib->config_menu_size = mn;
@@ -1484,3 +1497,44 @@
ibb = data;
e_gadman_mode_set(ibb->gmc->gadman, E_GADMAN_MODE_EDIT);
}
+
+static void
+_ibox_box_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ IBox *ib;
+ IBox_Box *ibb;
+ unsigned char enabled;
+ Evas_List *l;
+
+ ib = data;
+ enabled = e_menu_item_toggle_get(mi);
+ if ((enabled) && (!ib->conf->follower))
+ {
+ ib->conf->follower = 1;
+ for (l = ib->boxes; l; l = l->next)
+ {
+ Evas_Object *o;
+
+ ibb = l->data;
+ if (ibb->overlay_object) continue;
+ o = edje_object_add(ibb->evas);
+ ibb->overlay_object = o;
+ evas_object_layer_set(o, 1);
+ e_theme_edje_object_set(o, "base/theme/modules/ibox",
+ "modules/ibox/follower");
+ evas_object_show(o);
+ }
+ }
+ else if (!(enabled) && (ib->conf->follower))
+ {
+ ib->conf->follower = 0;
+ for (l = ib->boxes; l; l = l->next)
+ {
+ ibb = l->data;
+ if (!ibb->overlay_object) continue;
+ evas_object_del(ibb->overlay_object);
+ ibb->overlay_object = NULL;
+ }
+ }
+ e_config_save_queue();
+}
|
|
From: <enl...@li...> - 2005-10-08 19:27:38
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
Fix Ibar Icon Autoscrolling if Follower is disabled
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_mod_main.c 7 Oct 2005 18:36:54 -0000 1.82
+++ e_mod_main.c 8 Oct 2005 19:27:31 -0000 1.83
@@ -671,7 +671,7 @@
_ibar_icon_new(IBar_Bar *ibb, E_App *a)
{
IBar_Icon *ic;
- char *str;
+// char *str;
Evas_Object *o;
Evas_Coord w, h;
@@ -739,12 +739,13 @@
w, h /* max */
);
+/*
str = (char *)edje_object_data_get(ic->icon_object, "raise_on_hilight");
if (str)
{
if (atoi(str) == 1) ic->raise_on_hilight = 1;
}
-
+*/
edje_object_signal_emit(ic->bg_object, "passive", "");
edje_object_signal_emit(ic->overlay_object, "passive", "");
return ic;
@@ -1469,12 +1470,13 @@
Evas_Coord x, y, w, h, mw, mh;
ibb = data;
- if (!ibb->overlay_object)
+
+/* if (!ibb->overlay_object)
{
ibb->animator = NULL;
return 0;
}
-
+*/
if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) ||
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP))
{
|
|
From: <enl...@li...> - 2005-12-13 02:56:25
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for Ibox making E segv when window quits
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 8 Oct 2005 01:30:39 -0000 1.7
+++ e_mod_main.h 13 Dec 2005 02:56:19 -0000 1.8
@@ -54,6 +54,7 @@
Ecore_Event_Handler *ev_handler_border_iconify;
Ecore_Event_Handler *ev_handler_border_uniconify;
+ Ecore_Event_Handler *ev_handler_border_remove;
double align, align_req;
double follow, follow_req;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_main.c 4 Nov 2005 00:21:34 -0000 1.24
+++ e_mod_main.c 13 Dec 2005 02:56:19 -0000 1.25
@@ -67,6 +67,7 @@
static int _ibox_box_cb_event_border_iconify(void *data, int type, void *event);
static int _ibox_box_cb_event_border_uniconify(void *data, int type, void *event);
+static int _ibox_box_cb_event_border_remove(void *data, int type, void *event);
static void _ibox_icon_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
static void _ibox_icon_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
@@ -335,7 +336,9 @@
ecore_event_handler_add(E_EVENT_BORDER_ICONIFY, _ibox_box_cb_event_border_iconify, ibb);
ibb->ev_handler_border_uniconify =
ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, _ibox_box_cb_event_border_uniconify, ibb);
-
+ ibb->ev_handler_border_remove =
+ ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _ibox_box_cb_event_border_remove, ibb);
+
bl = e_container_border_list_first(ibb->con);
while ((bd = e_container_border_list_next(bl)))
{
@@ -411,6 +414,8 @@
ecore_event_handler_del(ibb->ev_handler_border_iconify);
ecore_event_handler_del(ibb->ev_handler_border_uniconify);
+ ecore_event_handler_del(ibb->ev_handler_border_remove);
+
while (ibb->icons)
_ibox_icon_free(ibb->icons->data);
@@ -1201,6 +1206,24 @@
return 1;
}
+static int
+_ibox_box_cb_event_border_remove(void *data, int type, void *event)
+{
+ E_Event_Border_Remove *ev;
+ IBox_Box *ibb;
+ IBox_Icon *ic;
+
+ ev = event;
+ ibb = data;
+
+ ic = _ibox_icon_find(ibb, ev->border);
+ if (ic)
+ _ibox_icon_free(ic);
+ _ibox_box_frame_resize(ibb);
+
+ return 1;
+}
+
static void
_ibox_box_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change)
{
|
|
From: <enl...@li...> - 2005-12-13 02:59:23
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Remove Ibox E Segv =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/TODO,v retrieving revision 1.287 retrieving revision 1.288 diff -u -3 -r1.287 -r1.288 --- TODO 1 Dec 2005 07:56:53 -0000 1.287 +++ TODO 13 Dec 2005 02:59:13 -0000 1.288 @@ -15,8 +15,6 @@ XMapWindow e wont de-iconify the window * BUG: in multihead dnd from pager to pager is pretty screwed especially at the top of the screen (if the pager is there) -* BUG: if iconified window quits qhile iconified and ibox is being used then - e segv's * BUG: dnd to ibar is broken if u did an icon that isn't IN the ibar yet (from a window border) to either the very start or end of the ibar. * BUG: race condition on winlist activate via keypress and the key grab thus |
|
From: <enl...@li...> - 2005-12-13 04:58:41
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
Add onefang's Ibar follower fix to IBox
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_mod_main.c 13 Dec 2005 02:56:19 -0000 1.25
+++ e_mod_main.c 13 Dec 2005 04:58:33 -0000 1.26
@@ -1572,6 +1572,8 @@
evas_object_layer_set(o, 1);
e_theme_edje_object_set(o, "base/theme/modules/ibox",
"modules/ibox/follower");
+ edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[e_gadman_client_edge_get(ibb->gmc)]);
+ edje_object_message_signal_process(o);
evas_object_show(o);
}
}
|
|
From: <enl...@li...> - 2005-12-13 14:31:04
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c
Log Message:
IBar Cfg Dlg Icon Size Fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 13 Dec 2005 04:47:41 -0000 1.1
+++ e_mod_config.c 13 Dec 2005 14:30:54 -0000 1.2
@@ -5,36 +5,29 @@
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
-#define ICONSIZE_MICROSCOPIC 8
-#define ICONSIZE_TINY 12
-#define ICONSIZE_VERYSMALL 16
#define ICONSIZE_SMALL 24
#define ICONSIZE_MEDIUM 32
#define ICONSIZE_LARGE 40
#define ICONSIZE_VERYLARGE 48
-#define ICONSIZE_EXTLARGE 56
-#define ICONSIZE_HUGE 64
-#define ICONSIZE_ENORMOUS 96
-#define ICONSIZE_GIGANTIC 128
-struct _cfdata
+struct _cfdata
{
IBar *ibar;
-
+
/* Basic Config */
int method;
int icon_method;
-
+
int follower;
int width;
int iconsize;
-
+
/* Advanced Config */
double follow_speed;
double autoscroll_speed;
};
-struct _Cfg_File_Data
+struct _Cfg_File_Data
{
E_Config_Dialog *cfd;
char *file;
@@ -51,13 +44,13 @@
IBar *ib = NULL;
-void e_int_config_ibar(E_Container *con, IBar *ibar)
+void e_int_config_ibar(E_Container *con, IBar *ibar)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
ib = ibar;
-
+
/* Dialog Methods */
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
@@ -65,57 +58,55 @@
v.basic.create_widgets = _basic_create_widgets;
v.advanced.apply_cfdata = _advanced_apply_data;
v.advanced.create_widgets = _advanced_create_widgets;
-
+
/* Create The Dialog */
cfd = e_config_dialog_new(con, _("IBar Module"), NULL, 0, &v, ibar);
}
-static void _fill_data(CFData *cfdata)
+static void _fill_data(CFData *cfdata)
{
cfdata->follower = ib->conf->follower;
- cfdata->width = ib->conf->width;
- if (cfdata->width == IBAR_WIDTH_AUTO) {
- cfdata->method = 1;
- } else {
- cfdata->method = 0;
- }
+ cfdata->width = ib->conf->width;
+ if (cfdata->width == IBAR_WIDTH_AUTO)
+ {
+ cfdata->method = 1;
+ }
+ else
+ {
+ cfdata->method = 0;
+ }
cfdata->iconsize = ib->conf->iconsize;
- if (cfdata->iconsize<=8) cfdata->icon_method = ICONSIZE_MICROSCOPIC;
- if ((cfdata->iconsize > 8) && (cfdata->iconsize <=12)) cfdata->icon_method = ICONSIZE_TINY;
- if ((cfdata->iconsize > 12) && (cfdata->iconsize <=16)) cfdata->icon_method = ICONSIZE_VERYSMALL;
- if ((cfdata->iconsize > 16) && (cfdata->iconsize <=24)) cfdata->icon_method = ICONSIZE_SMALL;
- if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM;
- if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE;
- if ((cfdata->iconsize > 40) && (cfdata->iconsize <=48)) cfdata->icon_method = ICONSIZE_VERYLARGE;
- if ((cfdata->iconsize > 48) && (cfdata->iconsize <=58)) cfdata->icon_method = ICONSIZE_EXTLARGE;
- if ((cfdata->iconsize > 58) && (cfdata->iconsize <=64)) cfdata->icon_method = ICONSIZE_HUGE;
- if ((cfdata->iconsize > 64) && (cfdata->iconsize <=96)) cfdata->icon_method = ICONSIZE_ENORMOUS;
- if ((cfdata->iconsize > 96) && (cfdata->iconsize <=128)) cfdata->icon_method = ICONSIZE_GIGANTIC;
+ if (cfdata->iconsize <=24) cfdata->icon_method = ICONSIZE_SMALL;
+ if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM;
+ if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE;
+ if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE;
+
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
}
-static void *_create_data(E_Config_Dialog *cfd)
+static void *_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
-
+
cfdata = E_NEW(CFData, 1);
- _fill_data(cfdata);
return cfdata;
}
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata)
+static void _free_data(E_Config_Dialog *cfd, CFData *cfdata)
{
free(cfdata);
}
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
-
+
+ _fill_data(cfdata);
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
ob = e_widget_check_add(evas, _("Follower"), &(cfdata->follower));
@@ -126,57 +117,40 @@
of = e_widget_framelist_add(evas, _("Icon Size"), 0);
rg = e_widget_radio_group_new(&(cfdata->icon_method));
-
- ob = e_widget_radio_add(evas, _("Microscopic"), ICONSIZE_MICROSCOPIC, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Tiny"), ICONSIZE_TINY, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Very Small"), ICONSIZE_VERYSMALL, rg);
- e_widget_framelist_object_append(of, ob);
+
ob = e_widget_radio_add(evas, _("Small"), ICONSIZE_SMALL, rg);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Large"), ICONSIZE_LARGE, rg);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Very Large"), ICONSIZE_VERYLARGE, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Exteremely Large"), ICONSIZE_EXTLARGE, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Huge"), ICONSIZE_HUGE, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Enormous"), ICONSIZE_ENORMOUS, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Gigantic"), ICONSIZE_GIGANTIC, rg);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append(of, ob);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+
return o;
}
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
e_border_button_bindings_ungrab_all();
ib->conf->follower = cfdata->follower;
- if (cfdata->method == 0) {
- cfdata->width = IBAR_WIDTH_FIXED;
- } else {
- cfdata->width = IBAR_WIDTH_AUTO;
- }
+ if (cfdata->method == 0)
+ {
+ cfdata->width = IBAR_WIDTH_FIXED;
+ }
+ else
+ {
+ cfdata->width = IBAR_WIDTH_AUTO;
+ }
ib->conf->width = cfdata->width;
-
- if (cfdata->icon_method == ICONSIZE_MICROSCOPIC) ib->conf->iconsize = 8;
- if (cfdata->icon_method == ICONSIZE_TINY) ib->conf->iconsize = 12;
- if (cfdata->icon_method == ICONSIZE_VERYSMALL) ib->conf->iconsize = 16;
- if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24;
- if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32;
- if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40;
- if (cfdata->icon_method == ICONSIZE_VERYLARGE) ib->conf->iconsize = 48;
- if (cfdata->icon_method == ICONSIZE_EXTLARGE) ib->conf->iconsize = 56;
- if (cfdata->icon_method == ICONSIZE_HUGE) ib->conf->iconsize = 64;
- if (cfdata->icon_method == ICONSIZE_ENORMOUS) ib->conf->iconsize = 96;
- if (cfdata->icon_method == ICONSIZE_GIGANTIC) ib->conf->iconsize = 128;
+
+ if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24;
+ if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32;
+ if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40;
+ if (cfdata->icon_method == ICONSIZE_VERYLARGE) ib->conf->iconsize = 48;
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -185,11 +159,13 @@
return 1;
}
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob, *ot;
E_Radio_Group *rg;
-
+
+ _fill_data(cfdata);
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
ob = e_widget_check_add(evas, _("Follower"), &(cfdata->follower));
@@ -199,50 +175,52 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Icon Settings"), 0);
- ob = e_widget_label_add(evas, _("Icon Size:"));
+ ob = e_widget_label_add(evas, _("Icon Size:"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 8, 128, 1, 0, NULL, &(cfdata->iconsize), 200);
e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
/* Advanced Options */
of = e_widget_framelist_add(evas, _("Advanced Settings"), 0);
- ob = e_widget_label_add(evas, _("Follow Speed:"));
- e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add(evas, _("Follow Speed:"));
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->follow_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
-
- ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
- e_widget_framelist_object_append(of, ob);
+
+ ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
-
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
e_border_button_bindings_ungrab_all();
ib->conf->follower = cfdata->follower;
- if (cfdata->method == 0) {
- cfdata->width = IBAR_WIDTH_FIXED;
- } else {
- cfdata->width = IBAR_WIDTH_AUTO;
- }
+ if (cfdata->method == 0)
+ {
+ cfdata->width = IBAR_WIDTH_FIXED;
+ }
+ else
+ {
+ cfdata->width = IBAR_WIDTH_AUTO;
+ }
ib->conf->width = cfdata->width;
-
+
ib->conf->iconsize = cfdata->iconsize;
-
- ib->conf->follow_speed = cfdata->follow_speed;
- ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
+
+ ib->conf->follow_speed = cfdata->follow_speed;
+ ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
e_border_button_bindings_grab_all();
e_config_save_queue();
-
+
_ibar_bar_cb_config_updated(ib);
return 1;
}
-
|
|
From: <enl...@li...> - 2005-12-13 14:32:26
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c e_mod_main.h Makefile.am
Added Files:
e_mod_config.c e_mod_config.h
Log Message:
IBox Config Dialog :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_mod_main.c 13 Dec 2005 04:58:33 -0000 1.26
+++ e_mod_main.c 13 Dec 2005 14:32:18 -0000 1.27
@@ -75,30 +75,20 @@
static void _ibox_icon_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibox_icon_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _ibox_box_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_iconsize_change(IBox_Box *ibb);
-static void _ibox_box_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_tiny(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_very_small(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_small(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_medium(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_large(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_very_large(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_extremely_large(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_huge(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_enormous(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_iconsize_gigantic(void *data, E_Menu *m, E_Menu_Item *mi);
-
static void _ibox_box_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibox_box_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _ibox_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ibox_box_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi);
+/* Config Updated Function Protos */
+static void _ibox_box_cb_width_auto(void *data);
+static void _ibox_box_cb_follower(void *data);
+static void _ibox_box_cb_iconsize_change(void *data);
/* public module routines. all modules must have these */
-E_Module_Api e_modapi =
+E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
- "IBox"
+ "IBox"
};
void *
@@ -149,7 +139,7 @@
int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(_("Enlightenment IBox Module"),
+ e_module_dialog_show(_("Enlightenment IBox Module"),
_("This is the IBox Iconified Application module for Enlightenment.<br>"
"It will hold minimized applications"));
return 1;
@@ -199,7 +189,7 @@
E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400);
E_CONFIG_LIMIT(ib->conf->width, -2, -1);
-
+
_ibox_config_menu_new(ib);
managers = e_manager_list();
@@ -235,13 +225,9 @@
_ibox_box_menu_new(ibb);
/* Add main menu to box menu */
- mi = e_menu_item_new(ibb->menu);
- e_menu_item_label_set(mi, _("Options"));
- e_menu_item_submenu_set(mi, ib->config_menu_options);
-
- mi = e_menu_item_new(ibb->menu);
- e_menu_item_label_set(mi, _("Size"));
- e_menu_item_submenu_set(mi, ib->config_menu_size);
+ mi = e_menu_item_new(ib->config_menu);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _ibox_box_cb_menu_configure, ibb);
mi = e_menu_item_new(ib->config_menu);
e_menu_item_label_set(mi, con->name);
@@ -258,7 +244,7 @@
}
static void
-_ibox_free(IBox *ib)
+ _ibox_free(IBox *ib)
{
E_CONFIG_DD_FREE(conf_edd);
E_CONFIG_DD_FREE(conf_box_edd);
@@ -266,8 +252,6 @@
while (ib->boxes)
_ibox_box_free(ib->boxes->data);
- e_object_del(E_OBJECT(ib->config_menu_options));
- e_object_del(E_OBJECT(ib->config_menu_size));
e_object_del(E_OBJECT(ib->config_menu));
evas_list_free(ib->conf->boxes);
free(ib->conf);
@@ -332,12 +316,12 @@
edje_object_part_swallow(ibb->box_object, "items", o);
evas_object_show(o);
- ibb->ev_handler_border_iconify =
- ecore_event_handler_add(E_EVENT_BORDER_ICONIFY, _ibox_box_cb_event_border_iconify, ibb);
- ibb->ev_handler_border_uniconify =
- ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, _ibox_box_cb_event_border_uniconify, ibb);
- ibb->ev_handler_border_remove =
- ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _ibox_box_cb_event_border_remove, ibb);
+ ibb->ev_handler_border_iconify =
+ ecore_event_handler_add(E_EVENT_BORDER_ICONIFY, _ibox_box_cb_event_border_iconify, ibb);
+ ibb->ev_handler_border_uniconify =
+ ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, _ibox_box_cb_event_border_uniconify, ibb);
+ ibb->ev_handler_border_remove =
+ ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _ibox_box_cb_event_border_remove, ibb);
bl = e_container_border_list_first(ibb->con);
while ((bd = e_container_border_list_next(bl)))
@@ -415,7 +399,7 @@
ecore_event_handler_del(ibb->ev_handler_border_iconify);
ecore_event_handler_del(ibb->ev_handler_border_uniconify);
ecore_event_handler_del(ibb->ev_handler_border_remove);
-
+
while (ibb->icons)
_ibox_icon_free(ibb->icons->data);
@@ -453,7 +437,12 @@
if (ibb->conf->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _ibox_box_cb_menu_enabled, ibb);
*/
-
+
+ /* Config */
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _ibox_box_cb_menu_configure, ibb);
+
/* Edit */
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Edit Mode"));
@@ -461,6 +450,17 @@
}
static void
+_ibox_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ IBox_Box *ibb;
+ E_Config_Dialog *cfd;
+
+ ibb = (IBox_Box *)data;
+ if (!ibb) return;
+ e_int_config_ibox(ibb->con, ibb->ibox);
+}
+
+static void
_ibox_box_enable(IBox_Box *ibb)
{
ibb->conf->enabled = 1;
@@ -592,114 +592,9 @@
_ibox_config_menu_new(IBox *ib)
{
E_Menu *mn;
- E_Menu_Item *mi;
mn = e_menu_new();
ib->config_menu = mn;
-
- mn = e_menu_new();
- ib->config_menu_options = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Auto fit icons"));
- e_menu_item_check_set(mi, 1);
- if (ib->conf->width == IBOX_WIDTH_AUTO) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_width_auto, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Follower"));
- e_menu_item_check_set(mi, 1);
- if (ib->conf->follower) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_follower, ib);
-
- mn = e_menu_new();
- ib->config_menu_size = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Microscopic"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 8) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_microscopic, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Tiny"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 12) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_tiny, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Small"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 16) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_very_small, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Small"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 24) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_small, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Medium"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 32) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_medium, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Large"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 40) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_large, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Very Large"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 48) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_very_large, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Extremely Large"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 56) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_extremely_large, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Huge"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 64) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_huge, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Enormous"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 96) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_enormous, ib);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Gigantic"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (ib->conf->iconsize == 128) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _ibox_box_cb_iconsize_gigantic, ib);
-
- /* Submenus */
- mi = e_menu_item_new(ib->config_menu);
- e_menu_item_label_set(mi, _("Options"));
- e_menu_item_submenu_set(mi, ib->config_menu_options);
-
- mi = e_menu_item_new(ib->config_menu);
- e_menu_item_label_set(mi, _("Size"));
- e_menu_item_submenu_set(mi, ib->config_menu_size);
}
static void
@@ -749,7 +644,7 @@
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM))
{
/* w is the width of the box */
- e_gadman_client_resize(ibb->gmc, ibb->w, bh);
+ e_gadman_client_resize(ibb->gmc, bw, bh); //ibb->w
}
}
}
@@ -1139,7 +1034,7 @@
e_box_align_set(ibb->item_object, ibb->align, 0.5);
else
e_box_align_set(ibb->item_object, 0.5, 0.5);
-
+
if (ibb->overlay_object)
{
evas_object_geometry_get(ibb->item_object, &x, &y, &w, &h);
@@ -1157,7 +1052,7 @@
e_box_align_set(ibb->item_object, 0.5, ibb->align);
else
e_box_align_set(ibb->item_object, 0.5, 0.5);
-
+
if (ibb->overlay_object)
{
evas_object_geometry_get(ibb->item_object, &x, &y, &w, &h);
@@ -1233,292 +1128,85 @@
switch (change)
{
case E_GADMAN_CHANGE_MOVE_RESIZE:
- e_gadman_client_geometry_get(ibb->gmc, &ibb->x, &ibb->y, &ibb->w, &ibb->h);
+ e_gadman_client_geometry_get(ibb->gmc, &ibb->x, &ibb->y, &ibb->w, &ibb->h);
- edje_extern_object_min_size_set(ibb->item_object, 0, 0);
- edje_object_part_swallow(ibb->box_object, "items", ibb->item_object);
+ edje_extern_object_min_size_set(ibb->item_object, 0, 0);
+ edje_object_part_swallow(ibb->box_object, "items", ibb->item_object);
- evas_object_move(ibb->box_object, ibb->x, ibb->y);
- if (ibb->overlay_object)
- evas_object_move(ibb->overlay_object, ibb->x, ibb->y);
- evas_object_resize(ibb->box_object, ibb->w, ibb->h);
- if (ibb->overlay_object)
- evas_object_resize(ibb->overlay_object, ibb->w, ibb->h);
+ evas_object_move(ibb->box_object, ibb->x, ibb->y);
+ if (ibb->overlay_object)
+ evas_object_move(ibb->overlay_object, ibb->x, ibb->y);
+ evas_object_resize(ibb->box_object, ibb->w, ibb->h);
+ if (ibb->overlay_object)
+ evas_object_resize(ibb->overlay_object, ibb->w, ibb->h);
- _ibox_box_follower_reset(ibb);
- _ibox_box_timer_handle(ibb);
+ _ibox_box_follower_reset(ibb);
+ _ibox_box_timer_handle(ibb);
- break;
+ break;
case E_GADMAN_CHANGE_EDGE:
- _ibox_box_edge_change(ibb, e_gadman_client_edge_get(ibb->gmc));
- break;
+ _ibox_box_edge_change(ibb, e_gadman_client_edge_get(ibb->gmc));
+ break;
case E_GADMAN_CHANGE_RAISE:
case E_GADMAN_CHANGE_ZONE:
/* Ignore */
- break;
+ break;
}
}
static void
-_ibox_box_cb_width_auto(void *data, E_Menu *m, E_Menu_Item *mi)
+_ibox_box_cb_width_auto(void *data)
{
IBox *ib;
IBox_Box *ibb;
- unsigned char enabled;
Evas_List *l;
- ib = data;
- enabled = e_menu_item_toggle_get(mi);
- if ((enabled) && (ib->conf->width == IBOX_WIDTH_FIXED))
- {
- ib->conf->width = IBOX_WIDTH_AUTO;
- for (l = ib->boxes; l; l = l->next)
- {
- ibb = l->data;
- _ibox_box_update_policy(ibb);
- _ibox_box_frame_resize(ibb);
- }
- }
- else if (!(enabled) && (ib->conf->width == IBOX_WIDTH_AUTO))
- {
- ib->conf->width = IBOX_WIDTH_FIXED;
- for (l = ib->boxes; l; l = l->next)
- {
- ibb = l->data;
- _ibox_box_update_policy(ibb);
- _ibox_box_frame_resize(ibb);
- }
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_iconsize_change(IBox_Box *ibb)
-{
- Evas_List *l;
-
- e_box_freeze(ibb->item_object);
- for (l = ibb->icons; l; l = l->next)
- {
- IBox_Icon *ic;
- Evas_Object *o;
- Evas_Coord bw, bh;
-
- ic = l->data;
- o = ic->icon_object;
- evas_object_resize(o, ibb->ibox->conf->iconsize, ibb->ibox->conf->iconsize);
- edje_object_part_swallow(ic->bg_object, "item", o);
-
- bw = ibb->ibox->conf->iconsize + ibb->icon_inset.l + ibb->icon_inset.r;
- bh = ibb->ibox->conf->iconsize + ibb->icon_inset.t + ibb->icon_inset.b;
- e_box_pack_options_set(ic->bg_object,
- 1, 1, /* fill */
- 0, 0, /* expand */
- 0.5, 0.5, /* align */
- bw, bh, /* min */
- bw, bh /* max */
- );
- }
- e_box_thaw(ibb->item_object);
- _ibox_box_frame_resize(ibb);
-}
-
-static void
-_ibox_box_cb_iconsize_microscopic(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 8;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_tiny(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 12;
+ ib = (IBox *)data;
for (l = ib->boxes; l; l = l->next)
{
- IBox_Box *ibb;
-
ibb = l->data;
- _ibox_box_iconsize_change(ibb);
+ _ibox_box_update_policy(ibb);
+ _ibox_box_frame_resize(ibb);
}
- e_config_save_queue();
}
static void
-_ibox_box_cb_iconsize_very_small(void *data, E_Menu *m, E_Menu_Item *mi)
+_ibox_box_cb_iconsize_change(void *data)
{
IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 16;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_small(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 24;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_medium(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 32;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_large(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 40;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_very_large(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 48;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_extremely_large(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 56;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_huge(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 64;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
-
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-
-static void
-_ibox_box_cb_iconsize_enormous(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
+ IBox_Box *ibb;
+ Evas_List *l, *ll;
- ib = data;
- ib->conf->iconsize = 96;
+ ib = (IBox *)data;
for (l = ib->boxes; l; l = l->next)
{
- IBox_Box *ibb;
-
ibb = l->data;
- _ibox_box_iconsize_change(ibb);
- }
- e_config_save_queue();
-}
-static void
-_ibox_box_cb_iconsize_gigantic(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- IBox *ib;
- Evas_List *l;
-
- ib = data;
- ib->conf->iconsize = 128;
- for (l = ib->boxes; l; l = l->next)
- {
- IBox_Box *ibb;
+ e_box_freeze(ibb->item_object);
+ for (ll = ibb->icons; ll; ll = ll->next)
+ {
+ IBox_Icon *ic;
+ Evas_Object *o;
+ Evas_Coord bw, bh;
- ibb = l->data;
- _ibox_box_iconsize_change(ibb);
+ ic = ll->data;
+ o = ic->icon_object;
+ evas_object_resize(o, ibb->ibox->conf->iconsize, ibb->ibox->conf->iconsize);
+ edje_object_part_swallow(ic->bg_object, "item", o);
+
+ bw = ibb->ibox->conf->iconsize + ibb->icon_inset.l + ibb->icon_inset.r;
+ bh = ibb->ibox->conf->iconsize + ibb->icon_inset.t + ibb->icon_inset.b;
+ e_box_pack_options_set(ic->bg_object,
+ 1, 1, /* fill */
+ 0, 0, /* expand */
+ 0.5, 0.5, /* align */
+ bw, bh, /* min */
+ bw, bh /* max */
+ );
+ }
+ e_box_thaw(ibb->item_object);
+ _ibox_box_frame_resize(ibb);
}
- e_config_save_queue();
}
static void
@@ -1530,11 +1218,11 @@
ibb = data;
enabled = e_menu_item_toggle_get(mi);
if ((ibb->conf->enabled) && (!enabled))
- {
+ {
_ibox_box_disable(ibb);
}
else if ((!ibb->conf->enabled) && (enabled))
- {
+ {
_ibox_box_enable(ibb);
}
}
@@ -1549,18 +1237,17 @@
}
static void
-_ibox_box_cb_follower(void *data, E_Menu *m, E_Menu_Item *mi)
+_ibox_box_cb_follower(void *data)
{
IBox *ib;
IBox_Box *ibb;
unsigned char enabled;
Evas_List *l;
- ib = data;
- enabled = e_menu_item_toggle_get(mi);
- if ((enabled) && (!ib->conf->follower))
+ ib = (IBox *)data;
+ enabled = ib->conf->follower;
+ if (enabled)
{
- ib->conf->follower = 1;
for (l = ib->boxes; l; l = l->next)
{
Evas_Object *o;
@@ -1573,13 +1260,12 @@
e_theme_edje_object_set(o, "base/theme/modules/ibox",
"modules/ibox/follower");
edje_object_signal_emit(o, "set_orientation", _ibox_main_orientation[e_gadman_client_edge_get(ibb->gmc)]);
- edje_object_message_signal_process(o);
+ edje_object_message_signal_process(o);
evas_object_show(o);
}
}
- else if (!(enabled) && (ib->conf->follower))
+ else if (!enabled)
{
- ib->conf->follower = 0;
for (l = ib->boxes; l; l = l->next)
{
ibb = l->data;
@@ -1588,5 +1274,13 @@
ibb->overlay_object = NULL;
}
}
- e_config_save_queue();
+}
+
+void
+_ibox_box_cb_config_updated(void *data)
+{
+ /* Call Any Needed Funcs To Let Module Handle Config Changes */
+ _ibox_box_cb_follower(data);
+ _ibox_box_cb_width_auto(data);
+ _ibox_box_cb_iconsize_change(data);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h 13 Dec 2005 02:56:19 -0000 1.8
+++ e_mod_main.h 13 Dec 2005 14:32:18 -0000 1.9
@@ -32,8 +32,6 @@
{
Evas_List *boxes;
E_Menu *config_menu;
- E_Menu *config_menu_options;
- E_Menu *config_menu_size;
Config *conf;
};
@@ -94,4 +92,6 @@
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
+EAPI void _ibox_box_cb_config_updated(void *data);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 14 May 2005 14:08:15 -0000 1.4
+++ Makefile.am 13 Dec 2005 14:32:18 -0000 1.5
@@ -20,7 +20,9 @@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
|
|
From: <enl...@li...> - 2005-12-13 14:39:25
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_config.c
Log Message:
IBox Cfg Dld Icon Size Fix
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 13 Dec 2005 14:32:18 -0000 1.1
+++ e_mod_config.c 13 Dec 2005 14:39:15 -0000 1.2
@@ -5,17 +5,10 @@
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
-#define ICONSIZE_MICROSCOPIC 8
-#define ICONSIZE_TINY 12
-#define ICONSIZE_VERYSMALL 16
#define ICONSIZE_SMALL 24
#define ICONSIZE_MEDIUM 32
#define ICONSIZE_LARGE 40
#define ICONSIZE_VERYLARGE 48
-#define ICONSIZE_EXTLARGE 56
-#define ICONSIZE_HUGE 64
-#define ICONSIZE_ENORMOUS 96
-#define ICONSIZE_GIGANTIC 128
struct _cfdata
{
@@ -86,7 +79,8 @@
cfdata->iconsize = ib->conf->iconsize;
if (cfdata->iconsize <=24) cfdata->icon_method = ICONSIZE_SMALL;
if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM;
- if (cfdata->iconsize > 32) cfdata->icon_method = ICONSIZE_LARGE;
+ if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE;
+ if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
@@ -128,6 +122,9 @@
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Large"), ICONSIZE_LARGE, rg);
e_widget_framelist_object_append(of, ob);
+ ob = e_widget_radio_add(evas, _("Very Large"), ICONSIZE_VERYLARGE, rg);
+ e_widget_framelist_object_append(of, ob);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@@ -151,7 +148,8 @@
if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24;
if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32;
if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40;
-
+ if (cfdata->icon_method == ICONSIZE_VERYLARGE) ib->conf->iconsize = 48;
+
e_border_button_bindings_grab_all();
e_config_save_queue();
|
|
From: <enl...@li...> - 2005-12-13 15:58:08
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c
Log Message:
Max IBar Follow Speed to 0.99 till we can track down the bug.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 13 Dec 2005 14:30:54 -0000 1.2
+++ e_mod_config.c 13 Dec 2005 15:57:54 -0000 1.3
@@ -185,7 +185,7 @@
of = e_widget_framelist_add(evas, _("Advanced Settings"), 0);
ob = e_widget_label_add(evas, _("Follow Speed:"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->follow_speed), NULL,200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
@@ -214,6 +214,7 @@
ib->conf->iconsize = cfdata->iconsize;
+ printf("Data Speed: %f\n", cfdata->follow_speed);
ib->conf->follow_speed = cfdata->follow_speed;
ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
|
|
From: <enl...@li...> - 2005-12-13 16:04:46
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_config.c
Log Message:
Max IBox Follow Speed to 0.99 till we can track down the bug.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 13 Dec 2005 14:39:15 -0000 1.2
+++ e_mod_config.c 13 Dec 2005 16:04:32 -0000 1.3
@@ -182,7 +182,7 @@
of = e_widget_framelist_add(evas, _("Advanced Settings"), 0);
ob = e_widget_label_add(evas, _("Follow Speed:"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->follow_speed), NULL,200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
|
|
From: <enl...@li...> - 2005-12-13 16:13:16
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c
Log Message:
Max IBar Autoscroll Speed to 0.99 till we can track down the bug.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 13 Dec 2005 15:57:54 -0000 1.3
+++ e_mod_config.c 13 Dec 2005 16:13:09 -0000 1.4
@@ -190,7 +190,7 @@
ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
|
From: <enl...@li...> - 2005-12-13 16:13:01
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_config.c
Log Message:
Max IBox Autoscroll Speed to 0.99 till we can track down the bug.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 13 Dec 2005 16:04:32 -0000 1.3
+++ e_mod_config.c 13 Dec 2005 16:12:50 -0000 1.4
@@ -187,7 +187,7 @@
ob = e_widget_label_add(evas, _("Autoscroll Speed:"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 1.0, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
|
From: <enl...@li...> - 2005-12-14 22:47:01
|
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.h e_mod_main.c Makefile.am
Added Files:
e_mod_config.h e_mod_config.c
Log Message:
Battery Config Dialog
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.h 24 Sep 2005 13:42:05 -0000 1.13
+++ e_mod_main.h 14 Dec 2005 22:46:51 -0000 1.14
@@ -47,6 +47,7 @@
struct _Battery_Face
{
+ Battery *battery;
E_Container *con;
E_Menu *menu;
@@ -94,4 +95,6 @@
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
+EAPI void _battery_face_cb_config_updated(Battery *bat);
+
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_mod_main.c 9 Nov 2005 07:56:20 -0000 1.53
+++ e_mod_main.c 14 Dec 2005 22:46:51 -0000 1.54
@@ -62,6 +62,8 @@
static int _battery_int_get(char *buf);
static char *_battery_string_get(char *buf);
+static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
+
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
@@ -194,6 +196,7 @@
ef = _battery_face_new(con);
if (ef)
{
+ ef->battery = e;
e->faces = evas_list_append(e->faces, ef);
/* Config */
@@ -214,13 +217,9 @@
_battery_face_menu_new(ef);
/* Add main menu to face menu */
- mi = e_menu_item_new(ef->menu);
- e_menu_item_label_set(mi, _("Set Poll Time"));
- e_menu_item_submenu_set(mi, e->config_menu_poll);
-
- mi = e_menu_item_new(ef->menu);
- e_menu_item_label_set(mi, _("Set Alarm"));
- e_menu_item_submenu_set(mi, e->config_menu_alarm);
+ mi = e_menu_item_new(e->config_menu);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, ef);
mi = e_menu_item_new(e->config_menu);
e_menu_item_label_set(mi, con->name);
@@ -251,8 +250,6 @@
evas_list_free(e->faces);
e_object_del(E_OBJECT(e->config_menu));
- e_object_del(E_OBJECT(e->config_menu_poll));
- e_object_del(E_OBJECT(e->config_menu_alarm));
ecore_timer_del(e->battery_check_timer);
@@ -262,66 +259,6 @@
}
static void
-_battery_menu_alarm_10(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 10;
- e_config_save_queue();
-}
-
-static void
-_battery_menu_alarm_20(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 20;
- e_config_save_queue();
-}
-
-static void
-_battery_menu_alarm_30(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 30;
- e_config_save_queue();
-}
-
-static void
-_battery_menu_alarm_40(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 40;
- e_config_save_queue();
-}
-
-static void
-_battery_menu_alarm_50(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 50;
- e_config_save_queue();
-}
-
-static void
-_battery_menu_alarm_60(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->alarm = 60;
- e_config_save_queue();
-}
-
-static void
_battery_menu_alarm_disable(void *data, E_Menu *m, E_Menu_Item *mi)
{
Battery *e;
@@ -332,175 +269,12 @@
}
static void
-_battery_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->poll_time = 1.0;
- ecore_timer_del(e->battery_check_timer);
- e->battery_check_timer = ecore_timer_add(e->conf->poll_time, _battery_cb_check, e);
- e_config_save_queue();
-}
-
-static void
-_battery_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->poll_time = 5.0;
- ecore_timer_del(e->battery_check_timer);
- e->battery_check_timer = ecore_timer_add(e->conf->poll_time, _battery_cb_check, e);
- e_config_save_queue();
-}
-
-static void
-_battery_menu_normal(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->poll_time = 10.0;
- ecore_timer_del(e->battery_check_timer);
- e->battery_check_timer = ecore_timer_add(e->conf->poll_time, _battery_cb_check, e);
- e_config_save_queue();
-}
-
-static void
-_battery_menu_slow(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->poll_time = 30.0;
- ecore_timer_del(e->battery_check_timer);
- e->battery_check_timer = ecore_timer_add(e->conf->poll_time, _battery_cb_check, e);
- e_config_save_queue();
-}
-
-static void
-_battery_menu_very_slow(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Battery *e;
-
- e = data;
- e->conf->poll_time = 60.0;
- ecore_timer_del(e->battery_check_timer);
- e->battery_check_timer = ecore_timer_add(e->conf->poll_time, _battery_cb_check, e);
- e_config_save_queue();
-}
-
-static void
_battery_config_menu_new(Battery *e)
{
E_Menu *mn;
- E_Menu_Item *mi;
/* Alarm */
mn = e_menu_new();
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Disable"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_disable, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("10 mins"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 10) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_10, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("20 mins"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 20) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_20, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("30 mins"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 30) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_30, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("40 mins"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 40) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_40, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("50 mins"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 50) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_50, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("1 hour"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->alarm == 60) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_alarm_60, e);
-
- e->config_menu_alarm = mn;
-
- /* Check interval */
- mn = e_menu_new();
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Check Fast (1 sec)"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->poll_time == 1.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_fast, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Check Medium (5 sec)"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->poll_time == 5.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_medium, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Check Normal (10 sec)"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->poll_time == 10.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_normal, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Check Slow (30 sec)"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->poll_time == 30.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_slow, e);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Check Very Slow (60 sec)"));
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 1);
- if (e->conf->poll_time == 60.0) e_menu_item_toggle_set(mi, 1);
- e_menu_item_callback_set(mi, _battery_menu_very_slow, e);
-
- e->config_menu_poll = mn;
-
- mn = e_menu_new();
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Set Poll Time"));
- e_menu_item_submenu_set(mi, e->config_menu_poll);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Set Alarm"));
- e_menu_item_submenu_set(mi, e->config_menu_alarm);
-
e->config_menu = mn;
}
@@ -583,6 +357,11 @@
if (face->conf->enabled) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _battery_face_cb_menu_enabled, face);
*/
+
+ /* Config */
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Config Dialog"));
+ e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, face);
/* Edit */
mi = e_menu_item_new(mn);
@@ -1789,3 +1568,23 @@
if (q) *q = 0;
return strdup(p);
}
+
+static void
+_battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ Battery_Face *face;
+
+ face = data;
+ if (!face) return;
+ e_int_config_battery(face->con, face->battery);
+}
+
+void
+_battery_face_cb_config_updated(Battery *bat)
+{
+ /* Call all functions needed to update battery */
+
+ /* Update Poll Time */
+ ecore_timer_del(bat->battery_check_timer);
+ bat->battery_check_timer = ecore_timer_add(bat->conf->poll_time, _battery_cb_check, bat);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 18 Aug 2005 06:15:27 -0000 1.5
+++ Makefile.am 14 Dec 2005 22:46:51 -0000 1.6
@@ -21,7 +21,9 @@
pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
|
Thanks for helping keep SourceForge clean.
X