commit 8319bdbbbe4515307ef95115ec6462f6533c52a2
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Tue Sep 13 12:42:28 2022 +0200
Unify wording for statistics
Use 'no blanks' uniformly.
Also remove separator in zoom menu.
---
lib/ui/stdcontext.inc | 2 +-
src/BufferView.cpp | 10 ++++------
src/frontends/qt/Menus.cpp | 1 -
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index b9a2304..c342f39 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -739,7 +739,7 @@ Menuset
Separator
Item "Word Count|W" "ui-toggle statistics-w"
Item "Character Count|C" "ui-toggle statistics-cb"
- Item "Character Count (Without Blanks)|h" "ui-toggle
statistics-c"
+ Item "Character Count (No Blanks)|h" "ui-toggle statistics-c"
End
End
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index da309d6..52baf09 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1876,16 +1876,14 @@ void BufferView::dispatch(FuncRequest const & cmd,
DispatchResult & dr)
message += _("One word");
message += "\n";
if (chars_blanks != 1)
- message += bformat(_("%1$d characters (including
blanks)"),
- chars_blanks);
+ message += bformat(_("%1$d characters"), chars_blanks);
else
- message += _("One character (including blanks)");
+ message += _("One character");
message += "\n";
if (chars != 1)
- message += bformat(_("%1$d characters (excluding
blanks)"),
- chars);
+ message += bformat(_("%1$d characters (no blanks)"),
chars);
else
- message += _("One character (excluding blanks)");
+ message += _("One character (no blanks)");
Alert::information(_("Statistics"), message);
}
diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp
index 2fbac3f..6b0c12b 100644
--- a/src/frontends/qt/Menus.cpp
+++ b/src/frontends/qt/Menus.cpp
@@ -1831,7 +1831,6 @@ void MenuDefinition::expandZoomOptions(BufferView const *
bv)
toqstr(bformat(_("Reset to Default (%1$d%)|R"),
lyxrc.defaultZoom)),
FuncRequest(LFUN_BUFFER_ZOOM)));
- add(MenuItem(MenuItem::Separator));
add(MenuItem(MenuItem::Command, qt_("Zoom In|I"),
FuncRequest(LFUN_BUFFER_ZOOM_IN)));
add(MenuItem(MenuItem::Command, qt_("Zoom Out|O"),
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
