From b9b1d2fb6626621008aa2f1b66aea116595dc2fc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 24 Oct 2023 19:15:14 +0300 Subject: [PATCH] Show disabled action instead of empty menu. --- src/app/tape/tmainwindow.cpp | 8 ++++++++ .../dialogs/dialogfinalmeasurements.cpp | 8 ++++++++ src/app/valentina/dialogs/dialoghistory.cpp | 8 ++++++++ src/app/valentina/dialogs/dialogincrements.cpp | 16 ++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 7643be530..85fb71529 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -5035,6 +5035,14 @@ void TMainWindow::InitSearchHistory() { QStringList searchHistory = MApplication::VApp()->TapeSettings()->GetTapeSearchHistory(); m_searchHistory->clear(); + + if (searchHistory.isEmpty()) + { + QAction *action = m_searchHistory->addAction('<'_L1 + tr("Empty", "list") + '>'_L1); + action->setDisabled(true); + return; + } + for (const auto &term : searchHistory) { QAction *action = m_searchHistory->addAction(term); diff --git a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp index fab3197ac..23d9b3d39 100644 --- a/src/app/valentina/dialogs/dialogfinalmeasurements.cpp +++ b/src/app/valentina/dialogs/dialogfinalmeasurements.cpp @@ -885,6 +885,14 @@ void DialogFinalMeasurements::InitSearchHistory() QStringList searchHistory = VAbstractValApplication::VApp()->ValentinaSettings()->GetFinalMeasurementsSearchHistory(); m_searchHistory->clear(); + + if (searchHistory.isEmpty()) + { + QAction *action = m_searchHistory->addAction('<'_L1 + tr("Empty", "list") + '>'_L1); + action->setDisabled(true); + return; + } + for (const auto &term : searchHistory) { QAction *action = m_searchHistory->addAction(term); diff --git a/src/app/valentina/dialogs/dialoghistory.cpp b/src/app/valentina/dialogs/dialoghistory.cpp index c06c38644..dca8b0c35 100644 --- a/src/app/valentina/dialogs/dialoghistory.cpp +++ b/src/app/valentina/dialogs/dialoghistory.cpp @@ -767,6 +767,14 @@ void DialogHistory::InitSearchHistory() { QStringList searchHistory = VAbstractValApplication::VApp()->ValentinaSettings()->GetHistorySearchHistory(); m_searchHistory->clear(); + + if (searchHistory.isEmpty()) + { + QAction *action = m_searchHistory->addAction('<'_L1 + tr("Empty", "list") + '>'_L1); + action->setDisabled(true); + return; + } + for (const auto &term : searchHistory) { QAction *action = m_searchHistory->addAction(term); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 410244f77..69c7deb21 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -1131,6 +1131,14 @@ void DialogIncrements::InitIncrementsSearchHistory() { QStringList searchHistory = VAbstractValApplication::VApp()->ValentinaSettings()->GetIncrementsSearchHistory(); m_searchHistory->clear(); + + if (searchHistory.isEmpty()) + { + QAction *action = m_searchHistory->addAction('<'_L1 + tr("Empty", "list") + '>'_L1); + action->setDisabled(true); + return; + } + for (const auto &term : searchHistory) { QAction *action = m_searchHistory->addAction(term); @@ -1156,6 +1164,14 @@ void DialogIncrements::InitPreviewCalculationsSearchHistory() QStringList searchHistory = VAbstractValApplication::VApp()->ValentinaSettings()->GetPreviewCalculationsSearchHistory(); m_searchHistoryPC->clear(); + + if (searchHistory.isEmpty()) + { + QAction *action = m_searchHistoryPC->addAction('<'_L1 + tr("Empty", "list") + '>'_L1); + action->setDisabled(true); + return; + } + for (const auto &term : searchHistory) { QAction *action = m_searchHistoryPC->addAction(term);