diff --git a/cairo-appbase.cabal b/cairo-appbase.cabal --- a/cairo-appbase.cabal +++ b/cairo-appbase.cabal @@ -1,8 +1,8 @@ Name: cairo-appbase -Version: 0.3 +Version: 0.4 -Synopsis: A template for building new GUI applications using GTK, Glade and Cairo. +Synopsis: A template for building new GUI applications using GTK and Cairo. Description: This template includes working callbacks to handle the File and Help @@ -18,12 +18,12 @@ > git clone git://github.com/kfish/cairo-appbase.git . To add widgets, install glade from your distro system and run - @glade data/main.glade@ + @glade data/main.ui@. Save the resulting file in GtkBuilder format. . - Note that you must run @cabal install@ to put the glade file in the correct + Note that you must run @cabal install@ to put the UI file in the correct place for your application to pick it up. To modify the code, edit @src/cairo-appbase.hs@. Hooking up functions to widgets is very simple: get - a widget by name (which you set in glade file), and hook one of its + a widget by name (which you set in ui file), and hook one of its signals (which you found in the Signals tab in glade) to an @IO ()@ action: . > cut1 <- get G.castToMenuItem "cut1" @@ -62,7 +62,7 @@ Cabal-Version: >= 1.8 Build-type: Simple -Data-Files: data/main.glade +Data-Files: data/main.ui flag splitBase description: Use the split-up base package. @@ -77,7 +77,7 @@ Main-Is: cairo-appbase.hs Hs-Source-Dirs: src - Build-Depends: glib, gtk, glade, cairo + Build-Depends: glib, gtk, cairo ------------------------------------------------------------------------ -- Git repo diff --git a/data/main.glade b/data/main.glade deleted file mode 100644 --- a/data/main.glade +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - True - window1 - 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 - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - gtk-new - True - - - - - - - True - gtk-open - True - - - - - - - True - gtk-save - True - - - - - - - True - gtk-save-as - True - - - - - - - True - - - - - - True - gtk-quit - True - - - - - - - - - - - True - _Edit - True - - - - - - - True - gtk-cut - True - - - - - - - True - gtk-copy - True - - - - - - - True - gtk-paste - True - - - - - - - True - gtk-delete - True - - - - - - - - - - - True - _View - True - - - - - - - - - - - True - _Help - True - - - - - - - True - _About - True - - - - - - - - - - 0 - False - False - - - - - - True - - - 0 - True - True - - - - - - True - True - - - 0 - False - False - - - - - - - - False - Application Name - False - translator-credits - - - - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - False - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-open - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - - - GTK_FILE_CHOOSER_ACTION_SAVE - True - False - False - False - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - - diff --git a/data/main.ui b/data/main.ui new file mode 100644 --- /dev/null +++ b/data/main.ui @@ -0,0 +1,318 @@ + + + + + + + + + menuitem1 + _File + + + + + gtk-new + new1 + + + + + + gtk-open + open1 + + + + + + gtk-save + save1 + + + + + + gtk-save-as + save_as1 + + + + + + gtk-quit + quit1 + + + + + + menuitem2 + _Edit + + + + + gtk-cut + cut1 + + + + + + gtk-copy + copy1 + + + + + + gtk-paste + paste1 + + + + + + gtk-delete + delete1 + + + + + + menuitem3 + _View + + + + + menuitem4 + _Help + + + + + about1 + _About + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + window1 + 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 + GTK_PACK_DIRECTION_LTR + GTK_PACK_DIRECTION_LTR + + + 0 + False + False + + + + + True + + + 0 + True + True + + + + + True + True + + + 0 + False + False + + + + + + + False + Application Name + False + translator-credits + + + GTK_FILE_CHOOSER_ACTION_OPEN + True + False + False + False + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 24 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + True + gtk-open + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + + button1 + opendialog-Open-button + + + + GTK_FILE_CHOOSER_ACTION_SAVE + True + False + False + False + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + + + True + False + 24 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + True + gtk-save + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + + button2 + button3 + + + diff --git a/src/cairo-appbase.hs b/src/cairo-appbase.hs --- a/src/cairo-appbase.hs +++ b/src/cairo-appbase.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE RankNTypes #-} {-# OPTIONS -Wall #-} -- -- Based on Gtk2Hs/demo/cairo/Drawing2.hs @@ -7,9 +8,7 @@ -- import Control.Monad (replicateM_) -import qualified System.Glib.Types as GTypes import qualified Graphics.UI.Gtk as G -import qualified Graphics.UI.Gtk.Glade as Glade import qualified Graphics.Rendering.Cairo as C import qualified Graphics.Rendering.Cairo.Matrix as M @@ -33,50 +32,56 @@ main = do _ <- G.initGUI - -- load up the glade file - filename <- My.getDataFileName "data/main.glade" - windowXmlM <- Glade.xmlNew filename + -- load up the gtk-builder file + filename <- My.getDataFileName "data/main.ui" + builder <- G.builderNew + G.builderAddFromFile builder filename +{- let windowXml = case windowXmlM of (Just wX) -> wX Nothing -> error ("can't find the glade file " ++ filename) - get :: (G.WidgetClass widget) => (GTypes.GObject -> widget) -> String -> IO widget - get = Glade.xmlGetWidget windowXml +-} + let get :: forall cls . G.GObjectClass cls + => (G.GObject -> cls) + -> String + -> IO cls + get = G.builderGetObject builder -- get a handle on widgets from the glade file window <- get G.castToWindow "window1" -- set up File->New - new1 <- get G.castToMenuItem "new1" - _ <- G.onActivateLeaf new1 $ myNew + new1 <- get G.castToAction "new1" + _ <- G.onActionActivate new1 $ myNew -- set up the File->Open dialog - open1 <- get G.castToMenuItem "open1" + open1 <- get G.castToAction "open1" openDialog <- get G.castToFileChooserDialog "opendialog" - _ <- G.onActivateLeaf open1 $ G.widgetShow openDialog + _ <- G.onActionActivate open1 $ G.widgetShow openDialog _ <- G.onResponse openDialog $ myFileOpen openDialog -- set up the File->Save_As dialog - save1 <- get G.castToMenuItem "save1" - save_as1 <- get G.castToMenuItem "save_as1" + save1 <- get G.castToAction "save1" + save_as1 <- get G.castToAction "save_as1" saveDialog <- get G.castToFileChooserDialog "savedialog" - _ <- G.onActivateLeaf save_as1 $ G.widgetShow saveDialog - _ <- G.onActivateLeaf save1 $ G.widgetShow saveDialog + _ <- G.onActionActivate save_as1 $ G.widgetShow saveDialog + _ <- G.onActionActivate save1 $ G.widgetShow saveDialog _ <- G.onResponse saveDialog $ myFileSave saveDialog -- set up Edit menu - cut1 <- get G.castToMenuItem "cut1" - _ <- G.onActivateLeaf cut1 $ myCut - copy1 <- get G.castToMenuItem "copy1" - _ <- G.onActivateLeaf copy1 $ myCopy - paste1 <- get G.castToMenuItem "paste1" - _ <- G.onActivateLeaf paste1 $ myPaste - delete1 <- get G.castToMenuItem "delete1" - _ <- G.onActivateLeaf delete1 $ myDelete + cut1 <- get G.castToAction "cut1" + _ <- G.onActionActivate cut1 $ myCut + copy1 <- get G.castToAction "copy1" + _ <- G.onActionActivate copy1 $ myCopy + paste1 <- get G.castToAction "paste1" + _ <- G.onActionActivate paste1 $ myPaste + delete1 <- get G.castToAction "delete1" + _ <- G.onActionActivate delete1 $ myDelete -- set up the Help->About dialog - about1 <- get G.castToMenuItem "about1" + about1 <- get G.castToAction "about1" aboutdialog1 <- get G.castToAboutDialog "aboutdialog1" - _ <- G.onActivateLeaf about1 $ G.widgetShow aboutdialog1 + _ <- G.onActionActivate about1 $ G.widgetShow aboutdialog1 _ <- G.onResponse aboutdialog1 $ const $ G.widgetHide aboutdialog1 -- fix size @@ -84,8 +89,8 @@ G.widgetSetSizeRequest window windowWidth windowHeight -- quit on File->Quit menu selection - quit1 <- get G.castToMenuItem "quit1" - _ <- G.onActivateLeaf quit1 $ G.widgetDestroy window + quit1 <- get G.castToAction "quit1" + _ <- G.onActionActivate quit1 $ G.widgetDestroy window _ <- G.onDestroy window G.mainQuit -- set up the canvas