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:
IBar Cfg Dlg Icon Size Fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_config.c 13 Dec 2005 04:47:41 -0000 1.1
+++ e_mod_config.c 13 Dec 2005 14:30:54 -0000 1.2
@@ -5,36 +5,29 @@
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
+struct _cfdata
{
IBar *ibar;
-
+
/* Basic Config */
int method;
int icon_method;
-
+
int follower;
int width;
int iconsize;
-
+
/* Advanced Config */
double follow_speed;
double autoscroll_speed;
};
-struct _Cfg_File_Data
+struct _Cfg_File_Data
{
E_Config_Dialog *cfd;
char *file;
@@ -51,13 +44,13 @@
IBar *ib = NULL;
-void e_int_config_ibar(E_Container *con, IBar *ibar)
+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;
@@ -65,57 +58,55 @@
v.basic.create_widgets = _basic_create_widgets;
v.advanced.apply_cfdata = _advanced_apply_data;
v.advanced.create_widgets = _advanced_create_widgets;
-
+
/* Create The Dialog */
cfd = e_config_dialog_new(con, _("IBar Module"), NULL, 0, &v, ibar);
}
-static void _fill_data(CFData *cfdata)
+static void _fill_data(CFData *cfdata)
{
cfdata->follower = ib->conf->follower;
- cfdata->width = ib->conf->width;
- if (cfdata->width == IBAR_WIDTH_AUTO) {
- cfdata->method = 1;
- } else {
- cfdata->method = 0;
- }
+ 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<=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->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 <=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;
}
-static void *_create_data(E_Config_Dialog *cfd)
+static void *_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
-
+
cfdata = E_NEW(CFData, 1);
- _fill_data(cfdata);
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, *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));
@@ -126,57 +117,40 @@
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);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Medium"), ICONSIZE_MEDIUM, rg);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Large"), ICONSIZE_LARGE, rg);
- e_widget_framelist_object_append(of, ob);
+ 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_framelist_object_append(of, ob);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+
return o;
}
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+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) {
- cfdata->width = IBAR_WIDTH_FIXED;
- } else {
- cfdata->width = IBAR_WIDTH_AUTO;
- }
+ if (cfdata->method == 0)
+ {
+ cfdata->width = IBAR_WIDTH_FIXED;
+ }
+ 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;
+
+ 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();
@@ -185,11 +159,13 @@
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;
-
+
+ _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));
@@ -199,50 +175,52 @@
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, _("Icon Size:"));
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);
e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+ 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:"));
- 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"), 0.01, 1.0, 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_label_add(evas, _("Autoscroll Speed:"));
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.01, 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);
+
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
-static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
+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) {
- cfdata->width = IBAR_WIDTH_FIXED;
- } else {
- cfdata->width = IBAR_WIDTH_AUTO;
- }
+ if (cfdata->method == 0)
+ {
+ cfdata->width = IBAR_WIDTH_FIXED;
+ }
+ else
+ {
+ cfdata->width = IBAR_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;
+
+ ib->conf->follow_speed = cfdata->follow_speed;
+ ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
e_border_button_bindings_grab_all();
e_config_save_queue();
-
+
_ibar_bar_cb_config_updated(ib);
return 1;
}
-
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
