[LyX/master] Fix tristate toolbar toggling via toolbar (#12177)

Juergen Spitzmueller spitz at lyx.org
Fri Mar 5 16:08:18 UTC 2021


commit 11d6708781cb4cb5d5c8638c3bad9905d0e78996
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri Mar 5 17:12:51 2021 +0100

    Fix tristate toolbar toggling via toolbar (#12177)
---
 lib/ui/stdtoolbars.inc |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index ddcff9d..5d48811 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -100,9 +100,9 @@ ToolbarSet
 		DynamicMenu "dynamic-custom-insets" "Custom insets"
 		Separator
 		Item "Toggle outline" "dialog-toggle toc"
-		Item "Toggle math toolbar" "toolbar-toggle math"
-		Item "Toggle table toolbar" "toolbar-toggle table"
-		Item "Toggle review toolbar" "toolbar-toggle review"
+		PopupMenu "toolbar-toggle_math" "Show math toolbar"
+		PopupMenu "toolbar-toggle_table" "Show table toolbar"
+		PopupMenu "toolbar-toggle_review" "Show review toolbar"
 	End
 
 	Toolbar "view/update" "View/Update"
@@ -209,7 +209,7 @@ ToolbarSet
 		Item "Delete row" "tabular-feature delete-row"
 		Item "Delete column" "tabular-feature delete-column"
 		Separator
-		Item "Toggle math panels" "toolbar-toggle math_panels"
+		PopupMenu "toolbar-toggle_math_panels" "Show math panels"
 	End
 
 	Toolbar "math_panels" "Math Panels"
@@ -297,6 +297,30 @@ ToolbarSet
 		UpdateFormats
 	End
 
+	Toolbar "toolbar-toggle_math" "Show math toolbar"
+		Item "[[Toolbar]]On" "toolbar-set math on"
+		Item "[[Toolbar]]Off" "toolbar-set math off"
+		Item "[[Toolbar]]Automatic" "toolbar-set math auto"
+	End
+
+	Toolbar "toolbar-toggle_math_panels" "Show math panels"
+		Item "[[Toolbar]]On" "toolbar-set math_panels on"
+		Item "[[Toolbar]]Off" "toolbar-set math_panels off"
+		Item "[[Toolbar]]Automatic" "toolbar-set math_panels auto"
+	End
+
+	Toolbar "toolbar-toggle_table" "Show table toolbar"
+		Item "[[Toolbar]]On" "toolbar-set table on"
+		Item "[[Toolbar]]Off" "toolbar-set table off"
+		Item "[[Toolbar]]Automatic" "toolbar-set table auto"
+	End
+
+	Toolbar "toolbar-toggle_review" "Show review toolbar"
+		Item "[[Toolbar]]On" "toolbar-set review on"
+		Item "[[Toolbar]]Off" "toolbar-set review off"
+		Item "[[Toolbar]]Automatic" "toolbar-set review auto"
+	End
+
 # The following three toolbars are disabled because of missing icons.
 #	Toolbar "import/export" "Import/Export"
 #		Item "Import" "buffer-import"


More information about the lyx-cvs mailing list