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

[lyx.git] / lib / ui / stdtoolbars.inc

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 42eb3f3ff3c0c3613f26dbc1e8033299fafe16a0..41907600103f4b9b8f2c1fbadcdb1086317d4fd9 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -10,7 +10,7 @@
 # Full author contact details are available in file CREDITS.
 
 # The interface is designed (partially) following the KDE Human Interface
-# Guidelines (http://usability.kde.org/hig/)
+# Guidelines (http://techbase.kde.org/Projects/Usability/HIG)
 
 # Casing rules "The tooltip":
 # Capitalize the first letter of the first word, and any other words normally
@@ -62,6 +62,8 @@
 #
 # This is the default toolbar:
 
+Format 1
+
 ToolbarSet
 
        Toolbar "standard" "Standard"
@@ -86,7 +88,7 @@ ToolbarSet
                Item "Toggle noun" "font-noun"
                Item "Apply last" "textstyle-apply"
                Separator
-               Item "Insert math" "math-mode"
+               Item "Insert math" "math-mode on"
                Item "Insert graphics" "dialog-show-new-inset graphics"
                TableInsert "Insert table"
                Separator
@@ -160,8 +162,8 @@ ToolbarSet
                Item "Align middle" "command-alternatives inset-modify tabular m-valign-middle;inset-modify tabular valign-middle"
                Item "Align bottom" "command-alternatives inset-modify tabular m-valign-bottom;inset-modify tabular valign-bottom"
                Separator
-               Item "Rotate cell" "inset-modify tabular toggle-rotate-cell"
-               Item "Rotate table" "inset-modify tabular toggle-rotate-tabular"
+               Item "Rotate cell by 90 degrees or unset rotation" "inset-modify tabular toggle-rotate-cell"
+               Item "Rotate table by 90 degrees or unset rotation" "inset-modify tabular toggle-rotate-tabular"
                Item "Set multi-column" "inset-modify tabular multicolumn"
                Item "Set multi-row" "inset-modify tabular multirow"
        End
@@ -334,6 +336,10 @@ ToolbarSet
                Item "Phantom   \\phantom" "math-insert \phantom"
                Item "Horizontal phantom        \\hphantom" "math-insert \hphantom"
                Item "Vertical phantom  \\vphantom" "math-insert \vphantom"
+               Item "Smash \\smash" "math-insert \smash"
+               Item "Left overlap \\mathllap" "math-insert \mathllap"
+               Item "Center overlap \\mathclap" "math-insert \mathclap"
+               Item "Right overlap \\mathrlap" "math-insert \mathrlap"
        End
 
        Toolbar "sqrt-square" "Roots"
@@ -351,15 +357,15 @@ ToolbarSet
        Toolbar "frac-square" "Fractions"
                Item "Standard  \\frac" "math-insert \frac"
                Item "Nice fraction (3/4)       \\nicefrac" "math-insert \nicefrac"
-               Item "Unit (km) \\unit" "math-insert \unitone"
-               Item "Unit (864 m)      \\unit" "math-insert \unittwo"
+               Item "Unit (km) \\unitone" "math-insert \unitone"
+               Item "Unit (864 m)      \\unittwo" "math-insert \unittwo"
                Item "Unit fraction (km/h)      \\unitfrac" "math-insert \unitfrac"
-               Item "Unit fraction (20 km/h)   \\unitfrac" "math-insert \unitfracthree"
+               Item "Unit fraction (20 km/h)   \\unitfracthree" "math-insert \unitfracthree"
                Item "Text fraction     \\tfrac" "math-insert \tfrac"
                Item "Display fraction  \\dfrac" "math-insert \dfrac"
                Item "Continued fraction        \\cfrac" "math-insert \cfrac"
-               Item "Continued fraction (left) \\cfrac" "math-insert \cfracleft"
-               Item "Continued fraction (right)        \\cfrac" "math-insert \cfracright"
+               Item "Continued fraction (left) \\cfracleft" "math-insert \cfracleft"
+               Item "Continued fraction (right)        \\cfracright" "math-insert \cfracright"
                Item "Binomial  \\binom" "math-insert \binom"
                Item "Text binomial     \\tbinom" "math-insert \tbinom"
                Item "Display binomial  \\dbinom" "math-insert \dbinom"
@@ -396,6 +402,7 @@ ToolbarSet
                Item "check" "math-insert \check"
                Item "widehat" "math-insert \widehat"
                Item "widetilde" "math-insert \widetilde"
+               Item "utilde" "math-insert \utilde"
                Item "vec" "math-insert \vec"
                Item "acute" "math-insert \acute"
                Item "ddot" "math-insert \ddot"
@@ -414,6 +421,10 @@ ToolbarSet
                Item "underrightarrow" "math-insert \underrightarrow"
                Item "underleftrightarrow" "math-insert \underleftrightarrow"
                Item "underset" "math-insert \underset"
+               Item "cancel" "math-insert \cancel"
+               Item "bcancel" "math-insert \bcancel"
+               Item "xcancel" "math-insert \xcancel"
+               Item "cancelto" "math-insert \cancelto"
        End
 
        Toolbar "latex_arrow" "Arrows"
@@ -552,17 +563,6 @@ ToolbarSet
                Item "chi" "math-insert \chi"
                Item "psi" "math-insert \psi"
                Item "omega" "math-insert \omega"
-               Item "varGamma" "math-insert \varGamma"
-               Item "varDelta" "math-insert \varDelta"
-               Item "varTheta" "math-insert \varTheta"
-               Item "varLambda" "math-insert \varLambda"
-               Item "varXi" "math-insert \varXi"
-               Item "varPi" "math-insert \varPi"
-               Item "varSigma" "math-insert \varSigma"
-               Item "varUpsilon" "math-insert \varUpsilon"
-               Item "varPhi" "math-insert \varPhi"
-               Item "varPsi" "math-insert \varPsi"
-               Item "varOmega" "math-insert \varOmega"
                Item "Gamma" "math-insert \Gamma"
                Item "Delta" "math-insert \Delta"
                Item "Theta" "math-insert \Theta"