[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/digikam
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2011-01-17 14:17:38
Message-ID: 20110117141738.CE421AC8B5 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1215075 by cgilles:
more private internal container
M +8 -8 tagcheckview.cpp
M +6 -3 tagcheckview.h
--- trunk/extragear/graphics/digikam/digikam/tagcheckview.cpp #1215074:1215075
@@ -28,7 +28,7 @@
// Qt includes
-#include <qaction.h>
+#include <QAction>
// KDE includes
@@ -44,9 +44,10 @@
namespace Digikam
{
-class TagCheckViewPriv
+class TagCheckView::TagCheckViewPriv
{
public:
+
TagCheckViewPriv() :
toggleAutoTags(TagCheckView::NoToggleAuto),
checkNewTags(false),
@@ -87,18 +88,18 @@
QAction* toggleParentsAction;
QAction* toggleBothAction;
};
-const QString TagCheckViewPriv::configToggleAutoTagsEntry("Toggle Auto Tags");
+const QString TagCheckView::TagCheckViewPriv::configToggleAutoTagsEntry("Toggle Auto Tags");
+
// --------------------------------------------------------
-TagCheckView::TagCheckView(QWidget* parent, TagModel* tagModel) :
- TagFolderView(parent, tagModel),
+TagCheckView::TagCheckView(QWidget* parent, TagModel* tagModel)
+ : TagFolderView(parent, tagModel),
d(new TagCheckViewPriv)
{
setSelectAlbumOnClick(false);
setExpandOnSingleClick(false);
setSelectOnContextMenu(false);
-
setShowFindDuplicateAction(false);
// prepare custom menu action
@@ -115,7 +116,6 @@
d->deselectParentsAction = d->deselectTagsMenu->addAction(i18n("Parents"));
d->invertAction = new QAction(i18n("Invert Selection"), this);
-
d->toggleAutoAction = new KSelectAction(i18n("Toggle Auto"), this);
d->toggleNoneAction = d->toggleAutoAction->addAction(i18nc("no auto toggle", "None"));
d->toggleAutoAction->menu()->addSeparator();
@@ -125,7 +125,6 @@
connect(albumModel(), SIGNAL(checkStateChanged(Album*, Qt::CheckState)),
this, SLOT(slotCheckStateChange(Album*, Qt::CheckState)));
-
}
TagCheckView::~TagCheckView()
@@ -358,4 +357,5 @@
d->toggleAutoTags = toggleRestore;
}
+
} // namespace Digikam
--- trunk/extragear/graphics/digikam/digikam/tagcheckview.h #1215074:1215075
@@ -28,16 +28,17 @@
#define TAGCHECKVIEW_H
// Local includes
+
#include "imagefiltersettings.h"
#include "tagfolderview.h"
namespace Digikam
{
-class TagCheckViewPriv;
class TagCheckView : public TagFolderView
{
Q_OBJECT
+
public:
enum ToggleAutoTags
@@ -84,6 +85,7 @@
void slotResetCheckState();
protected:
+
virtual void addCustomContextMenuActions(ContextMenuHelper& cmh, Album* album);
virtual void handleCustomContextMenuAction(QAction* action, AlbumPointer<Album> album);
@@ -98,10 +100,11 @@
void slotCreatedNewTagByContextMenu(TAlbum* tag);
private:
+
+ class TagCheckViewPriv;
TagCheckViewPriv* d;
-
};
-}
+} // namespace Digikam
#endif /* TAGCHECKVIEW_H */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic