From 2ed87e32af1e3f06cd490bbef548f6e231c71f94 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 2 Sep 2004 18:11:19 +0000 Subject: [PATCH] Commiting the patch for bug 82877 Sorry for not having seen it in bugs.kde.org Thanks Antti Backporting in a moment CCMAIL:82887-done@bugs.kde.org svn path=/trunk/kdegraphics/kpdf/; revision=343566 --- kpdf/kpdf_part.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/kpdf/kpdf_part.cpp b/kpdf/kpdf_part.cpp index 76d3330da..0cb562b5f 100644 --- a/kpdf/kpdf_part.cpp +++ b/kpdf/kpdf_part.cpp @@ -13,6 +13,7 @@ * Copyright (C) 2004 by Henrique Pinto * * Copyright (C) 2004 by Waldo Bastian * * Copyright (C) 2004 by Albert Astals Cid * + * Copyright (C) 2004 by Antti Markus * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -151,11 +152,16 @@ Part::Part(QWidget *parentWidget, const char *widgetName, m_zoomTo->clear(); QStringList translated; + QString localValue; + QString double_oh("00"); int idx = 0; int cur = 0; for ( int i = 0; i < 10;i++) { - translated << QString( "%1%" ).arg( zoomValue[i] * 100.0 ); + localValue = KGlobal::locale()->formatNumber( zoomValue[i] * 100.0, 2 ); + localValue.remove( KGlobal::locale()->decimalSymbol()+double_oh ); + + translated << QString( "%1%" ).arg( localValue ); if ( zoomValue[i] == 1.0 ) idx = cur; ++cur; @@ -191,9 +197,14 @@ void Part::slotZoom( const QString&nz ) QString z = nz; double zoom; z.remove( z.find( '%' ), 1 ); - zoom = KGlobal::locale()->readNumber( z ) / 100; - kdDebug() << "ZOOM = " << nz << ", setting zoom = " << zoom << endl; - m_outputDev->zoomTo( zoom ); + bool isNumber = true; + zoom = KGlobal::locale()->readNumber( z, &isNumber ) / 100; + + if ( isNumber ) + { + kdDebug() << "ZOOM = " << nz << ", setting zoom = " << zoom << endl; + m_outputDev->zoomTo( zoom ); + } } void Part::slotGoToPage()