hbro 0.2 → 0.2.1
raw patch · 4 files changed
+29/−14 lines, 4 files
Files
- hbro.cabal +1/−1
- src/Browser.hs +2/−4
- src/Gui.hs +4/−4
- src/Main.hs +22/−5
hbro.cabal view
@@ -3,7 +3,7 @@ -- The package version. See the Haskell package versioning policy -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for -- standards guiding when and how versions should be incremented.-Version: 0.2+Version: 0.2.1 Synopsis: A suckless minimal KISSy browser stability: alpha
src/Browser.hs view
@@ -127,8 +127,7 @@ Just string -> do case lookup (modifiers, string) keyBindings of Just callback -> liftIO $ callback gui- _ -> liftIO $ putStrLn "No callback associated"- liftIO $ putStrLn string+ _ -> liftIO $ putStrLn string _ -> return () return False@@ -173,7 +172,6 @@ browser = Dyre.wrapMain Dyre.defaultParams { Dyre.projectName = "hbro", Dyre.showError = showError,- Dyre.realMain = realMain--,- --Dyre.ghcOpts = ["-i /path/to/src", "-O2"]+ Dyre.realMain = realMain } -- }}}
src/Gui.hs view
@@ -38,8 +38,7 @@ inspectorWindow <- windowNew windowSetDefaultSize window 1024 768- windowSetPosition window WinPosCenter- --windowSetOpacity window 0.8 + windowSetPosition window WinPosCenter --windowSetIconFromFile window "/path/to/icon" set window [ windowTitle := "hbro" ] @@ -64,11 +63,12 @@ window `containerAdd` winBox scrollWin `containerAdd` webView + set webView [ widgetCanDefault := True ]+ windowSetDefault window (Just webView)+ _ <- on webView closeWebView $ do mainQuit return True-- --webFrame <- webViewGetMainFrame webView return $ GUI window inspectorWindow webView promptLabel promptEntry winBox statusBox progressLabel urlLabel -- }}}
src/Main.hs view
@@ -8,6 +8,7 @@ import Graphics.UI.Gtk import Graphics.UI.Gtk.WebKit.Download import Graphics.UI.Gtk.WebKit.NetworkRequest+import Graphics.UI.Gtk.WebKit.WebFrame import Graphics.UI.Gtk.WebKit.WebView import Graphics.UI.Gtk.WebKit.WebSettings import System.Cmd@@ -38,7 +39,11 @@ -- Others (([Control], "i"), showWebInspector), (([Control], "u"), toggleSourceMode),- (([], "t"), toggleStatusBar)+ (([], "t"), toggleStatusBar),+ (([Control], "p"), print),+ (([], "<F11>"), fullscreen),+ (([], "<Escape>"), unfullscreen)+ ], mWebSettings = (do@@ -89,10 +94,10 @@ -- Custom callbacks mCustomizations = \gui -> (let- webView = mWebView gui- progressLabel = mProgressLabel gui- urlLabel = mUrlLabel gui- window = mWindow gui+ webView = mWebView gui+ progressLabel = mProgressLabel gui+ urlLabel = mUrlLabel gui+ window = mWindow gui in do _ <- on webView loadStarted $ \_ -> do labelSetMarkup progressLabel "<span foreground=\"red\">0%</span>"@@ -187,3 +192,15 @@ u <- entryGetText (mPrompt g) loadURL u g) _ -> return ()++ print :: GUI -> IO ()+ print gui = do+ frame <- webViewGetMainFrame (mWebView gui)+ webFramePrint frame++ fullscreen :: GUI -> IO ()+ fullscreen gui = windowFullscreen (mWindow gui)++ unfullscreen :: GUI -> IO ()+ unfullscreen gui = windowUnfullscreen (mWindow gui)+