Enlightenment CVS committal
Author : ravenlock
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Tweak GUI. Fix users ability to disable the slide/drag buttons.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_config.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_mod_config.c 4 Apr 2007 09:55:39 -0000 1.29
+++ e_mod_config.c 19 Apr 2007 16:57:47 -0000 1.30
@@ -136,12 +136,28 @@
Evas_Object *o, *of, *of2, *ob;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Resistance to Dragging Windows:"), 0);
+
+ of = e_widget_frametable_add(evas, _("Pager Settings"), 0);
+ ob = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
&(cfdata->flip_desk));
+ e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 0, 0);
+ ob = e_widget_label_add(evas, _("Select and Slide button"));
+ e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_label_add(evas, _("Drag and Drop button (Keeps rel. loc.)"));
+ e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
+ ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show,
(void *)GRAB_BUTTON_DRAG, cfdata);
+ e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 0, 0);
+ cfdata->gui.o_btn1 = ob;
+ ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show,
(void *)GRAB_BUTTON_NOPLACE, cfdata);
+ e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 0, 0);
+ cfdata->gui.o_btn2 = ob;
+ _advanced_update_button_label(cfdata);
+ ob = e_widget_label_add(evas, _("Resistance to dragging"));
+ e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 0, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL,
&(cfdata->drag_resist), 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 1, 0, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Popup Settings"), 0);
+ of = e_widget_framelist_add(evas, _("Pager Popup Settings"), 0);
ob = e_widget_check_add(evas, _("Show Popup on desktop change"),
&(cfdata->show_popup));
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Popup Speed"));
@@ -165,25 +181,6 @@
e_widget_framelist_object_append(of, of2);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_frametable_add(evas, _("Buttons Settings"), 0);
- ob = e_widget_label_add(evas, _("Drag and select button"));
- e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Drag no place button"));
- e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show,
(void *)GRAB_BUTTON_DRAG, cfdata);
- e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 0, 0);
- cfdata->gui.o_btn1 = ob;
- ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show,
(void *)GRAB_BUTTON_NOPLACE, cfdata);
- e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 0, 0);
- cfdata->gui.o_btn2 = ob;
- _advanced_update_button_label(cfdata);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Wheel callback"), 0);
- ob = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
&(cfdata->flip_desk));
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -3 -r1.210 -r1.211
--- e_mod_main.c 4 Apr 2007 09:55:39 -0000 1.210
+++ e_mod_main.c 19 Apr 2007 16:57:47 -0000 1.211
@@ -1831,8 +1831,8 @@
E_CONFIG_LIMIT(pager_config->resize, PAGER_RESIZE_HORZ, PAGER_RESIZE_BOTH);
E_CONFIG_LIMIT(pager_config->flip_desk, 0, 1);
E_CONFIG_LIMIT(pager_config->scale, 0, 1);
- E_CONFIG_LIMIT(pager_config->btn_drag, 1, 32);
- E_CONFIG_LIMIT(pager_config->btn_noplace, 1, 32);
+ E_CONFIG_LIMIT(pager_config->btn_drag, 0, 32);
+ E_CONFIG_LIMIT(pager_config->btn_noplace, 0, 32);
pager_config->handlers = evas_list_append
(pager_config->handlers, ecore_event_handler_add
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs