smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use vertical scroll on the about screen (#7199)

Browse source 
* Replace scroll area with QTextBrowser

* Update about text

* Fix version number on macOS
This commit is contained in:
Serhii Hadzhilov 2022-07-05 14:54:41 +03:00 committed by GitHub
parent a48c34932b
commit e0023863db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/src/AboutDialog.cpp
View file

@ -33,7 +33,7 @@ AboutDialog::AboutDialog(MainWindow* parent, const AppConfig& config) :
setupCreditsLoader(); setupCreditsLoader();
QString aboutText(R"(<p> QString aboutText(R"(<p>
Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Keyboard and mouse sharing application. Cross platform and open source since 2001.<br /><br />
Copyright © %%YEAR%% Symless Ltd.<br /><br /> Copyright © %%YEAR%% Symless Ltd.<br /><br />
Synergy is released under the GNU General Public License (GPLv2).</p> Synergy is released under the GNU General Public License (GPLv2).</p>
<p style="font-size: 14px">Key contributors<br> <p style="font-size: 14px">Key contributors<br>
@ -42,7 +42,7 @@ Ryan Breen, Guido Poschta, Bertrand Landry Hetu, Tom Chadwick, Brent Priddy, Kyl
Daun Chung, Serhii Hadzhylov, Oleksandr Lysytsia, Olena Kutytska, Francisco Magalhães.</span> Daun Chung, Serhii Hadzhylov, Oleksandr Lysytsia, Olena Kutytska, Francisco Magalhães.</span>
</p>)"); </p>)");
m_versionChecker.setApp(config.synergycName()); m_versionChecker.setApp(parent->appPath(config.synergycName()));
QString version = m_versionChecker.getVersion(); QString version = m_versionChecker.getVersion();
#ifdef SYNERGY_REVISION #ifdef SYNERGY_REVISION
version += '-'; version += '-';
@ -81,11 +81,15 @@ Daun Chung, Serhii Hadzhylov, Oleksandr Lysytsia, Olena Kutytska, Francisco Maga
void AboutDialog::setupCreditsLoader() void AboutDialog::setupCreditsLoader()
{ {
this->textEliteBackers->setText("Loading...");
this->textEliteBackers->viewport()->setAutoFillBackground(false);
this->textEliteBackers->document()->setDocumentMargin(0);
connect(&credits, SIGNAL(loaded(const QString&)), this, SLOT(updateEliteBackers(const QString&))); connect(&credits, SIGNAL(loaded(const QString&)), this, SLOT(updateEliteBackers(const QString&)));
credits.loadEliteBackers(); credits.loadEliteBackers();
} }
void AboutDialog::updateEliteBackers(const QString& eliteBackers) const void AboutDialog::updateEliteBackers(const QString& eliteBackers) const
{ {
this->labelEliteBackersData->setText(eliteBackers); this->textEliteBackers->setText(eliteBackers);
} }

64
src/gui/src/AboutDialogBase.ui
View file

@ -121,70 +121,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QScrollArea" name="scrollAreaEliteBackers"> <widget class="QTextBrowser" name="textEliteBackers">
<property name="sizePolicy"> <property name="styleSheet">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <string notr="true">font-size: 11px;</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="widgetResizable"> <property name="horizontalScrollBarPolicy">
<bool>true</bool> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>419</width>
<height>83</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="labelEliteBackersData">
<property name="minimumSize">
<size>
<width>0</width>
<height>10</height>
</size>
</property>
<property name="font">
<font>
<pointsize>-1</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">font-size: 11px;s</string>
</property>
<property name="text">
<string>Loading...</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>