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

Add fullscreen mode options to ImportUI : toolbars, thumbbar, and sidebars are managed.

BUGS: 214107
BUGS: 220739
BUGS: 289262
BUGS: 236234
BUGS: 258180
BUGS: 293676
FIXED-IN: 3.2.0
parent 8cda9359
......@@ -56,7 +56,8 @@ enum FullScreenOptions
FS_ALBUMGUI = FS_TOOLBARS | FS_THUMBBAR | FS_SIDEBARS, /// Album GUI Config.
FS_EDITOR = FS_TOOLBARS | FS_THUMBBAR | FS_SIDEBARS, /// Image Editor Config.
FS_LIGHTTABLE = FS_TOOLBARS | FS_SIDEBARS /// Light Table Config.
FS_LIGHTTABLE = FS_TOOLBARS | FS_SIDEBARS, /// Light Table Config.
FS_IMPORTUI = FS_TOOLBARS | FS_THUMBBAR | FS_SIDEBARS, /// Import UI Config.
};
static const QString s_configFullScreenHideToolBarsEntry("FullScreen Hide ToolBars");
......
......@@ -142,7 +142,7 @@ ImportUI::ImportUI(QWidget* const parent, const QString& cameraTitle,
: DXmlGuiWindow(parent), d(new Private)
{
setXMLFile("importui.rc");
setFullScreenOptions(FS_NONE);
setFullScreenOptions(FS_IMPORTUI);
// --------------------------------------------------------
......
......@@ -7,7 +7,7 @@
* Description : camera setup tab.
*
* Copyright (C) 2003-2005 by Renchi Raju <renchi dot raju at gmail dot com>
* 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>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
......@@ -64,6 +64,8 @@
#include "importfilters.h"
#include "dfontselect.h"
#include "importsettings.h"
#include "fullscreensettings.h"
#include "dxmlguiwindow.h"
namespace Digikam
{
......@@ -193,7 +195,8 @@ public:
importListView(0),
tab(0),
ignoreNamesEdit(0),
ignoreExtensionsEdit(0)
ignoreExtensionsEdit(0),
fullScreenSettings(0)
{
}
......@@ -244,6 +247,8 @@ public:
QLineEdit* ignoreExtensionsEdit;
FilterList filters;
FullScreenSettings* fullScreenSettings;
};
const QString SetupCamera::Private::configGroupName("Camera Settings");
......@@ -472,7 +477,7 @@ SetupCamera::SetupCamera(QWidget* const parent)
// --------------------------------------------------------
QGroupBox* interfaceOptionsGroup = new QGroupBox(i18n("Preview Options"), panel);
QGroupBox* interfaceOptionsGroup = new QGroupBox(i18n("Preview Options"), panel4);
QGridLayout* grid3 = new QGridLayout(interfaceOptionsGroup);
d->previewLoadFullImageSize = new QCheckBox(i18n("Embedded preview loads full-sized images"), interfaceOptionsGroup);
......@@ -495,13 +500,18 @@ SetupCamera::SetupCamera(QWidget* const parent)
grid3->addWidget(d->previewItemsWhileDownload, 1, 0, 1, 2);
grid3->addWidget(d->previewShowIcons, 2, 0, 1, 2);
// --------------------------------------------------------
d->fullScreenSettings = new FullScreenSettings(FS_IMPORTUI, panel4);
layout2->setMargin(0);
layout2->setSpacing(KDialog::spacingHint());
layout2->addWidget(iconViewGroup);
layout2->addWidget(interfaceOptionsGroup);
layout2->addWidget(d->fullScreenSettings);
layout2->addStretch();
d->tab->insertTab(3, panel4, i18n("Icon View"));
d->tab->insertTab(3, panel4, i18n("Import Window"));
// -------------------------------------------------------------
......@@ -591,6 +601,8 @@ void SetupCamera::readSettings()
d->target1AlbumSelector->setCurrentAlbum(album);
d->target1AlbumSelector->setEnabled(d->useDefaultTargetAlbum->isChecked());
d->fullScreenSettings->readSettings(group);
// -------------------------------------------------------
KConfigGroup importGroup = config->group(d->importFiltersConfigGroupName);
......@@ -685,6 +697,9 @@ void SetupCamera::applySettings()
group.writeEntry(d->configUseDefaultTargetAlbum, d->useDefaultTargetAlbum->isChecked());
PAlbum* const album = d->target1AlbumSelector->currentAlbum();
group.writeEntry(d->configDefaultTargetAlbumId, album ? album->id() : 0);
d->fullScreenSettings->saveSettings(group);
group.sync();
// -------------------------------------------------------
......
......@@ -7,7 +7,7 @@
* Description : camera setup tab.
*
* Copyright (C) 2003-2005 by Renchi Raju <renchi dot raju at gmail dot com>
* Copyright (C) 2003-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2003-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
......
Supports Markdown
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