manatee-reader 0.0.7 → 0.0.8
raw patch · 2 files changed
+14/−7 lines, 2 filesdep ~manatee-core
Dependency ranges changed: manatee-core
Files
Manatee/Extension/Reader/ReaderView.hs view
@@ -31,6 +31,7 @@ import Graphics.UI.Gtk.WebKit.WebFrame import Graphics.UI.Gtk.WebKit.WebView import Manatee.Core.DBus+import Manatee.Core.PageFrame import Manatee.Core.PageView import Manatee.Core.Types import Manatee.Extension.Reader.ReaderBuffer@@ -48,7 +49,7 @@ data ReaderView = ReaderView {readerViewPlugId :: TVar PagePlugId- ,readerViewScrolledWindow :: ScrolledWindow+ ,readerViewFrame :: PageFrame ,readerViewTreeView :: TreeView ,readerViewTreeFrame :: Frame ,readerViewTreeScrolledWindow :: ScrolledWindow@@ -80,8 +81,9 @@ instance PageView ReaderView where pageViewBuffer = PageBufferWrap . readerViewBuffer pageViewPlugId = readerViewPlugId- pageViewFocus = widgetGrabFocus . readerViewHPaned+ pageViewBox = pageFrameBox . readerViewFrame pageViewScrolledWindow = readerViewScrolledWindow+ pageViewFocus = widgetGrabFocus . readerViewHPaned pageViewHandleKeyAction = readerViewHandleKeyAction -- | Create reader view.@@ -96,7 +98,7 @@ webFrame <- frameNew -- Create scrolled window.- scrolledWindow <- scrolledWindowNew_+ pFrame <- pageFrameNewWithModeName (pageModeName $ readerBufferMode buffer) treeScrolledWindow <- scrolledWindowNew_ navScrolledWindow <- scrolledWindowNew_ webScrolledWindow <- scrolledWindowNew_@@ -126,7 +128,7 @@ navFrame `containerAdd` navScrolledWindow webFrame `containerAdd` webScrolledWindow - scrolledWindowAddWithViewport scrolledWindow vPaned+ scrolledWindowAddWithViewport (pageFrameScrolledWindow pFrame) vPaned panedPack1 hPaned treeFrame True True panedPack2 hPaned navFrame True True @@ -155,7 +157,7 @@ channel <- createViewChannel (readerBufferBroadcastChannel buffer) treeView -- Build reader view.- let readerView = ReaderView pId scrolledWindow + let readerView = ReaderView pId pFrame treeView treeFrame treeScrolledWindow treeListStore treeSortModel navView navFrame navScrolledWindow navListStore navSortModel webView webFrame webScrolledWindow@@ -498,6 +500,11 @@ let url = fniUrl itemInfo unless (null url) $ mkDaemonSignal (pageViewClient view) NewTab (NewTabArgs "PageBrowser" url [])++-- | Scrolled window.+readerViewScrolledWindow :: ReaderView -> ScrolledWindow +readerViewScrolledWindow =+ pageFrameScrolledWindow . readerViewFrame -- | Keymap. readerViewKeymap :: Map Text (ReaderView -> IO ())
manatee-reader.cabal view
@@ -1,5 +1,5 @@ name: manatee-reader-version: 0.0.7+version: 0.0.8 Cabal-Version: >= 1.6 license: GPL-3 license-file: LICENSE@@ -37,7 +37,7 @@ location: http://patch-tag.com/r/AndyStewart/manatee-reader Library- build-depends: base >= 4 && < 5, manatee-core >= 0.0.7, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,+ build-depends: base >= 4 && < 5, manatee-core >= 0.0.8, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0, containers >= 0.3.0.0, gtk-serialized-event >= 0.12.0, gtk >= 0.12.0, text >= 0.7.1.0, webkit >= 0.12.0, feed >= 0.3.7, download-curl >= 0.1.2, utf8-string >= 0.3.4, filepath