From a796f78919862197e7289bc491babdd7a0385f8b Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 29 Mar 2012 18:25:18 +0200 Subject: [PATCH 1/5] Update version for 4.8.2 --- core/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/version.h b/core/version.h index 183ed5b33..dd037370a 100644 --- a/core/version.h +++ b/core/version.h @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.14.1" +#define OKULAR_VERSION_STRING "0.14.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 14 -#define OKULAR_VERSION_RELEASE 1 +#define OKULAR_VERSION_RELEASE 2 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ From c29ce712cf699e38a3a384fc69e5bf36cd26fd8e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 6 Apr 2012 00:50:13 +0200 Subject: [PATCH 2/5] Do not set mTextPageReady to true mTextPageReady is only used for threaded generation and this is a sync one so resetting it to true make very bad things happen An improvement of this area is needed since it makes no sense canGenerateTextPage returns mTextPageReady when generateTextPage doesn't use itB BUGS: 297379 FIXED-IN: 4.8.3 --- core/generator.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/core/generator.cpp b/core/generator.cpp index 284a3fade..2c63ca17f 100644 --- a/core/generator.cpp +++ b/core/generator.cpp @@ -257,7 +257,6 @@ void Generator::generateTextPage( Page *page ) Q_D( Generator ); TextPage *tp = textPage( page ); page->setTextPage( tp ); - d->mTextPageReady = true; signalTextGenerationDone( page, tp ); } From 4681d01e5ae4d6f814e1094ee8df9fafc58577d2 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 12 Apr 2012 23:20:55 +0200 Subject: [PATCH 3/5] Comment this since we don't use it for anything and the window field will be going away in the future --- generators/poppler/generator_pdf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index cba36aeb9..780cf845c 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -1238,8 +1238,8 @@ void PDFGenerator::addAnnotations( Poppler::Page * popplerPage, Okular::Page * p QList popplerAnnotations = popplerPage->annotations(); foreach(Poppler::Annotation *a, popplerAnnotations) { - a->window.width = (int)(page->width() * a->window.width); - a->window.height = (int)(page->height() * a->window.height); + //a->window.width = (int)(page->width() * a->window.width); + //a->window.height = (int)(page->height() * a->window.height); //a->window.width = a->window.width < 200 ? 200 : a->window.width; // a->window.height = a->window.height < 120 ? 120 : a->window.height; // resize annotation's geometry to an icon From 5482696067e642519d92e02bbfe4cd29ecf39e77 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Tue, 17 Apr 2012 21:20:49 +0200 Subject: [PATCH 4/5] SVN_SILENT made messages (.desktop file) --- generators/poppler/okularApplication_pdf.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/poppler/okularApplication_pdf.desktop b/generators/poppler/okularApplication_pdf.desktop index fb83b2221..0465975e3 100755 --- a/generators/poppler/okularApplication_pdf.desktop +++ b/generators/poppler/okularApplication_pdf.desktop @@ -127,7 +127,7 @@ InitialPreference=8 Categories=Qt;KDE;Graphics;Viewer; X-KDE-Keywords=PDF, Portable Document Format X-KDE-Keywords[ar]=PDF, Portable Document Format -X-KDE-Keywords[ca]=PDF, Portable Document Format, Format de document portable +X-KDE-Keywords[ca]=PDF, Format de document portable X-KDE-Keywords[ca@valencia]=PDF, Portable Document Format, Format de document portable X-KDE-Keywords[cs]=PDF, Portable Document Format X-KDE-Keywords[da]=PDF,Portable Document Format From 25f27760905b0266303bbbffabd5e241873f62f6 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 18 Apr 2012 20:13:57 +0200 Subject: [PATCH 5/5] Make sure we enable rePos before call setViewport BUGS: 298362 FIXED-IN: 4.8.3 --- ui/thumbnaillist.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/thumbnaillist.cpp b/ui/thumbnaillist.cpp index ebaef9c1a..0511d9342 100644 --- a/ui/thumbnaillist.cpp +++ b/ui/thumbnaillist.cpp @@ -483,6 +483,7 @@ ThumbnailListPrivate::ChangePageDirection ThumbnailListPrivate::forwardTrack(con return ThumbnailListPrivate::Right; if ( vp.rePos.normalizedX < 0.0 ) return ThumbnailListPrivate::Left; + vp.rePos.enabled = true; m_document->setViewport( vp ); return ThumbnailListPrivate::Null; }