summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_config.c1
-rw-r--r--src/bin/e_config.h1
-rw-r--r--src/modules/winlist/e_int_config_winlist.c12
-rw-r--r--src/modules/winlist/e_winlist.c5
6 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 054b6fb..c3efab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12013-05-29 Mike Blumenkrantz 12013-05-29 Mike Blumenkrantz
2 2
3 * added e_border_inset utility functions 3 * added e_border_inset utility functions
4 * new winlist config option for moving selected window to current desk
4 5
52013-05-29 Mike Blumenkrantz 62013-05-29 Mike Blumenkrantz
6 7
diff --git a/NEWS b/NEWS
index 4b6ff2d..2a5fefd 100644
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,7 @@ Additions:
53 * Added support for systemd user session 53 * Added support for systemd user session
54 * Added support for systemd hibernate and suspend 54 * Added support for systemd hibernate and suspend
55 * added support for systemd halt and poweroff 55 * added support for systemd halt and poweroff
56 * new winlist config option for moving selected window to current desk
56 57
57Changes: 58Changes:
58 Modules: 59 Modules:
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 2db11e3..3a5519e 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -505,6 +505,7 @@ _e_config_edd_init(Eina_Bool old)
505 E_CONFIG_VAL(D, T, winlist_list_jump_desk_while_selecting, INT); /**/ 505 E_CONFIG_VAL(D, T, winlist_list_jump_desk_while_selecting, INT); /**/
506 E_CONFIG_VAL(D, T, winlist_list_focus_while_selecting, INT); /**/ 506 E_CONFIG_VAL(D, T, winlist_list_focus_while_selecting, INT); /**/
507 E_CONFIG_VAL(D, T, winlist_list_raise_while_selecting, INT); /**/ 507 E_CONFIG_VAL(D, T, winlist_list_raise_while_selecting, INT); /**/
508 E_CONFIG_VAL(D, T, winlist_list_move_after_select, INT); /**/
508 E_CONFIG_VAL(D, T, winlist_pos_align_x, DOUBLE); /**/ 509 E_CONFIG_VAL(D, T, winlist_pos_align_x, DOUBLE); /**/
509 E_CONFIG_VAL(D, T, winlist_pos_align_y, DOUBLE); /**/ 510 E_CONFIG_VAL(D, T, winlist_pos_align_y, DOUBLE); /**/
510 E_CONFIG_VAL(D, T, winlist_pos_size_w, DOUBLE); /**/ 511 E_CONFIG_VAL(D, T, winlist_pos_size_w, DOUBLE); /**/
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 2369bd3..562bfa0 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -140,6 +140,7 @@ struct _E_Config
140 int winlist_list_jump_desk_while_selecting; // GUI 140 int winlist_list_jump_desk_while_selecting; // GUI
141 int winlist_list_focus_while_selecting; // GUI 141 int winlist_list_focus_while_selecting; // GUI
142 int winlist_list_raise_while_selecting; // GUI 142 int winlist_list_raise_while_selecting; // GUI
143 int winlist_list_move_after_select; // GUI
143 double winlist_pos_align_x; // GUI 144 double winlist_pos_align_x; // GUI
144 double winlist_pos_align_y; // GUI 145 double winlist_pos_align_y; // GUI
145 double winlist_pos_size_w; // GUI 146 double winlist_pos_size_w; // GUI
diff --git a/src/modules/winlist/e_int_config_winlist.c b/src/modules/winlist/e_int_config_winlist.c
index 6c3b444..be1df80 100644
--- a/src/modules/winlist/e_int_config_winlist.c
+++ b/src/modules/winlist/e_int_config_winlist.c
@@ -21,6 +21,7 @@ struct _E_Config_Dialog_Data
21 int warp_at_end; 21 int warp_at_end;
22 int no_warp_on_direction; 22 int no_warp_on_direction;
23 int jump_desk; 23 int jump_desk;
24 int move_after_select;
24 25
25 int scroll_animate; 26 int scroll_animate;
26 double scroll_speed; 27 double scroll_speed;
@@ -62,6 +63,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
62 cfdata->raise = e_config->winlist_list_raise_while_selecting; 63 cfdata->raise = e_config->winlist_list_raise_while_selecting;
63 cfdata->uncover = e_config->winlist_list_uncover_while_selecting; 64 cfdata->uncover = e_config->winlist_list_uncover_while_selecting;
64 cfdata->jump_desk = e_config->winlist_list_jump_desk_while_selecting; 65 cfdata->jump_desk = e_config->winlist_list_jump_desk_while_selecting;
66 cfdata->move_after_select = e_config->winlist_list_move_after_select;
65 67
66 cfdata->windows_other_desks = 68 cfdata->windows_other_desks =
67 e_config->winlist_list_show_other_desk_windows; 69 e_config->winlist_list_show_other_desk_windows;
@@ -119,6 +121,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
119 DO(list_show_other_screen_windows, windows_other_screens); 121 DO(list_show_other_screen_windows, windows_other_screens);
120 DO(list_uncover_while_selecting, uncover); 122 DO(list_uncover_while_selecting, uncover);
121 DO(list_jump_desk_while_selecting, jump_desk); 123 DO(list_jump_desk_while_selecting, jump_desk);
124 DO(list_move_after_select, move_after_select);
122 DO(warp_while_selecting, warp_while_selecting); 125 DO(warp_while_selecting, warp_while_selecting);
123 DO(warp_at_end, warp_at_end); 126 DO(warp_at_end, warp_at_end);
124 DO(no_warp_on_direction, no_warp_on_direction); 127 DO(no_warp_on_direction, no_warp_on_direction);
@@ -152,6 +155,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
152 DO(list_show_other_screen_windows, windows_other_screens); 155 DO(list_show_other_screen_windows, windows_other_screens);
153 DO(list_uncover_while_selecting, uncover); 156 DO(list_uncover_while_selecting, uncover);
154 DO(list_jump_desk_while_selecting, jump_desk); 157 DO(list_jump_desk_while_selecting, jump_desk);
158 DO(list_move_after_select, move_after_select);
155 DO(warp_while_selecting, warp_while_selecting); 159 DO(warp_while_selecting, warp_while_selecting);
156 DO(warp_at_end, warp_at_end); 160 DO(warp_at_end, warp_at_end);
157 DO(no_warp_on_direction, no_warp_on_direction); 161 DO(no_warp_on_direction, no_warp_on_direction);
@@ -173,7 +177,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
173static Evas_Object * 177static Evas_Object *
174_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) 178_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
175{ 179{
176 Evas_Object *otb, *ol, *ob, *iconified, *scroll_animate; 180 Evas_Object *otb, *ol, *ob, *iconified, *scroll_animate, *ck;
177 181
178 otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale)); 182 otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
179 183
@@ -216,7 +220,11 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
216 &(cfdata->no_warp_on_direction)); 220 &(cfdata->no_warp_on_direction));
217 e_widget_disabled_set(ob, e_config->disable_all_pointer_warps); 221 e_widget_disabled_set(ob, e_config->disable_all_pointer_warps);
218 e_widget_list_object_append(ol, ob, 1, 0, 0.0); 222 e_widget_list_object_append(ol, ob, 1, 0, 0.0);
219 ob = e_widget_check_add(evas, _("Jump to desk"), &(cfdata->jump_desk)); 223 ck = ob = e_widget_check_add(evas, _("Jump to desk"), &(cfdata->jump_desk));
224 e_widget_list_object_append(ol, ob, 1, 0, 0.0);
225 ob = e_widget_check_add(evas, _("Move to current desk after switch"), &(cfdata->move_after_select));
226 e_widget_check_widget_disable_on_checked_add(ck, ob);
227 e_widget_check_widget_disable_on_checked_add(ob, ck);
220 e_widget_list_object_append(ol, ob, 1, 0, 0.0); 228 e_widget_list_object_append(ol, ob, 1, 0, 0.0);
221 e_widget_toolbook_page_append(otb, NULL, _("Selecting"), ol, 229 e_widget_toolbook_page_append(otb, NULL, _("Selecting"), ol,
222 0, 0, 1, 0, 0.5, 0.0); 230 0, 0, 1, 0, 0.5, 0.0);
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index c88a9a8..7eb8240 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -269,6 +269,11 @@ e_winlist_hide(void)
269 if (!bd->lock_user_shade) 269 if (!bd->lock_user_shade)
270 e_border_unshade(bd, bd->shade.dir); 270 e_border_unshade(bd, bd->shade.dir);
271 } 271 }
272 if (e_config->winlist_list_move_after_select)
273 {
274 e_border_zone_set(bd, e_zone_current_get(e_util_container_current_get()));
275 e_border_desk_set(bd, e_desk_current_get(bd->zone));
276 }
272 else if (bd->desk) 277 else if (bd->desk)
273 { 278 {
274 if (!bd->sticky) e_desk_show(bd->desk); 279 if (!bd->sticky) e_desk_show(bd->desk);