feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Juggle messages on the Daemon state button around

Browse Source 
Change-Id: I64cef2458e475a8edd796d6a7ca5f3feb8bd0ac0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-16 13:05:40 +02:00
parent 6fef74a8cb
commit 8c1edf2be8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/docker/dockerdevice.cpp
View File

@@ -363,12 +363,15 @@ public:
auto daemonStateLabel = new QLabel(tr("Daemon state:")); auto daemonStateLabel = new QLabel(tr("Daemon state:"));
m_daemonReset = new QToolButton; m_daemonReset = new QToolButton;
m_daemonReset->setIcon(Icons::INFO.icon()); m_daemonReset->setIcon(Icons::INFO.icon());
m_daemonReset->setToolTip(tr("Daemon state not evaluated.")); m_daemonReset->setToolTip(tr("Clear detected daemon state. "
"It will be automatically re-evaluated next time an access is needed."));
m_daemonState = new QLabel(tr("Daemon state not evaluated."));
connect(m_daemonReset, &QToolButton::clicked, this, [this, dockerDevice] { connect(m_daemonReset, &QToolButton::clicked, this, [this, dockerDevice] {
dockerDevice->resetDaemonState(); dockerDevice->resetDaemonState();
m_daemonReset->setIcon(Icons::INFO.icon()); m_daemonReset->setIcon(Icons::INFO.icon());
m_daemonReset->setToolTip(tr("Daemon state not evaluated.")); m_daemonState->setText(tr("Daemon state not evaluated."));
}); });
m_runAsOutsideUser = new QCheckBox(tr("Run as outside user")); m_runAsOutsideUser = new QCheckBox(tr("Run as outside user"));
@@ -407,10 +410,11 @@ public:
if (!dockerDevice->isDaemonRunning()) { if (!dockerDevice->isDaemonRunning()) {
logView->append(tr("Docker daemon appears to be not running.")); logView->append(tr("Docker daemon appears to be not running."));
m_daemonReset->setToolTip(tr("Daemon not running. Push to reset the state.")); m_daemonState->setText(tr("Docker daemon not running."));
m_daemonReset->setIcon(Icons::CRITICAL.icon()); m_daemonReset->setIcon(Icons::CRITICAL.icon());
} else { } else {
m_daemonReset->setToolTip(tr("Docker daemon running.")); logView->append(tr("Docker daemon appears to be running."));
m_daemonState->setText(tr("Docker daemon running."));
m_daemonReset->setIcon(Icons::OK.icon()); m_daemonReset->setIcon(Icons::OK.icon());
} }
@@ -431,7 +435,7 @@ public:
Form { Form {
idLabel, m_idLineEdit, Break(), idLabel, m_idLineEdit, Break(),
repoLabel, m_repoLineEdit, Break(), repoLabel, m_repoLineEdit, Break(),
daemonStateLabel, m_daemonReset, Break(), daemonStateLabel, m_daemonReset, m_daemonState, Break(),
m_runAsOutsideUser, Break(), m_runAsOutsideUser, Break(),
tr("Paths to mount:"), m_pathsLineEdit, Break(), tr("Paths to mount:"), m_pathsLineEdit, Break(),
Column { Column {
@@ -449,6 +453,7 @@ private:
QLineEdit *m_idLineEdit; QLineEdit *m_idLineEdit;
QLineEdit *m_repoLineEdit; QLineEdit *m_repoLineEdit;
QToolButton *m_daemonReset; QToolButton *m_daemonReset;
QLabel *m_daemonState;
QCheckBox *m_runAsOutsideUser; QCheckBox *m_runAsOutsideUser;
QLineEdit *m_pathsLineEdit; QLineEdit *m_pathsLineEdit;