Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Version 0.10.0_rc2

  • Loading branch information...
commit fd24158f42c7ec55f8d15f361d8968ecec956add 1 parent ad9d396
@antialize antialize authored
Showing with 11 additions and 21 deletions.
  1. +5 −1 README_WKHTMLTOIMAGE
  2. +5 −2 README_WKHTMLTOPDF
  3. +1 −18 version.pri
View
6 README_WKHTMLTOIMAGE
@@ -1,4 +1,4 @@
-======================> wkhtmltoimage 0.10.0 rc1 Manual <=======================
+======================> wkhtmltoimage 0.10.0 rc2 Manual <=======================
This file documents wkhtmltoimage, a program capable of converting HTML
documents into images.
@@ -50,6 +50,8 @@ wkhtmltoimage [OPTIONS]... <input file> <output file>
-H, --extended-help Display more extensive help, detailing
less common command switches
-f, --format <format> Output file format (default is jpg)
+ --height <int> Set screen height (default is calculated
+ from page content) (default 0)
-h, --help Display help
--htmldoc Output program html help
--images Do load or print images (default)
@@ -99,6 +101,8 @@ wkhtmltoimage [OPTIONS]... <input file> <output file>
-V, --version Output version information an exit
--width <int> Set screen width (default is 1024)
(default 1024)
+ --window-status <windowStatus> Wait until window.status is equal to this
+ string before rendering page
--zoom <float> Use this zoom factor (default 1)
Items marked * are only available using patched QT.
View
7 README_WKHTMLTOPDF
@@ -1,4 +1,4 @@
-=======================> wkhtmltopdf 0.10.0 rc1 Manual <========================
+=======================> wkhtmltopdf 0.10.0 rc2 Manual <========================
This file documents wkhtmltopdf, a program capable of converting html documents
into PDF documents.
@@ -189,6 +189,7 @@ Items marked * are only available using patched QT.
contents and outlines
--include-in-outline * Include the page in the table of contents
and outlines (default)
+ --page-offset <offset> Set the starting page number (default 0)
--password <password> HTTP Authentication password
--disable-plugins Disable installed plugins (default)
--enable-plugins Enable installed plugins (plugins will
@@ -220,6 +221,8 @@ Items marked * are only available using patched QT.
--user-style-sheet <url> Specify a user style sheet, to load with
every page
--username <username> HTTP Authentication username
+ --window-status <windowStatus> Wait until window.status is equal to this
+ string before rendering page
--zoom <float> Use this zoom factor (default 1)
Items marked * are only available using patched QT.
@@ -414,7 +417,7 @@ given line combined with the arguments given to wkhtmltopdf
For example one could do the following:
echo "http://doc.trolltech.com/4.5/qapplication.html qapplication.pdf" >> cmds
-echo "--cover google.com http://en.wikipedia.org/wiki/Qt_(toolkit) qt.pdf" >> cmds
+echo "cover google.com http://en.wikipedia.org/wiki/Qt_(toolkit) qt.pdf" >> cmds
wkhtmltopdf --read-args-from-stdin --book < cmds
===============================> Static version <===============================
View
19 version.pri
@@ -1,23 +1,6 @@
-# Copyright 2011 wkhtmltopdf authors
-#
-# This file is part of wkhtmltopdf.
-#
-# wkhtmltopdf is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# wkhtmltopdf is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with wkhtmltopdf. If not, see <http:#www.gnu.org/licenses/>.
-
MAJOR_VERSION=0
MINOR_VERSION=10
PATCH_VERSION=0
-BUILD="rc1"
+BUILD="rc2"
DEFINES += MAJOR_VERSION=$$MAJOR_VERSION MINOR_VERSION=$$MINOR_VERSION PATCH_VERSION=$$PATCH_VERSION BUILD=$$BUILD
Please sign in to comment.
Something went wrong with that request. Please try again.