re-add ... to some menu entries

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5964 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index e1bfab97059c122426a1152be7c6af58f9ce8e05..7abfbc22c1f4a49ccf325c58f9101f1799defa8f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ui/default.ui: re-add ellipsis on some menu entries
+
 2003-01-15  Dekel Tsur  <dekelts@tau.ac.il>
 
        * symbols: Fix \Box, \Diamond, \cong, and \surd.

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index b91b92732f7519600a68eb787a69e8f235d7f7be..4d65bee872766ae6bad1b7c08c34faa8d0ea8cda 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -40,7 +40,7 @@ Menuset
     End
 
     Menu "file_vc"
-       OptItem "Register|R" "vc-register"
+       OptItem "Register...|R" "vc-register"
        OptItem "Check In Changes...|I" "vc-check-in"
        OptItem "Check Out for Edit|O" "vc-check-out"
        OptItem "Revert to Last Version|L" "vc-revert"
@@ -75,13 +75,13 @@ Menuset
        Submenu "Math|M" "edit_math"
        Separator
        #Item "Read Only" "buffer-toggle-read-only"
-       Item "Spellchecker|S" "spellchecker"
-       Item "Thesaurus" "thesaurus-entry"
+       Item "Spellchecker...|S" "spellchecker"
+       Item "Thesaurus..." "thesaurus-entry"
        Item "Check TeX|h" "buffer-chktex"
        Item "Remove All Error Boxes|E" "error-remove-all"
        Item "Open/Close float|l" "inset-toggle"
        Separator
-       Item "Preferences|P" "dialog-preferences"
+       Item "Preferences...|P" "dialog-preferences"
        Item "Reconfigure|R" "reconfigure"
     End
 
@@ -200,7 +200,7 @@ Menuset
        Item "Footnote|F" "footnote-insert"
        Item "Marginal Note|M" "marginalnote-insert"
        Item "Short Title" "optional-insert"
-       Item "Index Entry|I" "index-insert"
+       Item "Index Entry...|I" "index-insert"
        Item "URL...|U" "url-insert"
        Item "Note|N" "note-insert"
        Submenu "Lists & TOC|O" "insert_toc"
@@ -296,10 +296,10 @@ Menuset
 # LAYOUT MENU
 #
     Menu "layout"
-       Item "Character|C" "layout-character"
-       Item "Paragraph|P" "layout-paragraph"
-       Item "Document|D" "layout-document"
-       OptItem "Tabular|T" "layout-tabular"
+       Item "Character...|C" "layout-character"
+       Item "Paragraph...|P" "layout-paragraph"
+       Item "Document...|D" "layout-document"
+       OptItem "Tabular...|T" "layout-tabular"
        Separator
        Item "Emphasize Style|E" "font-emph"
        Item "Noun Style|N" "font-noun"
@@ -308,7 +308,7 @@ Menuset
        Separator
        Item "Decrease Environment Depth|v" "depth-decrement"
        Item "Increase Environment Depth|i" "depth-increment"
-       Item "Preamble|r" "layout-preamble"
+       Item "Preamble...|r" "layout-preamble"
        Item "Start Appendix Here|S" "appendix"
     End
 

diff --git a/src/ChangeLog b/src/ChangeLog
index d24276a67ad9fea791d324ca20658505c79e5fb6..6a0b9aac75473da8d6820a4450802fa34fc4606f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * MenuBackend.C (expandFormats): add "..." to import formats.
+
 2003-01-15  Dekel Tsur  <dekelts@tau.ac.il>
 
        * paragraph.C (asString): Remove XForms RTL hacks.

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index b56262882001e914dc88ef40030f22a4063a929f..445cde4f2801be9b23c20578516f5ce941db4e7f 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -373,11 +373,13 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
                if (label == "EPS" || label == "XPM" || label == "PNG")
                        continue;
 
-               if (kind == MenuItem::ImportFormats)
+               if (kind == MenuItem::ImportFormats) {
                        if ((*fit)->name() == "text")
                                label = _("ASCII text as lines");
                        else if ((*fit)->name() == "textparagraph")
                                label = _("ASCII text as paragraphs");
+                       label += "...";
+               }
                if (!(*fit)->shortcut().empty())
                        label += '|' + (*fit)->shortcut();
                int const action2 = lyxaction.