mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace the old filter widget for a new one

Browse source 
Wires the code to display the filter widget on the mainwindow.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2018-10-21 15:40:25 +02:00 committed by Dirk Hohndel
parent 8378695d7f
commit 89413c5f07
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop-widgets/mainwindow.cpp
View file

@ -761,9 +761,8 @@ void MainWindow::on_actionClose_triggered()
{ {
if (okToClose(tr("Please save or cancel the current dive edit before closing the file."))) { if (okToClose(tr("Please save or cancel the current dive edit before closing the file."))) {
closeCurrentFile(); closeCurrentFile();
// hide any pictures and the filter
DivePictureModel::instance()->updateDivePictures(); DivePictureModel::instance()->updateDivePictures();
ui.multiFilter->closeFilter(); setApplicationState("Default");
recreateDiveList(); recreateDiveList();
} }
} }
@ -1876,13 +1875,7 @@ void MainWindow::on_paste_triggered()
void MainWindow::on_actionFilterTags_triggered() void MainWindow::on_actionFilterTags_triggered()
{ {
if (ui.multiFilter->isVisible()) { setApplicationState(getCurrentAppState() == "FilterDive" ? "Default" : "FilterDive");
ui.multiFilter->closeFilter();
ui.actionFilterTags->setChecked(false);
} else {
ui.multiFilter->setVisible(true);
ui.actionFilterTags->setChecked(true);
}
} }
void MainWindow::setCheckedActionFilterTags(bool checked) void MainWindow::setCheckedActionFilterTags(bool checked)