]> git.lyx.org Git - lyx.git/blobdiff - lib/ui/stdtoolbars.inc
Add accept/reject change to the context menu of the toc.
[lyx.git] / lib / ui / stdtoolbars.inc
index 2bf0ede5dbc80a7bbda115886c6747006aa1d48c..8a50201f04fd52508936bc3b8da7534d054dae08 100644 (file)
@@ -67,6 +67,7 @@ ToolbarSet
                Item "Copy" "copy"
                Item "Paste" "paste"
                Item "Find and replace" "dialog-show findreplace"
+               Item "Navigate back" "bookmark-goto 0"
                Separator
                Item "Toggle emphasis" "font-emph"
                Item "Toggle noun" "font-noun"
@@ -126,13 +127,13 @@ ToolbarSet
                Item "Set all lines" "tabular-feature set-all-lines"
                Item "Unset all lines" "tabular-feature unset-all-lines"
                Separator
-               Item "Align left" "tabular-feature align-left"
-               Item "Align center" "tabular-feature align-center"
-               Item "Align right" "tabular-feature align-right"
+               Item "Align left" "command-alternatives tabular-feature m-align-left;tabular-feature align-left"
+               Item "Align center" "command-alternatives tabular-feature m-align-center;tabular-feature align-center"
+               Item "Align right" "command-alternatives tabular-feature m-align-right;tabular-feature align-right"
                Separator
-               Item "Align top" "tabular-feature valign-top"
-               Item "Align middle" "tabular-feature valign-middle"
-               Item "Align bottom" "tabular-feature valign-bottom"
+               Item "Align top" "command-alternatives tabular-feature m-valign-top;tabular-feature valign-top"
+               Item "Align middle" "command-alternatives tabular-feature m-valign-middle;tabular-feature valign-middle"
+               Item "Align bottom" "command-alternatives tabular-feature m-valign-bottom;tabular-feature valign-bottom"
                Separator
                Item "Rotate cell" "tabular-feature toggle-rotate-cell"
                Item "Rotate table" "tabular-feature toggle-rotate-tabular"
@@ -167,18 +168,18 @@ ToolbarSet
        End
 
        Toolbar "mathmacrotemplate" "Math Macros"
-               Item "Remove Last Parameter" "math-macro-remove-param"
-               Item "Append Parameter" "math-macro-add-param"
+               Item "Remove Last Argument" "math-macro-remove-param"
+               Item "Append Argument" "math-macro-add-param"
                 Separator
-               Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional"
-               Item "Make Last Optional into Non-Optional Parameter"
+               Item "Make First Non-Optional into Optional Argument" "math-macro-make-optional"
+               Item "Make Last Optional into Non-Optional Argument"
                "math-macro-make-nonoptional"
-                Item "Remove Optional Parameter" "math-macro-remove-optional-param"
-                Item "Insert Optional Parameter" "math-macro-add-optional-param"
+                Item "Remove Optional Argument" "math-macro-remove-optional-param"
+                Item "Insert Optional Argument" "math-macro-add-optional-param"
                Separator
-               Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param"
-               Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param"
-                Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param"
+               Item "Remove Last Argument Spitting Out To The Right" "math-macro-remove-greedy-param"
+               Item "Append Argument Eating From The Right" "math-macro-append-greedy-param"
+                Item "Append Optional Argument Eating From The Right" "math-macro-add-greedy-optional-param"
        End
        
        Toolbar "minibuffer" "Command Buffer"
@@ -190,8 +191,8 @@ ToolbarSet
                Item "Show changes in output" "changes-output"
                Separator
                Item "Next change" "change-next"
-               Item "Accept change" "change-accept"
-               Item "Reject change" "change-reject"
+               Item "Accept change inside selection" "change-accept"
+               Item "Reject change inside selection" "change-reject"
                Separator
                Item "Merge changes" "changes-merge"
                Item "Accept all changes" "all-changes-accept"
@@ -202,14 +203,35 @@ ToolbarSet
        End
        
        Toolbar "view/update" "View/Update"
+               Item "View" "buffer-view"
+               Item "Update" "buffer-update"
+               Item "View Master Document" "master-buffer-view"
+               Item "Update Master Document" "master-buffer-update"
+               Separator
+               StickyPopupMenu "view-others" "View Other Formats"
+               StickyPopupMenu "update-others" "Update Other Formats"
+       End
+       
+       Toolbar "view-others" "View Other Formats"
                Item "View DVI" "buffer-view dvi"
-               Item "Update DVI" "buffer-update dvi"
                Item "View PDF (pdflatex)" "buffer-view pdf2"
-               Item "Update PDF (pdflatex)" "buffer-update pdf2"
                Item "View PostScript" "buffer-view ps"
+       End
+       
+       Toolbar "update-others" "Update Other Formats"
+               Item "Update DVI" "buffer-update dvi"
+               Item "Update PDF (pdflatex)" "buffer-update pdf2"
                Item "Update PostScript" "buffer-update ps"
        End
 
+       Toolbar "vcs" "Version Control"
+               Item "Register" "vc-register"
+               Item "Check-out for edit" "vc-check-out"
+               Item "Check-in changes" "vc-check-in"
+               Item "View revision log" "dialog-show vclog"
+               Item "Revert changes" "vc-revert"
+       End
+
        Toolbar "math_panels" "Math Panels"
                PopupMenu "space" "Math Spacings"
                PopupMenu "style" "Styles"
@@ -285,22 +307,24 @@ ToolbarSet
        End
        
        Toolbar "style" "Styles"
-               Item "Display style     \\displaystyle" "math-insert \displaystyle"
-               Item "Normal text style \\textstyle" "math-insert \textstyle"
-               Item "Script (small) style      \\scriptstyle" "math-insert \scriptstyle"
-               Item "Scriptscript (smaller) style      \\scriptscriptstyle" "math-insert \scriptscriptstyle"
+               Item "Display style     \\displaystyle" "math-size \displaystyle"
+               Item "Normal text style \\textstyle" "math-size \textstyle"
+               Item "Script (small) style      \\scriptstyle" "math-size \scriptstyle"
+               Item "Scriptscript (smaller) style      \\scriptscriptstyle" "math-size \scriptscriptstyle"
        End
        
        Toolbar "frac-square" "Fractions"
                Item "Standard  \\frac" "math-insert \frac"
-               Item "No horizontal line        \\atop" "math-insert \atop"
                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 fraction (km/h)      \\unitfrac" "math-insert \unitfrac"
                Item "Unit fraction (20 km/h)   \\unitfrac" "math-insert \unitfracthree"
-               Item "Text fraction (amsmath)   \\tfrac" "math-insert \tfrac"
-               Item "Display fraction (amsmath)        \\dfrac" "math-insert \dfrac"
+               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 "Binomial  \\binom" "math-insert \binom"
                Item "Text binomial     \\tbinom" "math-insert \tbinom"
                Item "Display binomial  \\dbinom" "math-insert \dbinom"
@@ -572,6 +596,12 @@ ToolbarSet
                Item "sqintop" "math-insert \sqintop"
                Item "sqiint" "math-insert \sqiint"
                Item "sqiintop" "math-insert \sqiintop"
+               Item "fint" "math-insert \fint"
+               Item "fintop" "math-insert \fintop"
+               Item "landupint" "math-insert \landupint"
+               Item "landupintop" "math-insert \landupintop"
+               Item "landdownint" "math-insert \landdownint"
+               Item "landdownintop" "math-insert \landdownintop"
                Item "sum" "math-insert \sum"
                Item "prod" "math-insert \prod"
                Item "coprod" "math-insert \coprod"