diff --git a/GuiHaskell.cabal b/GuiHaskell.cabal --- a/GuiHaskell.cabal +++ b/GuiHaskell.cabal @@ -5,15 +5,14 @@ for Haskell that is integrated with other popular Haskell tools. The program uses the PropLang GUI combinator library to declaratively define the relationships between UI elements and data. -Version: 0.1 +Version: 0.1.1 License: BSD3 License-file: LICENSE -Author: Neil Mitchell, Asumu Takikawa -Stability: Alpha +Author: Neil Mitchell Homepage: http://www-users.cs.york.ac.uk/~ndm/guihaskell/ Category: Development -Build-Depends: base>=2.0, filepath>=1.0, proplang>=0.1, gtk>=0.9.11, glade>=0.9.11, parsec -Data-files: res/guihaskell.glade res/prefdialog.glade res/about.glade +Build-Type: Simple +Build-Depends: base>=2.0, filepath>=1.0, proplang>=0.1, gtk>=0.9.11, glade>=0.9.11, parsec, process, containers, directory Executable: guihaskell Main-is: Main.hs diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -28,7 +28,7 @@ import Graphics.UI.Gtk.Glade import System.Exit -import System.Posix.Signals +--import System.Posix.Signals import System.Process import Config @@ -169,13 +169,13 @@ tbStop!enabled =<= running -- Tools - tbProfile!onClicked += runProf dat + tbProfile!onClicked += (runProf dat) - -- Config Events - tbPref!onClicked += showWindow wndPref - miPref!onActivated += showWindow wndPref + -- Config events + tbPref!onClicked += (showWindow wndPref) + miPref!onActivated += (showWindow wndPref) -- Hack - tbClose!onClicked += closeWindow wndPref + tbClose!onClicked += (widgetHide $ getWindowRaw wndPref) fbFont!text -<- font fbFont!text =<>= font fbFont!text += setupFonts dat @@ -188,8 +188,7 @@ txtProfCFlags!text =<>= profCFlags txtProfRFlags!text -<- profRFlags txtProfRFlags!text =<>= profRFlags - - -- Key Events + -- Fixed some of the key event bugs. This should work. -- The enter key still doesn't work though... --enterKey <- newVarWithName "enter_key_pressed?" @@ -211,14 +210,10 @@ -- TODO: This should also run "main" too like in most IDEs, -- but concurrency makes that weird miRun!onActivated += refreshCommand dat - miProfile!onActivated += runProf dat - miAbout!onActivated += (runDialogRaw wndAbout >> closeWindow wndAbout) + miProfile!onActivated += (runProf dat) + miAbout!onActivated += (showWindow wndAbout) return () - - where - runDialogRaw = dialogRun . castToDialog . getWindowRaw - closeWindow = widgetHide . getWindowRaw -- -- Sends entered text to processes diff --git a/res/about.glade b/res/about.glade deleted file mode 100644 --- a/res/about.glade +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - About GuiHaskell - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - GuiHaskell - 0.0a - Copyright 2007 - A Haskell IDE written in Haskell. - http://www-users.cs.york.ac.uk/~ndm/guihaskell/ - Neil Mitchell, Asumu Takikawa - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_BUTTONBOX_END - - - False - GTK_PACK_END - - - - - - diff --git a/res/guihaskell.glade b/res/guihaskell.glade deleted file mode 100644 --- a/res/guihaskell.glade +++ /dev/null @@ -1,524 +0,0 @@ - - - - - - 300 - 450 - True - GuiHaskell - gtk-yes - - - True - - - True - - - True - _File - True - - - - - True - gtk-open - True - True - - - - - - True - - - - - True - gtk-quit - True - True - - - - - - - - - - - True - _Edit - True - - - - - True - gtk-cut - True - True - - - - - - True - gtk-copy - True - True - - - - - - True - gtk-paste - True - True - - - - - - True - gtk-delete - True - True - - - - - - - - - - True - _View - True - - - - - True - _Tools - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Refresh - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-refresh - - - - - - - True - _Profile - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-zoom-fit - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - True - gtk-preferences - True - True - - - - - - - - - True - _Help - True - - - - - True - gtk-about - True - True - - - - - - - - - False - False - - - - - True - True - 5 - False - True - - - True - 1 - 1 - - - True - GTK_TOOLBAR_BOTH_HORIZ - - - True - True - Run - True - gtk-media-play - - - False - - - - - True - True - Stop - True - gtk-stop - - - False - - - - - True - True - Refresh - True - gtk-refresh - - - False - - - - - True - - - False - False - - - - - True - True - Open - True - gtk-open - - - False - - - - - True - True - Recent files - True - gtk-file - - - False - False - - - - - - - False - - - - - True - Home - - - tab - False - False - - - - - True - GTK_TOOLBAR_BOTH_HORIZ - - - True - - - True - True - 0 - - - - - False - False - - - - - True - - - True - 4 - Compiler: - - - - - False - False - - - - - True - - - True - GHCi -Hugs - - - - - False - False - - - - - True - True - gtk-preferences - - - False - - - - - 1 - False - - - - - True - Options - - - tab - 1 - False - False - - - - - True - GTK_TOOLBAR_BOTH_HORIZ - - - True - True - Profile - True - gtk-zoom-fit - - - False - - - - - 2 - False - - - - - True - Tools - - - tab - 2 - False - False - - - - - False - 1 - - - - - True - - - True - Selected File: - - - False - False - 6 - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_IN - - - True - - - True - True - - - - - - - 1 - - - - - False - False - 2 - - - - - True - 0 - GTK_SHADOW_IN - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - True - False - GTK_WRAP_CHAR - - - - - - - 1 - 3 - - - - - True - 2 - 2 - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_ETCHED_IN - - - 20 - True - True - True - False - - - - - - - False - False - 4 - - - - - 19 - True - - - False - False - 5 - - - - - - diff --git a/res/prefdialog.glade b/res/prefdialog.glade deleted file mode 100644 --- a/res/prefdialog.glade +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - True - False - 0 - - - - True - False - 0 - - - - True - Executable name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 15 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 15 - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Compilation - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - True - False - 0 - - - - True - Compile Flags: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 15 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 15 - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - Runtime Flags: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 15 - False - False - - - - - - True - True - True - True - 0 - - True - ● - False - - - 15 - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Profiler - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 10 - True - True - - - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH_HORIZ - True - True - - - - True - gtk-close - True - True - True - - - False - True - - - - - 4 - False - False - - - - - - -