commit 7d9a8b00f94e5185234fd769cffc6fe38cbaf1ca
Author: Richard Kimberly Heck <[email protected]>
Date: Tue Jun 25 13:38:30 2024 -0400
Revert "Add temporary directory to About LyX dialog"
This introduced a new string, which is not for 2.4.1.
This reverts commit 5b51bab39b31207dd16e31651ffecbec052272d4.
---
src/frontends/qt/GuiAbout.cpp | 14 --------
src/frontends/qt/GuiAbout.h | 1 -
src/frontends/qt/ui/AboutUi.ui | 79 +++++++++---------------------------------
status.24x | 5 +--
4 files changed, 17 insertions(+), 82 deletions(-)
diff --git a/src/frontends/qt/GuiAbout.cpp b/src/frontends/qt/GuiAbout.cpp
index db7edae3dc..0a585f0eac 100644
--- a/src/frontends/qt/GuiAbout.cpp
+++ b/src/frontends/qt/GuiAbout.cpp
@@ -244,12 +244,6 @@ static QString dirUser()
}
-static QString dirTemp()
-{
- return toqstr(makeDisplayPath(package().temp_dir().absFileName()));
-}
-
-
static QString version(bool const plain = false)
{
QString loc_release_date;
@@ -327,12 +321,6 @@ void GuiAbout::on_showDirUserPB_clicked()
}
-void GuiAbout::on_showDirTempPB_clicked()
-{
- showDirectory(package().temp_dir());
-}
-
-
void GuiAbout::on_versionCopyPB_clicked()
{
qApp->clipboard()->setText(version(true));
@@ -362,8 +350,6 @@ GuiAbout::GuiAbout(GuiView & lv)
d->ui.iconSW->setFixedSize(iconsize, iconsize);
d->ui.dirLibraryLA->setText(dirLibrary());
d->ui.dirLibraryLA->adjustSize();
- d->ui.dirTempLA->setText(dirTemp());
- d->ui.dirTempLA->adjustSize();
d->ui.dirUserLA->setText(dirUser());
d->ui.dirUserLA->adjustSize();
d->ui.buildinfoTB->setText(buildinfo());
diff --git a/src/frontends/qt/GuiAbout.h b/src/frontends/qt/GuiAbout.h
index 3ca191d3c7..c9b2443689 100644
--- a/src/frontends/qt/GuiAbout.h
+++ b/src/frontends/qt/GuiAbout.h
@@ -30,7 +30,6 @@ private Q_SLOTS:
void on_buttonBox_rejected();
void on_showDirLibraryPB_clicked();
void on_showDirUserPB_clicked();
- void on_showDirTempPB_clicked();
void on_versionCopyPB_clicked();
private:
diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui
index 5a03c23180..4a6adac566 100644
--- a/src/frontends/qt/ui/AboutUi.ui
+++ b/src/frontends/qt/ui/AboutUi.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>552</width>
- <height>504</height>
+ <height>470</height>
</rect>
</property>
<property name="windowTitle">
@@ -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>
@@ -60,10 +60,10 @@
<item row="0" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Orientation::Horizontal</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Policy::Fixed</enum>
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -78,10 +78,10 @@
<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 +106,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 +115,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>
@@ -172,13 +172,13 @@
<string notr="true">System directory goes here.</string>
</property>
<property name="textFormat">
- <enum>Qt::TextFormat::PlainText</enum>
+ <enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@@ -200,13 +200,13 @@
<string notr="true">User directory goes here.</string>
</property>
<property name="textFormat">
- <enum>Qt::TextFormat::PlainText</enum>
+ <enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
@@ -232,53 +232,6 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="gridGroupBox2">
- <property name="title">
- <string>Temporary directory</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="0">
- <widget class="QLabel" name="dirTempLA">
- <property name="cursor">
- <cursorShape>IBeamCursor</cursorShape>
- </property>
- <property name="text">
- <string notr="true">Temp directory goes here.</string>
- </property>
- <property name="textFormat">
- <enum>Qt::TextFormat::PlainText</enum>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- <property name="textInteractionFlags">
-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="showDirTempPB">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Open temporary directory in file browser</string>
- </property>
- <property name="text">
- <string>[[do]]O&pen</string>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</item>
</layout>
@@ -415,7 +368,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 3e3b45a530..1bbf3b3d08 100644
--- a/status.24x
+++ b/status.24x
@@ -44,12 +44,9 @@ What's new
- Add bindings for 'paste, join lines'.
-- Middle-button pasting (in Linux) now preserves middle-button pasting
+- middle-button pasting (in Linux) now preserves middle-button pasting
(as does Edit > Paste since 2.4.0).
-- Show temporary directory in About LyX dialog.
-
-
* DOCUMENTATION AND LOCALIZATION
- Clarify quote-insert LFUN.
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
