[LyX/2.4.x] Fix AboutLyX layout
commit 4137bf116e0abf4696532e183548ef5e9bdc5cf3 Author: Juergen Spitzmueller Date: Sat Nov 2 14:33:28 2024 +0100 Fix AboutLyX layout * remove wrong (sub)namespaces. This are inserted by newer versions of designer, although they are wrong * add vertical spacer * make horizontal spacer expand (cherry picked from commit 11cbc3c4a765f93268a662846d7082b089b3782b) --- src/frontends/qt/ui/AboutUi.ui | 69 +- status.24x | 2 ++ 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui index 5a03c23180..e4f1bb7be9 100644 --- a/src/frontends/qt/ui/AboutUi.ui +++ b/src/frontends/qt/ui/AboutUi.ui @@ -30,7 +30,7 @@ - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize @@ -45,7 +45,7 @@ -Qt::Orientation::Vertical +Qt::Vertical @@ -57,31 +57,15 @@ - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Fixed - - - - 20 - 20 - - - - -Qt::Orientation::Vertical +Qt::Vertical -QSizePolicy::Policy::Fixed +QSizePolicy::Fixed @@ -106,7 +90,7 @@LyX version info goes here.
Qt version (run-time) goes here.
Qt version (compile-time) goes here.
- Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter +Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true @@ -115,17 +99,17 @@ 0 - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse +Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse -Qt::Orientation::Vertical +Qt::Vertical -QSizePolicy::Policy::MinimumExpanding +QSizePolicy::MinimumExpanding @@ -178,7 +162,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -206,7 +190,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -253,7 +237,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -281,6 +265,35 @@ + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -415,7 +428,7 @@ -QDialogButtonBox::StandardButton::Close +QDialogButtonBox::Close diff --git a/status.24x b/status.24x index f2d63aed2c..853ef361c2 100644 --- a/status.24x +++ b/status.24x @@ -83,6 +83,8 @@ What's new - Fix problem with display of heading in document float settings. +- Fix some layout problems with the About LyX dialog. + * INTERNALS -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix two typos in comments
commit 08d316491f4f46f34245814457ac8da9db1f8908 Author: Thibaut Cuvelier Date: Wed Oct 30 20:20:19 2024 +0100 Fix two typos in comments --- src/mathed/MathParser.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h index 734a92f2f9..ef9472bf90 100644 --- a/src/mathed/MathParser.h +++ b/src/mathed/MathParser.h @@ -36,7 +36,7 @@ public: char const * MathMLtype() const; /// name of the macro or primitive docstring name; - /// name of a inset that handles that macro + /// name of an inset that handles that macro std::string inset; /** * The string or symbol to draw. @@ -48,7 +48,7 @@ public: * docstring argument. * If \p name is a known symbol, but the corresponding font is not * available, or if it is a function name, then \c draw contains a -* regular UCS4 string (actuallay \c draw == \c name) that is painted +* regular UCS4 string (actually \c draw == \c name) that is painted * on screen. */ docstring draw; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] More Qt enum fixes
commit 3e6ca9b88440e44cdad7f5eb07626d823ccce229 Author: Juergen Spitzmueller Date: Sun Nov 3 06:02:41 2024 +0100 More Qt enum fixes --- src/frontends/qt/ui/LanguageUi.ui | 8 src/frontends/qt/ui/NomenclUi.ui | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt/ui/LanguageUi.ui b/src/frontends/qt/ui/LanguageUi.ui index 653c9fbe47..9e1fc6f9ee 100644 --- a/src/frontends/qt/ui/LanguageUi.ui +++ b/src/frontends/qt/ui/LanguageUi.ui @@ -170,7 +170,7 @@ -Qt::Orientation::Horizontal +Qt::Horizontal @@ -185,7 +185,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -230,10 +230,10 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - QSizePolicy::Policy::MinimumExpanding + QSizePolicy::MinimumExpanding diff --git a/src/frontends/qt/ui/NomenclUi.ui b/src/frontends/qt/ui/NomenclUi.ui index 432be0981d..b34291f5b1 100644 --- a/src/frontends/qt/ui/NomenclUi.ui +++ b/src/frontends/qt/ui/NomenclUi.ui @@ -34,7 +34,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] Qt enum fixes
commit 181110f33e05c871fdc83b7e0f1fd4bd170f9e7d Author: Juergen Spitzmueller Date: Sun Nov 3 06:04:31 2024 +0100 Qt enum fixes --- src/frontends/qt/ui/OutputUi.ui | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/frontends/qt/ui/OutputUi.ui b/src/frontends/qt/ui/OutputUi.ui index e18dc118fe..746de96685 100644 --- a/src/frontends/qt/ui/OutputUi.ui +++ b/src/frontends/qt/ui/OutputUi.ui @@ -117,7 +117,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -191,7 +191,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -244,10 +244,10 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - QSizePolicy::Policy::Fixed + QSizePolicy::Fixed @@ -288,7 +288,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -331,7 +331,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -395,7 +395,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -462,7 +462,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -527,7 +527,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -561,10 +561,10 @@ - Qt::Orientation::Vertical + Qt::Vertical - QSizePolicy::Policy::Expanding + QSizePolicy::Expanding -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix AboutLyX layout
commit 11cbc3c4a765f93268a662846d7082b089b3782b Author: Juergen Spitzmueller Date: Sat Nov 2 14:33:28 2024 +0100 Fix AboutLyX layout * remove wrong (sub)namespaces. This are inserted by newer versions of designer, although they are wrong * add vertical spacer * make horizontal spacer expand --- src/frontends/qt/ui/AboutUi.ui | 69 +- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui index 5a03c23180..e4f1bb7be9 100644 --- a/src/frontends/qt/ui/AboutUi.ui +++ b/src/frontends/qt/ui/AboutUi.ui @@ -30,7 +30,7 @@ - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize @@ -45,7 +45,7 @@ -Qt::Orientation::Vertical +Qt::Vertical @@ -57,31 +57,15 @@ - - - - Qt::Orientation::Horizontal - - - QSizePolicy::Policy::Fixed - - - - 20 - 20 - - - - -Qt::Orientation::Vertical +Qt::Vertical -QSizePolicy::Policy::Fixed +QSizePolicy::Fixed @@ -106,7 +90,7 @@LyX version info goes here.
Qt version (run-time) goes here.
Qt version (compile-time) goes here.
- Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter +Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true @@ -115,17 +99,17 @@ 0 - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse +Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse -Qt::Orientation::Vertical +Qt::Vertical -QSizePolicy::Policy::MinimumExpanding +QSizePolicy::MinimumExpanding @@ -178,7 +162,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -206,7 +190,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -253,7 +237,7 @@ false - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -281,6 +265,35 @@ + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -415,7 +428,7 @@ -QDialogButtonBox::StandardButton::Close +QDialogButtonBox::Close -- lyx-cvs mailing list lyx-cvs@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-cvs
