This is the last batch of patches from Gehad for the "soft pencils down" date. For those who have free time and are interested in the printing module please compile and have a look at this update.
I have requested multiple revisions on how the bundled templates look, trying to get them as close to what we had before. Of course, this an aesthetic topic and they simply *can't* be optimal for everybody. Mind that the core functionality itself is now done and the community can start contributing to the bundled templates by extending the CSS/HTML. If you have some nitpicks or find bugs, let us know! We are now pretty much waiting on user feedback, while in the meantime Gehad will finish the documentation update. If more time remains the now supported "statistics" print will receive more attention, but mind that this is a bonus feature for this GSoC project. --- The following changes since commit 342479586d1f34a2b7f3d1d69037cb0d631489fa: Planner: use the heap for note buffers (2015-08-10 00:04:17 -0700) are available in the git repository at: g...@github.com:neolit123/subsurface.git custom-print for you to fetch changes up to f3c5699714e43e91c8ff8f66119da454b314264d: Printing: remove silly white line at end of each page (2015-08-15 15:05:26 +0300) ---------------------------------------------------------------- Gehad elrobey (35): Printing: don't save invalid colors Printing: fix wrong custom palette index Printing: fix TemplateEdit color selection bug Printing: templates should use colors defined in the color palette Printing: hide warnings in dive profile while printing Printing: enhance templates layout Printing: add six dives per page template Printing: use pageRect() to support old QT versions Printing: export more dive details with Grantlee backend Printing: add statistics print Printing: add another color in color palettes Printing: fix color numbers in printing templates Printing: add color3 to templates and make it effective Printing: replace dark and light colors Printing: make default borders black Printing: make the actual data font width regular (not bold) Printing: remove the outer most border for all templates Printing: hide scrollbar from QWebview to fix padding issue Printing: remove templates additional margins Printing: insert placeholders in empty feilds Printing: rename "Table cells" to "Table cells 1" Printing: add more padding on the top of the profile Printing: remove extra white spaces from 6 dives template Printing: remove the outer border from table template Printing: fix scrolling bug by adding extra padding Printing: export border to templates Printing: use border width from Grantlee backend Printing: disable ui elements on statistics print Printing: don't break dives into successive pages Printing: add 'dontbreak' css class to dives Printing: use the same background for all the data cells flow layout Printing: add table backgrounds and borders to six dives template Printing: enhance 2 dives template Printing: fill the QPainter background color before rendering Printing: remove silly white line at end of each page printer.cpp | 124 ++++++++++++++++++++++++- printer.h | 2 + printing_templates/Flowlayout.html | 88 ++++++++++-------- printing_templates/One Dive.html | 91 +++++++++++-------- printing_templates/Six Dives.html | 182 +++++++++++++++++++++++++++++++++++++ printing_templates/Table.html | 24 ++--- printing_templates/Two Dives.html | 107 ++++++++++++---------- qt-ui/printdialog.cpp | 51 +++++------ qt-ui/printoptions.cpp | 26 +++++- qt-ui/printoptions.h | 9 +- qt-ui/profile/profilewidget2.cpp | 11 +++ qt-ui/templateedit.cpp | 45 ++++++--- qt-ui/templateedit.h | 1 + qt-ui/templateedit.ui | 60 ++++++++++-- templatelayout.cpp | 73 ++++++++++++++- templatelayout.h | 27 ++++++ 16 files changed, 720 insertions(+), 201 deletions(-) create mode 100644 printing_templates/Six Dives.html _______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface