Hierarchify

darcs-hash:20071101201059-a5988-fc1f1262bec1b69e13ba18ae7cefeafc8c4471d4.gz

8 files changed, 52 insertions, 52 deletions

diff --git a/XPrompt.hs b/XMonad/Prompt.hs
index 8df0d2f..0bd53fb 100644
--- a/XPrompt.hs
+++ b/XMonad/Prompt.hs
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.XPrompt (
+module XMonad.Prompt (
                              -- * Usage
                              -- $usage
                              mkXPrompt
@@ -46,8 +46,8 @@ import Graphics.X11.Xlib.Extras
 import XMonad  hiding (config, io)
 import XMonad.Operations (initColor)
 import qualified XMonad.StackSet as W
-import XMonadContrib.XUtils
-import XMonadContrib.XSelection (getSelection)
+import XMonad.Util.XUtils
+import XMonad.Util.XSelection (getSelection)
 
 import Control.Arrow ((***),(&&&))
 import Control.Monad.Reader
diff --git a/DirectoryPrompt.hs b/XMonad/Prompt/Directory.hs
index a8d58f8..1ceaab8 100644
--- a/DirectoryPrompt.hs
+++ b/XMonad/Prompt/Directory.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.DirectoryPrompt
+-- Module      :  XMonad.Prompt.Directory
 -- Copyright   :  (C) 2007 Andrea Rossato, David Roundy
 -- License     :  BSD3
 -- 
@@ -12,18 +12,18 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.DirectoryPrompt (
+module XMonad.Prompt.Directory (
                              -- * Usage
                              -- $usage
                              directoryPrompt
                               ) where
 
 import XMonad
-import XMonadContrib.XPrompt
-import XMonadContrib.Run ( runProcessWithInput )
+import XMonad.Prompt
+import XMonad.Util.Run ( runProcessWithInput )
 
 -- $usage
--- For an example usage see "XMonadContrib.WorkspaceDir"
+-- For an example usage see "XMonad.Layout.WorkspaceDir"
 
 data Dir = Dir String
 
diff --git a/ManPrompt.hs b/XMonad/Prompt/Man.hs
index 2eddb39..5a9f4ef 100644
--- a/ManPrompt.hs
+++ b/XMonad/Prompt/Man.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -Wall #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.ManPrompt
+-- Module      :  XMonad.Prompt.Man
 -- Copyright   :  (c) 2007 Valery V. Vorotyntsev
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -19,7 +19,7 @@
 --   * test with QuickCheck
 -----------------------------------------------------------------------------
 
-module XMonadContrib.ManPrompt (
+module XMonad.Prompt.Man (
                                 -- * Usage
                                 -- $usage
                                 manPrompt
@@ -27,9 +27,9 @@ module XMonadContrib.ManPrompt (
                                ) where
 
 import XMonad
-import XMonadContrib.XPrompt
-import XMonadContrib.Run
-import XMonadContrib.ShellPrompt (split)
+import XMonad.Prompt
+import XMonad.Util.Run
+import XMonad.Prompt.Shell (split)
 
 import System.Directory
 import System.Process
@@ -43,14 +43,14 @@ import Data.Maybe
 -- $usage
 -- 1. In Config.hs add:
 --
--- > import XMonadContrib.ManPrompt
+-- > import XMonad.Prompt.ManPrompt
 --
 -- 2. In your keybindings add something like:
 --
 -- >     , ((modMask, xK_F1), manPrompt defaultXPConfig) -- mod-f1 %! Query for manual page to be displayed
 
--- %import XMonadContrib.XPrompt
--- %import XMonadContrib.ManPrompt
+-- %import XMonad.Prompt.XPrompt
+-- %import XMonad.Prompt.ManPrompt
 -- %keybind , ((modMask, xK_F1), manPrompt defaultXPConfig)
 
 data Man = Man
diff --git a/ShellPrompt.hs b/XMonad/Prompt/Shell.hs
index 756b216..dfbfb09 100644
--- a/ShellPrompt.hs
+++ b/XMonad/Prompt/Shell.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.ShellPrompt
+-- Module      :  XMonad.Prompt.Shell
 -- Copyright   :  (C) 2007 Andrea Rossato
 -- License     :  BSD3
 --
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.ShellPrompt (
+module XMonad.Prompt.Shell(
                              -- * Usage
                              -- $usage
                              shellPrompt
@@ -27,24 +27,24 @@ import Control.Monad
 import Data.List
 import System.Directory
 import System.IO
-import XMonadContrib.Run
+import XMonad.Util.Run
 import XMonad
-import XMonadContrib.XPrompt
+import XMonad.Prompt
 
 -- $usage
 --
 -- 1. In Config.hs add:
 --
--- > import XMonadContrib.XPrompt
--- > import XMonadContrib.ShellPrompt
+-- > import XMonad.Prompt
+-- > import XMonad.Prompt.Shell
 --
 -- 2. In your keybindings add something like:
 --
 -- >   , ((modMask .|. controlMask, xK_x), shellPrompt defaultXPConfig)
 --
 
--- %import XMonadContrib.XPrompt
--- %import XMonadContrib.ShellPrompt
+-- %import XMonad.Prompt
+-- %import XMonad.Prompt.ShellPrompt
 -- %keybind , ((modMask .|. controlMask, xK_x), shellPrompt defaultXPConfig)
 
 data Shell = Shell
diff --git a/SshPrompt.hs b/XMonad/Prompt/Ssh.hs
index 64dd5ef..9194b27 100644
--- a/SshPrompt.hs
+++ b/XMonad/Prompt/Ssh.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.SshPrompt
+-- Module      :  XMonad.Prompt.Ssh
 -- Copyright   :  (C) 2007 Andrea Rossato
 -- License     :  BSD3
 --
@@ -12,15 +12,15 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.SshPrompt (
+module XMonad.Prompt.Ssh(
                              -- * Usage
                              -- $usage
                              sshPrompt
                               ) where
 
 import XMonad
-import XMonadContrib.Run
-import XMonadContrib.XPrompt
+import XMonad.Util.Run
+import XMonad.Prompt
 
 import System.Directory
 import System.Environment
@@ -32,16 +32,16 @@ import Data.Maybe
 -- $usage
 -- 1. In Config.hs add:
 --
--- > import XMonadContrib.XPrompt
--- > import XMonadContrib.SshPrompt
+-- > import XMonad.Prompt
+-- > import XMonad.Prompt.SshPrompt
 --
 -- 2. In your keybindings add something like:
 --
 -- >   , ((modMask .|. controlMask, xK_s), sshPrompt defaultXPConfig)
 --
 
--- %import XMonadContrib.XPrompt
--- %import XMonadContrib.SshPrompt
+-- %import XMonad.Prompt
+-- %import XMonad.Prompt.SshPrompt
 -- %keybind , ((modMask .|. controlMask, xK_s), sshPrompt defaultXPConfig)
 
 data Ssh = Ssh
diff --git a/WindowPrompt.hs b/XMonad/Prompt/Window.hs
index 5311f15..2c017ee 100644
--- a/WindowPrompt.hs
+++ b/XMonad/Prompt/Window.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.WindowPrompt
+-- Module      :  XMonad.Prompt.Window
 -- Copyright   :  Devin Mullins <me@twifkak.com>
 --                Andrea Rossato <andrea.rossato@unibz.it>
 -- License     :  BSD-style (see LICENSE)
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.WindowPrompt
+module XMonad.Prompt.Window
     (
     -- * Usage
     -- $usage 
@@ -28,8 +28,8 @@ import Data.List
 import qualified XMonad.StackSet as W
 import XMonad
 import XMonad.Operations (windows)
-import XMonadContrib.XPrompt
-import XMonadContrib.WindowBringer
+import XMonad.Prompt
+import XMonad.Actions.WindowBringer
 
 -- $usage
 -- WindowPrompt brings windows to you and you to windows.
@@ -38,16 +38,16 @@ import XMonadContrib.WindowBringer
 --
 -- Place in your Config.hs:
 --
--- > import XMonadContrib.XPrompt
--- > import XMonadContrib.WindowPrompt
+-- > import XMonad.Prompt
+-- > import XMonad.Prompt.WindowPrompt
 --
 -- and in the keys definition:
 --
 -- > , ((modMask .|. shiftMask, xK_g     ), windowPromptGoto  defaultXPConfig)
 -- > , ((modMask .|. shiftMask, xK_b     ), windowPromptBring defaultXPConfig)
 
--- %import XMonadContrib.XPrompt
--- %import XMonadContrib.WindowPrompt
+-- %import XMonad.Prompt
+-- %import XMonad.Prompt.WindowPrompt
 -- %keybind , ((modMask .|. shiftMask, xK_g     ), windowPromptGoto  defaultXPConfig)
 -- %keybind , ((modMask .|. shiftMask, xK_b     ), windowPromptBring defaultXPConfig)
 
diff --git a/WorkspacePrompt.hs b/XMonad/Prompt/Workspace.hs
index 1087cf0..c05ead0 100644
--- a/WorkspacePrompt.hs
+++ b/XMonad/Prompt/Workspace.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.WorkspacePrompt
+-- Module      :  XMonad.Prompt.Workspace
 -- Copyright   :  (C) 2007 Andrea Rossato, David Roundy
 -- License     :  BSD3
 -- 
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.WorkspacePrompt (
+module XMonad.Prompt.Workspace (
                              -- * Usage
                              -- $usage
                              workspacePrompt
@@ -21,13 +21,13 @@ module XMonadContrib.WorkspacePrompt (
 import Control.Monad.State ( gets )
 import Data.List ( sort )
 import XMonad hiding ( workspaces )
-import XMonadContrib.XPrompt
+import XMonad.Prompt
 import XMonad.StackSet ( workspaces, tag )
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 -- 
--- > import XMonadContrib.WorkspacePrompt
+-- > import XMonad.Prompt.WorkspacePrompt
 --
 -- >   , ((modMask .|. shiftMask, xK_m     ), workspacePrompt myXPConfig (windows . W.shift))
 
diff --git a/XMonadPrompt.hs b/XMonad/Prompt/XMonad.hs
index d60fe67..5effbe4 100644
--- a/XMonadPrompt.hs
+++ b/XMonad/Prompt/XMonad.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.XMonadPrompt
+-- Module      :  XMonad.Prompt.XMonad
 -- Copyright   :  (C) 2007 Andrea Rossato
 -- License     :  BSD3
 -- 
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.XMonadPrompt (
+module XMonad.Prompt.XMonad (
                              -- * Usage
                              -- $usage
                              xmonadPrompt,
@@ -20,23 +20,23 @@ module XMonadContrib.XMonadPrompt (
                               ) where
 
 import XMonad
-import XMonadContrib.XPrompt
-import XMonadContrib.Commands (defaultCommands, runCommand')
+import XMonad.Prompt
+import XMonad.Actions.Commands (defaultCommands, runCommand')
 
 -- $usage
 --
 -- in Config.hs add:
 --
--- > import XMonadContrib.XPrompt
--- > import XMonadContrib.XMonadPrompt
+-- > import XMonad.Prompt
+-- > import XMonad.Prompt.XMonad
 --
 -- in you keybindings add:
 --
 -- >   , ((modMask .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
 --
 
--- %import XMonadContrib.XPrompt
--- %import XMonadContrib.XMonadPrompt
+-- %import XMonad.Prompt
+-- %import XMonad.Prompt.XMonad
 -- %keybind , ((modMask .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
 
 data XMonad = XMonad