manatee-editor 0.0.6 → 0.0.7
raw patch · 4 files changed
+19/−9 lines, 4 filesdep +filepathdep ~manatee-core
Dependencies added: filepath
Dependency ranges changed: manatee-core
Files
- Main.hs +5/−2
- Manatee/Extension/Editor/SourceBuffer.hs +2/−2
- Manatee/Extension/Editor/SourceView.hs +7/−1
- manatee-editor.cabal +5/−4
Main.hs view
@@ -21,6 +21,7 @@ module Main where import Control.Applicative hiding (empty)+import Manatee.Core.Dynload import Manatee.Core.Render import Manatee.Core.Types import Manatee.Extension.Editor@@ -28,5 +29,7 @@ -- | Irc client render process. main :: IO () main = - startupRender (\ pagePath options client pageId -> - PageBufferWrap <$> sourceBufferNew pagePath options client pageId)+ startupRender + (\ pagePath options client pageId customize -> + PageBufferWrap <$> sourceBufferNew pagePath options client pageId customize)+ emptyCustomizeNew
Manatee/Extension/Editor/SourceBuffer.hs view
@@ -44,8 +44,8 @@ deriving Typeable -- | New source buffer.-sourceBufferNew :: String -> [String] -> Client -> PageId -> IO SourceBuffer-sourceBufferNew path _ client pageId = do+sourceBufferNew :: String -> [String] -> Client -> PageId -> CustomizeWrap -> IO SourceBuffer+sourceBufferNew path _ client pageId _ = do buffer <- SB.sourceBufferNew Nothing SB.sourceBufferSetHighlightMatchingBrackets buffer True -- highlight match brackets SB.sourceBufferSetMaxUndoLevels buffer (-1) -- no limit for undo level
Manatee/Extension/Editor/SourceView.hs view
@@ -40,6 +40,8 @@ import Manatee.Toolkit.Gtk.Gtk import Manatee.Toolkit.Gtk.Multiline import Manatee.Toolkit.Gtk.ScrolledWindow+import Paths_manatee_editor+import System.FilePath import Text.Printf import qualified Data.Map as M@@ -60,6 +62,7 @@ pageBufferClient = sourceBufferClient pageBufferCreateView a pId = PageViewWrap <$> sourceViewNew a pId pageBufferMode = sourceBufferMode+ pageBufferPackageName _ = fmap takeFileName getDataDir instance PageView SourceView where pageViewBuffer = PageBufferWrap . sourceViewBuffer@@ -447,7 +450,10 @@ -- | Set selection mark. sourceViewToggleSelectionMark :: SourceView -> IO ()-sourceViewToggleSelectionMark = textViewToggleSelectionMark . sourceViewView +sourceViewToggleSelectionMark view = + ifM (textViewToggleSelectionMark $ sourceViewView view )+ (pageViewUpdateInfoStatus view "Selection" "Selection (Active)")+ (pageViewUpdateInfoStatus view "Selection" "Selection (Inactive)") -- | Exchange selection mark. sourceViewExchangeSelectionMark :: SourceView -> IO ()
manatee-editor.cabal view
@@ -1,5 +1,5 @@ name: manatee-editor-version: 0.0.6+version: 0.0.7 Cabal-Version: >= 1.6 license: GPL-3 license-file: LICENSE@@ -7,7 +7,7 @@ synopsis: Editor extension for Manatee. description: manatee-editor is editor extension for Manatee (Haskell/Gtk+ Integrated Live Environment) .- Video at (Select 720p HD) at : <http://www.youtube.com/watch?v=weS6zys3U8k> <http://v.youku.com/v_show/id_XMjI2MDMzODI4.html>+ Video at (Select 720p HD) at : <http://www.youtube.com/watch?v=weS6zys3U8k> <http://www.youtube.com/watch?v=A3DgKDVkyeM> <http://v.youku.com/v_show/id_XMjI2MDMzODI4.html> . Screenshots at : <http://goo.gl/MkVw> .@@ -30,15 +30,16 @@ location: http://patch-tag.com/r/AndyStewart/manatee-editor Library- build-depends: base >= 4 && < 5, manatee-core >= 0.0.6, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,+ build-depends: base >= 4 && < 5, manatee-core >= 0.0.7, 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, gtksourceview2 >= 0.12.0,- text >= 0.7.1.0, bytestring >= 0.9.1.5, dbus-core, regex-tdfa+ text >= 0.7.1.0, bytestring >= 0.9.1.5, dbus-core, regex-tdfa, filepath exposed-modules: Manatee.Extension.Editor Manatee.Extension.Editor.PageMode Manatee.Extension.Editor.SourceBuffer Manatee.Extension.Editor.SourceView other-modules: + Paths_manatee_editor extensions: ghc-options: -fwarn-unused-matches -fwarn-unused-binds -fwarn-unused-imports -fwarn-overlapping-patterns -fwarn-duplicate-exports -fwarn-unrecognised-pragmas -fwarn-hi-shadowing