From: <enl...@li...> - 2005-12-16 17:54:39
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c Log Message: Make config dialogue more user friendly =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 15 Dec 2005 03:01:07 -0000 1.5 +++ e_mod_config.c 16 Dec 2005 17:54:33 -0000 1.6 @@ -105,7 +105,7 @@ _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Follower"), &(cfdata->follower)); + ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); e_widget_framelist_object_append(of, ob); @@ -163,7 +163,7 @@ _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Follower"), &(cfdata->follower)); + ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); e_widget_framelist_object_append(of, ob); @@ -178,7 +178,7 @@ /* Advanced Options */ of = e_widget_framelist_add(evas, _("Advanced Settings"), 0); - ob = e_widget_label_add(evas, _("Follow Speed:")); + ob = e_widget_label_add(evas, _("Follower Speed:")); e_widget_framelist_object_append(of, ob); ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); e_widget_framelist_object_append(of, ob); |
From: <enl...@li...> - 2005-12-16 17:54:55
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Make config dialogue more user friendly =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 15 Dec 2005 22:37:14 -0000 1.1 +++ e_mod_config.c 16 Dec 2005 17:54:47 -0000 1.2 @@ -157,7 +157,7 @@ _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Units"), 0); + of = e_widget_framelist_add(evas, _("Display Units"), 0); rg = e_widget_radio_group_new(&(cfdata->unit_method)); ob = e_widget_radio_add(evas, _("Celcius"), 0, rg); e_widget_framelist_object_append(of, ob); @@ -177,7 +177,7 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - of = e_widget_framelist_add(evas, _("Low Temp"), 0); + of = e_widget_framelist_add(evas, _("Low Temperature"), 0); rg = e_widget_radio_group_new(&(cfdata->low_method)); ob = e_widget_radio_add(evas, _("40 F"), 40, rg); e_widget_framelist_object_append(of, ob); @@ -187,7 +187,7 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - of = e_widget_framelist_add(evas, _("High Temp"), 0); + of = e_widget_framelist_add(evas, _("High Temperature"), 0); rg = e_widget_radio_group_new(&(cfdata->high_method)); ob = e_widget_radio_add(evas, _("60 F"), 60, rg); e_widget_framelist_object_append(of, ob); @@ -257,7 +257,7 @@ _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Units"), 0); + of = e_widget_framelist_add(evas, _("Display Units"), 0); rg = e_widget_radio_group_new(&(cfdata->unit_method)); ob = e_widget_radio_add(evas, _("Celcius"), 0, rg); e_widget_framelist_object_append(of, ob); |
From: <enl...@li...> - 2005-12-16 20:57:31
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c e_mod_main.h Makefile.am Added Files: e_mod_config.c e_mod_config.h Log Message: Pager Config Dialogue :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -3 -r1.149 -r1.150 --- e_mod_main.c 16 Dec 2005 04:35:49 -0000 1.149 +++ e_mod_main.c 16 Dec 2005 20:57:24 -0000 1.150 @@ -3,6 +3,7 @@ */ #include "e.h" #include "e_mod_main.h" +#include "e_mod_config.h" /* TODO * which options should be in main menu, and which in face menu? @@ -79,25 +80,17 @@ static void _pager_face_cb_leave(void *data, const char *type, void *drop); static void _pager_face_cb_drop(void *data, const char *type, void *drop); -static void _pager_face_cb_deskname_none(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_face_cb_deskname_top(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_face_cb_deskname_bottom(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_face_cb_deskname_left(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_face_cb_deskname_right(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_face_deskname_position_change(Pager_Face *face); static int _pager_popup_cb_timeout(void *data); -static void _pager_menu_cb_speed_very_slow(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_menu_cb_speed_slow(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_menu_cb_speed_normal(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_menu_cb_speed_fast(void *data, E_Menu *m, E_Menu_Item *mi); -static void _pager_menu_cb_speed_very_fast(void *data, E_Menu *m, E_Menu_Item *mi); - static void _pager_menu_cb_popup_enable(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_menu_cb_aspect_keep_height(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_menu_cb_aspect_keep_width(void *data, E_Menu *m, E_Menu_Item *mi); +static void _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); + + static int _pager_count; static E_Config_DD *_conf_edd; @@ -338,8 +331,6 @@ e_object_del(E_OBJECT(l->data)); evas_list_free(pager->menus); e_object_del(E_OBJECT(pager->config_menu)); - e_object_del(E_OBJECT(pager->config_menu_deskname)); - e_object_del(E_OBJECT(pager->config_menu_speed)); if (pager->ev_handler_border_resize) ecore_event_handler_del(pager->ev_handler_border_resize); @@ -384,105 +375,9 @@ mn = e_menu_new(); pager->config_menu = mn; - mn = e_menu_new(); - pager->config_menu_deskname = mn; - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("None")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (pager->conf->deskname_pos == PAGER_DESKNAME_NONE) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_deskname_none, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Top")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (pager->conf->deskname_pos == PAGER_DESKNAME_TOP) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_deskname_top, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Bottom")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (pager->conf->deskname_pos == PAGER_DESKNAME_BOTTOM) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_deskname_bottom, pager); - - /* FIXME: implement this in the theme, then re-enable */ - /* mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Left")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (pager->conf->deskname_pos == PAGER_DESKNAME_LEFT) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_deskname_left, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Right")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 2); - if (pager->conf->deskname_pos == PAGER_DESKNAME_RIGHT) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_face_cb_deskname_right, pager); - */ - - mn = e_menu_new(); - pager->config_menu_speed = mn; - - /* Desktopname speed */ - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Very Slow")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (pager->conf->popup_speed == 6.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_menu_cb_speed_very_slow, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Slow")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (pager->conf->popup_speed == 4.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_menu_cb_speed_slow, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Normal")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (pager->conf->popup_speed == 2.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_menu_cb_speed_normal, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Fast")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (pager->conf->popup_speed == 1.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_menu_cb_speed_fast, pager); - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Very Fast")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (pager->conf->popup_speed == 0.5) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _pager_menu_cb_speed_very_fast, pager); - - /* Submenus */ - mi = e_menu_item_new(pager->config_menu); - e_menu_item_label_set(mi, _("Desktop Name")); - e_menu_item_submenu_set(mi, pager->config_menu_deskname); - - mi = e_menu_item_new(pager->config_menu); - e_menu_item_label_set(mi, _("Enable Popup")); - e_menu_item_check_set(mi, 1); - e_menu_item_toggle_set(mi, pager->conf->popup); - e_menu_item_callback_set(mi, _pager_menu_cb_popup_enable, pager); - - mi = e_menu_item_new(pager->config_menu); - e_menu_item_label_set(mi, _("Popup Speed")); - e_menu_item_submenu_set(mi, pager->config_menu_speed); + e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_callback_set(mi, _pager_menu_cb_configure, pager); mi = e_menu_item_new(pager->config_menu); e_menu_item_label_set(mi, _("Fix Aspect (Keep Height)")); @@ -611,24 +506,15 @@ if (face->conf->enabled) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _pager_face_cb_menu_enabled, face); */ - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Edit Mode")); - e_menu_item_callback_set(mi, _pager_face_cb_menu_edit, face); - - /* Submenus */ - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Desktop Name")); - e_menu_item_submenu_set(mi, face->pager->config_menu_deskname); + /* Config */ mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Enable Popup")); - e_menu_item_check_set(mi, 1); - e_menu_item_toggle_set(mi, face->pager->conf->popup); - e_menu_item_callback_set(mi, _pager_menu_cb_popup_enable, face->pager); - + e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_callback_set(mi, _pager_menu_cb_configure, face->pager); + mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Popup Speed")); - e_menu_item_submenu_set(mi, face->pager->config_menu_speed); + e_menu_item_label_set(mi, _("Edit Mode")); + e_menu_item_callback_set(mi, _pager_face_cb_menu_edit, face); mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Fix Aspect (Keep Height)")); @@ -2165,96 +2051,6 @@ } static void -_pager_face_cb_deskname_none(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - Evas_List *l; - - pager = data; - pager->conf->deskname_pos = PAGER_DESKNAME_NONE; - for (l = pager->faces; l; l = l->next) - { - Pager_Face *face; - - face = l->data; - _pager_face_deskname_position_change(face); - } - e_config_save_queue(); -} - -static void -_pager_face_cb_deskname_top(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - Evas_List *l; - - pager = data; - pager->conf->deskname_pos = PAGER_DESKNAME_TOP; - for (l = pager->faces; l; l = l->next) - { - Pager_Face *face; - - face = l->data; - _pager_face_deskname_position_change(face); - } - e_config_save_queue(); -} - -static void -_pager_face_cb_deskname_bottom(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - Evas_List *l; - - pager = data; - pager->conf->deskname_pos = PAGER_DESKNAME_BOTTOM; - for (l = pager->faces; l; l = l->next) - { - Pager_Face *face; - - face = l->data; - _pager_face_deskname_position_change(face); - } - e_config_save_queue(); -} - -static void -_pager_face_cb_deskname_left(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - Evas_List *l; - - pager = data; - pager->conf->deskname_pos = PAGER_DESKNAME_LEFT; - for (l = pager->faces; l; l = l->next) - { - Pager_Face *face; - - face = l->data; - _pager_face_deskname_position_change(face); - } - e_config_save_queue(); -} - -static void -_pager_face_cb_deskname_right(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - Evas_List *l; - - pager = data; - pager->conf->deskname_pos = PAGER_DESKNAME_RIGHT; - for (l = pager->faces; l; l = l->next) - { - Pager_Face *face; - - face = l->data; - _pager_face_deskname_position_change(face); - } - e_config_save_queue(); -} - -static void _pager_face_deskname_position_change(Pager_Face *face) { switch (face->pager->conf->deskname_pos) @@ -2278,60 +2074,6 @@ } static void -_pager_menu_cb_speed_very_slow(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup_speed = 6.0; - e_config_save_queue(); -} - -static void -_pager_menu_cb_speed_slow(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup_speed = 4.0; - e_config_save_queue(); -} - -static void -_pager_menu_cb_speed_normal(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup_speed = 2.0; - e_config_save_queue(); -} - -static void -_pager_menu_cb_speed_fast(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup_speed = 1.0; - e_config_save_queue(); -} - -static void -_pager_menu_cb_speed_very_fast(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup_speed = 0.5; - e_config_save_queue(); -} - -static void -_pager_menu_cb_popup_enable(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Pager *pager; - pager = data; - pager->conf->popup = e_menu_item_toggle_get(mi); - e_config_save_queue(); -} - -static void _pager_menu_cb_aspect_keep_height(void *data, E_Menu *m, E_Menu_Item *mi) { Pager *pager; @@ -2380,3 +2122,30 @@ e_gadman_client_resize(face->gmc, face->fw, h); } } + +static void +_pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) +{ + Pager *p; + + p = data; + if (!p) return; + e_int_config_pager(e_container_current_get(e_manager_current_get()), p); +} + +void +_pager_cb_config_updated(void *data) +{ + Pager *pager; + Evas_List *l; + + /* Handle Desktop Name Position Change */ + pager = data; + for (l = pager->faces; l; l = l->next) + { + Pager_Face *face; + + face = l->data; + _pager_face_deskname_position_change(face); + } +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- e_mod_main.h 5 Oct 2005 17:56:35 -0000 1.37 +++ e_mod_main.h 16 Dec 2005 20:57:24 -0000 1.38 @@ -68,7 +68,6 @@ Ecore_Event_Handler *ev_handler_zone_desk_count_set; Ecore_Event_Handler *ev_handler_desk_show; Ecore_Event_Handler *ev_handler_desk_name_change; - Ecore_Event_Handler *ev_handler_container_resize; }; struct _Pager_Face @@ -148,4 +147,6 @@ EAPI int e_modapi_info (E_Module *module); EAPI int e_modapi_about (E_Module *module); +EAPI void _pager_cb_config_updated(void *data); + #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 8 May 2005 22:34:45 -0000 1.4 +++ Makefile.am 16 Dec 2005 20:57:24 -0000 1.5 @@ -20,7 +20,9 @@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ - e_mod_main.h + e_mod_main.h \ + e_mod_config.c \ + e_mod_config.h module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h |
From: <enl...@li...> - 2005-12-16 21:05:06
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: Remove unused function prototype. Formatting =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.150 retrieving revision 1.151 diff -u -3 -r1.150 -r1.151 --- e_mod_main.c 16 Dec 2005 20:57:24 -0000 1.150 +++ e_mod_main.c 16 Dec 2005 21:04:58 -0000 1.151 @@ -83,14 +83,10 @@ static void _pager_face_deskname_position_change(Pager_Face *face); static int _pager_popup_cb_timeout(void *data); -static void _pager_menu_cb_popup_enable(void *data, E_Menu *m, E_Menu_Item *mi); - static void _pager_menu_cb_aspect_keep_height(void *data, E_Menu *m, E_Menu_Item *mi); static void _pager_menu_cb_aspect_keep_width(void *data, E_Menu *m, E_Menu_Item *mi); - static void _pager_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); - static int _pager_count; static E_Config_DD *_conf_edd; |
From: <enl...@li...> - 2005-12-16 23:53:15
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Small Bugfix for Temperature Module =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 16 Dec 2005 17:54:47 -0000 1.2 +++ e_mod_config.c 16 Dec 2005 23:53:09 -0000 1.3 @@ -77,11 +77,11 @@ { cfdata->poll_method = 1; //Fast } - else if ((p > 5) && (p <=10)) + else if ((p > 5) && (p <= 10)) { cfdata->poll_method = 10; //Normal } - else if ((p > 10) && (p <=30)) + else if ((p > 10) && (p <= 30)) { cfdata->poll_method = 30; //Slow } @@ -222,7 +222,7 @@ { t->conf->low = (30 + (50 * t->conf->units)); } - else if (cfdata->low_method == 120) + else if (cfdata->low_method == 100) { t->conf->low = (50 + (70 * t->conf->units)); } @@ -313,12 +313,12 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Low Temperature"), 0); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 100, 10, 0, NULL, &(cfdata->low_temp), 200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 100, 5, 0, NULL, &(cfdata->low_temp), 200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("High Temperature"), 0); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 220, 10, 0, NULL, &(cfdata->high_temp), 200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 220, 5, 0, NULL, &(cfdata->high_temp), 200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); |
From: <enl...@li...> - 2005-12-17 02:14:26
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_includes.h e_configure.c Makefile.am Added Files: e_int_config_menus.h e_int_config_menus.c Log Message: Add Config Panel Dialogue For Menu Settings =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_includes.h 6 Dec 2005 14:25:57 -0000 1.70 +++ e_includes.h 17 Dec 2005 02:14:19 -0000 1.71 @@ -101,5 +101,6 @@ #include "e_int_config_window_manipulation.h" #include "e_int_config_window_display.h" #include "e_int_config_background.h" +#include "e_int_config_menus.h" #include "e_deskpreview.h" #include "e_exebuf.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_configure.c 22 Nov 2005 09:27:25 -0000 1.14 +++ e_configure.c 17 Dec 2005 02:14:19 -0000 1.15 @@ -60,6 +60,7 @@ /* add items here */ e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"), e_int_config_focus); e_configure_standard_item_add(eco, "enlightenment/e", _("Desktop Settings"), e_int_config_desks); + e_configure_standard_item_add(eco, "enlightenment/e", _("Menu Settings"), e_int_config_menus); e_configure_standard_item_add(eco, "enlightenment/e", _("Window Manipulation"), e_int_config_window_manipulation); e_configure_standard_item_add(eco, "enlightenment/e", _("Window Display"), e_int_config_window_display); //e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background Settings"), e_int_config_background); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- Makefile.am 6 Dec 2005 14:25:57 -0000 1.86 +++ Makefile.am 17 Dec 2005 02:14:19 -0000 1.87 @@ -121,6 +121,7 @@ e_int_config_window_manipulation.h \ e_int_config_window_display.h \ e_int_config_background.h \ +e_int_config_menus.h \ e_deskpreview.h \ e_exebuf.h @@ -224,6 +225,7 @@ e_int_config_window_manipulation.c \ e_int_config_window_display.c \ e_int_config_background.c \ +e_int_config_menus.c \ e_deskpreview.c \ e_exebuf.c \ $(ENLIGHTENMENTHEADERS) |
From: <enl...@li...> - 2005-12-17 02:23:56
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_config.c Log Message: More User Friendly Work & Formatting =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 16 Dec 2005 17:54:19 -0000 1.6 +++ e_mod_config.c 17 Dec 2005 02:23:50 -0000 1.7 @@ -80,7 +80,6 @@ if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE; if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE; - cfdata->follow_speed = ib->conf->follow_speed; cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } @@ -115,7 +114,6 @@ of = e_widget_framelist_add(evas, _("Icon Size"), 0); rg = e_widget_radio_group_new(&(cfdata->icon_method)); - ob = e_widget_radio_add(evas, _("Small"), ICONSIZE_SMALL, rg); e_widget_framelist_object_append(of, ob); ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg); @@ -126,7 +124,6 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - return o; } @@ -181,14 +178,14 @@ /* Advanced Options */ of = e_widget_framelist_add(evas, _("Advanced Settings"), 0); - ob = e_widget_label_add(evas, _("Follower Speed:")); + ob = e_widget_label_add(evas, _("Follow Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); e_widget_framelist_object_append(of, ob); ob = e_widget_label_add(evas, _("Autoscroll Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -199,7 +196,6 @@ { e_border_button_bindings_ungrab_all(); ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) { cfdata->width = IBAR_WIDTH_FIXED; @@ -209,13 +205,9 @@ cfdata->width = IBAR_WIDTH_AUTO; } ib->conf->width = cfdata->width; - ib->conf->iconsize = cfdata->iconsize; - - printf("Data Speed: %f\n", cfdata->follow_speed); ib->conf->follow_speed = cfdata->follow_speed; ib->conf->autoscroll_speed = cfdata->autoscroll_speed; - e_border_button_bindings_grab_all(); e_config_save_queue(); |
From: <enl...@li...> - 2005-12-17 02:24:15
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c Log Message: More User Friendly Work & Formatting =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 16 Dec 2005 17:54:33 -0000 1.6 +++ e_mod_config.c 17 Dec 2005 02:24:04 -0000 1.7 @@ -73,13 +73,11 @@ { cfdata->method = 0; } - cfdata->iconsize = ib->conf->iconsize; if (cfdata->iconsize <=24) cfdata->icon_method = ICONSIZE_SMALL; if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM; if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE; if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE; - cfdata->follow_speed = ib->conf->follow_speed; cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } @@ -113,7 +111,6 @@ of = e_widget_framelist_add(evas, _("Icon Size"), 0); rg = e_widget_radio_group_new(&(cfdata->icon_method)); - ob = e_widget_radio_add(evas, _("Small"), ICONSIZE_SMALL, rg); e_widget_framelist_object_append(of, ob); ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg); @@ -124,7 +121,6 @@ e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - return o; } @@ -132,7 +128,6 @@ { e_border_button_bindings_ungrab_all(); ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) { cfdata->width = IBOX_WIDTH_FIXED; @@ -142,7 +137,6 @@ cfdata->width = IBOX_WIDTH_AUTO; } ib->conf->width = cfdata->width; - if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24; if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32; if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40; @@ -178,14 +172,13 @@ /* Advanced Options */ of = e_widget_framelist_add(evas, _("Advanced Settings"), 0); - ob = e_widget_label_add(evas, _("Follower Speed:")); + ob = e_widget_label_add(evas, _("Follow Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Autoscroll Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -196,7 +189,6 @@ { e_border_button_bindings_ungrab_all(); ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) { cfdata->width = IBOX_WIDTH_FIXED; @@ -206,9 +198,7 @@ cfdata->width = IBOX_WIDTH_AUTO; } ib->conf->width = cfdata->width; - ib->conf->iconsize = cfdata->iconsize; - ib->conf->follow_speed = cfdata->follow_speed; ib->conf->autoscroll_speed = cfdata->autoscroll_speed; |
From: <enl...@li...> - 2005-12-17 20:55:04
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c e_mod_config.c e_mod_main.h Log Message: Re-Enable Edit Mode. Make e_modapi_config use the same configure call as menu->configuration method. Updated e_mod_config.c to use the dialog that raster designed. :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- e_mod_main.c 17 Dec 2005 11:21:53 -0000 1.93 +++ e_mod_main.c 17 Dec 2005 20:54:52 -0000 1.94 @@ -94,32 +94,6 @@ static void _ibar_drag_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y); static void _ibar_drag_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h); -/* PROTOTYPES - same all the time */ -typedef struct _CFData CFData; - -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); -static void _ibar_config_dialog(IBar *ib); - - -/* Actual config data we will be playing with whil the dialog is active */ -struct _CFData -{ - /*- BASIC -*/ - //int mode; - /*- ADVANCED -*/ - int follower; - double follow_speed; - int iconsize; - int autofit; - double autoscroll_speed; -}; - - /* Config Updated Function Protos */ static void _ibar_bar_cb_width_auto(void *data); static void _ibar_bar_cb_follower(void *data); @@ -192,9 +166,11 @@ e_modapi_config(E_Module *m) { IBar *ib; + E_Container *con; ib = m->data; - if (ib) _ibar_config_dialog(ib); + con = e_container_current_get(e_manager_current_get()); + if (ib) e_int_config_ibar(con, ib); return 1; } @@ -654,15 +630,6 @@ mn = e_menu_new(); ibb->menu = mn; - /* Enabled */ - /* - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, "Enabled"); - e_menu_item_check_set(mi, 1); - if (ibb->conf->enabled) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _ibar_bar_cb_menu_enabled, ibb); - */ - /* Config */ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); @@ -1817,25 +1784,6 @@ } } -/* -static void -_ibar_bar_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - IBar_Bar *ibb; - unsigned char enabled; - - ibb = data; - enabled = e_menu_item_toggle_get(mi); - if ((ibb->conf->enabled) && (!enabled)) - { - _ibar_bar_disable(ibb); - } - else if ((!ibb->conf->enabled) && (enabled)) - { - _ibar_bar_enable(ibb); - } -} - static void _ibar_bar_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -1858,266 +1806,3 @@ evas_object_resize(o, w, h); evas_object_resize(data, w, h); } -*/ - - -/* Config dialog info */ -static void -_ibar_config_dialog(IBar *ib) -{ - E_Config_Dialog *cfd; - E_Config_Dialog_View v; - E_Manager *man; - E_Container *con; - //IBar *ib; - //ib = ibb->ibar; - man = e_manager_current_get(); - //if (!man) return NULL; - con = e_container_current_get(man); - - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ib); - //ib->conf_diag = cfd; -} - -/**--CREATE--**/ -static void -_fill_data(IBar *ib,CFData *cfdata) -{ - cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO); - cfdata->autoscroll_speed = ib->conf->autoscroll_speed; - cfdata->follower = ib->conf->follower; - cfdata->follow_speed = ib->conf->follow_speed; - cfdata->iconsize = ib->conf->iconsize; -} - -static void * -_create_data(E_Config_Dialog *cfd) -{ - /* Create cfdata - cfdata is a temporary block of config data that this - * dialog will be dealing with while configuring. it will be applied to - * the running systems/config in the apply methods - */ - CFData *cfdata; - IBar *ib; - ib = cfd->data; - - cfdata = E_NEW(CFData, 1); - _fill_data(ib,cfdata); - return cfdata; -} - -static void -_free_data(E_Config_Dialog *cfd, CFData *cfdata) -{ - /* Free the cfdata */ - - free(cfdata); -} - -/**--APPLY--**/ -static int -_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) -{ - IBar *ib; - IBar_Bar *ibb; - Evas_List *l; - ib = cfd->data; - -/* Follower */ - if ((cfdata->follower) && (!ib->conf->follower)) - { - ib->conf->follower = 1; - for (l = ib->bars; l; l = l->next) - { - Evas_Object *o; - - ibb = l->data; - if (ibb->overlay_object) continue; - o = edje_object_add(ibb->evas); - ibb->overlay_object = o; - evas_object_layer_set(o, 2); - e_theme_edje_object_set(o, "base/theme/modules/ibar", - "modules/ibar/follower"); - evas_object_show(o); - _ibar_bar_follower_reset(ibb); - } - } - else if (!(cfdata->follower) && (ib->conf->follower)) - { - ib->conf->follower = 0; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - if (!ibb->overlay_object) continue; - evas_object_del(ibb->overlay_object); - ibb->overlay_object = NULL; - } - } - -/* Auto fit */ -if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED)) - { - ib->conf->width = IBAR_WIDTH_AUTO; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } - } - else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO)) - { - ib->conf->width = IBAR_WIDTH_FIXED; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } - } - return 1; -} - -static int -_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) -{ - IBar *ib; - IBar_Bar *ibb; - Evas_List *l; - ib = cfd->data; - -/* Follower */ - if ((cfdata->follower) && (!ib->conf->follower)) - { - ib->conf->follower = 1; - for (l = ib->bars; l; l = l->next) - { - Evas_Object *o; - - ibb = l->data; - if (ibb->overlay_object) continue; - o = edje_object_add(ibb->evas); - ibb->overlay_object = o; - evas_object_layer_set(o, 2); - e_theme_edje_object_set(o, "base/theme/modules/ibar", - "modules/ibar/follower"); - evas_object_show(o); - } - } - else if (!(cfdata->follower) && (ib->conf->follower)) - { - ib->conf->follower = 0; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - if (!ibb->overlay_object) continue; - evas_object_del(ibb->overlay_object); - ibb->overlay_object = NULL; - } - } - - /* Auto fit */ - if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED)) - { - ib->conf->width = IBAR_WIDTH_AUTO; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } - } - else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO)) - { - ib->conf->width = IBAR_WIDTH_FIXED; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_update_policy(ibb); - _ibar_bar_frame_resize(ibb); - } - } - -/* Icon size */ - if (cfdata->iconsize != ib->conf->iconsize) - { - ib->conf->iconsize = cfdata->iconsize; - for (l = ib->bars; l; l = l->next) - { - ibb = l->data; - _ibar_bar_cb_iconsize_change(ibb); - } - } - - e_config_save_queue(); - return 1; -} - -/**--GUI--**/ -static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) -{ - /* generate the core widget layout for a basic dialog */ - Evas_Object *o, *ob; - E_Radio_Group *rg; - IBar *ib; - ib = cfd->data; - - _fill_data(ib,cfdata); - o = e_widget_list_add(evas, 0, 0); - ob = e_widget_check_add(evas, _("Follower"), &(cfdata->follower)); - e_widget_list_object_append(o, ob, 1, 1, 0.5); - ob = e_widget_check_add(evas, _("Auto fit"), &(cfdata->autofit)); - e_widget_list_object_append(o, ob, 1, 1, 0.5); - return o; -} - -static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) -{ - /* generate the core widget layout for an advanced dialog */ - Evas_Object *o, *ob, *of,*oo; - E_Radio_Group *rg; - IBar *ib; - ib = cfd->data; - - _fill_data(ib,cfdata); - - o = e_widget_list_add(evas, 0, 0); - - of = e_widget_framelist_add(evas, _("Follower"), 0); - ob = e_widget_check_add(evas, _("Visible"), &(cfdata->follower)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Follow speed")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01,0, &(cfdata->follow_speed), NULL, 200); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - - of = e_widget_framelist_add(evas, _("Icon size"), 0); - ob = e_widget_slider_add(evas, 1, 0, _("%3.0f px"), 8.0, 128.0, 1.0,0, NULL, &(cfdata->iconsize), 200); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - - of = e_widget_framelist_add(evas, _("Width"), 0); - ob = e_widget_check_add(evas, _("Auto fit"), &(cfdata->autofit)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Autoscroll speed")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01,0, &(cfdata->autoscroll_speed), NULL, 200); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - - return o; -} - =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 17 Dec 2005 02:23:50 -0000 1.7 +++ e_mod_config.c 17 Dec 2005 20:54:52 -0000 1.8 @@ -12,15 +12,9 @@ struct _cfdata { - /* Basic Config */ - int method; - int icon_method; - + int autofit; int follower; - int width; int iconsize; - - /* Advanced Config */ double follow_speed; double autoscroll_speed; }; @@ -40,15 +34,11 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -IBar *ib = NULL; - void e_int_config_ibar(E_Container *con, IBar *ibar) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - ib = ibar; - /* Dialog Methods */ v.create_cfdata = _create_data; v.free_cfdata = _free_data; @@ -58,28 +48,14 @@ v.advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("IBar Module"), NULL, 0, &v, ibar); + cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar); } -static void _fill_data(CFData *cfdata) +static void _fill_data(IBar *ib, CFData *cfdata) { + cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO); cfdata->follower = ib->conf->follower; - cfdata->width = ib->conf->width; - if (cfdata->width == IBAR_WIDTH_AUTO) - { - cfdata->method = 1; - } - else - { - cfdata->method = 0; - } - - cfdata->iconsize = ib->conf->iconsize; - if (cfdata->iconsize <=24) cfdata->icon_method = ICONSIZE_SMALL; - if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM; - if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE; - if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE; - + cfdata->iconsize = ib->conf->iconsize; cfdata->follow_speed = ib->conf->follow_speed; cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } @@ -87,8 +63,11 @@ static void *_create_data(E_Config_Dialog *cfd) { CFData *cfdata; - + IBar *ib; + + ib = cfd->data; cfdata = E_NEW(CFData, 1); + _fill_data(ib, cfdata); return cfdata; } @@ -99,54 +78,44 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob; - E_Radio_Group *rg; - - _fill_data(cfdata); + Evas_Object *o, *ob; + IBar *ib; + + ib = cfd->data; + _fill_data(ib, cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Icon Size"), 0); - rg = e_widget_radio_group_new(&(cfdata->icon_method)); - ob = e_widget_radio_add(evas, _("Small"), ICONSIZE_SMALL, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Large"), ICONSIZE_LARGE, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Very Large"), ICONSIZE_VERYLARGE, rg); - e_widget_framelist_object_append(of, ob); - - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(o, ob, 1, 1, 0.5); + ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit)); + e_widget_list_object_append(o, ob, 1, 1, 0.5); return o; } static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + IBar *ib; + Evas_List *l; + + ib = cfd->data; e_border_button_bindings_ungrab_all(); - ib->conf->follower = cfdata->follower; - - if (cfdata->method == 0) + if ((cfdata->follower) && (!ib->conf->follower)) { - cfdata->width = IBAR_WIDTH_FIXED; + ib->conf->follower = 1; } - else + else if (!(cfdata->follower) && (ib->conf->follower)) { - cfdata->width = IBAR_WIDTH_AUTO; + ib->conf->follower = 0; + } + + if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED)) + { + ib->conf->width = IBAR_WIDTH_AUTO; + } + else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO)) + { + ib->conf->width = IBAR_WIDTH_FIXED; } - ib->conf->width = cfdata->width; - - if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24; - if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32; - if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40; - if (cfdata->icon_method == ICONSIZE_VERYLARGE) ib->conf->iconsize = 48; - e_border_button_bindings_grab_all(); e_config_save_queue(); @@ -158,56 +127,75 @@ { Evas_Object *o, *of, *ob, *ot; E_Radio_Group *rg; - - _fill_data(cfdata); + IBar *ib; + + ib = cfd->data; + _fill_data(ib, cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); + + of = e_widget_framelist_add(evas, _("Follower"), 0); + ob = e_widget_check_add(evas, _("Visible"), &(cfdata->follower)); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Icon Settings"), 0); - ob = e_widget_label_add(evas, _("Icon Size:")); + ob = e_widget_label_add(evas, _("Follow Speed")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 8, 128, 1, 0, NULL, &(cfdata->iconsize), 200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0, &(cfdata->follow_speed), NULL,200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - /* Advanced Options */ - of = e_widget_framelist_add(evas, _("Advanced Settings"), 0); - ob = e_widget_label_add(evas, _("Follow Speed:")); + of = e_widget_framelist_add(evas, _("Icon Size"), 0); + ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 8.0, 128.0, 1.0, 0, NULL, &(cfdata->iconsize), 200); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Width"), 0); + ob = e_widget_check_add(evas, _("Auto Fit"), &(cfdata->autofit)); e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("Autoscroll Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); return o; } static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + IBar *ib; + + ib = cfd->data; e_border_button_bindings_ungrab_all(); - ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) + if ((cfdata->follower) && (!ib->conf->follower)) + { + ib->conf->follower = 1; + } + else if (!(cfdata->follower) && (ib->conf->follower)) + { + ib->conf->follower = 0; + } + + if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED)) { - cfdata->width = IBAR_WIDTH_FIXED; + ib->conf->width = IBAR_WIDTH_AUTO; } - else + else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO)) { - cfdata->width = IBAR_WIDTH_AUTO; + ib->conf->width = IBAR_WIDTH_FIXED; } - ib->conf->width = cfdata->width; - ib->conf->iconsize = cfdata->iconsize; - ib->conf->follow_speed = cfdata->follow_speed; - ib->conf->autoscroll_speed = cfdata->autoscroll_speed; + + if (cfdata->iconsize != ib->conf->iconsize) + { + ib->conf->iconsize = cfdata->iconsize; + } + if (cfdata->follow_speed != ib->conf->follow_speed) + { + ib->conf->follow_speed = cfdata->follow_speed; + } + if (cfdata->autoscroll_speed != ib->conf->autoscroll_speed) + { + ib->conf->autoscroll_speed = cfdata->autoscroll_speed; + } + e_border_button_bindings_grab_all(); e_config_save_queue(); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- e_mod_main.h 14 Dec 2005 23:08:07 -0000 1.25 +++ e_mod_main.h 17 Dec 2005 20:54:52 -0000 1.26 @@ -34,8 +34,6 @@ E_App *apps; Evas_List *bars; E_Menu *config_menu; - E_Menu *config_menu_options; - E_Menu *config_menu_size; Config *conf; }; |
From: <enl...@li...> - 2005-12-17 21:16:45
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c Log Message: Updated module to use the dialog that raster designed. :) Some Cleanups =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 17 Dec 2005 02:24:04 -0000 1.7 +++ e_mod_config.c 17 Dec 2005 21:16:38 -0000 1.8 @@ -5,22 +5,11 @@ typedef struct _cfdata CFData; typedef struct _Cfg_File_Data Cfg_File_Data; -#define ICONSIZE_SMALL 24 -#define ICONSIZE_MEDIUM 32 -#define ICONSIZE_LARGE 40 -#define ICONSIZE_VERYLARGE 48 - struct _cfdata { - /* Basic Config */ - int method; - int icon_method; - + int autofit; int follower; - int width; int iconsize; - - /* Advanced Config */ double follow_speed; double autoscroll_speed; }; @@ -40,15 +29,11 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -IBox *ib = NULL; - void e_int_config_ibox(E_Container *con, IBox *ibox) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - ib = ibox; - /* Dialog Methods */ v.create_cfdata = _create_data; v.free_cfdata = _free_data; @@ -58,26 +43,14 @@ v.advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("IBox Module"), NULL, 0, &v, ibox); + cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox); } -static void _fill_data(CFData *cfdata) +static void _fill_data(IBox *ib, CFData *cfdata) { + cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO); cfdata->follower = ib->conf->follower; - cfdata->width = ib->conf->width; - if (cfdata->width == IBOX_WIDTH_AUTO) - { - cfdata->method = 1; - } - else - { - cfdata->method = 0; - } cfdata->iconsize = ib->conf->iconsize; - if (cfdata->iconsize <=24) cfdata->icon_method = ICONSIZE_SMALL; - if ((cfdata->iconsize > 24) && (cfdata->iconsize <=32)) cfdata->icon_method = ICONSIZE_MEDIUM; - if ((cfdata->iconsize > 32) && (cfdata->iconsize <=40)) cfdata->icon_method = ICONSIZE_LARGE; - if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE; cfdata->follow_speed = ib->conf->follow_speed; cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } @@ -85,8 +58,11 @@ static void *_create_data(E_Config_Dialog *cfd) { CFData *cfdata; - + IBox *ib; + + ib = cfd->data; cfdata = E_NEW(CFData, 1); + _fill_data(ib, cfdata); return cfdata; } @@ -97,51 +73,44 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob; - E_Radio_Group *rg; + Evas_Object *o, *ob; + IBox *ib; + + ib = cfd->data; + _fill_data(ib, cfdata); - _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Icon Size"), 0); - rg = e_widget_radio_group_new(&(cfdata->icon_method)); - ob = e_widget_radio_add(evas, _("Small"), ICONSIZE_SMALL, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Large"), ICONSIZE_LARGE, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Very Large"), ICONSIZE_VERYLARGE, rg); - e_widget_framelist_object_append(of, ob); - - e_widget_list_object_append(o, of, 1, 1, 0.5); + e_widget_list_object_append(o, ob, 1, 1, 0.5); + ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit)); + e_widget_list_object_append(o, ob, 1, 1, 0.5); return o; } static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + IBox *ib; + Evas_List *l; + + ib = cfd->data; e_border_button_bindings_ungrab_all(); - ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) + if ((cfdata->follower) && (!ib->conf->follower)) { - cfdata->width = IBOX_WIDTH_FIXED; + ib->conf->follower = 1; } - else + else if (!(cfdata->follower) && (ib->conf->follower)) { - cfdata->width = IBOX_WIDTH_AUTO; + ib->conf->follower = 0; } - ib->conf->width = cfdata->width; - if (cfdata->icon_method == ICONSIZE_SMALL) ib->conf->iconsize = 24; - if (cfdata->icon_method == ICONSIZE_MEDIUM) ib->conf->iconsize = 32; - if (cfdata->icon_method == ICONSIZE_LARGE) ib->conf->iconsize = 40; - if (cfdata->icon_method == ICONSIZE_VERYLARGE) ib->conf->iconsize = 48; + if ((cfdata->autofit) && (ib->conf->width == IBOX_WIDTH_FIXED)) + { + ib->conf->width = IBOX_WIDTH_AUTO; + } + else if (!(cfdata->autofit) && (ib->conf->width == IBOX_WIDTH_AUTO)) + { + ib->conf->width = IBOX_WIDTH_FIXED; + } e_border_button_bindings_grab_all(); e_config_save_queue(); @@ -151,57 +120,76 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob, *ot; - E_Radio_Group *rg; + Evas_Object *o, *of, *ob; + IBox *ib; + + ib = cfd->data; + _fill_data(ib, cfdata); - _fill_data(cfdata); o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->method)); + + of = e_widget_framelist_add(evas, _("Follower"), 0); + ob = e_widget_check_add(evas, _("Visible"), &(cfdata->follower)); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); - - of = e_widget_framelist_add(evas, _("Icon Settings"), 0); - ob = e_widget_label_add(evas, _("Icon Size:")); + ob = e_widget_label_add(evas, _("Follow Speed")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 8, 128, 1, 0, NULL, &(cfdata->iconsize), 200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0, &(cfdata->follow_speed), NULL,200); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - /* Advanced Options */ - of = e_widget_framelist_add(evas, _("Advanced Settings"), 0); - ob = e_widget_label_add(evas, _("Follow Speed:")); + of = e_widget_framelist_add(evas, _("Icon Size"), 0); + ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 8.0, 128.0, 1.0, 0, NULL, &(cfdata->iconsize), 200); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->follow_speed), NULL,200); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Width"), 0); + ob = e_widget_check_add(evas, _("Auto Fit"), &(cfdata->autofit)); e_widget_framelist_object_append(of, ob); ob = e_widget_label_add(evas, _("Autoscroll Speed:")); e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.2f pixels/sec"), 0.01, 0.99, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f px/s"), 0.0, 1.0, 0.01, 0, &(cfdata->autoscroll_speed), NULL,200); e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); return o; } static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + IBox *ib; + + ib = cfd->data; e_border_button_bindings_ungrab_all(); - ib->conf->follower = cfdata->follower; - if (cfdata->method == 0) + if ((cfdata->follower) && (!ib->conf->follower)) + { + ib->conf->follower = 1; + } + else if (!(cfdata->follower) && (ib->conf->follower)) + { + ib->conf->follower = 0; + } + + if ((cfdata->autofit) && (ib->conf->width == IBOX_WIDTH_FIXED)) { - cfdata->width = IBOX_WIDTH_FIXED; + ib->conf->width = IBOX_WIDTH_AUTO; } - else + else if (!(cfdata->autofit) && (ib->conf->width == IBOX_WIDTH_AUTO)) { - cfdata->width = IBOX_WIDTH_AUTO; + ib->conf->width = IBOX_WIDTH_FIXED; } - ib->conf->width = cfdata->width; - ib->conf->iconsize = cfdata->iconsize; - ib->conf->follow_speed = cfdata->follow_speed; - ib->conf->autoscroll_speed = cfdata->autoscroll_speed; + if (cfdata->iconsize != ib->conf->iconsize) + { + ib->conf->iconsize = cfdata->iconsize; + } + if (cfdata->follow_speed != ib->conf->follow_speed) + { + ib->conf->follow_speed = cfdata->follow_speed; + } + if (cfdata->autoscroll_speed != ib->conf->autoscroll_speed) + { + ib->conf->autoscroll_speed = cfdata->autoscroll_speed; + } + e_border_button_bindings_grab_all(); e_config_save_queue(); |
From: <enl...@li...> - 2005-12-17 21:53:17
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_config.c Log Message: Clean up e_mod_config.c =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 16 Dec 2005 05:21:12 -0000 1.3 +++ e_mod_config.c 17 Dec 2005 21:53:11 -0000 1.4 @@ -27,16 +27,12 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -Battery *b = NULL; - void e_int_config_battery(E_Container *con, Battery *bat) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - b = bat; - v.create_cfdata = _create_data; v.free_cfdata = _free_data; v.basic.apply_cfdata = _basic_apply_data; @@ -44,11 +40,11 @@ v.advanced.apply_cfdata = _advanced_apply_data; v.advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, _("Battery Module"), NULL, 0, &v, bat); + cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, &v, bat); } static void -_fill_data(CFData *cfdata) +_fill_data(Battery *b, CFData *cfdata) { cfdata->alarm_time = b->conf->alarm; cfdata->poll_time = b->conf->poll_time; @@ -66,7 +62,11 @@ *_create_data(E_Config_Dialog *cfd) { CFData *cfdata; + Battery *b; + + b = cfd->data; cfdata = E_NEW(CFData, 1); + _fill_data(b, cfdata); return cfdata; } @@ -79,9 +79,11 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { + Battery *b; Evas_Object *o, *of, *ob; - _fill_data(cfdata); + b = cfd->data; + _fill_data(b, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Basic Settings"), 0); @@ -94,6 +96,9 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Battery *b; + + b = cfd->data; e_border_button_bindings_ungrab_all(); b->conf->poll_time = 10.0; e_border_button_bindings_grab_all(); @@ -107,9 +112,11 @@ *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *of, *ob, *ot; + Battery *b; /* Use Sliders for both cfg options */ - _fill_data(cfdata); + b = cfd->data; + _fill_data(b, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_frametable_add(evas, _("Advanced Settings"), 1); @@ -136,6 +143,9 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Battery *b; + + b = cfd->data; e_border_button_bindings_ungrab_all(); b->conf->poll_time = cfdata->poll_time; |
From: <enl...@li...> - 2005-12-17 21:56:36
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.c Log Message: Clean up e_mod_config.c =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 16 Dec 2005 17:54:04 -0000 1.2 +++ e_mod_config.c 17 Dec 2005 21:56:28 -0000 1.3 @@ -23,16 +23,12 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -Clock_Face *clk = NULL; - void e_int_config_clock(E_Container *con, Clock_Face *c) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - clk = c; - /* Dialog Methods */ v.create_cfdata = _create_data; v.free_cfdata = _free_data; @@ -46,7 +42,7 @@ } static void -_fill_data(CFData *cfdata) +_fill_data(Clock_Face *clk, CFData *cfdata) { cfdata->digital_style = clk->conf->digitalStyle; } @@ -71,8 +67,10 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; + Clock_Face *c; - _fill_data(cfdata); + c = cfd->data; + _fill_data(c, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); @@ -90,6 +88,9 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Clock_Face *clk; + + clk = cfd->data; e_border_button_bindings_ungrab_all(); clk->conf->digitalStyle = cfdata->digital_style; e_border_button_bindings_grab_all(); |
From: <enl...@li...> - 2005-12-17 21:59:08
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_config.c Log Message: Clean up e_mod_config.c =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 16 Dec 2005 20:57:24 -0000 1.1 +++ e_mod_config.c 17 Dec 2005 21:59:02 -0000 1.2 @@ -28,16 +28,12 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -Pager *p = NULL; - void e_int_config_pager(E_Container *con, Pager *pager) { E_Config_Dialog *cfd; E_Config_Dialog_View v; - p = pager; - v.create_cfdata = _create_data; v.free_cfdata = _free_data; v.basic.apply_cfdata = _basic_apply_data; @@ -49,7 +45,7 @@ } static void -_fill_data(CFData *cfdata) +_fill_data(Pager *p, CFData *cfdata) { /* Name Pos, Show Popup, popup_speed */ cfdata->name_pos = p->conf->deskname_pos; @@ -87,8 +83,10 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; + Pager *p; - _fill_data(cfdata); + p = cfd->data; + _fill_data(p, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); @@ -119,6 +117,9 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Pager *p; + + p = cfd->data; e_border_button_bindings_ungrab_all(); p->conf->popup = cfdata->show_popup; @@ -136,8 +137,10 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; + Pager *p; - _fill_data(cfdata); + p = cfd->data; + _fill_data(p, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("General Settings"), 0); @@ -174,6 +177,9 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Pager *p; + + p = cfd->data; e_border_button_bindings_ungrab_all(); p->conf->popup = cfdata->show_popup; |
From: <enl...@li...> - 2005-12-17 22:02:12
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Clean up e_mod_config.c =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 16 Dec 2005 23:53:09 -0000 1.3 +++ e_mod_config.c 17 Dec 2005 22:02:05 -0000 1.4 @@ -27,8 +27,6 @@ char *file; }; -Temperature *t = NULL; - /* Protos */ static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, Config *cfdata); static void *_create_data(E_Config_Dialog *cfd); @@ -44,8 +42,6 @@ E_Config_Dialog *cfd; E_Config_Dialog_View v; - t = temp; - v.create_cfdata = _create_data; v.free_cfdata = _free_data; v.basic.apply_cfdata = _basic_apply_data; @@ -57,7 +53,7 @@ } static void -_fill_data(CFData *cfdata) +_fill_data(Temperature *t, CFData *cfdata) { double p; @@ -154,8 +150,11 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; - - _fill_data(cfdata); + Temperature *t; + + t = cfd->data; + _fill_data(t, cfdata); + o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Display Units"), 0); rg = e_widget_radio_group_new(&(cfdata->unit_method)); @@ -203,6 +202,9 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Temperature *t; + + t = cfd->data; e_border_button_bindings_ungrab_all(); if (cfdata->unit_method == 0) { @@ -253,8 +255,10 @@ { Evas_Object *o, *of, *ob; E_Radio_Group *rg; - - _fill_data(cfdata); + Temperature *t; + + t = cfd->data; + _fill_data(t, cfdata); o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Display Units"), 0); @@ -328,6 +332,10 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { + Temperature *t; + + t = cfd->data; + e_border_button_bindings_ungrab_all(); if (cfdata->unit_method == 0) { |
From: <enl...@li...> - 2005-12-17 22:06:49
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.c Log Message: Change Module To Configuration in the dialogue =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 17 Dec 2005 21:56:28 -0000 1.3 +++ e_mod_config.c 17 Dec 2005 22:06:41 -0000 1.4 @@ -38,7 +38,7 @@ v.advanced.create_widgets = NULL; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Clock Module"), NULL, 0, &v, c); + cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, &v, c); } static void |
From: <enl...@li...> - 2005-12-17 22:08:32
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_config.c Log Message: Change Module To Configuration in the dialogue =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 17 Dec 2005 21:59:02 -0000 1.2 +++ e_mod_config.c 17 Dec 2005 22:08:24 -0000 1.3 @@ -41,7 +41,7 @@ v.advanced.apply_cfdata = _advanced_apply_data; v.advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, _("Pager Module"), NULL, 0, &v, pager); + cfd = e_config_dialog_new(con, _("Pager Configuration"), NULL, 0, &v, pager); } static void |
From: <enl...@li...> - 2005-12-17 22:09:59
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Change Module To Configuration in the dialogue =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 17 Dec 2005 22:02:05 -0000 1.4 +++ e_mod_config.c 17 Dec 2005 22:09:53 -0000 1.5 @@ -49,7 +49,7 @@ v.advanced.apply_cfdata = _advanced_apply_data; v.advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, _("Temperature Module"), NULL, 0, &v, temp); + cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, &v, temp); } static void |
From: <enl...@li...> - 2005-12-17 22:57:24
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_main.c Log Message: Fix Autosize Bug When Ibox is at top or bottom of screen =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- e_mod_main.c 17 Dec 2005 11:21:53 -0000 1.31 +++ e_mod_main.c 17 Dec 2005 22:57:15 -0000 1.32 @@ -660,7 +660,7 @@ (e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM)) { /* w is the width of the box */ - e_gadman_client_resize(ibb->gmc, bw, bh); //ibb->w + e_gadman_client_resize(ibb->gmc, ibb->w, bh); } } } |
From: <enl...@li...> - 2005-12-17 23:24:44
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.h Log Message: Update which config properties have GUI =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_config.h 15 Dec 2005 04:29:38 -0000 1.70 +++ e_config.h 17 Dec 2005 23:24:36 -0000 1.71 @@ -72,9 +72,9 @@ Evas_List *desktop_backgrounds; char *desktop_default_name; Evas_List *desktop_names; - double menus_scroll_speed; - double menus_fast_mouse_move_threshhold; - double menus_click_drag_timeout; + double menus_scroll_speed; // GUI + double menus_fast_mouse_move_threshhold; // GUI + double menus_click_drag_timeout; // GUI int border_shade_animate; // GUI int border_shade_transition; // GUI double border_shade_speed; // GUI @@ -169,8 +169,8 @@ int focus_revert_on_hide_or_close; int use_e_cursor; int cursor_size; - int menu_autoscroll_margin; - int menu_autoscroll_cursor_margin; + int menu_autoscroll_margin; // GUI + int menu_autoscroll_cursor_margin; // GUI char *input_method; struct { int move; @@ -182,9 +182,9 @@ int iconify; } transient; int modal_windows; - int menu_eap_name_show; - int menu_eap_generic_show; - int menu_eap_comment_show; + int menu_eap_name_show; // GUI + int menu_eap_generic_show; // GUI + int menu_eap_comment_show; // GUI int fullscreen_policy; int exebuf_max_exe_list; int exebuf_max_eap_list; |
From: <enl...@li...> - 2005-12-18 06:25:52
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 14 Dec 2005 22:46:51 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:25:45 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_battery(E_Container *con, Battery *b); +EAPI void _config_battery_module(E_Container *con, Battery *b); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 17 Dec 2005 21:53:11 -0000 1.4 +++ e_mod_config.c 18 Dec 2005 06:25:45 -0000 1.5 @@ -28,7 +28,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); void -e_int_config_battery(E_Container *con, Battery *bat) +_config_battery_module(E_Container *con, Battery *bat) { E_Config_Dialog *cfd; E_Config_Dialog_View v; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- e_mod_main.c 17 Dec 2005 11:21:53 -0000 1.58 +++ e_mod_main.c 18 Dec 2005 06:25:45 -0000 1.59 @@ -145,7 +145,7 @@ if (!e->faces) return 0; face = e->faces->data; if (!face) return 0; - e_int_config_battery(face->con, face->battery); + _config_battery_module(face->con, face->battery); return 1; } @@ -1582,7 +1582,7 @@ face = data; if (!face) return; - e_int_config_battery(face->con, face->battery); + _config_battery_module(face->con, face->battery); } void |
From: <enl...@li...> - 2005-12-18 06:27:01
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.h 15 Dec 2005 22:33:56 -0000 1.2 +++ e_mod_config.h 18 Dec 2005 06:26:54 -0000 1.3 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_clock(E_Container *con, Clock_Face *c); +EAPI void _config_clock_module(E_Container *con, Clock_Face *c); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 17 Dec 2005 22:06:41 -0000 1.4 +++ e_mod_config.c 18 Dec 2005 06:26:54 -0000 1.5 @@ -24,7 +24,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); void -e_int_config_clock(E_Container *con, Clock_Face *c) +_config_clock_module(E_Container *con, Clock_Face *c) { E_Config_Dialog *cfd; E_Config_Dialog_View v; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_main.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- e_mod_main.c 17 Dec 2005 11:21:53 -0000 1.45 +++ e_mod_main.c 18 Dec 2005 06:26:54 -0000 1.46 @@ -108,7 +108,7 @@ if (!e->faces) return 0; face = e->faces->data; if (!face) return 0; - e_int_config_clock(face->con, face); + _config_clock_module(face->con, face); return 1; } @@ -436,7 +436,7 @@ face = data; if (!face) return; - e_int_config_clock(face->con, face); + _config_clock_module(face->con, face); } void |
From: <enl...@li...> - 2005-12-18 06:28:49
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 13 Dec 2005 04:47:41 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:28:42 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_ibar(E_Container *con, IBar *ibar); +EAPI void _config_ibar_module(E_Container *con, IBar *ibar); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_config.c 17 Dec 2005 20:54:52 -0000 1.8 +++ e_mod_config.c 18 Dec 2005 06:28:42 -0000 1.9 @@ -5,11 +5,6 @@ typedef struct _cfdata CFData; typedef struct _Cfg_File_Data Cfg_File_Data; -#define ICONSIZE_SMALL 24 -#define ICONSIZE_MEDIUM 32 -#define ICONSIZE_LARGE 40 -#define ICONSIZE_VERYLARGE 48 - struct _cfdata { int autofit; @@ -34,7 +29,8 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -void e_int_config_ibar(E_Container *con, IBar *ibar) +void +_config_ibar_module(E_Container *con, IBar *ibar) { E_Config_Dialog *cfd; E_Config_Dialog_View v; @@ -51,7 +47,8 @@ cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar); } -static void _fill_data(IBar *ib, CFData *cfdata) +static void +_fill_data(IBar *ib, CFData *cfdata) { cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO); cfdata->follower = ib->conf->follower; @@ -60,7 +57,8 @@ cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } -static void *_create_data(E_Config_Dialog *cfd) +static void +*_create_data(E_Config_Dialog *cfd) { CFData *cfdata; IBar *ib; @@ -71,12 +69,14 @@ return cfdata; } -static void _free_data(E_Config_Dialog *cfd, CFData *cfdata) +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) { free(cfdata); } -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +static Evas_Object +*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *ob; IBar *ib; @@ -92,7 +92,8 @@ return o; } -static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +static int +_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { IBar *ib; Evas_List *l; @@ -123,10 +124,10 @@ return 1; } -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +static Evas_Object +*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob, *ot; - E_Radio_Group *rg; + Evas_Object *o, *of, *ob; IBar *ib; ib = cfd->data; @@ -159,7 +160,8 @@ return o; } -static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +static int +_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { IBar *ib; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_mod_main.c 17 Dec 2005 20:54:52 -0000 1.94 +++ e_mod_main.c 18 Dec 2005 06:28:42 -0000 1.95 @@ -170,7 +170,7 @@ ib = m->data; con = e_container_current_get(e_manager_current_get()); - if (ib) e_int_config_ibar(con, ib); + if (ib) _config_ibar_module(con, ib); return 1; } @@ -648,7 +648,7 @@ ibb = data; if (!ibb) return; - e_int_config_ibar(ibb->con, ibb->ibar); + _config_ibar_module(ibb->con, ibb->ibar); } static void |
From: <enl...@li...> - 2005-12-18 06:30:47
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 13 Dec 2005 14:32:18 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:30:39 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_ibox(E_Container *con, IBox *ibox); +EAPI void _config_ibox_module(E_Container *con, IBox *ibox); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_config.c 17 Dec 2005 21:16:38 -0000 1.8 +++ e_mod_config.c 18 Dec 2005 06:30:39 -0000 1.9 @@ -29,7 +29,8 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -void e_int_config_ibox(E_Container *con, IBox *ibox) +void +_config_ibox_module(E_Container *con, IBox *ibox) { E_Config_Dialog *cfd; E_Config_Dialog_View v; @@ -46,7 +47,8 @@ cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox); } -static void _fill_data(IBox *ib, CFData *cfdata) +static void +_fill_data(IBox *ib, CFData *cfdata) { cfdata->autofit = (ib->conf->width == IBOX_WIDTH_AUTO); cfdata->follower = ib->conf->follower; @@ -55,7 +57,8 @@ cfdata->autoscroll_speed = ib->conf->autoscroll_speed; } -static void *_create_data(E_Config_Dialog *cfd) +static void +*_create_data(E_Config_Dialog *cfd) { CFData *cfdata; IBox *ib; @@ -66,12 +69,14 @@ return cfdata; } -static void _free_data(E_Config_Dialog *cfd, CFData *cfdata) +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) { free(cfdata); } -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +static Evas_Object +*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *ob; IBox *ib; @@ -87,7 +92,8 @@ return o; } -static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +static int +_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { IBox *ib; Evas_List *l; @@ -118,7 +124,8 @@ return 1; } -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +static Evas_Object +*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { Evas_Object *o, *of, *ob; IBox *ib; @@ -153,7 +160,8 @@ return o; } -static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +static int +_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { IBox *ib; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_mod_main.c 17 Dec 2005 22:57:15 -0000 1.32 +++ e_mod_main.c 18 Dec 2005 06:30:39 -0000 1.33 @@ -157,7 +157,7 @@ if (!e->boxes) return 0; face = e->boxes->data; if (!face) return 0; - e_int_config_ibox(face->con, face->ibox); + _config_ibox_module(face->con, face->ibox); return 1; } @@ -473,7 +473,7 @@ ibb = (IBox_Box *)data; if (!ibb) return; - e_int_config_ibox(ibb->con, ibb->ibox); + _config_ibox_module(ibb->con, ibb->ibox); } static void |
From: <enl...@li...> - 2005-12-18 06:32:13
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 16 Dec 2005 20:57:24 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:32:05 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_pager(E_Container *con, Pager *pager); +EAPI void _config_pager_module(E_Container *con, Pager *pager); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 17 Dec 2005 22:08:24 -0000 1.3 +++ e_mod_config.c 18 Dec 2005 06:32:05 -0000 1.4 @@ -29,7 +29,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); void -e_int_config_pager(E_Container *con, Pager *pager) +_config_pager_module(E_Container *con, Pager *pager) { E_Config_Dialog *cfd; E_Config_Dialog_View v; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.152 retrieving revision 1.153 diff -u -3 -r1.152 -r1.153 --- e_mod_main.c 17 Dec 2005 11:21:53 -0000 1.152 +++ e_mod_main.c 18 Dec 2005 06:32:05 -0000 1.153 @@ -166,7 +166,7 @@ if (!e->faces) return 0; face = e->faces->data; if (!face) return 0; - e_int_config_pager(e_container_current_get(e_manager_current_get()), e); + _config_pager_module(e_container_current_get(e_manager_current_get()), e); return 1; } @@ -2141,7 +2141,7 @@ p = data; if (!p) return; - e_int_config_pager(e_container_current_get(e_manager_current_get()), p); + _config_pager_module(e_container_current_get(e_manager_current_get()), p); } void |
From: <enl...@li...> - 2005-12-18 06:33:20
|
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.h e_mod_config.c e_mod_main.c Log Message: Rename e_int_config calls to avoid E namespace conflicts =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 15 Dec 2005 22:37:14 -0000 1.1 +++ e_mod_config.h 18 Dec 2005 06:33:14 -0000 1.2 @@ -3,6 +3,6 @@ #ifndef E_MOD_CONFIG_H #define E_MOD_CONFIG_H #include "e_mod_main.h" -EAPI void e_int_config_temperature(E_Container *con, Temperature *temp); +EAPI void _config_temperature_module(E_Container *con, Temperature *temp); #endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 17 Dec 2005 22:09:53 -0000 1.5 +++ e_mod_config.c 18 Dec 2005 06:33:14 -0000 1.6 @@ -37,7 +37,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); void -e_int_config_temperature(E_Container *con, Temperature *temp) +_config_temperature_module(E_Container *con, Temperature *temp) { E_Config_Dialog *cfd; E_Config_Dialog_View v; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- e_mod_main.c 17 Dec 2005 11:21:54 -0000 1.46 +++ e_mod_main.c 18 Dec 2005 06:33:14 -0000 1.47 @@ -112,7 +112,7 @@ if (!e->faces) return 0; face = e->faces->data; if (!face) return 0; - e_int_config_temperature(face->con, face->temp); + _config_temperature_module(face->con, face->temp); return 1; } @@ -627,7 +627,7 @@ tf = data; if (!tf) return; - e_int_config_temperature(tf->con, tf->temp); + _config_temperature_module(tf->con, tf->temp); } void |