commit 4137bf116e0abf4696532e183548ef5e9bdc5cf3
Author: Juergen Spitzmueller <sp...@lyx.org>
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 @@
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
- <enum>QLayout::SizeConstraint::SetFixedSize</enum>
+ <enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QSvgWidget" name="iconSW" native="true">
@@ -45,7 +45,7 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -57,31 +57,15 @@
</item>
</layout>
</item>
- <item row="0" column="1">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Policy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="0" column="2">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Policy::Fixed</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -106,7 +90,7 @@
<string
notr="true"><html><head/><body><p><span style="
font-weight:600;">LyX version info goes
here.</span></p><p>Qt version (run-time) goes
here.</p><p>Qt version (compile-time) goes
here.</p></body></html></string>
</property>
<property name="alignment">
-
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -115,17 +99,17 @@
<number>0</number>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Orientation::Vertical</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Policy::MinimumExpanding</enum>
+ <enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -178,7 +162,7 @@
<bool>false</bool>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@@ -206,7 +190,7 @@
<bool>false</bool>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@@ -253,7 +237,7 @@
<bool>false</bool>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@@ -281,6 +265,35 @@
</item>
</layout>
</item>
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="2">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="creditstab">
@@ -415,7 +428,7 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
- <set>QDialogButtonBox::StandardButton::Close</set>
+ <set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
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
