diff -Nru presentty-0.1.1/AUTHORS presentty-0.2.0/AUTHORS --- presentty-0.1.1/AUTHORS 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/AUTHORS 2015-07-25 16:42:00.000000000 +0000 @@ -1,2 +1,3 @@ Chris Packham James E. Blair +Jeremy Stanley diff -Nru presentty-0.1.1/ChangeLog presentty-0.2.0/ChangeLog --- presentty-0.1.1/ChangeLog 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/ChangeLog 2015-07-25 16:42:00.000000000 +0000 @@ -1,6 +1,14 @@ CHANGES ======= +0.2.0 +----- + +* Update Git URL and add contributing docs +* Add a tilt transition +* Use the q key to quit gracefully +* Use configured transition duration + 0.1.1 ----- diff -Nru presentty-0.1.1/debian/changelog presentty-0.2.0/debian/changelog --- presentty-0.1.1/debian/changelog 2015-02-21 17:57:13.000000000 +0000 +++ presentty-0.2.0/debian/changelog 2015-08-13 13:29:28.000000000 +0000 @@ -1,3 +1,11 @@ +presentty (0.2.0-1) unstable; urgency=medium + + * New upstream version. + - adds graceful quit key. closes: #795026. + * Use pybuild. + + -- Clint Adams Thu, 13 Aug 2015 15:28:22 +0200 + presentty (0.1.1-1) unstable; urgency=low * Initial release. Closes: #778855 diff -Nru presentty-0.1.1/debian/control presentty-0.2.0/debian/control --- presentty-0.1.1/debian/control 2015-02-21 17:52:46.000000000 +0000 +++ presentty-0.2.0/debian/control 2015-08-13 13:26:05.000000000 +0000 @@ -7,11 +7,10 @@ python-setuptools, python-pbr, dh-python -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://gitorious.org/presentty Vcs-Git: git://anonscm.debian.org/collab-maint/presentty.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/presentty.git -X-Python-Version: >= 2.6 Package: presentty Architecture: any diff -Nru presentty-0.1.1/debian/rules presentty-0.2.0/debian/rules --- presentty-0.1.1/debian/rules 2015-02-21 17:05:04.000000000 +0000 +++ presentty-0.2.0/debian/rules 2015-08-13 13:27:54.000000000 +0000 @@ -1,28 +1,7 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 -# exclude VCS paths if needed. -#DH_ALWAYS_EXCLUDE=CVS:.svn:.git -# see FEATURE AREAS in dpkg-buildflags(1)) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# see ENVIRONMENT in dpkg-buildflags(1)) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export PYBUILD_NAME=presentty %: - dh $@ --with "python2" - -# debmake generated override targets -# For example, set multiarch library install file path. -# See dpkg-architecture(1) -#DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -#override_dh_auto_configure: -# cmake -DCMAKE_INSTALL_PREFIX=/usr \ -# -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) - - + dh $@ --with python2 --buildsystem=pybuild diff -Nru presentty-0.1.1/example/demo.rst presentty-0.2.0/example/demo.rst --- presentty-0.1.1/example/demo.rst 2015-01-09 18:39:14.000000000 +0000 +++ presentty-0.2.0/example/demo.rst 2015-07-25 16:12:20.000000000 +0000 @@ -2,11 +2,11 @@ The following directives, when used at the top of the file, set default values for all slides: - This sets the transition style. Values are: 'dissolve', 'pan', or - 'cut'. The optional argument of 'duration' sets the duration of - the transition in seconds (0.4 seconds by default). The same - syntax may be used within a slide to override the transition for - that slide alone. + This sets the transition style. Values are: 'dissolve', 'pan', + 'tilt', or 'cut'. The optional argument of 'duration' sets the + duration of the transition in seconds (0.4 seconds by default). + The same syntax may be used within a slide to override thes + transition for that slide alone. .. transition:: dissolve :duration: 0.4 @@ -77,6 +77,13 @@ ...or "pan," where the slides appear horizontally adjacent and move right to left... +Tilt Transition +=============== +.. transition:: tilt + +...or "tilt," where the slides appear vertically adjacent and move +bottom to top... + Cut Transition ============== .. transition:: cut diff -Nru presentty-0.1.1/PKG-INFO presentty-0.2.0/PKG-INFO --- presentty-0.1.1/PKG-INFO 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/PKG-INFO 2015-07-25 16:42:00.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: presentty -Version: 0.1.1 +Version: 0.2.0 Summary: Console-based presentation system Home-page: UNKNOWN Author: James E. Blair @@ -64,10 +64,19 @@ left and right arrow keys or page-up and page-down navigate between slides. + To exit presentty gracefully, use the 'q' key. + Source ------ - Git repo: https://gitorious.org/presentty + Git repo: http://git.inaugust.com/cgit/presentty/ + + Contributing + ------------ + + To send your latest commit as a patch, run:: + + git send-email --to corvus@gnu.org --annotate -1 License ------- diff -Nru presentty-0.1.1/presentty/console.py presentty-0.2.0/presentty/console.py --- presentty-0.1.1/presentty/console.py 2015-01-09 18:39:14.000000000 +0000 +++ presentty-0.2.0/presentty/console.py 2015-07-25 16:12:16.000000000 +0000 @@ -172,6 +172,8 @@ self.console.prev() elif key == 't': self.console.timerDialog() + elif key == 'q': + raise urwid.ExitMainLoop() else: return super(Screen, self).keypress(size, key) return None diff -Nru presentty-0.1.1/presentty/presentty.py presentty-0.2.0/presentty/presentty.py --- presentty-0.1.1/presentty/presentty.py 2015-01-09 18:39:14.000000000 +0000 +++ presentty-0.2.0/presentty/presentty.py 2015-07-25 16:12:16.000000000 +0000 @@ -78,6 +78,8 @@ self.nextSlide() elif key in ('left', 'page up'): self.prevSlide() + elif key == 'q': + raise urwid.ExitMainLoop() def transitionTo(self, index, forward=True): self.pos = index diff -Nru presentty-0.1.1/presentty/rst.py presentty-0.2.0/presentty/rst.py --- presentty-0.1.1/presentty/rst.py 2015-01-10 18:54:37.000000000 +0000 +++ presentty-0.2.0/presentty/rst.py 2015-07-25 16:12:20.000000000 +0000 @@ -65,6 +65,7 @@ transition_map = {'dissolve': transition_mod.DissolveTransition, 'cut': transition_mod.CutTransition, 'pan': transition_mod.PanTransition, + 'tilt': transition_mod.TiltTransition, } def __init__(self, document, palette, hinter=None, basedir='.'): diff -Nru presentty-0.1.1/presentty/transition.py presentty-0.2.0/presentty/transition.py --- presentty-0.1.1/presentty/transition.py 2015-01-09 18:39:14.000000000 +0000 +++ presentty-0.2.0/presentty/transition.py 2015-07-25 16:12:20.000000000 +0000 @@ -18,7 +18,7 @@ class Transition(urwid.Widget): def __init__(self, duration=0.4): super(Transition, self).__init__() - self.duration = 0.4 + self.duration = duration self.old = None self.new = None self.progress = 0.0 @@ -46,6 +46,16 @@ c.pad_trim_left_right(0-offset, 0-(size[0]-offset)) return c +class TiltTransition(Transition): + def render(self, size, focus=False): + old = self.old.render((size[0], size[1])) + new = self.new.render((size[0], size[1])) + c = urwid.CanvasCombine([(old, None, False), + (new, None, False)]) + offset = int(size[1] * self.progress) + c.pad_trim_top_bottom(0-offset, 0-(size[1]-offset)) + return c + class DissolveTransition(Transition): def __init__(self, *args, **kw): super(DissolveTransition, self).__init__(*args, **kw) diff -Nru presentty-0.1.1/presentty.egg-info/entry_points.txt presentty-0.2.0/presentty.egg-info/entry_points.txt --- presentty-0.1.1/presentty.egg-info/entry_points.txt 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/presentty.egg-info/entry_points.txt 2015-07-25 16:42:00.000000000 +0000 @@ -1,4 +1,4 @@ [console_scripts] -presentty-console = presentty.console:main presentty = presentty.presentty:main +presentty-console = presentty.console:main diff -Nru presentty-0.1.1/presentty.egg-info/pbr.json presentty-0.2.0/presentty.egg-info/pbr.json --- presentty-0.1.1/presentty.egg-info/pbr.json 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/presentty.egg-info/pbr.json 2015-07-25 16:42:00.000000000 +0000 @@ -1 +1 @@ -{"is_release": true, "git_version": "0b611b5"} \ No newline at end of file +{"is_release": true, "git_version": "c670c45"} \ No newline at end of file diff -Nru presentty-0.1.1/presentty.egg-info/PKG-INFO presentty-0.2.0/presentty.egg-info/PKG-INFO --- presentty-0.1.1/presentty.egg-info/PKG-INFO 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/presentty.egg-info/PKG-INFO 2015-07-25 16:42:00.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: presentty -Version: 0.1.1 +Version: 0.2.0 Summary: Console-based presentation system Home-page: UNKNOWN Author: James E. Blair @@ -64,10 +64,19 @@ left and right arrow keys or page-up and page-down navigate between slides. + To exit presentty gracefully, use the 'q' key. + Source ------ - Git repo: https://gitorious.org/presentty + Git repo: http://git.inaugust.com/cgit/presentty/ + + Contributing + ------------ + + To send your latest commit as a patch, run:: + + git send-email --to corvus@gnu.org --annotate -1 License ------- diff -Nru presentty-0.1.1/presentty.egg-info/requires.txt presentty-0.2.0/presentty.egg-info/requires.txt --- presentty-0.1.1/presentty.egg-info/requires.txt 2015-02-20 19:10:08.000000000 +0000 +++ presentty-0.2.0/presentty.egg-info/requires.txt 2015-07-25 16:42:00.000000000 +0000 @@ -2,4 +2,4 @@ urwid docutils>=0.12 pygments -pillow # or PIL. Optional; only used for images. \ No newline at end of file +pillow # or PIL. Optional; only used for images. diff -Nru presentty-0.1.1/README.rst presentty-0.2.0/README.rst --- presentty-0.1.1/README.rst 2015-02-20 19:06:07.000000000 +0000 +++ presentty-0.2.0/README.rst 2015-07-25 16:32:45.000000000 +0000 @@ -56,10 +56,19 @@ left and right arrow keys or page-up and page-down navigate between slides. +To exit presentty gracefully, use the 'q' key. + Source ------ -Git repo: https://gitorious.org/presentty +Git repo: http://git.inaugust.com/cgit/presentty/ + +Contributing +------------ + +To send your latest commit as a patch, run:: + + git send-email --to corvus@gnu.org --annotate -1 License -------