Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c
Log Message:
jknife's fix for ibar config dialog! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_config.c 12 Mar 2006 16:12:57 -0000 1.18
+++ e_mod_config.c 14 Mar 2006 03:47:23 -0000 1.19
@@ -1,211 +1,214 @@
-#include "e.h"
-#include "e_mod_main.h"
-#include "e_mod_config.h"
-#include "config.h"
-
-typedef struct _Cfg_File_Data Cfg_File_Data;
-
-struct _E_Config_Dialog_Data
-{
- int autofit;
- int follower;
- int iconsize;
- double follow_speed;
- double autoscroll_speed;
-};
-
-struct _Cfg_File_Data
-{
- E_Config_Dialog *cfd;
- char *file;
-};
-
-/* Protos */
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-
-void
-_config_ibar_module(E_Container *con, IBar *ibar)
-{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
-
- v = E_NEW(E_Config_Dialog_View, 1);
-
- /* Dialog 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;
-
- /* Create The Dialog */
- cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, v, ibar);
- ibar->config_dialog = cfd;
-}
-
-static void
-_fill_data(IBar *ib, E_Config_Dialog_Data *cfdata)
-{
- cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
- cfdata->follower = ib->conf->follower;
- cfdata->iconsize = ib->conf->iconsize;
- cfdata->follow_speed = ib->conf->follow_speed;
- cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
-}
-
-static void *
-_create_data(E_Config_Dialog *cfd)
-{
- E_Config_Dialog_Data *cfdata;
- IBar *ib;
-
- ib = cfd->data;
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(ib, cfdata);
- return cfdata;
-}
-
-static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{
- IBar *ibar;
-
- ibar = cfd->data;
- ibar->config_dialog = NULL;
- free(cfdata);
-}
-
-static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
-{
- Evas_Object *o, *ob;
-
- o = e_widget_list_add(evas, 0, 0);
- ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower));
- 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);
-
- e_widget_list_object_append(o, ob, 1, 1, 0.5);
- return o;
-}
-
-static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
-{
- IBar *ib;
-
- ib = cfd->data;
- e_border_button_bindings_ungrab_all();
- 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))
- {
- ib->conf->width = IBAR_WIDTH_AUTO;
- }
- else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO))
- {
- ib->conf->width = IBAR_WIDTH_FIXED;
- }
- e_border_button_bindings_grab_all();
- e_config_save_queue();
-
- _ibar_bar_cb_config_updated(ib);
- return 1;
-}
-
-static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
-{
- Evas_Object *o, *of, *ob;
-
- 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 pixels"), 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);
-
- /* allow overlap checkbox */
- of = e_widget_framelist_add(evas, _("Extras"), 0);
- 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, E_Config_Dialog_Data *cfdata)
-{
- IBar *ib;
-
- ib = cfd->data;
- e_border_button_bindings_ungrab_all();
- 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))
- {
- ib->conf->width = IBAR_WIDTH_AUTO;
- }
- else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO))
- {
- ib->conf->width = IBAR_WIDTH_FIXED;
- }
-
- 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();
-
- _ibar_bar_cb_config_updated(ib);
- return 1;
-}
-
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "config.h"
+
+typedef struct _Cfg_File_Data Cfg_File_Data;
+
+struct _E_Config_Dialog_Data
+{
+ int autofit;
+ int follower;
+ int iconsize;
+ double follow_speed;
+ double autoscroll_speed;
+};
+
+struct _Cfg_File_Data
+{
+ E_Config_Dialog *cfd;
+ char *file;
+};
+
+/* Protos */
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+
+void
+_config_ibar_module(E_Container *con, IBar *ibar)
+{
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
+
+ v = E_NEW(E_Config_Dialog_View, 1);
+
+ /* Dialog 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;
+
+ /* Create The Dialog */
+ cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, v, ibar);
+ ibar->config_dialog = cfd;
+}
+
+static void
+_fill_data(IBar *ib, E_Config_Dialog_Data *cfdata)
+{
+ cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
+ cfdata->follower = ib->conf->follower;
+ cfdata->iconsize = ib->conf->iconsize;
+ cfdata->follow_speed = ib->conf->follow_speed;
+ cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
+}
+
+static void *
+_create_data(E_Config_Dialog *cfd)
+{
+ E_Config_Dialog_Data *cfdata;
+ IBar *ib;
+
+ ib = cfd->data;
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(ib, cfdata);
+ return cfdata;
+}
+
+static void
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+ IBar *ib;
+
+ ib = cfd->data;
+ ib->config_dialog = NULL;
+ free(cfdata);
+}
+
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
+{
+ Evas_Object *o, *ob;
+ IBar *ib;
+
+ ib = cfd->data;
+ _fill_data(ib, cfdata);
+
+ o = e_widget_list_add(evas, 0, 0);
+ ob = e_widget_check_add(evas, _("Show Follower"), &(cfdata->follower));
+ 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, E_Config_Dialog_Data *cfdata)
+{
+ IBar *ib;
+
+ ib = cfd->data;
+ e_border_button_bindings_ungrab_all();
+ 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))
+ {
+ ib->conf->width = IBAR_WIDTH_AUTO;
+ }
+ else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO))
+ {
+ ib->conf->width = IBAR_WIDTH_FIXED;
+ }
+
+ e_border_button_bindings_grab_all();
+ e_config_save_queue();
+
+ _ibar_bar_cb_config_updated(ib);
+ return 1;
+}
+
+static Evas_Object *
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
+{
+ Evas_Object *o, *of, *ob;
+ 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 pixels"), 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;
+}
+
+static int
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+{
+ IBar *ib;
+
+ ib = cfd->data;
+ e_border_button_bindings_ungrab_all();
+ 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))
+ {
+ ib->conf->width = IBAR_WIDTH_AUTO;
+ }
+ else if (!(cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_AUTO))
+ {
+ ib->conf->width = IBAR_WIDTH_FIXED;
+ }
+
+ 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();
+
+ _ibar_bar_cb_config_updated(ib);
+ return 1;
+}
+
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
