From 7c53414daec98fecb63ea234d54c428aefd587ac Mon Sep 17 00:00:00 2001 From: Akos Polster Date: Tue, 14 Jun 2011 19:50:08 +0200 Subject: [PATCH 1/1] . --- bookview.cpp | 24 ++++---- dorian.pro | 8 ++- qtc_packaging/debian_fremantle/README | 6 ++ qtc_packaging/debian_fremantle/changelog | 5 ++ qtc_packaging/debian_fremantle/compat | 1 + qtc_packaging/debian_fremantle/control | 14 +++++ qtc_packaging/debian_fremantle/copyright | 40 +++++++++++++ qtc_packaging/debian_fremantle/rules | 91 ++++++++++++++++++++++++++++++ 8 files changed, 176 insertions(+), 13 deletions(-) create mode 100644 qtc_packaging/debian_fremantle/README create mode 100644 qtc_packaging/debian_fremantle/changelog create mode 100644 qtc_packaging/debian_fremantle/compat create mode 100644 qtc_packaging/debian_fremantle/control create mode 100644 qtc_packaging/debian_fremantle/copyright create mode 100755 qtc_packaging/debian_fremantle/rules diff --git a/bookview.cpp b/bookview.cpp index 1e80aa1..b751393 100644 --- a/bookview.cpp +++ b/bookview.cpp @@ -355,18 +355,18 @@ void BookView::paintEvent(QPaintEvent *e) int bookmarkPos = (int)((qreal)height * (qreal)b.pos); painter.drawPixmap(2, bookmarkPos - scrollPos.y(), bookmarkPixmap); } - if (mBook) { - QPen pen(Qt::gray); - pen.setStyle(Qt::DotLine); - pen.setWidth(3); - painter.setPen(pen); - if (contentIndex > 0) { - painter.drawLine(0, -scrollPos.y(), width(), -scrollPos.y()); - } - if (contentIndex < (mBook->parts.size() - 1)) { - int h = contentsHeight - scrollPos.y() - 1; - painter.drawLine(0, h, width(), h); - } + + // Paint page separator(s) + QPen pen(Qt::gray); + pen.setStyle(Qt::DotLine); + pen.setWidth(3); + painter.setPen(pen); + if (contentIndex > 0) { + painter.drawLine(0, -scrollPos.y(), width(), -scrollPos.y()); + } + if (contentIndex < (mBook->parts.size() - 1)) { + int h = contentsHeight - scrollPos.y() - 1; + painter.drawLine(0, h, width(), h); } } diff --git a/dorian.pro b/dorian.pro index 4ecb1c2..87b7367 100644 --- a/dorian.pro +++ b/dorian.pro @@ -112,7 +112,13 @@ OTHER_FILES += \ pkg/symbian/book.svg \ pkg/symbian/clean.bat \ pkg/maemo/icon-48/dorian.png \ - pkg/maemo/icon-scalable/dorian.png + pkg/maemo/icon-scalable/dorian.png \ + qtc_packaging/debian_fremantle/rules \ + qtc_packaging/debian_fremantle/README \ + qtc_packaging/debian_fremantle/copyright \ + qtc_packaging/debian_fremantle/control \ + qtc_packaging/debian_fremantle/compat \ + qtc_packaging/debian_fremantle/changelog DEFINES += \ USE_FILE32API diff --git a/qtc_packaging/debian_fremantle/README b/qtc_packaging/debian_fremantle/README new file mode 100644 index 0000000..cbca184 --- /dev/null +++ b/qtc_packaging/debian_fremantle/README @@ -0,0 +1,6 @@ +The Debian Package dorian +---------------------------- + +Comments regarding the Package + + -- unknown Tue, 14 Jun 2011 19:45:50 +0200 diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog new file mode 100644 index 0000000..394bb97 --- /dev/null +++ b/qtc_packaging/debian_fremantle/changelog @@ -0,0 +1,5 @@ +dorian (0.0.1) unstable; urgency=low + + * Initial Release. + + -- unknown Tue, 14 Jun 2011 19:45:50 +0200 diff --git a/qtc_packaging/debian_fremantle/compat b/qtc_packaging/debian_fremantle/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/qtc_packaging/debian_fremantle/compat @@ -0,0 +1 @@ +7 diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control new file mode 100644 index 0000000..9caa293 --- /dev/null +++ b/qtc_packaging/debian_fremantle/control @@ -0,0 +1,14 @@ +Source: dorian +Section: user/hidden +Priority: optional +Maintainer: unknown +Build-Depends: debhelper (>= 5), libqt4-dev +Standards-Version: 3.7.3 +Homepage: + +Package: dorian +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: + +XB-Maemo-Display-Name: dorian diff --git a/qtc_packaging/debian_fremantle/copyright b/qtc_packaging/debian_fremantle/copyright new file mode 100644 index 0000000..12c8417 --- /dev/null +++ b/qtc_packaging/debian_fremantle/copyright @@ -0,0 +1,40 @@ +This package was debianized by unknown on +Tue, 14 Jun 2011 19:45:50 +0200. + +It was downloaded from + +Upstream Author(s): + + + + +Copyright: + + + + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package 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 General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2011, unknown and +is licensed under the GPL, see above. + + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules new file mode 100755 index 0000000..b10d3d3 --- /dev/null +++ b/qtc_packaging/debian_fremantle/rules @@ -0,0 +1,91 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + + +configure: configure-stamp +configure-stamp: + dh_testdir + # qmake PREFIX=/usr# Uncomment this line for use without Qt Creator + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + # $(MAKE) # Uncomment this line for use without Qt Creator + #docbook-to-man debian/dorian.sgml > dorian.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/dorian. + $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/dorian install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + # dh_shlibdeps # Uncomment this line for use without Qt Creator + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure -- 1.7.9.5