From 7ad666c346e5e4a1706405dd64535e1896540e5e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 2 Sep 2017 18:34:50 +0200 Subject: [PATCH] Ref T146, read only mode for login mode (so it can be used as display only UI element) Also some minor tweaks/formatting --- src/blackgui/loginmodebuttons.cpp | 11 +++++++++-- src/blackgui/loginmodebuttons.h | 9 +++++---- src/blackgui/loginmodebuttons.ui | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index 20539db16..d400640ec 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -65,9 +65,16 @@ namespace BlackGui } } + void CLoginModeButtons::setReadOnly(bool readonly) + { + ui->rb_LoginNormal->setEnabled(!readonly); + ui->rb_LoginObserver->setEnabled(!readonly); + ui->rb_LoginStealth->setEnabled(!readonly); + } + void CLoginModeButtons::configureLoginModes() { - if(CBuildConfig::isStableBranch() && !sGui->getIContextSimulator()->isSimulatorSimulating()) + if (CBuildConfig::isStableBranch() && !sGui->getIContextSimulator()->isSimulatorSimulating()) { // Disable pilot login modes ui->rb_LoginNormal->setEnabled(false); @@ -85,4 +92,4 @@ namespace BlackGui ui->rb_LoginNormal->setChecked(true); } } -} +} // ns diff --git a/src/blackgui/loginmodebuttons.h b/src/blackgui/loginmodebuttons.h index 434947ab4..4a09d9de3 100644 --- a/src/blackgui/loginmodebuttons.h +++ b/src/blackgui/loginmodebuttons.h @@ -14,7 +14,6 @@ #include "blackcore/network.h" #include "blackgui/blackguiexport.h" - #include #include #include @@ -22,7 +21,6 @@ class QWidget; namespace Ui { class CLoginModeButtons; } - namespace BlackGui { //! Display login modes (normal, stealth, ...) @@ -35,7 +33,7 @@ namespace BlackGui explicit CLoginModeButtons(QWidget *parent = nullptr); //! Destructor - ~CLoginModeButtons(); + virtual ~CLoginModeButtons(); //! Get login mode, \sa BlackCore::INetwork::LoginMode BlackCore::INetwork::LoginMode getLoginMode() const; @@ -43,11 +41,14 @@ namespace BlackGui //! Set login mode void setLoginMode(BlackCore::INetwork::LoginMode mode); + //! Set to read only + void setReadOnly(bool readonly); + private: void configureLoginModes(); QScopedPointer ui; }; -} +} // ns #endif // guard diff --git a/src/blackgui/loginmodebuttons.ui b/src/blackgui/loginmodebuttons.ui index e5b41cf6f..b772faa05 100644 --- a/src/blackgui/loginmodebuttons.ui +++ b/src/blackgui/loginmodebuttons.ui @@ -6,8 +6,8 @@ 0 0 - 271 - 23 + 257 + 49 @@ -38,7 +38,7 @@ - Login mode + Mode