On 2020-08-12 21:53, Daniel wrote:
On 2020-08-12 21:46, Stephan Witt wrote:
Am 12.08.2020 um 20:00 schrieb Richard Kimberly Heck <rikih...@lyx.org>:
commit 01b2893f8beef6a9716195ee5e7b42c75e135fae
Author: Daniel Ramoeller <d....@web.de>
Date: Wed Aug 12 14:24:40 2020 -0400
Fix bug #10346.
Allow to open user and library directories from About LyX.
---
src/frontends/qt/GuiAbout.cpp | 75 ++++++++++++++------
src/frontends/qt/GuiAbout.h | 3 +
src/frontends/qt/GuiLog.cpp | 16 +----
src/frontends/qt/qt_helpers.cpp | 17 +++++
src/frontends/qt/qt_helpers.h | 2 +
src/frontends/qt/ui/AboutUi.ui | 151
+++++++++++++++++++++++++++++++++++----
6 files changed, 214 insertions(+), 50 deletions(-)
Sorry, this breaks Qt 4.x builds.
/Users/stephan/git/lyx/src/frontends/qt/GuiAbout.cpp:277:26: error:
use of undeclared identifier 'QGuiApplication'; did you mean
'GuiApplication'?
QClipboard *clipboard = QGuiApplication::clipboard();
^~~~~~~~~~~~~~~
GuiApplication
https://doc.qt.io/qt-5/qguiapplication.html
With Qt 5 on Mac opening the library directory works. But I cannot
open the user directory, the library directory is presented instead.
I'll take a look.
Oddly enough, I can't reproduce that the same directory is opened for
each button. Instead they seem to have been swapped. I fixed that and
also tried again with the clipboard function. I don't have Qt 4 at hand.
Could you try whether the patch resolves the problems?
--
Daniel
diff --git a/src/frontends/qt/GuiAbout.cpp b/src/frontends/qt/GuiAbout.cpp
index 25c3a689dd..824d03e900 100644
--- a/src/frontends/qt/GuiAbout.cpp
+++ b/src/frontends/qt/GuiAbout.cpp
@@ -274,7 +274,7 @@ void GuiAbout::on_showDirUserPB_clicked()
void GuiAbout::on_versionCopyPB_clicked()
{
- QClipboard *clipboard = QGuiApplication::clipboard();
+ QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(version());
}
diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui
index 7f38644bb0..fd07468009 100644
--- a/src/frontends/qt/ui/AboutUi.ui
+++ b/src/frontends/qt/ui/AboutUi.ui
@@ -95,22 +95,6 @@
<string>Library directory</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="1">
- <widget class="QPushButton" name="showDirUserPB">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Open</string>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="dirLibraryLA">
<property name="sizePolicy">
@@ -136,15 +120,6 @@
</property>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="gridGroupBox1">
- <property name="title">
- <string>User directory</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="1">
<widget class="QPushButton" name="showDirLibraryPB">
<property name="sizePolicy">
@@ -158,6 +133,15 @@
</property>
</widget>
</item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="gridGroupBox1">
+ <property name="title">
+ <string>User directory</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="dirUserLA">
<property name="cursor">
@@ -177,6 +161,22 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="showDirUserPB">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Open</string>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
