summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix project errorHEADmasterJesus Fernandez2017-04-041-0/+0
| | | | | | | | Fixes the following error when calling qmake -recursive: Project ERROR: Project has no top-level .qmake.conf file. Change-Id: Iac9beb9acbc99d09ae3e74813e0dcc6a274c3f3d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* (mostly) use Shortcut rather than KeysShawn Rutledge2017-02-201-19/+21
| | | | | | | | | | | | | | | | | | | Thus it's not required for the root Presentation to retain key focus. That way each slide can also use the keyboard as long as those uses don't interefere with the global shortcuts. The shortcuts can also be disabled in case they interfere (e.g. using arrow navigation globally prevents using it for navigating within a slide). The remaining exception is for directly entering slide numbers. IMO this is impractical anyway; but if you need to do that, then you also need to give the Presentation keyboard focus, as before. The shortcut which used Esc to quit is removed, and replaced with the more-standard Control-Q. Enter and Backspace are also no longer used for slide navigation: there seem to be enough keys for that. Change-Id: I0a54ae62305aa28b0ffef15b5ec010058c36fb8e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Presentation.qml: allow directly changing currentSlideShawn Rutledge2017-02-201-27/+19
| | | | | | | instead of needing to go through the switchSlides function. Change-Id: Ia28df40025070fbdd699720f7017ec0619ec85a6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* allow disabling mouse navigationShawn Rutledge2017-02-131-0/+1
| | | | | Change-Id: I1017662ee815ef1cd651774f0d5b0bca40e82751 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Make sure all notes are visible and with slightly improved formatting.Gunnar Sletta2015-05-111-9/+54
| | | | | Change-Id: I4f5b57fbc6d480039a07d9716e4039a9d5dd0b59 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix bullet positioningGunnar Sletta2015-05-081-7/+6
| | | | | Change-Id: I05c3770d9930f70aeaeea42826dad9b986685f73 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Allow for overriding the text format of a slideSimon Hausmann2014-09-291-1/+2
| | | | | | | | Sometimes it's convenient to use rich-text formatting inside content Change-Id: Ie0296521f98b07a2871b478aefd8f17c0c8d93d2 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Add a point-by-point reveal optionAlan Alpert2013-10-213-0/+20
| | | | | Change-Id: I9addb0ee7685b5e583315432b4f3c7c25a6904d0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Changed contact detailsTeemu Kaukoranta2013-05-3019-19/+19
| | | | | | | | | | | | | | | | | | | | | | Contact details from qt-project.org to qt-project.org/legal Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/ \1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I }}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*) (.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.* |.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.* |.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.* |.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}') Change-Id: I9c3e3b701dd1e14b76bef8b216e9c9e3294843cd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fixed licensesTeemu Kaukoranta2013-05-2319-399/+399
| | | | | | | | | | | | Updated licenses using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Reviewed-by: Janne Anttila <janne.anttila@digia.com>, Sergio Ahumada <sergio.ahumada@digia.com> Change-Id: Ic7a632fdaa54433c3267f9423bc61f77fe3149ae Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Use children instead of resources to find slides.Gunnar Sletta2013-05-151-2/+2
| | | | | Change-Id: I18b439c5afe3631f970709069eba6458944ebc34 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Better rotation code for examplesGunnar Sletta2013-04-193-15/+24
| | | | | Change-Id: I73f617ebf909492009c776bbd8cd03ac80ae75cb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* use qml_module in .pro fileGunnar Sletta2013-04-082-16/+12
| | | | | Change-Id: I8932934a0d1cf1fbe6ee85c7c09754998591255f Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Go back a slide on pressAndHoldAlan Alpert2013-02-111-0/+1
| | | | | | | | While a gesture would be a lot better, pressAndHold is an easy to implement way of providing limited 'go back' functionality on a touch only device. Change-Id: Ic6b2f4759dc5c7bdcb84d9dc5ef7c40589746c8d Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Make the writeInText fasterunstableGunnar Sletta2012-12-141-1/+1
|
* Update to most recent APIGunnar Sletta2012-12-111-1/+1
|
* Fix license and install to "right" locationGunnar Sletta2012-11-2621-424/+673
|
* pagerect fixGunnar Sletta2012-11-081-2/+6
|
* Fix title coloring in some examplesGunnar Sletta2012-11-084-4/+4
|
* New feature: Notes window with example, tutorial updated.Gunnar Sletta2012-11-085-25/+155
| | | | | | Also did some refactoring inside Presentation. Prefixed "private" API variables with underscore and made the font/coloring properties explicit in the Presentation element.
* Make clock show two digits for minutes always...Gunnar Sletta2012-11-081-1/+3
|
* Added:Gunnar Sletta2012-11-077-19/+222
| | | | | | | | | | - SlideCounter - Clock - titleColor Changed: - Slide.slideTextColor -> Slide.fontColor - Slide.slideFontFamily -> Slide.fontFamily
* code slide...Gunnar Sletta2012-11-054-3/+146
|
* using grabWindow() of QQuickView instead of screen().Alan Ezust2012-11-031-2/+2
|
* Merge remote-tracking branch 'ezust/master'Gunnar Sletta2012-11-035-0/+212
|\
| * docs only.Alan Ezust2012-11-032-7/+6
| |
| * added a help messageAlan Ezust2012-11-033-3/+11
| |
| * Added printslides program.Alan Ezust2012-11-036-0/+205
| |
* | Added Slide.writeInText property.Gunnar Sletta2012-11-032-3/+32
| |
* | Merge branch 'master' of gitorious.org:qt-labs/qml-presentation-systemGunnar Sletta2012-11-033-10/+10
|\|
| * Update to latest declarativeGunnar Sletta2012-08-132-5/+6
| |
| * Work with latest declarativeGunnar Sletta2012-06-052-6/+5
| |
* | Make it possiblet to set global fontGunnar Sletta2012-08-201-0/+4
|/
* Make it possible to implement forward and backward transition.Kim Motoyoshi Kalland2011-09-093-23/+30
|
* Go to next slide on Return, go to previous slide on Backspace or right-clickOrgad Shaneh2011-07-251-5/+16
|
* Added arbitrary slide selection (number + return)Orgad Shaneh2011-07-041-5/+30
|
* Update text to match implementationGunnar Sletta2011-06-151-3/+3
|
* Change text to use [C] for clearingGunnar Sletta2011-06-151-1/+1
|
* Adapt to new particle namingGunnar Sletta2011-06-151-10/+11
|
* Clear with 'C' and quit using 'ESC'.Gunnar Sletta2011-05-311-4/+8
|
* Enabled make install to copy directly to QTDIRGunnar Sletta2011-05-305-2/+18
|
* Added a readme fileGunnar Sletta2011-05-261-0/+34
|
* Added BSD license headers to all files...Gunnar Sletta2011-05-2012-2/+433
|
* Rotated launchers and some fixes to tutorialGunnar Sletta2011-05-195-14/+56
|
* better text..Gunnar Sletta2011-05-191-7/+6
|
* Slight improvemnts to examplesGunnar Sletta2011-05-184-57/+36
|
* Moved hello to tutorialGunnar Sletta2011-05-182-0/+0
|
* Slide::masterWidth and masterHeightGunnar Sletta2011-05-181-0/+3
|
* Added contentWidth to decide where text wrapsGunnar Sletta2011-05-162-6/+25
|
* renamed to Qt.labs.presentationGunnar Sletta2011-05-147-5/+8
|