haskell-pdf-presenter 0.2.3 → 0.2.4
raw patch · 5 files changed
+59/−54 lines, 5 files
Files
- CHANGELOG +5/−0
- HaskellPdfPresenter.glade +37/−37
- HaskellPdfPresenter.hs +11/−11
- README +4/−4
- haskell-pdf-presenter.cabal +2/−2
CHANGELOG view
@@ -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
HaskellPdfPresenter.glade view
@@ -8,7 +8,7 @@ <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> <property name="program_name">Haskell Pdf Presenter</property>- <property name="version">Version 0.2.3</property>+ <property name="version">Version 0.2.4</property> <property name="copyright" translatable="yes">Copyright 2012-2013, Michael D. Adams</property> <property name="website">http://michaeldadams.org</property> <property name="website_label" translatable="yes">http://michaeldadams.org</property>@@ -95,39 +95,6 @@ <placeholder/> </child> <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child>- <placeholder/>- </child>- <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property>@@ -329,7 +296,7 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property>- <property name="top_attach">7</property>+ <property name="top_attach">8</property> <property name="bottom_attach">9</property> </packing> </child>@@ -569,7 +536,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property>- <property name="label" translatable="yes">Presenter view</property>+ <property name="label" translatable="yes">Presenter window</property> <attributes> <attribute name="weight" value="bold"/> </attributes>@@ -783,7 +750,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property>- <property name="label" translatable="yes">S, Shift-S (reverse)+ <property name="label" translatable="yes">M, Shift-M (reverse) (w/ Ctrl = move only presenter window) (w/ Alt = move only audience window)</property> </object>@@ -847,6 +814,39 @@ <property name="top_attach">6</property> <property name="bottom_attach">7</property> </packing>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/>+ </child>+ <child>+ <placeholder/> </child> </object> <packing>
HaskellPdfPresenter.hs view
@@ -69,7 +69,7 @@ , pageAdjustment :: Adjustment } -header = "Haskell Pdf Presenter, version 0.2.3, <http://michaeldadams.org/projects/haskell-pdf-presenter>\nUsage: hpdfp [OPTION...] file"+header = "Haskell Pdf Presenter, version 0.2.4, <http://michaeldadams.org/projects/haskell-pdf-presenter>\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
README view
@@ -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)
haskell-pdf-presenter.cabal view
@@ -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