summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schuele <ravenlock@ravenlock.us>2007-04-19 16:57:47 +0000
committerEric Schuele <ravenlock@ravenlock.us>2007-04-19 16:57:47 +0000
commitc5d4436618844e5a9489f105862d7aec97a34fd7 (patch)
tree5f564a1bcfdd55e0a3e5b960529d40962255dcde
parentc93f2de656b90504609f4059b13e9f7d3705a0b0 (diff)
Tweak GUI. Fix users ability to disable the slide/drag buttons.
SVN revision: 29600
-rw-r--r--src/modules/pager/e_mod_config.c41
-rw-r--r--src/modules/pager/e_mod_main.c4
2 files changed, 21 insertions, 24 deletions
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 0bf832d83..3351e5421 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -136,12 +136,28 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
136 Evas_Object *o, *of, *of2, *ob; 136 Evas_Object *o, *of, *of2, *ob;
137 137
138 o = e_widget_list_add(evas, 0, 0); 138 o = e_widget_list_add(evas, 0, 0);
139 of = e_widget_framelist_add(evas, _("Resistance to Dragging Windows:"), 0); 139
140 of = e_widget_frametable_add(evas, _("Pager Settings"), 0);
141 ob = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), &(cfdata->flip_desk));
142 e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 0, 0);
143 ob = e_widget_label_add(evas, _("Select and Slide button"));
144 e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
145 ob = e_widget_label_add(evas, _("Drag and Drop button (Keeps rel. loc.)"));
146 e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
147 ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show, (void *)GRAB_BUTTON_DRAG, cfdata);
148 e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 0, 0);
149 cfdata->gui.o_btn1 = ob;
150 ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show, (void *)GRAB_BUTTON_NOPLACE, cfdata);
151 e_widget_frametable_object_append(of, ob, 2, 3, 1, 1, 1, 1, 0, 0);
152 cfdata->gui.o_btn2 = ob;
153 _advanced_update_button_label(cfdata);
154 ob = e_widget_label_add(evas, _("Resistance to dragging"));
155 e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 0, 0);
140 ob = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, &(cfdata->drag_resist), 200); 156 ob = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, &(cfdata->drag_resist), 200);
141 e_widget_framelist_object_append(of, ob); 157 e_widget_frametable_object_append(of, ob, 1, 5, 2, 1, 1, 1, 0, 0);
142 e_widget_list_object_append(o, of, 1, 1, 0.5); 158 e_widget_list_object_append(o, of, 1, 1, 0.5);
143 159
144 of = e_widget_framelist_add(evas, _("Popup Settings"), 0); 160 of = e_widget_framelist_add(evas, _("Pager Popup Settings"), 0);
145 ob = e_widget_check_add(evas, _("Show Popup on desktop change"), &(cfdata->show_popup)); 161 ob = e_widget_check_add(evas, _("Show Popup on desktop change"), &(cfdata->show_popup));
146 e_widget_framelist_object_append(of, ob); 162 e_widget_framelist_object_append(of, ob);
147 ob = e_widget_label_add(evas, _("Popup Speed")); 163 ob = e_widget_label_add(evas, _("Popup Speed"));
@@ -166,25 +182,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
166 e_widget_framelist_object_append(of, of2); 182 e_widget_framelist_object_append(of, of2);
167 e_widget_list_object_append(o, of, 1, 1, 0.5); 183 e_widget_list_object_append(o, of, 1, 1, 0.5);
168 184
169 of = e_widget_frametable_add(evas, _("Buttons Settings"), 0);
170 ob = e_widget_label_add(evas, _("Drag and select button"));
171 e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
172 ob = e_widget_label_add(evas, _("Drag no place button"));
173 e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
174 ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show, (void *)GRAB_BUTTON_DRAG, cfdata);
175 e_widget_frametable_object_append(of, ob, 2, 1, 1, 1, 1, 1, 0, 0);
176 cfdata->gui.o_btn1 = ob;
177 ob = e_widget_button_add(evas, _("Click to set"), NULL, _grab_wnd_show, (void *)GRAB_BUTTON_NOPLACE, cfdata);
178 e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 0, 0);
179 cfdata->gui.o_btn2 = ob;
180 _advanced_update_button_label(cfdata);
181 e_widget_list_object_append(o, of, 1, 1, 0.5);
182
183 of = e_widget_framelist_add(evas, _("Wheel callback"), 0);
184 ob = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), &(cfdata->flip_desk));
185 e_widget_framelist_object_append(of, ob);
186 e_widget_list_object_append(o, of, 1, 1, 0.5);
187
188 return o; 185 return o;
189} 186}
190 187
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index c66919c27..39521e087 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1831,8 +1831,8 @@ e_modapi_init(E_Module *m)
1831 E_CONFIG_LIMIT(pager_config->resize, PAGER_RESIZE_HORZ, PAGER_RESIZE_BOTH); 1831 E_CONFIG_LIMIT(pager_config->resize, PAGER_RESIZE_HORZ, PAGER_RESIZE_BOTH);
1832 E_CONFIG_LIMIT(pager_config->flip_desk, 0, 1); 1832 E_CONFIG_LIMIT(pager_config->flip_desk, 0, 1);
1833 E_CONFIG_LIMIT(pager_config->scale, 0, 1); 1833 E_CONFIG_LIMIT(pager_config->scale, 0, 1);
1834 E_CONFIG_LIMIT(pager_config->btn_drag, 1, 32); 1834 E_CONFIG_LIMIT(pager_config->btn_drag, 0, 32);
1835 E_CONFIG_LIMIT(pager_config->btn_noplace, 1, 32); 1835 E_CONFIG_LIMIT(pager_config->btn_noplace, 0, 32);
1836 1836
1837 pager_config->handlers = evas_list_append 1837 pager_config->handlers = evas_list_append
1838 (pager_config->handlers, ecore_event_handler_add 1838 (pager_config->handlers, ecore_event_handler_add