Merge lp:~stijnbrouwers/ubuntu/quantal/kamoso/fix-thumbnails into lp:ubuntu/quantal/kamoso

[Stijn Brouwers]

This patch fixes the bug which makes all thumbnails show up as red rectangles

[Sebastien Bacher (seb128)]

Thank you for your work, is that issue reported upstream? Could you update the patch with to file the infos Description/Origin/Bug? Could you also explain what's the issue with the code that are dropping? It was probably added for a reason so it would be good to have some details on why it's not needed anymore and why it's creating issues

review: Needs Information

[lp:~stijnbrouwers/ubuntu/quantal/kamoso/fix-thumbnails]

21. By Stijn Brouwers on 2012-11-30

debian/patches/fix-thumbnails.patch:
Problem : The thumbnails are shown as red rectangles (LP: #1074958)
Solution : dropped some code.
Explanation of the code dropped:
The code checked a parameter named 'showDecorationSelected'.
judging by the name of the parameter and the functionality, when-
ever a thumbnail is selected, a red rectangle should show behind it.
However, the z-index is not correct (seems to be on top of the image),
and the parameter is not applied correctly (to every thumbnail instead
of only the selected). Because there is already some basic selection,
I just dropped the code that sets the red rectangle.

[Stijn Brouwers (stijnbrouwers)]

Hi,

First of all, sorry for my lack of information, It is my first time I fixed a bug so... I didn't really know what to do :-)
1. No, I haven't reported anything upstream. How should I do this? Is there some documentation?
2. I just updated the debian/changelog, please check if it is sufficient
3. Also answered by '2.'

Thanks for reviewing this!

Kind regards,

Stijn Brouwers

[Sebastien Bacher (seb128)]

Thanks for the update, could you also change the target vcs to be raring (the current active Ubuntu serie) rather than quantal?

To report the bug upstream, you can find informations on
http://userbase.kde.org/Asking_Questions#Reporting_KDE_Bugs

If you do IRC you can try talking to afiestas on #kubuntu-devel which is upstream for kamoso

Note that apparently kamaso is not buildable at the moment in raring due to changes in the KDE graphics library, it will need to be ported because those fixes can be uploaded

[lp:~stijnbrouwers/ubuntu/quantal/kamoso/fix-thumbnails]

22. By Stijn Brouwers on 2012-11-30

changed the target vcs from quantal to raring

[Stijn Brouwers (stijnbrouwers)]

I reported the bug upstream
-> https://bugs.kde.org/show_bug.cgi?id=310936
And I changed the debian/changelog to target raring instead of quantal

Unmerged revisions

22. By Stijn Brouwers on 2012-11-30

changed the target vcs from quantal to raring

21. By Stijn Brouwers on 2012-11-30

debian/patches/fix-thumbnails.patch:
Problem : The thumbnails are shown as red rectangles (LP: #1074958)
Solution : dropped some code.
Explanation of the code dropped:
The code checked a parameter named 'showDecorationSelected'.
judging by the name of the parameter and the functionality, when-
ever a thumbnail is selected, a red rectangle should show behind it.
However, the z-index is not correct (seems to be on top of the image),
and the parameter is not applied correctly (to every thumbnail instead
of only the selected). Because there is already some basic selection,
I just dropped the code that sets the red rectangle.

20. By Stijn Brouwers on 2012-11-22

debian/patches/fix-thumbnails.patch: Fix the bug which makes thumbnails
show as red rectangles. (LP: #1074958)

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 14:50:10 +0000
+++ debian/changelog	2012-11-30 15:52:23 +0000
@@ -1,3 +1,19 @@
+kamoso (2.0.2-1ubuntu3) raring; urgency=low
+
+  * debian/patches/fix-thumbnails.patch: 
+    Problem : The thumbnails are shown as red rectangles (LP: #1074958)
+    Solution : dropped some code.
+    Explanation of the code dropped:
+    The code checked a parameter named 'showDecorationSelected'.
+    judging by the name of the parameter and the functionality, when-
+    ever a thumbnail is selected, a red rectangle should show behind it.
+    However, the z-index is not correct (seems to be on top of the image),
+    and the parameter is not applied correctly (to every thumbnail instead
+    of only the selected). Because there is already some basic selection, 
+    I just dropped the code that sets the red rectangle.
+
+ -- Stijn Brouwers <[e-mail]>  Thu, 22 Nov 2012 17:00:15 +0100
+
 kamoso (2.0.2-1ubuntu2) quantal; urgency=low
 
   * Suggest instead of recommend kipi-plugins since it has a large set of

=== added file 'debian/patches/fix-thumbnails.patch'
--- debian/patches/fix-thumbnails.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-thumbnails.patch	2012-11-30 15:52:23 +0000
@@ -0,0 +1,20 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: kamoso/src/customDelegate.cpp
+===================================================================
+--- kamoso.orig/src/customDelegate.cpp	2012-11-22 15:25:13.159022000 +0100
++++ kamoso/src/customDelegate.cpp	2012-11-22 17:00:01.305329273 +0100
+@@ -93,12 +93,6 @@
+         painter->drawPixmap(QRect(topleft, s), pix);
+     }
+ 
+-    if(option.showDecorationSelected)
+-    {
+-        painter->setBrush(Qt::red);
+-        painter->drawRect(rect);
+-    }
+-
+     if(!icons.isEmpty()) {
+         int count=0, margin=(space-(extent*overlayperline))/2;
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-10 10:44:16 +0000
+++ debian/patches/series	2012-11-30 15:52:23 +0000
@@ -2,3 +2,4 @@
 proper_version_kaboutdata.diff
 dont_build_plugin_tester.diff
 fix_ftbfs_libkipi9.patch
+fix-thumbnails.patch