manatee-mplayer 0.0.7 → 0.0.8
raw patch · 2 files changed
+17/−11 lines, 2 filesdep ~manatee-core
Dependency ranges changed: manatee-core
Files
Manatee/Extension/Mplayer/PlaylistView.hs view
@@ -29,6 +29,7 @@ import Data.Typeable import Graphics.UI.Gtk hiding (Statusbar, statusbarNew, get) import Graphics.UI.Gtk.Gdk.SerializedEvent+import Manatee.Core.PageFrame import Manatee.Core.PageView import Manatee.Core.Types import Manatee.Extension.Mplayer.DBus@@ -40,7 +41,6 @@ import Manatee.Toolkit.Gio.Gio import Manatee.Toolkit.Gtk.Gtk import Manatee.Toolkit.Gtk.ModelView-import Manatee.Toolkit.Gtk.ScrolledWindow import Paths_manatee_mplayer import System.GIO.File.ContentType import System.Posix.Process@@ -51,7 +51,7 @@ data PlaylistView = PlaylistView {playlistViewPlugId :: TVar PagePlugId- ,playlistViewScrolledWindow :: ScrolledWindow+ ,playlistViewFrame :: PageFrame ,playlistViewBuffer :: PlaylistBuffer ,playlistViewTreeView :: TreeView ,playlistViewListStore :: ListStore MultimediaInfo@@ -71,8 +71,9 @@ instance PageView PlaylistView where pageViewBuffer = PageBufferWrap . playlistViewBuffer pageViewPlugId = playlistViewPlugId- pageViewFocus = treeViewFocus . playlistViewTreeView+ pageViewBox = pageFrameBox . playlistViewFrame pageViewScrolledWindow = playlistViewScrolledWindow+ pageViewFocus = treeViewFocus . playlistViewTreeView pageViewHandleKeyAction = playlistViewHandleKeyAction pageViewScrollToTop = playlistViewScrollToTop pageViewScrollToBottom = playlistViewScrollToBottom@@ -91,12 +92,12 @@ pId <- newTVarIO plugId -- Create UI frame.- scrolledWindow <- scrolledWindowNew_+ pFrame <- pageFrameNewWithModeName (pageModeName $ playlistBufferMode buffer) -- Tree view. treeView <- treeViewNew treeViewSetEnableTreeLines treeView True- scrolledWindow `containerAdd` treeView+ pageFrameAddChild pFrame treeView -- List store. listStore <- listStoreNew []@@ -111,7 +112,7 @@ playMode <- newTVarIO ListMode -- Playlist view.- let playlistView = PlaylistView pId scrolledWindow buffer treeView listStore sortModel path playMode + let playlistView = PlaylistView pId pFrame buffer treeView listStore sortModel path playMode -- Build match rule listen DBus message. playlistViewBuildMatchRule playlistView@@ -143,7 +144,7 @@ ListMode -> RandomMode RandomMode -> SingleMode writeTVarIO (playlistViewPlayMode view) newMode- pageViewUpdateInfoStatus view "PlayMode" (" PlayMode (" ++ show newMode ++ ")")+ pageFrameUpdateStatusbar (playlistViewFrame view) "PlayMode" (" PlayMode (" ++ show newMode ++ ")") -- | Play current track. playlistViewPlayCurrent :: PlaylistView -> IO ()@@ -413,10 +414,10 @@ -- Update play mode status. mode <- readTVarIO (playlistViewPlayMode view)- pageViewUpdateInfoStatus view "PlayMode" (" PlayMode (" ++ show mode ++ ")")+ pageFrameUpdateStatusbar (playlistViewFrame view) "PlayMode" (" PlayMode (" ++ show mode ++ ")") -- Update playing status.- pageViewUpdateInfoStatus view "Playing" (" Playing : " ++ displayPath)+ pageFrameUpdateStatusbar (playlistViewFrame view) "Playing" (" Playing : " ++ displayPath) -- Send daemon signal to play. processId <- fmap show getProcessID@@ -484,3 +485,8 @@ case M.lookup keystoke playlistViewKeymap of Just action -> action view Nothing -> widgetPropagateEvent (playlistViewTreeView view) sEvent++-- | Scrolled window.+playlistViewScrolledWindow :: PlaylistView -> ScrolledWindow +playlistViewScrolledWindow =+ pageFrameScrolledWindow . playlistViewFrame
manatee-mplayer.cabal view
@@ -1,5 +1,5 @@ name: manatee-mplayer-version: 0.0.7+version: 0.0.8 Cabal-Version: >= 1.6 license: GPL-3 license-file: LICENSE@@ -30,7 +30,7 @@ location: http://patch-tag.com/r/AndyStewart/manatee-mplayer 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, bytestring >= 0.9.1.5, libtagc >= 0.12.0, regex-tdfa >= 1.1.2, filepath >= 1.1.0.3, utf8-string >= 0.3.4, time, dbus-core, gio >= 0.12.0,