From a5562c794fd0d342047e7dc808d790b4d6b78e4c Mon Sep 17 00:00:00 2001 From: Bharadwaj Raju Date: Thu, 14 Oct 2021 15:10:51 +0530 Subject: [PATCH 1/2] Make Quick Annotations button open the full toolbar when no Quick Annotations are configured Before the button did nothing in that case. Now it will toggle the full toolbar. --- part/annotationactionhandler.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/part/annotationactionhandler.cpp b/part/annotationactionhandler.cpp index 99d504ee9..8dd7a24ef 100644 --- a/part/annotationactionhandler.cpp +++ b/part/annotationactionhandler.cpp @@ -125,6 +125,7 @@ public: QAction *aAdvancedSettings; QAction *aHideToolBar; QAction *aShowToolBar; + QAction *aToggleFullToolBar; KToggleAction *aToolBarVisibility; QAction *aCustomStamp; @@ -396,10 +397,17 @@ void AnnotationActionHandlerPrivate::populateQuickAnnotations() // set the default action if (quickTools.isEmpty()) { - aQuickTools->setDefaultAction(aQuickTools); + aShowToolBar->setVisible(false); + aToggleFullToolBar->setEnabled(true); + aQuickTools->addAction(aToggleFullToolBar); + aQuickTools->setDefaultAction(aToggleFullToolBar); Okular::Settings::setQuickAnnotationDefaultAction(0); Okular::Settings::self()->save(); } else { + aShowToolBar->setVisible(true); + aToggleFullToolBar->setEnabled(false); + aQuickTools->removeAction(aToggleFullToolBar); + aQuickTools->setDefaultAction(aQuickTools); int defaultAction = Okular::Settings::quickAnnotationDefaultAction(); if (isFirstTimePopulated && defaultAction < quickTools.count()) { // we can reach here also if no quick tools were defined before, in that case defaultAction is correctly equal to zero -- GitLab From 244f51a45d4deceefe0cca0aba020f1e95ad692e Mon Sep 17 00:00:00 2001 From: Bharadwaj Raju Date: Thu, 14 Oct 2021 20:14:52 +0530 Subject: [PATCH 2/2] Reuse existing action and simplify patch --- part/annotationactionhandler.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/part/annotationactionhandler.cpp b/part/annotationactionhandler.cpp index 8dd7a24ef..ddaed908c 100644 --- a/part/annotationactionhandler.cpp +++ b/part/annotationactionhandler.cpp @@ -125,7 +125,6 @@ public: QAction *aAdvancedSettings; QAction *aHideToolBar; QAction *aShowToolBar; - QAction *aToggleFullToolBar; KToggleAction *aToolBarVisibility; QAction *aCustomStamp; @@ -398,15 +397,13 @@ void AnnotationActionHandlerPrivate::populateQuickAnnotations() // set the default action if (quickTools.isEmpty()) { aShowToolBar->setVisible(false); - aToggleFullToolBar->setEnabled(true); - aQuickTools->addAction(aToggleFullToolBar); - aQuickTools->setDefaultAction(aToggleFullToolBar); + aQuickTools->addAction(aToolBarVisibility); + aQuickTools->setDefaultAction(aToolBarVisibility); Okular::Settings::setQuickAnnotationDefaultAction(0); Okular::Settings::self()->save(); } else { aShowToolBar->setVisible(true); - aToggleFullToolBar->setEnabled(false); - aQuickTools->removeAction(aToggleFullToolBar); + aQuickTools->removeAction(aToolBarVisibility); aQuickTools->setDefaultAction(aQuickTools); int defaultAction = Okular::Settings::quickAnnotationDefaultAction(); if (isFirstTimePopulated && defaultAction < quickTools.count()) { -- GitLab