Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-02-20 07:55:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2014-01-27 11:16:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-02-20 07:56:15.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Feb 1 10:16:04 UTC 2014 - [email protected] + +- Update to 4.12.2 + * KDE 4.12.2 release + * See http://www.kde.org/announcements/announce-4.12.2.php + +------------------------------------------------------------------- Old: ---- okular-4.12.1.tar.xz New: ---- okular-4.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.czi0Br/_old 2014-02-20 07:56:16.000000000 +0100 +++ /var/tmp/diff_new_pack.czi0Br/_new 2014-02-20 07:56:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: okular -Version: 4.12.1 +Version: 4.12.2 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.12.1.tar.xz -> okular-4.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/VERSION new/okular-4.12.2/VERSION --- old/okular-4.12.1/VERSION 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/VERSION 2014-01-28 23:01:01.000000000 +0100 @@ -1 +1 @@ -okular v0.18.1 +okular v0.18.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/core/fileprinter.cpp new/okular-4.12.2/core/fileprinter.cpp --- old/okular-4.12.1/core/fileprinter.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/core/fileprinter.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -438,7 +438,7 @@ return QStringList(); } -QStringList FilePrinter::deleteFile( QPrinter &printer, FileDeletePolicy fileDeletePolicy, const QString &version ) +QStringList FilePrinter::deleteFile( QPrinter &, FileDeletePolicy fileDeletePolicy, const QString &version ) { if ( fileDeletePolicy == FilePrinter::SystemDeletesFiles && version.startsWith( "lpr" ) ) { return QStringList("-r"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/core/generator.h new/okular-4.12.2/core/generator.h --- old/okular-4.12.1/core/generator.h 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/core/generator.h 2014-01-28 23:01:01.000000000 +0100 @@ -358,7 +358,8 @@ InvalidPrinterStatePrintError, UnableToFindFilePrintError, NoFileToPrintError, - NoBinaryToPrintError + NoBinaryToPrintError, + InvalidPageSizePrintError ///< @since 0.18.2 (KDE 4.12.2) }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/core/script/kjs_data.cpp new/okular-4.12.2/core/script/kjs_data.cpp --- old/okular-4.12.1/core/script/kjs_data.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/core/script/kjs_data.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -35,7 +35,7 @@ return KJSString( file->description() ); } -static KJSObject dataGetMIMEType( KJSContext *, void *object ) +static KJSObject dataGetMIMEType( KJSContext *, void * ) { return KJSString( "" ); } @@ -54,7 +54,7 @@ return KJSString( file->name() ); } -static KJSObject dataGetPath( KJSContext *, void *object ) +static KJSObject dataGetPath( KJSContext *, void * ) { return KJSString( "" ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/core/textpage.cpp new/okular-4.12.2/core/textpage.cpp --- old/okular-4.12.1/core/textpage.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/core/textpage.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -63,38 +63,11 @@ } /** - * If the horizontal arm of one rectangle fully contains the other (example below) + * If the vertical arm of one rectangle fully contains the other (example below) * -------- ---- ----- first * ---- -------- ----- second * or we can make it overlap of spaces by threshold% */ -static bool doesConsumeX(const QRect& first, const QRect& second, int threshold) -{ - // if one consumes another fully - if(first.left() <= second.left() && first.right() >= second.right()) - return true; - - if(first.left() >= second.left() && first.right() <= second.right()) - return true; - - // or if there is overlap of space by more than threshold% - // there is overlap - if(second.right() >= first.left() && first.right() >= second.left()) - { - const int overlap = (second.right() >= first.right()) ? first.right() - second.left() - : second.right() - first.left(); - // we will divide by the smaller rectangle to calculate the overlap - const int percentage = (first.width() < second.width()) ? overlap * 100 / (first.right() - first.left()) - : overlap * 100 / (second.right() - second.left()); - if(percentage >= threshold) return true; - } - - return false; -} - -/** - * Same concept of doesConsumeX but in this case we calculate on y axis - */ static bool doesConsumeY(const QRect& first, const QRect& second, int threshold) { // if one consumes another fully diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/core/version.h new/okular-4.12.2/core/version.h --- old/okular-4.12.1/core/version.h 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/core/version.h 2014-01-28 23:01:01.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.18.1" +#define OKULAR_VERSION_STRING "0.18.2" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 18 -#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 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/generators/mobipocket/libokularGenerator_mobi.desktop new/okular-4.12.2/generators/mobipocket/libokularGenerator_mobi.desktop --- old/okular-4.12.1/generators/mobipocket/libokularGenerator_mobi.desktop 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/generators/mobipocket/libokularGenerator_mobi.desktop 2014-01-28 23:01:01.000000000 +0100 @@ -25,6 +25,7 @@ Name[it]=Documento Mobipocket Name[kk]=Mobipocket құжаты Name[lv]=Mobipocket dokuments +Name[nb]=Mobipocket-dokument Name[nds]=Mobipocket-Dokment Name[nl]=Mobipocket-document Name[nn]=Mobipocket-dokument @@ -72,6 +73,7 @@ Comment[it]=Backend Mobipocket per Okular Comment[kk]=Okular-дың Mobipocket тетігі Comment[lv]=Mobipocket Okular aizmugure +Comment[nb]=Mobipocket-motor for Okular Comment[nds]=Mobipocket-Hülppropgramm för Okular Comment[nl]=Mobipocket-backend voor Okular Comment[nn]=Mobipocket-motor for Okular diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/generators/mobipocket/okularApplication_mobi.desktop new/okular-4.12.2/generators/mobipocket/okularApplication_mobi.desktop --- old/okular-4.12.1/generators/mobipocket/okularApplication_mobi.desktop 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/generators/mobipocket/okularApplication_mobi.desktop 2014-01-28 23:01:01.000000000 +0100 @@ -148,6 +148,7 @@ X-KDE-Keywords[is]=mobipocket X-KDE-Keywords[it]=mobipocket X-KDE-Keywords[kk]=mobipocket +X-KDE-Keywords[nb]=mobipocket X-KDE-Keywords[nl]=mobipocket X-KDE-Keywords[pa]=ਮੋਬੀਪਾਕਟ X-KDE-Keywords[pt]=mobipocket diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/generators/poppler/generator_pdf.cpp new/okular-4.12.2/generators/poppler/generator_pdf.cpp --- old/okular-4.12.1/generators/poppler/generator_pdf.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/generators/poppler/generator_pdf.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -1116,6 +1116,13 @@ int width = printer.width(); int height = printer.height(); #endif + + if (width <= 0 || height <= 0) + { + lastPrintError = InvalidPageSizePrintError; + return false; + } + // Create the tempfile to send to FilePrinter, which will manage the deletion KTemporaryFile tf; tf.setSuffix( ".ps" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/part.cpp new/okular-4.12.2/part.cpp --- old/okular-4.12.1/part.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/part.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -2057,7 +2057,7 @@ /* Don't show it if there are no local annotations */ if ( containsLocalAnnotations ) { - int res = KMessageBox::warningContinueCancel( widget(), "Your annotations will not be exported.\nYou can export the annotated document using File -> Export As -> Document Archive" ); + int res = KMessageBox::warningContinueCancel( widget(), i18n("Your annotations will not be exported.\nYou can export the annotated document using File -> Export As -> Document Archive") ); if ( res != KMessageBox::Continue ) return; // Canceled } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/ui/minibar.cpp new/okular-4.12.2/ui/minibar.cpp --- old/okular-4.12.1/ui/minibar.cpp 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/ui/minibar.cpp 2014-01-28 23:01:01.000000000 +0100 @@ -27,6 +27,7 @@ #include <klineedit.h> #include <klocale.h> #include <kacceleratormanager.h> +#include <qtoolbar.h> // local includes #include "core/document.h" @@ -153,6 +154,7 @@ MiniBar::MiniBar( QWidget * parent, MiniBarLogic * miniBarLogic ) : QWidget( parent ) , m_miniBarLogic( miniBarLogic ) + , m_oldToobarParent( 0 ) { setObjectName( QLatin1String( "miniBar" ) ); @@ -219,6 +221,27 @@ m_miniBarLogic->removeMiniBar( this ); } +void MiniBar::changeEvent( QEvent * event ) +{ + if ( event->type() == QEvent::ParentChange ) + { + QToolBar *tb = dynamic_cast<QToolBar*>( parent() ); + if ( tb != m_oldToobarParent ) + { + if ( m_oldToobarParent ) + { + disconnect( m_oldToobarParent, SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged())); + } + m_oldToobarParent = tb; + if ( tb ) + { + connect( tb, SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged())); + slotToolBarIconSizeChanged(); + } + } + } +} + bool MiniBar::eventFilter( QObject *target, QEvent *event ) { if ( target == m_pageNumberEdit || target == m_pageLabelEdit ) @@ -271,6 +294,13 @@ prevPage(); } +void MiniBar::slotToolBarIconSizeChanged() +{ + const QSize buttonSize = m_oldToobarParent->iconSize(); + m_prevButton->setIconSize( buttonSize ); + m_nextButton->setIconSize( buttonSize ); +} + void MiniBar::resizeForPage( int pages ) { int numberWidth = 10 + fontMetrics().width( QString::number( pages ) ); @@ -566,3 +596,4 @@ #include "minibar.moc" +/* kate: replace-tabs on; indent-width 4; */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.12.1/ui/minibar.h new/okular-4.12.2/ui/minibar.h --- old/okular-4.12.1/ui/minibar.h 2014-01-09 00:27:35.000000000 +0100 +++ new/okular-4.12.2/ui/minibar.h 2014-01-28 23:01:01.000000000 +0100 @@ -24,6 +24,7 @@ class HoverButton; class QIntValidator; class QLabel; +class QToolBar; // [private widget] lineEdit for entering/validating page numbers class PagesEdit : public KLineEdit @@ -113,6 +114,8 @@ MiniBar( QWidget *parent, MiniBarLogic * miniBarLogic ); ~MiniBar(); + void changeEvent( QEvent * event ) ; + signals: void gotoPage(); void prevPage(); @@ -124,6 +127,7 @@ void slotChangePage(int page); void slotEmitNextPage(); void slotEmitPrevPage(); + void slotToolBarIconSizeChanged(); private: void resizeForPage( int pages ); @@ -136,6 +140,7 @@ HoverButton * m_prevButton; HoverButton * m_pagesButton; HoverButton * m_nextButton; + QToolBar * m_oldToobarParent; }; /** -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
