Hello community, here is the log from the commit of package gwenview checked in at Wed Oct 3 00:56:42 CEST 2007. -------- --- KDE/gwenview/gwenview.changes 2007-06-04 10:37:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwenview/gwenview.changes 2007-09-26 16:52:08.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 26 16:51:20 CEST 2007 - stbinner@suse.de + +- update to version 1.4.2, new features besides several bugfixes: + * Settings in the dialog to edit the thumbnail view details are + now directly applied, no need to click "Apply" anymore. + * OSD can now display more image information: aperture, focal + length, iso and exposure time. Patch by Carles Pina i Estany. + +------------------------------------------------------------------- Old: ---- gwenview-1.4.1.tar.bz2 gwenview-i18n-1.4.1.tar.bz2 imagescaling-overflow.diff rpm-opt-flags.diff New: ---- gwenview-1.4.2.tar.bz2 gwenview-i18n-1.4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview.spec ++++++ --- /var/tmp/diff_new_pack.HK8278/_old 2007-10-03 00:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.HK8278/_new 2007-10-03 00:56:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gwenview (Version 1.4.1) +# spec file for package gwenview (Version 1.4.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,20 +12,18 @@ Name: gwenview BuildRequires: kdelibs3-devel libexiv2-devel libkipi-devel -URL: http://gwenview.sourceforge.net/home/ -License: GNU General Public License (GPL) +Url: http://gwenview.sourceforge.net/home/ +License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: Simple Image Viewer for KDE -Version: 1.4.1 -Release: 49 +Version: 1.4.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 Source1: %name-i18n-%version.tar.bz2 #Patch: 1_3_BRANCH.diff Patch1: gwenview-media.diff Patch2: no-icontextright.diff -Patch3: rpm-opt-flags.diff -Patch4: imagescaling-overflow.diff %if %suse_version > 1000 Recommends: kipi-plugins %endif @@ -49,8 +47,6 @@ %setup -q -b 1 %patch1 -p1 %patch2 -%patch3 -%patch4 cd src #%patch cd .. @@ -116,8 +112,13 @@ %if %suse_version < 930 %doc %lang(pt_BR) /opt/kde3/share/doc/HTML/pt_BR %endif - %changelog +* Wed Sep 26 2007 - stbinner@suse.de +- update to version 1.4.2, new features besides several bugfixes: + * Settings in the dialog to edit the thumbnail view details are + now directly applied, no need to click "Apply" anymore. + * OSD can now display more image information: aperture, focal + length, iso and exposure time. Patch by Carles Pina i Estany. * Mon Jun 04 2007 - stbinner@suse.de - fix build on older distributions * Mon May 14 2007 - coolo@suse.de ++++++ gwenview-1.4.1.tar.bz2 -> gwenview-1.4.2.tar.bz2 ++++++ ++++ 30915 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/acinclude.m4 new/gwenview-1.4.2/acinclude.m4 --- old/gwenview-1.4.1/acinclude.m4 2006-11-26 12:03:12.000000000 +0100 +++ new/gwenview-1.4.2/acinclude.m4 2007-09-15 15:50:47.000000000 +0200 @@ -983,7 +983,7 @@ X_INCLUDES="-I$x_includes" fi -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then X_LDFLAGS="" x_libraries="/usr/lib"; dnl better than nothing :- else @@ -3198,7 +3198,7 @@ case $host in *-*-linux-gnu) CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; @@ -5215,9 +5215,10 @@ for dir in $javadirs; do dnl Check for the java executable if test -x "$dir/java"; then + sane_path=$(cd $dir; /bin/pwd) dnl And also check for a libjvm.so somewhere under there dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$dir" != "/usr/bin"; then + if test "$sane_path" != "/usr/bin"; then libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` if test ! -f $libjvmdir/libjvm.so; then continue; fi jredirs="$jredirs $dir" @@ -7395,7 +7396,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/admin/acinclude.m4.in new/gwenview-1.4.2/admin/acinclude.m4.in --- old/gwenview-1.4.1/admin/acinclude.m4.in 2006-11-26 11:59:20.000000000 +0100 +++ new/gwenview-1.4.2/admin/acinclude.m4.in 2007-09-15 15:46:03.000000000 +0200 @@ -983,7 +983,7 @@ X_INCLUDES="-I$x_includes" fi -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then X_LDFLAGS="" x_libraries="/usr/lib"; dnl better than nothing :- else @@ -3198,7 +3198,7 @@ case $host in *-*-linux-gnu) CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; @@ -5215,9 +5215,10 @@ for dir in $javadirs; do dnl Check for the java executable if test -x "$dir/java"; then + sane_path=$(cd $dir; /bin/pwd) dnl And also check for a libjvm.so somewhere under there dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$dir" != "/usr/bin"; then + if test "$sane_path" != "/usr/bin"; then libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` if test ! -f $libjvmdir/libjvm.so; then continue; fi jredirs="$jredirs $dir" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/admin/cvs.sh new/gwenview-1.4.2/admin/cvs.sh --- old/gwenview-1.4.1/admin/cvs.sh 2006-11-26 11:59:20.000000000 +0100 +++ new/gwenview-1.4.2/admin/cvs.sh 2007-09-15 15:46:03.000000000 +0200 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION=""3.5.5"" + VERSION=""3.5.7"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/admin/detect-autoconf.pl new/gwenview-1.4.2/admin/detect-autoconf.pl --- old/gwenview-1.4.1/admin/detect-autoconf.pl 2006-11-26 11:59:20.000000000 +0100 +++ new/gwenview-1.4.2/admin/detect-autoconf.pl 2007-09-15 15:46:03.000000000 +0200 @@ -46,6 +46,8 @@ ($version) = $file =~ /$prefix/$program-?(.*)$/; $version =~ s/-|.//g; + # Don't check the -wrapper ones + next if $version eq "wrapper"; # Special case some programs to make sure it has a minimum version. if (not $version and exists $minimumVersions{$program}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/admin/libtool.m4.in new/gwenview-1.4.2/admin/libtool.m4.in --- old/gwenview-1.4.1/admin/libtool.m4.in 2006-11-26 11:59:20.000000000 +0100 +++ new/gwenview-1.4.2/admin/libtool.m4.in 2007-09-15 15:46:03.000000000 +0200 @@ -1424,7 +1424,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/ChangeLog new/gwenview-1.4.2/ChangeLog --- old/gwenview-1.4.1/ChangeLog 2006-11-26 11:59:30.000000000 +0100 +++ new/gwenview-1.4.2/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -See CVS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/configure.in new/gwenview-1.4.2/configure.in --- old/gwenview-1.4.1/configure.in 2006-11-26 12:03:12.000000000 +0100 +++ new/gwenview-1.4.2/configure.in 2007-09-15 15:50:47.000000000 +0200 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(gwenview-1.4.1, "3.5.5") dnl searches for some needed programs +AM_INIT_AUTOMAKE(gwenview-1.4.2, "3.5.7") dnl searches for some needed programs KDE_SET_PREFIX diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/NEWS new/gwenview-1.4.2/NEWS --- old/gwenview-1.4.1/NEWS 2006-11-26 11:59:30.000000000 +0100 +++ new/gwenview-1.4.2/NEWS 2007-09-15 15:46:18.000000000 +0200 @@ -1,3 +1,22 @@ +2007.09.15 - v1.4.2 +- New features: + - Settings in the dialog to edit the thumbnail view details are now directly + applied, no need to click "Apply" anymore. + - OSD can now display more image information: aperture, focal length, iso and + exposure time. Patch by Carles Pina i Estany. +- Fixes: + - Bug 123516: After renaming, thumbnail panel is not updated + - Bug 138467: Crash in Exiv2 readMetadata when reading image saved in Photoshop + - Bug 131162: Autorotate images preference setting is forgotten + - Bug 132556: Gwenview asks to save the wrong file if the modified file is read-only + - Bug 111641: When several printing images in a row, "Keep Ratio" keeps ratio of first image + - Avoid crash when viewing extremely large images. + - Fix optimization compiler flags being disabled for scaling code. + - In fullscreen mode, make sure the cursor does not come back after moving to + the next image. Patch by Carles Pina i Estany. + - Bug 130511: In the KParts, make Gwenview translations the active one, to + avoid using KDELibs instead. + 2006.11.26 - v1.4.1 - New features: - Show preview of images when dragging them. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/app/configdialog.cpp new/gwenview-1.4.2/src/app/configdialog.cpp --- old/gwenview-1.4.1/src/app/configdialog.cpp 2006-11-26 11:59:24.000000000 +0100 +++ new/gwenview-1.4.2/src/app/configdialog.cpp 2007-09-15 15:46:08.000000000 +0200 @@ -261,6 +261,10 @@ formatter.mImageSize=QSize(1600, 1200); formatter.mPosition=4; formatter.mCount=12; + formatter.mAperture="F2.8"; + formatter.mExposureTime="1/60 s"; + formatter.mIso="100"; + formatter.mFocalLength="8.88 mm"; QString txt=formatter.format( d->mFullScreenPage->kcfg_osdFormat->text() ); d->mFullScreenPage->mOSDPreviewLabel->setText(txt); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/app/configfullscreenpage.ui new/gwenview-1.4.2/src/app/configfullscreenpage.ui --- old/gwenview-1.4.1/src/app/configfullscreenpage.ui 2006-11-26 11:59:24.000000000 +0100 +++ new/gwenview-1.4.2/src/app/configfullscreenpage.ui 2007-09-15 15:46:08.000000000 +0200 @@ -113,6 +113,10 @@ <li>%r: resolution</li> <li>%n: current image position</li> <li>%N: image count</li> +<li>%a: aperture</li> +<li>%t: exposure time</li> +<li>%i: iso</li> +<li>%l: focal length</li> </ul> </qt></string> </property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/app/main.cpp new/gwenview-1.4.2/src/app/main.cpp --- old/gwenview-1.4.1/src/app/main.cpp 2006-11-26 11:59:24.000000000 +0100 +++ new/gwenview-1.4.2/src/app/main.cpp 2007-09-15 15:46:08.000000000 +0200 @@ -43,7 +43,7 @@ KCmdLineLastOption }; -static const char version[] = "1.4.1"; +static const char version[] = "1.4.2"; void applyFilterArgs(KCmdLineArgs* args, FileViewController* controller) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/app/mainwindow.cpp new/gwenview-1.4.2/src/app/mainwindow.cpp --- old/gwenview-1.4.1/src/app/mainwindow.cpp 2006-11-26 11:59:24.000000000 +0100 +++ new/gwenview-1.4.2/src/app/mainwindow.cpp 2007-09-15 15:46:08.000000000 +0200 @@ -256,7 +256,12 @@ } } - +void MainWindow::slotRenamed(const QString& fileName) { + KURL url = mDocument->url(); + url.setFileName(fileName); + mDocument->setURL(url); +} + void MainWindow::slotDirURLChanged(const KURL& dirURL) { LOG(dirURL.prettyURL(0,KURL::StripFileProtocol)); @@ -297,6 +302,10 @@ formatter.mImageSize=mDocument->image().size(); formatter.mPosition=mFileViewController->shownFilePosition()+1; formatter.mCount=mFileViewController->fileCount(); + formatter.mAperture=mDocument->aperture(); + formatter.mExposureTime=mDocument->exposureTime(); + formatter.mIso=mDocument->iso(); + formatter.mFocalLength=mDocument->focalLength(); QString txt=formatter.format( FullScreenConfig::osdFormat() ); mFullScreenLabelAction->label()->setText(txt); @@ -350,7 +359,7 @@ } else { url = mDocument->url(); } - FileOperation::rename(url, this); + FileOperation::rename(url, this, this, SLOT(slotRenamed(const QString &))); } @@ -515,7 +524,10 @@ void MainWindow::slotImageLoaded() { - kapp->restoreOverrideCursor(); + // Reciproc of slotImageLoading + if (FullScreenConfig::showBusyPtr() || !mToggleFullScreen->isChecked()) { + kapp->restoreOverrideCursor(); + } updateStatusInfo(); updateImageActions(); updateLocationURL(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/app/mainwindow.h new/gwenview-1.4.2/src/app/mainwindow.h --- old/gwenview-1.4.1/src/app/mainwindow.h 2006-11-26 11:59:24.000000000 +0100 +++ new/gwenview-1.4.2/src/app/mainwindow.h 2007-09-15 15:46:08.000000000 +0200 @@ -148,6 +148,7 @@ void makeDir(); void goHome(); void renameFile(); + void slotRenamed(const QString&); void copyFiles(); void moveFiles(); void linkFiles(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/desktopfiles/gwenview.desktop new/gwenview-1.4.2/src/desktopfiles/gwenview.desktop --- old/gwenview-1.4.1/src/desktopfiles/gwenview.desktop 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/desktopfiles/gwenview.desktop 2007-09-15 15:46:13.000000000 +0200 @@ -17,9 +17,9 @@ GenericName[el]=Προβολέας εικόνων GenericName[es]=Visualizador de imágenes GenericName[et]=Pildinäitaja +GenericName[fa]=مشاهدهگر تصویر GenericName[fi]=Kuvankatseluohjelma GenericName[fr]=Afficheur d'images -GenericName[ga]=Amharcán Íomhánna GenericName[gl]=Visor de Imaxes GenericName[hi]=छवि प्रदर्शक GenericName[hr]=Preglednik slika @@ -30,6 +30,7 @@ GenericName[ka]=სურათების დამთვალიერებელი GenericName[lt]=Paveikslėlių žiūriklis GenericName[ms]=Pelihat Imej +GenericName[nds]=Bildkieker GenericName[nl]=Afbeeldingweergaveprogramma GenericName[pa]=ਚਿੱਤਰ ਦਰਸ਼ਕ GenericName[pl]=Przeglądarka obrazków @@ -45,6 +46,7 @@ GenericName[tg]=Намоишгари тасвир GenericName[tr]=Resim Gösterici GenericName[uk]=Переглядач зображень +GenericName[vi]=Bộ xem ảnh GenericName[xh]=Umboniseli Womfanekiso GenericName[xx]=xxImage Viewerxx GenericName[zh_CN]=图像查看器 @@ -61,9 +63,9 @@ Comment[el]=Ένας απλός προβολέας εικόνων Comment[es]=Visor de mensajes sencillo Comment[et]=Lihtne pildinäitaja +Comment[fa]=یک مشاهدهگر تصویر ساده Comment[fi]=Yksinkertainen kuvankatseluohjelma Comment[fr]=Un afficheur basique d'images -Comment[ga]=Amharcán simplí íomhánna Comment[gl]=Un visor de imaxes Comment[he]=מציג תמונות פשוט Comment[hi]=एक सरल चित्र प्रदर्शक @@ -74,6 +76,7 @@ Comment[ja]=シンプルな画像ビューア Comment[ka]=სურათების მარტივი დამთვალიერებელი Comment[ms]=Pelihat imej ringkas +Comment[nds]=En eenfach Bildkieker Comment[nl]=Een eenvoudig afbeeldingenweergaveprogramma Comment[pa]=ਇੱਕ ਸਧਾਰਨ ਚਿੱਤਰ ਦਰਸ਼ਕ Comment[pl]=Prosta przeglądarka obrazków @@ -89,6 +92,7 @@ Comment[tg]=Барномаи оддӣ барои намоиши тасвир Comment[tr]=Basit bir resim izleyici Comment[uk]=Простий переглядач зображень +Comment[vi]=Bộ xem ảnh đơn giản Comment[xh]=Umboniseli olula womfanekiso Comment[xx]=xxA simple image viewerxx Comment[zh_CN]=一个简单的图像查看器 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/desktopfiles/konqgwenview.desktop new/gwenview-1.4.2/src/desktopfiles/konqgwenview.desktop --- old/gwenview-1.4.1/src/desktopfiles/konqgwenview.desktop 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/desktopfiles/konqgwenview.desktop 2007-09-15 15:46:13.000000000 +0200 @@ -16,9 +16,9 @@ Name[el]=Εξερεύνηση με το Gwenview Name[es]=Navegación con Gwenview Name[et]=Lehitse kasutades Gwenview'd +Name[fa]=مرور با Gwenview Name[fi]=Katsele Gwenviewilla Name[fr]=Naviguer avec Gwenview -Name[ga]=Brabhsáil le Gwenview Name[gl]=Examinar con Gwenview Name[he]=עיין בעזרת Gwenview Name[hi]=ग्वेनव्यू के साथ ब्राउज़ करें @@ -29,6 +29,7 @@ Name[ja]=Gwenview で閲覧 Name[ka]=დათვალიერება Gwenview-ით Name[ms]= Lungsur dengan Gwenview +Name[nds]=Dateien mit Gwenview dörkieken Name[nl]=Bladeren met Gwenview Name[pa]=Gwenview ਨਾਲ ਵੇਖੋ Name[pl]=Przeglądaj za pomocą Gwenview @@ -44,6 +45,7 @@ Name[tg]=Ҷустан бо НамоишиGwen Name[tr]=Gwenview ile gözat Name[uk]=Перегляд у Gwenview +Name[vi]=Duyệt bằng Gwenview Name[xh]=Khangela nge Gwenview Name[xx]=xxBrowse with Gwenviewxx Name[zh_CN]=用 Gwenview 浏览 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/captionformatter.cpp new/gwenview-1.4.2/src/gvcore/captionformatter.cpp --- old/gwenview-1.4.1/src/gvcore/captionformatter.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/captionformatter.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -45,6 +45,11 @@ str.replace("%r", resolution); str.replace("%n", QString::number(mPosition)); str.replace("%N", QString::number(mCount)); + str.replace("%a", mAperture); + str.replace("%t", mExposureTime); + str.replace("%i", mIso); + str.replace("%l", mFocalLength); + return str; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/captionformatter.h new/gwenview-1.4.2/src/gvcore/captionformatter.h --- old/gwenview-1.4.1/src/gvcore/captionformatter.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/captionformatter.h 2007-09-15 15:46:13.000000000 +0200 @@ -41,6 +41,11 @@ QString mPath; QString mFileName; QString mComment; + QString mAperture; + QString mFocalLength; + QString mExposureTime; + QString mIso; + QSize mImageSize; int mPosition; int mCount; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/document.cpp new/gwenview-1.4.2/src/gvcore/document.cpp --- old/gwenview-1.4.1/src/gvcore/document.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/document.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -283,6 +283,22 @@ return d->mImpl->comment(); } +QString Document::aperture() const { + return d->mImpl->aperture(); +} + +QString Document::exposureTime() const { + return d->mImpl->exposureTime(); +} + +QString Document::iso() const { + return d->mImpl->iso(); +} + +QString Document::focalLength() const { + return d->mImpl->focalLength(); +} + void Document::setComment(const QString& comment) { d->mImpl->setComment(comment); d->mModified=true; @@ -388,13 +404,13 @@ int scaling = printer->option( "app-gwenview-scale" ).toInt(); QSize size = image.size(); - if (scaling==1 /* Fit to page */) { + if (scaling==GV_FITTOPAGE /* Fit to page */) { bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f; if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) { size.scale( pdWidth, pdHeight, QSize::ScaleMin ); } } else { - if (scaling==2 /* Scale To */) { + if (scaling==GV_SCALE /* Scale To */) { int unit = (printer->option("app-gwenview-scaleUnit").isEmpty() ? GV_INCHES : printer->option("app-gwenview-scaleUnit").toInt()); double inches = 1; @@ -410,11 +426,22 @@ size.setWidth( int(wImg * printer->resolution()) ); size.setHeight( int(hImg * printer->resolution()) ); } else { - /* No scaling */ - size = image.size(); + /* GV_NOSCALE: no scaling */ + // try to get the density info so that we can print using original size + // known if it is am image from scanner for instance + const float INCHESPERMETER = (100. / 2.54); + if (image.dotsPerMeterX()) + { + double wImg = double(size.width()) / double(image.dotsPerMeterX()) * INCHESPERMETER; + size.setWidth( int(wImg *printer->resolution()) ); + } + if (image.dotsPerMeterY()) + { + double hImg = double(size.height()) / double(image.dotsPerMeterY()) * INCHESPERMETER; + size.setHeight( int(hImg *printer->resolution()) ); + } } - - + if (size.width() > pdWidth || size.height() > pdHeight) { int resp = KMessageBox::warningYesNoCancel(dialogParentWidget(), i18n("The image will not fit on the page, what do you want to do?"), @@ -480,6 +507,8 @@ QString msg=saveInternal(url(), d->mImageFormat); if (!msg.isNull()) { KMessageBox::error(dialogParentWidget(), msg); + // If it can't be saved we leave it as modified, because user + // could choose to save it to another path with saveAs } } @@ -493,6 +522,8 @@ QString msg=saveInternal(saveURL, dialog.imageFormat() ); if (!msg.isNull()) { + // If it can't be saved we leave it as modified, because user + // could choose a wrong readonly path from dialog and retry to KMessageBox::error(dialogParentWidget(), msg); } } @@ -508,6 +539,10 @@ if (result == KMessageBox::Yes) { saveInternal(url(), d->mImageFormat); + // If it can't be saved it's useless to leave it as modified + // since user is closing this image and changing to another one + d->mModified=false; + //FIXME it should be nice to tell the user it failed } else { d->mModified=false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/document.h new/gwenview-1.4.2/src/gvcore/document.h --- old/gwenview-1.4.1/src/gvcore/document.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/document.h 2007-09-15 15:46:13.000000000 +0200 @@ -84,6 +84,10 @@ Document::CommentState commentState() const; QString comment() const; void setComment(const QString&); + QString aperture() const; + QString exposureTime() const; + QString iso() const; + QString focalLength() const; int duration() const; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/documentimpl.cpp new/gwenview-1.4.2/src/gvcore/documentimpl.cpp --- old/gwenview-1.4.1/src/gvcore/documentimpl.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/documentimpl.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -57,6 +57,22 @@ mDocument->setFileSize(size); } +QString DocumentImpl::aperture() const { + return QString::null; +} + +QString DocumentImpl::exposureTime() const { + return QString::null; +} + +QString DocumentImpl::iso() const { + return QString::null; +} + +QString DocumentImpl::focalLength() const { + return QString::null; +} + QString DocumentImpl::comment() const { return QString::null; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/documentimpl.h new/gwenview-1.4.2/src/gvcore/documentimpl.h --- old/gwenview-1.4.1/src/gvcore/documentimpl.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/documentimpl.h 2007-09-15 15:46:13.000000000 +0200 @@ -52,7 +52,12 @@ * Convenience method to emit rectUpdated with the whole image rect */ void emitImageRectUpdated(); - + + virtual QString aperture() const; + virtual QString exposureTime() const; + virtual QString iso() const; + virtual QString focalLength() const; + virtual QString comment() const; virtual Document::CommentState commentState() const; virtual void setComment(const QString&); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/documentjpegloadedimpl.cpp new/gwenview-1.4.2/src/gvcore/documentjpegloadedimpl.cpp --- old/gwenview-1.4.1/src/gvcore/documentjpegloadedimpl.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/documentjpegloadedimpl.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -119,6 +119,22 @@ d->mJPEGContent.setComment(comment); } +QString DocumentJPEGLoadedImpl::aperture() const { + return d->mJPEGContent.aperture(); +} + +QString DocumentJPEGLoadedImpl::exposureTime() const { + return d->mJPEGContent.exposureTime(); +} + +QString DocumentJPEGLoadedImpl::iso() const { + return d->mJPEGContent.iso(); +} + +QString DocumentJPEGLoadedImpl::focalLength() const { + return d->mJPEGContent.focalLength(); +} + Document::CommentState DocumentJPEGLoadedImpl::commentState() const { return Document::WRITABLE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/documentjpegloadedimpl.h new/gwenview-1.4.2/src/gvcore/documentjpegloadedimpl.h --- old/gwenview-1.4.1/src/gvcore/documentjpegloadedimpl.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/documentjpegloadedimpl.h 2007-09-15 15:46:13.000000000 +0200 @@ -42,7 +42,12 @@ QString comment() const; void setComment(const QString&); Document::CommentState commentState() const; - + + QString aperture() const; + QString exposureTime() const; + QString iso() const; + QString focalLength() const; + void transform(ImageUtils::Orientation); protected: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/filethumbnailview.cpp new/gwenview-1.4.2/src/gvcore/filethumbnailview.cpp --- old/gwenview-1.4.1/src/gvcore/filethumbnailview.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/filethumbnailview.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -135,6 +135,7 @@ int mItemDetails; ImageLoader* mPrefetch; + ThumbnailDetailsDialog* mThumbnailsDetailDialog; void updateWaitThumbnail(const FileThumbnailView* view) { mWaitThumbnail=QPixmap(mThumbnailSize, mThumbnailSize); @@ -171,6 +172,7 @@ d->mItemDetails=FileViewConfig::thumbnailDetails(); d->mPrefetch = NULL; d->mThumbnailSize = 0; + d->mThumbnailsDetailDialog = 0; setItemTextPos( QIconView::ItemTextPos(FileViewConfig::thumbnailTextPos()) ); setAutoArrange(true); @@ -854,8 +856,10 @@ void FileThumbnailView::showThumbnailDetailsDialog() { - ThumbnailDetailsDialog dlg(this); - dlg.exec(); + if (!d->mThumbnailsDetailDialog) { + d->mThumbnailsDetailDialog = new ThumbnailDetailsDialog(this); + } + d->mThumbnailsDetailDialog->show(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/imageloader.cpp new/gwenview-1.4.2/src/gvcore/imageloader.cpp --- old/gwenview-1.4.1/src/gvcore/imageloader.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/imageloader.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -29,10 +29,12 @@ // KDE #include <kapplication.h> +#include <kimageio.h> #include <kmimetype.h> // Local #include "cache.h" +#include "miscconfig.h" #include "imageutils/imageutils.h" #include "imageutils/jpegcontent.h" @@ -436,6 +438,16 @@ } } +// There is no way in KImageIO to get the mimeType from the image format. +// This function assumes KImageIO::types and KImageIO::mimeTypes return items +// in the same order (which they do, according to the source code). +static QString mimeTypeFromFormat(const char* format) { + QStringList formats = KImageIO::types(KImageIO::Reading); + QStringList mimeTypes = KImageIO::mimeTypes(KImageIO::Reading); + int pos = formats.findIndex(QString::fromAscii(format)); + Q_ASSERT(pos != -1); + return mimeTypes[pos]; +} void ImageLoader::slotDataReceived(KIO::Job* job, const QByteArray& chunk) { LOG2("size: " << chunk.size()); @@ -447,9 +459,18 @@ if (oldSize==0) { // Try to determine the data type - KMimeType::Ptr ptr = KMimeType::findByContent(d->mRawData); - d->mMimeType = ptr->name(); - d->mURLKind = MimeTypeUtils::mimeTypeKind(d->mMimeType); + QBuffer buffer(d->mRawData); + buffer.open(IO_ReadOnly); + const char* format = QImageIO::imageFormat(&buffer); + if (format) { + // This is a raster image, get the mime type now + d->mURLKind = MimeTypeUtils::KIND_RASTER_IMAGE; + d->mMimeType = mimeTypeFromFormat(format); + } else { + KMimeType::Ptr ptr = KMimeType::findByContent(d->mRawData); + d->mMimeType = ptr->name(); + d->mURLKind = MimeTypeUtils::mimeTypeKind(d->mMimeType); + } if (d->mURLKind!=MimeTypeUtils::KIND_RASTER_IMAGE) { Q_ASSERT(!d->mDecoderTimer.isActive()); job->kill(true /* quietly */); @@ -662,15 +683,18 @@ Q_ASSERT(!d->mImageFormat.isEmpty()); if (d->mImageFormat == "JPEG") { // This is a JPEG, extract orientation and adjust mProcessedImage - // if necessary + // if necessary according to misc options ImageUtils::JPEGContent content; if (content.loadFromData(d->mRawData)) { - d->mOrientation = content.orientation(); - if (d->mOrientation != ImageUtils::NOT_AVAILABLE && d->mOrientation != ImageUtils::NORMAL) { + d->mOrientation = content.orientation(); + if (MiscConfig::autoRotateImages() && + d->mOrientation != ImageUtils::NOT_AVAILABLE && d->mOrientation != ImageUtils::NORMAL) { QSize size = content.size(); d->mProcessedImage = QImage(size, d->mDecoder.image().depth()); } + d->mProcessedImage.setDotsPerMeterX(content.dotsPerMeterX()); + d->mProcessedImage.setDotsPerMeterY(content.dotsPerMeterY()); } else { kdWarning() << "ImageLoader::changed(): JPEGContent could not load '" << d->mURL.prettyURL() << "'\n"; } @@ -680,8 +704,9 @@ emit sizeLoaded(d->mProcessedImage.width(), d->mProcessedImage.height()); } - // Apply orientation if necessary - if (d->mOrientation != ImageUtils::NOT_AVAILABLE && d->mOrientation != ImageUtils::NORMAL) { + // Apply orientation if necessary and if wanted by user settings (misc options) + if (MiscConfig::autoRotateImages() && + d->mOrientation != ImageUtils::NOT_AVAILABLE && d->mOrientation != ImageUtils::NORMAL) { // We can only rotate whole images, so copy the loaded rect in a temp // image, rotate the temp image and copy it to mProcessedImage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/imageviewcontroller.cpp new/gwenview-1.4.2/src/gvcore/imageviewcontroller.cpp --- old/gwenview-1.4.1/src/gvcore/imageviewcontroller.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/imageviewcontroller.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -98,7 +98,9 @@ ImageView* mImageView; KActionPtrList mImageViewActions; + // Hide cursor stuff QTimer* mAutoHideTimer; + bool mCursorHidden; KParts::ReadOnlyPart* mPlayerPart; @@ -269,6 +271,7 @@ d->mDocument=document; d->mActionCollection=actionCollection; d->mAutoHideTimer=new QTimer(this); + d->mCursorHidden=false; d->mContainer=new QWidget(parent); d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size @@ -349,6 +352,7 @@ } else { d->mAutoHideTimer->stop(); QApplication::restoreOverrideCursor(); + d->mCursorHidden=false; } d->mToolBar->setHidden(d->mFullScreen); @@ -394,6 +398,7 @@ QWidget* widget = KApplication::kApplication()->activeWindow(); if (!widget || !widget->inherits("QDialog")) { QApplication::setOverrideCursor(blankCursor); + d->mCursorHidden=true; } } @@ -429,8 +434,18 @@ if (!isAChildOfStack) return false; d->updateFullScreenBarPosition(); - QApplication::restoreOverrideCursor(); - d->restartAutoHideTimer(); + + if (event->type()==QEvent::MouseMove) { + d->mCursorHidden=false; + d->restartAutoHideTimer(); + } + + if (d->mCursorHidden) { + QApplication::setOverrideCursor(blankCursor,true); + } else { + QApplication::restoreOverrideCursor(); + } + return false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/jpegformattype.cpp new/gwenview-1.4.2/src/gvcore/jpegformattype.cpp --- old/gwenview-1.4.1/src/gvcore/jpegformattype.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/jpegformattype.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -453,6 +453,29 @@ if(consumer) consumer->end(); + // get the density X and Y info and the related units to have + // the aspect ratio of the image + // field: units -- one byte: Units for the X and Y densities + // 0 => no units, X and Y specify the pixel aspect ratio + // 1 => X and Y are dots per inch + // 2 => X and Y are dots per cm + // Xdensity -- two bytes + // Ydensity -- two bytes + const float INCHESPERMETER = (100. / 2.54); + switch (mDecompress.density_unit) + { + case 0: // no units + break; + case 1: // dots per inch + image.setDotsPerMeterX(int(mDecompress.X_density * INCHESPERMETER)); + image.setDotsPerMeterY(int(mDecompress.Y_density * INCHESPERMETER)); + break; + case 2: // dots per cm + image.setDotsPerMeterX(mDecompress.X_density * 100); + image.setDotsPerMeterY(mDecompress.Y_density * 100); + break; + } + mSourceManager.at_eof = true; (void) jpeg_finish_decompress(&mDecompress); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/Makefile.am new/gwenview-1.4.2/src/gvcore/Makefile.am --- old/gwenview-1.4.1/src/gvcore/Makefile.am 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/Makefile.am 2007-09-15 15:46:13.000000000 +0200 @@ -6,7 +6,7 @@ libgwenviewcore_la_LIBADD = \ $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \ - $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) \ + $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\ -lkmediaplayer ../imageutils/libgvimageutils.la \ ../tsthread/libtsthread.la diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/printdialog.cpp new/gwenview-1.4.2/src/gvcore/printdialog.cpp --- old/gwenview-1.4.1/src/gvcore/printdialog.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/printdialog.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -37,6 +37,7 @@ #include "document.h" #include "printdialogpagebase.h" #include "printdialog.moc" + namespace Gwenview { @@ -99,9 +100,9 @@ opts["app-gwenview-printFilename"] = mContent->mAddFileName->isChecked() ? STR_TRUE : STR_FALSE; opts["app-gwenview-printComment"] = mContent->mAddComment->isChecked() ? STR_TRUE : STR_FALSE; opts["app-gwenview-scale"] = QString::number( - mContent->mNoScale->isChecked() ? 0 - : mContent->mFitToPage->isChecked() ? 1 - : 2); + mContent->mNoScale->isChecked() ? GV_NOSCALE + : mContent->mFitToPage->isChecked() ? GV_FITTOPAGE + : GV_SCALE); opts["app-gwenview-fitToPage"] = mContent->mFitToPage->isChecked() ? STR_TRUE : STR_FALSE; opts["app-gwenview-enlargeToFit"] = mContent->mEnlargeToFit->isChecked() ? STR_TRUE : STR_FALSE; @@ -125,13 +126,14 @@ mContent->mAddFileName->setChecked( opts["app-gwenview-printFilename"] == STR_TRUE ); mContent->mAddComment->setChecked( opts["app-gwenview-printComment"] == STR_TRUE ); - - val = opts["app-gwenview-scale"].toInt( &ok ); - if (ok) { - mContent->mScaleGroup->setButton( val ); - } else { - mContent->mScaleGroup->setButton( 0 ); - } + // Starts from id 1 because 0 is returned if not ok, and seems to have a weird + // problem with id 2 (last id) otherwise :( + ScaleId scaleButtonId = static_cast<ScaleId>( opts["app-gwenview-scale"].toInt( &ok ) ); + if (ok) { + mContent->mScaleGroup->setButton( scaleButtonId ); + } else { + mContent->mScaleGroup->setButton( GV_NOSCALE ); + } mContent->mEnlargeToFit->setChecked( opts["app-gwenview-enlargeToFit"] == STR_TRUE ); Unit unit = static_cast<Unit>( opts["app-gwenview-scaleUnit"].toInt( &ok ) ); @@ -250,12 +252,17 @@ void PrintDialogPage::toggleRatio(bool enable) { if (!enable) return; + // choosing a startup value of 15x10 cm (common photo dimention) + // mContent->mHeight->value() or mContent->mWidth->value() + // are usually empty at startup and hxw (0x0) isn't good IMO keeping ratio double hValue, wValue; if (mDocument->height() > mDocument->width()) { hValue = mContent->mHeight->value(); + if (!hValue) hValue = 150*unitToMM(mPreviousUnit); wValue = (mDocument->width() * hValue)/ mDocument->height(); } else { wValue = mContent->mWidth->value(); + if (!wValue) wValue = 150*unitToMM(mPreviousUnit); hValue = (mDocument->height() * wValue)/ mDocument->width(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/printdialog.h new/gwenview-1.4.2/src/gvcore/printdialog.h --- old/gwenview-1.4.1/src/gvcore/printdialog.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/printdialog.h 2007-09-15 15:46:13.000000000 +0200 @@ -40,6 +40,12 @@ GV_INCHES }; +enum ScaleId { + GV_NOSCALE=1, + GV_FITTOPAGE, + GV_SCALE +}; + class LIBGWENVIEW_EXPORT PrintDialogPage : public KPrintDialogPage { Q_OBJECT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/printdialogpagebase.ui new/gwenview-1.4.2/src/gvcore/printdialogpagebase.ui --- old/gwenview-1.4.1/src/gvcore/printdialogpagebase.ui 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/printdialogpagebase.ui 2007-09-15 15:46:13.000000000 +0200 @@ -151,7 +151,7 @@ <bool>true</bool> </property> <property name="buttonGroupId"> - <number>0</number> + <number>1</number> </property> </widget> <widget class="QRadioButton"> @@ -165,7 +165,7 @@ <bool>false</bool> </property> <property name="buttonGroupId"> - <number>1</number> + <number>2</number> </property> </widget> <widget class="QLayoutWidget"> @@ -231,7 +231,7 @@ <string>&Scale to:</string> </property> <property name="buttonGroupId"> - <number>2</number> + <number>3</number> </property> </widget> <widget class="QLayoutWidget"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/thumbnaildetailsdialog.cpp new/gwenview-1.4.2/src/gvcore/thumbnaildetailsdialog.cpp --- old/gwenview-1.4.1/src/gvcore/thumbnaildetailsdialog.cpp 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/thumbnaildetailsdialog.cpp 2007-09-15 15:46:13.000000000 +0200 @@ -38,8 +38,8 @@ ThumbnailDetailsDialog::ThumbnailDetailsDialog(FileThumbnailView* view) : KDialogBase( - view, 0, true /* modal */, QString::null, KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply, - KDialogBase::Ok, true /* separator */) + view, 0, false /* modal */, QString::null, KDialogBase::Close, + KDialogBase::Close, true /* separator */) , d(new ThumbnailDetailsDialog::Private) { d->mView=view; @@ -52,6 +52,11 @@ d->mContent->mShowFileDate->setChecked(details & FileThumbnailView::FILEDATE); d->mContent->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE); d->mContent->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE); + + connect(d->mContent->mShowFileName, SIGNAL(toggled(bool)), SLOT(applyChanges()) ); + connect(d->mContent->mShowFileDate, SIGNAL(toggled(bool)), SLOT(applyChanges()) ); + connect(d->mContent->mShowFileSize, SIGNAL(toggled(bool)), SLOT(applyChanges()) ); + connect(d->mContent->mShowImageSize, SIGNAL(toggled(bool)), SLOT(applyChanges()) ); } ThumbnailDetailsDialog::~ThumbnailDetailsDialog() { @@ -59,7 +64,7 @@ } -void ThumbnailDetailsDialog::slotApply() { +void ThumbnailDetailsDialog::applyChanges() { int details= (d->mContent->mShowFileName->isChecked() ? FileThumbnailView::FILENAME : 0) | (d->mContent->mShowFileDate->isChecked() ? FileThumbnailView::FILEDATE : 0) @@ -70,10 +75,4 @@ } -void ThumbnailDetailsDialog::slotOk() { - slotApply(); - accept(); -} - - } // namespace diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvcore/thumbnaildetailsdialog.h new/gwenview-1.4.2/src/gvcore/thumbnaildetailsdialog.h --- old/gwenview-1.4.1/src/gvcore/thumbnaildetailsdialog.h 2006-11-26 11:59:27.000000000 +0100 +++ new/gwenview-1.4.2/src/gvcore/thumbnaildetailsdialog.h 2007-09-15 15:46:13.000000000 +0200 @@ -34,9 +34,8 @@ ThumbnailDetailsDialog(FileThumbnailView* view); ~ThumbnailDetailsDialog(); -protected: - virtual void slotApply(); - virtual void slotOk(); +private slots: + void applyChanges(); private: struct Private; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvdirpart/gvdirpart.cpp new/gwenview-1.4.2/src/gvdirpart/gvdirpart.cpp --- old/gwenview-1.4.1/src/gvdirpart/gvdirpart.cpp 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/gvdirpart/gvdirpart.cpp 2007-09-15 15:46:16.000000000 +0200 @@ -63,7 +63,8 @@ const QStringList &) : KParts::ReadOnlyPart( parent, name ) { GVDirFactory::instance()->iconLoader()->addAppDir( "gwenview"); setInstance( GVDirFactory::instance() ); - KGlobal::locale()->insertCatalogue( "gwenview" ); + KGlobal::locale()->insertCatalogue("gwenview"); + KGlobal::locale()->setActiveCatalogue("gwenview"); mBrowserExtension = new GVDirPartBrowserExtension(this); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvdirpart/gvdirpart.desktop new/gwenview-1.4.2/src/gvdirpart/gvdirpart.desktop --- old/gwenview-1.4.1/src/gvdirpart/gvdirpart.desktop 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/gvdirpart/gvdirpart.desktop 2007-09-15 15:46:16.000000000 +0200 @@ -10,8 +10,8 @@ Name[el]=Προβολή εικόνων Name[es]=Visor de imágenes Name[et]=Pildinäitaja +Name[fa]=نمای تصویر Name[fr]=Aperçu d'images -Name[ga]=Amharc Íomhánna Name[gl]=Visor de Imaxes Name[hr]=Pregled slike Name[hu]=Képnézegető @@ -19,6 +19,8 @@ Name[it]=Vista immagini Name[ja]=画像表示 Name[ka]=სურათების ნახვა +Name[ms]=Lihat Imej +Name[nds]=Bildansicht Name[nl]=Afbeeldingweergave Name[pa]=ਚਿੱਤਰ ਝਲਕ Name[pt]=Visualizador de Imagens @@ -32,6 +34,7 @@ Name[tg]=Намоишгари тасвир Name[tr]=Resim Görünümü Name[uk]=Перегляд зображень +Name[vi]=Xem ảnh Name[xx]=xxImage Viewxx Name[zh_CN]=图像查看 MimeType=inode/directory diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvimagepart/gvimagepart.cpp new/gwenview-1.4.2/src/gvimagepart/gvimagepart.cpp --- old/gwenview-1.4.1/src/gvimagepart/gvimagepart.cpp 2006-11-26 11:59:30.000000000 +0100 +++ new/gwenview-1.4.2/src/gvimagepart/gvimagepart.cpp 2007-09-15 15:46:18.000000000 +0200 @@ -82,7 +82,8 @@ , mLastDirection( DirectionUnknown ) { GVImageFactory::instance()->iconLoader()->addAppDir( "gwenview"); setInstance( GVImageFactory::instance() ); - KGlobal::locale()->insertCatalogue( "gwenview" ); + KGlobal::locale()->insertCatalogue("gwenview"); + KGlobal::locale()->setActiveCatalogue("gwenview"); mBrowserExtension = new GVImagePartBrowserExtension(this); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/gvimagepart/gvimagepart.desktop new/gwenview-1.4.2/src/gvimagepart/gvimagepart.desktop --- old/gwenview-1.4.1/src/gvimagepart/gvimagepart.desktop 2006-11-26 11:59:30.000000000 +0100 +++ new/gwenview-1.4.2/src/gvimagepart/gvimagepart.desktop 2007-09-15 15:46:18.000000000 +0200 @@ -10,9 +10,9 @@ Name[el]=Προβολέας εικόνων Gwenview Name[es]=Visor de imágenes Gwenview Name[et]=Gwenview pildinäitaja +Name[fa]=مشاهدهگر تصویر Gwenview Name[fi]=Gwenview-kuvankatseluohjelma Name[fr]=Aperçu d'images Gwenview -Name[ga]=Amharcán Íomhánna Gwenview Name[gl]=Visor de Imaxes Gwenview Name[hi]=ग्वेन-व्यू छवि प्रदर्शक Name[hr]=Gwenview preglednik slika @@ -22,6 +22,7 @@ Name[ja]=Gwenview 画像ビューア Name[ka]=Gwenview სურათების დამთვალიერებელი Name[ms]=Pelihat imej Gwenview +Name[nds]=Bildkieker Gwenview Name[nl]=Gwenview Afbeeldingenweergave Name[pa]=Gwenview ਚਿੱਤਰ ਦਰਸ਼ਕ Name[pl]=Przeglądarka obrazków Gwenview @@ -37,6 +38,7 @@ Name[tg]=Намоишгари тасвири Gwenview Name[tr]=Gwenview Resim Gösterici Name[uk]=Переглядач зображень - Gwenview +Name[vi]=Bộ xem ảnh Gwenview Name[xx]=xxGwenview Image Viewerxx Name[zh_CN]=Gwenview 图像查看器 MimeType=image/gif;image/jpeg;image/png;image/x-bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbm;image/x-xpm diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/imageutils/jpegcontent.cpp new/gwenview-1.4.2/src/imageutils/jpegcontent.cpp --- old/gwenview-1.4.1/src/imageutils/jpegcontent.cpp 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/imageutils/jpegcontent.cpp 2007-09-15 15:46:17.000000000 +0200 @@ -143,6 +143,11 @@ QByteArray mRawData; QSize mSize; QString mComment; + QString mAperture; + QString mExposureTime; + QString mFocalLength; + QString mIso; + bool mPendingTransformation; QWMatrix mTransformMatrix; Exiv2::ExifData mExifData; @@ -255,15 +260,20 @@ Exiv2::Image::AutoPtr image; try { image = Exiv2::ImageFactory::open((unsigned char*)data.data(), data.size()); + image->readMetadata(); } catch (Exiv2::Error&) { kdError() << "Could not load image with Exiv2\n"; return false; } - image->readMetadata(); d->mExifData = image->exifData(); d->mComment = QString::fromUtf8( image->comment().c_str() ); + d->mAperture=aperture(); + d->mExposureTime=exposureTime(); + d->mIso=iso(); + d->mFocalLength=iso(); + // Adjust the size according to the orientation switch (orientation()) { case TRANSPOSE: @@ -290,6 +300,47 @@ } +int JPEGContent::dotsPerMeterX() const { + return dotsPerMeter("XResolution"); +} + + +int JPEGContent::dotsPerMeterY() const { + return dotsPerMeter("YResolution"); +} + + +int JPEGContent::dotsPerMeter(const QString& keyName) const { + Exiv2::ExifKey keyResUnit("Exif.Image.ResolutionUnit"); + Exiv2::ExifData::iterator it = d->mExifData.findKey(keyResUnit); + if (it == d->mExifData.end()) { + return 0; + } + int res = it->toLong(); + QString keyVal = "Exif.Image." + keyName; + Exiv2::ExifKey keyResolution(keyVal.ascii()); + it = d->mExifData.findKey(keyResolution); + if (it == d->mExifData.end()) { + return 0; + } + // The unit for measuring XResolution and YResolution. The same unit is used for both XResolution and YResolution. + // If the image resolution in unknown, 2 (inches) is designated. + // Default = 2 + // 2 = inches + // 3 = centimeters + // Other = reserved + const float INCHESPERMETER = (100. / 2.54); + switch (res) { + case 3: // dots per cm + return (it->toLong() * 100); + default: // dots per inch + return (it->toLong() * INCHESPERMETER); + } + + return 0; +} + + void JPEGContent::resetOrientation() { Exiv2::ExifKey key("Exif.Image.Orientation"); Exiv2::ExifData::iterator it = d->mExifData.findKey(key); @@ -310,12 +361,47 @@ return d->mComment; } +QString JPEGContent::getExifInformation(const QString exifkey) const { + QString ret; + + Exiv2::ExifKey key(exifkey.latin1()); + Exiv2::ExifData::iterator it = d->mExifData.findKey(key); + + if (it != d->mExifData.end()) { + std::ostringstream outputString; + outputString << *it; + ret=QString(outputString.str().c_str()); + } + else { + ret="n/a"; + } + return ret; +} + +QString JPEGContent::aperture() const { + d->mAperture=getExifInformation("Exif.Photo.FNumber"); + return d->mAperture; +} + +QString JPEGContent::exposureTime() const { + d->mExposureTime=getExifInformation("Exif.Photo.ExposureTime"); + return d->mExposureTime; +} + +QString JPEGContent::iso() const { + d->mIso=getExifInformation("Exif.Photo.ISOSpeedRatings"); + return d->mIso; +} + +QString JPEGContent::focalLength() const { + d->mFocalLength=getExifInformation("Exif.Photo.FocalLength"); + return d->mFocalLength; +} void JPEGContent::setComment(const QString& comment) { d->mComment = comment; } - static QWMatrix createRotMatrix(int angle) { QWMatrix matrix; matrix.rotate(angle); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/imageutils/jpegcontent.h new/gwenview-1.4.2/src/imageutils/jpegcontent.h --- old/gwenview-1.4.1/src/imageutils/jpegcontent.h 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/imageutils/jpegcontent.h 2007-09-15 15:46:17.000000000 +0200 @@ -43,12 +43,22 @@ Orientation orientation() const; void resetOrientation(); + + int dotsPerMeterX() const; + int dotsPerMeterY() const; QSize size() const; QString comment() const; void setComment(const QString&); - + + QString aperture() const; + QString exposureTime() const; + QString iso() const; + QString focalLength() const; + + QString getExifInformation(const QString exifkey) const; + void transform(Orientation); QImage thumbnail() const; @@ -66,6 +76,7 @@ JPEGContent(const JPEGContent&); void operator=(const JPEGContent&); void applyPendingTransformation(); + int dotsPerMeter(const QString& keyName) const; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/imageutils/Makefile.am new/gwenview-1.4.2/src/imageutils/Makefile.am --- old/gwenview-1.4.1/src/imageutils/Makefile.am 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/imageutils/Makefile.am 2007-09-15 15:46:17.000000000 +0200 @@ -4,7 +4,7 @@ -DQT_CLEAN_NAMESPACE AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS) -CXXFLAGS = -fexceptions +KDE_CXXFLAGS = $(USE_EXCEPTIONS) noinst_LTLIBRARIES = libgvimageutils.la diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/imageutils/scale.cpp new/gwenview-1.4.2/src/imageutils/scale.cpp --- old/gwenview-1.4.1/src/imageutils/scale.cpp 2006-11-26 11:59:29.000000000 +0100 +++ new/gwenview-1.4.2/src/imageutils/scale.cpp 2007-09-15 15:46:17.000000000 +0200 @@ -944,6 +944,7 @@ int dyy, int dx, int dy, int dw, int dh, int dow, int sow); QImage smoothScale(const QImage& img, int dw, int dh); + typedef long long llong; } #ifdef HAVE_X86_MMX @@ -1028,7 +1029,8 @@ { unsigned int **p; int i, j = 0; - int val, inc, rv = 0; + int rv = 0; + llong val, inc; if(dh < 0){ dh = -dh; @@ -1037,7 +1039,7 @@ p = new unsigned int* [dh+1]; val = 0; - inc = (sh << 16) / dh; + inc = (llong(sh) << 16) / dh; for(i = 0; i < dh; i++){ p[j++] = src + ((val >> 16) * sow); val += inc; @@ -1055,7 +1057,8 @@ int* MImageScale::mimageCalcXPoints(int sw, int dw) { int *p, i, j = 0; - int val, inc, rv = 0; + int rv = 0; + llong val, inc; if(dw < 0){ dw = -dw; @@ -1064,7 +1067,7 @@ p = new int[dw+1]; val = 0; - inc = (sw << 16) / dw; + inc = (llong(sw) << 16) / dw; for(i = 0; i < dw; i++){ p[j++] = (val >> 16); val += inc; @@ -1092,10 +1095,10 @@ /* scaling up */ if(up){ - int val, inc; + llong val, inc; val = 0; - inc = (s << 16) / d; + inc = (llong(s) << 16) / d; for(i = 0; i < d; i++){ p[j++] = (val >> 8) - ((val >> 8) & 0xffffff00); if((val >> 16) >= (s - 1)) @@ -1105,10 +1108,11 @@ } /* scaling down */ else{ - int val, inc, ap, Cp; + llong val, inc; + int ap, Cp; val = 0; - inc = (s << 16) / d; - Cp = ((d << 14) / s) + 1; + inc = (llong(s) << 16) / d; + Cp = ((llong(d) << 14) / s) + 1; for(i = 0; i < d; i++){ ap = ((0x100 - ((val >> 8) & 0xff)) * Cp) >> 8; p[j] = ap | (Cp << 16); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/tools/gimp.desktop new/gwenview-1.4.2/src/tools/gimp.desktop --- old/gwenview-1.4.1/src/tools/gimp.desktop 2006-11-26 11:59:28.000000000 +0100 +++ new/gwenview-1.4.2/src/tools/gimp.desktop 2007-09-15 15:46:15.000000000 +0200 @@ -10,15 +10,16 @@ Name[de]=GIMP Name[el]=Το GIMP Name[et]=GIMP +Name[fa]=GIMP Name[fi]=GIMP Name[fr]=GIMP -Name[ga]=An GIMP Name[gl]=O Gimp Name[hi]=द गिम्प Name[hr]=GIMP Name[hu]=A GIMP Name[it]=GIMP Name[ms]=GIMP +Name[nds]=GIMP Name[pa]=ਜੈਮਪ Name[pl]=GIMP Name[pt]=O GIMP @@ -32,4 +33,5 @@ Name[tg]=ГИМП Name[tr]=GIMP Name[uk]=GIMP +Name[vi]=GIMP Name[xx]=xxThe GIMPxx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/tools/tiledwallpaper.desktop new/gwenview-1.4.2/src/tools/tiledwallpaper.desktop --- old/gwenview-1.4.1/src/tools/tiledwallpaper.desktop 2006-11-26 11:59:28.000000000 +0100 +++ new/gwenview-1.4.2/src/tools/tiledwallpaper.desktop 2007-09-15 15:46:15.000000000 +0200 @@ -11,9 +11,9 @@ Name[el]=Ορισμός σαν Ταπετσαρία σε παράθεση Name[es]=Establecer como fondo de pantalla embaldosado Name[et]=Sea paanidena taustapildiks +Name[fa]=تنظیم به عنوان کاغذدیواری کاشیشده Name[fi]=Aseta taustakuvaksi monistettuna Name[fr]=Établir comme papier peint en mosaïque -Name[ga]=Socraigh mar Chúlbhrat Tílithe Name[gl]=Colocar como Fondo de Escritório en Mosaico Name[hi]=टाइल्ड वालपेपर के रूप में सेट करें Name[hr]=Popločeno na radnu površinu @@ -22,6 +22,8 @@ Name[it]=Imposta come immagine di sfondo ripetuta Name[ja]=タイルされた壁紙として設定 Name[ka]=მოზაიკურ ფონად დაყენება +Name[ms]=Tetapn sebagai Kertas Dinding Jubin +Name[nds]=As kachelt Achtergrundbild fastleggen Name[nl]=Als getegelde achtergrondafbeelding instellen Name[pa]=ਤਣਿਆ ਵਾਲਪੇਪਰ ਬਣਾਓ Name[pl]=Ustaw jako kafelkowaną tapetę @@ -36,5 +38,6 @@ Name[tg]=Сурати мизи кориро бо мавзӯъи сафолӣ танзим кунед Name[tr]=Döşenmiş Duvar Kağıdı Yap Name[uk]=Встановити як шпалери (плиткою) +Name[vi]=Đặt là ảnh nền màn hình đã lát đều Name[xx]=xxSet as Tiled Wallpaperxx Name[zh_CN]=设为平铺墙纸 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/src/tools/wallpaper.desktop new/gwenview-1.4.2/src/tools/wallpaper.desktop --- old/gwenview-1.4.1/src/tools/wallpaper.desktop 2006-11-26 11:59:28.000000000 +0100 +++ new/gwenview-1.4.2/src/tools/wallpaper.desktop 2007-09-15 15:46:15.000000000 +0200 @@ -13,9 +13,9 @@ Name[el]=Ορισμός σαν Ταπετσαρία Name[es]=Establecer como fondo Name[et]=Sea taustapildiks +Name[fa]=تنظیم به عنوان کاغذدیواری Name[fi]=Aseta taustakuvaksi Name[fr]=Établir comme papier peint -Name[ga]=Socraigh mar Chúlbhrat Name[gl]=Colocar como Fondo de Escritório Name[hi]=वालपेपर के रूप में सेट करें Name[hr]=Postavi na radnu površinu @@ -24,8 +24,10 @@ Name[it]=Imposta come immagine di sfondo Name[ja]=壁紙として設定 Name[ka]=ფონად მითითება +Name[ms]=Tetapn sebagai Kertas Dinding +Name[nds]=As Achtergrundbild fastleggen Name[nl]=Als achtergrondafbeelding instellen -Name[pa]=ਵਾਲਪੇਪਰ ਬਣਾਓ +Name[pa]=ਵਾਲਪੇਪਰ ਸੈੱਟ ਕਰੋ Name[pl]=Ustaw jako tapetę Name[pt]=Colocar como Fundo de Ecrã Name[pt_BR]=Configurar como papel de parede @@ -38,5 +40,6 @@ Name[tg]=Танзими сурати мизи корӣ Name[tr]=Duvar Kağıdı Yap Name[uk]=Встановити як шпалери +Name[vi]=Đặt là ảnh nền màn hình Name[xx]=xxSet as Wallpaperxx Name[zh_CN]=设为墙纸 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gwenview-1.4.1/TODO new/gwenview-1.4.2/TODO --- old/gwenview-1.4.1/TODO 2006-11-26 11:59:30.000000000 +0100 +++ new/gwenview-1.4.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -This file was always outdated, so I emptied it. Have a look at : -http://gwenview.sourceforge.net/overview/ -instead. ++++++ gwenview-i18n-1.4.1.tar.bz2 -> gwenview-i18n-1.4.2.tar.bz2 ++++++ ++++ 146135 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org