Merge branch 'development'

conky/conky_shortcuts_numix

@@ -33,9 +33,10 @@ ${color2}container layout (tabbed) - ${color}mod+w
 ${color2}container layout (horiz) - ${color}mod+q
 ${color2}container layout (vert) - ${color}mod+e
 ${color2}container layout (stck) - ${color}mod+s
-${color2}child container (tabbed) - ${color}mod+Shift+w
-${color2}child container (vert) - ${color}mod+Shift+e
-${color2}child container (stck) - ${color}mod+Shift+s
+${color2}child container (tabbed) - ${color}mod+Alt+w
+${color2}child container (horiz) - ${color}mod+Alt+q
+${color2}child container (vert) - ${color}mod+Alt+e
+${color2}child container (stck) - ${color}mod+Alt+s
 
 ${color2}tab with next window - ${color}mod+z
 ${color2}tab with previous window - ${color}mod+Shift+z

i3/config

@@ -156,16 +156,17 @@ bindsym $mod+Mod1+slash focus parent, title_format "<span foreground='#FEC196'><
 bindsym $mod+Ctrl+w exec "WINDOWS=$(xdotool search --all --onlyvisible --desktop $(xprop -notype -root _NET_CURRENT_DESKTOP | cut -c 24-) \\"\\" 2>/dev/null); for window in $WINDOWS; do xdotool windowactivate $window; i3-msg \\"split h; layout tabbed\\"; $con_title; done"
 bindsym $mod+Mod1+Ctrl+w exec "WINDOWS=$(xdotool search --all --onlyvisible --desktop $(xprop -notype -root _NET_CURRENT_DESKTOP | cut -c 24-) \\"\\" 2>/dev/null); for window in $WINDOWS; do xdotool windowactivate $window; i3-msg \\"move left\\"; $con_title; done"
 
-# split orientations
+# container layouts
+bindsym $mod+w layout tabbed;exec notify-send 'tabbed layout'
 bindsym $mod+q layout splith;exec notify-send 'horizontal layout'
 bindsym $mod+e layout splitv;exec notify-send 'vertical layout'
-bindsym $mod+Shift+e split h; exec "$con_title"
-
-# change container layout (stacked, tabbed, toggle split)
 bindsym $mod+s layout stacking;exec notify-send 'stacking layout'
-bindsym $mod+Shift+s split h; layout stacking; exec "$con_title"
-bindsym $mod+w layout tabbed;exec notify-send 'tabbed layout'
-bindsym $mod+Shift+w split h; layout tabbed; exec "$con_title"
+
+# child container layouts (creates a child container from current selected application)
+bindsym $mod+Mod1+w split h; layout tabbed; exec "$con_title"
+bindsym $mod+Mod1+q split h; exec "$con_title"
+bindsym $mod+Mod1+e split h; layout splitv; exec "$con_title"
+bindsym $mod+Mod1+s split h; layout stacking; exec "$con_title"
 
 # special combo for horizontal split of two windows next to each other
 bindsym $mod+x split h, layout splith, focus right, move left, focus left, exec "$con_title"