[PULL REQUEST] GSoC Printing: initial batch of patches

Lubomir I. Ivanov neolit123 at gmail.com
Thu Jun 4 07:58:10 PDT 2015


So this is the initial work from Gehad. I'm looking forward to getting this in
master as he needs to continute the work into the template specific logic.
Rebasing all the time while waiting on me for reviews must be a pain, so this
is pending.

As discussed this does break the current printing module in the expense of
not maintaining a couple of modules (old vs new) durring GSoC. 
For users that follow master and don't want to install Grantlee please use
"cmake -DNO_PRINTING" but mind that Grantlee will be a hard dependency if you
ever want to print with Subsurface. 

Some of the patches at this point simply remove old code and add some of the
new logic which is WIP for the time being.

Earlier today I've sent another patch, which is for the sake of me being able
to build with NO_MARBLE:
[PATCH] GlobeGPS: add empty function for NO_MARBLE

Let me know if you think anything is bad and shouldn't be in, as is.

-------------------------
The following changes since commit 778204d662a2e01b2effb4a8653c2c9d06d2ccbe:

  Cmake: handle the case of local libgit2 but pkg_config for libssh2 (2015-06-03 22:15:26 -0700)

are available in the git repository at:

  git at github.com:neolit123/subsurface.git custom-print

for you to fetch changes up to 64f129d60b43e017db1874ff5d8326b25fcefbe4:

  Printing: Add progress updating ability to print dialog (2015-06-04 17:41:32 +0300)

----------------------------------------------------------------
Gehad elrobey (11):
      Printing: Create two dives per page grantlee template
      CMAKE: Require Grantlee library
      Printing: Add TemplateLayout class
      Printing: Add Printer class that holds the rendering logic.
      Printing: Change "NEW_PRINTING" to "NO_PRINTING"
      Printing: Remove the obsolete code from PrintDialog
      Printing: Edit the print options widget
      Printing: Remove more obsolete code from printlayout
      Printing: remove the print_options struct from display.h
      Printing: call print from printer class
      Printing: Add progress updating ability to print dialog

Lubomir I. Ivanov (1):
      Cmake: add optional pkg-config for Grantlee

 CMakeLists.txt               |  31 ++-
 display.h                    |  14 --
 printer.cpp                  |  59 ++++++
 printer.h                    |  27 +++
 printing_templates/base.html | 204 +++++++++++++++++++
 qt-ui/printdialog.cpp        |  77 ++------
 qt-ui/printdialog.h          |   7 +-
 qt-ui/printlayout.cpp        | 462 -------------------------------------------
 qt-ui/printlayout.h          |  49 -----
 qt-ui/printoptions.cpp       |  61 ++----
 qt-ui/printoptions.h         |  20 +-
 qt-ui/printoptions.ui        |  73 +++----
 subsurface.pro               |   4 +
 templatelayout.cpp           | 187 ++++++++++++++++++
 templatelayout.h             | 101 ++++++++++
 15 files changed, 687 insertions(+), 689 deletions(-)
 create mode 100644 printer.cpp
 create mode 100644 printer.h
 create mode 100644 printing_templates/base.html
 delete mode 100644 qt-ui/printlayout.cpp
 delete mode 100644 qt-ui/printlayout.h
 create mode 100644 templatelayout.cpp
 create mode 100644 templatelayout.h


More information about the subsurface mailing list