Index: settings-dialogs/xfwm4-settings.desktop.in =================================================================== --- settings-dialogs/xfwm4-settings.desktop.in (revision 27427) +++ settings-dialogs/xfwm4-settings.desktop.in (working copy) @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 -_Name=Xfce 4 Windowmanager Settings -_GenericName=Windowmanager Settings +_Name=Xfce 4 Window Manager Settings +_GenericName=Window Manager Settings _Comment= Exec=xfwm4-settings Icon=xfwm4 Index: settings-dialogs/xfwm4-tweaks-dialog.glade =================================================================== --- settings-dialogs/xfwm4-tweaks-dialog.glade (revision 27427) +++ settings-dialogs/xfwm4-tweaks-dialog.glade (working copy) @@ -1,43 +1,34 @@ - +

- - 500 - 5 + + Window Manager Tweaks GTK_WIN_POS_CENTER_ON_PARENT + wmtweaks GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - wmtweaks - Window Manager Tweaks - - - False - False - 1 - - - True True + 6 True + 12 + 6 True True - Skip windows that have "skip pager" -or "skip taskbar" properties set + Skip windows that have "skip pager" or "skip taskbar" +properties set 0 True @@ -89,7 +80,8 @@ True - 3 + 12 + 6 True @@ -135,6 +127,8 @@ True + 6 + 6 True @@ -206,6 +200,8 @@ True + 12 + 6 True @@ -313,6 +309,8 @@ True + 12 + 6 True @@ -388,6 +386,8 @@ True + 12 + 6 True @@ -460,6 +460,8 @@ True + 12 + 6 True @@ -487,130 +489,143 @@ GTK_RESIZE_QUEUE GTK_SHADOW_NONE - + True - 10 + 12 + 6 - + True - 3 + True + Display fullscreen overlay windows directly + 0 + True + + + + + True + True + Show shadows under regular windows + 0 + True + + + 1 + + + + + True + True + Show shadows under popup windows + 0 + True + + + 2 + + + + + True + True + Show shadows under docking windows + 0 + True + + + 3 + + + + + True + 2 - + True - True - Display fullscreen overlay windows directly - 0 - True + 0 + Opacity of window decorations - - - - True - True - Show shadows under regular windows - 0 - True - - 1 + False - + True - True - Show shadows under popup windows - 0 - True - - - 2 - - - - - True - True - Show shadows under docking windows - 0 - True - - - 3 - - - - - True + 6 - + True - 0 - Opacity of window decorations + Transparent + True False + False - + True - - - True - Transparent - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 90 0 100 1 10 0 - False - False - - - 1 - - - - - True - Opaque - True - - - False - False - 2 - - + True + GTK_UPDATE_DISCONTINUOUS + 90 0 100 1 10 0 + False + False + 1 + + + + + True + Opaque + True + + False False - 1 + 2 - 4 + False + False + 1 + + + 4 + + + + + True - + True + 0 + Opacity of inactive windows + + + False + False + + + + + True - + True - 0 - Opacity of inactive windows + Transparent + True False @@ -618,64 +633,64 @@ - + True - - - True - Transparent - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 90 0 100 1 10 0 - False - False - - - 1 - - - - - True - Opaque - True - - - False - False - 2 - - + True + GTK_UPDATE_DISCONTINUOUS + 90 0 100 1 10 0 + False + False + 1 + + + + + True + Opaque + True + + False False - 1 + 2 - 5 + False + False + 1 + + + 5 + + + + + True - + True + 0 + Opacity of windows during move + + + False + False + + + + + True - + True - 0 - Opacity of windows during move + Transparent + True False @@ -683,64 +698,64 @@ - + True - - - True - Transparent - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 100 0 100 1 10 0 - False - False - - - 1 - - - - - True - Opaque - True - - - False - False - 2 - - + True + GTK_UPDATE_DISCONTINUOUS + 100 0 100 1 10 0 + False + False + 1 + + + + + True + Opaque + True + + False False - 1 + 2 - 6 + False + False + 1 + + + 6 + + + + + True - + True + 0 + Opacity of windows during resize + + + False + False + + + + + True - + True - 0 - Opacity of windows during resize + Transparent + True False @@ -748,64 +763,64 @@ - + True - - - True - Transparent - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 90 0 100 1 10 0 - False - False - - - 1 - - - - - True - Opaque - True - - - False - False - 2 - - + True + GTK_UPDATE_DISCONTINUOUS + 90 0 100 1 10 0 + False + False + 1 + + + + + True + Opaque + True + + False False - 1 + 2 - 7 + False + False + 1 + + + 7 + + + + + True - + True + 0 + Opacity of popup windows + + + False + False + + + + + True - + True - 0 - Opacity of popup windows + Transparent + True False @@ -813,57 +828,41 @@ - + True - - - True - Transparent - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 90 0 100 1 10 0 - False - False - - - 1 - - - - - True - Opaque - True - - - False - False - 2 - - + True + GTK_UPDATE_DISCONTINUOUS + 90 0 100 1 10 0 + False + False + 1 + + + + + True + Opaque + True + + False False - 1 + 2 - 8 + False + False + 1 + + 8 + @@ -892,13 +891,13 @@ - 2 + 1 - + True - GTK_BUTTONBOX_EDGE + GTK_BUTTONBOX_END True @@ -908,6 +907,9 @@ True 0 + + True + Index: settings-dialogs/xfwm4-workspace-dialog.glade =================================================================== --- settings-dialogs/xfwm4-workspace-dialog.glade (revision 27427) +++ settings-dialogs/xfwm4-workspace-dialog.glade (working copy) @@ -1,37 +1,27 @@ - +

- - 5 + + Workspace Settings GTK_WIN_POS_CENTER_ON_PARENT + xfce4-workspaces GDK_WINDOW_TYPE_HINT_DIALOG False - + True 2 - - True - xfce4-workspaces - Workspace Settings - - - False - False - 1 - - - True - 5 + 6 + 6 True - 4 + 12 True @@ -62,10 +52,18 @@ - + True True - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + 1 @@ -73,13 +71,13 @@ - 2 + 1 - + True - GTK_BUTTONBOX_EDGE + GTK_BUTTONBOX_END True @@ -89,6 +87,9 @@ True 0 + + True + Index: settings-dialogs/xfwm4-dialog.glade =================================================================== --- settings-dialogs/xfwm4-dialog.glade (revision 27427) +++ settings-dialogs/xfwm4-dialog.glade (working copy) @@ -1,22 +1,66 @@ - +

- + 5 + False GTK_WIN_POS_CENTER_ON_PARENT GDK_WINDOW_TYPE_HINT_DIALOG + True + True + main-dialog False - + True 2 - + True - xfwm4 - Windowmanager Settings + 4 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + input-keyboard + Add a new window-manage shortcut theme + + + False + False + + + + + True + 0 + Type the name for the new shortcut theme: + + + False + False + 1 + + + + + True + 10 + + + True + True + + + + + False + False + 2 + + False @@ -24,35 +68,119 @@ 1 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + Window Manager Settings + GTK_WIN_POS_CENTER_ON_PARENT + xfwm4 + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + 2 True True + 6 - + True - 4 - 4 - 4 - 4 + 12 + 12 - + + 120 True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN - - 120 + True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + False + + + + + False + False + + + + + True + 4 + + + True + 0 + GTK_SHADOW_NONE - + True - True - False + 6 + 12 + 18 + 6 + + + True + True + True + 0 + + + + + True + Title Font + True + + + label_item + + False @@ -60,323 +188,280 @@ - + True - 4 + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 + 18 + 6 - + True - 12 - 12 - - - True - True - True - 0 - - + - - - True - Title font - True - - - label_item - - - - False - False - - + True - 0 - GTK_SHADOW_NONE - - - True - 12 - 12 - - - True - - - - - - - - True - Title alignment - True - - - label_item - - + Title Alignment + True - False - False - 1 + label_item + + + False + False + 1 + + + + + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 - + True - 12 - 12 + 6 + 6 - + True + 0 + Drag the buttons to change the layout + + + + + True + 0 - + True - Click and drag the buttons to change the layout - - - - - True - 0 - GTK_SHADOW_IN + 6 + 6 + 6 + 6 - + True - 4 - 4 - 4 - - - 26 - True - - - True - True - True - The window title, it cannot be removed - Title - 0 - - - - + True + True + The window title, it cannot be removed + Title + 0 - - - True - Active - True - - - label_item - - + + + + True + Active + True + - 1 + label_item + + + 1 + + + + + True + 0 - - 0 - GTK_SHADOW_IN + + True + 6 + 6 + 6 + 6 - + True - 4 - 4 - 4 + 12 - - 26 + True - 5 + True + True + Menu + 0 - + True - True - True - Menu - 0 - - - True - gtk-index - - + gtk-index - - False - False - + + + False + False + + + + + True + True + True + Stick + 0 - + True - True - True - Stick - 0 - - - True - gtk-add - - + gtk-add - - False - False - 1 - + + + False + False + 1 + + + + + True + True + True + Shade + 0 - + True - True - True - Shade - 0 - - - True - gtk-goto-top - - + gtk-goto-top - - False - False - 2 - + + + False + False + 2 + + + + + True + True + True + Hide + 0 - + True - True - True - Hide - 0 - - - True - gtk-undo - - + gtk-undo - - False - False - 3 - + + + False + False + 3 + + + + + True + True + True + Maximize + 0 - + True - True - True - Maximize - 0 - - - True - gtk-zoom-100 - - + gtk-zoom-100 - - False - False - 4 - + + + False + False + 4 + + + + + True + True + True + Close + 0 - + True - True - True - Close - 0 - - - True - gtk-close - - + gtk-close - - False - False - 5 - + + False + False + 5 + - - - True - Hidden - True - - - label_item - - + + + + True + Hidden + True + - 2 + label_item + + 2 + - - - True - Button layout - True - - - label_item - - + + + + True + Button Layout + True + - False - False - 2 + label_item - 1 + False + False + 2 + + 1 + @@ -391,117 +476,83 @@ - + True - 4 - 4 - 4 - 4 + 12 + 12 - + True + 6 - + True - 4 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - - - True - True - True - gtk-add - True - 0 - - - False - False - 1 - - - - - True - False - True - True - gtk-remove - True - 0 - - - False - False - 2 - - + Theme: False - False - 4 - + True - 0 - GTK_SHADOW_NONE - - - True - 12 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - False - True - True - - - - - - - - - True - Window shortcuts - True - - - label_item - - + GTK_SENSITIVITY_ON 1 + + + True + True + True + gtk-add + True + 0 + + + False + 2 + + + + + True + True + True + gtk-remove + True + 0 + + + False + 3 + + + + False + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + False + True + + + + + 1 + + 1 @@ -510,7 +561,7 @@ True - Keyboard + Shortcuts tab @@ -519,29 +570,29 @@ - + True - 4 - 4 - 4 - 4 + 12 + 6 - + True - 4 + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 - + True - 12 - 12 + 6 + 6 True + 12 True @@ -569,41 +620,14 @@ - - - - - True - Focus model - True - - - label_item - - - - - False - False - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 12 True - 4 + 12 True - Short + Delay: True @@ -617,228 +641,193 @@ True GTK_UPDATE_DISCONTINUOUS 100 100 2000 1 10 10 - False + 0 + GTK_POS_RIGHT 1 - - - True - Long - True - - - False - False - 2 - - + + 1 + + + + + + True + Focus Model + True + + + label_item + + + + + False + False + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 6 + 12 - + True - Delay before window receives focus - True + True + 6 + Automatically give focus to newly created windows + 0 + True - - label_item - + + + + True + New Window Focus + True + - False - 1 + label_item + + + False + False + 1 + + + + + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 - + True - 12 - 12 + 6 + 6 - + True True - Automatically give focus to newly created windows + Automatically raise windows when they receive focus 0 True - - - - - True - New window focus - True - - - label_item - - - - - False - False - 2 - - - - - True - 0 - GTK_SHADOW_NONE - - - True - 12 - 12 - + True - 4 + 12 - + True - True - Automatically raise windows when they receive focus - 0 - True + Delay: + True + + False + False + - + True - - - True - 0 - Delay before raising focused window: - - - False - False - - - - - True - 4 - - - True - Short - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 100 100 2000 1 10 10 - False - - - 1 - - - - - True - Long - True - - - False - False - 2 - - - - - 1 - - + True + GTK_UPDATE_DISCONTINUOUS + 100 100 2000 1 10 10 + 0 + GTK_POS_RIGHT 1 + + 1 + - - - True - Raise on focus - True - - - label_item - - + + + + True + Raise On Focus + True + - False - False - 3 + label_item + + + False + False + 2 + + + + + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 - + True - 12 - 12 - - - True - True - Raise window when clicking inside application window - 0 - True - - + True + 6 + Raise window when clicking inside application window + 0 + True - - - True - Raise on click - True - - - label_item - - + + + + True + Raise On Click + True + - False - False - 4 + label_item + + False + False + 3 + @@ -857,36 +846,62 @@ - + True - 4 - 4 - 4 - 4 + 12 + 6 - + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 6 + 12 + 12 - + True - 12 - 12 + 6 - + True - 4 + True + Snap windows to screen border + 0 + True + + + False + False + + + + + True + True + Snap windows to other windows + 0 + True + + + False + False + 1 + + + + + True + 12 - + True - True - Snap windows to screen border - 0 - True + Distance: + True False @@ -894,235 +909,90 @@ - + True True - Snap windows to other windows - 0 - True + GTK_UPDATE_DISCONTINUOUS + 20 0 100 1 10 10 + False + 0 + GTK_POS_RIGHT - False - False 1 - - - True - - - True - 0 - Distance: - - - - - True - 4 - - - True - Small - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 20.332225913621262 0 100 1 10 10 - False - False - - - 1 - - - - - True - Wide - True - - - False - False - 2 - - - - - 1 - - - - - 2 - - + + 2 + - - - True - Windows snapping - True - - - label_item - - - + True - 0 - GTK_SHADOW_NONE - - - True - 12 - 12 - - - True - 4 - - - True - True - Wrap workspaces when the pointer reaches the screen edge - 0 - True - - - - - True - True - Wrap workspaces when dragging a window off the screen - 0 - True - - - 1 - - - - - True - - - True - 0 - Edge resistance: - True - - - False - False - - - - - True - 4 - - - True - Small - True - - - False - False - - - - - True - True - GTK_UPDATE_DISCONTINUOUS - 20.332225913621262 0 100 1 10 10 - False - False - - - 1 - - - - - True - Wide - True - - - False - False - 2 - - - - - 1 - - - - - 2 - - - - - - - - - True - Wrap workspaces - True - - - label_item - - + Windows Snapping + True - 1 + label_item + + + False + + + + + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 6 + 12 + 12 - + True - 12 - 12 + 6 + 6 - + True - 4 + True + Wrap workspaces when the pointer reaches the screen edge + 0 + True + + + + + True + True + Wrap workspaces when dragging a window off the screen + 0 + True + + + 1 + + + + + True + 12 - + True - True - Hide content of windows when resizing - 0 - True + Edge resistance: + True False @@ -1130,73 +1000,142 @@ - + True True - Hide content of windows when moving - 0 - True + GTK_UPDATE_DISCONTINUOUS + 20 0 100 1 10 10 + False + 0 + GTK_POS_RIGHT - False - False 1 + + 2 + - - - True - Box move and resize - True - - - label_item - - + + + + True + Wrap Workspaces + True + - 2 + label_item + + + False + 1 + + + + + True + 0 + GTK_SHADOW_NONE - + True - 0 - GTK_SHADOW_NONE + 6 + 12 - + True - 12 - 12 + 6 + 4 - + True - The action to perform when the title-bar is double-clicked - + True + Hide content of windows when resizing + 0 + True + + False + False + + + + True + True + Hide content of windows when moving + 0 + True + + + False + False + 1 + + + + + + + True + Box Move And Resize + True + + + label_item + + + + + False + 2 + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 6 + 12 + 18 + 6 - + True - Double click action - True + The action to perform when the title-bar is double-clicked + - - label_item - + + + + True + Double Click Action + True + - 3 + label_item + + False + 3 + @@ -1216,13 +1155,13 @@ - 2 + 1 - + True - GTK_BUTTONBOX_EDGE + GTK_BUTTONBOX_END True @@ -1232,6 +1171,9 @@ True 0 + + True + @@ -1255,105 +1197,4 @@ - - 5 - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - main-dialog - False - - - True - 2 - - - True - 4 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - input-keyboard - Add a new window-manage shortcut theme - - - False - False - - - - - True - 0 - Type the name for the new shortcut theme: - - - False - False - 1 - - - - - True - 10 - - - True - True - - - - - False - False - 2 - - - - - False - False - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - gtk-ok - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - -