From 5ded80ff1a3c59fdd4602933a0d9373e64c9dd06 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 19 Mar 2005 12:49:46 +0000 Subject: [PATCH] set the default sizes to somethingn "sane" :) SVN revision: 13790 --- src/modules/battery/e_mod_main.c | 4 ++-- src/modules/clock/e_mod_main.c | 4 ++-- src/modules/ibar/e_mod_main.c | 21 +++------------------ src/modules/ibar/e_mod_main.h | 5 ----- src/modules/pager/e_mod_main.c | 6 +++--- src/modules/temperature/e_mod_main.c | 4 ++-- 6 files changed, 12 insertions(+), 32 deletions(-) diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index f16224cec..e1371de33 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -516,9 +516,9 @@ _battery_face_new(E_Container *con) E_GADMAN_POLICY_VSIZE); e_gadman_client_min_size_set(ef->gmc, 4, 4); e_gadman_client_max_size_set(ef->gmc, 128, 128); - e_gadman_client_auto_size_set(ef->gmc, 64, 64); + e_gadman_client_auto_size_set(ef->gmc, 40, 40); e_gadman_client_align_set(ef->gmc, 1.0, 1.0); - e_gadman_client_resize(ef->gmc, 64, 64); + e_gadman_client_resize(ef->gmc, 40, 40); e_gadman_client_change_func_set(ef->gmc, _battery_face_cb_gmc_change, ef); e_gadman_client_load(ef->gmc); evas_event_thaw(con->bg_evas); diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index c03c7c250..ac12bc54b 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -244,10 +244,10 @@ _clock_face_new(E_Container *con) E_GADMAN_POLICY_VSIZE); e_gadman_client_min_size_set(face->gmc, 4, 4); e_gadman_client_max_size_set(face->gmc, 512, 512); - e_gadman_client_auto_size_set(face->gmc, 64, 64); + e_gadman_client_auto_size_set(face->gmc, 40, 40); e_gadman_client_align_set(face->gmc, 0.0, 1.0); e_gadman_client_aspect_set(face->gmc, 1.0, 1.0); - e_gadman_client_resize(face->gmc, 64, 64); + e_gadman_client_resize(face->gmc, 40, 40); e_gadman_client_change_func_set(face->gmc, _clock_face_cb_gmc_change, face); e_gadman_client_load(face->gmc); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index f015ae79b..7976b36df 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -193,11 +193,6 @@ _ibar_new() E_CONFIG_VAL(D, T, iconsize, INT); E_CONFIG_VAL(D, T, width, INT); E_CONFIG_LIST(D, T, bars, conf_bar_edd); - /* - E_CONFIG_VAL(D, T, anchor, DOUBLE); - E_CONFIG_VAL(D, T, handle, DOUBLE); - E_CONFIG_VAL(D, T, autohide, UCHAR); - */ ib->conf = e_config_domain_load("module.ibar", conf_edd); if (!ib->conf) @@ -206,24 +201,14 @@ _ibar_new() ib->conf->appdir = strdup("bar"); ib->conf->follow_speed = 0.9; ib->conf->autoscroll_speed = 0.95; - ib->conf->iconsize = 32; + ib->conf->iconsize = 24; ib->conf->width = IBAR_WIDTH_AUTO; - /* - ib->conf->anchor = 0.5; - ib->conf->handle = 0.5; - ib->conf->autohide = 0; - */ } E_CONFIG_LIMIT(ib->conf->follow_speed, 0.01, 1.0); E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0); E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400); E_CONFIG_LIMIT(ib->conf->width, -2, -1); - /* - E_CONFIG_LIMIT(ib->conf->anchor, 0.0, 1.0); - E_CONFIG_LIMIT(ib->conf->handle, 0.0, 1.0); - E_CONFIG_LIMIT(ib->conf->autohide, 0, 1); - */ - + _ibar_config_menu_new(ib); if (ib->conf->appdir[0] != '/') @@ -497,7 +482,7 @@ _ibar_bar_new(IBar *ib, E_Container *con) policy |= E_GADMAN_POLICY_HSIZE; e_gadman_client_policy_set(ibb->gmc, policy); e_gadman_client_min_size_set(ibb->gmc, 8, 8); - e_gadman_client_max_size_set(ibb->gmc, 800, 136); + e_gadman_client_max_size_set(ibb->gmc, 3200, 3200); e_gadman_client_auto_size_set(ibb->gmc, -1, -1); e_gadman_client_align_set(ibb->gmc, 0.5, 1.0); e_gadman_client_resize(ibb->gmc, 400, 40); diff --git a/src/modules/ibar/e_mod_main.h b/src/modules/ibar/e_mod_main.h index 29f4b23f7..2f13492b3 100644 --- a/src/modules/ibar/e_mod_main.h +++ b/src/modules/ibar/e_mod_main.h @@ -21,11 +21,6 @@ struct _Config int iconsize; int width; Evas_List *bars; - /* - double anchor; - double handle; - char autohide; - */ }; struct _Config_Bar diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index f7f9eac9b..9be32e021 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -346,10 +346,10 @@ _pager_face_new(E_Zone *zone) E_GADMAN_POLICY_VSIZE | E_GADMAN_POLICY_FIXED_ZONE); e_gadman_client_min_size_set(face->gmc, 8, 8); - e_gadman_client_max_size_set(face->gmc, 400, 400); - e_gadman_client_auto_size_set(face->gmc, 64, 64); + e_gadman_client_max_size_set(face->gmc, 600, 600); + e_gadman_client_auto_size_set(face->gmc, 186, 40); e_gadman_client_align_set(face->gmc, 0.0, 1.0); - e_gadman_client_resize(face->gmc, 80, 60); + e_gadman_client_resize(face->gmc, 186, 40); e_gadman_client_change_func_set(face->gmc, _pager_face_cb_gmc_change, face); e_gadman_client_load(face->gmc); diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 7623742c5..aabcedc5f 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -659,9 +659,9 @@ _temperature_face_new(E_Container *con) E_GADMAN_POLICY_VSIZE); e_gadman_client_min_size_set(ef->gmc, 4, 4); e_gadman_client_max_size_set(ef->gmc, 128, 128); - e_gadman_client_auto_size_set(ef->gmc, 64, 64); + e_gadman_client_auto_size_set(ef->gmc, 40, 40); e_gadman_client_align_set(ef->gmc, 0.9, 1.0); - e_gadman_client_resize(ef->gmc, 64, 64); + e_gadman_client_resize(ef->gmc, 40, 40); e_gadman_client_change_func_set(ef->gmc, _temperature_face_cb_gmc_change, ef); e_gadman_client_load(ef->gmc);