noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Settings UI inconsistencies (#1202)

Browse source 
* Move "About" tab in Settings

* Resize Settings window

This prevents from spawning horizontal scroll (which is caused by too long line
in "Attributions" group)

* Fix "show license" link width

If you clicked empty space next to link application assumed you clicked link.
I fixed that by using QLabels instead of SignalLabel (there's something "wrong"
with them, but I couldn't find what)
This commit is contained in:
Mateusz Ż 2019-08-14 18:03:42 +00:00 committed by fourtf
parent 4679fd6753
commit eb38b53c04
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/widgets/dialogs/SettingsDialog.cpp
View file

@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog()
this->overrideBackgroundColor_ = QColor("#111111"); this->overrideBackgroundColor_ = QColor("#111111");
this->themeChangedEvent(); this->themeChangedEvent();
this->resize(766, 600); this->resize(815, 600);
} }
void SettingsDialog::initUi() void SettingsDialog::initUi()
@ -54,7 +54,7 @@ void SettingsDialog::initUi()
.withoutMargin() .withoutMargin()
.assign(&this->ui_.tabContainer); .assign(&this->ui_.tabContainer);
this->ui_.tabContainerContainer->layout()->setContentsMargins(8, 8, 0, 8); this->ui_.tabContainerContainer->layout()->setContentsMargins(8, 8, 0, 39);
this->layout()->setSpacing(0); this->layout()->setSpacing(0);
@ -129,6 +129,7 @@ void SettingsDialog::addTabs()
this->ui_.tabContainer->addStretch(1); this->ui_.tabContainer->addStretch(1);
this->addTab(new AboutPage, Qt::AlignBottom); this->addTab(new AboutPage, Qt::AlignBottom);
this->ui_.tabContainer->addSpacing(16);
} }
void SettingsDialog::addTab(SettingsPage *page, Qt::Alignment alignment) void SettingsDialog::addTab(SettingsPage *page, Qt::Alignment alignment)

6
src/widgets/settingspages/AboutPage.cpp
View file

@ -205,10 +205,8 @@ void AboutPage::addLicense(QFormLayout *form, const QString &name,
{ {
auto *a = new QLabel("<a href=\"" + website + "\">" + name + "</a>"); auto *a = new QLabel("<a href=\"" + website + "\">" + name + "</a>");
a->setOpenExternalLinks(true); a->setOpenExternalLinks(true);
auto *b = new SignalLabel(); auto *b = new QLabel("<a href=\"" + licenseLink + "\">show license</a>");
b->setText("<a href=\"" + licenseLink + "\">show license</a>"); QObject::connect(b, &QLabel::linkActivated, [licenseLink] {
b->setCursor(Qt::PointingHandCursor);
QObject::connect(b, &SignalLabel::mouseUp, [licenseLink] {
auto *edit = new QTextEdit; auto *edit = new QTextEdit;
QFile file(licenseLink); QFile file(licenseLink);