From 27075778c61f6772ecba81db2568c01c6b3c1e01 Mon Sep 17 00:00:00 2001 From: Syping Date: Mon, 24 Aug 2020 16:35:52 +0200 Subject: [PATCH] enable NavigationBar for non-Windows systems --- OptionsDialog.cpp | 7 +++++-- PictureDialog.cpp | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp index e3c6c72..ff1c43d 100644 --- a/OptionsDialog.cpp +++ b/OptionsDialog.cpp @@ -362,6 +362,8 @@ void OptionsDialog::applySettings() #if QT_VERSION >= 0x050200 settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked()); #endif +#else + settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked()); #endif settings->endGroup(); @@ -722,8 +724,9 @@ void OptionsDialog::setupSnapmaticPictureViewer() ui->gbSnapmaticPictureViewer->setVisible(false); #endif #else - ui->cbSnapmaticNavigationBar->setVisible(false); - ui->gbSnapmaticPictureViewer->setVisible(false); + settings->beginGroup("Interface"); + ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", true).toBool()); + settings->endGroup(); #endif } diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 990dead..f710599 100644 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -215,6 +215,15 @@ PictureDialog::~PictureDialog() delete layout()->menuBar(); } #endif +#else + if (naviEnabled) + { + for (QObject *obj : layout()->menuBar()->children()) + { + delete obj; + } + delete layout()->menuBar(); + } #endif for (QObject *obj : manageMenu->children()) { @@ -247,6 +256,15 @@ void PictureDialog::addPreviousNextButtons() naviEnabled = true; #endif +#else + QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this); + uiToolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + uiToolbar->setObjectName("uiToolbar"); + uiToolbar->addAction(QIcon(":/img/back.svgz"), "", this, SLOT(previousPictureRequestedSlot())); + uiToolbar->addAction(QIcon(":/img/next.svgz"), "", this, SLOT(nextPictureRequestedSlot())); + layout()->setMenuBar(uiToolbar); + + naviEnabled = true; #endif }