Commit 8cda9359 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

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

CCBUGS: 214107
CCBUGS: 220739
CCBUGS: 289262
CCBUGS: 236234
CCBUGS: 258180
CCBUGS: 293676
parent 52cdc362
......@@ -169,7 +169,7 @@ DigikamApp::DigikamApp()
{
// --------------------------------------------------------
setFullScreenOptions(FS_NONE);
setFullScreenOptions(FS_ALBUMGUI);
setXMLFile("digikamui.rc");
// --------------------------------------------------------
......
......@@ -54,6 +54,7 @@ enum FullScreenOptions
FS_SIDEBARS = 0x00000004, /// Manage Side bars in full-screen mode.
FS_NONE = 0x00000008, /// No full-screen options.
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.
};
......
......@@ -45,6 +45,8 @@
#include "albumsettings.h"
#include "dfontselect.h"
#include "fullscreensettings.h"
#include "dxmlguiwindow.h"
namespace Digikam
{
......@@ -73,33 +75,36 @@ public:
iconTreeThumbSize(0),
leftClickActionComboBox(0),
iconViewFontSelect(0),
treeViewFontSelect(0)
treeViewFontSelect(0),
fullScreenSettings(0)
{
}
QLabel* iconTreeThumbLabel;
QCheckBox* iconShowNameBox;
QCheckBox* iconShowSizeBox;
QCheckBox* iconShowDateBox;
QCheckBox* iconShowModDateBox;
QCheckBox* iconShowResolutionBox;
QCheckBox* iconShowAspectRatioBox;
QCheckBox* iconShowTitleBox;
QCheckBox* iconShowCommentsBox;
QCheckBox* iconShowTagsBox;
QCheckBox* iconShowOverlaysBox;
QCheckBox* iconShowRatingBox;
QCheckBox* iconShowFormatBox;
QCheckBox* previewLoadFullImageSize;
QCheckBox* previewShowIcons;
QCheckBox* showFolderTreeViewItemsCount;
KComboBox* iconTreeThumbSize;
KComboBox* leftClickActionComboBox;
DFontSelect* iconViewFontSelect;
DFontSelect* treeViewFontSelect;
QLabel* iconTreeThumbLabel;
QCheckBox* iconShowNameBox;
QCheckBox* iconShowSizeBox;
QCheckBox* iconShowDateBox;
QCheckBox* iconShowModDateBox;
QCheckBox* iconShowResolutionBox;
QCheckBox* iconShowAspectRatioBox;
QCheckBox* iconShowTitleBox;
QCheckBox* iconShowCommentsBox;
QCheckBox* iconShowTagsBox;
QCheckBox* iconShowOverlaysBox;
QCheckBox* iconShowRatingBox;
QCheckBox* iconShowFormatBox;
QCheckBox* previewLoadFullImageSize;
QCheckBox* previewShowIcons;
QCheckBox* showFolderTreeViewItemsCount;
KComboBox* iconTreeThumbSize;
KComboBox* leftClickActionComboBox;
DFontSelect* iconViewFontSelect;
DFontSelect* treeViewFontSelect;
FullScreenSettings* fullScreenSettings;
};
SetupAlbumView::SetupAlbumView(QWidget* const parent)
......@@ -239,11 +244,16 @@ SetupAlbumView::SetupAlbumView(QWidget* const parent)
// --------------------------------------------------------
d->fullScreenSettings = new FullScreenSettings(FS_ALBUMGUI, panel);
// --------------------------------------------------------
layout->setMargin(0);
layout->setSpacing(KDialog::spacingHint());
layout->addWidget(iconViewGroup);
layout->addWidget(folderViewGroup);
layout->addWidget(interfaceOptionsGroup);
layout->addWidget(d->fullScreenSettings);
layout->addStretch();
// --------------------------------------------------------
......@@ -295,6 +305,9 @@ void SetupAlbumView::applySettings()
settings->setPreviewShowIcons(d->previewShowIcons->isChecked());
settings->setShowFolderTreeViewItemsCount(d->showFolderTreeViewItemsCount->isChecked());
settings->saveSettings();
KConfigGroup group = settings->defaultConfigGroup();
d->fullScreenSettings->saveSettings(group);
}
void SetupAlbumView::readSettings()
......@@ -343,6 +356,9 @@ void SetupAlbumView::readSettings()
d->previewLoadFullImageSize->setChecked(settings->getPreviewLoadFullImageSize());
d->previewShowIcons->setChecked(settings->getPreviewShowIcons());
d->showFolderTreeViewItemsCount->setChecked(settings->getShowFolderTreeViewItemsCount());
KConfigGroup group = settings->defaultConfigGroup();
d->fullScreenSettings->readSettings(group);
}
} // namespace Digikam
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