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