yi 0.6.2.3 → 0.6.2.4
raw patch · 4 files changed
+12/−9 lines, 4 filesdep ~gconfdep ~glibdep ~gtk
Dependency ranges changed: gconf, glib, gtk, pointedlist
Files
- src/Yi/Editor.hs +0/−1
- src/Yi/UI/Pango.hs +3/−1
- src/Yi/UI/Pango/Control.hs +4/−2
- yi.cabal +5/−5
src/Yi/Editor.hs view
@@ -125,7 +125,6 @@ $(nameDeriveAccessors ''Editor (\n -> Just (n ++ "A"))) - -- TODO: replace this by accessor windows :: Editor -> PL.PointedList Window windows editor = PL.focus $ tabs_ editor
src/Yi/UI/Pango.hs view
@@ -22,8 +22,10 @@ import qualified Data.Rope as Rope import Graphics.UI.Gtk hiding (on, Region, Window, Action, Point, Style)+import Graphics.UI.Gtk.Gdk.GC hiding (foreground) import qualified Graphics.UI.Gtk.Gdk.Events as Gdk.Events import qualified Graphics.UI.Gtk as Gtk+import qualified Graphics.UI.Gtk.Gdk.GC as Gtk import System.Glib.GError import Yi.Prelude@@ -123,7 +125,7 @@ windowSetDefaultSize win 900 700 windowSetTitle win "Yi" ico <- loadIcon "yi+lambda-fat.32.png"- windowSetIcon win ico+ windowSetIcon win (Just ico) onKeyPress win (processEvent ch)
src/Yi/UI/Pango/Control.hs view
@@ -53,8 +53,8 @@ (Color(..), PangoRectangle(..), Rectangle(..), selectionDataSetText, targetString, clipboardSetWithData, clipboardRequestText, selectionPrimary, clipboardGetForDisplay, widgetGetDisplay,- onMotionNotify, drawRectangle, drawLine, newGCValues, gcSetValues,- layoutIndexToPos, layoutGetCursorPos, drawLayout, gcNew,+ onMotionNotify, drawRectangle, drawLine, + layoutIndexToPos, layoutGetCursorPos, drawLayout, widgetGetDrawWindow, layoutSetAttributes, widgetGrabFocus, scrolledWindowSetPolicy, scrolledWindowAddWithViewport, scrolledWindowNew, contextGetMetrics, contextGetLanguage,@@ -67,6 +67,8 @@ mainQuit, signalDisconnect, ConnectId(..), PolicyType(..), StateType(..), EventMask(..), AttrOp(..), Weight(..), PangoAttribute(..), Underline(..), FontStyle(..))+import Graphics.UI.Gtk.Gdk.GC as Gtk+ (newGCValues, gcSetValues, gcNew, foreground) import qualified Graphics.UI.Gtk as Gtk import qualified Graphics.UI.Gtk.Gdk.Events as Gdk.Events import System.Glib.GError
yi.cabal view
@@ -1,5 +1,5 @@ name: yi-version: 0.6.2.3+version: 0.6.2.4 category: Development, Editor synopsis: The Haskell-Scriptable Editor description:@@ -257,7 +257,7 @@ build-depends: ghc-paths ==0.1.* build-depends: hint > 0.3.1 build-depends: monads-fd- build-depends: pointedlist >= 0.3.5+ build-depends: pointedlist >= 0.3.5 && <0.4 build-depends: pureMD5 >= 0.2.3 build-depends: random build-depends: regex-base ==0.93.*@@ -284,15 +284,15 @@ cpp-options: -DFRONTEND_VTY if flag (pango)- build-depends: gtk==0.10.*- build-depends: glib==0.10.*+ build-depends: gtk==0.11.*+ build-depends: glib==0.11.* cpp-options: -DFRONTEND_PANGO other-modules: Yi.UI.Pango.ProjectTree Yi.UI.Pango.Utils Yi.UI.Pango if flag(gnome)- build-depends: gconf==0.10.*+ build-depends: gconf==0.11.* cpp-options: -DGNOME_ENABLED other-modules: Yi.UI.Pango.Gnome