diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp index 08f447cc0..fad32685e 100644 --- a/src/widgets/settingspages/LookPage.cpp +++ b/src/widgets/settingspages/LookPage.cpp @@ -128,12 +128,6 @@ void LookPage::addMessageTab(LayoutCreator layout) // font layout.append(this->createFontChanger()); - // bold-slider - { - auto box = layout.emplace().withoutMargin(); - box.emplace("Boldness: "); - box.append(this->createBoldScaleSlider()); - } // -- layout.emplace(false); @@ -150,8 +144,8 @@ void LookPage::addMessageTab(LayoutCreator layout) // -- layout.emplace(false); - // seperate - layout.append(this->createCheckBox("Seperate lines", + // separate + layout.append(this->createCheckBox("Lines between messages", getSettings()->separateMessages)); // alternate @@ -161,12 +155,23 @@ void LookPage::addMessageTab(LayoutCreator layout) // -- layout.emplace(false); + // bold-slider + { + auto box = layout.emplace().withoutMargin(); + box.emplace("Username boldness: "); + box.append(this->createBoldScaleSlider()); + } + + // bold usernames + layout.append(this->createCheckBox("Bold mentions (@username)", + getSettings()->enableUsernameBold)); + + // -- + layout.emplace(false); + // lowercase links layout.append(this->createCheckBox("Lowercase domains", getSettings()->enableLowercaseLink)); - // bold usernames - layout.append(this->createCheckBox("Bold @usernames", - getSettings()->enableUsernameBold)); // collapsing { @@ -583,14 +588,14 @@ QLayout *LookPage::createBoldScaleSlider() // }, // this->connections_); - QPushButton *button = new QPushButton("Reset"); - layout->addWidget(button); - button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Policy::Fixed); + // QPushButton *button = new QPushButton("Reset"); + // layout->addWidget(button); + // button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Policy::Fixed); - QObject::connect(button, &QPushButton::clicked, [=]() { - getSettings()->boldScale.setValue(57); - slider->setValue(57); - }); + // QObject::connect(button, &QPushButton::clicked, [=]() { + // getSettings()->boldScale.setValue(57); + // slider->setValue(57); + //}); return layout; } diff --git a/src/widgets/settingspages/NotificationPage.cpp b/src/widgets/settingspages/NotificationPage.cpp index 8e1248b1a..c557a0178 100644 --- a/src/widgets/settingspages/NotificationPage.cpp +++ b/src/widgets/settingspages/NotificationPage.cpp @@ -34,12 +34,11 @@ NotificationPage::NotificationPage() settings.append(this->createCheckBox( "Flash taskbar", getSettings()->notificationFlashTaskbar)); settings.append(this->createCheckBox( - "Playsound (doesn't mute the Windows 8.x sound of toasts)", - getSettings()->notificationPlaySound)); + "Play sound", getSettings()->notificationPlaySound)); #ifdef Q_OS_WIN - settings.append(this->createCheckBox( - "Enable toasts (currently only for windows 8.x or 10)", - getSettings()->notificationToast)); + settings.append( + this->createCheckBox("Enable toasts (Windows 8 or later)", + getSettings()->notificationToast)); #endif auto customSound = layout.emplace().withoutMargin(); diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp index 989d792b6..aa7a18e55 100644 --- a/src/widgets/splits/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -98,7 +98,8 @@ void SplitInput::initLayout() // textEditLength visibility getSettings()->showMessageLength.connect( [this](const bool &value, auto) { - this->ui_.textEditLength->setHidden(!value); + // this->ui_.textEditLength->setHidden(!value); + this->editTextChanged(); }, this->managedConnections_); } @@ -376,7 +377,7 @@ void SplitInput::editTextChanged() QString labelText; - if (text.length() == 0) { + if (text.length() == 0 || getSettings()->showMessageLength) { labelText = ""; } else { labelText = QString::number(text.length());