From: <kr_...@us...> - 2003-04-26 20:56:37
|
Update of /cvsroot/htoolkit/gio/src/Graphics/UI/GIO In directory sc8-pr-cvs1:/tmp/cvs-serv3345/gio/src/Graphics/UI/GIO Modified Files: CommonDialogs.hs Log Message: Add owner window as parameter for each function in CommonDialog Index: CommonDialogs.hs =================================================================== RCS file: /cvsroot/htoolkit/gio/src/Graphics/UI/GIO/CommonDialogs.hs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CommonDialogs.hs 26 Apr 2003 10:00:49 -0000 1.2 --- CommonDialogs.hs 26 Apr 2003 20:56:34 -0000 1.3 *************** *** 22,25 **** --- 22,27 ---- import Graphics.UI.GIO.Types + import Graphics.UI.GIO.Attributes + import Graphics.UI.GIO.Window import qualified Graphics.UI.Port as Lib *************** *** 33,38 **** -- filter name and the second element is a list of -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) -> IO (Maybe FilePath) -- ^ The full qualified path to the selected file ! runInputFileDialog = Lib.runInputFileDialog -- | Run a dialog to select an input file. Returns 'Nothing' when cancelled. --- 35,41 ---- -- filter name and the second element is a list of -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) + -> Maybe Window -- ^ The owner window -> IO (Maybe FilePath) -- ^ The full qualified path to the selected file ! runInputFileDialog title filter mb_parent = Lib.runInputFileDialog title filter (getWHandle mb_parent) -- | Run a dialog to select an input file. Returns 'Nothing' when cancelled. *************** *** 42,47 **** -- filter name and the second element is a list of -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) -> IO [FilePath] -- ^ The list of full qualified paths for the selected files ! runInputFilesDialog = Lib.runInputFilesDialog -- | Run a dialog to select an output file. Returns 'Nothing' when cancelled. --- 45,51 ---- -- filter name and the second element is a list of -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) + -> Maybe Window -- ^ The owner window -> IO [FilePath] -- ^ The list of full qualified paths for the selected files ! runInputFilesDialog title filter mb_parent = Lib.runInputFilesDialog title filter (getWHandle mb_parent) -- | Run a dialog to select an output file. Returns 'Nothing' when cancelled. *************** *** 52,68 **** -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) -> FilePath -- ^ The default file name -> IO (Maybe FilePath) -- ^ The full qualified path to the selected file ! runOutputFileDialog = Lib.runOutputFileDialog -- | Runs a dialog to select a directory. Returns 'Nothing' when cancelled. runDirectoryDialog :: String -- ^ The dialog title -> IO (Maybe FilePath) -- ^ The full qualified path to the selected directory ! runDirectoryDialog = Lib.runDirectoryDialog -- | Run a dialog to select a font. Returns 'Nothing' when cancelled. ! runFontDialog :: IO (Maybe FontDef) ! runFontDialog = Lib.runFontDialog -- | Run a dialog to select a color. Returns 'Nothing' when cancelled. ! runColorDialog :: IO (Maybe Color) ! runColorDialog = Lib.runColorDialog \ No newline at end of file --- 56,79 ---- -- wildcards (example [(\"Haskell script\", [\"*.hs\", \"*.lhs\"])]) -> FilePath -- ^ The default file name + -> Maybe Window -- ^ The owner window -> IO (Maybe FilePath) -- ^ The full qualified path to the selected file ! runOutputFileDialog title filter fname mb_parent = Lib.runOutputFileDialog title filter fname (getWHandle mb_parent) -- | Runs a dialog to select a directory. Returns 'Nothing' when cancelled. runDirectoryDialog :: String -- ^ The dialog title + -> Maybe Window -- ^ The owner window -> IO (Maybe FilePath) -- ^ The full qualified path to the selected directory ! runDirectoryDialog title mb_parent = Lib.runDirectoryDialog title (getWHandle mb_parent) -- | Run a dialog to select a font. Returns 'Nothing' when cancelled. ! runFontDialog :: Maybe Window -- ^ The owner window ! -> IO (Maybe FontDef) ! runFontDialog mb_parent = Lib.runFontDialog (getWHandle mb_parent) -- | Run a dialog to select a color. Returns 'Nothing' when cancelled. ! runColorDialog :: Maybe Window -- ^ The owner window ! -> IO (Maybe Color) ! runColorDialog mb_parent = Lib.runColorDialog (getWHandle mb_parent) ! ! ! getWHandle = maybe Lib.nullHandle hwindow |