summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Stefan Fuchs <sfuchs@gmx.de>2017-10-27 17:52:49 +0200
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-10-28 14:16:38 +0200
commit81492b8cbae8bee18eecaf317cdd01629a3a8130 (patch)
tree92b46adf1553f1c38579ca710cc989725dd82b82
parent215f61175dc2b782592fcae5d48be54029bf6867 (diff)
downloadsubsurface-81492b8cbae8bee18eecaf317cdd01629a3a8130.tar.gz
Set checked status of menu entry for dive list filter correctly
When enabling the dive list filter via the menu entry "Log->Filter dives" and then switch off the filter via the small "close" button of the filter: Set the checked status of the menu entry correctly. Also set it correctly when switching on/off via the menu entry to avoid any situation where it is not synced. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
-rw-r--r--desktop-widgets/mainwindow.cpp13
-rw-r--r--desktop-widgets/mainwindow.h1
-rw-r--r--desktop-widgets/simplewidgets.cpp1
3 files changed, 13 insertions, 2 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 1afe8b262..93943edcf 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1945,10 +1945,19 @@ void MainWindow::on_paste_triggered()
void MainWindow::on_actionFilterTags_triggered()
{
- if (ui.multiFilter->isVisible())
+ if (ui.multiFilter->isVisible()) {
ui.multiFilter->closeFilter();
- else
+ ui.actionFilterTags->setChecked(false);
+ }
+ else {
ui.multiFilter->setVisible(true);
+ ui.actionFilterTags->setChecked(true);
+ }
+}
+
+void MainWindow::setCheckedActionFilterTags(bool checked)
+{
+ ui.actionFilterTags->setChecked(checked);
}
void MainWindow::registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *topRight, QWidget *bottomLeft, QWidget *bottomRight)
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 073d3cad8..edd3fb0c8 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -87,6 +87,7 @@ public:
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();
+ void setCheckedActionFilterTags(bool checked);
private
slots:
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index ab1fcaabb..13a3ee435 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -653,6 +653,7 @@ void MultiFilter::closeFilter()
{
MultiFilterSortModel::instance()->clearFilter();
hide();
+ MainWindow::instance()->setCheckedActionFilterTags(false);
}
TextHyperlinkEventFilter::TextHyperlinkEventFilter(QTextEdit *txtEdit) : QObject(txtEdit),