summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:26:50 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 14:17:08 +0200
commit47859e8bae300b458ba843c75a8b3ba5b3786b9b (patch)
tree8fd774bc45b970876496c5cf0f956a48f5f62e3b /src
parentf47d1a789efed7996b2abde673ee3e5d3e72709d (diff)
tree-wide: get rid of trailing whitespace (part 7)
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11827
Diffstat (limited to 'src')
-rw-r--r--src/modules/conf_paths/e_mod_main.c16
-rw-r--r--src/modules/conf_performance/e_int_config_powermanagement.c16
-rw-r--r--src/modules/conf_performance/e_mod_main.c2
-rw-r--r--src/modules/conf_randr/e_int_config_randr2.c2
-rw-r--r--src/modules/conf_randr/e_mod_main.c4
-rw-r--r--src/modules/conf_shelves/e_int_config_shelf.c2
-rw-r--r--src/modules/conf_shelves/e_mod_main.c14
-rw-r--r--src/modules/conf_theme/e_int_config_borders.c2
-rw-r--r--src/modules/conf_theme/e_int_config_fonts.c4
-rw-r--r--src/modules/conf_theme/e_int_config_scale.c42
10 files changed, 52 insertions, 52 deletions
diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c
index 7d3f4e501..6d6879221 100644
--- a/src/modules/conf_paths/e_mod_main.c
+++ b/src/modules/conf_paths/e_mod_main.c
@@ -14,15 +14,15 @@ 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("advanced", 80, _("Advanced"), NULL, 17 e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL,
18 "preferences-advanced"); 18 "preferences-advanced");
19 e_configure_registry_item_add("advanced/search_directories", 50, 19 e_configure_registry_item_add("advanced/search_directories", 50,
20 _("Search Directories"), NULL, 20 _("Search Directories"), NULL,
21 "preferences-directories", 21 "preferences-directories",
22 e_int_config_paths); 22 e_int_config_paths);
23 e_configure_registry_item_add("advanced/environment_variables", 120, 23 e_configure_registry_item_add("advanced/environment_variables", 120,
24 _("Environment Variables"), NULL, 24 _("Environment Variables"), NULL,
25 "preferences-variables", 25 "preferences-variables",
26 e_int_config_env); 26 e_int_config_env);
27 conf_module = m; 27 conf_module = m;
28 28
@@ -34,9 +34,9 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
34{ 34{
35 E_Config_Dialog *cfd; 35 E_Config_Dialog *cfd;
36 36
37 while ((cfd = e_config_dialog_get("E", "advanced/environment_variables"))) 37 while ((cfd = e_config_dialog_get("E", "advanced/environment_variables")))
38 e_object_del(E_OBJECT(cfd)); 38 e_object_del(E_OBJECT(cfd));
39 while ((cfd = e_config_dialog_get("E", "advanced/search_directories"))) 39 while ((cfd = e_config_dialog_get("E", "advanced/search_directories")))
40 e_object_del(E_OBJECT(cfd)); 40 e_object_del(E_OBJECT(cfd));
41 e_configure_registry_item_del("advanced/environment_variables"); 41 e_configure_registry_item_del("advanced/environment_variables");
42 e_configure_registry_item_del("advanced/search_directories"); 42 e_configure_registry_item_del("advanced/search_directories");
diff --git a/src/modules/conf_performance/e_int_config_powermanagement.c b/src/modules/conf_performance/e_int_config_powermanagement.c
index 8b3e14d13..ab879f853 100644
--- a/src/modules/conf_performance/e_int_config_powermanagement.c
+++ b/src/modules/conf_performance/e_int_config_powermanagement.c
@@ -111,14 +111,14 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
111 Evas_Object *ob, *ol; 111 Evas_Object *ob, *ol;
112 E_Radio_Group *rmin, *rmax; 112 E_Radio_Group *rmin, *rmax;
113 int y; 113 int y;
114 114
115 cfdata->powersave_min = e_config->powersave.min; 115 cfdata->powersave_min = e_config->powersave.min;
116 cfdata->powersave_max = e_config->powersave.max; 116 cfdata->powersave_max = e_config->powersave.max;
117 rmin = e_widget_radio_group_new((int*) &(cfdata->powersave_min)); 117 rmin = e_widget_radio_group_new((int*) &(cfdata->powersave_min));
118 rmax = e_widget_radio_group_new((int*) &(cfdata->powersave_max)); 118 rmax = e_widget_radio_group_new((int*) &(cfdata->powersave_max));
119 119
120 ol = e_widget_table_add(e_win_evas_win_get(evas), 0); 120 ol = e_widget_table_add(e_win_evas_win_get(evas), 0);
121 121
122 y = 0; 122 y = 0;
123 ob = e_widget_label_add(evas, 123 ob = e_widget_label_add(evas,
124 _("Levels Allowed")); 124 _("Levels Allowed"));
@@ -139,7 +139,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
139 0.5, 0.5 //align 139 0.5, 0.5 //align
140 ); 140 );
141 141
142 142
143 y++; 143 y++;
144 ob = e_widget_label_add(evas, _("Min")); 144 ob = e_widget_label_add(evas, _("Min"));
145 e_widget_table_object_align_append(ol, ob, 145 e_widget_table_object_align_append(ol, ob,
@@ -176,7 +176,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
176 0.5, 0.5 //align 176 0.5, 0.5 //align
177 ); 177 );
178 y++; 178 y++;
179 179
180 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_NONE, rmin); 180 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_NONE, rmin);
181 e_widget_table_object_align_append(ol, ob, 181 e_widget_table_object_align_append(ol, ob,
182 0, y, //place 182 0, y, //place
@@ -215,7 +215,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
215 0.5, 0.5 //align 215 0.5, 0.5 //align
216 ); 216 );
217 y++; 217 y++;
218 218
219 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_LOW, rmin); 219 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_LOW, rmin);
220 e_widget_table_object_align_append(ol, ob, 220 e_widget_table_object_align_append(ol, ob,
221 0, y, //place 221 0, y, //place
@@ -254,7 +254,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
254 0.0, 0.5 //align 254 0.0, 0.5 //align
255 ); 255 );
256 y++; 256 y++;
257 257
258 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_MEDIUM, rmin); 258 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_MEDIUM, rmin);
259 e_widget_table_object_align_append(ol, ob, 259 e_widget_table_object_align_append(ol, ob,
260 0, y, //place 260 0, y, //place
@@ -293,7 +293,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
293 0.0, 0.5 //align 293 0.0, 0.5 //align
294 ); 294 );
295 y++; 295 y++;
296 296
297 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_HIGH, rmin); 297 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_HIGH, rmin);
298 e_widget_table_object_align_append(ol, ob, 298 e_widget_table_object_align_append(ol, ob,
299 0, y, //place 299 0, y, //place
@@ -332,7 +332,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
332 0.0, 0.5 //align 332 0.0, 0.5 //align
333 ); 333 );
334 y++; 334 y++;
335 335
336 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_EXTREME, rmin); 336 ob = e_widget_radio_add(evas, "", E_POWERSAVE_MODE_EXTREME, rmin);
337 e_widget_table_object_align_append(ol, ob, 337 e_widget_table_object_align_append(ol, ob,
338 0, y, //place 338 0, y, //place
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
index c7c88c6bb..139e4e596 100644
--- a/src/modules/conf_performance/e_mod_main.c
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -15,7 +15,7 @@ E_API void *
15e_modapi_init(E_Module *m) 15e_modapi_init(E_Module *m)
16{ 16{
17 e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); 17 e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
18 e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance); 18 e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);
19 e_configure_registry_item_add("advanced/powermanagement", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_powermanagement); 19 e_configure_registry_item_add("advanced/powermanagement", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_powermanagement);
20 conf_module = m; 20 conf_module = m;
21 return m; 21 return m;
diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c
index 5c3bdd109..1698e3b1e 100644
--- a/src/modules/conf_randr/e_int_config_randr2.c
+++ b/src/modules/conf_randr/e_int_config_randr2.c
@@ -474,7 +474,7 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata, E_Config_Randr2_Screen *cs
474 { 474 {
475 elm_check_state_set(cfdata->scale_custom_obj, EINA_TRUE); 475 elm_check_state_set(cfdata->scale_custom_obj, EINA_TRUE);
476 elm_object_disabled_set(cfdata->scale_value_obj, EINA_FALSE); 476 elm_object_disabled_set(cfdata->scale_value_obj, EINA_FALSE);
477 elm_slider_value_set(cfdata->scale_value_obj, 477 elm_slider_value_set(cfdata->scale_value_obj,
478 _scale_for_multiplier(cs->scale_multiplier)); 478 _scale_for_multiplier(cs->scale_multiplier));
479 } 479 }
480 else 480 else
diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c
index 7667be912..b3500feb8 100644
--- a/src/modules/conf_randr/e_mod_main.c
+++ b/src/modules/conf_randr/e_mod_main.c
@@ -31,12 +31,12 @@ E_API void *
31e_modapi_init(E_Module *m) 31e_modapi_init(E_Module *m)
32{ 32{
33 /* create Screen configuration category 33 /* create Screen configuration category
34 * 34 *
35 * NB: If the category already exists, this function just returns */ 35 * NB: If the category already exists, this function just returns */
36 e_configure_registry_category_add("screen", 30, _("Screen"), 36 e_configure_registry_category_add("screen", 30, _("Screen"),
37 NULL, "preferences-desktop-display"); 37 NULL, "preferences-desktop-display");
38 38
39 /* add the randr dialog to the screen category and provide 39 /* add the randr dialog to the screen category and provide
40 * the configure category with the function to call */ 40 * the configure category with the function to call */
41 e_configure_registry_item_add("screen/screen_setup", 20, _("Screen Setup"), 41 e_configure_registry_item_add("screen/screen_setup", 20, _("Screen Setup"),
42 NULL, "preferences-system-screen-resolution", 42 NULL, "preferences-system-screen-resolution",
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index aa14e7351..8482639b8 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -123,7 +123,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
123 E_Zone *zone; 123 E_Zone *zone;
124 124
125 e_dialog_resizable_set(cfd->dia, 1); 125 e_dialog_resizable_set(cfd->dia, 1);
126 126
127 ol = e_widget_list_add(evas, 0, 0); 127 ol = e_widget_list_add(evas, 0, 0);
128 zone = e_zone_current_get(); 128 zone = e_zone_current_get();
129 snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num); 129 snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num);
diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c
index 98cfca910..074a3d605 100644
--- a/src/modules/conf_shelves/e_mod_main.c
+++ b/src/modules/conf_shelves/e_mod_main.c
@@ -18,13 +18,13 @@ E_API E_Module_Api e_modapi =
18E_API void * 18E_API void *
19e_modapi_init(E_Module *m) 19e_modapi_init(E_Module *m)
20{ 20{
21 e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, 21 e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
22 "preferences-extensions"); 22 "preferences-extensions");
23 e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, 23 e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL,
24 "preferences-desktop-shelf", 24 "preferences-desktop-shelf",
25 e_int_config_shelf); 25 e_int_config_shelf);
26 maug = 26 maug =
27 e_int_menus_menu_augmentation_add_sorted("config/1", _("Shelves"), 27 e_int_menus_menu_augmentation_add_sorted("config/1", _("Shelves"),
28 _e_mod_menu_add, NULL, NULL, NULL); 28 _e_mod_menu_add, NULL, NULL, NULL);
29 29
30 conf_module = m; 30 conf_module = m;
@@ -43,7 +43,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
43 e_int_menus_menu_augmentation_del("config/1", maug); 43 e_int_menus_menu_augmentation_del("config/1", maug);
44 maug = NULL; 44 maug = NULL;
45 } 45 }
46 while ((cfd = e_config_dialog_get("E", "extensions/shelves"))) 46 while ((cfd = e_config_dialog_get("E", "extensions/shelves")))
47 e_object_del(E_OBJECT(cfd)); 47 e_object_del(E_OBJECT(cfd));
48 e_configure_registry_item_del("extensions/shelves"); 48 e_configure_registry_item_del("extensions/shelves");
49 e_configure_registry_category_del("extensions"); 49 e_configure_registry_category_del("extensions");
@@ -59,7 +59,7 @@ e_modapi_save(E_Module *m EINA_UNUSED)
59} 59}
60 60
61/* menu item callback(s) */ 61/* menu item callback(s) */
62static void 62static void
63_e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED) 63_e_mod_run_cb(void *data EINA_UNUSED, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
64{ 64{
65 e_configure_registry_call("extensions/shelves", NULL, NULL); 65 e_configure_registry_call("extensions/shelves", NULL, NULL);
diff --git a/src/modules/conf_theme/e_int_config_borders.c b/src/modules/conf_theme/e_int_config_borders.c
index 173572f7f..8081cbbab 100644
--- a/src/modules/conf_theme/e_int_config_borders.c
+++ b/src/modules/conf_theme/e_int_config_borders.c
@@ -113,7 +113,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
113static int 113static int
114_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 114_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
115{ 115{
116 Eina_Bool remch = ((cfdata->remember_border && 116 Eina_Bool remch = ((cfdata->remember_border &&
117 !((cfdata->client->remember) && 117 !((cfdata->client->remember) &&
118 (cfdata->client->remember->apply & E_REMEMBER_APPLY_BORDER))) || 118 (cfdata->client->remember->apply & E_REMEMBER_APPLY_BORDER))) ||
119 (!cfdata->remember_border && cfdata->client && 119 (!cfdata->remember_border && cfdata->client &&
diff --git a/src/modules/conf_theme/e_int_config_fonts.c b/src/modules/conf_theme/e_int_config_fonts.c
index 2609fd1d4..1ef71360a 100644
--- a/src/modules/conf_theme/e_int_config_fonts.c
+++ b/src/modules/conf_theme/e_int_config_fonts.c
@@ -720,7 +720,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_
720 720
721 ob = e_widget_font_preview_add 721 ob = e_widget_font_preview_add
722 (evas, _("English 012 #!? 日本語 にほんご ソフト 中文 華語 한국")); 722 (evas, _("English 012 #!? 日本語 にほんご ソフト 中文 華語 한국"));
723 723
724 cfdata->gui.preview = ob; 724 cfdata->gui.preview = ob;
725 e_widget_table_object_append(ot, ob, 0, 2, 3, 1, 1, 0, 1, 0); 725 e_widget_table_object_append(ot, ob, 0, 2, 3, 1, 1, 0, 1, 0);
726 726
@@ -920,7 +920,7 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj EINA_UNUSED)
920 icon = e_icon_add(cfdata->evas); 920 icon = e_icon_add(cfdata->evas);
921 e_util_icon_theme_set(icon, "enlightenment"); 921 e_util_icon_theme_set(icon, "enlightenment");
922 } 922 }
923 923
924 e_widget_ilist_nth_icon_set(cfdata->gui.class_list, e_widget_ilist_selected_get(cfdata->gui.class_list), icon); 924 e_widget_ilist_nth_icon_set(cfdata->gui.class_list, e_widget_ilist_selected_get(cfdata->gui.class_list), icon);
925 } 925 }
926} 926}
diff --git a/src/modules/conf_theme/e_int_config_scale.c b/src/modules/conf_theme/e_int_config_scale.c
index 72d8ad5ae..77c4093a9 100644
--- a/src/modules/conf_theme/e_int_config_scale.c
+++ b/src/modules/conf_theme/e_int_config_scale.c
@@ -42,7 +42,7 @@ _scale_preview_sel_set(Evas_Object *ob, int sel)
42 int v; 42 int v;
43 Eina_List *l; 43 Eina_List *l;
44 E_Config_Dialog_Data *cfdata; 44 E_Config_Dialog_Data *cfdata;
45 45
46 cfdata = evas_object_data_get(ob, "cfdata"); 46 cfdata = evas_object_data_get(ob, "cfdata");
47 rc = evas_object_data_get(ob, "rec"); 47 rc = evas_object_data_get(ob, "rec");
48 if (sel) 48 if (sel)
@@ -80,7 +80,7 @@ static void
80_scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 80_scale_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
81{ 81{
82 Evas_Object *ob = data; 82 Evas_Object *ob = data;
83 83
84 _scale_preview_sel_set(ob, 1); 84 _scale_preview_sel_set(ob, 1);
85} 85}
86 86
@@ -91,12 +91,12 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp
91 const char *file; 91 const char *file;
92 char buf[64]; 92 char buf[64];
93 int v; 93 int v;
94 94
95#define SZW 160 95#define SZW 160
96#define SZH 100 96#define SZH 100
97 ob = e_widget_preview_add(e, SZW, SZH); 97 ob = e_widget_preview_add(e, SZW, SZH);
98 e_widget_preview_vsize_set(ob, SZW, SZH); 98 e_widget_preview_vsize_set(ob, SZW, SZH);
99 99
100 bg = edje_object_add(e_widget_preview_evas_get(ob)); 100 bg = edje_object_add(e_widget_preview_evas_get(ob));
101 file = e_bg_file_get(0, 0, 0); 101 file = e_bg_file_get(0, 0, 0);
102 edje_object_file_set(bg, file, "e/desktop/background"); 102 edje_object_file_set(bg, file, "e/desktop/background");
@@ -104,23 +104,23 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp
104 evas_object_move(bg, 0, 0); 104 evas_object_move(bg, 0, 0);
105 evas_object_resize(bg, 640, 480); 105 evas_object_resize(bg, 640, 480);
106 evas_object_show(bg); 106 evas_object_show(bg);
107 107
108 cm = edje_object_add(e_widget_preview_evas_get(ob)); 108 cm = edje_object_add(e_widget_preview_evas_get(ob));
109 e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/frame/default"); 109 e_theme_edje_object_set(cm, "base/theme/borders", "e/comp/frame/default");
110 evas_object_move(cm, 16, 16); 110 evas_object_move(cm, 16, 16);
111 evas_object_resize(cm, 180 * sc, 70); 111 evas_object_resize(cm, 180 * sc, 70);
112 evas_object_show(cm); 112 evas_object_show(cm);
113 113
114 bd = edje_object_add(e_widget_preview_evas_get(ob)); 114 bd = edje_object_add(e_widget_preview_evas_get(ob));
115 e_theme_edje_object_set(bd, "base/theme/borders", "e/widgets/border/default/border"); 115 e_theme_edje_object_set(bd, "base/theme/borders", "e/widgets/border/default/border");
116 edje_object_part_swallow(cm, "e.swallow.content", bd); 116 edje_object_part_swallow(cm, "e.swallow.content", bd);
117 evas_object_show(bd); 117 evas_object_show(bd);
118 118
119 wb = edje_object_add(e_widget_preview_evas_get(ob)); 119 wb = edje_object_add(e_widget_preview_evas_get(ob));
120 e_theme_edje_object_set(wb, "base/theme/dialog", "e/widgets/dialog/main"); 120 e_theme_edje_object_set(wb, "base/theme/dialog", "e/widgets/dialog/main");
121 edje_object_part_swallow(bd, "e.swallow.client", wb); 121 edje_object_part_swallow(bd, "e.swallow.client", wb);
122 evas_object_show(wb); 122 evas_object_show(wb);
123 123
124 rc = evas_object_rectangle_add(e_widget_preview_evas_get(ob)); 124 rc = evas_object_rectangle_add(e_widget_preview_evas_get(ob));
125 evas_object_move(rc, 0, 0); 125 evas_object_move(rc, 0, 0);
126 evas_object_resize(rc, 640, 480); 126 evas_object_resize(rc, 640, 480);
@@ -136,27 +136,27 @@ _scale_preview_new(E_Config_Dialog_Data *cfdata, Evas *e, double sc, double *scp
136 edje_object_part_text_set(bd, "e.text.title", tit); 136 edje_object_part_text_set(bd, "e.text.title", tit);
137 edje_object_signal_emit(bd, "e,state,focused", "e"); 137 edje_object_signal_emit(bd, "e,state,focused", "e");
138 edje_object_signal_emit(bd, "e,state,shadow,on", "e"); 138 edje_object_signal_emit(bd, "e,state,shadow,on", "e");
139 139
140 edje_object_signal_emit(cm, "e,state,visible", "e"); 140 edje_object_signal_emit(cm, "e,state,visible", "e");
141 edje_object_signal_emit(cm, "e,state,focus,on", "e"); 141 edje_object_signal_emit(cm, "e,state,focus,on", "e");
142 142
143 edje_object_scale_set(bd, sc); 143 edje_object_scale_set(bd, sc);
144 edje_object_scale_set(cm, sc); 144 edje_object_scale_set(cm, sc);
145 edje_object_scale_set(bg, sc); 145 edje_object_scale_set(bg, sc);
146 edje_object_scale_set(wb, sc); 146 edje_object_scale_set(wb, sc);
147 147
148 evas_object_data_set(ob, "rec", rc); 148 evas_object_data_set(ob, "rec", rc);
149 v = sc * 1000; 149 v = sc * 1000;
150 evas_object_data_set(ob, "scale", (void *)(unsigned long)v); 150 evas_object_data_set(ob, "scale", (void *)(unsigned long)v);
151 evas_object_data_set(ob, "scalep", scp); 151 evas_object_data_set(ob, "scalep", scp);
152 evas_object_data_set(ob, "dpi", (void *)(unsigned long)dpi); 152 evas_object_data_set(ob, "dpi", (void *)(unsigned long)dpi);
153 evas_object_data_set(ob, "cfdata", cfdata); 153 evas_object_data_set(ob, "cfdata", cfdata);
154 154
155 evas_object_event_callback_add(rc, 155 evas_object_event_callback_add(rc,
156 EVAS_CALLBACK_MOUSE_DOWN, 156 EVAS_CALLBACK_MOUSE_DOWN,
157 _scale_down, ob); 157 _scale_down, ob);
158 cfdata->obs = eina_list_append(cfdata->obs, ob); 158 cfdata->obs = eina_list_append(cfdata->obs, ob);
159 159
160 return ob; 160 return ob;
161} 161}
162 162
@@ -243,14 +243,14 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
243 243
244 if ((dpi > 0) && (cfdata->base_dpi > 0)) 244 if ((dpi > 0) && (cfdata->base_dpi > 0))
245 sc = (double)dpi / (double)cfdata->base_dpi; 245 sc = (double)dpi / (double)cfdata->base_dpi;
246 246
247 ob = _scale_preview_new(cfdata, evas, sc, &(cfdata->factor), _("DPI Scaling"), EINA_TRUE); 247 ob = _scale_preview_new(cfdata, evas, sc, &(cfdata->factor), _("DPI Scaling"), EINA_TRUE);
248 e_widget_table_object_align_append(o, ob, 0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5); 248 e_widget_table_object_align_append(o, ob, 0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
249 if (cfdata->use_dpi) _scale_preview_sel_set(ob, 1); 249 if (cfdata->use_dpi) _scale_preview_sel_set(ob, 1);
250 250
251 x = 1; 251 x = 1;
252 252
253#define COL 3 253#define COL 3
254#define SCALE_OP(v) do { \ 254#define SCALE_OP(v) do { \
255 ob = _scale_preview_new(cfdata, evas, v, &(cfdata->factor), NULL, EINA_FALSE); \ 255 ob = _scale_preview_new(cfdata, evas, v, &(cfdata->factor), NULL, EINA_FALSE); \
256 e_widget_table_object_align_append(o, ob, x, y, 1, 1, 0, 0, 0, 0, 0.5, 0.5); \ 256 e_widget_table_object_align_append(o, ob, x, y, 1, 1, 0, 0, 0, 0, 0.5, 0.5); \
@@ -274,7 +274,7 @@ static int
274_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 274_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
275{ 275{
276 E_Action *a; 276 E_Action *a;
277 277
278 if (cfdata->use_dpi) cfdata->use_mode = 1; 278 if (cfdata->use_dpi) cfdata->use_mode = 1;
279 else cfdata->use_mode = 0; 279 else cfdata->use_mode = 0;
280 280
@@ -296,7 +296,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
296 296
297 a = e_action_find("restart"); 297 a = e_action_find("restart");
298 if ((a) && (a->func.go)) a->func.go(NULL, NULL); 298 if ((a) && (a->func.go)) a->func.go(NULL, NULL);
299 299
300 return 1; 300 return 1;
301} 301}
302 302
@@ -385,7 +385,7 @@ static int
385_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 385_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
386{ 386{
387 E_Action *a; 387 E_Action *a;
388 388
389 cfdata->use_custom = 0; 389 cfdata->use_custom = 0;
390 cfdata->use_dpi = 0; 390 cfdata->use_dpi = 0;
391 if (cfdata->use_mode == 1) 391 if (cfdata->use_mode == 1)
@@ -403,10 +403,10 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
403 e_win_no_reopen_set(cfd->dia->win, 1); 403 e_win_no_reopen_set(cfd->dia->win, 1);
404 e_remember_update(e_win_client_get(cfd->dia->win)); 404 e_remember_update(e_win_client_get(cfd->dia->win));
405 e_config_save_queue(); 405 e_config_save_queue();
406 406
407 a = e_action_find("restart"); 407 a = e_action_find("restart");
408 if ((a) && (a->func.go)) a->func.go(NULL, NULL); 408 if ((a) && (a->func.go)) a->func.go(NULL, NULL);
409 409
410 return 1; 410 return 1;
411} 411}
412 412