Block statusbar via presenter

MishkaRogachev · Oct 19, 2017 · 3257544 · 3257544
1 parent 8aff352
commit 3257544
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/sources/presentation/presenters/main_presenter/main_presenter.cpp b/sources/presentation/presenters/main_presenter/main_presenter.cpp
@@ -40,16 +40,18 @@ MainPresenter::Mode MainPresenter::mode() const
 
 void MainPresenter::setMode(int iMode)
 {
-    Mode mode = static_cast<Mode>(iMode);
-    if (mode == d->mode) return;
-    d->mode = mode;
+    d->statusbar->setStatusbarEnabled(false);
+
+    d->mode = static_cast<Mode>(iMode);
 
     if (d->modePresenter)
     {
         delete d->modePresenter;
         d->modePresenter = nullptr;
     }
 
+    this->setViewProperty(PROPERTY(mode), d->mode);
+
     switch (d->mode) {
     case Control:
         d->modePresenter = new ControlPresenter(this);
@@ -67,7 +69,7 @@ void MainPresenter::setMode(int iMode)
         break;
     }
 
-    this->setViewProperty(PROPERTY(mode), d->mode);
+    d->statusbar->setStatusbarEnabled(true);
 }
 
 void MainPresenter::connectView(QObject* view)

diff --git a/sources/presentation/presenters/statusbar_presenter/statusbar_presenter.cpp b/sources/presentation/presenters/statusbar_presenter/statusbar_presenter.cpp
@@ -30,6 +30,11 @@ StatusbarPresenter::StatusbarPresenter(QObject* parent):
 StatusbarPresenter::~StatusbarPresenter()
 {}
 
+void StatusbarPresenter::setStatusbarEnabled(bool enabled)
+{
+    this->setViewProperty(PROPERTY(enabled), enabled);
+}
+
 void StatusbarPresenter::connectView(QObject* view)
 {
     d->radio->setView(view->findChild<QObject*>(NAME(radio)));

diff --git a/sources/presentation/presenters/statusbar_presenter/statusbar_presenter.h b/sources/presentation/presenters/statusbar_presenter/statusbar_presenter.h
@@ -13,6 +13,9 @@ namespace presentation
         explicit StatusbarPresenter(QObject* parent = nullptr);
         ~StatusbarPresenter() override;
 
+    public slots:
+        void setStatusbarEnabled(bool enabled);
+
     signals:
         void setMode(int mode);
 

diff --git a/sources/presentation/qml/Views/Status/StatusModeButton.qml b/sources/presentation/qml/Views/Status/StatusModeButton.qml
@@ -9,13 +9,7 @@ Controls.Button {
 
     property int mode: MainPresenter.NoMode
 
-    onClicked: {
-        if (highlighted) return;
-
-        parent.enabled = false;
-        setMode(mode);
-    }
+    onClicked: if (!highlighted) setMode(mode)
     highlighted: main.mode === mode
-    onHighlightedChanged: if (highlighted) parent.enabled = true;
     flat: true
 }