diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG for Haskell Pdf Presenter ======================================== +0.2.4 + * Change keybinding for changing monitors from "S" to "M" + * Fix positioning errors in the Glade GUI file + * Terminology fix: "presenter window" not "screen" or "view" + 0.2.3 * Fix compilation on GHC 7.4 diff --git a/HaskellPdfPresenter.glade b/HaskellPdfPresenter.glade --- a/HaskellPdfPresenter.glade +++ b/HaskellPdfPresenter.glade @@ -8,7 +8,7 @@ True dialog Haskell Pdf Presenter - Version 0.2.3 + Version 0.2.4 Copyright 2012-2013, Michael D. Adams http://michaeldadams.org http://michaeldadams.org @@ -95,39 +95,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True False @@ -329,7 +296,7 @@ 3 4 - 7 + 8 9 @@ -569,7 +536,7 @@ True False 0 - Presenter view + Presenter window @@ -783,7 +750,7 @@ True False 0 - S, Shift-S (reverse) + M, Shift-M (reverse) (w/ Ctrl = move only presenter window) (w/ Alt = move only audience window) @@ -847,6 +814,39 @@ 6 7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HaskellPdfPresenter.hs b/HaskellPdfPresenter.hs --- a/HaskellPdfPresenter.hs +++ b/HaskellPdfPresenter.hs @@ -69,7 +69,7 @@ , pageAdjustment :: Adjustment } -header = "Haskell Pdf Presenter, version 0.2.3, \nUsage: hpdfp [OPTION...] file" +header = "Haskell Pdf Presenter, version 0.2.4, \nUsage: hpdfp [OPTION...] file" options = [ Option "h?" ["help"] (NoArg (const $ putStr (usageInfo header options) >> exitSuccess)) "Display usage message" , Option "s" ["slide"] (argOption initSlide "slide" maybeRead "INT") "Initial slide number (default 1)" @@ -420,7 +420,7 @@ handleKey state [] "b" = modifyVideoMute state (\b -> return $ if b == MuteBlack then MuteOff else MuteBlack) >> return True handleKey state [] "w" = modifyVideoMute state (\b -> return $ if b == MuteWhite then MuteOff else MuteWhite) >> return True --- Presenter screen +-- Presenter window handleKey state [] "tab" = builderGetObject (builder state) castToNotebook "presenter.notebook" >>= (`set` [notebookCurrentPage :~ (`mod` 2) . (+ 1)]) >> return True @@ -447,14 +447,14 @@ handleKey state [] "f11" = toggleFullScreen state >> return True handleKey state [Alt] "return" = toggleFullScreen state >> return True handleKey state [Control] "l" = toggleFullScreen state >> return True -handleKey state [] "s" = changeMonitors state f where +handleKey state [] "m" = changeMonitors state f where f mP mA n = if mA `incMod` n == mP then (mP `incMod` n, mP `incMod` n) else (mP, mA `incMod` n) -handleKey state [Shift] "s" = changeMonitors state f where +handleKey state [Shift] "m" = changeMonitors state f where f mP mA n = if mA == mP then (mP `decMod` n, mP `decMod` n `decMod` n) else (mP, mA `decMod` n) -handleKey state [Control] "s" = changeMonitors state f where f mP mA n = (mP `incMod` n, mA) -handleKey state [Shift,Control] "s" = changeMonitors state f where f mP mA n = (mP `decMod` n, mA) -handleKey state [Alt] "s" = changeMonitors state f where f mP mA n = (mP, mA `incMod` n) -handleKey state [Shift,Alt] "s" = changeMonitors state f where f mP mA n = (mP, mA `decMod` n) +handleKey state [Control] "m" = changeMonitors state f where f mP mA n = (mP `incMod` n, mA) +handleKey state [Shift,Control] "m" = changeMonitors state f where f mP mA n = (mP `decMod` n, mA) +handleKey state [Alt] "m" = changeMonitors state f where f mP mA n = (mP, mA `incMod` n) +handleKey state [Shift,Alt] "m" = changeMonitors state f where f mP mA n = (mP, mA `decMod` n) handleKey _ _ name | name `elem` [ -- Ignore modifier keys "shift_l", "shift_r", "control_l", "control_r", "alt_l", "alt_r", @@ -522,9 +522,9 @@ -- Move the windows between the available monitors according to the -- provided f function. For forwards movement, the order is that we --- always move the audience view first, but if the audience view would --- move to the same monitor as the presenter view then we advance the --- presenter view and also move the audience view to that monitor. +-- always move the audience window first, but if the audience window would +-- move to the same monitor as the presenter window then we advance the +-- presenter window and also move the audience window to that monitor. changeMonitors state f = do wP <- presenterWindow state wA <- audienceWindow state diff --git a/README b/README --- a/README +++ b/README @@ -52,13 +52,13 @@ (e.g. a video player may not dim the background or hide the mouse). I haven't found any programs where this is an actual problem, but it is a possibility. -- Audience view +- Audience window - Mouse hides after ~3 seconds - Shows on top if there is only one monitor - Automatically placed on auxiliary monitor/projector if present - Both black and white video mute -- Presenter view +- Presenter window - Meta-data: - A small progress bar is shown at the bottom while pre-rendering, but since pre-rendering is done in the background, the GUI is @@ -131,7 +131,7 @@ - Mute: - Toggle white: W - Toggle black: B - - Presenter screen: + - Presenter window: - Switch views: Tab - Change preview percentage: [, ], Shift-[ (minor), Shift-] (minor), = (standard stops) - Standard stops: 0, best-fit on left, 1/3, 1/2, 2/3, best-fit on right, 1 @@ -142,7 +142,7 @@ - Window control: - Enter fullscreen: F, F11, Alt-Enter, Control-L - Exit fullscreen: Escape, F, F11, Alt-Enter, Control-L - - Move between monitors: S, Shift-S (reverse) + - Move between monitors: M, Shift-M (reverse) - Move presenter window between monitors: Ctrl-S, Shift-Ctrl-S (reverse) - Move audience window between monitors: Alt-S, Shift-Alt-S (reverse) diff --git a/haskell-pdf-presenter.cabal b/haskell-pdf-presenter.cabal --- a/haskell-pdf-presenter.cabal +++ b/haskell-pdf-presenter.cabal @@ -4,7 +4,7 @@ -- The package version. See the Haskell package versioning policy -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for -- standards guiding when and how versions should be incremented. -Version: 0.2.3 +Version: 0.2.4 -- A short (one-line) description of the package. Synopsis: Tool for presenting PDF-based presentations. @@ -76,4 +76,4 @@ Source-repository this Type: mercurial Location: http://michaeldadams.org/repos-pub/hg/haskell-pdf-presenter/ - Tag: v0.2.3 + Tag: v0.2.4