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

some style changes to settings

Browse source
This commit is contained in:
fourtf 2019-09-03 11:15:38 +02:00
parent 0ada2e51c6
commit f7ee778af6
5 changed files with 104 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/qss/settings.qss
View file

@ -27,14 +27,12 @@ QComboBox QFrame {
chatterino--SettingsPage {
background: #222;
border: 1px solid #555;
/*border: 1px solid #555;
border-left: none;*/
}
chatterino--PageHeader {
min-height: 54px;
min-width: 64px;
border: 1px solid #555;
border-bottom: none;
margin-bottom: 12px;
}
chatterino--TitleLabel {

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

@ -46,35 +46,67 @@ SettingsDialog::SettingsDialog()
void SettingsDialog::initUi()
{
LayoutCreator<SettingsDialog> layoutCreator(this);
auto outerBox = LayoutCreator<SettingsDialog>(this)
.setLayoutType<QVBoxLayout>()
.withoutSpacing();
// tab pages
auto outerBox = layoutCreator.setLayoutType<QHBoxLayout>();
outerBox->setSpacing(12);
// TOP
auto title = outerBox.emplace<PageHeader>();
auto edit = LayoutCreator<PageHeader>(title.getElement())
.setLayoutType<QHBoxLayout>()
.withoutMargin()
.emplace<QLineEdit>()
.assign(&this->ui_.search);
edit->setPlaceholderText("Find in settings...");
outerBox.emplace<QWidget>()
QObject::connect(edit.getElement(), &QLineEdit::textChanged, this,
&SettingsDialog::filterElements);
// CENTER
auto centerBox =
outerBox.emplace<QHBoxLayout>().withoutMargin().withoutSpacing();
// left side (tabs)
centerBox.emplace<QWidget>()
.assign(&this->ui_.tabContainerContainer)
.emplace<QVBoxLayout>()
.setLayoutType<QVBoxLayout>()
.withoutMargin()
.assign(&this->ui_.tabContainer);
this->ui_.tabContainerContainer->layout()->setContentsMargins(8, 8, 0, 39);
// right side layout
// right side (pages)
auto right =
layoutCreator.emplace<QVBoxLayout>().withoutMargin().withoutSpacing();
centerBox.emplace<QVBoxLayout>().withoutMargin().withoutSpacing();
{
auto title = right.emplace<PageHeader>();
auto header = LayoutCreator<PageHeader>(title.getElement())
.setLayoutType<QHBoxLayout>();
right.emplace<QStackedLayout>()
.assign(&this->ui_.pageStack)
.withoutMargin();
}
auto edit = header.emplace<QLineEdit>().assign(&this->ui_.search);
edit->setPlaceholderText("Find in settings...");
QTimer::singleShot(100, edit.getElement(),
[edit = edit.getElement()]() { edit->setFocus(); });
QObject::connect(
edit.getElement(), &QLineEdit::textChanged, this,
[this](const QString &text) {
this->ui_.pageStack->setMargin(0);
outerBox->addSpacing(12);
// BOTTOM
auto buttons = outerBox.emplace<QDialogButtonBox>(Qt::Horizontal);
{
this->ui_.okButton =
buttons->addButton("Ok", QDialogButtonBox::YesRole);
this->ui_.cancelButton =
buttons->addButton("Cancel", QDialogButtonBox::NoRole);
}
// ---- misc
this->ui_.tabContainerContainer->setObjectName("tabWidget");
this->ui_.pageStack->setObjectName("pages");
QObject::connect(this->ui_.okButton, &QPushButton::clicked, this,
&SettingsDialog::onOkClicked);
QObject::connect(this->ui_.cancelButton, &QPushButton::clicked, this,
&SettingsDialog::onCancelClicked);
}
void SettingsDialog::filterElements(const QString &text)
{
// filter elements and hide pages
for (auto &&page : this->pages_)
{
@ -82,11 +114,8 @@ void SettingsDialog::initUi()
page->tab()->setVisible(page->filterElements(text));
}
// TODO: add originally selected page
// find next visible page
if (this->lastSelectedByUser_ &&
this->lastSelectedByUser_->isVisible())
if (this->lastSelectedByUser_ && this->lastSelectedByUser_->isVisible())
{
this->selectTab(this->lastSelectedByUser_, false);
}
@ -103,15 +132,14 @@ void SettingsDialog::initUi()
}
// remove duplicate spaces
bool shouldShowSpace = true;
bool shouldShowSpace = false;
for (int i = 0; i < this->ui_.tabContainer->count(); i++)
{
auto item = this->ui_.tabContainer->itemAt(i);
if (auto x = dynamic_cast<QSpacerItem *>(item); x)
{
x->changeSize(
10, shouldShowSpace ? int(16 * this->scale()) : 0);
x->changeSize(10, shouldShowSpace ? int(16 * this->scale()) : 0);
shouldShowSpace = false;
}
else if (item->widget())
@ -119,40 +147,6 @@ void SettingsDialog::initUi()
shouldShowSpace |= item->widget()->isVisible();
}
}
});
auto searchButton = header.emplace<Button>();
searchButton->setPixmap(getApp()->resources->buttons.search);
searchButton->setScaleIndependantSize(30, 30);
QObject::connect(
searchButton.getElement(), &Button::clicked, this,
[]() { QDesktopServices::openUrl({"https://google.com"}); });
right.emplace<QStackedLayout>()
.assign(&this->ui_.pageStack)
.withoutMargin();
right->addSpacing(12);
auto buttons = right.emplace<QDialogButtonBox>(Qt::Horizontal);
{
this->ui_.okButton =
buttons->addButton("Ok", QDialogButtonBox::YesRole);
this->ui_.cancelButton =
buttons->addButton("Cancel", QDialogButtonBox::NoRole);
}
}
this->ui_.pageStack->setMargin(0);
// ---- misc
this->ui_.tabContainerContainer->setObjectName("tabWidget");
this->ui_.pageStack->setObjectName("pages");
QObject::connect(this->ui_.okButton, &QPushButton::clicked, this,
&SettingsDialog::onOkClicked);
QObject::connect(this->ui_.cancelButton, &QPushButton::clicked, this,
&SettingsDialog::onCancelClicked);
}
SettingsDialog *SettingsDialog::getHandle()
@ -165,6 +159,8 @@ void SettingsDialog::addTabs()
this->ui_.tabContainer->setMargin(0);
this->ui_.tabContainer->setSpacing(0);
this->ui_.tabContainer->setContentsMargins(0, 20, 0, 20);
this->addTab(new GeneralPage);
this->ui_.tabContainer->addSpacing(16);
@ -187,7 +183,6 @@ void SettingsDialog::addTabs()
this->ui_.tabContainer->addStretch(1);
this->addTab(new AboutPage, Qt::AlignBottom);
this->ui_.tabContainer->addSpacing(16);
}
void SettingsDialog::addTab(SettingsPage *page, Qt::Alignment alignment)
@ -218,7 +213,7 @@ void SettingsDialog::selectTab(SettingsDialogTab *tab, bool byUser)
tab->setSelected(true);
tab->setStyleSheet("background: #222; color: #4FC3F7;"
"border: 1px solid #444;");
"/*border: 1px solid #555; border-right: none;*/");
this->selectedTab_ = tab;
if (byUser)
{

1
src/widgets/dialogs/SettingsDialog.hpp
View file

@ -50,6 +50,7 @@ private:
void addTab(SettingsPage *page, Qt::Alignment alignment = Qt::AlignTop);
void selectTab(SettingsDialogTab *tab, bool byUser = true);
void selectPage(SettingsPage *page);
void filterElements(const QString &query);
void onOkClicked();
void onCancelClicked();

16
src/widgets/settingspages/SettingsPage.cpp
View file

@ -40,6 +40,22 @@ bool filterItemsRec(QObject *object, const QString &query)
return false;
}());
}
else if (auto x = dynamic_cast<QTabWidget *>(child); x)
{
for (int i = 0; i < x->count(); i++)
{
bool tabAny{};
if (x->tabText(i).contains(query, Qt::CaseInsensitive))
{
tabAny = true;
}
auto widget = x->widget(i);
tabAny |= filterItemsRec(widget, query);
any |= tabAny;
}
}
else
{
any |= filterItemsRec(child, query);

3
src/widgets/settingspages/SettingsPage.hpp
View file

@ -33,9 +33,12 @@
namespace chatterino {
// S* widgets are the same as their Q* counterparts,
// but they can be greyed out and will be if you search.
SETTINGS_PAGE_WIDGET_BOILERPLATE(SCheckBox, QCheckBox)
SETTINGS_PAGE_WIDGET_BOILERPLATE(SLabel, QLabel)
SETTINGS_PAGE_WIDGET_BOILERPLATE(SComboBox, QComboBox)
SETTINGS_PAGE_WIDGET_BOILERPLATE(SPushButton, QPushButton)
class SettingsDialogTab;