Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / ui / default.ui

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 95cf61761a9ac0a4b22e831ae32898e06aa420d9..03efe167af560536ed257b02222408bd9be98b86 100644 (file)
--- 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 1
 
 Include "stdmenus.inc"
 
+Include "stdcontext.inc"
+
 Include "stdtoolbars.inc"
 
 # Which toolbars to use.
@@ -30,17 +34,22 @@ Include "stdtoolbars.inc"
 # 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
 #
 # 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"
        "view/update" "on,top"
-       "extra" "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"