lp:~dpm/qreator/touch-scanner

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qreator/touch at revision 16

Schwarzburg: Approve on 2013-06-16

Diff: 4388 lines (+4189/-50)

12 files modified

.bzrignore (+2/-0)
js/jsqrcode-combined.js (+3748/-0)
qreator-touch.qml (+49/-16)
qreator/Creator.qml (+0/-17)
qreator/Decoder.qml (+68/-0)
qreator/DeviceOrientation.qml (+37/-0)
qreator/History.qml (+2/-2)
qreator/QrCodeCanvas.qml (+4/-4)
qreator/QrCodeDialog.qml (+44/-0)
qreator/QrCodeToolbar.qml (+13/-2)
qreator/Scanner.qml (+185/-9)
qreator/UploadImageDialog.qml (+37/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

26. By David Planella on 2013-06-16

Added clipboard copy support for decoding results, code cleanup

25. By David Planella on 2013-06-16

Added higher resolution toolbar icons

24. By David Planella on 2013-06-15

Cleaned up code, switched to saving all images before decoding, moved image capture to an action in the scanner toolbar, added clear action to debug tab

23. By David Planella on 2013-06-15

Removed test images

22. By David Planella on 2013-06-15

Added icons for upload and shot

21. By David Planella on 2013-06-15

Merged source tree reorg from trunk

20. By David Planella on 2013-06-15

Created Decoder component to abstract the decoding backend to use (C++ vs. JavaScript)

19. By David Planella on 2013-06-13

Added an image uploading feature to decode local images, added test data with pictures from a device.

18. By David Planella on 2013-06-10

Added result dialog, automatic orientation and a (not yet functional) overlay on the video preview to put the QR code in.

17. By David Planella on 2013-06-05

Improved camera orientation on the Nexus. This still needs many improvements