Summary: | Slideshow info is displayed too high [patch] | ||
---|---|---|---|
Product: | [Applications] digikam | Reporter: | Andi Clemens <andi.clemens> |
Component: | Plugin-Generic-SlideShow | Assignee: | Digikam Developers <digikam-bugs-null> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | caulier.gilles, crucerucalincristian |
Priority: | NOR | ||
Version: | 2.7.0 | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | http://commits.kde.org/digikam/d8cc9d2a6b4a5ec4f37e80e7024f9ab7800326ef | Version Fixed In: | 4.0.0 |
Sentry Crash Report: | |||
Attachments: |
the patch
patch for bug 302422 |
Description
Andi Clemens
2012-06-23 21:53:10 UTC
Created attachment 72082 [details]
the patch
Andi, Your patch cannot be applied to git/master : [gilles@localhost core]$ patch -p1 < slideshow_info.diff patching file utilities/slideshow/slideshow.cpp Hunk #1 FAILED at 8. Hunk #2 succeeded at 406 (offset 8 lines). Hunk #3 FAILED at 791. Hunk #4 succeeded at 835 (offset 8 lines). Hunk #5 succeeded at 850 (offset 8 lines). Hunk #6 FAILED at 856. 3 out of 6 hunks FAILED -- saving rejects to file utilities/slideshow/slideshow.cpp.rej patching file utilities/slideshow/slideshow.h Hunk #1 FAILED at 7. Hunk #2 FAILED at 95. 2 out of 2 hunks FAILED -- saving rejects to file utilities/slideshow/slideshow.h.rej Please update it... Gilles Caulier Created attachment 85289 [details] patch for bug 302422 I did what Andi proposed on a fresh cloned digikam. So I guess it should work. However, I spoke with Gilles and I know it could be done even better. But it is my first trial to solve something in digikam, so I hope there is no problem I posted this patch. Git commit d8cc9d2a6b4a5ec4f37e80e7024f9ab7800326ef by Cruceru Calin-Cristian. Committed on 24/02/2014 at 06:52. Pushed by crucerucalincristian into branch 'master'. GUI: Toolbar in SlideShow only appears now in the top right and left corners and Image Info appears now with 0 offset in left buttom corner M +10 -30 utilities/slideshow/slideshow.cpp M +2 -3 utilities/slideshow/slideshow.h http://commits.kde.org/digikam/d8cc9d2a6b4a5ec4f37e80e7024f9ab7800326ef |