# HG changeset patch # User Wuzzy # Date 1593907128 -7200 # Node ID f28ca5a87682f007e7630b0ea7d6bdbd60ceb1a2 # Parent 0b99e220568a4c9d9b2fa585b5e62dc861e98ab9 [backport] Chat scale: Move setting to Video tab Backport of 9455b9e56aee to branch ui-scaling by sheepluva diff -r 0b99e220568a -r f28ca5a87682 ChangeLog.txt --- a/ChangeLog.txt Sat Jul 04 02:46:06 2020 +0200 +++ b/ChangeLog.txt Sun Jul 05 01:58:48 2020 +0200 @@ -1,7 +1,7 @@ + features * bugfixes -======================= ??? ======================== -User Interface: +======================= ui-scaling backport to 1.0.0 ======================== +Graphics / user interface: + In-Game chat size can now be adjusted. Hold Ctrl and press -, + or = while in chat input. Hold shift for finer control. + The intial in-game chat size can be configured in the Frontend's "advanced" settings tab. diff -r 0b99e220568a -r f28ca5a87682 QTfrontend/ui/page/pageoptions.cpp --- a/QTfrontend/ui/page/pageoptions.cpp Sat Jul 04 02:46:06 2020 +0200 +++ b/QTfrontend/ui/page/pageoptions.cpp Sun Jul 05 01:58:48 2020 +0200 @@ -398,16 +398,29 @@ WeaponTooltip->setText(QCheckBox::tr("Show ammo menu tooltips")); groupGame->layout()->addWidget(WeaponTooltip, 10, 0, 1, 2); - groupGame->addDivider(); + // Chat size adjustment + QLabel *labelChatSize = new QLabel(groupGame); + labelChatSize->setText(QLabel::tr("Initial chat size (%)")); + labelChatSize->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + groupGame->layout()->addWidget(labelChatSize, 11, 0); + + sbChatSize = new QSpinBox(groupGame); + sbChatSize->setSingleStep(5); + sbChatSize->setMinimum(80); + sbChatSize->setMaximum(2000); + sbChatSize->setValue(100); + groupGame->layout()->addWidget(sbChatSize, 11, 1, Qt::AlignLeft); + + groupGame->addDivider(); // row 12 lblTags = new QLabel(groupGame); lblTags->setText(QLabel::tr("Displayed tags above hogs and translucent tags")); - groupGame->layout()->addWidget(lblTags, 12, 0, 1, 2); + groupGame->layout()->addWidget(lblTags, 13, 0, 1, 2); tagsContainer = new QWidget(); QHBoxLayout * tagsLayout = new QHBoxLayout(tagsContainer); tagsLayout->setSpacing(0); - groupGame->layout()->addWidget(tagsContainer, 13, 0, 1, 2); + groupGame->layout()->addWidget(tagsContainer, 14, 0, 1, 2); CBTeamTag = new QCheckBox(groupGame); CBTeamTag->setText(QCheckBox::tr("Team")); @@ -714,21 +727,6 @@ BtnAssociateFiles->setVisible(!custom_data && !custom_config); groupMisc->layout()->addWidget(BtnAssociateFiles, 4, 0, 1, 2); - // Divider - - groupMisc->addDivider(); // row 5 - - QLabel *labelChatSize = new QLabel(groupMisc); - labelChatSize->setText(QLabel::tr("Initial in-game chat size (%)")); - groupMisc->layout()->addWidget(labelChatSize, 6, 0); - - // Chat size adjustment - sbChatSize = new QSpinBox(groupMisc); - sbChatSize->setMinimum(80); - sbChatSize->setMaximum(2000); - sbChatSize->setValue(100); - groupMisc->layout()->addWidget(sbChatSize, 6, 1); - } #ifdef __APPLE__