diffing dir...
Sun May 23 23:39:04 EDT 2010 Andy Stewart <laz...@gm...>
* Move mozembed demo to ./mozembed/demo
Ignore-this: be945149615e5c04c0e7557967afd213
{
hunk ./demo/mozembed/Makefile 1
-
-PROG = testembedmoz
-SOURCES = TestEmbedMoz.hs
-
-$(PROG) : $(SOURCES)
- $(HC) --make $< -o $@ $(HCFLAGS)
-
-clean:
- rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)
-
-HC=ghc
rmfile ./demo/mozembed/Makefile
hunk ./demo/mozembed/TestEmbedMoz.hs 1
--- A Test Program for the Gtk2 Mozilla Widget
---
-
-import Graphics.UI.Gtk
-import Graphics.UI.Gtk.MozEmbed
-import System (getArgs, getEnv, getProgName)
-
-
-main :: IO ()
-main = do
- initGUI
- w <- windowNew
- onDestroy w mainQuit
- mozEmbedSetCompPath mozEmbedDefaultCompPath
-
- moz <- mozEmbedNew
- widgetShow moz
-
- containerAdd w moz
-
- windowSetTitle w "TestEmbedMoz"
- containerSetBorderWidth w 2
- widgetSetSizeRequest w 640 480
- widgetShowAll w
-
- onOpenConnectID <- onOpenURI moz
- (\ s -> do putStrLn ("onOpenURI: " ++ s)
- return False)
-
- args <- getArgs
- case args of
- file@(c:_) : _ -> let
- (fr,dr) = span ('/' /=) $ reverse file
- dir = reverse dr
- in do
- dir <- if c == '/' then return dir
- else do pwd <- getEnv "PWD"
- return (pwd ++ '/' : dir)
- let dirSlash = case last dir of
- '/' -> dir
- _ -> dir ++ "/"
- baseURI = "file://" ++ dirSlash
- mozdata <- readFile file
- mozEmbedRenderData moz mozdata baseURI mimeType
- mainGUI
- _ -> do p <- getProgName
- putStrLn ("Usage: " ++ p ++ " <htmlfile>")
-
-mimeType = "text/html"
-
rmfile ./demo/mozembed/TestEmbedMoz.hs
rmdir ./demo/mozembed
adddir ./mozembed/demo
addfile ./mozembed/demo/Makefile
hunk ./mozembed/demo/Makefile 1
+
+PROG = testembedmoz
+SOURCES = TestEmbedMoz.hs
+
+$(PROG) : $(SOURCES)
+ $(HC) --make $< -o $@ $(HCFLAGS)
+
+clean:
+ rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)
+
+HC=ghc
addfile ./mozembed/demo/TestEmbedMoz.hs
hunk ./mozembed/demo/TestEmbedMoz.hs 1
+-- A Test Program for the Gtk2 Mozilla Widget
+--
+
+import Graphics.UI.Gtk
+import Graphics.UI.Gtk.MozEmbed
+import System (getArgs, getEnv, getProgName)
+
+
+main :: IO ()
+main = do
+ initGUI
+ w <- windowNew
+ onDestroy w mainQuit
+ mozEmbedSetCompPath mozEmbedDefaultCompPath
+
+ moz <- mozEmbedNew
+ widgetShow moz
+
+ containerAdd w moz
+
+ windowSetTitle w "TestEmbedMoz"
+ containerSetBorderWidth w 2
+ widgetSetSizeRequest w 640 480
+ widgetShowAll w
+
+ onOpenConnectID <- onOpenURI moz
+ (\ s -> do putStrLn ("onOpenURI: " ++ s)
+ return False)
+
+ args <- getArgs
+ case args of
+ file@(c:_) : _ -> let
+ (fr,dr) = span ('/' /=) $ reverse file
+ dir = reverse dr
+ in do
+ dir <- if c == '/' then return dir
+ else do pwd <- getEnv "PWD"
+ return (pwd ++ '/' : dir)
+ let dirSlash = case last dir of
+ '/' -> dir
+ _ -> dir ++ "/"
+ baseURI = "file://" ++ dirSlash
+ mozdata <- readFile file
+ mozEmbedRenderData moz mozdata baseURI mimeType
+ mainGUI
+ _ -> do p <- getProgName
+ putStrLn ("Usage: " ++ p ++ " <htmlfile>")
+
+mimeType = "text/html"
+
}
|
