Place video settings in the centered desktop call control row
This commit is contained in:
1 parent
32c6ff5cfa
commit
4b0e3726a8
2 files changed
+5
-2
No files matched your search
@@ -365,7 +365,7 @@ CallWindow::CallWindow(QWidget* parent)
|
||||
m_videoEnabled->setCheckable(true); m_videoEnabled->setAccessibleName(callText("Turn video on"));
|
||||
actions->addStretch(1);
|
||||
m_settingsBtn = makeRoundBtn(makeRoundIcon(QColor("#7f8c8d"), Glyph::Settings, 96), callText("Video settings"), this);
|
||||
m_settingsBtn->setCheckable(true); m_settingsBtn->setAccessibleName(callText("Video settings")); actions->addWidget(m_settingsBtn);
|
||||
m_settingsBtn->setCheckable(true); m_settingsBtn->setAccessibleName(callText("Video settings"));
|
||||
m_showVideoBtn = new QPushButton(callText("Show video"), this); actions->addWidget(m_showVideoBtn);
|
||||
lay->addLayout(actions);
|
||||
connect(m_settingsBtn, &QPushButton::toggled, this, [this](bool checked) {
|
||||
@@ -479,6 +479,7 @@ CallWindow::CallWindow(QWidget* parent)
|
||||
m_hangupCell = wrapWithCaption(m_hangupBtn, QCoreApplication::translate("ChatGui", "End call"));
|
||||
m_muteCell = wrapWithCaption(m_muteBtn, QCoreApplication::translate("ChatGui", "Mute"), &m_muteCaption);
|
||||
m_videoCell = wrapWithCaption(m_videoEnabled, callText("Camera"));
|
||||
m_settingsCell = wrapWithCaption(m_settingsBtn, callText("Video settings"));
|
||||
|
||||
QHBoxLayout* btn = new QHBoxLayout();
|
||||
btn->setSpacing(10);
|
||||
@@ -488,6 +489,7 @@ CallWindow::CallWindow(QWidget* parent)
|
||||
btn->addWidget(m_hangupCell);
|
||||
btn->addWidget(m_muteCell);
|
||||
btn->addWidget(m_videoCell);
|
||||
btn->addWidget(m_settingsCell);
|
||||
btn->addStretch(1);
|
||||
lay->addLayout(btn);
|
||||
videoLayout->addWidget(m_deviceCombo);
|
||||
@@ -604,7 +606,7 @@ void CallWindow::updateVideoPresentation() {
|
||||
m_localPreview->setVisible(active && !receiving && !m_localImage.isNull());
|
||||
m_connectionLabel->setVisible(active); m_bgpPathLabel->setVisible(active && !m_bgpPathLabel->text().isEmpty());
|
||||
m_statsLabel->setVisible(active && !m_statsLabel->text().isEmpty());
|
||||
m_videoCell->setVisible(active); m_settingsBtn->setVisible(active);
|
||||
m_videoCell->setVisible(active); m_settingsCell->setVisible(active);
|
||||
m_videoControls->setVisible(settings); m_showVideoBtn->setVisible(receiving);
|
||||
m_videoStatus->setVisible(active && !m_videoStatus->text().isEmpty());
|
||||
QSize panelMinimum = m_panel->minimumSizeHint();
|
||||
|
||||
@@ -97,5 +97,6 @@ private:
|
||||
QWidget* m_hangupCell; // Кнопка Hangup и подпись.
|
||||
QWidget* m_muteCell; // Кнопка mute и подпись.
|
||||
QWidget* m_videoCell; // Кнопка камеры и подпись справа от mute в общей центрированной строке.
|
||||
QWidget* m_settingsCell; // Шестерёнка настроек видео и подпись справа от камеры.
|
||||
QLabel* m_muteCaption; // Меняется между Mute/Unmute.
|
||||
};
|
||||
Reference in new issue
Block a user