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

IBar Cfg Dlg Icon Size Fixes 

SVN revision: 18991
This commit is contained in:
Christopher Michael 2005-12-13 14:30:54 +00:00
parent 4010eccdd2
commit 1a804fbd5b
1 changed files with 79 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/modules/ibar/e_mod_config.c
View File

@ -5,17 +5,10 @@
typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
#define ICONSIZE_MICROSCOPIC 8
#define ICONSIZE_TINY 12
#define ICONSIZE_VERYSMALL 16
#define ICONSIZE_SMALL 24
#define ICONSIZE_MEDIUM 32
#define ICONSIZE_LARGE 40
#define ICONSIZE_VERYLARGE 48
#define ICONSIZE_EXTLARGE 56
#define ICONSIZE_HUGE 64
#define ICONSIZE_ENORMOUS 96
#define ICONSIZE_GIGANTIC 128
struct _cfdata
{
@ -74,24 +67,21 @@ static void _fill_data(CFData *cfdata)
{
cfdata->follower = ib->conf->follower;
cfdata->width = ib->conf->width;
if (cfdata->width == IBAR_WIDTH_AUTO) {
if (cfdata->width == IBAR_WIDTH_AUTO)
{
cfdata->method = 1;
} else {
}
else
{
cfdata->method = 0;
}
cfdata->iconsize = ib->conf->iconsize;
if (cfdata->iconsize<=8) cfdata->icon_method = ICONSIZE_MICROSCOPIC;
if ((cfdata->iconsize > 8) && (cfdata->iconsize <=12)) cfdata->icon_method = ICONSIZE_TINY;
if ((cfdata->iconsize > 12) && (cfdata->iconsize <=16)) cfdata->icon_method = ICONSIZE_VERYSMALL;
if ((cfdata->iconsize > 16) && (cfdata->iconsize <=24)) cfdata->icon_method = ICONSIZE_SMALL;
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->iconsize <=48)) cfdata->icon_method = ICONSIZE_VERYLARGE;
if ((cfdata->iconsize > 48) && (cfdata->iconsize <=58)) cfdata->icon_method = ICONSIZE_EXTLARGE;
if ((cfdata->iconsize > 58) && (cfdata->iconsize <=64)) cfdata->icon_method = ICONSIZE_HUGE;
if ((cfdata->iconsize > 64) && (cfdata->iconsize <=96)) cfdata->icon_method = ICONSIZE_ENORMOUS;
if ((cfdata->iconsize > 96) && (cfdata->iconsize <=128)) cfdata->icon_method = ICONSIZE_GIGANTIC;
if (cfdata->iconsize > 40) cfdata->icon_method = ICONSIZE_VERYLARGE;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
@ -102,7 +92,6 @@ static void *_create_data(E_Config_Dialog *cfd)
CFData *cfdata;
cfdata = E_NEW(CFData, 1);
_fill_data(cfdata);
return cfdata;
}
@ -116,6 +105,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
_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));
@ -127,12 +118,6 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
of = e_widget_framelist_add(evas, _("Icon Size"), 0);
rg = e_widget_radio_group_new(&(cfdata->icon_method));
ob = e_widget_radio_add(evas, _("Microscopic"), ICONSIZE_MICROSCOPIC, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Tiny"), ICONSIZE_TINY, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Very Small"), ICONSIZE_VERYSMALL, rg);
e_widget_framelist_object_append(of, ob);
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);
@ -141,14 +126,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFDa
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);
ob = e_widget_radio_add(evas, _("Exteremely Large"), ICONSIZE_EXTLARGE, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Huge"), ICONSIZE_HUGE, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Enormous"), ICONSIZE_ENORMOUS, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Gigantic"), ICONSIZE_GIGANTIC, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@ -159,24 +137,20 @@ static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
e_border_button_bindings_ungrab_all();
ib->conf->follower = cfdata->follower;
if (cfdata->method == 0) {
if (cfdata->method == 0)
{
cfdata->width = IBAR_WIDTH_FIXED;
} else {
}
else
{
cfdata->width = IBAR_WIDTH_AUTO;
}
ib->conf->width = cfdata->width;
if (cfdata->icon_method == ICONSIZE_MICROSCOPIC) ib->conf->iconsize = 8;
if (cfdata->icon_method == ICONSIZE_TINY) ib->conf->iconsize = 12;
if (cfdata->icon_method == ICONSIZE_VERYSMALL) ib->conf->iconsize = 16;
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->icon_method == ICONSIZE_EXTLARGE) ib->conf->iconsize = 56;
if (cfdata->icon_method == ICONSIZE_HUGE) ib->conf->iconsize = 64;
if (cfdata->icon_method == ICONSIZE_ENORMOUS) ib->conf->iconsize = 96;
if (cfdata->icon_method == ICONSIZE_GIGANTIC) ib->conf->iconsize = 128;
e_border_button_bindings_grab_all();
e_config_save_queue();
@ -190,6 +164,8 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, C
Evas_Object *o, *of, *ob, *ot;
E_Radio_Group *rg;
_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));
@ -226,9 +202,12 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
e_border_button_bindings_ungrab_all();
ib->conf->follower = cfdata->follower;
if (cfdata->method == 0) {
if (cfdata->method == 0)
{
cfdata->width = IBAR_WIDTH_FIXED;
} else {
}
else
{
cfdata->width = IBAR_WIDTH_AUTO;
}
ib->conf->width = cfdata->width;
@ -245,4 +224,3 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
return 1;
}