[pkg-kde-commits] rev 2724 - in kde-extras/digikam/trunk/debian: .
patches
Achim Bohnet
ach-guest at costa.debian.org
Fri Dec 30 22:54:47 UTC 2005
Author: ach-guest
Date: 2005-12-30 22:54:46 +0000 (Fri, 30 Dec 2005)
New Revision: 2724
Added:
kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff
kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
Log:
digikam: apply two patches from digikams KDE SVN stable tree:
patches/10_kdesvn_r485500_efficient_printing.diff
patches/11_kdesvn_r492446_properly_restore_albumtree.diff
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2005-12-30 22:27:26 UTC (rev 2723)
+++ kde-extras/digikam/trunk/debian/changelog 2005-12-30 22:54:46 UTC (rev 2724)
@@ -1,3 +1,13 @@
+digikam (0.8.0-1-2) UNRELEASED; urgency=low
+
+ [ Achim Bohnet ]
+ * patches/10_kdesvn_r485500_efficient_printing.diff
+ grab Anders Lunds patch to speed up printing from stable branch
+ * patches/11_kdesvn_r492446_properly_restore_albumtree.diff (fixes
+ upstream bug 117401)
+
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Fri, 30 Dec 2005 23:48:53 +0100
+
digikam (0.8.0-1-1) unstable; urgency=low
* new upstream release
Added: kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff 2005-12-30 22:27:26 UTC (rev 2723)
+++ kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff 2005-12-30 22:54:46 UTC (rev 2724)
@@ -0,0 +1,59 @@
+Index: digikam/utilities/imageeditor/imageprint.cpp
+===================================================================
+--- digikam/utilities/imageeditor/imageprint.cpp (revision 485499)
++++ digikam/utilities/imageeditor/imageprint.cpp (revision 485500)
+@@ -226,6 +226,8 @@
+ int w = metrics.width();
+ int h = metrics.height();
+
++ QSize size = m_image.size();
++
+ bool printFilename = m_printer.option( "app-imageeditor-printFilename" ) != f;
+ if ( printFilename )
+ {
+@@ -238,7 +240,7 @@
+ {
+
+ // Scale image to fit pagesize
+- m_image = m_image.smoothScale( w, h, QImage::ScaleMin );
++ size.scale( w, h, QSize::ScaleMin );
+ }
+ else
+ {
+@@ -260,7 +262,7 @@
+ hresize = (int)(metrics.logicalDpiY() * hunit);
+ }
+
+- m_image = m_image.smoothScale( wresize, hresize, QImage::ScaleMin );
++ size.scale( wresize, hresize, QSize::ScaleMin );
+ }
+
+ // Align image.
+@@ -280,22 +282,22 @@
+
+ // x - alignment
+ if ( alignment & Qt::AlignHCenter )
+- x = (w - m_image.width())/2;
++ x = (w - size.width())/2;
+ else if ( alignment & Qt::AlignLeft )
+ x = 0;
+ else if ( alignment & Qt::AlignRight )
+- x = w - m_image.width();
++ x = w - size.width();
+
+ // y - alignment
+ if ( alignment & Qt::AlignVCenter )
+- y = (h - m_image.height())/2;
++ y = (h - size.height())/2;
+ else if ( alignment & Qt::AlignTop )
+ y = 0;
+ else if ( alignment & Qt::AlignBottom )
+- y = h - m_image.height();
++ y = h - size.height();
+
+ // Perform the actual drawing.
+- p.drawImage( x, y, m_image );
++ p.drawImage( QRect( x, y, size.width(), size.height()), m_image );;
+
+ if ( printFilename )
+ {
Added: kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff 2005-12-30 22:27:26 UTC (rev 2723)
+++ kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff 2005-12-30 22:54:46 UTC (rev 2724)
@@ -0,0 +1,15 @@
+Index: digikam/digikam/folderview.cpp
+===================================================================
+--- digikam/digikam/folderview.cpp (revision 492445)
++++ digikam/digikam/folderview.cpp (revision 492446)
+@@ -314,8 +314,8 @@
+ }
+
+ FolderItem *item;
+- QListViewItemIterator it(this);
+- for( ; it.current(); ++it)
++ QListViewItemIterator it(this->lastItem());
++ for( ; it.current(); --it)
+ {
+ item = dynamic_cast<FolderItem*>(it.current());
+ if(!item)
More information about the pkg-kde-commits
mailing list