[LyX/master] Remove ellipsis from "End Edit Externally..."

[Scott Kostyshak]

commit d957afdb64325d1ae4cbbee4a6d9b5055dae3b8f
Author: Daniel Ramoeller 
Date:   Wed May 17 20:26:32 2023 +0200

Remove ellipsis from "End Edit Externally..."

Fix for bug #12780
---
 lib/ui/stdcontext.inc |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 0b0d32f..b594814 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -371,7 +371,7 @@ Menuset
spellingsuggestions
Separator
OptItem "Edit Externally..." "inset-edit"
-   OptItem "End Editing Externally..." "inset-end-edit"
+   OptItem "End Editing Externally" "inset-end-edit"
Separator
Item "Cut" "cut"
Item "Copy" "copy"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Replace deprecated function

[Juergen Spitzmueller]

commit 92f211d6b4fc8de8ea60427d74afecd4ad90b3d0
Author: Juergen Spitzmueller 
Date:   Wed May 17 08:56:12 2023 +0200

Replace deprecated function

activateWindow() is available back to Qt4 (at least)
---
 src/frontends/qt/GuiApplication.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt/GuiApplication.cpp 
b/src/frontends/qt/GuiApplication.cpp
index 5abab17..165d140 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -1825,7 +1825,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
createView(QString(), false); // keep hidden
current_view_->newDocument(to_utf8(cmd.argument()));
current_view_->show();
-   setActiveWindow(current_view_);
+   current_view_->activateWindow();
} else {
current_view_->newDocument(to_utf8(cmd.argument()));
}
@@ -2619,7 +2619,7 @@ void GuiApplication::createView(QString const & 
geometry_arg, bool autoShow,
 
if (autoShow) {
view->show();
-   setActiveWindow(view);
+   view->activateWindow();
}
 
if (!geometry_arg.isEmpty()) {
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs