Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_menus
Modified Files:
e_int_config_menus.c
Log Message:
Make menu advanced settings fit into 640x480.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_menus/e_int_config_menus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_menus.c 29 Jul 2007 03:25:34 -0000 1.1
+++ e_int_config_menus.c 18 Dec 2007 01:42:56 -0000 1.2
@@ -2,10 +2,10 @@
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-static int _advanced_apply_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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
struct _E_Config_Dialog_Data
{
@@ -35,10 +35,10 @@
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;
+ v->basic.apply_cfdata = _basic_apply;
+ v->basic.create_widgets = _basic_create;
+ v->advanced.apply_cfdata = _advanced_apply;
+ v->advanced.create_widgets = _advanced_create;
cfd = e_config_dialog_new(con,
_("Menu Settings"),
@@ -56,10 +56,12 @@
cfdata->menu_eap_generic_show = e_config->menu_eap_generic_show;
cfdata->menu_eap_comment_show = e_config->menu_eap_comment_show;
cfdata->menus_scroll_speed = e_config->menus_scroll_speed;
- cfdata->menus_fast_mouse_move_threshhold =
e_config->menus_fast_mouse_move_threshhold;
+ cfdata->menus_fast_mouse_move_threshhold =
+ e_config->menus_fast_mouse_move_threshhold;
cfdata->menus_click_drag_timeout = e_config->menus_click_drag_timeout;
cfdata->menu_autoscroll_margin = e_config->menu_autoscroll_margin;
- cfdata->menu_autoscroll_cursor_margin =
e_config->menu_autoscroll_cursor_margin;
+ cfdata->menu_autoscroll_cursor_margin =
+ e_config->menu_autoscroll_cursor_margin;
}
static void *
@@ -79,7 +81,7 @@
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
e_config->menu_favorites_show = cfdata->menu_favorites_show;
e_config->menu_apps_show = cfdata->menu_apps_show;
@@ -91,103 +93,122 @@
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
+_basic_create(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, _("Main Menu Settings"), 0);
- ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
&(cfdata->menu_favorites_show));
+ ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
+ &(cfdata->menu_favorites_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
&(cfdata->menu_apps_show));
+ ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
+ &(cfdata->menu_apps_show));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
- ob = e_widget_check_add(evas, _("Show Name In Menu"),
&(cfdata->menu_eap_name_show));
+ ob = e_widget_check_add(evas, _("Show Name In Menu"),
+ &(cfdata->menu_eap_name_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Comment In Menu"),
&(cfdata->menu_eap_comment_show));
+ ob = e_widget_check_add(evas, _("Show Comment In Menu"),
+ &(cfdata->menu_eap_comment_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Generic In Menu"),
&(cfdata->menu_eap_generic_show));
+ ob = e_widget_check_add(evas, _("Show Generic In Menu"),
+ &(cfdata->menu_eap_generic_show));
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)
+_advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
e_config->menu_favorites_show = cfdata->menu_favorites_show;
e_config->menu_apps_show = cfdata->menu_apps_show;
e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
e_config->menu_eap_generic_show = cfdata->menu_eap_generic_show;
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
-
+
if (cfdata->menus_scroll_speed == 0)
e_config->menus_scroll_speed = 1.0;
else
e_config->menus_scroll_speed = cfdata->menus_scroll_speed;
-
+
if (cfdata->menus_fast_mouse_move_threshhold == 0)
e_config->menus_fast_mouse_move_threshhold = 1.0;
else
- e_config->menus_fast_mouse_move_threshhold =
cfdata->menus_fast_mouse_move_threshhold;
+ {
+ e_config->menus_fast_mouse_move_threshhold =
+ cfdata->menus_fast_mouse_move_threshhold;
+ }
e_config->menus_click_drag_timeout = cfdata->menus_click_drag_timeout;
e_config->menu_autoscroll_margin = cfdata->menu_autoscroll_margin;
- e_config->menu_autoscroll_cursor_margin =
cfdata->menu_autoscroll_cursor_margin;
+ e_config->menu_autoscroll_cursor_margin =
+ cfdata->menu_autoscroll_cursor_margin;
e_config_save_queue();
return 1;
}
static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
+_advanced_create(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, _("Main Menu Settings"), 0);
- ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
&(cfdata->menu_favorites_show));
+ ob = e_widget_check_add(evas, _("Show Favorites In Main Menu"),
+ &(cfdata->menu_favorites_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
&(cfdata->menu_apps_show));
+ ob = e_widget_check_add(evas, _("Show Applications In Main Menu"),
+ &(cfdata->menu_apps_show));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
- ob = e_widget_check_add(evas, _("Show Name In Menu"),
&(cfdata->menu_eap_name_show));
+ ob = e_widget_check_add(evas, _("Show Name In Menu"),
+ &(cfdata->menu_eap_name_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Comment In Menu"),
&(cfdata->menu_eap_comment_show));
+ ob = e_widget_check_add(evas, _("Show Comment In Menu"),
+ &(cfdata->menu_eap_comment_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Generic In Menu"),
&(cfdata->menu_eap_generic_show));
+ ob = e_widget_check_add(evas, _("Show Generic In Menu"),
+ &(cfdata->menu_eap_generic_show));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Autoscroll Settings"), 0);
+
+ of = e_widget_frametable_add(evas, _("Autoscroll Settings"), 0);
ob = e_widget_label_add(evas, _("Autoscroll Margin"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
NULL, &(cfdata->menu_autoscroll_margin), 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
+ NULL, &(cfdata->menu_autoscroll_margin), 200);
+ e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Autoscroll Cursor Margin"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
NULL, &(cfdata->menu_autoscroll_cursor_margin), 200);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+ e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 50.0, 1.0, 0,
+ NULL, &(cfdata->menu_autoscroll_cursor_margin),
200);
+ e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Miscellaneous Options"), 0);
+ of = e_widget_frametable_add(evas, _("Miscellaneous Options"), 0);
ob = e_widget_label_add(evas, _("Menu Scroll Speed"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/sec"), 0.0, 20000.0,
100.0, 0, &(cfdata->menus_scroll_speed), NULL, 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/sec"), 0.0, 20000.0,
+ 100.0, 0, &(cfdata->menus_scroll_speed), NULL, 200);
+ e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Fast Mouse Move Threshhold"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0.0, 2000.0,
10.0, 0, &(cfdata->menus_fast_mouse_move_threshhold), NULL, 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0.0, 2000.0,
+ 10.0, 0,
&(cfdata->menus_fast_mouse_move_threshhold),
+ NULL, 200);
+ e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Click Drag Timeout"));
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%2.2f seconds"), 0.0, 10.0, 0.25,
0, &(cfdata->menus_click_drag_timeout), NULL, 200);
- e_widget_framelist_object_append(of, ob);
-
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- return o;
+ e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%2.2f seconds"), 0.0, 10.0, 0.25,
+ 0, &(cfdata->menus_click_drag_timeout), NULL, 200);
+ e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0);
+
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+ return o;
}
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
