hpage 0.5.3 → 0.5.5
raw patch · 4 files changed
+12/−21 lines, 4 filesdep ~Cabaldep ~containersdep ~haskell-src-exts
Dependency ranges changed: Cabal, containers, haskell-src-exts, wx, wxcore
Files
- hpage.cabal +7/−7
- src/HPage/Control.hs +0/−4
- src/HPage/GUI/Dialogs.hs +0/−3
- src/HPage/GUI/FreeTextWindow.hs +5/−7
hpage.cabal view
@@ -1,5 +1,5 @@ name: hpage-version: 0.5.3+version: 0.5.5 cabal-version: >=1.6 build-type: Custom license: BSD3@@ -34,15 +34,15 @@ build-depends: base >= 4, base < 5, mtl >=1.1.0, mtl < 1.2, monad-loops >=0.3.0, monad-loops < 0.4,- haskell-src-exts >=1.1.3, haskell-src-exts < 1.2,- bytestring >=0.9.1, bytestring <0.10,+ haskell-src-exts >=1.1.3, haskell-src-exts < 1.8,+ bytestring >= 0.9.1, bytestring < 0.10, MonadCatchIO-mtl >= 0.1.0, MonadCatchIO-mtl < 0.3,- containers >=0.2.0, containers < 0.3,+ containers >=0.2.0, containers < 0.4, directory >=1.0.0, directory < 1.1,- wxcore >=0.11.1, wxcore < 0.12,- wx >=0.11.1, wx < 0.12,+ wxcore >=0.11.1, wxcore < 0.13,+ wx >=0.11.1, wx < 0.13, filepath >=1.1.0, filepath < 1.2,- Cabal >= 1.6, Cabal < 1.7,+ Cabal >= 1.6, Cabal < 1.9, hint >= 0.3.2, hint < 0.4, eprocess >= 1.1.0, eprocess < 2, hint-server >= 1.1.0, hint-server < 2
src/HPage/Control.hs view
@@ -55,15 +55,12 @@ ctxString ) where -import System.IO import System.Directory import System.FilePath import Data.Set (Set, empty, union, fromList, toList)-import Data.Char import Control.Monad.Loops import Control.Monad.Error import Control.Monad.State-import Control.Monad.State.Class import Control.Concurrent.MVar import Language.Haskell.Interpreter (OptionVal((:=))) import qualified Language.Haskell.Interpreter as Hint@@ -71,7 +68,6 @@ import qualified Language.Haskell.Interpreter.Server as HS import HPage.Utils.Log import Data.List (isPrefixOf)-import qualified Data.List as List import qualified Data.ByteString.Char8 as Str import qualified Language.Haskell.Exts.Parser as Parser import Distribution.Simple.Configure hiding (tryGetConfigStateFile)
src/HPage/GUI/Dialogs.hs view
@@ -1,12 +1,9 @@ module HPage.GUI.Dialogs where -import System.FilePath import Data.List-import Control.Monad.Error import Graphics.UI.WX import Graphics.UI.WXCore-import Graphics.UI.WXCore.WxcClasses import HPage.GUI.IDs import qualified HPage.Control as HP
src/HPage/GUI/FreeTextWindow.hs view
@@ -23,10 +23,6 @@ import Control.Monad.Loops import Graphics.UI.WX import Graphics.UI.WXCore hiding (kill, Process)-import Graphics.UI.WXCore.Types-import Graphics.UI.WXCore.Dialogs-import Graphics.UI.WXCore.Events---import Graphics.UI.WXCore.WxcClasses hiding (Process, kill) import qualified HPage.Control as HP import qualified HPage.Server as HPS import HPage.GUI.Dialogs@@ -73,7 +69,8 @@ -- Server context model <- HPS.start - win <- frame [text := "\955Page"]+ win <- frame [text := "\955Page",+ visible := False] imageFile "icon/hpage.tif" >>= topLevelWindowSetIconFromFile win set win [on closing := HPS.stop model >> propagateEvent]@@ -161,7 +158,7 @@ menuAppend mnuPage wxId_SAVE "&Save\tCtrl-s" "Save Page" False menuAppend mnuPage wxId_SAVEAS "&Save as...\tCtrl-Shift-s" "Save Page as" False menuAppendSeparator mnuPage- menuQuit mnuPage [on command := close win]+ menuQuit mnuPage [on command := wxcAppExit] mnuEdit <- menuPane [text := "Edit"] menuAppend mnuEdit wxId_UNDO "&Undo\tCtrl-z" "Undo" False@@ -262,10 +259,11 @@ rightL = minsize (sz 485 100) $ fill $ widget txtCode set win [layout := column 5 [fill $ row 10 [leftL, rightL], resultsL], clientSize := sz 800 600]-+ -- ...and RUN! refreshPage model guiCtx onCmd "start" openHelpPage+ set win [visible := True] focusOn txtCode -- EVENT HANDLERS --------------------------------------------------------------