diff --git a/src/widgets/channellist/autotests/channellistwidgettest.cpp b/src/widgets/channellist/autotests/channellistwidgettest.cpp index b7879113..c25c7270 100644 --- a/src/widgets/channellist/autotests/channellistwidgettest.cpp +++ b/src/widgets/channellist/autotests/channellistwidgettest.cpp @@ -1,48 +1,53 @@ /* Copyright (c) 2020 Laurent Montel This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License or ( at your option ) version 3 or, at the discretion of KDE e.V. ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "channellistwidgettest.h" #include "channellist/channellistwidget.h" #include "channellist/statuscombobox.h" #include "channellist/channellistview.h" +#include #include #include QTEST_MAIN(ChannelListWidgetTest) ChannelListWidgetTest::ChannelListWidgetTest(QObject *parent) : QObject(parent) { } void ChannelListWidgetTest::shouldHaveDefaultValues() { ChannelListWidget w; QVBoxLayout *mainLayout = w.findChild(QStringLiteral("mainlayout")); QVERIFY(mainLayout); QCOMPARE(mainLayout->contentsMargins(), QMargins(0, 0, 0, 0)); StatusCombobox *mStatusComboBox = w.findChild(QStringLiteral("mStatusComboBox")); QVERIFY(mStatusComboBox); ChannelListView *mChannelView = w.findChild(QStringLiteral("mChannelView")); QVERIFY(mChannelView); + + QLabel *label = w.findChild(QStringLiteral("label")); + QVERIFY(label); + QVERIFY(!label->text().isEmpty()); } diff --git a/src/widgets/channellist/channellistwidget.cpp b/src/widgets/channellist/channellistwidget.cpp index 61121f03..0d06abda 100644 --- a/src/widgets/channellist/channellistwidget.cpp +++ b/src/widgets/channellist/channellistwidget.cpp @@ -1,46 +1,54 @@ /* Copyright (c) 2020 Laurent Montel This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License or ( at your option ) version 3 or, at the discretion of KDE e.V. ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "channellistview.h" #include "channellistwidget.h" #include "statuscombobox.h" #include +#include #include ChannelListWidget::ChannelListWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *mainLayout = new QVBoxLayout(this); mainLayout->setObjectName(QStringLiteral("mainlayout")); mainLayout->setContentsMargins(0, 0, 0, 0); mChannelView = new ChannelListView(this); mChannelView->setObjectName(QStringLiteral("mChannelView")); mainLayout->addWidget(mChannelView); connect(mChannelView, &ChannelListView::channelSelected, this, &ChannelListWidget::channelSelected); + + QHBoxLayout *statusComboBoxLayout = new QHBoxLayout; + mainLayout->addLayout(statusComboBoxLayout); + QLabel *label = new QLabel(i18n("Status:"), this); + label->setObjectName(QStringLiteral("label")); + statusComboBoxLayout->addWidget(label); + mStatusComboBox = new StatusCombobox(this); mStatusComboBox->setObjectName(QStringLiteral("mStatusComboBox")); - mainLayout->addWidget(mStatusComboBox); + statusComboBoxLayout->addWidget(mStatusComboBox); } ChannelListWidget::~ChannelListWidget() { }