Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2014-09-18 07:58:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-25 10:59:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2014-09-18 07:59:22.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 13 16:34:39 UTC 2014 - [email protected] + +- Update to 4.14.1 + * KDE 4.14.1 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.1.php + +------------------------------------------------------------------- @@ -6 +13 @@ - * See http://www.kde.org/announcements/4.13/ + * See http://www.kde.org/announcements/4.14/ Old: ---- okular-4.14.0.tar.xz New: ---- okular-4.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.Ys3h0c/_old 2014-09-18 07:59:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Ys3h0c/_new 2014-09-18 07:59:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: okular -Version: 4.14.0 +Version: 4.14.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ ++++++ okular-4.14.0.tar.xz -> okular-4.14.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.0/generators/fictionbook/CMakeLists.txt new/okular-4.14.1/generators/fictionbook/CMakeLists.txt --- old/okular-4.14.0/generators/fictionbook/CMakeLists.txt 2014-08-13 23:51:48.000000000 +0200 +++ new/okular-4.14.1/generators/fictionbook/CMakeLists.txt 2014-08-24 22:38:33.000000000 +0200 @@ -24,3 +24,5 @@ install( FILES libokularGenerator_fb.desktop okularFb.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( PROGRAMS okularApplication_fb.desktop active-documentviewer_fb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + +kde4_install_icons(${DATA_INSTALL_DIR}/okular/icons) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.0/generators/fictionbook/generator_fb.cpp new/okular-4.14.1/generators/fictionbook/generator_fb.cpp --- old/okular-4.14.0/generators/fictionbook/generator_fb.cpp 2014-08-13 23:51:48.000000000 +0200 +++ new/okular-4.14.1/generators/fictionbook/generator_fb.cpp 2014-08-24 22:38:33.000000000 +0200 @@ -42,5 +42,5 @@ { Okular::TextDocumentSettingsWidget *widget = new Okular::TextDocumentSettingsWidget(); - dlg->addPage( widget, generalSettings(), i18n("FictionBook"), "application-x-fictionbook+xml", i18n("FictionBook Backend Configuration") ); + dlg->addPage( widget, generalSettings(), i18n("FictionBook"), "okular-fb2", i18n("FictionBook Backend Configuration") ); } Files old/okular-4.14.0/generators/fictionbook/hi16-app-okular-fb2.png and new/okular-4.14.1/generators/fictionbook/hi16-app-okular-fb2.png differ Files old/okular-4.14.0/generators/fictionbook/hi32-app-okular-fb2.png and new/okular-4.14.1/generators/fictionbook/hi32-app-okular-fb2.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.0/generators/fictionbook/hi32-app-okular-fb2.svg new/okular-4.14.1/generators/fictionbook/hi32-app-okular-fb2.svg --- old/okular-4.14.0/generators/fictionbook/hi32-app-okular-fb2.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/okular-4.14.1/generators/fictionbook/hi32-app-okular-fb2.svg 2014-08-24 22:38:33.000000000 +0200 @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + id="svg4171" + version="1.1" + inkscape:version="0.48+devel r13309" + width="32" + height="32" + viewBox="0 0 32 32" + sodipodi:docname="hi32-app-okular-fb2.svg" + inkscape:export-filename="/home/yurchor/Install/Ukrainization/kde4doc/kdegraphics/okular/generators/fictionbook/test.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata4177"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs4175"> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter4229" + x="-0.093600001" + width="1.1872" + y="-0.022285714" + height="1.0445714"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.195" + id="feGaussianBlur4231" /> + </filter> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter4461" + x="-0.135" + width="1.27" + y="-0.020769231" + height="1.0415385"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.1125" + id="feGaussianBlur4463" /> + </filter> + <mask + maskUnits="userSpaceOnUse" + id="mask4479"> + <path + inkscape:connector-curvature="0" + id="path4481" + d="m 10.009212,23.901584 0,-12.909277 1.879574,0 0,12.909277 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </mask> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter4495" + x="-0.065250003" + width="1.1305" + y="-0.024857142" + height="1.0497143"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.2175" + id="feGaussianBlur4497" /> + </filter> + <filter + inkscape:collect="always" + style="color-interpolation-filters:sRGB" + id="filter4533" + x="-0.041373824" + width="1.0827476" + y="-0.03186166" + height="1.0637233"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.11070099" + id="feGaussianBlur4535" /> + </filter> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1060" + id="namedview4173" + showgrid="true" + inkscape:zoom="21.140625" + inkscape:cx="2.4646776" + inkscape:cy="10.647411" + inkscape:window-x="-2" + inkscape:window-y="-3" + inkscape:window-maximized="1" + inkscape:current-layer="svg4171"> + <inkscape:grid + type="xygrid" + id="grid4181" /> + </sodipodi:namedview> + <path + style="fill:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + d="m 0,30 0,-28 25,0 0,5 -9,9 9,9 0,5 z" + id="path4451" + inkscape:connector-curvature="0" /> + <path + style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4495)" + d="m 7.4712644,26.572414 0,-21.0000002 2.9999996,0 0,4 4,0 c 0,0 -1,0 0,0 1,0 1,1.0000002 1,1.0000002 l 0,15 c 0,0 0,-1 0,0 0,1 -1,1 -1,1 z" + id="path4193-4" + inkscape:connector-curvature="0" /> + <path + style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + d="m 7,26 0,-21 3,0 0,4 4,0 c 0,0 -1,0 0,0 1,0 1,1 1,1 l 0,15 c 0,0 0,-1 0,0 0,1 -1,1 -1,1 z" + id="path4193" + inkscape:connector-curvature="0" /> + <rect + style="opacity:1;fill:#ff9900;fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect4185" + width="11" + height="11" + x="23.475122" + y="-11.911101" + transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.5px;line-height:125%;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="1.6183908" + y="5.4068966" + id="text4187" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4189" + x="1.6183908" + y="5.4068966" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Microsoft Sans Serif;-inkscape-font-specification:Microsoft Sans Serif" /></text> + <path + style="fill:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4229)" + d="m 2.5827586,26.372414 0,-15 -1,0 0,-2.0000002 1,0 0,-3 c 0,0 0,1 0,0 0,-1 1,-1 1,-1 l 3,0 0,2 -1,0 0,2 1,0 0,2.0000002 -1,0 0,15 z" + id="path4191-1" + inkscape:connector-curvature="0" /> + <path + style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + d="M 2,26 2,11 1,11 1,9 2,9 2,6 C 2,6 2,7 2,6 2,5 3,5 3,5 l 3,0 0,2 -1,0 0,2 1,0 0,2 -1,0 0,15 z" + id="path4191" + inkscape:connector-curvature="0" /> + <path + style="fill:#7f7f7f;fill-opacity:1;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:0.51683007;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4461);stroke-miterlimit:4;stroke-dasharray:none" + d="m 10.30115,24.248277 0,-13 2,0 0,13 z" + id="path4195-1" + inkscape:connector-curvature="0" + inkscape:transform-center-x="0.66534982" + inkscape:transform-center-y="-0.48152163" + mask="url(#mask4479)" + transform="matrix(1.064071,0,0,1.0070277,-0.65051241,-0.06955745)" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:22.5px;line-height:125%;font-family:UkrainianSchoolBook;-inkscape-font-specification:UkrainianSchoolBook Bold;letter-spacing:0px;word-spacing:0px;fill:#3c3c3c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4533)" + x="21.146496" + y="20.33403" + id="text4233-4" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4235-1" + x="21.146496" + y="20.33403" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;font-family:Verdana;-inkscape-font-specification:Verdana Bold;fill:#3c3c3c;fill-opacity:1">2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:22.5px;line-height:125%;font-family:UkrainianSchoolBook;-inkscape-font-specification:UkrainianSchoolBook Bold;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="20.912128" + y="19.897528" + id="text4233" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4235" + x="20.912128" + y="19.897528" + style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.25px;font-family:Verdana;-inkscape-font-specification:Verdana Bold">2</tspan></text> +</svg> Files old/okular-4.14.0/generators/fictionbook/hi48-app-okular-fb2.png and new/okular-4.14.1/generators/fictionbook/hi48-app-okular-fb2.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.14.0/ui/pageview.cpp new/okular-4.14.1/ui/pageview.cpp --- old/okular-4.14.0/ui/pageview.cpp 2014-08-13 23:51:48.000000000 +0200 +++ new/okular-4.14.1/ui/pageview.cpp 2014-08-24 22:38:33.000000000 +0200 @@ -1205,10 +1205,6 @@ // enable setViewport calls d->blockViewport = false; - // update zoom text if in a ZoomFit/* zoom mode - if ( d->zoomMode != ZoomFixed ) - updateZoomText(); - if( viewport() ) { viewport()->update(); @@ -1343,6 +1339,10 @@ Q_FOREACH ( VideoWidget *videoWidget, item->videoWidgets() ) videoWidget->pageEntered(); } + + // update zoom text and factor if in a ZoomFit/* zoom mode + if ( d->zoomMode != ZoomFixed ) + updateZoomText(); } } @@ -3384,7 +3384,8 @@ height = ( height / width ) * colWidth; zoom = (double)colWidth / width; item->setWHZC( colWidth, (int)height, zoom, crop ); - d->zoomFactor = zoom; + if ((uint)item->pageNumber() == d->document->currentPage()) + d->zoomFactor = zoom; } else if ( d->zoomMode == ZoomFitPage ) { @@ -3392,7 +3393,8 @@ const double scaleH = (double)rowHeight / (double)height; zoom = qMin( scaleW, scaleH ); item->setWHZC( (int)(zoom * width), (int)(zoom * height), zoom, crop ); - d->zoomFactor = zoom; + if ((uint)item->pageNumber() == d->document->currentPage()) + d->zoomFactor = zoom; } else if ( d->zoomMode == ZoomFitAuto ) { @@ -3420,7 +3422,8 @@ zoom = qMin( scaleW, scaleH ); } item->setWHZC( (int)(zoom * width), (int)(zoom * height), zoom, crop ); - d->zoomFactor = zoom; + if ((uint)item->pageNumber() == d->document->currentPage()) + d->zoomFactor = zoom; } #ifndef NDEBUG else @@ -3663,10 +3666,14 @@ QVector<float>::iterator i; if ( newZoomMode == ZoomOut ) { + if (newFactor <= zoomValue.first()) + return; i = qLowerBound(zoomValue.begin(), zoomValue.end(), newFactor) - 1; } else { + if (newFactor >= zoomValue.last()) + return; i = qUpperBound(zoomValue.begin(), zoomValue.end(), newFactor); } const float tmpFactor = *i; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
