[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam
From: Johannes Wienke <languitar () semipol ! de>
Date: 2009-10-03 17:55:01
Message-ID: 1254592501.376546.23809.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1031003 by jwienke:
Rotation overlay buttons in album view are now optional
BUG: 209189
M +1 -0 CMakeLists.txt
M +2 -1 NEWS
M +22 -8 digikam/albumsettings.cpp
M +9 -0 digikam/albumsettings.h
M +21 -35 digikam/digikamimageview.cpp
AM digikam/digikamimageview_p.cpp [License: GPL (v2+)]
AM digikam/digikamimageview_p.h [License: GPL (v2+)]
M +1 -0 libs/widgets/iccprofiles/iccprofilescombobox.cpp
M +9 -0 utilities/setup/setupalbumview.cpp
--- trunk/extragear/graphics/digikam/CMakeLists.txt #1031002:1031003
@@ -1104,6 +1104,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/digikam/dbstatdlg.cpp
${CMAKE_CURRENT_SOURCE_DIR}/digikam/digikamapp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/digikam/digikamimageview.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/digikam/digikamimageview_p.cpp
${CMAKE_CURRENT_SOURCE_DIR}/digikam/digikamview.cpp
${CMAKE_CURRENT_SOURCE_DIR}/digikam/dio.cpp
${CMAKE_CURRENT_SOURCE_DIR}/digikam/ddragobjects.cpp
--- trunk/extragear/graphics/digikam/NEWS #1031002:1031003
@@ -60,7 +60,8 @@
049 ==> 204080 : It crashed when it was closing.
050 ==> 198554 : Crash on making thumbnails, every time.
051 ==> 207330 : digiKam crashes if the editor has to open a new image while working \
on another.
-052 ==>
+052 ==> 209189 : Make albumview rotation buttons optional
+053 ==>
*********************************************************************************************************
digiKam 1.0.0-beta4 - Release date: 2009-08-30
--- trunk/extragear/graphics/digikam/digikam/albumsettings.cpp #1031002:1031003
@@ -82,6 +82,7 @@
bool iconShowResolution;
bool iconShowTags;
bool iconShowRating;
+ bool iconShowOverlays;
QFont iconviewFont;
@@ -229,6 +230,7 @@
d->iconShowResolution = false;
d->iconShowTags = true;
d->iconShowRating = true;
+ d->iconShowOverlays = true;
d->iconviewFont = KGlobalSettings::generalFont();
d->toolTipsFont = KGlobalSettings::generalFont();
@@ -330,6 +332,7 @@
d->iconShowComments = group.readEntry("Icon Show Comments", \
true);
d->iconShowTags = group.readEntry("Icon Show Tags", \
true);
d->iconShowRating = group.readEntry("Icon Show Rating", \
true); + d->iconShowOverlays = group.readEntry("Icon Show Overlays", \
true);
d->iconviewFont = group.readEntry("IconView Font", \
KGlobalSettings::generalFont());
d->toolTipsFont = group.readEntry("ToolTips Font", \
KGlobalSettings::generalFont()); @@ -433,15 +436,16 @@
group.writeEntry("Theme", d->currentTheme);
group.writeEntry("Sidebar Title Style", (int)d->sidebarTitleStyle);
- group.writeEntry("Icon Show Name", d->iconShowName);
- group.writeEntry("Icon Show Resolution", d->iconShowResolution);
- group.writeEntry("Icon Show Size", d->iconShowSize);
- group.writeEntry("Icon Show Date", d->iconShowDate);
+ group.writeEntry("Icon Show Name", d->iconShowName);
+ group.writeEntry("Icon Show Resolution", d->iconShowResolution);
+ group.writeEntry("Icon Show Size", d->iconShowSize);
+ group.writeEntry("Icon Show Date", d->iconShowDate);
group.writeEntry("Icon Show Modification Date", d->iconShowModDate);
- group.writeEntry("Icon Show Comments", d->iconShowComments);
- group.writeEntry("Icon Show Tags", d->iconShowTags);
- group.writeEntry("Icon Show Rating", d->iconShowRating);
- group.writeEntry("IconView Font", d->iconviewFont);
+ group.writeEntry("Icon Show Comments", d->iconShowComments);
+ group.writeEntry("Icon Show Tags", d->iconShowTags);
+ group.writeEntry("Icon Show Rating", d->iconShowRating);
+ group.writeEntry("Icon Show Overlays", d->iconShowOverlays);
+ group.writeEntry("IconView Font", d->iconviewFont);
group.writeEntry("ToolTips Font", d->toolTipsFont);
group.writeEntry("Show ToolTips", d->showToolTips);
@@ -826,6 +830,16 @@
return d->iconShowRating;
}
+void AlbumSettings::setIconShowOverlays(bool val)
+{
+ d->iconShowOverlays = val;
+}
+
+bool AlbumSettings::getIconShowOverlays() const
+{
+ return d->iconShowOverlays;
+}
+
void AlbumSettings::setExifRotate(bool val)
{
d->exifRotate = val;
--- trunk/extragear/graphics/digikam/digikam/albumsettings.h #1031002:1031003
@@ -162,6 +162,15 @@
void setIconShowRating(bool val);
bool getIconShowRating() const;
+ /**
+ * Sets the visibility of the overlay buttons on the image icons.
+ */
+ void setIconShowOverlays(bool val);
+ /**
+ * Determines whether the overlay buttons should be displayed on the icons.
+ */
+ bool getIconShowOverlays() const;
+
void setExifRotate(bool val);
bool getExifRotate() const;
--- trunk/extragear/graphics/digikam/digikam/digikamimageview.cpp #1031002:1031003
@@ -24,6 +24,7 @@
#include "digikamimageview.h"
#include "digikamimageview.moc"
+#include "digikamimageview_p.h"
// Qt includes
@@ -60,55 +61,46 @@
#include "imagealbummodel.h"
#include "imagedragdrop.h"
#include "imageratingoverlay.h"
-#include "imagerotationoverlay.h"
#include "imageviewutilities.h"
#include "imagewindow.h"
#include "metadatamanager.h"
-#include "renamethread.h"
#include "thumbnailloadthread.h"
namespace Digikam
{
-class DigikamImageViewPriv
+DigikamImageView::DigikamImageView(QWidget *parent)
+ : ImageCategorizedView(parent), d(new DigikamImageViewPriv(this))
{
-public:
- DigikamImageViewPriv()
- {
- utilities = 0;
- renameThread = 0;
- }
- ImageViewUtilities* utilities;
- RenameThread* renameThread;
-};
+ AlbumSettings *settings = AlbumSettings::instance();
-DigikamImageView::DigikamImageView(QWidget *parent)
- : ImageCategorizedView(parent), d(new DigikamImageViewPriv)
-{
imageFilterModel()->setCategorizationMode(ImageSortSettings::CategoryByAlbum);
imageModel()->setThumbnailLoadThread(ThumbnailLoadThread::defaultIconViewThread());
- setThumbnailSize((ThumbnailSize::Size)AlbumSettings::instance()->getDefaultIconSize());
+ setThumbnailSize((ThumbnailSize::Size)settings->getDefaultIconSize());
imageModel()->setDragDropHandler(new ImageDragDropHandler(imageModel()));
setDragEnabled(true);
setAcceptDrops(true);
setDropIndicatorShown(false);
- setToolTipEnabled(AlbumSettings::instance()->showToolTipsIsValid());
- imageFilterModel()->setSortRole((ImageSortSettings::SortRole)AlbumSettings::instance()->getImageSortOrder());
- imageFilterModel()->setCategorizationMode((ImageSortSettings::CategorizationMode)AlbumSettings::instance()->getImageGroupMode());
+ setToolTipEnabled(settings->showToolTipsIsValid());
+ imageFilterModel()->setSortRole((ImageSortSettings::SortRole)settings->getImageSortOrder());
+ imageFilterModel()->setCategorizationMode((ImageSortSettings::CategorizationMode)settings->getImageGroupMode());
- ImageRotateLeftOverlay *rotateLeftOverlay = new ImageRotateLeftOverlay(this);
- addOverlay(rotateLeftOverlay);
+ // rotation overlays
+ d->rotateLeftOverlay = new ImageRotateLeftOverlay(this);
+ d->rotateRightOverlay = new ImageRotateRightOverlay(this);
+ d->updateOverlays();
- ImageRotateRightOverlay *rotateRightOverlay = new ImageRotateRightOverlay(this);
- addOverlay(rotateRightOverlay);
-
- ImageRatingOverlay *ratingOverlay = new ImageRatingOverlay(this);
+ // rating overlay
+ ImageRatingOverlay *ratingOverlay = new ImageRatingOverlay(this);
addOverlay(ratingOverlay);
+ connect(ratingOverlay, SIGNAL(ratingEdited(const QModelIndex &, int)),
+ this, SLOT(assignRating(const QModelIndex&, int)));
+
d->utilities = new ImageViewUtilities(this);
connect(d->utilities, SIGNAL(editorCurrentUrlChanged(const KUrl&)),
@@ -120,16 +112,7 @@
connect(imageModel()->dragDropHandler(), SIGNAL(dioResult(KJob*)),
d->utilities, SLOT(slotDIOResult(KJob*)));
- connect(ratingOverlay, SIGNAL(ratingEdited(const QModelIndex &, int)),
- this, SLOT(assignRating(const QModelIndex&, int)));
-
- connect(rotateLeftOverlay, SIGNAL(signalRotateLeft()),
- this, SLOT(slotRotateLeft()));
-
- connect(rotateRightOverlay, SIGNAL(signalRotateRight()),
- this, SLOT(slotRotateRight()));
-
- connect(AlbumSettings::instance(), SIGNAL(setupChanged()),
+ connect(settings, SIGNAL(setupChanged()),
this, SLOT(slotSetupChanged()));
}
@@ -146,6 +129,9 @@
void DigikamImageView::slotSetupChanged()
{
setToolTipEnabled(AlbumSettings::instance()->showToolTipsIsValid());
+
+ d->updateOverlays();
+
ImageCategorizedView::slotSetupChanged();
}
** trunk/extragear/graphics/digikam/digikam/digikamimageview_p.cpp #property \
svn:mime-type + text/x-c
** trunk/extragear/graphics/digikam/digikam/digikamimageview_p.h #property \
svn:mime-type + text/x-h
--- trunk/extragear/graphics/digikam/libs/widgets/iccprofiles/iccprofilescombobox.cpp \
#1031002:1031003 @@ -27,6 +27,7 @@
#include <QFileInfo>
#include <QSignalMapper>
+#include <QSet>
// KDE includes
--- trunk/extragear/graphics/digikam/utilities/setup/setupalbumview.cpp \
#1031002:1031003 @@ -66,6 +66,7 @@
iconShowCommentsBox = 0;
iconShowTagsBox = 0;
iconShowRatingBox = 0;
+ iconShowOverlaysBox = 0;
rightClickActionComboBox = 0;
previewLoadFullImageSize = 0;
showFolderTreeViewItemsCount = 0;
@@ -83,6 +84,7 @@
QCheckBox *iconShowCommentsBox;
QCheckBox *iconShowTagsBox;
QCheckBox *iconShowRatingBox;
+ QCheckBox *iconShowOverlaysBox;
QCheckBox *previewLoadFullImageSize;
QCheckBox *showFolderTreeViewItemsCount;
@@ -139,6 +141,10 @@
d->iconShowRatingBox->setWhatsThis(i18n("Set this option to show the digiKam \
rating "
"below the image thumbnail."));
+ d->iconShowOverlaysBox = new QCheckBox(i18n("Show rotation overlay buttons"), \
iconViewGroup); + d->iconShowOverlaysBox->setWhatsThis(i18n("Set this option to \
show overlay buttons on " + "the image \
thumbnail for image rotation.")); +
QLabel *rightClickLabel = new QLabel(i18n("Thumbnail click action:"), \
iconViewGroup); d->rightClickActionComboBox = new KComboBox(iconViewGroup);
d->rightClickActionComboBox->addItem(i18n("Show embedded preview"), \
AlbumSettings::ShowPreview); @@ -157,6 +163,7 @@
grid->addWidget(d->iconShowCommentsBox, 0, 1, 1, 1);
grid->addWidget(d->iconShowTagsBox, 1, 1, 1, 1);
grid->addWidget(d->iconShowRatingBox, 2, 1, 1, 1);
+ grid->addWidget(d->iconShowOverlaysBox, 3, 1, 1, 1);
grid->addWidget(rightClickLabel, 5, 0, 1, 1);
grid->addWidget(d->rightClickActionComboBox, 5, 1, 1, 1);
grid->addWidget(d->iconViewFontSelect, 6, 0, 1, 2);
@@ -238,6 +245,7 @@
settings->setIconShowResolution(d->iconShowResolutionBox->isChecked());
settings->setIconShowComments(d->iconShowCommentsBox->isChecked());
settings->setIconShowRating(d->iconShowRatingBox->isChecked());
+ settings->setIconShowOverlays(d->iconShowOverlaysBox->isChecked());
settings->setIconViewFont(d->iconViewFontSelect->font());
settings->setItemRightClickAction((AlbumSettings::ItemRightClickAction)
@@ -271,6 +279,7 @@
d->iconShowResolutionBox->setChecked(settings->getIconShowResolution());
d->iconShowCommentsBox->setChecked(settings->getIconShowComments());
d->iconShowRatingBox->setChecked(settings->getIconShowRating());
+ d->iconShowOverlaysBox->setChecked(settings->getIconShowOverlays());
d->iconViewFontSelect->setFont(settings->getIconViewFont());
d->rightClickActionComboBox->setCurrentIndex((int)settings->getItemRightClickAction());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic