From 3bf9d80c40b9ec8f2900fe9fffa4fc17627b5b0d Mon Sep 17 00:00:00 2001 From: slotThe Date: Tue, 24 Nov 2020 12:33:56 +0100 Subject: [PATCH] XMonad.Layout.Named: Deprecate --- XMonad/Config/Bluetile.hs | 12 ++++++------ XMonad/Config/Droundy.hs | 10 +++++----- XMonad/Layout/Groups/Examples.hs | 7 +++---- XMonad/Layout/Groups/Wmii.hs | 5 ++--- XMonad/Layout/LayoutModifier.hs | 2 +- XMonad/Layout/Named.hs | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/XMonad/Config/Bluetile.hs b/XMonad/Config/Bluetile.hs index f39fdd17..93086cd8 100644 --- a/XMonad/Config/Bluetile.hs +++ b/XMonad/Config/Bluetile.hs @@ -29,7 +29,7 @@ module XMonad.Config.Bluetile ( import XMonad import XMonad.Layout.BorderResize -import XMonad.Layout.BoringWindows +import XMonad.Layout.BoringWindows hiding (Replace) import XMonad.Layout.ButtonDecoration import XMonad.Layout.Decoration import XMonad.Layout.DecorationAddons @@ -37,7 +37,7 @@ import XMonad.Layout.DraggingVisualizer import XMonad.Layout.Maximize import XMonad.Layout.Minimize import XMonad.Layout.MouseResizableTile -import XMonad.Layout.Named +import XMonad.Layout.Renamed import XMonad.Layout.NoBorders import XMonad.Layout.PositionStoreFloat import XMonad.Layout.WindowSwitcherDecoration @@ -183,10 +183,10 @@ bluetileManageHook = composeAll , isFullscreen --> doFullFloat] bluetileLayoutHook = avoidStruts $ minimize $ boringWindows $ - named "Floating" floating ||| - named "Tiled1" tiled1 ||| - named "Tiled2" tiled2 ||| - named "Fullscreen" fullscreen + renamed [Replace "Floating"] floating ||| + renamed [Replace "Tiled1"] tiled1 ||| + renamed [Replace "Tiled2"] tiled2 ||| + renamed [Replace "Fullscreen"] fullscreen where floating = floatingDeco $ maximize $ borderResize positionStoreFloat tiled1 = tilingDeco $ maximize mouseResizableTileMirrored diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs index f4afe848..6fa76f76 100644 --- a/XMonad/Config/Droundy.hs +++ b/XMonad/Config/Droundy.hs @@ -20,7 +20,7 @@ import System.Exit ( exitSuccess ) import XMonad.Layout.Tabbed ( tabbed, shrinkText, Shrinker, shrinkIt, CustomShrink(CustomShrink) ) import XMonad.Layout.Combo ( combineTwo ) -import XMonad.Layout.Named ( named ) +import XMonad.Layout.Renamed ( Rename(Replace), renamed ) import XMonad.Layout.LayoutCombinators import XMonad.Layout.Square ( Square(Square) ) import XMonad.Layout.WindowNavigation ( Navigate(Move,Swap,Go), Direction2D(U,D,R,L), @@ -124,10 +124,10 @@ config = docks $ ewmh def , layoutHook = showWName $ workspaceDir "~" $ boringWindows $ smartBorders $ windowNavigation $ maximizeVertical $ toggleLayouts Full $ avoidStruts $ - named "tabbed" mytab ||| - named "xclock" (mytab ****//* combineTwo Square mytab mytab) ||| - named "three" (mytab **//* mytab *//* combineTwo Square mytab mytab) ||| - named "widescreen" ((mytab *||* mytab) + renamed [Replace "tabbed"] mytab ||| + renamed [Replace "xclock"] (mytab ****//* combineTwo Square mytab mytab) ||| + renamed [Replace "three"] (mytab **//* mytab *//* combineTwo Square mytab mytab) ||| + renamed [Replace "widescreen"] ((mytab *||* mytab) ****//* combineTwo Square mytab mytab) -- ||| --mosaic 0.25 0.5 , terminal = "xterm" -- The preferred terminal program. diff --git a/XMonad/Layout/Groups/Examples.hs b/XMonad/Layout/Groups/Examples.hs index 877ef6bd..fb5e375d 100644 --- a/XMonad/Layout/Groups/Examples.hs +++ b/XMonad/Layout/Groups/Examples.hs @@ -59,7 +59,6 @@ import XMonad.Layout.Groups.Helpers import XMonad.Layout.ZoomRow import XMonad.Layout.Tabbed -import XMonad.Layout.Named import XMonad.Layout.Renamed import XMonad.Layout.Decoration import XMonad.Layout.Simplest @@ -209,13 +208,13 @@ tallTabs c = _tab c $ G.group _tabs $ _vert c ||| _horiz c ||| Full mirrorTallTabs c = _tab c $ G.group _tabs $ _horiz c ||| Full ||| _vert c -_tabs = named "Tabs" Simplest +_tabs = renamed [Replace "Tabs"] Simplest _tab c l = renamed [CutWordsLeft 1] $ addTabs (tabsShrinker c) (tabsTheme c) l -_vert c = named "Vertical" $ Tall (vNMaster c) (vIncrement c) (vRatio c) +_vert c = renamed [Replace "Vertical"] $ Tall (vNMaster c) (vIncrement c) (vRatio c) -_horiz c = named "Horizontal" $ Mirror $ Tall (hNMaster c) (hIncrement c) (hRatio c) +_horiz c = renamed [Replace "Horizontal"] $ Mirror $ Tall (hNMaster c) (hIncrement c) (hRatio c) -- | Increase the number of master groups by one increaseNMasterGroups :: X () diff --git a/XMonad/Layout/Groups/Wmii.hs b/XMonad/Layout/Groups/Wmii.hs index 26cc711c..714cf4db 100644 --- a/XMonad/Layout/Groups/Wmii.hs +++ b/XMonad/Layout/Groups/Wmii.hs @@ -41,7 +41,6 @@ import XMonad.Layout.Groups.Examples import XMonad.Layout.Groups.Helpers import XMonad.Layout.Tabbed -import XMonad.Layout.Named import XMonad.Layout.Renamed import XMonad.Layout.MessageControl import XMonad.Layout.Simplest @@ -90,8 +89,8 @@ import XMonad.Layout.Simplest -- | A layout inspired by wmii wmii s t = G.group innerLayout zoomRowG - where column = named "Column" $ Tall 0 (3/100) (1/2) - tabs = named "Tabs" Simplest + where column = renamed [Replace "Column"] $ Tall 0 (3/100) (1/2) + tabs = renamed [Replace "Tabs"] Simplest innerLayout = renamed [CutWordsLeft 3] $ addTabs s t $ ignore NextLayout diff --git a/XMonad/Layout/LayoutModifier.hs b/XMonad/Layout/LayoutModifier.hs index e9d8ffc8..d70ccfe5 100644 --- a/XMonad/Layout/LayoutModifier.hs +++ b/XMonad/Layout/LayoutModifier.hs @@ -73,7 +73,7 @@ import XMonad.StackSet ( Stack, Workspace (..) ) -- -- * "XMonad.Layout.Reflect" -- --- * "XMonad.Layout.Named" +-- * "XMonad.Layout.Renamed" -- -- * "XMonad.Layout.WindowNavigation" -- diff --git a/XMonad/Layout/Named.hs b/XMonad/Layout/Named.hs index eebbbe52..a8bca247 100644 --- a/XMonad/Layout/Named.hs +++ b/XMonad/Layout/Named.hs @@ -16,7 +16,7 @@ -- ----------------------------------------------------------------------------- -module XMonad.Layout.Named +module XMonad.Layout.Named {-# DEPRECATED "Use XMonad.Layout.Renamed instead" #-} ( -- * Usage -- $usage named,