summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-14 14:30:42 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 17:59:39 +0200
commit9f3fcf22258b43bdb4662be2dcd7c852fce7af2b (patch)
tree49af61b4c6b74b357ce4c606d609148e03fa33be /src
parent28080ccc046996f5b948e7f93b16b3380e7eb934 (diff)
tree-wide: get rid of trailing whitespace
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11826
Diffstat (limited to 'src')
-rw-r--r--src/modules/conf_display/e_int_config_desks.c16
-rw-r--r--src/modules/conf_display/e_int_config_screensaver.c26
-rw-r--r--src/modules/conf_display/e_mod_main.c36
-rw-r--r--src/modules/conf_interaction/e_int_config_interaction.c38
-rw-r--r--src/modules/conf_interaction/e_int_config_mouse.c4
-rw-r--r--src/modules/conf_interaction/e_mod_main.c16
-rw-r--r--src/modules/conf_menus/e_int_config_menus.c70
-rw-r--r--src/modules/conf_paths/e_int_config_paths.c54
8 files changed, 130 insertions, 130 deletions
diff --git a/src/modules/conf_display/e_int_config_desks.c b/src/modules/conf_display/e_int_config_desks.c
index 92004a998..0f2966b3c 100644
--- a/src/modules/conf_display/e_int_config_desks.c
+++ b/src/modules/conf_display/e_int_config_desks.c
@@ -31,10 +31,10 @@ e_int_config_desks(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUS
31{ 31{
32 E_Config_Dialog *cfd; 32 E_Config_Dialog *cfd;
33 E_Config_Dialog_View *v; 33 E_Config_Dialog_View *v;
34 34
35 if (e_config_dialog_find("E", "screen/virtual_desktops")) return NULL; 35 if (e_config_dialog_find("E", "screen/virtual_desktops")) return NULL;
36 v = E_NEW(E_Config_Dialog_View, 1); 36 v = E_NEW(E_Config_Dialog_View, 1);
37 37
38 /* methods */ 38 /* methods */
39 v->create_cfdata = _create_data; 39 v->create_cfdata = _create_data;
40 v->free_cfdata = _free_data; 40 v->free_cfdata = _free_data;
@@ -126,7 +126,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
126 if (cfdata->flip_mode) 126 if (cfdata->flip_mode)
127 e_config->desk_flip_animate_type = eina_stringshare_ref(eina_list_nth(cfdata->comp_effects, cfdata->flip_mode)); 127 e_config->desk_flip_animate_type = eina_stringshare_ref(eina_list_nth(cfdata->comp_effects, cfdata->flip_mode));
128 e_config->desk_flip_animate_interpolation = cfdata->flip_interp; 128 e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
129 129
130 e_config->edge_flip_dragging = cfdata->edge_flip_dragging; 130 e_config->edge_flip_dragging = cfdata->edge_flip_dragging;
131 e_config->desk_flip_wrap = cfdata->flip_wrap; 131 e_config->desk_flip_wrap = cfdata->flip_wrap;
132 132
@@ -167,7 +167,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
167 int mode = 0; 167 int mode = 0;
168 168
169 otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale)); 169 otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
170 170
171 of = e_widget_frametable_add(evas, _("Number of Desktops"), 0); 171 of = e_widget_frametable_add(evas, _("Number of Desktops"), 0);
172 e_widget_frametable_content_align_set(of, 0.5, 0.0); 172 e_widget_frametable_content_align_set(of, 0.5, 0.0);
173 173
@@ -178,12 +178,12 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
178 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); 178 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
179 cfdata->preview = ob; 179 cfdata->preview = ob;
180 180
181 ob = e_widget_slider_add(evas, 0, 0, _("%1.0f"), 1.0, 12.0, 1.0, 0, NULL, 181 ob = e_widget_slider_add(evas, 0, 0, _("%1.0f"), 1.0, 12.0, 1.0, 0, NULL,
182 &(cfdata->y), 150); 182 &(cfdata->y), 150);
183 e_widget_on_change_hook_set(ob, _cb_slider_change, cfdata); 183 e_widget_on_change_hook_set(ob, _cb_slider_change, cfdata);
184 e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 0, 1); 184 e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 0, 1);
185 185
186 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 12.0, 1.0, 0, NULL, 186 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 12.0, 1.0, 0, NULL,
187 &(cfdata->x), 200); 187 &(cfdata->x), 200);
188 e_widget_on_change_hook_set(ob, _cb_slider_change, cfdata); 188 e_widget_on_change_hook_set(ob, _cb_slider_change, cfdata);
189 e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0); 189 e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
@@ -193,11 +193,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
193 193
194 o = e_widget_list_add(evas, 0, 0); 194 o = e_widget_list_add(evas, 0, 0);
195 195
196 ob = e_widget_check_add(evas, _("Flip when dragging objects to the screen edge"), 196 ob = e_widget_check_add(evas, _("Flip when dragging objects to the screen edge"),
197 &(cfdata->edge_flip_dragging)); 197 &(cfdata->edge_flip_dragging));
198 e_widget_list_object_append(o, ob, 1, 1, 0.); 198 e_widget_list_object_append(o, ob, 1, 1, 0.);
199 199
200 ob = e_widget_check_add(evas, _("Wrap desktops around when flipping"), 200 ob = e_widget_check_add(evas, _("Wrap desktops around when flipping"),
201 &(cfdata->flip_wrap)); 201 &(cfdata->flip_wrap));
202 e_widget_list_object_append(o, ob, 1, 0, 0.5); 202 e_widget_list_object_append(o, ob, 1, 0, 0.5);
203 203
diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c
index 763a8a466..ebf6dc57b 100644
--- a/src/modules/conf_display/e_int_config_screensaver.c
+++ b/src/modules/conf_display/e_int_config_screensaver.c
@@ -24,7 +24,7 @@ struct _E_Config_Dialog_Data
24 double desklock_timeout; 24 double desklock_timeout;
25 int ask_presentation; 25 int ask_presentation;
26 double ask_presentation_timeout; 26 double ask_presentation_timeout;
27 27
28 int screensaver_suspend; 28 int screensaver_suspend;
29 int screensaver_hibernate; 29 int screensaver_hibernate;
30 int screensaver_suspend_on_ac; 30 int screensaver_suspend_on_ac;
@@ -37,7 +37,7 @@ struct _E_Config_Dialog_Data
37 int no_dpms_on_fullscreen; 37 int no_dpms_on_fullscreen;
38 int use_dpms; 38 int use_dpms;
39 39
40 struct 40 struct
41 { 41 {
42 Evas_Object *ask_presentation_slider; 42 Evas_Object *ask_presentation_slider;
43 Evas_Object *slider_suspend_seconds; 43 Evas_Object *slider_suspend_seconds;
@@ -144,14 +144,14 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
144 e_config->dpms_suspend_timeout = e_config->screensaver_timeout; 144 e_config->dpms_suspend_timeout = e_config->screensaver_timeout;
145 e_config->dpms_off_timeout = e_config->screensaver_timeout; 145 e_config->dpms_off_timeout = e_config->screensaver_timeout;
146 } 146 }
147 147
148 e_config->no_dpms_on_fullscreen = cfdata->no_dpms_on_fullscreen; 148 e_config->no_dpms_on_fullscreen = cfdata->no_dpms_on_fullscreen;
149 e_config->screensaver_dpms_off = !cfdata->use_dpms; 149 e_config->screensaver_dpms_off = !cfdata->use_dpms;
150 150
151 /* Apply settings */ 151 /* Apply settings */
152 e_screensaver_update(); 152 e_screensaver_update();
153 e_dpms_update(); 153 e_dpms_update();
154 154
155 e_config_save_queue(); 155 e_config_save_queue();
156 return 1; 156 return 1;
157} 157}
@@ -201,7 +201,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
201 oc2 = e_widget_check_add(evas, _("Use Power Saving (DPMS)"), 201 oc2 = e_widget_check_add(evas, _("Use Power Saving (DPMS)"),
202 &(cfdata->use_dpms)); 202 &(cfdata->use_dpms));
203 e_widget_list_object_append(ol, oc2, 1, 1, 0.5); 203 e_widget_list_object_append(ol, oc2, 1, 1, 0.5);
204 204
205 ow = e_widget_label_add(evas, _("Timeout")); 205 ow = e_widget_label_add(evas, _("Timeout"));
206 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 206 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
207 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 207 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
@@ -209,7 +209,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
209 0.1, 60.0, 0.1, 0, &(cfdata->timeout), NULL, 100); 209 0.1, 60.0, 0.1, 0, &(cfdata->timeout), NULL, 100);
210 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 210 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
211 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 211 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
212 212
213 ow = e_widget_label_add(evas, _("Special timeout when locked (0 is off)")); 213 ow = e_widget_label_add(evas, _("Special timeout when locked (0 is off)"));
214 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 214 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
215 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 215 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
@@ -217,8 +217,8 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
217 0.0, 60.0, 1.0, 0, &(cfdata->desklock_timeout), NULL, 100); 217 0.0, 60.0, 1.0, 0, &(cfdata->desklock_timeout), NULL, 100);
218 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 218 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
219 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 219 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
220 220
221 ow = e_widget_check_add(evas, _("Suspend on blank"), 221 ow = e_widget_check_add(evas, _("Suspend on blank"),
222 &(cfdata->screensaver_suspend)); 222 &(cfdata->screensaver_suspend));
223 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 223 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
224 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 224 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
@@ -232,7 +232,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
232 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 232 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
233 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 233 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
234 234
235 235
236 ow = e_widget_label_add(evas, _("Suspend delay")); 236 ow = e_widget_label_add(evas, _("Suspend delay"));
237 e_widget_check_widget_disable_on_unchecked_add(oc, ow); 237 e_widget_check_widget_disable_on_unchecked_add(oc, ow);
238 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 238 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
@@ -254,7 +254,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
254 &(cfdata->no_dpms_on_fullscreen)); 254 &(cfdata->no_dpms_on_fullscreen));
255 e_widget_list_object_append(ol, oc, 1, 1, 0.5); 255 e_widget_list_object_append(ol, oc, 1, 1, 0.5);
256 256
257 e_widget_toolbook_page_append(otb, NULL, _("Blanking"), ol, 257 e_widget_toolbook_page_append(otb, NULL, _("Blanking"), ol,
258 1, 1, 1, 0, 0.0, 0.0); 258 1, 1, 1, 0, 0.0, 0.0);
259 259
260 /* Wakeups */ 260 /* Wakeups */
@@ -269,7 +269,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
269 1, 1, 1, 0, 0.0, 0.0); 269 1, 1, 1, 0, 0.0, 0.0);
270 /* Presentation */ 270 /* Presentation */
271 ol = e_widget_list_add(evas, 0, 0); 271 ol = e_widget_list_add(evas, 0, 0);
272 oc2 = e_widget_check_add(evas, _("Suggest if deactivated before"), 272 oc2 = e_widget_check_add(evas, _("Suggest if deactivated before"),
273 &(cfdata->ask_presentation)); 273 &(cfdata->ask_presentation));
274 e_widget_check_widget_disable_on_unchecked_add(oc, oc2); 274 e_widget_check_widget_disable_on_unchecked_add(oc, oc2);
275 e_widget_list_object_append(ol, oc2, 1, 1, 0.5); 275 e_widget_list_object_append(ol, oc2, 1, 1, 0.5);
@@ -283,7 +283,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
283 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 283 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
284 e_widget_toolbook_page_append(otb, NULL, _("Presentation"), ol, 284 e_widget_toolbook_page_append(otb, NULL, _("Presentation"), ol,
285 1, 1, 1, 0, 0.0, 0.0); 285 1, 1, 1, 0, 0.0, 0.0);
286 286
287 e_widget_toolbook_page_show(otb, 0); 287 e_widget_toolbook_page_show(otb, 0);
288 288
289 return otb; 289 return otb;
diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c
index e19bba899..09766e445 100644
--- a/src/modules/conf_display/e_mod_main.c
+++ b/src/modules/conf_display/e_mod_main.c
@@ -14,37 +14,37 @@ E_API E_Module_Api e_modapi =
14E_API void * 14E_API void *
15e_modapi_init(E_Module *m) 15e_modapi_init(E_Module *m)
16{ 16{
17 e_configure_registry_category_add("screen", 30, _("Screen"), NULL, 17 e_configure_registry_category_add("screen", 30, _("Screen"), NULL,
18 "preferences-desktop-display"); 18 "preferences-desktop-display");
19 19
20 e_configure_registry_item_add("screen/virtual_desktops", 10, 20 e_configure_registry_item_add("screen/virtual_desktops", 10,
21 _("Virtual Desktops"), NULL, 21 _("Virtual Desktops"), NULL,
22 "preferences-desktop", e_int_config_desks); 22 "preferences-desktop", e_int_config_desks);
23// e_configure_registry_item_add("screen/screen_resolution", 20, 23// e_configure_registry_item_add("screen/screen_resolution", 20,
24// _("Screen Resolution"), NULL, 24// _("Screen Resolution"), NULL,
25// "preferences-system-screen-resolution", 25// "preferences-system-screen-resolution",
26// e_int_config_display); 26// e_int_config_display);
27 e_configure_registry_item_add("screen/screen_lock", 30, 27 e_configure_registry_item_add("screen/screen_lock", 30,
28 _("Screen Lock"), NULL, 28 _("Screen Lock"), NULL,
29 "preferences-system-lock-screen", 29 "preferences-system-lock-screen",
30 e_int_config_desklock); 30 e_int_config_desklock);
31 e_configure_registry_item_add("screen/screen_saver", 40, 31 e_configure_registry_item_add("screen/screen_saver", 40,
32 _("Blanking"), NULL, 32 _("Blanking"), NULL,
33 "preferences-desktop-screensaver", 33 "preferences-desktop-screensaver",
34 e_int_config_screensaver); 34 e_int_config_screensaver);
35 e_configure_registry_item_add("screen/power_management", 50, 35 e_configure_registry_item_add("screen/power_management", 50,
36 _("Backlight"), NULL, 36 _("Backlight"), NULL,
37 "preferences-system-power-management", 37 "preferences-system-power-management",
38 e_int_config_dpms); 38 e_int_config_dpms);
39 39
40 e_configure_registry_category_add("internal", -1, _("Internal"), NULL, 40 e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
41 "enlightenment/internal"); 41 "enlightenment/internal");
42 42
43 e_configure_registry_item_add("internal/desk", -1, 43 e_configure_registry_item_add("internal/desk", -1,
44 _("Desk"), NULL, 44 _("Desk"), NULL,
45 "preferences-system-windows", 45 "preferences-system-windows",
46 e_int_config_desk); 46 e_int_config_desk);
47 47
48 conf_module = m; 48 conf_module = m;
49 return m; 49 return m;
50} 50}
@@ -56,18 +56,18 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
56 56
57 while ((cfd = e_config_dialog_get("E", "internal/desk"))) 57 while ((cfd = e_config_dialog_get("E", "internal/desk")))
58 e_object_del(E_OBJECT(cfd)); 58 e_object_del(E_OBJECT(cfd));
59 59
60 e_configure_registry_item_del("internal/desk"); 60 e_configure_registry_item_del("internal/desk");
61 61
62 e_configure_registry_category_del("internal"); 62 e_configure_registry_category_del("internal");
63 63
64 while ((cfd = e_config_dialog_get("E", "screen/power_management"))) 64 while ((cfd = e_config_dialog_get("E", "screen/power_management")))
65 e_object_del(E_OBJECT(cfd)); 65 e_object_del(E_OBJECT(cfd));
66 while ((cfd = e_config_dialog_get("E", "screen/screen_saver"))) 66 while ((cfd = e_config_dialog_get("E", "screen/screen_saver")))
67 e_object_del(E_OBJECT(cfd)); 67 e_object_del(E_OBJECT(cfd));
68 while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) 68 while ((cfd = e_config_dialog_get("E", "screen/screen_lock")))
69 e_object_del(E_OBJECT(cfd)); 69 e_object_del(E_OBJECT(cfd));
70// while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) 70// while ((cfd = e_config_dialog_get("E", "screen/screen_resolution")))
71// e_object_del(E_OBJECT(cfd)); 71// e_object_del(E_OBJECT(cfd));
72 while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops"))) 72 while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops")))
73 e_object_del(E_OBJECT(cfd)); 73 e_object_del(E_OBJECT(cfd));
@@ -77,7 +77,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
77 e_configure_registry_item_del("screen/screen_lock"); 77 e_configure_registry_item_del("screen/screen_lock");
78// e_configure_registry_item_del("screen/screen_resolution"); 78// e_configure_registry_item_del("screen/screen_resolution");
79 e_configure_registry_item_del("screen/virtual_desktops"); 79 e_configure_registry_item_del("screen/virtual_desktops");
80 80
81 e_configure_registry_category_del("screen"); 81 e_configure_registry_category_del("screen");
82 conf_module = NULL; 82 conf_module = NULL;
83 return 1; 83 return 1;
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index cbbfdab86..4e597b3e5 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -7,7 +7,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
7static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); 7static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
8static void _enabled_cb(void *data, Evas_Object *obj, void *event_info); 8static void _enabled_cb(void *data, Evas_Object *obj, void *event_info);
9 9
10struct _E_Config_Dialog_Data 10struct _E_Config_Dialog_Data
11{ 11{
12 Evas_Object *l1, *l2, *l3, *sl1, *sl2, *sl3; 12 Evas_Object *l1, *l2, *l3, *sl1, *sl2, *sl3;
13 int thumbscroll_enable; 13 int thumbscroll_enable;
@@ -17,15 +17,15 @@ struct _E_Config_Dialog_Data
17}; 17};
18 18
19E_Config_Dialog * 19E_Config_Dialog *
20e_int_config_interaction(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) 20e_int_config_interaction(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
21{ 21{
22 E_Config_Dialog *cfd; 22 E_Config_Dialog *cfd;
23 E_Config_Dialog_View *v; 23 E_Config_Dialog_View *v;
24 24
25 if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) 25 if (e_config_dialog_find("E", "keyboard_and_mouse/interaction"))
26 return NULL; 26 return NULL;
27 v = E_NEW(E_Config_Dialog_View, 1); 27 v = E_NEW(E_Config_Dialog_View, 1);
28 28
29 v->create_cfdata = _create_data; 29 v->create_cfdata = _create_data;
30 v->free_cfdata = _free_data; 30 v->free_cfdata = _free_data;
31 v->basic.apply_cfdata = _basic_apply; 31 v->basic.apply_cfdata = _basic_apply;
@@ -40,33 +40,33 @@ e_int_config_interaction(Evas_Object *parent EINA_UNUSED, const char *params EIN
40} 40}
41 41
42static void 42static void
43_fill_data(E_Config_Dialog_Data *cfdata) 43_fill_data(E_Config_Dialog_Data *cfdata)
44{ 44{
45 cfdata->thumbscroll_enable = e_config->thumbscroll_enable; 45 cfdata->thumbscroll_enable = e_config->thumbscroll_enable;
46 cfdata->thumbscroll_threshhold = e_config->thumbscroll_threshhold; 46 cfdata->thumbscroll_threshhold = e_config->thumbscroll_threshhold;
47 cfdata->thumbscroll_momentum_threshhold = 47 cfdata->thumbscroll_momentum_threshhold =
48 e_config->thumbscroll_momentum_threshhold; 48 e_config->thumbscroll_momentum_threshhold;
49 cfdata->thumbscroll_friction = e_config->thumbscroll_friction; 49 cfdata->thumbscroll_friction = e_config->thumbscroll_friction;
50} 50}
51 51
52static void * 52static void *
53_create_data(E_Config_Dialog *cfd EINA_UNUSED) 53_create_data(E_Config_Dialog *cfd EINA_UNUSED)
54{ 54{
55 E_Config_Dialog_Data *cfdata; 55 E_Config_Dialog_Data *cfdata;
56 56
57 cfdata = E_NEW(E_Config_Dialog_Data, 1); 57 cfdata = E_NEW(E_Config_Dialog_Data, 1);
58 _fill_data(cfdata); 58 _fill_data(cfdata);
59 return cfdata; 59 return cfdata;
60} 60}
61 61
62static void 62static void
63_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 63_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
64{ 64{
65 E_FREE(cfdata); 65 E_FREE(cfdata);
66} 66}
67 67
68static int 68static int
69_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 69_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
70{ 70{
71 return ((cfdata->thumbscroll_enable != e_config->thumbscroll_enable) || 71 return ((cfdata->thumbscroll_enable != e_config->thumbscroll_enable) ||
72 (cfdata->thumbscroll_threshhold != e_config->thumbscroll_threshhold) || 72 (cfdata->thumbscroll_threshhold != e_config->thumbscroll_threshhold) ||
@@ -75,11 +75,11 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd
75} 75}
76 76
77static int 77static int
78_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 78_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
79{ 79{
80 e_config->thumbscroll_enable = cfdata->thumbscroll_enable; 80 e_config->thumbscroll_enable = cfdata->thumbscroll_enable;
81 e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold; 81 e_config->thumbscroll_threshhold = cfdata->thumbscroll_threshhold;
82 e_config->thumbscroll_momentum_threshhold = 82 e_config->thumbscroll_momentum_threshhold =
83 cfdata->thumbscroll_momentum_threshhold; 83 cfdata->thumbscroll_momentum_threshhold;
84 e_config->thumbscroll_friction = cfdata->thumbscroll_friction; 84 e_config->thumbscroll_friction = cfdata->thumbscroll_friction;
85 e_config_save_queue(); 85 e_config_save_queue();
@@ -87,14 +87,14 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
87} 87}
88 88
89static Evas_Object * 89static Evas_Object *
90_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) 90_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
91{ 91{
92 Evas_Object *o, *of, *ob; 92 Evas_Object *o, *of, *ob;
93 93
94 o = e_widget_list_add(evas, 0, 0); 94 o = e_widget_list_add(evas, 0, 0);
95 of = e_widget_framelist_add(evas, _("Thumbscroll"), 0); 95 of = e_widget_framelist_add(evas, _("Thumbscroll"), 0);
96 96
97 ob = e_widget_check_add(evas, _("Enable Thumbscroll"), 97 ob = e_widget_check_add(evas, _("Enable Thumbscroll"),
98 &(cfdata->thumbscroll_enable)); 98 &(cfdata->thumbscroll_enable));
99 e_widget_framelist_object_append(of, ob); 99 e_widget_framelist_object_append(of, ob);
100 evas_object_smart_callback_add(ob, "changed", _enabled_cb, cfdata); 100 evas_object_smart_callback_add(ob, "changed", _enabled_cb, cfdata);
@@ -102,7 +102,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
102 ob = e_widget_label_add(evas, _("Threshold for a thumb drag")); 102 ob = e_widget_label_add(evas, _("Threshold for a thumb drag"));
103 e_widget_framelist_object_append(of, ob); 103 e_widget_framelist_object_append(of, ob);
104 cfdata->l1 = ob; 104 cfdata->l1 = ob;
105 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 0, 64, 4, 0, NULL, 105 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 0, 64, 4, 0, NULL,
106 &(cfdata->thumbscroll_threshhold), 100); 106 &(cfdata->thumbscroll_threshhold), 100);
107 e_widget_framelist_object_append(of, ob); 107 e_widget_framelist_object_append(of, ob);
108 cfdata->sl1 = ob; 108 cfdata->sl1 = ob;
@@ -110,8 +110,8 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
110 ob = e_widget_label_add(evas, _("Threshold for applying drag momentum")); 110 ob = e_widget_label_add(evas, _("Threshold for applying drag momentum"));
111 e_widget_framelist_object_append(of, ob); 111 e_widget_framelist_object_append(of, ob);
112 cfdata->l2 = ob; 112 cfdata->l2 = ob;
113 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels/s"), 0, 2000, 20, 0, 113 ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels/s"), 0, 2000, 20, 0,
114 &(cfdata->thumbscroll_momentum_threshhold), 114 &(cfdata->thumbscroll_momentum_threshhold),
115 NULL, 100); 115 NULL, 100);
116 e_widget_framelist_object_append(of, ob); 116 e_widget_framelist_object_append(of, ob);
117 cfdata->sl2 = ob; 117 cfdata->sl2 = ob;
@@ -119,7 +119,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
119 ob = e_widget_label_add(evas, _("Friction slowdown")); 119 ob = e_widget_label_add(evas, _("Friction slowdown"));
120 e_widget_framelist_object_append(of, ob); 120 e_widget_framelist_object_append(of, ob);
121 cfdata->l3 = ob; 121 cfdata->l3 = ob;
122 ob = e_widget_slider_add(evas, 1, 0, _("%1.2f s"), 0.00, 5.0, 0.1, 0, 122 ob = e_widget_slider_add(evas, 1, 0, _("%1.2f s"), 0.00, 5.0, 0.1, 0,
123 &(cfdata->thumbscroll_friction), NULL, 100); 123 &(cfdata->thumbscroll_friction), NULL, 100);
124 e_widget_framelist_object_append(of, ob); 124 e_widget_framelist_object_append(of, ob);
125 cfdata->sl3 = ob; 125 cfdata->sl3 = ob;
diff --git a/src/modules/conf_interaction/e_int_config_mouse.c b/src/modules/conf_interaction/e_int_config_mouse.c
index e388a8c14..258807828 100644
--- a/src/modules/conf_interaction/e_int_config_mouse.c
+++ b/src/modules/conf_interaction/e_int_config_mouse.c
@@ -192,7 +192,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
192 cfdata->gui.idle_cursor = ob; 192 cfdata->gui.idle_cursor = ob;
193 193
194 e_widget_list_object_append(ol, of, 1, 0, 0.5); 194 e_widget_list_object_append(ol, of, 1, 0, 0.5);
195 e_widget_toolbook_page_append(otb, NULL, _("Cursor"), ol, 195 e_widget_toolbook_page_append(otb, NULL, _("Cursor"), ol,
196 1, 0, 1, 0, 0.5, 0.0); 196 1, 0, 1, 0, 0.5, 0.0);
197 197
198 /* Mouse */ 198 /* Mouse */
@@ -243,7 +243,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
243#endif 243#endif
244 244
245 e_widget_list_object_append(ol, of, 1, 0, 0.5); 245 e_widget_list_object_append(ol, of, 1, 0, 0.5);
246 e_widget_toolbook_page_append(otb, NULL, _("Mouse"), ol, 246 e_widget_toolbook_page_append(otb, NULL, _("Mouse"), ol,
247 1, 0, 1, 0, 0.5, 0.0); 247 1, 0, 1, 0, 0.5, 0.0);
248 248
249 e_widget_toolbook_page_show(otb, 0); 249 e_widget_toolbook_page_show(otb, 0);
diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c
index 5bc40b927..bce81760d 100644
--- a/src/modules/conf_interaction/e_mod_main.c
+++ b/src/modules/conf_interaction/e_mod_main.c
@@ -14,11 +14,11 @@ E_API E_Module_Api e_modapi =
14E_API void * 14E_API void *
15e_modapi_init(E_Module *m) 15e_modapi_init(E_Module *m)
16{ 16{
17 e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), 17 e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"),
18 NULL, "preferences-behavior"); 18 NULL, "preferences-behavior");
19 e_configure_registry_item_add("keyboard_and_mouse/interaction", 40, 19 e_configure_registry_item_add("keyboard_and_mouse/interaction", 40,
20 _("Touch"), NULL, 20 _("Touch"), NULL,
21 "preferences-interaction", 21 "preferences-interaction",
22 e_int_config_interaction); 22 e_int_config_interaction);
23 e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 50, 23 e_configure_registry_item_add("keyboard_and_mouse/mouse_settings", 50,
24 _("Mouse"), NULL, 24 _("Mouse"), NULL,
@@ -35,14 +35,14 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
35 35
36 while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings"))) 36 while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_settings")))
37 e_object_del(E_OBJECT(cfd)); 37 e_object_del(E_OBJECT(cfd));
38 while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction"))) 38 while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/interaction")))
39 e_object_del(E_OBJECT(cfd)); 39 e_object_del(E_OBJECT(cfd));
40 40
41 e_configure_registry_item_del("keyboard_and_mouse/mouse_settings"); 41 e_configure_registry_item_del("keyboard_and_mouse/mouse_settings");
42 e_configure_registry_item_del("keyboard_and_mouse/interaction"); 42 e_configure_registry_item_del("keyboard_and_mouse/interaction");
43 43
44 e_configure_registry_category_del("keyboard_and_mouse"); 44 e_configure_registry_category_del("keyboard_and_mouse");
45 45
46 conf_module = NULL; 46 conf_module = NULL;
47 return 1; 47 return 1;
48} 48}
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index 50ca96d95..50a296142 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -1,7 +1,7 @@
1#include "e.h" 1#include "e.h"
2 2
3/* local structures */ 3/* local structures */
4struct _E_Config_Dialog_Data 4struct _E_Config_Dialog_Data
5{ 5{
6 int show_favs, show_apps, hide_icons; 6 int show_favs, show_apps, hide_icons;
7 int show_name, show_generic, show_comment; 7 int show_name, show_generic, show_comment;
@@ -21,7 +21,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
21static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); 21static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
22 22
23E_Config_Dialog * 23E_Config_Dialog *
24e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) 24e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
25{ 25{
26 E_Config_Dialog *cfd; 26 E_Config_Dialog *cfd;
27 E_Config_Dialog_View *v; 27 E_Config_Dialog_View *v;
@@ -35,7 +35,7 @@ e_int_config_menus(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUS
35 v->basic.apply_cfdata = _basic_apply; 35 v->basic.apply_cfdata = _basic_apply;
36 v->basic.check_changed = _basic_check_changed; 36 v->basic.check_changed = _basic_check_changed;
37 37
38 cfd = e_config_dialog_new(NULL, _("Menu Settings"), "E", "menus/menu_settings", 38 cfd = e_config_dialog_new(NULL, _("Menu Settings"), "E", "menus/menu_settings",
39 "preferences-menus", 0, v, NULL); 39 "preferences-menus", 0, v, NULL);
40 return cfd; 40 return cfd;
41} 41}
@@ -55,7 +55,7 @@ static void
55_fill_data(E_Config_Dialog_Data *cfdata EINA_UNUSED) 55_fill_data(E_Config_Dialog_Data *cfdata EINA_UNUSED)
56{ 56{
57 if (e_config->default_system_menu) 57 if (e_config->default_system_menu)
58 cfdata->default_system_menu = 58 cfdata->default_system_menu =
59 eina_stringshare_add(e_config->default_system_menu); 59 eina_stringshare_add(e_config->default_system_menu);
60 else 60 else
61 cfdata->default_system_menu = NULL; 61 cfdata->default_system_menu = NULL;
@@ -67,7 +67,7 @@ _fill_data(E_Config_Dialog_Data *cfdata EINA_UNUSED)
67 cfdata->show_comment = e_config->menu_eap_comment_show; 67 cfdata->show_comment = e_config->menu_eap_comment_show;
68 cfdata->menu_gadcon_client_toplevel = e_config->menu_gadcon_client_toplevel; 68 cfdata->menu_gadcon_client_toplevel = e_config->menu_gadcon_client_toplevel;
69 cfdata->scroll_speed = e_config->menus_scroll_speed; 69 cfdata->scroll_speed = e_config->menus_scroll_speed;
70 cfdata->fast_mouse_move_threshhold = 70 cfdata->fast_mouse_move_threshhold =
71 e_config->menus_fast_mouse_move_threshhold; 71 e_config->menus_fast_mouse_move_threshhold;
72 cfdata->click_drag_timeout = e_config->menus_click_drag_timeout; 72 cfdata->click_drag_timeout = e_config->menus_click_drag_timeout;
73 cfdata->autoscroll_margin = e_config->menu_autoscroll_margin; 73 cfdata->autoscroll_margin = e_config->menu_autoscroll_margin;
@@ -77,7 +77,7 @@ _fill_data(E_Config_Dialog_Data *cfdata EINA_UNUSED)
77static void 77static void
78_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 78_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
79{ 79{
80 if (cfdata->default_system_menu) 80 if (cfdata->default_system_menu)
81 eina_stringshare_del(cfdata->default_system_menu); 81 eina_stringshare_del(cfdata->default_system_menu);
82 E_FREE(cfdata); 82 E_FREE(cfdata);
83} 83}
@@ -87,7 +87,7 @@ check_menu_dir(const char *dir, Eina_List **menus)
87{ 87{
88 char buf[PATH_MAX], *file; 88 char buf[PATH_MAX], *file;
89 Eina_List *files; 89 Eina_List *files;
90 90
91 snprintf(buf, sizeof(buf), "%s/menus", dir); 91 snprintf(buf, sizeof(buf), "%s/menus", dir);
92 files = ecore_file_ls(buf); 92 files = ecore_file_ls(buf);
93 EINA_LIST_FREE(files, file) 93 EINA_LIST_FREE(files, file)
@@ -100,7 +100,7 @@ check_menu_dir(const char *dir, Eina_List **menus)
100 free(file); 100 free(file);
101 } 101 }
102} 102}
103 103
104void 104void
105get_menus(Eina_List **menus) 105get_menus(Eina_List **menus)
106{ 106{
@@ -120,12 +120,12 @@ get_menus(Eina_List **menus)
120 NULL 120 NULL
121 }; 121 };
122 int i, newdir; 122 int i, newdir;
123 123
124 e_user_homedir_concat(buf, sizeof(buf), ".config"); 124 e_user_homedir_concat(buf, sizeof(buf), ".config");
125 check_menu_dir(buf, menus); 125 check_menu_dir(buf, menus);
126 126
127 for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i], menus); 127 for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i], menus);
128 128
129 newdir = 1; 129 newdir = 1;
130 snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get()); 130 snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get());
131 for (i = 0; dirs[i]; i++) 131 for (i = 0; dirs[i]; i++)
@@ -146,24 +146,24 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata)
146 Evas_Object *ob; 146 Evas_Object *ob;
147 char *file; 147 char *file;
148 int sel = -1, i = 0; 148 int sel = -1, i = 0;
149 149
150 get_menus(&menus); 150 get_menus(&menus);
151 ob = e_widget_ilist_add(evas, (32 * e_scale), (32 * e_scale), 151 ob = e_widget_ilist_add(evas, (32 * e_scale), (32 * e_scale),
152 &(cfdata->default_system_menu)); 152 &(cfdata->default_system_menu));
153 e_widget_size_min_set(ob, (100 * e_scale), (140 * e_scale)); 153 e_widget_size_min_set(ob, (100 * e_scale), (140 * e_scale));
154 e_widget_ilist_freeze(ob); 154 e_widget_ilist_freeze(ob);
155 155
156 EINA_LIST_FREE(menus, file) 156 EINA_LIST_FREE(menus, file)
157 { 157 {
158 char buf[PATH_MAX], buf2[PATH_MAX], *p, *p2, *tlabel, *tdesc; 158 char buf[PATH_MAX], buf2[PATH_MAX], *p, *p2, *tlabel, *tdesc;
159 const char *label; 159 const char *label;
160 160
161 label = file; 161 label = file;
162 tlabel = NULL; 162 tlabel = NULL;
163 tdesc = NULL; 163 tdesc = NULL;
164 e_user_homedir_concat(buf, sizeof(buf), 164 e_user_homedir_concat(buf, sizeof(buf),
165 ".config/menus/applications.menu"); 165 ".config/menus/applications.menu");
166 snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/e-applications.menu", 166 snprintf(buf2, sizeof(buf2), "%s/etc/xdg/menus/e-applications.menu",
167 e_prefix_get()); 167 e_prefix_get());
168 if (!strcmp("/etc/xdg/menus/applications.menu", file)) 168 if (!strcmp("/etc/xdg/menus/applications.menu", file))
169 { 169 {
@@ -241,9 +241,9 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata)
241 } 241 }
242 e_widget_ilist_go(ob); 242 e_widget_ilist_go(ob);
243 e_widget_ilist_thaw(ob); 243 e_widget_ilist_thaw(ob);
244 244
245 if (sel >= 0) e_widget_ilist_selected_set(ob, sel); 245 if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
246 246
247 return ob; 247 return ob;
248} 248}
249 249
@@ -256,23 +256,23 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
256 otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale)); 256 otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
257 257
258 ol = e_widget_list_add(evas, 0, 0); 258 ol = e_widget_list_add(evas, 0, 0);
259 of = e_widget_framelist_add(evas, _("Main Menu"), 0); 259 of = e_widget_framelist_add(evas, _("Main Menu"), 0);
260 ow = e_widget_check_add(evas, _("Favorites"), &(cfdata->show_favs)); 260 ow = e_widget_check_add(evas, _("Favorites"), &(cfdata->show_favs));
261 e_widget_framelist_object_append(of, ow); 261 e_widget_framelist_object_append(of, ow);
262 ow = e_widget_check_add(evas, _("Applications"), &(cfdata->show_apps)); 262 ow = e_widget_check_add(evas, _("Applications"), &(cfdata->show_apps));
263 e_widget_framelist_object_append(of, ow); 263 e_widget_framelist_object_append(of, ow);
264 e_widget_list_object_append(ol, of, 1, 0, 0.5); 264 e_widget_list_object_append(ol, of, 1, 0, 0.5);
265 265
266 of = e_widget_framelist_add(evas, _("Applications Display"), 0); 266 of = e_widget_framelist_add(evas, _("Applications Display"), 0);
267 ow = e_widget_check_add(evas, _("Name"), &(cfdata->show_name)); 267 ow = e_widget_check_add(evas, _("Name"), &(cfdata->show_name));
268 e_widget_framelist_object_append(of, ow); 268 e_widget_framelist_object_append(of, ow);
269 ow = e_widget_check_add(evas, _("Generic"), &(cfdata->show_generic)); 269 ow = e_widget_check_add(evas, _("Generic"), &(cfdata->show_generic));
270 e_widget_framelist_object_append(of, ow); 270 e_widget_framelist_object_append(of, ow);
271 ow = e_widget_check_add(evas, _("Comments"), &(cfdata->show_comment)); 271 ow = e_widget_check_add(evas, _("Comments"), &(cfdata->show_comment));
272 e_widget_framelist_object_append(of, ow); 272 e_widget_framelist_object_append(of, ow);
273 e_widget_list_object_append(ol, of, 1, 0, 0.5); 273 e_widget_list_object_append(ol, of, 1, 0, 0.5);
274 274
275 of = e_widget_framelist_add(evas, _("Gadgets"), 0); 275 of = e_widget_framelist_add(evas, _("Gadgets"), 0);
276 ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel)); 276 ow = e_widget_check_add(evas, _("Show gadget settings in top-level"), &(cfdata->menu_gadcon_client_toplevel));
277 e_widget_framelist_object_append(of, ow); 277 e_widget_framelist_object_append(of, ow);
278 e_widget_list_object_append(ol, of, 1, 1, 0.5); 278 e_widget_list_object_append(ol, of, 1, 1, 0.5);
@@ -280,18 +280,18 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
280 280
281 ol = e_widget_list_add(evas, 0, 0); 281 ol = e_widget_list_add(evas, 0, 0);
282 ow = _create_menus_list(evas, cfdata); 282 ow = _create_menus_list(evas, cfdata);
283 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 283 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
284 e_widget_toolbook_page_append(otb, NULL, _("Applications"), ol, 1, 1, 1, 1, 0.0, 0.0); 284 e_widget_toolbook_page_append(otb, NULL, _("Applications"), ol, 1, 1, 1, 1, 0.0, 0.0);
285 285
286 ol = e_widget_list_add(evas, 0, 0); 286 ol = e_widget_list_add(evas, 0, 0);
287 ow = e_widget_label_add(evas, _("Margin")); 287 ow = e_widget_label_add(evas, _("Margin"));
288 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 288 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
289 ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL, 289 ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL,
290 &(cfdata->autoscroll_margin), 100); 290 &(cfdata->autoscroll_margin), 100);
291 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 291 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
292 ow = e_widget_label_add(evas, _("Cursor Margin")); 292 ow = e_widget_label_add(evas, _("Cursor Margin"));
293 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 293 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
294 ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL, 294 ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50, 1, 0, NULL,
295 &(cfdata->autoscroll_cursor_margin), 100); 295 &(cfdata->autoscroll_cursor_margin), 100);
296 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 296 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
297 e_widget_toolbook_page_append(otb, NULL, _("Autoscroll"), ol, 1, 1, 1, 0, 0.0, 0.0); 297 e_widget_toolbook_page_append(otb, NULL, _("Autoscroll"), ol, 1, 1, 1, 0, 0.0, 0.0);
@@ -301,17 +301,17 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
301 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 301 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
302 ow = e_widget_label_add(evas, _("Menu Scroll Speed")); 302 ow = e_widget_label_add(evas, _("Menu Scroll Speed"));
303 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 303 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
304 ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/s"), 0, 20000, 100, 304 ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/s"), 0, 20000, 100,
305 0, &(cfdata->scroll_speed), NULL, 100); 305 0, &(cfdata->scroll_speed), NULL, 100);
306 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 306 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
307 ow = e_widget_label_add(evas, _("Fast Mouse Move Threshold")); 307 ow = e_widget_label_add(evas, _("Fast Mouse Move Threshold"));
308 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 308 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
309 ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/s"), 0, 2000, 10, 309 ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/s"), 0, 2000, 10,
310 0, &(cfdata->fast_mouse_move_threshhold), NULL, 100); 310 0, &(cfdata->fast_mouse_move_threshhold), NULL, 100);
311 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 311 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
312 ow = e_widget_label_add(evas, _("Click Drag Timeout")); 312 ow = e_widget_label_add(evas, _("Click Drag Timeout"));
313 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 313 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
314 ow = e_widget_slider_add(evas, 1, 0, _("%2.2f s"), 0, 10, 0.25, 314 ow = e_widget_slider_add(evas, 1, 0, _("%2.2f s"), 0, 10, 0.25,
315 0, &(cfdata->click_drag_timeout), NULL, 100); 315 0, &(cfdata->click_drag_timeout), NULL, 100);
316 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 316 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
317 e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 1, 1, 1, 0, 0.0, 0.0); 317 e_widget_toolbook_page_append(otb, NULL, _("Miscellaneous"), ol, 1, 1, 1, 0, 0.0, 0.0);
@@ -336,9 +336,9 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
336 336
337 if (EINA_DBL_EQ(cfdata->fast_mouse_move_threshhold, 0.0)) 337 if (EINA_DBL_EQ(cfdata->fast_mouse_move_threshhold, 0.0))
338 e_config->menus_fast_mouse_move_threshhold = 1.0; 338 e_config->menus_fast_mouse_move_threshhold = 1.0;
339 else 339 else
340 { 340 {
341 e_config->menus_fast_mouse_move_threshhold = 341 e_config->menus_fast_mouse_move_threshhold =
342 cfdata->fast_mouse_move_threshhold; 342 cfdata->fast_mouse_move_threshhold;
343 } 343 }
344 e_config->menus_click_drag_timeout = cfdata->click_drag_timeout; 344 e_config->menus_click_drag_timeout = cfdata->click_drag_timeout;
@@ -348,7 +348,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
348 { 348 {
349 if (e_config->default_system_menu) 349 if (e_config->default_system_menu)
350 eina_stringshare_del(e_config->default_system_menu); 350 eina_stringshare_del(e_config->default_system_menu);
351 e_config->default_system_menu = 351 e_config->default_system_menu =
352 eina_stringshare_add(cfdata->default_system_menu); 352 eina_stringshare_add(cfdata->default_system_menu);
353 } 353 }
354 else 354 else
diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
index 4b67fe36c..51db12dbe 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -24,7 +24,7 @@ struct _CFPath_Change_Data
24 int dirty; 24 int dirty;
25 E_Config_Dialog_Data *cfdata; 25 E_Config_Dialog_Data *cfdata;
26}; 26};
27 27
28struct _E_Config_Dialog_Data 28struct _E_Config_Dialog_Data
29{ 29{
30 E_Config_Dialog *cfd; 30 E_Config_Dialog *cfd;
@@ -50,12 +50,12 @@ e_int_config_paths(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUS
50 50
51 if (e_config_dialog_find("E", "advanced/search_directories")) return NULL; 51 if (e_config_dialog_find("E", "advanced/search_directories")) return NULL;
52 v = E_NEW(E_Config_Dialog_View, 1); 52 v = E_NEW(E_Config_Dialog_View, 1);
53 53
54 v->create_cfdata = _create_data; 54 v->create_cfdata = _create_data;
55 v->free_cfdata = _free_data; 55 v->free_cfdata = _free_data;
56 v->basic.create_widgets = _basic_create_widgets; 56 v->basic.create_widgets = _basic_create_widgets;
57 v->basic.apply_cfdata = _basic_apply_data; 57 v->basic.apply_cfdata = _basic_apply_data;
58 58
59 cfd = e_config_dialog_new(NULL, _("Search Path Settings"), 59 cfd = e_config_dialog_new(NULL, _("Search Path Settings"),
60 "E", "advanced/search_directories", 60 "E", "advanced/search_directories",
61 "preferences-directories", 0, v, NULL); 61 "preferences-directories", 0, v, NULL);
@@ -107,14 +107,14 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
107 while (pcd->new_user_path) 107 while (pcd->new_user_path)
108 { 108 {
109 const char *dir; 109 const char *dir;
110 110
111 dir = pcd->new_user_path->data; 111 dir = pcd->new_user_path->data;
112 eina_stringshare_del(dir); 112 eina_stringshare_del(dir);
113 pcd->new_user_path = 113 pcd->new_user_path =
114 eina_list_remove_list(pcd->new_user_path, pcd->new_user_path); 114 eina_list_remove_list(pcd->new_user_path, pcd->new_user_path);
115 } 115 }
116 free(pcd); 116 free(pcd);
117 cfdata->pcd_list = 117 cfdata->pcd_list =
118 eina_list_remove_list(cfdata->pcd_list, cfdata->pcd_list); 118 eina_list_remove_list(cfdata->pcd_list, cfdata->pcd_list);
119 } 119 }
120 free(cfdata->paths_available); 120 free(cfdata->paths_available);
@@ -123,10 +123,10 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
123 123
124static int 124static int
125_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 125_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
126{ 126{
127 Eina_List *l; 127 Eina_List *l;
128 Eina_List *ll; 128 Eina_List *ll;
129 129
130 _ilist_update(cfdata->gui.user_list, cfdata->cur_pcd, NULL); 130 _ilist_update(cfdata->gui.user_list, cfdata->cur_pcd, NULL);
131 131
132 for (l = cfdata->pcd_list; l; l = l->next) 132 for (l = cfdata->pcd_list; l; l = l->next)
@@ -169,7 +169,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
169 evas_event_freeze(evas_object_evas_get(cfdata->gui.path_list)); 169 evas_event_freeze(evas_object_evas_get(cfdata->gui.path_list));
170 edje_freeze(); 170 edje_freeze();
171 e_widget_ilist_freeze(cfdata->gui.path_list); 171 e_widget_ilist_freeze(cfdata->gui.path_list);
172 172
173 /* Fill In Ilist */ 173 /* Fill In Ilist */
174 for (i = 0; cfdata->paths_available[i].path; i++) 174 for (i = 0; cfdata->paths_available[i].path; i++)
175 { 175 {
@@ -179,8 +179,8 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
179 pcd->path = cfdata->paths_available[i].path; 179 pcd->path = cfdata->paths_available[i].path;
180 pcd->cfdata = cfdata; 180 pcd->cfdata = cfdata;
181 cfdata->pcd_list = eina_list_append(cfdata->pcd_list, pcd); 181 cfdata->pcd_list = eina_list_append(cfdata->pcd_list, pcd);
182 e_widget_ilist_append(ob, NULL, 182 e_widget_ilist_append(ob, NULL,
183 cfdata->paths_available[i].path_description, 183 cfdata->paths_available[i].path_description,
184 _ilist_path_cb_change, pcd, NULL); 184 _ilist_path_cb_change, pcd, NULL);
185 } 185 }
186 186
@@ -200,13 +200,13 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
200 e_widget_table_object_append(o, of, 0, 1, 1, 1, 0, 1, 0, 1); 200 e_widget_table_object_append(o, of, 0, 1, 1, 1, 0, 1, 0, 1);
201 201
202 of = e_widget_framelist_add(evas, _("User Defined Directories"), 0); 202 of = e_widget_framelist_add(evas, _("User Defined Directories"), 0);
203 ob = e_widget_config_list_add(evas, e_widget_entry_add, 203 ob = e_widget_config_list_add(evas, e_widget_entry_add,
204 _("New Directory"), 2); 204 _("New Directory"), 2);
205 e_widget_disabled_set(ob, 1); 205 e_widget_disabled_set(ob, 1);
206 cfdata->gui.user_list = ob; 206 cfdata->gui.user_list = ob;
207 e_widget_framelist_object_append(of, ob); 207 e_widget_framelist_object_append(of, ob);
208 e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1); 208 e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1);
209 209
210 return o; 210 return o;
211} 211}
212 212
@@ -216,7 +216,7 @@ _ilist_path_cb_change(void *data)
216 CFPath_Change_Data *pcd; 216 CFPath_Change_Data *pcd;
217 Eina_List *default_list; 217 Eina_List *default_list;
218 Eina_List *l; 218 Eina_List *l;
219 219
220 pcd = data; 220 pcd = data;
221 default_list = pcd->path->default_dir_list; 221 default_list = pcd->path->default_dir_list;
222 222
@@ -224,14 +224,14 @@ _ilist_path_cb_change(void *data)
224 evas_event_freeze(evas_object_evas_get(pcd->cfdata->gui.default_list)); 224 evas_event_freeze(evas_object_evas_get(pcd->cfdata->gui.default_list));
225 edje_freeze(); 225 edje_freeze();
226 e_widget_ilist_freeze(pcd->cfdata->gui.default_list); 226 e_widget_ilist_freeze(pcd->cfdata->gui.default_list);
227 227
228 e_widget_ilist_clear(pcd->cfdata->gui.default_list); 228 e_widget_ilist_clear(pcd->cfdata->gui.default_list);
229 for (l = default_list; l; l = l->next) 229 for (l = default_list; l; l = l->next)
230 { 230 {
231 const char *dir; 231 const char *dir;
232 232
233 dir = ((E_Path_Dir *)l->data)->dir; 233 dir = ((E_Path_Dir *)l->data)->dir;
234 e_widget_ilist_append(pcd->cfdata->gui.default_list, 234 e_widget_ilist_append(pcd->cfdata->gui.default_list,
235 NULL, dir, NULL, NULL, NULL); 235 NULL, dir, NULL, NULL, NULL);
236 } 236 }
237 e_widget_ilist_go(pcd->cfdata->gui.default_list); 237 e_widget_ilist_go(pcd->cfdata->gui.default_list);
@@ -239,15 +239,15 @@ _ilist_path_cb_change(void *data)
239 e_widget_ilist_thaw(pcd->cfdata->gui.default_list); 239 e_widget_ilist_thaw(pcd->cfdata->gui.default_list);
240 edje_thaw(); 240 edje_thaw();
241 evas_event_thaw(evas_object_evas_get(pcd->cfdata->gui.default_list)); 241 evas_event_thaw(evas_object_evas_get(pcd->cfdata->gui.default_list));
242 242
243 _ilist_update(pcd->cfdata->gui.user_list, 243 _ilist_update(pcd->cfdata->gui.user_list,
244 pcd->cfdata->cur_pcd, /* Path data to save */ 244 pcd->cfdata->cur_pcd, /* Path data to save */
245 pcd); /* New Path to show */ 245 pcd); /* New Path to show */
246 246
247 pcd->cfdata->cur_pcd = pcd; 247 pcd->cfdata->cur_pcd = pcd;
248} 248}
249 249
250static void 250static void
251_ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new) 251_ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new)
252{ 252{
253 /* Save current data to old path */ 253 /* Save current data to old path */
@@ -259,10 +259,10 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
259 while (old->new_user_path) 259 while (old->new_user_path)
260 { 260 {
261 const char *dir; 261 const char *dir;
262 262
263 dir = old->new_user_path->data; 263 dir = old->new_user_path->data;
264 eina_stringshare_del(dir); 264 eina_stringshare_del(dir);
265 old->new_user_path = 265 old->new_user_path =
266 eina_list_remove_list(old->new_user_path, old->new_user_path); 266 eina_list_remove_list(old->new_user_path, old->new_user_path);
267 } 267 }
268 268
@@ -271,17 +271,17 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
271 const char *dir; 271 const char *dir;
272 272
273 dir = e_widget_config_list_nth_get(obj, i); 273 dir = e_widget_config_list_nth_get(obj, i);
274 old->new_user_path = 274 old->new_user_path =
275 eina_list_append(old->new_user_path, eina_stringshare_add(dir)); 275 eina_list_append(old->new_user_path, eina_stringshare_add(dir));
276 } 276 }
277 } 277 }
278 278
279 if (!new) return; 279 if (!new) return;
280 280
281 /* Fill list with selected data */ 281 /* Fill list with selected data */
282 e_widget_disabled_set(obj, 0); 282 e_widget_disabled_set(obj, 0);
283 e_widget_config_list_clear(obj); 283 e_widget_config_list_clear(obj);
284 284
285 if (new->new_user_path) 285 if (new->new_user_path)
286 { 286 {
287 Eina_List *l; 287 Eina_List *l;
@@ -292,7 +292,7 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
292 for (l = user_path; l; l = l->next) 292 for (l = user_path; l; l = l->next)
293 { 293 {
294 const char *dir; 294 const char *dir;
295 295
296 dir = l->data; 296 dir = l->data;
297 e_widget_config_list_append(obj, dir); 297 e_widget_config_list_append(obj, dir);
298 } 298 }
@@ -307,9 +307,9 @@ _ilist_update(Evas_Object *obj, CFPath_Change_Data *old, CFPath_Change_Data *new
307 for (l = user_path; l; l = l->next) 307 for (l = user_path; l; l = l->next)
308 { 308 {
309 E_Path_Dir *epd; 309 E_Path_Dir *epd;
310 310
311 epd = l->data; 311 epd = l->data;
312 e_widget_config_list_append(obj, epd->dir); 312 e_widget_config_list_append(obj, epd->dir);
313 } 313 }
314 } 314 }
315} 315}