From: Daniel W. <dm...@lu...> - 2012-12-19 01:26:16
|
diffing dir... Wed Dec 19 01:23:54 GMT 2012 Daniel Wagner <da...@wa...> * switch FileChooser over to new-style signals, and add the fileSelectionChanged signal (per trac #1273) Ignore-this: b525fc13f8ef583426cf1eb79bda02df hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 210 + currentFolderChanged, + fileActivated, + fileSelectionChanged, + updatePreview, +#if GTK_CHECK_VERSION(2,8,0) + confirmOverwrite, +#endif + +#ifndef DISABLE_DEPRECATED +-- * Deprecated hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 231 -#endif -#endif +#endif -- version 2.8 +#endif -- deprecated +#endif -- version 2.4 hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1086 -onCurrentFolderChanged, afterCurrentFolderChanged :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" False -afterCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" True +currentFolderChanged :: FileChooserClass self => Signal self (IO ()) +currentFolderChanged = Signal (connect_NONE__NONE "current-folder-changed") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1102 ---onSelectionChanged, afterSelectionChanged :: FileChooserClass self => self --- -> IO () --- -> IO (ConnectId self) ---onSelectionChanged = connect_NONE__NONE "selection-changed" False ---afterSelectionChanged = connect_NONE__NONE "selection-changed" True +fileSelectionChanged :: FileChooserClass self => Signal self (IO ()) +fileSelectionChanged = Signal (connect_NONE__NONE "selection-changed") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1122 -onUpdatePreview, afterUpdatePreview :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onUpdatePreview = connect_NONE__NONE "update-preview" False -afterUpdatePreview = connect_NONE__NONE "update-preview" True +updatePreview :: FileChooserClass self => Signal self (IO ()) +updatePreview = Signal (connect_NONE__NONE "update-preview") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1136 -onFileActivated, afterFileActivated :: FileChooserClass self => self - -> IO () - -> IO (ConnectId self) -onFileActivated = connect_NONE__NONE "file-activated" False -afterFileActivated = connect_NONE__NONE "file-activated" True +fileActivated :: FileChooserClass self => Signal self (IO ()) +fileActivated = Signal (connect_NONE__NONE "file-activated") hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1162 +confirmOverwrite :: FileChooserClass self => Signal self (IO FileChooserConfirmation) +confirmOverwrite = Signal (connect_NONE__ENUM "confirm-overwrite") +#endif + +#ifndef DISABLE_DEPRECATED + +-- * Deprecated + +onCurrentFolderChanged, afterCurrentFolderChanged :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" False +afterCurrentFolderChanged = connect_NONE__NONE "current-folder-changed" True +{-# DEPRECATED onCurrentFolderChanged "use currentFolderChanged instead" #-} +{-# DEPRECATED afterCurrentFolderChanged "use currentFolderChanged instead" #-} + +--onSelectionChanged, afterSelectionChanged :: FileChooserClass self => self +-- -> IO () +-- -> IO (ConnectId self) +--onSelectionChanged = connect_NONE__NONE "selection-changed" False +--afterSelectionChanged = connect_NONE__NONE "selection-changed" True + +onUpdatePreview, afterUpdatePreview :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onUpdatePreview = connect_NONE__NONE "update-preview" False +afterUpdatePreview = connect_NONE__NONE "update-preview" True +{-# DEPRECATED onUpdatePreview "use updatePreview instead" #-} +{-# DEPRECATED afterUpdatePreview "use updatePreview instead" #-} + +onFileActivated, afterFileActivated :: FileChooserClass self => self + -> IO () + -> IO (ConnectId self) +onFileActivated = connect_NONE__NONE "file-activated" False +afterFileActivated = connect_NONE__NONE "file-activated" True +{-# DEPRECATED onFileActivated "use fileActivated instead" #-} +{-# DEPRECATED afterFileActivated "use fileActivated instead" #-} + +#if GTK_CHECK_VERSION(2,8,0) hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs 1206 +{-# DEPRECATED onConfirmOverwrite "use confirmOverwrite instead" #-} +{-# DEPRECATED afterConfirmOverwrite "use confirmOverwrite instead" #-} +#endif + |