Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/digikam/files: digikam-2.5.0-libkipi.patch
Date: Tue, 03 Jan 2012 16:30:21
Message-Id: 20120103163012.1BB252004C@flycatcher.gentoo.org
1 dilfridge 12/01/03 16:30:12
2
3 Added: digikam-2.5.0-libkipi.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch?rev=1.1&content-type=text/plain
14
15 Index: digikam-2.5.0-libkipi.patch
16 ===================================================================
17 From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
18 From: Gilles Caulier <caulier.gilles@×××××.com>
19 Date: Tue, 3 Jan 2012 15:16:37 +0100
20 Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
21 BUGS: 290496
22
23 ---
24 utilities/setup/setupplugins.cpp | 13 +++++++++++--
25 utilities/setup/setupplugins.h | 4 ++--
26 2 files changed, 13 insertions(+), 4 deletions(-)
27
28 diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
29 index 0f4030a..b8efb35 100644
30 --- a/utilities/setup/setupplugins.cpp
31 +++ b/utilities/setup/setupplugins.cpp
32 @@ -6,8 +6,8 @@
33 * Date : 2004-01-02
34 * Description : setup Kipi plugins tab.
35 *
36 - * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
37 - * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
38 + * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
39 + * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
40 *
41 * This program is free software; you can redistribute it
42 * and/or modify it under the terms of the GNU General
43 @@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
44
45 panel->setLayout(mainLayout);
46
47 +#if KIPI_VERSION < 0x010400
48 + d->checkAllBtn->setVisible(false);
49 + d->clearBtn->setVisible(false);
50 +#endif
51 +
52 initPlugins();
53
54 // --------------------------------------------------------
55 @@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
56 void SetupPlugins::slotCheckAll()
57 {
58 QApplication::setOverrideCursor(Qt::WaitCursor);
59 +#if KIPI_VERSION >= 0x010400
60 d->kipiConfig->slotCheckAll();
61 +#endif
62 QApplication::restoreOverrideCursor();
63 }
64
65 void SetupPlugins::slotClear()
66 {
67 QApplication::setOverrideCursor(Qt::WaitCursor);
68 +#if KIPI_VERSION >= 0x010400
69 d->kipiConfig->slotClear();
70 +#endif
71 QApplication::restoreOverrideCursor();
72 }
73
74 diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
75 index 271a569..114e0fa 100644
76 --- a/utilities/setup/setupplugins.h
77 +++ b/utilities/setup/setupplugins.h
78 @@ -6,8 +6,8 @@
79 * Date : 2004-01-02
80 * Description : setup Kipi plugins tab.
81 *
82 - * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
83 - * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
84 + * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
85 + * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
86 *
87 * This program is free software; you can redistribute it
88 * and/or modify it under the terms of the GNU General
89 --
90 1.7.3.4