diff --git a/Graphics/UI/Gtk/Types.chs b/Graphics/UI/Gtk/Types.chs --- a/Graphics/UI/Gtk/Types.chs +++ b/Graphics/UI/Gtk/Types.chs @@ -749,7 +749,7 @@ #else import Foreign.ForeignPtr (unsafeForeignPtrToPtr) #endif -import Foreign.C.Types (CULong(..), CUInt(..)) +import Foreign.C.Types (CULong(..), CUInt(..), CULLong(..)) import System.Glib.GType (GType, typeInstanceIsA) {#import System.Glib.GObject#} import Graphics.UI.Gtk.General.Threading diff --git a/demo/embedded/Embedded.hs b/demo/embedded/Embedded.hs --- a/demo/embedded/Embedded.hs +++ b/demo/embedded/Embedded.hs @@ -39,7 +39,7 @@ windowSetPosition window WinPosCenter windowSetDefaultSize window 600 400 windowSetTitle window "Press `m` to new tab, press `q` exit." - window `onDestroy` mainQuit + on window objectDestroy mainQuit -- Create notebook to contain GtkSocekt. notebook <- notebookNew @@ -73,13 +73,13 @@ initGUI plug <- plugNew $ Just id - plug `onDestroy` mainQuit + on plug objectDestroy $ mainQuit button <- buttonNewWithLabel "Click me to hang." plug `containerAdd` button -- Simulate a plugin hanging to see if it blocks the outer process. - button `onClicked` threadDelay 5000000 + on button buttonActivated $ threadDelay 5000000 widgetShowAll plug diff --git a/demo/filechooser/FileChooserDemo.glade b/demo/filechooser/FileChooserDemo.glade --- a/demo/filechooser/FileChooserDemo.glade +++ b/demo/filechooser/FileChooserDemo.glade @@ -1,28 +1,24 @@ - - - - - - - 10 - True - File Chooser Demo - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - - - - True - False - 0 - - - - True - This is a demo of the GtkFileChooser that was intoduced in Gtk+ 2.4 + + + + + 10 + True + File Chooser Demo + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + + + True + False + 0 + + + True + This is a demo of the GtkFileChooser that was intoduced in Gtk+ 2.4 The dialog has four modes: * open file (selects existing file) @@ -31,386 +27,357 @@ * create folder (selects existing or bew folder) The last demo show how you can install extra widgets or a preview widget in the file open dialog - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0 - 10 - 10 - - - 0 - True - False - - - - - - True - GTK_BUTTONBOX_EDGE - 5 - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Open File - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-save-as - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Save File - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Select Folder - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Create Folder - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - 5 - False - True - - - - - - True - GTK_BUTTONBOX_SPREAD - 5 - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Open File (with preview) - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - gtk-quit - True - GTK_RELIEF_NORMAL - - - - - 0 - True - True - - - - - - - + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 10 + 10 + + + 0 + True + False + + + + + True + GTK_BUTTONBOX_EDGE + 5 + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Open File + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-save-as + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Save File + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Select Folder + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Create Folder + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 5 + False + True + + + + + True + GTK_BUTTONBOX_SPREAD + 5 + + + True + True + True + GTK_RELIEF_NORMAL + + + True + 0.5 + 0.5 + 0 + 0 + + + True + False + 2 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + Open File (with preview) + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + True + True + True + gtk-quit + True + GTK_RELIEF_NORMAL + + + + + 0 + True + True + + + + + + diff --git a/demo/filechooser/FileChooserDemo.hs b/demo/filechooser/FileChooserDemo.hs --- a/demo/filechooser/FileChooserDemo.hs +++ b/demo/filechooser/FileChooserDemo.hs @@ -1,40 +1,39 @@ module Main where -import Graphics.UI.Gtk -import Graphics.UI.Gtk.Glade +import Graphics.UI.Gtk hiding (response) main :: IO () main = do initGUI -- load up our main window - dialogXmlM <- xmlNew "FileChooserDemo.glade" - let dialogXml = case dialogXmlM of - (Just dialogXml) -> dialogXml - Nothing -> error $ "can't find the glade file \"FileChooserDemo.glade\"" - ++ "in the current directory" + gui <- builderNew + builderAddFromFile gui "FileChooserDemo.glade" + mainWindow <- builderGetObject gui castToWindow "mainWindow" + -- get a handle on a various objects from the glade file - mainWindow <- xmlGetWidget dialogXml castToWindow "mainWindow" - mainWindow `onDestroy` mainQuit + on mainWindow objectDestroy mainQuit - -- and associate actions with the buttons - selectFolderButton <- xmlGetWidget dialogXml castToButton "selectFolderButton" + let onClicked obj = on obj buttonActivated + + -- -- and associate actions with the buttons + selectFolderButton <- builderGetObject gui castToButton "selectFolderButton" selectFolderButton `onClicked` openSelectFolderDialog mainWindow - createFolderButton <- xmlGetWidget dialogXml castToButton "createFolderButton" + createFolderButton <- builderGetObject gui castToButton "createFolderButton" createFolderButton `onClicked` openCreateFolderDialog mainWindow - openFileButton <- xmlGetWidget dialogXml castToButton "openFileButton" + openFileButton <- builderGetObject gui castToButton "openFileButton" openFileButton `onClicked` openOpenFileDialog mainWindow - saveFileButton <- xmlGetWidget dialogXml castToButton "saveFileButton" + saveFileButton <- builderGetObject gui castToButton "saveFileButton" saveFileButton `onClicked` openSaveFileDialog mainWindow - openFilePreviewButton <- xmlGetWidget dialogXml castToButton "openFilePreviewButton" + openFilePreviewButton <- builderGetObject gui castToButton "openFilePreviewButton" openFilePreviewButton `onClicked` openFilePreviewDialog mainWindow - quitButton <- xmlGetWidget dialogXml castToButton "quitButton" + quitButton <- builderGetObject gui castToButton "quitButton" quitButton `onClicked` (do widgetDestroy mainWindow mainQuit) @@ -145,7 +144,7 @@ previewLabel <- labelNew $ Just "Preview appears here" previewLabel `labelSetLineWrap` True dialog `fileChooserSetPreviewWidget` previewLabel - dialog `onUpdatePreview` do + on dialog updatePreview $ do previewFile <- fileChooserGetPreviewFilename dialog previewLabel `labelSetText` case previewFile of Nothing -> "Preview appears here" diff --git a/demo/menu/Makefile b/demo/menu/Makefile --- a/demo/menu/Makefile +++ b/demo/menu/Makefile @@ -13,6 +13,6 @@ HC_RULE = $(HC) --make $< -o $@ $(HCFLAGS) clean: - rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG) + rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROGS) HC=ghc diff --git a/demo/treelist/Completion.hs b/demo/treelist/Completion.hs --- a/demo/treelist/Completion.hs +++ b/demo/treelist/Completion.hs @@ -66,7 +66,7 @@ return True set window [containerChild := entry] widgetShowAll window - onDestroy window mainQuit + on window objectDestroy mainQuit mainGUI matchFunc :: ListStore ColorDesc -> String -> TreeIter -> IO Bool diff --git a/demo/treelist/DirList.hs b/demo/treelist/DirList.hs --- a/demo/treelist/DirList.hs +++ b/demo/treelist/DirList.hs @@ -9,18 +9,18 @@ import System.Directory import System.IO import System.Locale -import System.Time +import Data.Time data FileInfo = FileInfo { fName :: String, fSize :: Integer, - fTime :: ClockTime + fTime :: UTCTime } main = do initGUI win <- windowNew - win `onDestroy` mainQuit + on win objectDestroy mainQuit curDir <- getCurrentDirectory files <- getDirectoryContents curDir @@ -73,9 +73,8 @@ time <- New.cellRendererTextNew New.treeViewColumnPackStart tvc time True New.cellLayoutSetAttributes tvc time store $ \FileInfo { fTime = time } -> - [ New.cellText :=> do - calTime <- toCalendarTime time - return (formatCalendarTime defaultTimeLocale "%D %T" calTime) + [ New.cellText :=> + return (formatTime defaultTimeLocale "%D %T" time) ] widgetShowAll win diff --git a/demo/treelist/FilterDemo.hs b/demo/treelist/FilterDemo.hs --- a/demo/treelist/FilterDemo.hs +++ b/demo/treelist/FilterDemo.hs @@ -16,7 +16,7 @@ initGUI win <- windowNew - onDestroy win mainQuit + on win objectDestroy mainQuit content <- readFile "FilterDemo.hs" diff --git a/demo/treelist/ListDND.hs b/demo/treelist/ListDND.hs --- a/demo/treelist/ListDND.hs +++ b/demo/treelist/ListDND.hs @@ -47,7 +47,7 @@ initGUI win <- windowNew - onDestroy win mainQuit + on win objectDestroy mainQuit -- create a tag that we use as selection, target and selection type compTypeTag <- atomNew "_CompType" diff --git a/demo/treelist/ListTest.glade b/demo/treelist/ListTest.glade --- a/demo/treelist/ListTest.glade +++ b/demo/treelist/ListTest.glade @@ -1,1404 +1,1389 @@ - - - - - - - True - List Test - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - - - - True - False - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - 8 - True - False - 12 - - - - True - True - True - 0 - - - - 2 - True - 3 - 2 - False - 2 - 18 - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - String value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - True - Number value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - True - Boolean value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - expand|shrink|fill - - - - - - - - - True - <b>Value</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - True - 0 - - - - 4 - True - False - 2 - - - - True - True - 0 - - - - True - True - insert - True - GTK_RELIEF_NORMAL - True - - - 0 - True - True - - - - - - True - new entry at - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 4 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - True - prepend - True - GTK_RELIEF_NORMAL - True - - - 0 - True - True - - - - - - True - new entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - True - append - True - GTK_RELIEF_NORMAL - True - - - 0 - True - True - - - - - - True - new entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - 0 - - - - True - True - update - True - GTK_RELIEF_NORMAL - True - - - 0 - True - True - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - True - <b>Insert and Update</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - True - 0 - - - - True - False - 2 - - - - 4 - True - True - 0 - - - - 54 - True - True - delete - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - 4 - True - True - 0 - - - - True - True - clear - True - GTK_RELIEF_NORMAL - True - - - 0 - False - True - - - - - - True - all - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - True - <b>Delete</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - 4 - True - False - 2 - - - - True - True - 0 - - - - 54 - True - True - move - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - True - False - - - - - - True - before - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - True - False - - - - - 0 - False - False - - - - - - True - True - 0 - - - - 54 - True - True - move - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - True - False - - - - - - True - after - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - True - False - - - - - 0 - False - False - - - - - - - - True - <b>Move</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - 4 - True - True - 0 - - - - 54 - True - True - swap - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - False - - - - - - True - with - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 0 - False - False - - - - - - - - True - <b>Swap</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - - - - - True - <b>Reorder</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - False - True - - - - - - - + + + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 100 + 0 + 10 + 1 + 10 + 1 + + + True + List Test + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + + + True + False + 0 + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + False + False + False + + + + + 0 + True + True + + + + + True + False + 0 + + + 8 + True + False + 12 + + + True + True + True + 0 + + + 2 + True + 3 + 2 + False + 2 + 18 + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + adjustment1 + + + 1 + 2 + 1 + 2 + + + + + + True + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + True + String value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + True + Number value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + True + Boolean value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + expand|shrink|fill + + + + + + + + True + <b>Value</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + True + 0 + + + 4 + True + False + 2 + + + True + True + 0 + + + True + True + insert + True + GTK_RELIEF_NORMAL + True + + + 0 + True + True + + + + + True + new entry at + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment2 + + + 4 + False + False + + + + + 0 + True + True + + + + + True + True + 0 + + + True + True + prepend + True + GTK_RELIEF_NORMAL + True + + + 0 + True + True + + + + + True + new entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + True + True + 0 + + + True + True + append + True + GTK_RELIEF_NORMAL + True + + + 0 + True + True + + + + + True + new entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + True + True + 0 + + + True + True + update + True + GTK_RELIEF_NORMAL + True + + + 0 + True + True + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment3 + + + 0 + False + False + + + + + 0 + True + True + + + + + + + True + <b>Insert and Update</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + True + 0 + + + True + False + 2 + + + 4 + True + True + 0 + + + 54 + True + True + delete + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment4 + + + 0 + False + False + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + 4 + True + True + 0 + + + True + True + clear + True + GTK_RELIEF_NORMAL + True + + + 0 + False + True + + + + + True + all + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + + True + <b>Delete</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + 4 + True + False + 2 + + + True + True + 0 + + + 54 + True + True + move + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment5 + + + 0 + True + False + + + + + True + before + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment6 + + + 0 + True + False + + + + + 0 + False + False + + + + + True + True + 0 + + + 54 + True + True + move + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment7 + + + 0 + True + False + + + + + True + after + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment8 + + + 0 + True + False + + + + + 0 + False + False + + + + + + + True + <b>Move</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + 4 + True + True + 0 + + + 54 + True + True + swap + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment9 + + + 0 + False + False + + + + + True + with + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment10 + + + 0 + False + False + + + + + + + True + <b>Swap</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + + + + True + <b>Reorder</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + True + + + + + + diff --git a/demo/treelist/ListTest.hs b/demo/treelist/ListTest.hs --- a/demo/treelist/ListTest.hs +++ b/demo/treelist/ListTest.hs @@ -1,35 +1,36 @@ module Main where import Graphics.UI.Gtk -import Graphics.UI.Gtk.Glade import Graphics.UI.Gtk.ModelView as New data Phone = Phone { name :: String, number :: Int, marked :: Bool } main = do initGUI - Just xml <- xmlNew "ListTest.glade" - win <- xmlGetWidget xml castToWindow "window" - onDestroy win mainQuit + gui <- builderNew + builderAddFromFile gui "ListTest.glade" - view <- xmlGetWidget xml castToTreeView "view" + win <- builderGetObject gui castToWindow "window" + on win objectDestroy mainQuit - stringValue <- xmlGetWidget xml castToEntry "stringValue" - intValue <- xmlGetWidget xml castToSpinButton "intValue" - boolValue <- xmlGetWidget xml castToCheckButton "boolValue" + view <- builderGetObject gui castToTreeView "view" - insertButton <- xmlGetWidget xml castToButton "insert" - prependButton <- xmlGetWidget xml castToButton "prepend" - appendButton <- xmlGetWidget xml castToButton "append" - updateButton <- xmlGetWidget xml castToButton "update" - newIndex <- xmlGetWidget xml castToSpinButton "newIndex" - updateIndex <- xmlGetWidget xml castToSpinButton "updateIndex" + stringValue <- builderGetObject gui castToEntry "stringValue" + intValue <- builderGetObject gui castToSpinButton "intValue" + boolValue <- builderGetObject gui castToCheckButton "boolValue" - removeButton <- xmlGetWidget xml castToButton "remove" - clearButton <- xmlGetWidget xml castToButton "clear" - removeIndex <- xmlGetWidget xml castToSpinButton "removeIndex" + insertButton <- builderGetObject gui castToButton "insert" + prependButton <- builderGetObject gui castToButton "prepend" + appendButton <- builderGetObject gui castToButton "append" + updateButton <- builderGetObject gui castToButton "update" + newIndex <- builderGetObject gui castToSpinButton "newIndex" + updateIndex <- builderGetObject gui castToSpinButton "updateIndex" + removeButton <- builderGetObject gui castToButton "remove" + clearButton <- builderGetObject gui castToButton "clear" + removeIndex <- builderGetObject gui castToSpinButton "removeIndex" + -- create a new list store store <- storeImpl New.treeViewSetModel view store @@ -44,6 +45,8 @@ number = floor number, marked = marked } + + let onClicked obj act = on obj buttonActivated $ act onClicked prependButton $ getValues >>= New.listStorePrepend store onClicked appendButton $ getValues >>= New.listStoreAppend store >> return () diff --git a/demo/treelist/TreeSort.hs b/demo/treelist/TreeSort.hs --- a/demo/treelist/TreeSort.hs +++ b/demo/treelist/TreeSort.hs @@ -57,7 +57,7 @@ -- Create a button that shows information on the current state of the sorting -- settings. button <- buttonNewWithLabel "Dump Info" - button `onClicked` do + on button buttonActivated $ do sId <- New.treeViewColumnGetSortColumnId col putStrLn ("tvc1 sort id is "++show sId) sId <- New.treeViewColumnGetSortColumnId col' @@ -77,9 +77,10 @@ -- Put it all together. vBox <- vBoxNew False 3 - boxPackStartDefaults vBox view + -- boxPackStartDefaults vBox view + boxPackStart vBox view PackRepel 0 boxPackEnd vBox button PackNatural 0 containerAdd win vBox widgetShowAll win - win `onDestroy` mainQuit + on win objectDestroy mainQuit mainGUI diff --git a/demo/treelist/TreeTest.glade b/demo/treelist/TreeTest.glade --- a/demo/treelist/TreeTest.glade +++ b/demo/treelist/TreeTest.glade @@ -1,1108 +1,1040 @@ - - - - - - - True - Tree Test - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - - 8 - True - False - 12 - - - - True - True - True - 0 - - - - 2 - True - 3 - 2 - False - 4 - 18 - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 0 100 1 10 10 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - expand|shrink|fill - - - - - - - True - Number value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - - - - - - - - True - String value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - - - - - - - - True - Boolean value: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - - - - - - - - - - True - <b>Value</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - True - 0 - - - - True - 2 - 3 - False - 4 - 2 - - - - True - True - insert - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - new entry at - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 2 - 3 - 0 - 1 - - - - - - - True - True - update - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - entry at - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 2 - 3 - 1 - 2 - - - - - - - - - True - <b>Insert and Update</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - True - 0 - - - - True - 2 - 3 - False - 4 - 2 - - - - 54 - True - True - delete - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - clear - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - all - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 2 - 3 - 0 - 1 - - - - - - - - - True - <b>Delete</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - True - 2 - 5 - False - 4 - 2 - - - - 54 - True - True - move - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 0 - 1 - fill - - - - - - - 54 - True - True - move - True - GTK_RELIEF_NORMAL - True - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - before - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 0 - 1 - fill - - - - - - - True - after - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 3 - 4 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 2 - 3 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 4 - 5 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 2 - 3 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 4 - 5 - 1 - 2 - - - - - - - - - True - <b>Move</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - 4 - True - False - 2 - - - - 54 - True - True - swap - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - True - entry - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 0 - True - True - - - - - - True - with - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 4 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - * - False - 10 - - - 0 - True - True - - - - - - - - True - <b>Swap</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - False - 0 - - - - - - - - True - <b>Reorder</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - 0 - False - True - - - - - - - + + + + + 100 + 0 + 10 + 1 + 10 + 1 + + + True + Tree Test + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 0 + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + False + False + False + + + + + 0 + True + True + + + + + 8 + True + False + 12 + + + True + True + True + 0 + + + 2 + True + 3 + 2 + False + 4 + 18 + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + adjustment1 + + + 1 + 2 + 1 + 2 + + + + + + True + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + + 1 + 2 + 2 + 3 + fill + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + expand|shrink|fill + + + + + + True + Number value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + String value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + + + + + + True + Boolean value: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + + + + + + + + + True + <b>Value</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + True + 0 + + + True + 2 + 3 + False + 4 + 2 + + + True + True + insert + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 0 + 1 + fill + + + + + + True + new entry at + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 2 + 3 + 0 + 1 + + + + + + True + True + update + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 1 + 2 + fill + + + + + + True + entry at + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 2 + 3 + 1 + 2 + + + + + + + + True + <b>Insert and Update</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + True + 0 + + + True + 2 + 3 + False + 4 + 2 + + + 54 + True + True + delete + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 0 + 1 + fill + + + + + + True + True + clear + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 1 + 2 + fill + + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + True + all + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 2 + 3 + 0 + 1 + + + + + + + + True + <b>Delete</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + True + 2 + 5 + False + 4 + 2 + + + 54 + True + True + move + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 0 + 1 + fill + + + + + + 54 + True + True + move + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 1 + 2 + fill + + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True + before + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 3 + 4 + 0 + 1 + fill + + + + + + True + after + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 3 + 4 + 1 + 2 + fill + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 2 + 3 + 0 + 1 + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 4 + 5 + 0 + 1 + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 2 + 3 + 1 + 2 + + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 4 + 5 + 1 + 2 + + + + + + + + True + <b>Move</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + 4 + True + False + 2 + + + 54 + True + True + swap + True + GTK_RELIEF_NORMAL + True + + + 0 + False + False + + + + + True + entry + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 0 + True + True + + + + + True + with + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + True + True + True + True + 0 + + True + * + False + 10 + + + 0 + True + True + + + + + + + True + <b>Swap</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + True + True + False + 0 + + + + + + True + <b>Reorder</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + False + False + + + + + 0 + False + True + + + + + + diff --git a/demo/treelist/TreeTest.hs b/demo/treelist/TreeTest.hs --- a/demo/treelist/TreeTest.hs +++ b/demo/treelist/TreeTest.hs @@ -1,7 +1,6 @@ module Main where import Graphics.UI.Gtk -import Graphics.UI.Gtk.Glade import Graphics.UI.Gtk.ModelView as New import qualified Data.Tree as Tree @@ -10,26 +9,28 @@ main = do initGUI - Just xml <- xmlNew "TreeTest.glade" - win <- xmlGetWidget xml castToWindow "window" - onDestroy win mainQuit + gui <- builderNew + builderAddFromFile gui "TreeTest.glade" - view <- xmlGetWidget xml castToTreeView "view" + win <- builderGetObject gui castToWindow "window" + on win objectDestroy mainQuit - stringValue <- xmlGetWidget xml castToEntry "stringValue" - intValue <- xmlGetWidget xml castToSpinButton "intValue" - boolValue <- xmlGetWidget xml castToCheckButton "boolValue" + view <- builderGetObject gui castToTreeView "view" - insertButton <- xmlGetWidget xml castToButton "insert" - updateButton <- xmlGetWidget xml castToButton "update" - newPath <- xmlGetWidget xml castToEntry "newPath" - updatePath <- xmlGetWidget xml castToEntry "updatePath" + stringValue <- builderGetObject gui castToEntry "stringValue" + intValue <- builderGetObject gui castToSpinButton "intValue" + boolValue <- builderGetObject gui castToCheckButton "boolValue" - removeButton <- xmlGetWidget xml castToButton "remove" - clearButton <- xmlGetWidget xml castToButton "clear" - removePath <- xmlGetWidget xml castToEntry "removePath" + insertButton <- builderGetObject gui castToButton "insert" + updateButton <- builderGetObject gui castToButton "update" + newPath <- builderGetObject gui castToEntry "newPath" + updatePath <- builderGetObject gui castToEntry "updatePath" + removeButton <- builderGetObject gui castToButton "remove" + clearButton <- builderGetObject gui castToButton "clear" + removePath <- builderGetObject gui castToEntry "removePath" + -- create a new list store store <- storeImpl New.treeViewSetModel view store @@ -45,22 +46,22 @@ marked = marked } - onClicked insertButton $ do + on insertButton buttonActivated $ do value <- getValues path <- fmap read $ get newPath entryText New.treeStoreInsert store (init path) (last path) value - onClicked updateButton $ do + on updateButton buttonActivated $ do value <- getValues path <- fmap read $ get updatePath entryText New.treeStoreSetValue store path value - onClicked removeButton $ do + on removeButton buttonActivated $ do path <- fmap read $ get removePath entryText New.treeStoreRemove store path return () - onClicked clearButton $ New.treeStoreClear store + on clearButton buttonActivated $ New.treeStoreClear store New.treeViewSetReorderable view True diff --git a/gtk.cabal b/gtk.cabal --- a/gtk.cabal +++ b/gtk.cabal @@ -1,5 +1,5 @@ Name: gtk -Version: 0.13.0.0 +Version: 0.13.0.1 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -137,7 +137,7 @@ Library build-depends: base >= 4 && < 5, array, containers, mtl, bytestring, - text >= 0.11.0.6 && < 1.2, + text >= 0.11.0.6 && < 1.3, glib >= 0.13.0.0 && < 0.14, pango >= 0.13.0.0 && < 0.14, cairo >= 0.13.0.0 && < 0.14