Commit 52cdc362 authored by Gilles Caulier's avatar Gilles Caulier 🗼
Browse files

Image Editor and Light Table windows now manage side-bars visibility in Full-Screen mode.

CCBUGS: 214107
CCBUGS: 220739
CCBUGS: 289262
CCBUGS: 236234
CCBUGS: 258180
CCBUGS: 293676
parent 9d2bb7da
......@@ -59,7 +59,7 @@ public:
Private()
{
fsOptions = FS_DEFAULT;
fsOptions = FS_NONE;
fullScreenAction = 0;
fullScreenBtn = 0;
dirtyMainToolBar = false;
......
......@@ -49,11 +49,13 @@ namespace Digikam
*/
enum FullScreenOptions
{
FS_TOOLBARS = 0x00000001,
FS_THUMBBAR = 0x00000002,
FS_SIDEBARS = 0x00000004,
FS_NONE = 0x00000008,
FS_DEFAULT = FS_TOOLBARS | FS_THUMBBAR // Image Editor config.
FS_TOOLBARS = 0x00000001, /// Manage Tools bar in full-screen mode.
FS_THUMBBAR = 0x00000002, /// Manage Thumb bar in full-screen mode.
FS_SIDEBARS = 0x00000004, /// Manage Side bars in full-screen mode.
FS_NONE = 0x00000008, /// No full-screen options.
FS_EDITOR = FS_TOOLBARS | FS_THUMBBAR | FS_SIDEBARS, /// Image Editor Config.
FS_LIGHTTABLE = FS_TOOLBARS | FS_SIDEBARS /// Light Table Config.
};
static const QString s_configFullScreenHideToolBarsEntry("FullScreen Hide ToolBars");
......
......@@ -48,7 +48,7 @@ public:
Private()
{
options = FS_DEFAULT;
options = FS_NONE;
hideToolBars = 0;
hideThumbBar = 0;
hideSideBars = 0;
......@@ -77,6 +77,7 @@ FullScreenSettings::FullScreenSettings(int options, QWidget* const parent)
vlay->addWidget(d->hideToolBars);
vlay->addWidget(d->hideThumbBar);
vlay->addWidget(d->hideSideBars);
vlay->setMargin(0);
vlay->setSpacing(KDialog::spacingHint());
......
......@@ -166,7 +166,7 @@ EditorWindow::EditorWindow(const char* const name)
{
setObjectName(name);
setWindowFlags(Qt::Window);
setFullScreenOptions(FS_DEFAULT);
setFullScreenOptions(FS_EDITOR);
m_nonDestructive = true;
m_contextMenu = 0;
......
......@@ -127,7 +127,7 @@ LightTableWindow::LightTableWindow()
setCaption(i18n("Light Table"));
// We don't want to be deleted on close
setAttribute(Qt::WA_DeleteOnClose, false);
setFullScreenOptions(FS_TOOLBARS);
setFullScreenOptions(FS_LIGHTTABLE);
// -- Build the GUI -------------------------------
......
......@@ -153,7 +153,7 @@ SetupEditor::SetupEditor(QWidget* const parent)
// --------------------------------------------------------
d->fullScreenSettings = new FullScreenSettings(FS_DEFAULT, panel);
d->fullScreenSettings = new FullScreenSettings(FS_EDITOR, panel);
// --------------------------------------------------------
......
......@@ -127,7 +127,7 @@ SetupLightTable::SetupLightTable(QWidget* const parent)
// --------------------------------------------------------
d->fullScreenSettings = new FullScreenSettings(FS_TOOLBARS, panel);
d->fullScreenSettings = new FullScreenSettings(FS_LIGHTTABLE, panel);
// --------------------------------------------------------
......
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