[LyX/master] Fix bug #10346.
Daniel
xracoonx at gmx.de
Thu Aug 13 18:33:57 UTC 2020
On 2020-08-13 20:13, Stephan Witt wrote:
> Am 13.08.2020 um 18:24 schrieb Daniel <xracoonx at gmx.de>:
>>
>> On 2020-08-13 18:15, Daniel wrote:
>>> On 2020-08-13 17:43, Stephan Witt wrote:
>>>> Am 13.08.2020 um 09:19 schrieb Daniel <xracoonx at gmx.de>:
>>>>>
>>>>> On 2020-08-13 09:15, Stephan Witt wrote:
>>>>>> Am 12.08.2020 um 23:00 schrieb Daniel <xracoonx at gmx.de>:
>>>>>>>
>>>>>>> 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 <rikiheck at lyx.org>:
>>>>>>>>>>
>>>>>>>>>> commit 01b2893f8beef6a9716195ee5e7b42c75e135fae
>>>>>>>>>> Author: Daniel Ramoeller <d.lyx at 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?
>>>>>> First I’ve commit a change conforming to clipboard access at other places in the code.
>>>>>> The button action problem is solved with your new patch.
>>>>>
>>>>> Is there anything for me left to do?
>>>>
>>>> You should make a patch with „git format-patch“ …
>>>>
>>>> This can be applied and pushed then by Riki or me.
>>> So, I create a proper patch, it will be applied and we wait and see what Jenkins says, right?
>
> Yes. You commit your (compilable) change and do the git commit locally. git push is not allowed for you, AFAIK.
> Next step is to do „git format-patch HEAD^“. This creates the file with the information you may send to the list.
> The aim is to get the commit log message and the author information from you.
> After all it’s not my patch. I saw you did it with the change 01b2893f8b like that. Or was it Riki?
>
> I did this myself with my latest change and will send the result attached as an example for you.
>
>> I just realized that I did not understand what you did regarding the clipboard. Does that in any way affect my patch?
>
> Yes. I’ve replaced your change in src/frontends/qt/GuiAbout.cpp with my solution.
> You have to restore the original file contents (e.g. with git checkout src/frontends/qt/GuiAbout.cpp)
> before you commit your changes.
Thanks. So this should be enough, I guess.
--
Daniel
-------------- next part --------------
From 18dbab6c9b38961eb9b326f640f437a09c4eb587 Mon Sep 17 00:00:00 2001
From: Daniel Ramoeller <d.lyx at web.de>
Date: Thu, 13 Aug 2020 20:33:02 +0200
Subject: [PATCH] #10346 Amend change 01b2893f8b switch directory buttons
---
src/frontends/qt/ui/AboutUi.ui | 50 +++++++++++++++++-----------------
1 file changed, 25 insertions(+), 25 deletions(-)
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>
--
2.24.3 (Apple Git-128)
More information about the lyx-devel
mailing list