summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dj2>2005-09-22 18:17:18 +0000
committerDan Sinclair <dj2@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-09-22 18:17:18 +0000
commit9288298ae80c3fa765b1f8c08ec3081fa86601f5 (patch)
treec8f439bf4a9a3cefc343b387efee36c4eeb8b772
parentbcce7a8bce24ff3f373d946a4efeb8e032cfebf8 (diff)
- move the common code to a function in the e_modules file.
SVN revision: 16851
-rw-r--r--AUTHORS1
-rw-r--r--src/bin/e_module.c19
-rw-r--r--src/bin/e_module.h1
-rw-r--r--src/modules/battery/e_mod_main.c38
-rw-r--r--src/modules/clock/e_mod_main.c30
-rw-r--r--src/modules/cpufreq/e_mod_main.c30
-rw-r--r--src/modules/dropshadow/e_mod_main.c34
-rw-r--r--src/modules/ibar/e_mod_main.c36
-rw-r--r--src/modules/ibox/e_mod_main.c32
-rw-r--r--src/modules/pager/e_mod_main.c30
-rw-r--r--src/modules/randr/e_mod_main.c30
-rw-r--r--src/modules/start/e_mod_main.c28
-rw-r--r--src/modules/temperature/e_mod_main.c34
-rw-r--r--src/modules/test/e_mod_main.c31
14 files changed, 99 insertions, 275 deletions
diff --git a/AUTHORS b/AUTHORS
index 90e2e60b0..0ec41a757 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,4 @@ Ibukun Olumuyiwa <ibukun@computer.org>
3Sebastian Dransfeld <sebastid@tango.flipp.net> 3Sebastian Dransfeld <sebastid@tango.flipp.net>
4HandyAndE (Andrew Williams) <andy@handyande.co.uk> 4HandyAndE (Andrew Williams) <andy@handyande.co.uk>
5CodeWarrior (Hisham Mardam Bey) <hisham@hisham.cc> 5CodeWarrior (Hisham Mardam Bey) <hisham@hisham.cc>
6dj2 (dan sinclair) <dj2@everburning.com>
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 57e147430..c5afa1067 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -456,3 +456,22 @@ _e_module_control_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
456 } 456 }
457 e_menu_item_toggle_set(mi, e_module_enabled_get(mod)); 457 e_menu_item_toggle_set(mi, e_module_enabled_get(mod));
458} 458}
459
460void
461e_module_dialog_show(char *title, char *body)
462{
463 E_Dialog *dia;
464
465 dia = e_dialog_new (e_container_current_get (e_manager_current_get ()));
466 if (!dia) return;
467
468 e_dialog_title_set (dia, title);
469 e_dialog_icon_set (dia, "enlightenment/e", 64);
470 e_dialog_text_set (dia, body);
471 e_dialog_button_add (dia, _("Ok"), NULL, NULL, NULL);
472 e_win_centered_set (dia->win, 1);
473 e_dialog_show (dia);
474}
475
476
477
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index f47cbe078..1e3976d8f 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -65,6 +65,7 @@ EAPI int e_module_save_all(void);
65EAPI E_Module *e_module_find(char *name); 65EAPI E_Module *e_module_find(char *name);
66EAPI Evas_List *e_module_list(void); 66EAPI Evas_List *e_module_list(void);
67EAPI E_Menu *e_module_menu_new(void); 67EAPI E_Menu *e_module_menu_new(void);
68EAPI void e_module_dialog_show(char *title, char *body);
68 69
69#endif 70#endif
70#endif 71#endif
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 22c2e4aac..7e17adee7 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -73,23 +73,13 @@ e_modapi_init(E_Module *m)
73 /* check module api version */ 73 /* check module api version */
74 if (m->api->version < E_MODULE_API_VERSION) 74 if (m->api->version < E_MODULE_API_VERSION)
75 { 75 {
76 E_Dialog *dia;
77 char buf[4096]; 76 char buf[4096];
78 77 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
79 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
80 if (!dia) return NULL;
81
82 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Battery<br>"
83 "It requires a minimum module API version of: %i.<br>" 78 "It requires a minimum module API version of: %i.<br>"
84 "The module API advertized by Enlightenment is: %i.<br>"), 79 "The module API advertized by Enlightenment is: %i.<br>"),
85 E_MODULE_API_VERSION, m->api->version); 80 _("Battery"), E_MODULE_API_VERSION, m->api->version);
86 81
87 e_dialog_title_set(dia, "Enlightenment Battery Module"); 82 e_module_dialog_show(_("Enlightenment Battery Module"), buf);
88 e_dialog_icon_set(dia, "enlightenment/e", 64);
89 e_dialog_text_set(dia, buf);
90 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
91 e_win_centered_set(dia->win, 1);
92 e_dialog_show(dia);
93 return NULL; 83 return NULL;
94 } 84 }
95 /* actually init battery */ 85 /* actually init battery */
@@ -136,20 +126,12 @@ e_modapi_info(E_Module *m)
136int 126int
137e_modapi_about(E_Module *m) 127e_modapi_about(E_Module *m)
138{ 128{
139 E_Dialog *dia; 129 e_module_dialog_show(_("Enlightenment Battery Module"),
140 130 _("A basic battery meter that uses either"
141 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 131 "<hilight>ACPI</hilight> or <hilight>APM</hilight><br>"
142 if (!dia) return 0; 132 "on Linux to monitor your battery and AC power adaptor<br>"
143 e_dialog_title_set(dia, "Enlightenment Battery Module"); 133 "status. This will work under Linux and FreeBSD and is only<br>"
144 e_dialog_icon_set(dia, "enlightenment/e", 64); 134 "as accurate as your BIOS or kernel drivers."));
145 e_dialog_text_set(dia, _("A basic battery meter that uses either"
146 "<hilight>ACPI</hilight> or <hilight>APM</hilight><br>"
147 "on Linux to monitor your battery and AC power adaptor<br>"
148 "status. This will work under Linux and FreeBSD and is only<br>"
149 "as accurate as your BIOS or kernel drivers."));
150 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
151 e_win_centered_set(dia->win, 1);
152 e_dialog_show(dia);
153 return 1; 135 return 1;
154} 136}
155 137
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index a071d17ab..d8caf11a4 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -46,23 +46,13 @@ e_modapi_init(E_Module *module)
46 /* check module api version */ 46 /* check module api version */
47 if (module->api->version < E_MODULE_API_VERSION) 47 if (module->api->version < E_MODULE_API_VERSION)
48 { 48 {
49 E_Dialog *dia;
50 char buf[4096]; 49 char buf[4096];
51 50 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
52 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
53 if (!dia) return NULL;
54
55 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Clock<br>"
56 "It requires a minimum module API version of: %i.<br>" 51 "It requires a minimum module API version of: %i.<br>"
57 "The module API advertized by Enlightenment is: %i.<br>"), 52 "The module API advertized by Enlightenment is: %i.<br>"),
58 E_MODULE_API_VERSION, module->api->version); 53 _("Clock"), E_MODULE_API_VERSION, module->api->version);
59 54
60 e_dialog_title_set(dia, "Enlightenment Clock Module"); 55 e_module_dialog_show(_("Enlightenment Clock Module"), buf);
61 e_dialog_icon_set(dia, "enlightenment/e", 64);
62 e_dialog_text_set(dia, buf);
63 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
64 e_win_centered_set(dia->win, 1);
65 e_dialog_show(dia);
66 return NULL; 56 return NULL;
67 } 57 }
68 58
@@ -111,16 +101,8 @@ e_modapi_info(E_Module *module)
111int 101int
112e_modapi_about(E_Module *module) 102e_modapi_about(E_Module *module)
113{ 103{
114 E_Dialog *dia; 104 e_module_dialog_show(_("Enlightenment Clock Module"),
115 105 _("A simple module to give E17 a clock."));
116 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
117 if (!dia) return 0;
118 e_dialog_title_set(dia, "Enlightenment Clock Module");
119 e_dialog_icon_set(dia, "enlightenment/e", 64);
120 e_dialog_text_set(dia, _("A simple module to give E17 a clock."));
121 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
122 e_win_centered_set(dia->win, 1);
123 e_dialog_show(dia);
124 return 1; 106 return 1;
125} 107}
126 108
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index e0da18e02..0f467e469 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -64,23 +64,13 @@ e_modapi_init(E_Module *module)
64 64
65 if (module->api->version < E_MODULE_API_VERSION) 65 if (module->api->version < E_MODULE_API_VERSION)
66 { 66 {
67 E_Dialog *dia;
68 char buf[4096]; 67 char buf[4096];
69 68 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
70 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
71 if (!dia) return NULL;
72
73 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Cpufreq<br>"
74 "It requires a minimum module API version of: %i.<br>" 69 "It requires a minimum module API version of: %i.<br>"
75 "The module API advertized by Enlightenment is: %i.<br>"), 70 "The module API advertized by Enlightenment is: %i.<br>"),
76 E_MODULE_API_VERSION, module->api->version); 71 _("Cpufreq"), E_MODULE_API_VERSION, module->api->version);
77 72
78 e_dialog_title_set(dia, "Enlightenment Cpufreq Module"); 73 e_module_dialog_show(_("Enlightenment Cpufreq Module"), buf);
79 e_dialog_icon_set(dia, "enlightenment/e", 64);
80 e_dialog_text_set(dia, buf);
81 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
82 e_win_centered_set(dia->win, 1);
83 e_dialog_show(dia);
84 return NULL; 74 return NULL;
85 } 75 }
86 76
@@ -128,17 +118,9 @@ e_modapi_info(E_Module *module)
128int 118int
129e_modapi_about(E_Module *module) 119e_modapi_about(E_Module *module)
130{ 120{
131 E_Dialog *dia; 121 e_module_dialog_show(_("CPU Frequency Controller Module"),
132 122 _("A simple module to control the frequency of the system CPU.<br>"
133 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 123 "This is especially useful to save power on laptops."));
134 if (!dia) return 0;
135 e_dialog_title_set(dia, "CPU Frequency Controller Module");
136 e_dialog_icon_set(dia, "enlightenment/e", 64);
137 e_dialog_text_set(dia, _("A simple module to control the frequency of the system CPU.<br>"
138 "This is especially useful to save power on laptops."));
139 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
140 e_win_centered_set(dia->win, 1);
141 e_dialog_show(dia);
142 return 1; 124 return 1;
143} 125}
144 126
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index d89cc92cb..91298a6f3 100644
--- a/src/modules/dropshadow/e_mod_main.c
+++ b/src/modules/dropshadow/e_mod_main.c
@@ -97,23 +97,13 @@ e_modapi_init(E_Module *m)
97 97
98 if (m->api->version < E_MODULE_API_VERSION) 98 if (m->api->version < E_MODULE_API_VERSION)
99 { 99 {
100 E_Dialog *dia;
101 char buf[4096]; 100 char buf[4096];
102 101 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
103 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
104 if (!dia) return NULL;
105
106 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Dropshadow<br>"
107 "It requires a minimum module API version of: %i.<br>" 102 "It requires a minimum module API version of: %i.<br>"
108 "The module API advertized by Enlightenment is: %i.<br>"), 103 "The module API advertized by Enlightenment is: %i.<br>"),
109 E_MODULE_API_VERSION, m->api->version); 104 _("Dropshadow"), E_MODULE_API_VERSION, m->api->version);
110 105
111 e_dialog_title_set(dia, "Enlightenment Dropshadow Module"); 106 e_module_dialog_show(_("Enlightenment Dropshadow Module"), buf);
112 e_dialog_icon_set(dia, "enlightenment/e", 64);
113 e_dialog_text_set(dia, buf);
114 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
115 e_win_centered_set(dia->win, 1);
116 e_dialog_show(dia);
117 return NULL; 107 return NULL;
118 } 108 }
119 ds = _ds_init(m); 109 ds = _ds_init(m);
@@ -200,18 +190,10 @@ e_modapi_info(E_Module *m)
200int 190int
201e_modapi_about(E_Module *m) 191e_modapi_about(E_Module *m)
202{ 192{
203 E_Dialog *dia; 193 e_module_dialog_show(_("Enlightenment Dropshadow Module"),
204 194 _("This is the dropshadow module that allows dropshadows to be cast<br>"
205 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 195 "on the desktop background - without special X-Server extensions<br>"
206 if (!dia) return 0; 196 "or hardware acceleration."));
207 e_dialog_title_set(dia, "Enlightenment Dropshadow Module");
208 e_dialog_icon_set(dia, "enlightenment/e", 64);
209 e_dialog_text_set(dia, _("This is the dropshadow module that allows dropshadows to be cast<br>"
210 "on the desktop background - without special X-Server extensions<br>"
211 "or hardware acceleration."));
212 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
213 e_win_centered_set(dia->win, 1);
214 e_dialog_show(dia);
215 return 1; 197 return 1;
216} 198}
217 199
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index c62b58494..9d5c02685 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -118,23 +118,13 @@ e_modapi_init(E_Module *m)
118 /* check module api version */ 118 /* check module api version */
119 if (m->api->version < E_MODULE_API_VERSION) 119 if (m->api->version < E_MODULE_API_VERSION)
120 { 120 {
121 E_Dialog *dia;
122 char buf[4096]; 121 char buf[4096];
123 122 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
124 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
125 if (!dia) return NULL;
126
127 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: IBar<br>"
128 "It requires a minimum module API version of: %i.<br>" 123 "It requires a minimum module API version of: %i.<br>"
129 "The module API advertized by Enlightenment is: %i.<br>"), 124 "The module API advertized by Enlightenment is: %i.<br>"),
130 E_MODULE_API_VERSION, m->api->version); 125 _("IBar"), E_MODULE_API_VERSION, m->api->version);
131 126
132 e_dialog_title_set(dia, "Enlightenment IBar Module"); 127 e_module_dialog_show(_("Enlightenment IBar Module"), buf);
133 e_dialog_icon_set(dia, "enlightenment/e", 64);
134 e_dialog_text_set(dia, buf);
135 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
136 e_win_centered_set(dia->win, 1);
137 e_dialog_show(dia);
138 return NULL; 128 return NULL;
139 } 129 }
140 /* actually init ibar */ 130 /* actually init ibar */
@@ -181,19 +171,11 @@ e_modapi_info(E_Module *m)
181int 171int
182e_modapi_about(E_Module *m) 172e_modapi_about(E_Module *m)
183{ 173{
184 E_Dialog *dia; 174 e_module_dialog_show(_("Enlightenment IBar Module"),
185 175 _("This is the IBar Application Launcher bar module for Enlightenment.<br>"
186 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 176 "It is a first example module and is being used to flesh out several<br>"
187 if (!dia) return 0; 177 "interfaces in Enlightenment 0.17.0. It is under heavy development,<br>"
188 e_dialog_title_set(dia, "Enlightenment IBar Module"); 178 "so expect it to <hilight>break often</hilight> and change as it improves."));
189 e_dialog_icon_set(dia, "enlightenment/e", 64);
190 e_dialog_text_set(dia, _("This is the IBar Application Launcher bar module for Enlightenment.<br>"
191 "It is a first example module and is being used to flesh out several<br>"
192 "interfaces in Enlightenment 0.17.0. It is under heavy development,<br>"
193 "so expect it to <hilight>break often</hilight> and change as it improves."));
194 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
195 e_win_centered_set(dia->win, 1);
196 e_dialog_show(dia);
197 return 1; 179 return 1;
198} 180}
199 181
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index dd050221f..64f8c7697 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -100,23 +100,13 @@ e_modapi_init(E_Module *m)
100 /* check module api version */ 100 /* check module api version */
101 if (m->api->version < E_MODULE_API_VERSION) 101 if (m->api->version < E_MODULE_API_VERSION)
102 { 102 {
103 E_Dialog *dia;
104 char buf[4096]; 103 char buf[4096];
105 104 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
106 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
107 if (!dia) return NULL;
108
109 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: IBox<br>"
110 "It requires a minimum module API version of: %i.<br>" 105 "It requires a minimum module API version of: %i.<br>"
111 "The module API advertized by Enlightenment is: %i.<br>"), 106 "The module API advertized by Enlightenment is: %i.<br>"),
112 E_MODULE_API_VERSION, m->api->version); 107 _("IBox"), E_MODULE_API_VERSION, m->api->version);
113 108
114 e_dialog_title_set(dia, "Enlightenment IBox Module"); 109 e_module_dialog_show(_("Enlightenment IBox Module"), buf);
115 e_dialog_icon_set(dia, "enlightenment/e", 64);
116 e_dialog_text_set(dia, buf);
117 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
118 e_win_centered_set(dia->win, 1);
119 e_dialog_show(dia);
120 return NULL; 110 return NULL;
121 } 111 }
122 /* actually init ibox */ 112 /* actually init ibox */
@@ -163,17 +153,9 @@ e_modapi_info(E_Module *m)
163int 153int
164e_modapi_about(E_Module *m) 154e_modapi_about(E_Module *m)
165{ 155{
166 E_Dialog *dia; 156 e_module_dialog_show(_("Enlightenment IBox Module"),
167 157 _("This is the IBox Iconified Application module for Enlightenment.<br>"
168 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 158 "It will hold minimized applications"));
169 if (!dia) return 0;
170 e_dialog_title_set(dia, "Enlightenment IBox Module");
171 e_dialog_icon_set(dia, "enlightenment/e", 64);
172 e_dialog_text_set(dia, _("This is the IBox Iconified Application module for Enlightenment.<br>"
173 "It will hold minimized applications"));
174 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
175 e_win_centered_set(dia->win, 1);
176 e_dialog_show(dia);
177 return 1; 159 return 1;
178} 160}
179 161
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 71adba635..6390f9434 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -112,23 +112,13 @@ e_modapi_init(E_Module *module)
112 /* check module api version */ 112 /* check module api version */
113 if (module->api->version < E_MODULE_API_VERSION) 113 if (module->api->version < E_MODULE_API_VERSION)
114 { 114 {
115 E_Dialog *dia;
116 char buf[4096]; 115 char buf[4096];
117 116 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
118 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
119 if (!dia) return NULL;
120
121 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Pager<br>"
122 "It requires a minimum module API version of: %i.<br>" 117 "It requires a minimum module API version of: %i.<br>"
123 "The module API advertized by Enlightenment is: %i.<br>"), 118 "The module API advertized by Enlightenment is: %i.<br>"),
124 E_MODULE_API_VERSION, module->api->version); 119 _("Pager"), E_MODULE_API_VERSION, module->api->version);
125 120
126 e_dialog_title_set(dia, "Enlightenment Pager Module"); 121 e_module_dialog_show(_("Enlightenment Pager Module"), buf);
127 e_dialog_icon_set(dia, "enlightenment/e", 64);
128 e_dialog_text_set(dia, buf);
129 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
130 e_win_centered_set(dia->win, 1);
131 e_dialog_show(dia);
132 return NULL; 122 return NULL;
133 } 123 }
134 /* actually init pager */ 124 /* actually init pager */
@@ -178,16 +168,8 @@ e_modapi_info(E_Module *module)
178int 168int
179e_modapi_about(E_Module *module) 169e_modapi_about(E_Module *module)
180{ 170{
181 E_Dialog *dia; 171 e_module_dialog_show(_("Enlightenment Pager Module"),
182 172 _("A pager module to navigate virtual desktops."));
183 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
184 if (!dia) return 0;
185 e_dialog_title_set(dia, "Enlightenment Pager Module");
186 e_dialog_icon_set(dia, "enlightenment/e", 64);
187 e_dialog_text_set(dia, _("A pager module to navigate virtual desktops."));
188 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
189 e_win_centered_set(dia->win, 1);
190 e_dialog_show(dia);
191 return 1; 173 return 1;
192} 174}
193 175
diff --git a/src/modules/randr/e_mod_main.c b/src/modules/randr/e_mod_main.c
index 82a399dec..44d523ab2 100644
--- a/src/modules/randr/e_mod_main.c
+++ b/src/modules/randr/e_mod_main.c
@@ -34,23 +34,13 @@ e_modapi_init(E_Module *m)
34 34
35 if (m->api->version < E_MODULE_API_VERSION) 35 if (m->api->version < E_MODULE_API_VERSION)
36 { 36 {
37 E_Dialog *dia;
38 char buf[4096]; 37 char buf[4096];
39 38 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
40 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
41 if (!dia) return NULL;
42
43 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Randr<br>"
44 "It requires a minimum module API version of: %i.<br>" 39 "It requires a minimum module API version of: %i.<br>"
45 "The module API advertized by Enlightenment is: %i.<br>"), 40 "The module API advertized by Enlightenment is: %i.<br>"),
46 E_MODULE_API_VERSION, m->api->version); 41 _("RandR"), E_MODULE_API_VERSION, m->api->version);
47 42
48 e_dialog_title_set(dia, "Enlightenment Randr Module"); 43 e_module_dialog_show(_("Enlightenment Randr Module"), buf);
49 e_dialog_icon_set(dia, "enlightenment/e", 64);
50 e_dialog_text_set(dia, buf);
51 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
52 e_win_centered_set(dia->win, 1);
53 e_dialog_show(dia);
54 return NULL; 44 return NULL;
55 } 45 }
56 46
@@ -101,16 +91,8 @@ e_modapi_info(E_Module *m)
101int 91int
102e_modapi_about(E_Module *m) 92e_modapi_about(E_Module *m)
103{ 93{
104 E_Dialog *dia; 94 e_module_dialog_show(_("Enlightenment Randr Module"),
105 95 _("Module to change screen resolution for E17"));
106 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
107 if (!dia) return 0;
108 e_dialog_title_set(dia, "Enlightenment Randr Module");
109 e_dialog_icon_set(dia, "enlightenment/e", 64);
110 e_dialog_text_set(dia, _("Module to change screen resolution for E17"));
111 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
112 e_win_centered_set(dia->win, 1);
113 e_dialog_show(dia);
114 return 1; 96 return 1;
115} 97}
116 98
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index dfac77c6d..58960a622 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -29,23 +29,13 @@ e_modapi_init(E_Module *m)
29 29
30 if (m->api->version < E_MODULE_API_VERSION) 30 if (m->api->version < E_MODULE_API_VERSION)
31 { 31 {
32 E_Dialog *dia;
33 char buf[4096]; 32 char buf[4096];
34 33 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
35 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
36 if (!dia) return NULL;
37
38 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Start<br>"
39 "It requires a minimum module API version of: %i.<br>" 34 "It requires a minimum module API version of: %i.<br>"
40 "The module API advertized by Enlightenment is: %i.<br>"), 35 "The module API advertized by Enlightenment is: %i.<br>"),
41 E_MODULE_API_VERSION, m->api->version); 36 _("Start"), E_MODULE_API_VERSION, m->api->version);
42 37
43 e_dialog_title_set(dia, "Enlightenment Start Module"); 38 e_module_dialog_show(_("Enlightenment Start Module"), buf);
44 e_dialog_icon_set(dia, "enlightenment/e", 64);
45 e_dialog_text_set(dia, buf);
46 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
47 e_win_centered_set(dia->win, 1);
48 e_dialog_show(dia);
49 return NULL; 39 return NULL;
50 } 40 }
51 41
@@ -92,16 +82,8 @@ e_modapi_info(E_Module *m)
92int 82int
93e_modapi_about(E_Module *m) 83e_modapi_about(E_Module *m)
94{ 84{
95 E_Dialog *dia; 85 e_module_dialog_show(_("Enlightenment Start Module"),
96 86 _("Experimental Button module for E17"));
97 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
98 if (!dia) return 0;
99 e_dialog_title_set(dia, "Enlightenment Start Module");
100 e_dialog_icon_set(dia, "enlightenment/e", 64);
101 e_dialog_text_set(dia, _("Experimental Button module for E17"));
102 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
103 e_win_centered_set(dia->win, 1);
104 e_dialog_show(dia);
105 return 1; 87 return 1;
106} 88}
107 89
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index 5f8b7ca62..80f37e1b7 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -46,23 +46,13 @@ e_modapi_init(E_Module *m)
46 /* check module api version */ 46 /* check module api version */
47 if (m->api->version < E_MODULE_API_VERSION) 47 if (m->api->version < E_MODULE_API_VERSION)
48 { 48 {
49 E_Dialog *dia;
50 char buf[4096]; 49 char buf[4096];
51 50 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
52 dia = e_dialog_new(e_container_current_get(e_manager_current_get()));
53 if (!dia) return NULL;
54
55 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Temperature<br>"
56 "It requires a minimum module API version of: %i.<br>" 51 "It requires a minimum module API version of: %i.<br>"
57 "The module API advertized by Enlightenment is: %i.<br>"), 52 "The module API advertized by Enlightenment is: %i.<br>"),
58 E_MODULE_API_VERSION, m->api->version); 53 _("Temperature"), E_MODULE_API_VERSION, m->api->version);
59 54
60 e_dialog_title_set(dia, "Enlightenment Temperature Module"); 55 e_module_dialog_show(_("Enlightenment Temperature Module"), buf);
61 e_dialog_icon_set(dia, "enlightenment/e", 64);
62 e_dialog_text_set(dia, buf);
63 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
64 e_win_centered_set(dia->win, 1);
65 e_dialog_show(dia);
66 return NULL; 56 return NULL;
67 } 57 }
68 /* actually init temperature */ 58 /* actually init temperature */
@@ -109,18 +99,10 @@ e_modapi_info(E_Module *m)
109int 99int
110e_modapi_about(E_Module *m) 100e_modapi_about(E_Module *m)
111{ 101{
112 E_Dialog *dia; 102 e_module_dialog_show(_("Enlightenment Temperature Module"),
113 103 _("A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux.<br>"
114 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 104 "It is especially useful for modern Laptops with high speed<br>"
115 if (!dia) return 0; 105 "CPUs that generate a lot of heat."));
116 e_dialog_title_set(dia, "Enlightenment Temperature Module");
117 e_dialog_icon_set(dia, "enlightenment/e", 64);
118 e_dialog_text_set(dia, _("A module to measure the <hilight>ACPI Thermal sensor</hilight> on Linux.<br>"
119 "It is especially useful for modern Laptops with high speed<br>"
120 "CPUs that generate a lot of heat."));
121 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
122 e_win_centered_set(dia->win, 1);
123 e_dialog_show(dia);
124 return 1; 106 return 1;
125} 107}
126 108
diff --git a/src/modules/test/e_mod_main.c b/src/modules/test/e_mod_main.c
index 8844cf578..5a39aa1cd 100644
--- a/src/modules/test/e_mod_main.c
+++ b/src/modules/test/e_mod_main.c
@@ -9,23 +9,14 @@ e_modapi_init(E_Module *m)
9{ 9{
10 if (m->api->version < E_MODULE_API_VERSION) 10 if (m->api->version < E_MODULE_API_VERSION)
11 { 11 {
12 E_Dialog *dia;
13 char buf[4096]; 12 char buf[4096];
14 13
15 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 14 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: %s<br>"
16 if (!dia) return NULL;
17
18 snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing Module: Test<br>"
19 "It requires a minimum module API version of: %i.<br>" 15 "It requires a minimum module API version of: %i.<br>"
20 "The module API advertized by Enlightenment is: %i.<br>"), 16 "The module API advertized by Enlightenment is: %i.<br>"),
21 E_MODULE_API_VERSION, m->api->version); 17 _("Test"), E_MODULE_API_VERSION, m->api->version);
22 18
23 e_dialog_title_set(dia, "Enlightenment Test Module"); 19 e_module_dialog_show(_("Enlightenment Test Module"), buf);
24 e_dialog_icon_set(dia, "enlightenment/e", 64);
25 e_dialog_text_set(dia, buf);
26 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
27 e_win_centered_set(dia->win, 1);
28 e_dialog_show(dia);
29 return NULL; 20 return NULL;
30 } 21 }
31 { 22 {
@@ -76,17 +67,9 @@ e_modapi_info(E_Module *m)
76int 67int
77e_modapi_about(E_Module *m) 68e_modapi_about(E_Module *m)
78{ 69{
79 E_Dialog *dia; 70 e_module_dialog_show(_("Enlightenment Test Module"),
80 71 _("This module is VERY simple and is only used to test the basic<br>"
81 dia = e_dialog_new(e_container_current_get(e_manager_current_get())); 72 "interface of the Enlightenment 0.17.0 module system. Please<br>"
82 if (!dia) return 0; 73 "ignore this module unless you are working on the module system."));
83 e_dialog_title_set(dia, "Enlightenment Test Module");
84 e_dialog_icon_set(dia, "enlightenment/e", 64);
85 e_dialog_text_set(dia, _("This module is VERY simple and is only used to test the basic<br>"
86 "interface of the Enlightenment 0.17.0 module system. Please<br>"
87 "ignore this module unless you are working on the module system."));
88 e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
89 e_win_centered_set(dia->win, 1);
90 e_dialog_show(dia);
91 return 1; 74 return 1;
92} 75}