From d5b8eeeb49c7df91689f8cd8c41054d72437fe04 Mon Sep 17 00:00:00 2001 From: hasufell Date: Sun, 5 Oct 2014 21:41:51 +0200 Subject: [PATCH] Add algorithm combo box Currently a no-op. --- Gtk.hs | 7 +++++-- gtk2.glade | 14 +++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Gtk.hs b/Gtk.hs index c4609fc..7c72262 100644 --- a/Gtk.hs +++ b/Gtk.hs @@ -25,7 +25,8 @@ data MyGUI = MkMyGUI { xu :: Entry, yl :: Entry, yu :: Entry, - aD :: AboutDialog + aD :: AboutDialog, + cB :: ComboBox } @@ -51,8 +52,9 @@ makeMyGladeGUI = do yl' <- xmlGetWidget xml castToEntry "ylD" yu' <- xmlGetWidget xml castToEntry "yuD" aD' <- xmlGetWidget xml castToAboutDialog "aboutdialog" + cB' <- xmlGetWidget xml castToComboBox "comboalgo" - return $ MkMyGUI win' dB' sB' qB' fB' da' hs' xl' xu' yl' yu' aD' + return $ MkMyGUI win' dB' sB' qB' fB' da' hs' xl' xu' yl' yu' aD' cB' -- |Handle the whole GTK gui. @@ -74,6 +76,7 @@ makeGUI startFile = do else do _ <- fileChooserSetFilename (fB mygui) startFile return () + comboBoxSetActive (cB mygui) 0 -- callbacks _ <- onDestroy (win mygui) mainQuit diff --git a/gtk2.glade b/gtk2.glade index 9058b67..30a04d1 100644 --- a/gtk2.glade +++ b/gtk2.glade @@ -378,7 +378,7 @@ Malte Flender <malte.flender@fh-bielefeld.de> 600 - 700 + 750 False dialog @@ -698,6 +698,18 @@ Malte Flender <malte.flender@fh-bielefeld.de> 3 + + + True + False + Show points + + + False + False + 4 + +