enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

with the new randr stuff - old screen resolution settings disabled. 

SVN revision: 81319
This commit is contained in:
Carsten Haitzler 2012-12-19 02:02:49 +00:00
parent 47c5345f55
commit 911e610feb
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/conf_display/e_int_config_display.c
View File

@ -5,6 +5,7 @@
* Give list some icons. * Give list some icons.
*/ */
/*
#define RANDR_11 ((1 << 16) | 1) #define RANDR_11 ((1 << 16) | 1)
static void _fill_data(E_Config_Dialog_Data *cfdata); static void _fill_data(E_Config_Dialog_Data *cfdata);
@ -93,8 +94,8 @@ _surebox_dialog_cb_yes(void *data, E_Dialog *dia)
_fill_data(sb->cfdata); _fill_data(sb->cfdata);
_load_resolutions(sb->cfdata); _load_resolutions(sb->cfdata);
/* No need to load rates as the currently selected resolution has not been // No need to load rates as the currently selected resolution has not been
* changed since last selection. */ // changed since last selection.
if (dia) _surebox_dialog_cb_delete(dia->win); if (dia) _surebox_dialog_cb_delete(dia->win);
} }
@ -649,3 +650,4 @@ _deferred_norates_error(void *data __UNUSED__)
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
*/

14
src/modules/conf_display/e_mod_main.c
View File

@ -20,10 +20,10 @@ e_modapi_init(E_Module *m)
e_configure_registry_item_add("screen/virtual_desktops", 10, e_configure_registry_item_add("screen/virtual_desktops", 10,
_("Virtual Desktops"), NULL, _("Virtual Desktops"), NULL,
"preferences-desktop", e_int_config_desks); "preferences-desktop", e_int_config_desks);
e_configure_registry_item_add("screen/screen_resolution", 20, // e_configure_registry_item_add("screen/screen_resolution", 20,
_("Screen Resolution"), NULL, // _("Screen Resolution"), NULL,
"preferences-system-screen-resolution", // "preferences-system-screen-resolution",
e_int_config_display); // e_int_config_display);
e_configure_registry_item_add("screen/screen_lock", 30, e_configure_registry_item_add("screen/screen_lock", 30,
_("Screen Lock"), NULL, _("Screen Lock"), NULL,
"preferences-system-lock-screen", "preferences-system-lock-screen",
@ -68,15 +68,15 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_object_del(E_OBJECT(cfd)); e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_lock"))) while ((cfd = e_config_dialog_get("E", "screen/screen_lock")))
e_object_del(E_OBJECT(cfd)); e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/screen_resolution"))) // while ((cfd = e_config_dialog_get("E", "screen/screen_resolution")))
e_object_del(E_OBJECT(cfd)); // e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops"))) while ((cfd = e_config_dialog_get("E", "screen/virtual_desktops")))
e_object_del(E_OBJECT(cfd)); e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("screen/power_management"); e_configure_registry_item_del("screen/power_management");
e_configure_registry_item_del("screen/screen_saver"); e_configure_registry_item_del("screen/screen_saver");
e_configure_registry_item_del("screen/screen_lock"); e_configure_registry_item_del("screen/screen_lock");
e_configure_registry_item_del("screen/screen_resolution"); // e_configure_registry_item_del("screen/screen_resolution");
e_configure_registry_item_del("screen/virtual_desktops"); e_configure_registry_item_del("screen/virtual_desktops");
e_configure_registry_category_del("screen"); e_configure_registry_category_del("screen");