diff --git a/src/widgets/filterwidget.cpp b/src/widgets/filterwidget.cpp --- a/src/widgets/filterwidget.cpp +++ b/src/widgets/filterwidget.cpp @@ -52,7 +52,6 @@ connect(ui->sortTypeCombo, static_cast(&QComboBox::currentIndexChanged), this, &FilterWidget::onSortTypeChanged); connect(ui->ascendingButton, &QToolButton::clicked, this, &FilterWidget::onAscendingClicked); connect(ui->descendingButton, &QToolButton::clicked, this, &FilterWidget::onDescendingClicked); - connect(ui->showFutureCheck, &QCheckBox::toggled, this, &FilterWidget::onShowFutureChanged); } FilterWidget::~FilterWidget() diff --git a/src/widgets/filterwidget.ui b/src/widgets/filterwidget.ui --- a/src/widgets/filterwidget.ui +++ b/src/widgets/filterwidget.ui @@ -38,7 +38,8 @@ - + + .. true @@ -67,7 +68,8 @@ - + + .. true @@ -89,7 +91,8 @@ - + + .. true @@ -107,13 +110,6 @@ - - - - Show future items - - - diff --git a/tests/units/widgets/filterwidgettest.cpp b/tests/units/widgets/filterwidgettest.cpp --- a/tests/units/widgets/filterwidgettest.cpp +++ b/tests/units/widgets/filterwidgettest.cpp @@ -76,11 +76,6 @@ QVERIFY(!descendingButton->isVisibleTo(&filter)); QVERIFY(!descendingButton->isChecked()); QVERIFY(descendingButton->autoRaise()); - - auto showFutureCheck = filter.findChild(QStringLiteral("showFutureCheck")); - QVERIFY(showFutureCheck); - QVERIFY(!showFutureCheck->isVisibleTo(&filter)); - QVERIFY(!showFutureCheck->isChecked()); } void shouldChangeAppliedFilter() @@ -132,18 +127,14 @@ QAbstractButton *descendingButton = filter.findChild(QStringLiteral("descendingButton")); QVERIFY(descendingButton); - auto showFutureCheck = filter.findChild(QStringLiteral("showFutureCheck")); - QVERIFY(showFutureCheck); - // WHEN extensionButton->click(); // THEN QVERIFY(extensionButton->isChecked()); QVERIFY(sortTypeCombo->isVisibleTo(&filter)); QVERIFY(descendingButton->isVisibleTo(&filter)); QVERIFY(descendingButton->isVisibleTo(&filter)); - QVERIFY(showFutureCheck->isVisibleTo(&filter)); // WHEN extensionButton->click(); @@ -153,7 +144,6 @@ QVERIFY(!sortTypeCombo->isVisibleTo(&filter)); QVERIFY(!descendingButton->isVisibleTo(&filter)); QVERIFY(!descendingButton->isVisibleTo(&filter)); - QVERIFY(!showFutureCheck->isVisibleTo(&filter)); } void shouldChangeSortType() @@ -204,29 +194,6 @@ QVERIFY(!descendingButton->isChecked()); QCOMPARE(filter.proxyModel()->sortOrder(), Qt::AscendingOrder); } - - void shouldShowHideFutureTasks() - { - // GIVEN - Widgets::FilterWidget filter; - - auto showFutureCheck = filter.findChild(QStringLiteral("showFutureCheck")); - QVERIFY(showFutureCheck); - - // WHEN - showFutureCheck->click(); - - // THEN - QVERIFY(showFutureCheck->isChecked()); - QVERIFY(filter.proxyModel()->showFutureTasks()); - - // WHEN - showFutureCheck->click(); - - // THEN - QVERIFY(!showFutureCheck->isChecked()); - QVERIFY(!filter.proxyModel()->showFutureTasks()); - } }; ZANSHIN_TEST_MAIN(FilterWidgetTest)