Commit f1441231 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

Initialize MetadataSettings at showfoto startup

Move canvas Exif autorotate handing in applyStandardSettings()
BUGS: 312549
FIXED-IN : 3.2.0
parent d29228b6
......@@ -8,7 +8,7 @@
* editor with no support of digiKam database.
*
* Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot com>
* Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2004-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
......
......@@ -6,7 +6,7 @@
* Date : 2004-11-22
* Description : stand alone digiKam image editor GUI
*
* Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2004-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
* Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot com>
* Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot com>
......@@ -107,6 +107,7 @@ extern "C"
#include "iofilesettings.h"
#include "loadingcache.h"
#include "loadingcacheinterface.h"
#include "metadatasettings.h"
#include "savingcontext.h"
#include "setup.h"
#include "setupmisc.h"
......@@ -200,6 +201,7 @@ ShowFoto::ShowFoto(const KUrl::List& urlList)
// Setup loading cache and thumbnails interface.
Digikam::LoadingCacheInterface::initialize();
Digikam::MetadataSettings::instance();
d->thumbLoadThread = new Digikam::ThumbnailLoadThread();
d->thumbLoadThread->setThumbnailSize(Digikam::ThumbnailSize::Huge);
......@@ -568,26 +570,21 @@ void ShowFoto::applySettings()
m_fileDeleteAction->setText(i18n("Delete File"));
}
/*
bool exifRotate = group.readEntry("EXIF Rotate", true);
m_setExifOrientationTag = group.readEntry("EXIF Set Orientation", true);
*/
Digikam::ThumbBarToolTipSettings settings;
settings.showToolTips = group.readEntry("Show ToolTips", true);
settings.font = group.readEntry("ToolTips Font", KGlobalSettings::generalFont());
settings.showFileName = group.readEntry("ToolTips Show File Name", true);
settings.showFileDate = group.readEntry("ToolTips Show File Date", false);
settings.showFileSize = group.readEntry("ToolTips Show File Size", false);
settings.showImageType = group.readEntry("ToolTips Show Image Type", false);
settings.showImageDim = group.readEntry("ToolTips Show Image Dim", true);
settings.showPhotoMake = group.readEntry("ToolTips Show Photo Make", true);
settings.showPhotoDate = group.readEntry("ToolTips Show Photo Date", true);
settings.showToolTips = group.readEntry("Show ToolTips", true);
settings.font = group.readEntry("ToolTips Font", KGlobalSettings::generalFont());
settings.showFileName = group.readEntry("ToolTips Show File Name", true);
settings.showFileDate = group.readEntry("ToolTips Show File Date", false);
settings.showFileSize = group.readEntry("ToolTips Show File Size", false);
settings.showImageType = group.readEntry("ToolTips Show Image Type", false);
settings.showImageDim = group.readEntry("ToolTips Show Image Dim", true);
settings.showPhotoMake = group.readEntry("ToolTips Show Photo Make", true);
settings.showPhotoDate = group.readEntry("ToolTips Show Photo Date", true);
settings.showPhotoFocal = group.readEntry("ToolTips Show Photo Focal", true);
settings.showPhotoExpo = group.readEntry("ToolTips Show Photo Expo", true);
settings.showPhotoMode = group.readEntry("ToolTips Show Photo Mode", true);
settings.showPhotoExpo = group.readEntry("ToolTips Show Photo Expo", true);
settings.showPhotoMode = group.readEntry("ToolTips Show Photo Mode", true);
settings.showPhotoFlash = group.readEntry("ToolTips Show Photo Flash", false);
settings.showPhotoWB = group.readEntry("ToolTips Show Photo WB", false);
settings.showPhotoWB = group.readEntry("ToolTips Show Photo WB", false);
d->thumbBar->setToolTipSettings(settings);
}
......
......@@ -6,7 +6,7 @@
* Date : 2004-11-22
* Description : stand alone digiKam image editor GUI
*
* Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2004-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2012 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
* Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot com>
* Copyright (C) 2004-2005 by Renchi Raju <renchi dot raju at gmail dot com>
......
......@@ -6,7 +6,7 @@
* Date : 2006-01-20
* Description : core image editor GUI implementation
*
* Copyright (C) 2006-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2006-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2009-2011 by Andi Clemens <andi dot clemens at gmail dot com>
*
* This program is free software; you can redistribute it
......@@ -138,6 +138,7 @@
#include "imageplugin.h"
#include "imagepluginloader.h"
#include "iofilesettings.h"
#include "metadatasettings.h"
#include "libsinfodlg.h"
#include "loadingcacheinterface.h"
#include "printhelper.h"
......@@ -160,7 +161,7 @@ namespace Digikam
const QString EditorWindow::CONFIG_GROUP_NAME = "ImageViewer Settings";
EditorWindow::EditorWindow(const char* name)
EditorWindow::EditorWindow(const char* const name)
: KXmlGuiWindow(0), d(new Private)
{
setObjectName(name);
......@@ -961,6 +962,12 @@ void EditorWindow::applyStandardSettings()
d->exposureSettings->overExposurePercent = group.readEntry(d->configOverExposurePercentsEntry, 1.0);
d->exposureSettings->exposureIndicatorMode = group.readEntry(d->configExpoIndicatorModeEntry, true);
d->toolIface->updateExposureSettings();
// -- Metadata Settings --------------------------------------------------
MetadataSettingsContainer writeSettings = MetadataSettings::instance()->settings();
m_setExifOrientationTag = writeSettings.exifSetOrientation;
m_canvas->setExifOrient(writeSettings.exifRotate);
}
void EditorWindow::applyIOSettings()
......
......@@ -84,7 +84,7 @@ class DIGIKAM_EXPORT EditorWindow : public KXmlGuiWindow
public:
explicit EditorWindow(const char* name);
explicit EditorWindow(const char* const name);
~EditorWindow();
const static QString CONFIG_GROUP_NAME;
......
......@@ -478,13 +478,9 @@ void ImageWindow::slotSetupChanged()
{
applyStandardSettings();
MetadataSettingsContainer writeSettings = MetadataSettings::instance()->settings();
m_setExifOrientationTag = writeSettings.exifSetOrientation;
m_canvas->setExifOrient(writeSettings.exifRotate);
VersionManagerSettings versionSettings = AlbumSettings::instance()->getVersionManagerSettings();
d->versionManager.setSettings(versionSettings);
m_nonDestructive = versionSettings.enabled;
m_nonDestructive = versionSettings.enabled;
toggleNonDestructiveActions();
d->rightSideBar->setStyle(AlbumSettings::instance()->getSidebarTitleStyle());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment