X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fui%2Fdefault.ui;h=fa20f1d39e35fb7d99cb8aea2a214098c5d6beb0;hb=c663a1f50a4fb2375512f8be51c30a249397eae5;hp=b65720845b08922a93f1e9ca446012ee521d760e;hpb=8dd721572f83c2d1b631e2de8bf803477faeb1e0;p=lyx.git

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index b65720845b..fa20f1d39e 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -12,10 +12,14 @@
 # The syntax should be straightforward enough.
 
 # The interface is designed (partially) following the KDE Human Interface
-# Guidelines (http://usability.kde.org/hig/)
+# Guidelines (http://techbase.kde.org/Projects/Usability/HIG)
+
+Format 2
 
 Include "stdmenus.inc"
 
+Include "stdcontext.inc"
+
 Include "stdtoolbars.inc"
 
 # Which toolbars to use.
@@ -24,19 +28,33 @@ Include "stdtoolbars.inc"
 #
 # on: the toolbar is visible
 # off: the toolbar is not visible
+# auto: the toolbar is automatically shown and hidden depending on the
+#       next 3 flags.
+#
 # math: the toolbar is visible only when in math
+# mathmacrotemplate: the toolbar is visible only when in a macro definition
 # table: the toolbar is visible only when in a table
+# review: the toolbar is visible only when inside a tracked change
+# ipa: the toolbar is only visible when inside an ipa inset
+#
 # top: the toolbar should be at the top of the window
 # bottom: the toolbar should be at the bottom of the window
 # left: the toolbar should be at the left of the window
 # right: the toolbar should be at the right of the window
 #
+# samerow: do not create new line for this toolbar
+#        (note that order of toolbars is defined in stdtoolbars.inc)
+#
 Toolbars
 	"standard" "on,top"
-	"extra" "on,top"
-	"view/update" "on,right"
-	"review" "review,top"
-	"table" "table,bottom"
-	"math" "math,bottom"
+	"view/update" "on,top"
+	"extra" "on,top,samerow"
+	"review" "auto,review,top"
+	"vcs" "off,top"
+	"table" "auto,table,bottom"
+	"math_panels" "auto,math,bottom"
+	"math" "auto,math,bottom"
+	"mathmacrotemplate" "auto,mathmacrotemplate,bottom"
+	"ipa" "auto,ipa,bottom"
 	"minibuffer" "off,bottom"
 End